From 7b9282bfefbd7e8bf9df9cf87ccd498107b86685 Mon Sep 17 00:00:00 2001
From: Tanguy Herbron <tanguy.herbron@outlook.com>
Date: Thu, 5 Jul 2018 23:26:40 +0200
Subject: [PATCH] Rework settings activity

- Clearer settings activity
- Data import/export buttons
---
 .idea/caches/build_file_checksums.ser         | Bin 540 -> 540 bytes
 .idea/gradle.xml                              |   4 +-
 .idea/inspectionProfiles/Project_Default.xml  |  17 ------
 .idea/misc.xml                                |  12 ++--
 .idea/statistic.xml                           |  21 -------
 .idea/vcs.xml                                 |   2 +-
 .../moodl/Activities/SettingsActivity.java    |  47 ++++------------
 app/src/main/res/values-fr/strings.xml        |   6 ++
 app/src/main/res/values/strings.xml           |   9 +++
 app/src/main/res/xml/pref_general.xml         |  53 ------------------
 app/src/main/res/xml/pref_headers.xml         |  27 ---------
 app/src/main/res/xml/pref_main.xml            |  50 +++++++++++++++++
 12 files changed, 84 insertions(+), 164 deletions(-)
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/statistic.xml
 delete mode 100644 app/src/main/res/xml/pref_general.xml
 delete mode 100644 app/src/main/res/xml/pref_headers.xml
 create mode 100644 app/src/main/res/xml/pref_main.xml

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 3721cc08cd3e62bcd014ea22f78a45acc8fa9afe..b7963731466993ffdba52e8c194b033943dba50f 100644
GIT binary patch
delta 36
ucmV+<0NekZ1e^qrmjz^IQ;waHoOck?ey~jI%$7VqFqn+&Am+=HBLVp<D-k{b

delta 36
ucmV+<0NekZ1e^qrmjz?aqS=*^oOcio0&*f;rv6091;)N;Gn-PABLVp#P!H4q

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cbbf71c..a2421b7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-4.1" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-4.8.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 036bb5c..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="HardCodedStringLiteral" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreForAssertStatements" value="true" />
-      <option name="ignoreForExceptionConstructors" value="true" />
-      <option name="ignoreForSpecifiedExceptionConstructors" value="" />
-      <option name="ignoreForJUnitAsserts" value="true" />
-      <option name="ignoreForClassReferences" value="true" />
-      <option name="ignoreForPropertyKeyReferences" value="true" />
-      <option name="ignoreForNonAlpha" value="true" />
-      <option name="ignoreAssignedToConstants" value="false" />
-      <option name="ignoreToString" value="false" />
-      <option name="nonNlsCommentPattern" value="NON-NLS" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 119ebae..c0f68ed 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="org.greenrobot.eventbus.Subscribe" />
-    </list>
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="5">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
         </list>
       </value>
     </option>
diff --git a/.idea/statistic.xml b/.idea/statistic.xml
deleted file mode 100644
index 66820b8..0000000
--- a/.idea/statistic.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Statistic">
-    <option name="fileTypes" value="class;svn-base;svn-work;Extra;gif;png;jpg;jpeg;bmp;tga;tiff;ear;war;zip;jar;iml;iws;ipr;bz2;gz;gitignore;gradle;md;pro;properties;" />
-    <option name="excludedDirectories">
-      <list>
-        <option value="$PROJECT_DIR$/build" />
-        <option value="$PROJECT_DIR$/export" />
-        <option value="$PROJECT_DIR$/gource" />
-        <option value="$PROJECT_DIR$/gradle" />
-        <option value="$PROJECT_DIR$/libs" />
-        <option value="$PROJECT_DIR$/.idea" />
-        <option value="$PROJECT_DIR$/.gradle" />
-        <option value="$PROJECT_DIR$/app/build" />
-        <option value="$PROJECT_DIR$/app/release" />
-        <option value="$PROJECT_DIR$/app/src/androidTest" />
-        <option value="$PROJECT_DIR$/app/src/test" />
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/herbron/moodl/Activities/SettingsActivity.java b/app/src/main/java/com/herbron/moodl/Activities/SettingsActivity.java
index 1b1d874..0bc4912 100644
--- a/app/src/main/java/com/herbron/moodl/Activities/SettingsActivity.java
+++ b/app/src/main/java/com/herbron/moodl/Activities/SettingsActivity.java
@@ -19,6 +19,7 @@ import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
 import android.preference.RingtonePreference;
 import android.preference.SwitchPreference;
 import android.security.keystore.KeyGenParameterSpec;
