From 778fbf2581db3d3dfac663f3d6b563e5dde6cb2c Mon Sep 17 00:00:00 2001
From: Andries Smit <mr.andries.smit@gmail.com>
Date: Mon, 21 Mar 2022 10:53:52 +0100
Subject: [PATCH] fix: number picker image button

---
 .../layout/number_picker_layout_vertical.xml  | 14 +++-----
 .../androidaps/utils/ui/NumberPicker.kt       |  5 +--
 core/src/main/res/drawable/ic_minus.xml       | 10 ++++++
 core/src/main/res/drawable/ic_plus.xml        | 10 ++++++
 .../main/res/layout/number_picker_layout.xml  | 34 +++++++------------
 5 files changed, 41 insertions(+), 32 deletions(-)
 create mode 100644 core/src/main/res/drawable/ic_minus.xml
 create mode 100644 core/src/main/res/drawable/ic_plus.xml

diff --git a/app/src/main/res/layout/number_picker_layout_vertical.xml b/app/src/main/res/layout/number_picker_layout_vertical.xml
index 240333831f..99b5063235 100644
--- a/app/src/main/res/layout/number_picker_layout_vertical.xml
+++ b/app/src/main/res/layout/number_picker_layout_vertical.xml
@@ -6,14 +6,12 @@
     android:background="@drawable/background_total"
     android:orientation="vertical">
 
-    <Button
+    <ImageButton
         android:id="@+id/increment"
         android:layout_width="match_parent"
         android:layout_height="30dp"
         android:background="@color/transparent"
-        android:padding="0dp"
-        android:text="+"
-        android:textSize="20sp" />
+        android:src="@drawable/ic_minus" />
 
     <EditText
         android:id="@+id/display"
@@ -24,15 +22,13 @@
         android:imeOptions="actionDone"
         android:inputType="number"
         android:textColor="?attr/numPickerText"
-        android:text="1" />
+        tools:text="1" />
 
-    <Button
+    <ImageButton
         android:id="@+id/decrement"
         android:layout_width="match_parent"
         android:layout_height="30dp"
         android:background="@color/transparent"
-        android:padding="0dp"
-        android:text="—"
-        android:textStyle="bold" />
+        android:src="@drawable/ic_plus" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.kt b/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.kt
index dcf34b8107..f69da340a6 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.kt
@@ -20,6 +20,7 @@ import android.view.accessibility.AccessibilityManager
 import android.view.inputmethod.InputMethodManager
 import android.widget.Button
 import android.widget.EditText
+import android.widget.ImageButton
 import android.widget.LinearLayout
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.ToastUtils
@@ -39,8 +40,8 @@ open class NumberPicker(context: Context, attrs: AttributeSet? = null) : LinearL
     }
 
     var editText: EditText? = null
-    private var minusButton: Button? = null
-    private var plusButton: Button? = null
+    private var minusButton: ImageButton? = null
+    private var plusButton: ImageButton? = null
     var currentValue = 0.0
     var minValue = 0.0
     var maxValue = 1.0
diff --git a/core/src/main/res/drawable/ic_minus.xml b/core/src/main/res/drawable/ic_minus.xml
new file mode 100644
index 0000000000..e49e52d1d4
--- /dev/null
+++ b/core/src/main/res/drawable/ic_minus.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M 19 13 h -14 v -2 h 14 V 13 z" />
+</vector>
diff --git a/core/src/main/res/drawable/ic_plus.xml b/core/src/main/res/drawable/ic_plus.xml
new file mode 100644
index 0000000000..9eb39c3598
--- /dev/null
+++ b/core/src/main/res/drawable/ic_plus.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+</vector>
diff --git a/core/src/main/res/layout/number_picker_layout.xml b/core/src/main/res/layout/number_picker_layout.xml
index f42f19ff35..0ebb24a3ba 100644
--- a/core/src/main/res/layout/number_picker_layout.xml
+++ b/core/src/main/res/layout/number_picker_layout.xml
@@ -3,40 +3,32 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="130dp"
     android:layout_height="40dp"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="horizontal"
-    android:background="@drawable/background_total">
+    android:background="@drawable/background_total"
+    android:orientation="horizontal">
 
-    <Button
+    <ImageButton
         android:id="@+id/decrement"
         android:layout_width="30dp"
         android:layout_height="match_parent"
-        android:padding="0dp"
-        android:background="@android:color/transparent"
-        app:backgroundTint="@android:color/transparent"
-        android:textStyle="bold"
-        android:text="-"
-        tools:ignore="HardcodedText" />
+        android:background="@color/transparent"
+        android:src="@drawable/ic_minus" />
 
     <EditText
         android:id="@+id/display"
         android:layout_width="70dp"
-        android:background="@drawable/border_gray"
         android:layout_height="match_parent"
-        android:text="1"
-        android:inputType="number"
+        android:background="@drawable/border_gray"
         android:gravity="center"
         android:imeOptions="actionDone"
+        android:inputType="number"
         android:textColor="?attr/numPickerText"
-        tools:ignore="HardcodedText" />
-    <Button
+        tools:text="1" />
+
+    <ImageButton
         android:id="@+id/increment"
         android:layout_width="30dp"
         android:layout_height="match_parent"
-        android:padding="0dp"
-        android:textSize="25sp"
-        android:background="@android:color/transparent"
-        app:backgroundTint="@android:color/transparent"
-        android:text="+"
-        tools:ignore="HardcodedText" />
+        android:background="@color/transparent"
+        android:src="@drawable/ic_plus" />
+
 </LinearLayout>