Add new settings

javiersantos · May 25, 2015 · d0f0aa8 · d0f0aa8
1 parent 04fa4ac
commit d0f0aa8
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 6 deletions.
diff --git a/app/src/main/java/com/javiersantos/mlmanager/SettingsActivity.java b/app/src/main/java/com/javiersantos/mlmanager/SettingsActivity.java
@@ -9,6 +9,7 @@
 import android.preference.PreferenceManager;
 
 import com.javiersantos.mlmanager.utils.AppPreferences;
+import com.javiersantos.mlmanager.utils.UtilsApp;
 import com.javiersantos.mlmanager.utils.UtilsDialog;
 
 public class SettingsActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -17,7 +18,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 
     // Settings variables
     private SharedPreferences prefs;
-    private Preference prefVersion, prefPrimaryColor;
+    private Preference prefVersion, prefPrimaryColor, prefFABColor, prefDeleteAll, prefDefaultValues;
     private String versionName;
     private int versionCode;
     private Context context;
@@ -36,7 +37,11 @@ public void onCreate(Bundle savedInstanceState) {
 
         prefVersion = findPreference("prefVersion");
         prefPrimaryColor = findPreference("prefPrimaryColor");
+        prefFABColor = findPreference("prefFABColor");
+        prefDeleteAll = findPreference("prefDeleteAll");
+        prefDefaultValues = findPreference("prefDefaultValues");
 
+        // prefVersion
         try {
             versionName = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
             versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
@@ -52,10 +57,38 @@ public boolean onPreferenceClick(Preference preference) {
             }
         });
 
+        // prefPrimaryColor
         if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             prefPrimaryColor.setEnabled(false);
         }
 