@@ -139,6 +140,16 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setupActionBar();
+        addPreferencesFromResource(R.xml.pref_main);
+
+        findPreference("version").setSummary(BuildConfig.VERSION_NAME);
+
+        bindPreferenceSummaryToValue(findPreference("default_currency"));
+        bindPreferenceSummaryToValue(findPreference("minimum_value_displayed"));
+
+        EditTextPreference editTextPreference = (EditTextPreference) findPreference("minimum_value_displayed");
+        editTextPreference.setPositiveButtonText("Save");
+        editTextPreference.setNegativeButtonText("Cancel");
     }
 
     /**
@@ -166,7 +177,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
     @Override
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     public void onBuildHeaders(List<Header> target) {
-        loadHeadersFromResource(R.xml.pref_headers, target);
+        //loadHeadersFromResource(R.xml.pref_headers, target);
     }
 
     /**
@@ -175,43 +186,9 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
      */
     protected boolean isValidFragment(String fragmentName) {
         return PreferenceFragment.class.getName().equals(fragmentName)
-                || GeneralPreferenceFragment.class.getName().equals(fragmentName)
                 || ExchangePreferenceFragment.class.getName().equals(fragmentName);
     }
 
-    /**
-     * This fragment shows general preferences only. It is used when the
-     * activity is showing a two-pane settings UI.
-     */
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static class GeneralPreferenceFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_general);
-            setHasOptionsMenu(true);
-
-            findPreference("version").setSummary(BuildConfig.VERSION_NAME);
-
-            bindPreferenceSummaryToValue(findPreference("default_currency"));
-            bindPreferenceSummaryToValue(findPreference("minimum_value_displayed"));
-
-            EditTextPreference editTextPreference = (EditTextPreference) findPreference("minimum_value_displayed");
-            editTextPreference.setPositiveButtonText("Save");
-            editTextPreference.setNegativeButtonText("Cancel");
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            int id = item.getItemId();
-            if (id == android.R.id.home) {
-                //startActivity(new Intent(getActivity(), SettingsActivity.class));
-                return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
-    }
-
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     public static class ExchangePreferenceFragment extends PreferenceFragment {
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index fbf3e5e..18838a9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -89,4 +89,10 @@
     <string name="field_empty">Ce champ en peut pas être vide</string>
     <string name="field_nan">Ce champ doit être un nombre</string>
     <string name="field_negative">Ce champ doit être positif</string>
+    <string name="pref_title_category_display">Affichage</string>
+    <string name="pref_title_category_data_backup">Sauvegarde des données</string>
+    <string name="pref_title_category_other">Autre</string>
+    <string name="pref_title_version">Version</string>
+    <string name="pref_title_export">Exporter les entrées manuelles</string>
+    <string name="pref_title_import">Importer de nouvelles entrées</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bf6c00c..558ee8d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,8 +12,17 @@
     <string name="pref_title_hide_balance">Hide balance</string>
 
     <!-- Example settings for Data & Sync -->
+    <string name="pref_title_category_display">Display</string>
+    <string name="pref_title_category_data_backup">Data backup</string>
+    <string name="pref_title_category_other">Other</string>
+
     <string name="pref_title_minimum_amount_displayed">Minimum amount displayed</string>
 
+    <string name="pref_title_version">Version</string>
+
+    <string name="pref_title_export">Export manual entries</string>
+    <string name="pref_title_import">Import manual entries</string>
+
     <string name="pref_title_default_currency">Default currency</string>
     <string-array name="pref_default_currencies_titles">
         <item>Dollar (USD)</item>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
deleted file mode 100644
index b175af2..0000000
--- a/app/src/main/res/xml/pref_general.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!--<SwitchPreference
-        android:defaultValue="false"
-        android:key="hide_balance"
-        android:title="@string/pref_title_hide_balance" />-->
-
-    <ListPreference
-        android:defaultValue="USD"
-        android:entries="@array/pref_default_currencies_titles"
-        android:entryValues="@array/pref_default_currencies_values"
-        android:key="default_currency"
-        android:negativeButtonText="@null"
-        android:positiveButtonText="@null"
-        android:title="@string/pref_title_default_currency" />
-
-    <EditTextPreference
-        android:defaultValue="0"
-        android:key="minimum_value_displayed"
-        android:negativeButtonText="@null"
-        android:positiveButtonText="@null"
-        android:title="@string/pref_title_minimum_amount_displayed"
-        android:inputType="numberDecimal"
-        android:hint="Let blank for none" />
-
-    <PreferenceScreen android:title="Version"
-        android:key="version"/>
-
-    <!-- NOTE: EditTextPreference accepts EditText attributes. -->
-    <!-- NOTE: EditTextPreference's summary should be set to its value by the activity code. -->
-    <!--<EditTextPreference
-        android:capitalize="words"
-        android:defaultValue="@string/pref_default_display_name"
-        android:inputType="textCapWords"
-        android:key="example_text"
-        android:maxLines="1"
-        android:selectAllOnFocus="true"
-        android:singleLine="true"
-        android:title="@string/pref_title_display_name" />-->
-
-    <!-- NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
-         dismiss it. -->
-    <!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
-    <!--<ListPreference
-        android:defaultValue="-1"
-        android:entries="@array/pref_example_list_titles"
-        android:entryValues="@array/pref_example_list_values"
-        android:key="example_list"
-        android:negativeButtonText="@null"
-        android:positiveButtonText="@null"
-        android:title="@string/pref_title_add_friends_to_messages" />-->
-
-</PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml
deleted file mode 100644
index 4abbb27..0000000
--- a/app/src/main/res/xml/pref_headers.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- These settings headers are only used on tablets. -->
-
-    <header
-        android:fragment="com.herbron.moodl.Activities.SettingsActivity$GeneralPreferenceFragment"
-        android:icon="@drawable/ic_info_black_24dp"
-        android:title="@string/pref_header_general" />
-
-    <header
-        android:fragment="com.herbron.moodl.Activities.SettingsActivity$ExchangePreferenceFragment"
-        android:icon="@drawable/ic_developer_board_black_24dp"
-        android:title="@string/pref_header_exchange" />
-
-    <!--<header
-        android:fragment="com.nauk.crystalvault.Activities.SettingsActivity$NotificationPreferenceFragment"
-        android:icon="@drawable/ic_notifications_black_24dp"
-        android:title="@string/pref_header_notifications" />
-
-    <header
-        android:fragment="com.nauk.crystalvault.Activities.SettingsActivity$DataSyncPreferenceFragment"
-        android:icon="@drawable/ic_sync_black_24dp"
-        android:title="@string/pref_header_data_sync" />-->
-
-</preference-headers>
-
-
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
new file mode 100644
index 0000000..43563a8
--- /dev/null
+++ b/app/src/main/res/xml/pref_main.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+        android:title="@string/pref_title_category_display">
+
+        <ListPreference
+            android:defaultValue="USD"
+            android:entries="@array/pref_default_currencies_titles"
+            android:entryValues="@array/pref_default_currencies_values"
+            android:key="default_currency"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:title="@string/pref_title_default_currency" />
+
+        <EditTextPreference
+            android:defaultValue="0"
+            android:key="minimum_value_displayed"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:title="@string/pref_title_minimum_amount_displayed"
+            android:inputType="numberDecimal"
+            android:hint="Let blank for none" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_title_category_data_backup">
+
+        <PreferenceScreen android:title="@string/pref_title_export"
+            android:key="export"/>
+
+        <PreferenceScreen android:title="@string/pref_title_import"
+            android:key="import"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_title_category_other">
+
+        <Preference
+            android:fragment="com.herbron.moodl.Activities.SettingsActivity$ExchangePreferenceFragment"
+            android:title="@string/pref_header_exchange" />
+
+        <PreferenceScreen android:title="@string/pref_title_version"
+            android:key="version"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file