isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed the "numerical habits enabled" setting

Browse Source
pull/498/head
thomas 6 years ago
parent ef22fd8dce
commit c60b2e0511
8 changed files with 13 additions and 85 deletions
Show Stats Download Patch File Download Diff File

16
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt
Unescape View File

@ -46,21 +46,11 @@ class ListHabitsMenu @Inject constructor(
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 {
when (item.itemId) {
R.id.actionToggleNightMode -> {
@ -68,11 +58,6 @@ class ListHabitsMenu @Inject constructor(
return true
}
R.id.actionAdd -> {
behavior.onCreateHabit()
return true
}
R.id.actionCreateBooleanHabit -> {
behavior.onCreateBooleanHabit()
return true
@ -138,6 +123,7 @@ 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()) {

17
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
Unescape View File

@ -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))
}

2
android/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt
Unescape View File

@ -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)
}

24
android/uhabits-android/src/main/res/menu/list_habits.xml
Unescape View File

@ -32,12 +32,12 @@
<item
android:id="@+id/actionCreateBooleanHabit"
android:enabled="true"
android:title="@string/yes_or_no" />
android:title="@string/yes_or_no"/>
<item
android:id="@+id/actionCreateNumeralHabit"
android:enabled="true"
android:title="@string/number" />
android:title="@string/number"/>
</menu>
</item>
@ -51,31 +51,31 @@
android:id="@+id/actionHideArchived"
android:checkable="true"
android:enabled="true"
android:title="@string/hide_archived" />
android:title="@string/hide_archived"/>
<item
android:id="@+id/actionHideCompleted"
android:checkable="true"
android:enabled="true"
android:title="@string/hide_completed" />
android:title="@string/hide_completed"/>
<item android:title="@string/sort">
<menu>
<item
android:id="@+id/actionSortManual"
android:title="@string/manually" />
android:title="@string/manually"/>
<item
android:id="@+id/actionSortName"
android:title="@string/by_name" />
android:title="@string/by_name"/>
<item
android:id="@+id/actionSortColor"
android:title="@string/by_color" />
android:title="@string/by_color"/>
<item
android:id="@+id/actionSortScore"
android:title="@string/by_score" />
android:title="@string/by_score"/>
</menu>
</item>
</menu>
@ -87,23 +87,23 @@
android:enabled="true"
android:orderInCategory="50"
android:title="@string/night_mode"
app:showAsAction="never" />
app:showAsAction="never"/>
<item
android:id="@+id/actionSettings"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never" />
app:showAsAction="never"/>
<item
android:id="@+id/actionFAQ"
android:orderInCategory="100"
android:title="@string/help"
app:showAsAction="never" />
app:showAsAction="never"/>
<item
android:id="@+id/actionAbout"
android:orderInCategory="100"
android:title="@string/about"
app:showAsAction="never" />
app:showAsAction="never"/>
</menu>

5
android/uhabits-android/src/main/res/xml/preferences.xml
Unescape View File

@ -153,11 +153,6 @@
android:key="pref_developer"
android:title="Enable developer mode"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_feature_numerical_habits"
android:title="Enable numerical habits"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_feature_sync"

11
android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java
Unescape View File

@ -224,17 +224,6 @@ public class Preferences
storage.putBoolean("pref_first_run", isFirstRun);
}
public boolean isNumericalHabitsFeatureEnabled()
{
return storage.getBoolean("pref_feature_numerical_habits", false);
}
public void setNumericalHabitsFeatureEnabled(boolean enabled)
{
storage.putBoolean("pref_feature_numerical_habits", enabled);
for (Listener l : listeners) l.onNumericalHabitsFeatureChanged();
}
public boolean isPureBlackEnabled()
{
return storage.getBoolean("pref_pure_black", false);

15
android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java
Unescape View File

@ -61,19 +61,6 @@ public class ListHabitsMenuBehavior
updateAdapterFilter();
}
/**
* This function is called when a new habit should be created. (A dialog will be created)
* When only a single type of habit type exists (e.g. the numeral habits feature is disabled) a menu is spawned directly.
* If this is not the case however, a dropdown menu is shown.
*/
public void onCreateHabit()
{
if(!preferences.isNumericalHabitsFeatureEnabled())
{
screen.showCreateHabitScreen();
}
}
public void onCreateBooleanHabit()
{
screen.showCreateBooleanHabitScreen();
@ -163,8 +150,6 @@ public class ListHabitsMenuBehavior
void showAboutScreen();
void showCreateHabitScreen();
void showCreateBooleanHabitScreen();
void showCreateNumericalHabitScreen();

8
android/uhabits-core/src/test/java/org/isoron/uhabits/core/preferences/PreferencesTest.java
Unescape View File

@ -196,14 +196,6 @@ public class PreferencesTest extends BaseUnitTest
assertTrue(prefs.isShortToggleEnabled());
}
@Test
public void testNumericalHabits() throws Exception
{
assertFalse(prefs.isNumericalHabitsFeatureEnabled());
prefs.setNumericalHabitsFeatureEnabled(true);
assertTrue(prefs.isNumericalHabitsFeatureEnabled());
}
@Test
public void testDeveloper() throws Exception
{

Write Preview
Loading…
Cancel
Save