From 75d975202460639167e1e8a32007ac50d4eeacf0 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 21 Nov 2013 06:44:19 -0800
Subject: [PATCH] use "pct." to indicate what thumb scale choices mean. '%'
 triggers a known crasher in Android.

---
 xwords4/android/XWords4/res/values/strings.xml        |  2 ++
 xwords4/android/XWords4/res/xml/xwprefs.xml           |  3 ++-
 .../XWords4/src/org/eehouse/android/xw4/XWPrefs.java  | 11 +++++++----
 .../eehouse/android/xw4/XWThumbListPreference.java    |  5 ++++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 6e24792f5..ee3193f2e 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -2192,4 +2192,6 @@
     means that any time a board that\'s missing a player is open, you
     can tap a nearby person\'s device to invite him/her to
     play – if he/she is also using NFC.</string>
+
+    <string name="pct_suffix">\u0020pct.</string>
 </resources>
diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml
index 626cdfae0..79cc9d134 100644
--- a/xwords4/android/XWords4/res/xml/xwprefs.xml
+++ b/xwords4/android/XWords4/res/xml/xwprefs.xml
@@ -119,10 +119,11 @@
                             android:defaultValue="true"
                             />
 
+        <!-- " pct." below must match R.string.pct_suffix -->
         <org.eehouse.android.xw4.XWThumbListPreference 
              android:key="@string/key_thumbsize"
              android:title="@string/summary_thumbsize"
-             android:defaultValue="30"
+             android:defaultValue="30 pct."
              />
     </PreferenceScreen>
 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java
index aaee9f88d..02ff7705a 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java
@@ -350,10 +350,13 @@ public class XWPrefs {
     public static int getThumbPct( Context context )
     {
         String pct = getPrefsString( context, R.string.key_thumbsize );
-        int result = 30;
-        if ( null != pct && 2 <= pct.length() ) {
-            // result = Integer.parseInt( pct.substring( 0, pct.length() - 1 ) );
-            result = Integer.parseInt( pct );
+        int result;
+        try {
+            String suffix = context.getString( R.string.pct_suffix );
+            result = Integer.parseInt( pct.substring( 0, pct.length()
+                                                      - suffix.length() ) );
+        } catch (Exception ex ) {
+            result = 30;
         }
         DbgUtils.logf( "pct: %s => %d", pct, result );
         return result;
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWThumbListPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWThumbListPreference.java
index b3e957086..3edf55b68 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWThumbListPreference.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWThumbListPreference.java
@@ -24,10 +24,12 @@ import android.content.Context;
 import android.util.AttributeSet;
 
 public class XWThumbListPreference extends XWListPreference {
+    private Context m_context;
 
     public XWThumbListPreference( Context context, AttributeSet attrs )
     {
         super( context, attrs );
+        m_context = context;
     }
 
     // Why I exist: insert the rowid and gameid lines if debug is on
@@ -37,8 +39,9 @@ public class XWThumbListPreference extends XWListPreference {
 
         CharSequence[] newEntries = new CharSequence[6];
         int indx = 0;
+        String suffix = m_context.getString( R.string.pct_suffix );
         for ( int pct = 20; pct <= 45; pct += 5 ) {
-            newEntries[indx++] = String.format( "%d", pct );
+            newEntries[indx++] = String.format( "%d%s", pct, suffix );
         }
         setEntries( newEntries );
         setEntryValues( newEntries );