Merge pull request #69 from antonv6/l10n-ru

Russian translation

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9e0e00282c79fa62eccdb8e8f807300a8e4665f0..21d6a06f2addb73a83338cee42f940a226480208 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,9 +23,11 @@
     <application
         android:name=".DictionaryApplication"
         android:allowBackup="true"
+        android:resizeableActivity="true"
         android:icon="@drawable/icon"
         android:banner="@drawable/banner_tv"
         android:label="@string/app_name"
+        android:supportsRtl="true"
         android:theme="@style/AppBaseThemeDark" >
         <meta-data
             android:name="com.google.android.backup.api_key"

diff --git a/build.gradle b/build.gradle
index ec54900cf29f6c38f77a1eb511071402882cd70e..77816bc282bf18c3ec9a453b187f6ed20c73a7d5 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
@@ -77,5 +77,6 @@ android {
     defaultConfig {
         applicationId 'de.reimardoeffinger.quickdic'
         targetSdkVersion 23
+        resConfigs "de", "es", "fr", "it", "ja", "pt", "pt-rBR"
     }
 }

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 9523215e9bd72e5cab208d4205e946c18daeec7d..37c4755ec49bdbd379011f64759a94186aff8127 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -42,6 +42,7 @@ import android.text.Spannable;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
 import android.text.style.StyleSpan;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextMenu;
@@ -1473,7 +1474,12 @@ public class DictionaryActivity extends ActionBarActivity {
 
         private void getMetrics() {
             // Get the screen's density scale
-            final float scale = getResources().getDisplayMetrics().density;
+            // The previous method getResources().getDisplayMetrics()
+            // used to occasionally trigger a null pointer exception,
+            // so try this instead.
+            DisplayMetrics dm = new DisplayMetrics();
+            getWindowManager().getDefaultDisplay().getMetrics(dm);
+            final float scale = dm.density;
             // Convert the dps to pixels, based on density scale
             mPaddingDefault = (int) (PADDING_DEFAULT_DP * scale + 0.5f);
             mPaddingLarge = (int) (PADDING_LARGE_DP * scale + 0.5f);