Fix selecting FreeSerif in settings.

rdoeffinger · Sep 20, 2015 · 803fc0b · 803fc0b
1 parent 1f3adae
commit 803fc0b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hughes.android.dictionary"
     android:installLocation="auto"
-    android:versionCode="33"
+    android:versionCode="34"
     android:versionName="5.0.7" >
 
     <uses-sdk

diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
@@ -2,7 +2,7 @@
 <resources>
 
   <string-array name="fontKeys">
-    <item>FreeSerif.ttf.jpg</item>
+    <item>FreeSerif.otf.jpg</item>
     <item>SYSTEM</item>
     <item>SERIF</item>
     <item>SANS_SERIF</item>

diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
@@ -2,7 +2,7 @@
 <resources>
 
   <string-array name="fontKeys">
-    <item>FreeSerif.ttf.jpg</item>
+    <item>FreeSerif.otf.jpg</item>
     <item>SYSTEM</item>
     <item>SERIF</item>
     <item>SANS_SERIF</item>

diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
@@ -2,7 +2,7 @@
 <resources>
 
   <string-array name="fontKeys">
-    <item>FreeSerif.ttf.jpg</item>
+    <item>FreeSerif.otf.jpg</item>
     <item>SYSTEM</item>
     <item>SERIF</item>
     <item>SANS_SERIF</item>

diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
@@ -2,7 +2,7 @@
 <resources>
 
   <string-array name="fontKeys">
-    <item>FreeSerif.ttf.jpg</item>
+    <item>FreeSerif.otf.jpg</item>
     <item>SYSTEM</item>
     <item>SERIF</item>
     <item>SANS_SERIF</item>

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
@@ -2,7 +2,7 @@
 <resources>
 
   <string-array name="fontKeys">
-    <item>FreeSerif.ttf.jpg</item>
+    <item>FreeSerif.otf.jpg</item>
     <item>SYSTEM</item>
     <item>SERIF</item>
     <item>SANS_SERIF</item>

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
@@ -29,7 +29,7 @@
     android:title="@string/fontTitle"
     android:summary="@string/fontSummary"
     android:persistent="true"
-    android:defaultValue="FreeSerif.ttf.jpg"
+    android:defaultValue="FreeSerif.otf.jpg"
     android:entries="@array/fonts"
     android:entryValues="@array/fontKeys"
   />
@@ -76,4 +76,4 @@
     android:entryValues="@array/themeKeys"
   />
 
-</PreferenceScreen>  
+</PreferenceScreen>  
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -408,6 +408,9 @@ public void run() {
 	} else if ("MONOSPACE".equals(fontName)) {
             typeface = Typeface.MONOSPACE;
         } else {
+            if ("FreeSerif.ttf.jpg".equals(fontName)) {
+                fontName = "FreeSerif.otf.jpg";
+            }
             try {
                 typeface = Typeface.createFromAsset(getAssets(), fontName);
             } catch (Exception e) {