From: Thad Hughes <thad.hughes@gmail.com>
Date: Wed, 9 May 2012 22:07:10 +0000 (-0700)
Subject: Fixed font problems!
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=02f5c7207dc34715fdb0fda9c9edc4aa2c78adbc

Fixed font problems!
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fce4847..ca1e53f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -8,7 +8,7 @@
  android:versionName="3.2.2"
  android:installLocation="auto">
 
- <uses-sdk android:minSdkVersion="4" />
+ <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="15"/>
  
    <!--
     Because android:minSdkVersion is 3, these parameters default to
diff --git a/Dictionary_signed.apk b/Dictionary_signed.apk
index 435dfa0..7991959 100644
Binary files a/Dictionary_signed.apk and b/Dictionary_signed.apk differ
diff --git a/res/layout/about_activity.xml b/res/layout/about_activity.xml
index 781b682..e473641 100644
--- a/res/layout/about_activity.xml
+++ b/res/layout/about_activity.xml
@@ -1,103 +1,103 @@
-<ScrollView android:id="@+id/ScrollView01"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="wrap_content" 
-	android:layout_height="wrap_content">
-	
-<LinearLayout 
-	android:id="@+id/LinearLayout01"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ScrollView01"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    tools:ignore="HardcodedText" >
 
-	<LinearLayout 
-		android:id="@+id/LinearLayout02"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:paddingBottom="10dip">
+    <LinearLayout
+        android:id="@+id/LinearLayout01"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
 
-		<ImageView 
-			android:id="@+id/ImageView01"
-			android:layout_width="wrap_content" 
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:background="@drawable/icon" 
-      android:contentDescription="icon"/>
+        <LinearLayout
+            android:id="@+id/LinearLayout02"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:paddingBottom="10dip" >
 
-		<TextView 
-			android:id="@+id/title" 
-			android:text="@string/titleWithVersion"
-			android:textAppearance="?android:attr/textAppearanceLarge"
-			android:layout_width="wrap_content" 
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical|fill_vertical" />
-	</LinearLayout>
+            <ImageView
+                android:id="@+id/ImageView01"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:background="@drawable/icon"
+                android:contentDescription="icon" />
 
-	<TextView 
-		android:id="@+id/copyright"
-		android:text="Copyright 2009-2011 Google Inc." 
-		android:layout_width="wrap_content" 
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"/>
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|fill_vertical"
+                android:text="@string/titleWithVersion"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+        </LinearLayout>
 
-	<TextView 
-		android:id="@+id/author"
-		android:text="Thad Hughes" 
-		android:layout_width="wrap_content" 
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:paddingBottom="10dip"/>
+        <TextView
+            android:id="@+id/copyright"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="Copyright 2009-2011 Google Inc." />
 
-	<TextView 
-		android:id="@+id/emailMe"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" 
-		android:text="@string/contactMe"/>
+        <TextView
+            android:id="@+id/author"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:paddingBottom="10dip"
+            android:text="Thad Hughes" />
 
-	<TextView 
-		android:id="@+id/email" 
-		android:text="@string/myEmail"
-		android:autoLink="email"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" 
-		android:clickable="true" 
-		android:layout_gravity="left"
-		android:paddingBottom="10dip"/>
-  
-    <TextView 
-    android:id="@+id/webPage"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" 
-    android:text="@string/webPage"/>
+        <TextView
+            android:id="@+id/emailMe"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/contactMe" />
 
-  <TextView 
-    android:id="@+id/webPageUrl" 
-    android:text="@string/webPageUrl"
-    android:autoLink="web"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" 
-    android:clickable="true" 
-    android:layout_gravity="left"
-    android:paddingBottom="10dip"/>
-  
-  <TextView
-    android:id="@+id/license" 
-    android:text="@string/license"
-    android:autoLink="web"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" 
-    android:layout_gravity="left"/>
+        <TextView
+            android:id="@+id/email"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:autoLink="email"
+            android:clickable="true"
+            android:paddingBottom="10dip"
+            android:text="@string/myEmail" />
 
