From 66a2b41250996bc7a3ac1ad35b12749c04682e82 Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Wed, 29 Sep 2021 03:03:21 -0500
Subject: [PATCH] Target type: use dropdown instead of radio button

---
 .../habits/edit/EditHabitActivity.kt          | 35 ++++++++++++----
 .../main/res/layout/activity_edit_habit.xml   | 40 ++++++++-----------
 .../src/main/res/values/strings.xml           |  4 +-
 3 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
index 8bd84b98c..572917d10 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
@@ -88,6 +88,7 @@ class EditHabitActivity : AppCompatActivity() {
     var reminderHour = -1
     var reminderMin = -1
     var reminderDays: WeekdayList = WeekdayList.EVERY_DAY
+    var targetType = NumericalHabitType.AT_LEAST
 
     override fun onCreate(state: Bundle?) {
         super.onCreate(state)
@@ -107,6 +108,7 @@ class EditHabitActivity : AppCompatActivity() {
             color = habit.color
             freqNum = habit.frequency.numerator
             freqDen = habit.frequency.denominator
+            targetType = habit.targetType
             habit.reminder?.let {
                 reminderHour = it.hour
                 reminderMin = it.minute
@@ -117,10 +119,6 @@ class EditHabitActivity : AppCompatActivity() {
             binding.notesInput.setText(habit.description)
             binding.unitInput.setText(habit.unit)
             binding.targetInput.setText(habit.targetValue.toString())
-            if (habit.targetType == NumericalHabitType.AT_MOST) {
-                binding.targetTypeAtMost.isChecked = true
-                binding.targetTypeAtLeast.isChecked = false
-            }
         } else {
             habitType = HabitType.fromInt(intent.getIntExtra("habitType", HabitType.YES_NO.value))
         }
@@ -177,6 +175,23 @@ class EditHabitActivity : AppCompatActivity() {
             dialog.show(supportFragmentManager, "frequencyPicker")
         }
 
+        populateTargetType()
+        binding.targetTypePicker.setOnClickListener {
+            val builder = AlertDialog.Builder(this)
+            val arrayAdapter = ArrayAdapter<String>(this, android.R.layout.select_dialog_item)
+            arrayAdapter.add(getString(R.string.target_type_at_least))
+            arrayAdapter.add(getString(R.string.target_type_at_most))
+            builder.setAdapter(arrayAdapter) { dialog, which ->
+                targetType = when (which) {
+                    0 -> NumericalHabitType.AT_LEAST
+                    else -> NumericalHabitType.AT_MOST
+                }
+                populateTargetType()
+                dialog.dismiss()
+            }
+            builder.show()
+        }
+
         binding.numericalFrequencyPicker.setOnClickListener {
             val builder = AlertDialog.Builder(this)
             val arrayAdapter = ArrayAdapter<String>(this, android.R.layout.select_dialog_item)
@@ -267,10 +282,7 @@ class EditHabitActivity : AppCompatActivity() {
         habit.frequency = Frequency(freqNum, freqDen)
         if (habitType == HabitType.NUMERICAL) {
             habit.targetValue = targetInput.text.toString().toDouble()
-            if (binding.targetTypeAtLeast.isChecked)
-                habit.targetType = NumericalHabitType.AT_LEAST
-            else
-                habit.targetType = NumericalHabitType.AT_MOST
+            habit.targetType = targetType
             habit.unit = unitInput.text.trim().toString()
         }
         habit.type = habitType
@@ -332,6 +344,13 @@ class EditHabitActivity : AppCompatActivity() {
         }
     }
 
+    private fun populateTargetType() {
+        binding.targetTypePicker.text = when (targetType) {
+            NumericalHabitType.AT_MOST -> getString(R.string.target_type_at_most)
+            else -> getString(R.string.target_type_at_least)
+        }
+    }
+
     private fun updateColors() {
         androidColor = themeSwitcher.currentTheme.color(color).toInt()
         binding.colorButton.backgroundTintList = ColorStateList.valueOf(androidColor)
diff --git a/uhabits-android/src/main/res/layout/activity_edit_habit.xml b/uhabits-android/src/main/res/layout/activity_edit_habit.xml
index e30490bfb..75dddb551 100644
--- a/uhabits-android/src/main/res/layout/activity_edit_habit.xml
+++ b/uhabits-android/src/main/res/layout/activity_edit_habit.xml
@@ -167,29 +167,7 @@
                         android:hint="@string/measurable_units_example"/>
                 </LinearLayout>
             </FrameLayout>
-            <FrameLayout
-                android:id="@+id/targetTypeOuterBox"
-                style="@style/FormOuterBox">
-                <LinearLayout style="@style/FormInnerBox">
-                    <TextView
-                        style="@style/FormLabel"
-                        android:text="@string/target_type" />
-                    <RadioGroup
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-                        <RadioButton android:id="@+id/targetTypeAtLeast"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/target_type_at_least"
-                            android:checked="true"/>
-                        <RadioButton android:id="@+id/targetTypeAtMost"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/target_type_at_most"/>
-                    </RadioGroup>
-                </LinearLayout>
-            </FrameLayout>
+
             <LinearLayout
                 android:id="@+id/targetOuterBox"
                 android:layout_width="match_parent"
@@ -230,6 +208,22 @@
                 </FrameLayout>
             </LinearLayout>
 
+            <FrameLayout
+                android:id="@+id/targetTypeOuterBox"
+                style="@style/FormOuterBox">
+                <LinearLayout style="@style/FormInnerBox">
+                    <TextView
+                        style="@style/FormLabel"
+                        android:text="@string/target_type" />
+                    <TextView
+                        style="@style/FormDropdown"
+                        android:id="@+id/targetTypePicker"
+                        android:textColor="?attr/contrast100"
+                        />
+                </LinearLayout>
+            </FrameLayout>
+
+
             <!-- Reminder -->
             <FrameLayout style="@style/FormOuterBox">
                 <LinearLayout style="@style/FormInnerBox">
diff --git a/uhabits-android/src/main/res/values/strings.xml b/uhabits-android/src/main/res/values/strings.xml
index 8c5e9552a..13767b3df 100644
--- a/uhabits-android/src/main/res/values/strings.xml
+++ b/uhabits-android/src/main/res/values/strings.xml
@@ -185,8 +185,8 @@
     <string name="calendar">Calendar</string>
     <string name="unit">Unit</string>
     <string name="target_type">Target Type</string>
-    <string name="target_type_at_least">At Least</string>
-    <string name="target_type_at_most">At Most</string>
+    <string name="target_type_at_least">At least</string>
+    <string name="target_type_at_most">At most</string>
     <string name="example_question_boolean">e.g. Did you exercise today?</string>
     <string name="question">Question</string>
     <string name="target">Target</string>