From 62dccbda49fc90a01c7d90c060d4488c56aaef37 Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 12 Aug 2019 16:56:40 +0200 Subject: [PATCH] Cleaned up code after review --- .../activities/habits/list/ListHabitsMenu.kt | 20 ------------------- .../uhabits/core/preferences/Preferences.java | 4 ---- 2 files changed, 24 deletions(-) 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 76be720f7..599bfdfa7 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 @@ -35,8 +35,6 @@ class ListHabitsMenu @Inject constructor( private val behavior: ListHabitsMenuBehavior ) : BaseMenu(activity), Preferences.Listener { - private lateinit var topBarMenu: Menu - override fun onCreate(menu: Menu) { val nightModeItem = menu.findItem(R.id.actionToggleNightMode) val hideArchivedItem = menu.findItem(R.id.actionHideArchived) @@ -45,10 +43,6 @@ class ListHabitsMenu @Inject constructor( nightModeItem.isChecked = themeSwitcher.isNightMode hideArchivedItem.isChecked = !preferences.showArchived hideCompletedItem.isChecked = !preferences.showCompleted - - topBarMenu = menu - //let the class add itself as listener - preferences.addListener(this) } override fun onItemSelected(item: MenuItem): Boolean { @@ -119,19 +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 - */ - @Deprecated(message = "This function was used to enable/disable the habit creation drop down menu, but since the feature is mostly implemented this is no longer necessary.") - 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-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java index 2d55d4e74..10abd9c51 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java @@ -336,10 +336,6 @@ public class Preferences default void onSyncFeatureChanged() { } - - default void onNumericalHabitsFeatureChanged() - { - } } public interface Storage