]> gitweb.fperrin.net Git - Dictionary.git/commitdiff
Try to fix font issue.
authorThad Hughes <thad.hughes@gmail.com>
Tue, 10 Apr 2012 22:49:10 +0000 (15:49 -0700)
committerThad Hughes <thad.hughes@gmail.com>
Tue, 10 Apr 2012 22:49:10 +0000 (15:49 -0700)
.classpath
AndroidManifest.xml
res/raw-de/whats_new.html
res/raw/whats_new.html
res/values-de/strings.xml
res/values/arrays.xml
res/values/strings.xml
src/com/hughes/android/dictionary/C.java
src/com/hughes/android/dictionary/DictionaryActivity.java
src/com/hughes/android/dictionary/DictionaryManagerActivity.java

index 00ba4b76323fb53a6fa7ca9a9751a1220f96eb7c..117a6ee98d49c3b88e978a77d215c7b27008c503 100644 (file)
@@ -5,5 +5,6 @@
        <classpathentry combineaccessrules="false" exported="true" kind="src" path="/Util"/>
        <classpathentry kind="src" path="gen"/>
        <classpathentry exported="true" kind="lib" path="jars/icu4j-module.jar"/>
+       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
        <classpathentry kind="output" path="bin/classes"/>
 </classpath>
index 6b49408460820db3fecf3e9912fa4dc31c4eddde..fce48471c29fc223e4334d902e5dca52d3d3ecf2 100644 (file)
@@ -4,8 +4,8 @@
  
  package="com.hughes.android.dictionary"
  
- android:versionCode="19"
- android:versionName="3.2.1"
+ android:versionCode="20"
+ android:versionName="3.2.2"
  android:installLocation="auto">
 
  <uses-sdk android:minSdkVersion="4" />
index 23901b4559579246f22c2ad5361fdb6a40f4c1cd..d74e30b6dbe0ed34b89570285a97ac21b7d98155 100644 (file)
@@ -9,11 +9,9 @@
 </head>
 <body>
 <!-- Don't use links in the text below, it crashes the app. -->
-Vielen Dank f&uuml;r die Aktualisierung auf QuickDic 3.2.1.
+Vielen Dank f&uuml;r die Aktualisierung auf QuickDic 3.2.2.
 <p>Neue Funktionen:</p>
 <ul>
-<li>W&ouml;rterb&uuml;cher filtern.</li>
-<li>&Uuml;bersetungen verbessert.</li>
 <li>Fixed font bug on Sony Ericsson devices.</li>
 </ul>
 </body>
index 41bda3313a7b3fa5dc46e19f637c7dca0c23c94a..abb19b14c43fc7e2802d9bb1d3d9b553725ef4d8 100644 (file)
@@ -9,10 +9,9 @@
 </head>
 <body>
 <!-- Don't use links in the text below, it crashes the app. -->
-Thanks for updating to QuickDic 3.2.1.
+Thanks for updating to QuickDic 3.2.2.
 <p>New features:</p>
 <ul>
-<li>Filter dictionary list.</li>
 <li>Fixed font bug on Sony Ericsson devices.</li>
 </ul>
 </body>
index 8f2f22d672944bb59af9b71e57edc311e097797c..f78b506ae197748364387d58f5b41896b66e4f1d 100644 (file)
@@ -3,13 +3,14 @@
 
        <string name="app_name">QuickDic</string>
 
-       <string name="titleWithVersion">QuickDic 3.2.1</string>
+       <string name="titleWithVersion">QuickDic 3.2.2</string>
        
   <!-- Global. -->
   <string name="about">Über QuickDic…</string>
   <string name="preferences">Einstellungen…</string>
   <string name="help">Hilfe</string>
   <string name="reportIssue">Problem melden…</string>
+  <string name="fontWorkaround">Detected font problem (common on Sony Ericsson devices), switching back to default font.</string>
   
   
   <!-- DictionaryManagerActivity -->
@@ -21,7 +22,7 @@
   <string name="deleteDictionary">Wörterbuch entfernen</string>
   <string name="indexInfo">%1$s: %2$,d Wörter</string>
 
-  <string name="thanksForUpdatingVersion">3.2.1_de_a</string>
+  <string name="thanksForUpdatingVersion">3.2.2_de_a</string>
 
   <!-- DictionaryActivity -->
   <string name="searchText">Suchtext</string>
index 0e4d6654829b94e9c46b8366a02f3dcbfe6f8061..73b5accef979ee7eabff3f084481847d22c526f8 100644 (file)
@@ -11,7 +11,7 @@
     <item>FreeSerif</item>
     <item>FreeSans</item>
     <item>System default</item>
-    </string-array>
+  </string-array>
     
   <string-array name="themeKeys">
     <item>themeLight</item>
index d7949db3d9d3073a03a2d94d7bdbac2f8cbd0931..d6b5977cb588b9a0b9713a30599ad1517dc8130e 100644 (file)
@@ -3,13 +3,14 @@
 
   <string name="app_name">QuickDic</string>
 
