diff --git a/android/uhabits-android/src/main/AndroidManifest.xml b/android/uhabits-android/src/main/AndroidManifest.xml
index 66e733339..13d637217 100644
--- a/android/uhabits-android/src/main/AndroidManifest.xml
+++ b/android/uhabits-android/src/main/AndroidManifest.xml
@@ -85,7 +85,15 @@
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+
+
+
+
+
+
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
index e1a986294..a49430346 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
@@ -158,6 +158,7 @@ public class ShowHabitRootView extends BaseRootView
if(habit.isNumerical()) {
overviewCard.setVisibility(View.GONE);
+ streakCard.setVisibility(View.GONE);
} else {
targetCard.setVisibility(View.GONE);
}
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/BooleanHabitPickerDialog.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/BooleanHabitPickerDialog.kt
new file mode 100644
index 000000000..e7b2fe45f
--- /dev/null
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/BooleanHabitPickerDialog.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2016-2020 Álinson Santos Xavier
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+
+package org.isoron.uhabits.widgets.activities
+
+class BooleanHabitPickerDialog : HabitPickerDialog() {
+ override fun shouldHideNumerical() = true
+}
\ No newline at end of file
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
similarity index 91%
rename from android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt
rename to android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
index 0ff16d9ef..6bcb6bbe1 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Álinson Santos Xavier
+ * Copyright (C) 2016-2020 Álinson Santos Xavier
*
* This file is part of Loop Habit Tracker.
*
@@ -17,7 +17,7 @@
* with this program. If not, see .
*/
-package org.isoron.uhabits.widgets
+package org.isoron.uhabits.widgets.activities
import android.app.*
import android.appwidget.AppWidgetManager.*
@@ -27,14 +27,17 @@ import android.widget.*
import android.widget.AbsListView.*
import org.isoron.uhabits.*
import org.isoron.uhabits.core.preferences.*
+import org.isoron.uhabits.widgets.*
import java.util.*
-class HabitPickerDialog : Activity() {
+open class HabitPickerDialog : Activity() {
private var widgetId = 0
private lateinit var widgetPreferences: WidgetPreferences
private lateinit var widgetUpdater: WidgetUpdater
+ protected open fun shouldHideNumerical() = false
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val component = (applicationContext as HabitsApplication).component
@@ -48,6 +51,7 @@ class HabitPickerDialog : Activity() {
val habitNames = ArrayList()
for (h in habitList) {
if (h.isArchived) continue
+ if (h.isNumerical and shouldHideNumerical()) continue
habitIds.add(h.id!!)
habitNames.add(h.name)
}
diff --git a/android/uhabits-android/src/main/res/xml/widget_checkmark_info.xml b/android/uhabits-android/src/main/res/xml/widget_checkmark_info.xml
index 4541e5857..5e988f548 100644
--- a/android/uhabits-android/src/main/res/xml/widget_checkmark_info.xml
+++ b/android/uhabits-android/src/main/res/xml/widget_checkmark_info.xml
@@ -25,6 +25,6 @@
android:previewImage="@drawable/widget_preview_checkmark"
android:resizeMode="none"
android:updatePeriodMillis="3600000"
- android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
+ android:configure="org.isoron.uhabits.widgets.activities.HabitPickerDialog"
android:widgetCategory="home_screen">
\ No newline at end of file
diff --git a/android/uhabits-android/src/main/res/xml/widget_frequency_info.xml b/android/uhabits-android/src/main/res/xml/widget_frequency_info.xml
index 32a25906b..7869dd926 100644
--- a/android/uhabits-android/src/main/res/xml/widget_frequency_info.xml
+++ b/android/uhabits-android/src/main/res/xml/widget_frequency_info.xml
@@ -27,7 +27,7 @@
android:previewImage="@drawable/widget_preview_frequency"
android:resizeMode="vertical|horizontal"
android:updatePeriodMillis="3600000"
- android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
+ android:configure="org.isoron.uhabits.widgets.activities.HabitPickerDialog"
android:widgetCategory="home_screen">
\ No newline at end of file
diff --git a/android/uhabits-android/src/main/res/xml/widget_history_info.xml b/android/uhabits-android/src/main/res/xml/widget_history_info.xml
index 5b8d501af..0740f7f0f 100644
--- a/android/uhabits-android/src/main/res/xml/widget_history_info.xml
+++ b/android/uhabits-android/src/main/res/xml/widget_history_info.xml
@@ -27,7 +27,7 @@
android:previewImage="@drawable/widget_preview_history"
android:resizeMode="vertical|horizontal"
android:updatePeriodMillis="3600000"
- android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
+ android:configure="org.isoron.uhabits.widgets.activities.HabitPickerDialog"
android:widgetCategory="home_screen">
\ No newline at end of file
diff --git a/android/uhabits-android/src/main/res/xml/widget_score_info.xml b/android/uhabits-android/src/main/res/xml/widget_score_info.xml
index e2be33252..b7daf2d88 100644
--- a/android/uhabits-android/src/main/res/xml/widget_score_info.xml
+++ b/android/uhabits-android/src/main/res/xml/widget_score_info.xml
@@ -27,7 +27,7 @@
android:previewImage="@drawable/widget_preview_score"
android:resizeMode="vertical|horizontal"
android:updatePeriodMillis="3600000"
- android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
+ android:configure="org.isoron.uhabits.widgets.activities.HabitPickerDialog"
android:widgetCategory="home_screen">
\ No newline at end of file
diff --git a/android/uhabits-android/src/main/res/xml/widget_streak_info.xml b/android/uhabits-android/src/main/res/xml/widget_streak_info.xml
index 4ca86447f..4ef0c3458 100644
--- a/android/uhabits-android/src/main/res/xml/widget_streak_info.xml
+++ b/android/uhabits-android/src/main/res/xml/widget_streak_info.xml
@@ -27,7 +27,7 @@
android:previewImage="@drawable/widget_preview_streaks"
android:resizeMode="vertical|horizontal"
android:updatePeriodMillis="3600000"
- android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
+ android:configure="org.isoron.uhabits.widgets.activities.BooleanHabitPickerDialog"
android:widgetCategory="home_screen">
\ No newline at end of file