Merge branch 'isse_1857_reset_measurable_entry' into dev

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberDialog.kt

@@ -36,16 +36,17 @@ class NumberDialog : AppCompatDialogFragment() {
         val appComponent = (requireActivity().application as HabitsApplication).component
         val prefs = appComponent.preferences
         view = CheckmarkPopupBinding.inflate(LayoutInflater.from(context))
-        arrayOf(view.yesBtn, view.skipBtn).forEach {
+        arrayOf(view.yesBtn).forEach {
             it.setTextColor(requireArguments().getInt("color"))
         }
-        arrayOf(view.noBtn, view.unknownBtn).forEach {
+        arrayOf(view.noBtn, view.unknownBtnNumber).forEach {
             it.setTextColor(view.root.sres.getColor(R.attr.contrast60))
         }
-        arrayOf(view.yesBtn, view.noBtn, view.skipBtn, view.unknownBtn).forEach {
+        arrayOf(view.yesBtn, view.noBtn, view.unknownBtnNumber).forEach {
             it.typeface = InterfaceUtils.getFontAwesome(requireContext())
         }
         if (!prefs.isSkipEnabled) view.skipBtnNumber.visibility = View.GONE
+        if (!prefs.areQuestionMarksEnabled) view.unknownBtnNumber.visibility = View.GONE
         view.numberButtons.visibility = View.VISIBLE
         fixDecimalSeparator(view)
         originalNotes = requireArguments().getString("notes")!!
@@ -71,6 +72,12 @@ class NumberDialog : AppCompatDialogFragment() {
             view.value.setText(DecimalFormat("#.###").format((Entry.SKIP.toDouble() / 1000)))
             save()
         }
+
+        view.unknownBtnNumber.setOnClickListener {
+            view.value.setText(DecimalFormat("#.###").format((Entry.UNKNOWN.toDouble() / 1000)))
+            save()
+        }
+
         view.notes.setOnEditorActionListener { v, actionId, event ->
             save()
             true

uhabits-android/src/main/res/layout/checkmark_popup.xml

@@ -23,32 +23,32 @@
     android:id="@+id/container"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:minHeight="128dp"
+    android:background="@drawable/checkmark_dialog_bg"
     android:minWidth="208dp"
-    app:divider="@drawable/checkmark_dialog_divider"
-    app:showDividers="middle"
+    android:minHeight="128dp"
     android:orientation="vertical"
-    android:background="@drawable/checkmark_dialog_bg">
+    app:divider="@drawable/checkmark_dialog_divider"
+    app:showDividers="middle">
 
     <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/notes"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:gravity="center"
-        android:inputType="textCapSentences|textMultiLine"
-        android:textSize="@dimen/smallTextSize"
-        android:padding="4dp"
         android:background="@color/transparent"
+        android:gravity="center"
         android:hint="@string/notes"
-        android:text="" />
+        android:inputType="textCapSentences|textMultiLine"
+        android:padding="4dp"
+        android:text=""
+        android:textSize="@dimen/smallTextSize" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/booleanButtons"
-        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:orientation="horizontal"
+        android:visibility="gone"
         app:divider="@drawable/checkmark_dialog_divider"
         app:showDividers="middle">
 
@@ -75,10 +75,10 @@
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/numberButtons"
-        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:orientation="horizontal"
+        android:visibility="gone"
         app:divider="@drawable/checkmark_dialog_divider"
         app:showDividers="middle">
 
@@ -86,21 +86,26 @@
             android:id="@+id/value"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1"
+            android:layout_weight="2"
             android:background="@color/transparent"
-            android:textAlignment="center"
             android:inputType="numberDecimal"
             android:selectAllOnFocus="true"
+            android:textAlignment="center"
             android:textSize="@dimen/smallTextSize" />
 
+        <TextView
+            android:id="@+id/saveBtn"
+            style="@style/NumericalPopupBtn"
+            android:text="@string/save" />
+
         <TextView
             android:id="@+id/skipBtnNumber"
             style="@style/NumericalPopupBtn"
             android:text="@string/skip_day" />
 
         <TextView
-            android:id="@+id/saveBtn"
-            style="@style/NumericalPopupBtn"
-            android:text="@string/save" />
+            android:id="@+id/unknownBtnNumber"
+            style="@style/CheckmarkPopupBtn"
+            android:text="@string/fa_question" />
     </androidx.appcompat.widget.LinearLayoutCompat>
 </androidx.appcompat.widget.LinearLayoutCompat>