-  <string name="titleWithVersion">QuickDic 3.2.1</string>
+  <string name="titleWithVersion">QuickDic 3.2.2</string>
   
   <!-- Global. -->
   <string name="about">About QuickDic…</string> 
   <string name="preferences">Preferences…</string>
   <string name="help">Help</string>
   <string name="reportIssue">Report issue…</string>
+  <string name="fontWorkaround">Detected font problem (common on Sony Ericsson devices), switching back to default font.</string>
   
   
    <!-- DictionaryManagerActivity -->
@@ -24,7 +25,7 @@
   <string name="managerFilterCheckbox">Local only</string>
   
 
-  <string name="thanksForUpdatingVersion">3.2.1_en_a</string>
+  <string name="thanksForUpdatingVersion">3.2.2_en_e</string>
 
   <!-- DictionaryActivity -->
   <string name="searchText">Search Text</string>
index c8511da3474087118fc473d2687d18690328d531..452c98b2fe2376fb3ff204366ee1bc632c73da0f 100644 (file)
@@ -26,6 +26,8 @@ public class C {
 
   public static final String THANKS_FOR_UPDATING_VERSION = "thanksForUpdatingVersion";
 
+  public static final String FONT_WORKAROUND = "fontWorkaround";
+
 
   enum Theme {
     DEFAULT(R.style.Theme_Default, R.style.Theme_Default_TokenRow_Fg,
index 78c8a476b822cb0de1d69de411af4cef3a0d4512..89869b646e0dd4aa543288fe514cf68f9ffa0e62 100644 (file)
@@ -247,8 +247,15 @@ public class DictionaryActivity extends ListActivity {
       }\r
     }).start();\r
     \r
-    final String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.ttf.jpg");\r
-    if ("SYSTEM".equals(fontName)) {\r
+    \r
+    final int fontWorkAround = prefs.getInt(C.FONT_WORKAROUND, 1);\r
+    if (fontWorkAround == 0) {\r
+      Toast.makeText(this, getString(R.string.fontWorkaround), Toast.LENGTH_LONG).show();\r
+      prefs.edit().putString(getString(R.string.fontKey), "SYSTEM").commit();\r
+    }\r
+    prefs.edit().putInt(C.FONT_WORKAROUND, 0).commit();\r
+    String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.ttf.jpg");\r
+    if (fontWorkAround == 0 || "SYSTEM".equals(fontName)) {\r
       typeface = Typeface.DEFAULT;\r
     } else {\r
       try {\r
@@ -258,6 +265,9 @@ public class DictionaryActivity extends ListActivity {
         Toast.makeText(this, getString(R.string.fontFailure, e.getLocalizedMessage()), Toast.LENGTH_LONG).show();\r
       }\r
     }\r
+//    if (!"SYSTEM".equals(fontName)) {\r
+//      throw new RuntimeException("Test force using system font: " + fontName);\r
+//    }\r
     if (typeface == null) {\r
       Log.w(LOG, "Unable to create typeface, using default.");\r
       typeface = Typeface.DEFAULT;\r
@@ -267,7 +277,10 @@ public class DictionaryActivity extends ListActivity {
       fontSizeSp = Integer.parseInt(fontSize.trim());\r
     } catch (NumberFormatException e) {\r
       fontSizeSp = 14;\r
-    }\r
+    } \r
+    // Things worked with loading the font.\r
+    prefs.edit().putInt(C.FONT_WORKAROUND, 1).commit();\r
+\r
 \r
     setContentView(R.layout.dictionary_activity);\r
     searchText = (EditText) findViewById(R.id.SearchText);\r
index dab77f5d776bad583940fbe6e134e77d8fd53407..f136dbdb7e95d949f685f94dfce1cb210172f9cc 100644 (file)
@@ -136,19 +136,19 @@ public class DictionaryManagerActivity extends ListActivity {
       builder.setCancelable(false);
       final WebView webView = new WebView(getApplicationContext());
       webView.loadData(StringUtil.readToString(getResources().openRawResource(R.raw.whats_new)), "text/html", "utf-8");
-      builder.setView(webView);
       builder.setNegativeButton(android.R.string.ok, new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialog, int id) {
                dialog.cancel();
           }
       });
-      final AlertDialog alert = builder.create();
       WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
-      layoutParams.copyFrom(alert.getWindow().getAttributes());
       layoutParams.width = WindowManager.LayoutParams.FILL_PARENT;
       layoutParams.height = WindowManager.LayoutParams.FILL_PARENT;
+      webView.setLayoutParams(layoutParams);
+      builder.setView(webView);
+      final AlertDialog alert = builder.create();
+      alert.getWindow().setLayout(WindowManager.LayoutParams.FILL_PARENT, WindowManager.LayoutParams.FILL_PARENT);
       alert.show();
-      alert.getWindow().setAttributes(layoutParams);
       prefs.edit().putString(C.THANKS_FOR_UPDATING_VERSION, thanksForUpdatingLatestVersion).commit();
     }
   }