From 74c9e9db92cf9d9274ac93c37f697df66cd0bf75 Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand.private.network>
Date: Thu, 10 Jun 2010 21:28:38 -0700
Subject: [PATCH] add second prefs menu to restore all prefs

---
 .../android/XWords4/res/values/strings.xml    |  3 +
 .../eehouse/android/xw4/PrefsActivity.java    | 69 ++++++++++++++-----
 2 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index e1672fb58..6175d475d 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -219,9 +219,12 @@
     <string name="phonies_disallow">Disallow phonies</string>
     <string name="menu_prefs">Settings</string>
     <string name="gamel_menu_dicts">Dictionaries</string>
+    <string name="menu_revert_all">Restore all</string>
     <string name="menu_revert_colors">Restore colors</string>
     <string name="confirm_revert_colors">Are you sure you want to
     restore all color preferences to their default values?</string>
+    <string name="confirm_revert_all">Are you sure you want to restore
+    all preferences to their default values?</string>
 
     <string name="room_label">Room</string>
     <string name="phone_label">Host phone number</string>
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java
index 2fdfd5788..8a4964372 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java
@@ -36,17 +36,20 @@ public class PrefsActivity extends PreferenceActivity
     implements SharedPreferences.OnSharedPreferenceChangeListener {
 
     private static final int REVERT_COLORS = 1;
+    private static final int REVERT_ALL = 2;
 
     private String[] m_keys;
 
     @Override
     protected Dialog onCreateDialog( int id )
     {
-        Dialog dialog = null;
+        DialogInterface.OnClickListener lstnr = null;
+        int confirmID = 0;
+
         switch( id ) {
         case REVERT_COLORS:
-            DialogInterface.OnClickListener lstnr = 
-                new DialogInterface.OnClickListener() {
+            confirmID = R.string.confirm_revert_colors;
+            lstnr = new DialogInterface.OnClickListener() {
                     public void onClick( DialogInterface dlg, int item ) {
                         SharedPreferences sp =
                             getPreferenceScreen().getSharedPreferences();
@@ -68,26 +71,33 @@ public class PrefsActivity extends PreferenceActivity
                             editor.remove( getString(colorKey) );
                         }
                         editor.commit();
-
-                        PreferenceManager.setDefaultValues( PrefsActivity.this, 
-                                                            R.xml.xwprefs,
-                                                            false );
-
-                        // Now replace this activity with a new copy
-                        // so the new values get loaded.
-                        startActivity( new Intent( PrefsActivity.this,
-                                                   PrefsActivity.class ) );
-                        finish();
+                        relaunch();
                     }
                 };
+            break;
+        case REVERT_ALL:
+            confirmID = R.string.confirm_revert_all;
+            lstnr = new DialogInterface.OnClickListener() {
+                    public void onClick( DialogInterface dlg, int item ) {
+                        SharedPreferences sp =
+                            getPreferenceScreen().getSharedPreferences();
+                        SharedPreferences.Editor editor = sp.edit();
+                        editor.clear();
+                        editor.commit();
+                        relaunch();
+                    }
+                };
+            break;
+        }
 
+        Dialog dialog = null;
+        if ( null != lstnr ) {
             dialog = new AlertDialog.Builder( this )
                 .setTitle( R.string.query_title )
-                .setMessage( R.string.confirm_revert_colors )
+                .setMessage( confirmID )
                 .setPositiveButton( R.string.button_ok, lstnr )
                 .setNegativeButton( R.string.button_cancel, null )
                 .create();
-            break;
         }
         return dialog;
     }
@@ -158,10 +168,19 @@ public class PrefsActivity extends PreferenceActivity
     @Override
     public boolean onOptionsItemSelected( MenuItem item )
     {
-        boolean handled = false;
-        if ( R.id.menu_revert_colors == item.getItemId()) {
-            showDialog( REVERT_COLORS );
-            handled = true;
+        int dlgID = 0;
+        switch ( item.getItemId() ) {
+        case R.id.menu_revert_all:
+            dlgID = REVERT_ALL;
+            break;
+        case R.id.menu_revert_colors:
+            dlgID = REVERT_COLORS;
+            break;
+        }
+
+        boolean handled = 0 != dlgID;
+        if ( handled ) {
+            showDialog( dlgID );
         }
         return handled;
     }
@@ -175,4 +194,16 @@ public class PrefsActivity extends PreferenceActivity
         }
     }
 
+
+    private void relaunch()
+    {
+        PreferenceManager.setDefaultValues( this, R.xml.xwprefs,
+                                            false );
+
+        // Now replace this activity with a new copy
+        // so the new values get loaded.
+        startActivity( new Intent( this, PrefsActivity.class ) );
+        finish();
+    }
+
 }