From e8238b5ed7067e3fb24ac9640e713af3a1e1fbed Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Mon, 28 Dec 2020 10:35:13 -0600
Subject: [PATCH] Enable widget stacks for all users

---
 .../widgets/activities/HabitPickerDialog.kt   | 41 ++++++-------------
 .../src/main/res/xml/preferences.xml          |  6 ---
 .../uhabits/core/preferences/Preferences.java |  5 ---
 3 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
index 1f5c5ee7c..d78975771 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
@@ -54,7 +54,6 @@ open class HabitPickerDialog : Activity() {
         super.onCreate(savedInstanceState)
         val component = (applicationContext as HabitsApplication).component
         val habitList = component.habitList
-        val preferences = component.preferences
         widgetPreferences = component.widgetPreferences
         widgetUpdater = component.widgetUpdater
         widgetId = intent.extras?.getInt(EXTRA_APPWIDGET_ID, INVALID_APPWIDGET_ID) ?: 0
@@ -79,35 +78,21 @@ open class HabitPickerDialog : Activity() {
         val listView = findViewById<ListView>(R.id.listView)
         val saveButton = findViewById<Button>(R.id.buttonSave)
 
-        if(preferences.isWidgetStackEnabled) {
-            with(listView) {
-                adapter = ArrayAdapter(context,
-                                       android.R.layout.simple_list_item_multiple_choice,
-                                       habitNames)
-                choiceMode = CHOICE_MODE_MULTIPLE
-                itemsCanFocus = false
-            }
-            saveButton.setOnClickListener {
-                val selectedIds = mutableListOf<Long>()
-                for (i in 0..listView.count) {
-                    if (listView.isItemChecked(i)) {
-                        selectedIds.add(habitIds[i])
-                    }
+        with(listView) {
+            adapter = ArrayAdapter(context,
+                                   android.R.layout.simple_list_item_multiple_choice,
+                                   habitNames)
+            choiceMode = CHOICE_MODE_MULTIPLE
+            itemsCanFocus = false
+        }
+        saveButton.setOnClickListener {
+            val selectedIds = mutableListOf<Long>()
+            for (i in 0..listView.count) {
+                if (listView.isItemChecked(i)) {
+                    selectedIds.add(habitIds[i])
                 }
-                confirm(selectedIds)
-            }
-        } else {
-            saveButton.visibility = GONE
-            with(listView) {
-                adapter = ArrayAdapter(context,
-                                       android.R.layout.simple_list_item_1,
-                                       habitNames)
-                choiceMode = CHOICE_MODE_SINGLE
-                itemsCanFocus = false
-            }
-            listView.setOnItemClickListener { _, _, position, _ ->
-                confirm(listOf(habitIds[position]))
             }
+            confirm(selectedIds)
         }
     }
 
diff --git a/android/uhabits-android/src/main/res/xml/preferences.xml b/android/uhabits-android/src/main/res/xml/preferences.xml
index 0f1e2d654..333fcd40d 100644
--- a/android/uhabits-android/src/main/res/xml/preferences.xml
+++ b/android/uhabits-android/src/main/res/xml/preferences.xml
@@ -222,12 +222,6 @@
                 android:title="Enable developer mode"
                 app:iconSpaceReserved="false" />
 
-        <CheckBoxPreference
-                android:defaultValue="false"
-                android:key="pref_feature_widget_stack"
-                android:title="Enable widget stacks"
-                app:iconSpaceReserved="false" />
-
         <EditTextPreference
             android:defaultValue="@string/syncBaseURL"
             android:key="pref_sync_base_url"
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 a7901871d..dd1260bf3 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
@@ -226,11 +226,6 @@ public class Preferences
         storage.putBoolean("pref_short_toggle", enabled);
     }
 
-    public boolean isWidgetStackEnabled()
-    {
-        return storage.getBoolean("pref_feature_widget_stack", false);
-    }
-
     public void removeListener(Listener listener)
     {
         listeners.remove(listener);