Added conditions in application listeners

In order for the buttons to work the listeners must listen to the right android key in the xml

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt

@@ -49,12 +49,14 @@ const val RESULT_BUG_REPORT = 4
 const val RESULT_REPAIR_DB = 5
 const val REQUEST_OPEN_DOCUMENT = 6
 const val REQUEST_SETTINGS = 7
+const val RESET_HABITS = 8
 
 @ActivityScope
 class ListHabitsScreen
 @Inject constructor(
         activity: BaseActivity,
         rootView: ListHabitsRootView,
+        private val habitList: HabitList,
         private val commandRunner: CommandRunner,
         private val intentFactory: IntentFactory,
         private val themeSwitcher: ThemeSwitcher,
@@ -118,12 +120,14 @@ class ListHabitsScreen
     }
 
     private fun onSettingsResult(resultCode: Int) {
+        val liist = habitList.getFiltered(HabitMatcher(true,true,true))
         when (resultCode) {
             RESULT_IMPORT_DATA -> showImportScreen()
             RESULT_EXPORT_CSV -> behavior.get().onExportCSV()
             RESULT_EXPORT_DB -> onExportDB()
             RESULT_BUG_REPORT -> behavior.get().onSendBugReport()
             RESULT_REPAIR_DB -> behavior.get().onRepairDB()
+            RESET_HABITS -> ResetHabitsCommand(liist, liist.toList()).execute()
         }
     }
 

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java

@@ -93,6 +93,8 @@ public class SettingsFragment extends PreferenceFragmentCompat
         setResultOnPreferenceClick("exportDB", RESULT_EXPORT_DB);
         setResultOnPreferenceClick("repairDB", RESULT_REPAIR_DB);
         setResultOnPreferenceClick("bugReport", RESULT_BUG_REPORT);
+        setResultOnPreferenceClick("resetHabits", RESET_HABITS);
+
     }
 
     @Override

android/uhabits-android/src/main/res/menu/list_habits_selection.xml

@@ -50,5 +50,8 @@
         android:id="@+id/action_notify"
         android:title="@string/reminder"
         app:showAsAction="never"/>
-
+    <item
+        android:id="@+id/action_reset"
+        android:title="@string/reset"
+        app:showAsAction="never" />
 </menu>

android/uhabits-android/src/main/res/values/strings.xml

@@ -246,5 +246,7 @@
     <string name="default_reminder_question">Have you completed this habit today?</string>
     <string name="notes">Notes</string>
     <string name="example_notes">You can put whatever you want here!</string>
+    <string name="Reset">reset</string>
+    <string name="reset">Reset</string>
 
 </resources>

android/uhabits-android/src/main/res/xml/preferences.xml

@@ -134,18 +134,18 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-            android:key="pref_key_debug"
-            android:title="@string/troubleshooting">
+        android:key="pref_key_debug"
+        android:title="@string/troubleshooting">
 
         <Preference
-                android:key="bugReport"
-                android:title="@string/generate_bug_report"
-                app:iconSpaceReserved="false" />
+            android:key="bugReport"
+            android:title="@string/generate_bug_report"
+            app:iconSpaceReserved="false" />
 
         <Preference
-                android:key="repairDB"
-                android:title="@string/repair_database"
-                app:iconSpaceReserved="false" />
+            android:key="repairDB"
+            android:title="@string/repair_database"
+            app:iconSpaceReserved="false" />
 
     </PreferenceCategory>
 

android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java

@@ -126,7 +126,14 @@ public class ListHabitsBehavior
             screen.showMessage(Message.DATABASE_REPAIRED);
         });
     }
-
+    public void onResetHabits()
+    {
+        taskRunner.execute(() ->
+        {
+            habitList.repair();
+            screen.showMessage(Message.DATABASE_REPAIRED);
+        });
+    }
     public void onSendBugReport()
     {
         bugReporter.dumpBugReportToFile();