diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt index 348dd4ee7..cfbbd81a5 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt @@ -33,9 +33,7 @@ class ListHabitsMenu @Inject constructor( private val preferences: Preferences, private val themeSwitcher: ThemeSwitcher, private val behavior: ListHabitsMenuBehavior -) : BaseMenu(activity), Preferences.Listener { - - private lateinit var topBarMenu: Menu +) : BaseMenu(activity){ override fun onCreate(menu: Menu) { val nightModeItem = menu.findItem(R.id.actionToggleNightMode) @@ -45,19 +43,6 @@ class ListHabitsMenu @Inject constructor( nightModeItem.isChecked = themeSwitcher.isNightMode hideArchivedItem.isChecked = !preferences.showArchived hideCompletedItem.isChecked = !preferences.showCompleted - - topBarMenu = menu - //the habit creation menu should be disabled when numeric habits are also disabled - if (!preferences.isNumericalHabitsFeatureEnabled) { - setCreateHabitMenuEnabled(false, menu) - } - //let the class add itself as listener - preferences.addListener(this) - } - - override fun onNumericalHabitsFeatureChanged() { - if(topBarMenu==null){return} - setCreateHabitMenuEnabled(preferences.isNumericalHabitsFeatureEnabled, topBarMenu) } override fun onItemSelected(item: MenuItem): Boolean { @@ -67,11 +52,6 @@ class ListHabitsMenu @Inject constructor( return true } - R.id.actionAdd -> { - behavior.onCreateHabit() - return true - } - R.id.actionCreateBooleanHabit -> { behavior.onCreateBooleanHabit() return true @@ -133,18 +113,5 @@ class ListHabitsMenu @Inject constructor( } } - /** - * @param enabled whether the create habit menu should be enabled or disabled - * @param menu a reference to the menu on which should be enabled or disabled - */ - fun setCreateHabitMenuEnabled(enabled: Boolean, menu: Menu) { - val habitCreationMenu = menu.findItem(R.id.actionAdd).subMenu - for (itemIndex: Int in 0 until habitCreationMenu.size()) { - val menuItem = habitCreationMenu.getItem(itemIndex) - menuItem.isEnabled = enabled - menuItem.isVisible = enabled - } - } - override fun getMenuResourceId() = R.menu.list_habits } diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt index a5ba91425..abcd91b02 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt @@ -147,23 +147,6 @@ class ListHabitsScreen activity.showDialog(dialog, "editHabit") } - override fun showCreateHabitScreen() { - if (!preferences.isNumericalHabitsFeatureEnabled) { - showCreateBooleanHabitScreen() - return - } - - val dialog = AlertDialog.Builder(activity) - .setTitle("Type of habit") - .setItems(R.array.habitTypes) { _, which -> - if (which == 0) showCreateBooleanHabitScreen() - else showCreateNumericalHabitScreen() - } - .create() - - dialog.show() - } - override fun showDeleteConfirmationScreen(callback: OnConfirmedCallback) { activity.showDialog(confirmDeleteDialogFactory.create(callback)) } diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt index 5572cbe51..cc7553deb 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt @@ -89,8 +89,6 @@ class SharedPreferencesStorage preferences.setNotificationsLed(getBoolean(key, false)) "pref_feature_sync" -> preferences.isSyncEnabled = getBoolean(key, false) - "pref_feature_numerical_habits" -> - preferences.isNumericalHabitsFeatureEnabled = getBoolean(key, false) } sharedPreferences.registerOnSharedPreferenceChangeListener(this) } diff --git a/android/uhabits-android/src/main/res/menu/list_habits.xml b/android/uhabits-android/src/main/res/menu/list_habits.xml index c03d2e5a2..82a3e20b4 100644 --- a/android/uhabits-android/src/main/res/menu/list_habits.xml +++ b/android/uhabits-android/src/main/res/menu/list_habits.xml @@ -32,12 +32,12 @@ + android:title="@string/yes_or_no"/> + android:title="@string/number"/> @@ -51,31 +51,31 @@ android:id="@+id/actionHideArchived" android:checkable="true" android:enabled="true" - android:title="@string/hide_archived" /> + android:title="@string/hide_archived"/> + android:title="@string/hide_completed"/> + android:title="@string/manually"/> + android:title="@string/by_name"/> + android:title="@string/by_color"/> + android:title="@string/by_score"/> @@ -87,23 +87,23 @@ android:enabled="true" android:orderInCategory="50" android:title="@string/night_mode" - app:showAsAction="never" /> + app:showAsAction="never"/> + app:showAsAction="never"/> + app:showAsAction="never"/> + app:showAsAction="never"/> diff --git a/android/uhabits-android/src/main/res/xml/preferences.xml b/android/uhabits-android/src/main/res/xml/preferences.xml index 8da5b9b2d..8be250740 100644 --- a/android/uhabits-android/src/main/res/xml/preferences.xml +++ b/android/uhabits-android/src/main/res/xml/preferences.xml @@ -153,11 +153,6 @@ android:key="pref_developer" android:title="Enable developer mode"/> - -