+        // prefDeleteAll
+        prefDeleteAll.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                prefDeleteAll.setSummary(R.string.deleting);
+                prefDeleteAll.setEnabled(false);
+                Boolean deleteAll = UtilsApp.deleteAppFiles();
+                if (deleteAll) {
+                    prefDeleteAll.setSummary(R.string.deleting_done);
+                } else {
+                    prefDeleteAll.setSummary(R.string.deleting_error);
+                }
+                prefDeleteAll.setEnabled(true);
+                return true;
+            }
+        });
+
+        // prefDefaultValues
+        prefDefaultValues.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                appPreferences.setPrimaryColorPref(getResources().getColor(R.color.primary));
+                appPreferences.setFABColorPref(getResources().getColor(R.color.fab));
+                return true;
+            }
+        });
+
     }
 
     private void setInitialConfiguration() {
@@ -71,7 +104,6 @@ private void setInitialConfiguration() {
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         Preference pref = findPreference(key);
 
-
     }
 
     @Override

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -23,7 +23,7 @@
     <string name="settings_about">Hecho con \u2665 en España</string>
     <string name="settings_customizations">Personalizaciones</string>
     <string name="settings_delete_on_start">Eliminar APKs</string>
-    <string name="settings_delete_on_start_description">Eliminar todos los APK extraídos en cada inicio de la app</string>
+    <string name="settings_delete_on_start_description">Eliminar todos los APK extraídos en cada inicio de la aplicación</string>
     <string name="settings_fab_color">Color del botón flotante</string>
     <string name="settings_fab_color_description">Ajustar el color para el botón flotante (FAB)</string>
     <string name="settings_googleplay">Valorar en Google Play</string>
@@ -32,6 +32,13 @@
     <string name="settings_primary_color_description">Ajustar el color primario para la barra de herramientas y navegación. Requiere Android 5.0 o superior.</string>
     <string name="tap_exit">Pulsa de nuevo para salir</string>
     <string name="dialog_cache_description">Eliminar la caché para esta app: %.2f MB</string>
-    <string name="settings_navigation_black_description">No usar un color personalizado para la barra de navegación.</string>
+    <string name="settings_navigation_black_description">No usar un color personalizado para la barra de navegación</string>
     <string name="settings_navigation_black">Mostrar barra de navegación en negro</string>
+    <string name="deleting">Eliminando...</string>
+    <string name="deleting_done">¡Archivos eliminados!</string>
+    <string name="deleting_error">Algo fué mal eliminando los archivos</string>
+    <string name="settings_default_customization">Restaurar personalizaciones</string>
+    <string name="settings_default_customization_description">Restaurar colores a los valores por defecto</string>
+    <string name="settings_delete_all">Eliminar todos los APK extraídos</string>
+    <string name="settings_delete_all_description">Eliminar  los archivos APK extraídos en la carpeta de extracción</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,9 +1,13 @@
 <resources>
     <string name="app_name" translatable="false">ML Manager</string>
 
+    <!-- Labels -->
     <string name="action_settings">Settings</string>
     <string name="action_about">About</string>
     <string name="send_to">Send %s</string>
+    <string name="deleting">Deleting...</string>
+    <string name="deleting_done">Files deleted!</string>
+    <string name="deleting_error">Something went wrong removing the files</string>
 
     <!-- Dialogs -->
     <string name="dialog_saved">%s APK saved</string>
@@ -30,17 +34,21 @@
     <!-- Settings -->
     <string name="settings_delete_on_start">Delete APKs</string>
     <string name="settings_delete_on_start_description">Remove all the extracted APKs on every app starts</string>
+    <string name="settings_delete_all">Delete all extracted APKs</string>
+    <string name="settings_delete_all_description">Remove all the extracted APKs stored in the extraction folder</string>
     <string name="settings_customizations">Customizations</string>
     <string name="settings_primary_color">Primary color</string>
     <string name="settings_primary_color_description">Set the primary color for the toolbar and navigation bar. Requires Android 5.0+</string>
     <string name="settings_fab_color">Floating button color</string>
     <string name="settings_fab_color_description">Set the color for the Floating Action Button (FAB)</string>
     <string name="settings_navigation_black">Show navigation bar in black</string>
     <string name="settings_navigation_black_description">Don\'t use a custom color for the navigation bar.</string>
+    <string name="settings_default_customization">Restore customizations</string>
+    <string name="settings_default_customization_description">Restore colors to the default values</string>
     <string name="settings_googleplay">Rate on Google Play</string>
     <string name="settings_googleplay_description">Do you have a few seconds to rate this app? We want to hear your opinion</string>
     <string name="settings_about">Made with \u2665 from Spain</string>
 
     <!-- Toasts -->
-    <string name="tap_exit">Please tap again to exit</string>
+    <string name="tap_exit">Tap again to close the app</string>
 </resources>
diff --git a/app/src/main/res/xml/activity_settings.xml b/app/src/main/res/xml/activity_settings.xml
@@ -8,6 +8,10 @@
             android:title="@string/settings_delete_on_start"
             android:summary="@string/settings_delete_on_start_description"
             android:defaultValue="false" />
+        <Preference
+            android:key="prefDeleteAll"
+            android:title="@string/settings_delete_all"
+            android:summary="@string/settings_delete_all_description" />
     </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/settings_customizations">
@@ -18,14 +22,18 @@
             android:summary="@string/settings_primary_color_description"/>
         <yuku.ambilwarna.widget.AmbilWarnaPreference
             android:key="prefFABColor"
-            android:defaultValue="@color/pink"
+            android:defaultValue="@color/fab"
             android:title="@string/settings_fab_color"
             android:summary="@string/settings_fab_color_description"/>
         <CheckBoxPreference
             android:key="prefNavigationBlack"
             android:title="@string/settings_navigation_black"
             android:summary="@string/settings_navigation_black_description"
             android:defaultValue="false" />
+        <Preference
+            android:key="prefDefaultValues"
+            android:title="@string/settings_default_customization"
+            android:summary="@string/settings_default_customization_description" />
     </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/action_about">