From 1df9cc7664c9f896ddedff8ecfd5f2f35afb0d1f Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Mon, 1 May 2023 18:52:53 -0500 Subject: [PATCH] Widgets: Remove option to create StackWidgets StackWidgets have been unfortunately been very unreliable on multiple phones, and fixing it does not appear to be simple. This commit removes the ability to create new StackWidgets, but existing ones should remain functional. --- .../widgets/activities/HabitPickerDialog.kt | 16 +++------------- .../res/layout/widget_configure_activity.xml | 6 ------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt index ff743816b..67ad8ae2d 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt @@ -24,7 +24,6 @@ import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID import android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID import android.content.Intent import android.os.Bundle -import android.widget.AbsListView.CHOICE_MODE_MULTIPLE import android.widget.ArrayAdapter import android.widget.Button import android.widget.ListView @@ -34,7 +33,6 @@ import org.isoron.uhabits.R import org.isoron.uhabits.activities.AndroidThemeSwitcher import org.isoron.uhabits.core.preferences.WidgetPreferences import org.isoron.uhabits.widgets.WidgetUpdater -import java.util.ArrayList class BooleanHabitPickerDialog : HabitPickerDialog() { override fun shouldHideNumerical() = true @@ -88,20 +86,12 @@ open class HabitPickerDialog : Activity() { with(listView) { adapter = ArrayAdapter( context, - android.R.layout.simple_list_item_multiple_choice, + android.R.layout.simple_list_item_1, habitNames ) - choiceMode = CHOICE_MODE_MULTIPLE - itemsCanFocus = false - } - saveButton.setOnClickListener { - val selectedIds = mutableListOf() - for (i in 0..listView.count) { - if (listView.isItemChecked(i)) { - selectedIds.add(habitIds[i]) - } + setOnItemClickListener { parent, view, position, id -> + confirm(mutableListOf(habitIds[position])) } - confirm(selectedIds) } } diff --git a/uhabits-android/src/main/res/layout/widget_configure_activity.xml b/uhabits-android/src/main/res/layout/widget_configure_activity.xml index ac32d91e9..ba7053467 100644 --- a/uhabits-android/src/main/res/layout/widget_configure_activity.xml +++ b/uhabits-android/src/main/res/layout/widget_configure_activity.xml @@ -30,10 +30,4 @@ android:layout_weight="1"> -