-  <TextView
-    android:id="@+id/licenseUrl" 
-    android:text="@string/licenseUrl"
-    android:autoLink="web"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" 
-    android:layout_gravity="left"
-    android:paddingBottom="10dip"/>
-  
-</LinearLayout>
+        <TextView
+            android:id="@+id/webPage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/webPage" />
+
+        <TextView
+            android:id="@+id/webPageUrl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:autoLink="web"
+            android:clickable="true"
+            android:paddingBottom="10dip"
+            android:text="@string/webPageUrl" />
+
+        <TextView
+            android:id="@+id/license"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:autoLink="web"
+            android:text="@string/license" />
+
+        <TextView
+            android:id="@+id/licenseUrl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:autoLink="web"
+            android:paddingBottom="10dip"
+            android:text="@string/licenseUrl" />
+    </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/res/layout/dictionary_manager_activity.xml b/res/layout/dictionary_manager_activity.xml
index 96a0967..5fc34ce 100644
--- a/res/layout/dictionary_manager_activity.xml
+++ b/res/layout/dictionary_manager_activity.xml
@@ -37,7 +37,7 @@
     android:layout_weight="1.0"
     />
 
-   <TextView 
+   <EditText 
      android:id="@+id/DictionaryListHeader"
      android:hint="@string/helpText"
      android:layout_width="fill_parent"
diff --git a/res/layout/thadolina_dialog.xml b/res/layout/thadolina_dialog.xml
index d9ea0fb..fb0e102 100644
--- a/res/layout/thadolina_dialog.xml
+++ b/res/layout/thadolina_dialog.xml
@@ -1,7 +1,9 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ScrollView01"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
+    android:layout_height="fill_parent"
+    tools:ignore="HardcodedText" >
 
     <LinearLayout
         android:id="@+id/linearLayout1"
@@ -9,45 +11,39 @@
         android:layout_height="wrap_content"
         android:orientation="vertical" >
 
-       <TextView
-         android:layout_marginTop="20dip"
-         android:id="@+id/text_quote_flower"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:layout_gravity="center_horizontal"
-         android:text="There is a flower... I think that she has tamed me..."
-         android:layout_marginBottom="20dip"
-          />
-        
+        <TextView
+            android:id="@+id/text_quote_flower"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="20dip"
+            android:layout_marginTop="20dip"
+            android:text="There is a flower... I think that she has tamed me..." />
+
         <ImageView
             android:id="@+id/thadolina_image"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:background="@drawable/thadolina"
             android:layout_marginBottom="20dip"
-            android:contentDescription="Ti amo tanto!"
-             />
+            android:background="@drawable/thadolina"
+            android:contentDescription="Ti amo tanto!" />
 
         <TextView
             android:id="@+id/text_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:text="Happy Valentine's Day, amore mio!  And happy every other day, too!" 
-            android:textAppearance="@android:style/TextAppearance.Large"
             android:layout_marginBottom="20dip"
-            />
-        
+            android:text="Happy Valentine&apos;s Day, amore mio!  And happy every other day, too!"
+            android:textAppearance="@android:style/TextAppearance.Large" />
+
         <TextView
             android:id="@+id/text_quote"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:text="It is only with the heart that one can see rightly; what is essential is invisible to the eye."
-             />
-
-        
+            android:text="It is only with the heart that one can see rightly; what is essential is invisible to the eye." />
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f78b506..f9551ab 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -21,7 +21,9 @@
   <string name="moveToTop">Nach Anfang ziehen</string>
   <string name="deleteDictionary">Wörterbuch entfernen</string>
   <string name="indexInfo">%1$s: %2$,d Wörter</string>
-
+  <string name="managerFilterText">Filter</string>
+  <string name="managerFilterCheckbox">Nur SD-Karte</string>
+  
   <string name="thanksForUpdatingVersion">3.2.2_de_a</string>
 
   <!-- DictionaryActivity -->
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 89869b6..e1c4c70 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -250,6 +250,7 @@ public class DictionaryActivity extends ListActivity {
     
     final int fontWorkAround = prefs.getInt(C.FONT_WORKAROUND, 1);
     if (fontWorkAround == 0) {
+      Log.w(LOG, "Loading font seemed to fail last time, trying with default font.");
       Toast.makeText(this, getString(R.string.fontWorkaround), Toast.LENGTH_LONG).show();
       prefs.edit().putString(getString(R.string.fontKey), "SYSTEM").commit();
     }
@@ -278,8 +279,6 @@ public class DictionaryActivity extends ListActivity {
     } catch (NumberFormatException e) {
       fontSizeSp = 14;
     } 
-    // Things worked with loading the font.
-    prefs.edit().putInt(C.FONT_WORKAROUND, 1).commit();
 
 
     setContentView(R.layout.dictionary_activity);
@@ -392,6 +391,11 @@ public class DictionaryActivity extends ListActivity {
   @Override
   protected void onPause() {
     super.onPause();
+    
+    // If the app exits normally, this will happen.
+    final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+    Log.d(LOG, "Loading font seemed to work.");
+    prefs.edit().putInt(C.FONT_WORKAROUND, 1).commit();
   }
   
   private static void setDictionaryPrefs(final Context context,