From 2972138d2a78a1f4c98a5d6313cb2302b463e3d7 Mon Sep 17 00:00:00 2001
From: swissalpine <hauptpost@gmail.com>
Date: Tue, 10 Apr 2018 22:14:52 +0200
Subject: [PATCH] Fix for black number and labels on black background (aaps
 wear)

---
 .../res/layout/action_editplusminus_item.xml  | 45 ++++++++++---------
 .../action_editplusminus_item_below.xml       | 10 +++--
 .../action_editplusminus_item_quicklefty.xml  | 45 ++++++++++---------
 .../action_editplusminus_item_quickrighty.xml | 45 ++++++++++---------
 .../action_editplusminus_item_viktoria.xml    |  2 +
 .../main/res/layout/action_toggle_item.xml    |  4 +-
 6 files changed, 83 insertions(+), 68 deletions(-)

diff --git a/wear/src/main/res/layout/action_editplusminus_item.xml b/wear/src/main/res/layout/action_editplusminus_item.xml
index 38336ff903..8ea1826e77 100644
--- a/wear/src/main/res/layout/action_editplusminus_item.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item.xml
@@ -26,28 +26,31 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center">
-        <EditText
-            android:id="@+id/amountfield"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:inputType="numberDecimal"
-            android:minWidth="50dp"
-            android:padding="10dp"
-            android:text="112"
-            android:textSize="45sp"
-            android:cursorVisible="false"
-            android:gravity="center_horizontal" />
 
-        <TextView
-            android:id="@+id/label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="label"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:gravity="center"
-            android:textSize="25sp" />
+            <EditText
+                android:id="@+id/amountfield"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:cursorVisible="false"
+                android:gravity="center_horizontal"
+                android:inputType="numberDecimal"
+                android:minWidth="50dp"
+                android:padding="10dp"
+                android:text="112"
+                android:textColor="@color/white"
+                android:textSize="45sp" />
+
+            <TextView
+                android:id="@+id/label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="label"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/white"
+                android:textSize="25sp" />
         </LinearLayout>
         <ImageView
             android:id="@+id/plusbutton"
diff --git a/wear/src/main/res/layout/action_editplusminus_item_below.xml b/wear/src/main/res/layout/action_editplusminus_item_below.xml
index 2f2beb50dc..3b0ca0d835 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_below.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_below.xml
@@ -16,21 +16,23 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:cursorVisible="false"
+            android:gravity="center"
             android:inputType="numberDecimal"
             android:minWidth="50dp"
             android:text="112"
-            android:textSize="45sp"
-            android:cursorVisible="false"
-            android:gravity="center" />
+            android:textColor="@color/white"
+            android:textSize="45sp" />
 
         <TextView
             android:id="@+id/label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:gravity="center"
             android:text="label"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:gravity="center"
+            android:textColor="@color/white"
             android:textSize="25sp" />
 
         <LinearLayout
diff --git a/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml b/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
index 89eedd569b..defa4d274d 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
@@ -27,28 +27,31 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center">
-        <EditText
-            android:id="@+id/amountfield"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:inputType="numberDecimal"
-            android:minWidth="100dp"
-            android:paddingTop="10dp"
-            android:text="112"
-            android:textSize="45sp"
-            android:cursorVisible="false"
-            android:gravity="center_horizontal" />
 
-        <TextView
-            android:id="@+id/label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="label"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:gravity="center"
-            android:textSize="25sp" />
+            <EditText
+                android:id="@+id/amountfield"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:cursorVisible="false"
+                android:gravity="center_horizontal"
+                android:inputType="numberDecimal"
+                android:minWidth="100dp"
+                android:paddingTop="10dp"
+                android:text="112"
+                android:textColor="@color/white"
+                android:textSize="45sp" />
+
+            <TextView
+                android:id="@+id/label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="label"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/white"
+                android:textSize="25sp" />
 
             <ImageView
                 android:id="@+id/minusbutton"
diff --git a/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml b/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
index 305aa32d40..31c6251f4b 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
@@ -17,28 +17,31 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center">
-        <EditText
-            android:id="@+id/amountfield"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:inputType="numberDecimal"
-            android:minWidth="100dp"
-            android:paddingTop="10dp"
-            android:text="112"
-            android:textSize="45sp"
-            android:cursorVisible="false"
-            android:gravity="center_horizontal" />
 
-        <TextView
-            android:id="@+id/label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="label"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:gravity="center"
-            android:textSize="25sp" />
+            <EditText
+                android:id="@+id/amountfield"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:cursorVisible="false"
+                android:gravity="center_horizontal"
+                android:inputType="numberDecimal"
+                android:minWidth="100dp"
+                android:paddingTop="10dp"
+                android:text="112"
+                android:textColor="@color/white"
+                android:textSize="45sp" />
+
+            <TextView
+                android:id="@+id/label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:text="label"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/white"
+                android:textSize="25sp" />
 
             <ImageView
                 android:id="@+id/minusbutton"
diff --git a/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml b/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml
index cef730a62d..24bdd2d0d3 100644
--- a/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml
+++ b/wear/src/main/res/layout/action_editplusminus_item_viktoria.xml
@@ -24,6 +24,7 @@
                 android:rotation="90"
                 android:text="label"
                 android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/white"
                 android:textSize="25sp" />
 
             <LinearLayout
@@ -53,6 +54,7 @@
                     android:minWidth="50dp"
                     android:padding="10dp"
                     android:text="112"
+                    android:textColor="@color/white"
                     android:textSize="45sp" />
 
                 <ImageView
diff --git a/wear/src/main/res/layout/action_toggle_item.xml b/wear/src/main/res/layout/action_toggle_item.xml
index e36930b422..622ee30d64 100644
--- a/wear/src/main/res/layout/action_toggle_item.xml
+++ b/wear/src/main/res/layout/action_toggle_item.xml
@@ -10,14 +10,16 @@
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:gravity="center">
+
         <TextView
             android:id="@+id/label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:gravity="center"
             android:text="label"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:gravity="center"/>
+            android:textColor="@color/white" />
         <ImageView
             android:id="@+id/togglebutton"
             android:layout_width="wrap_content"