From 93736af2984e79ba63137048a4941fe9e4c07439 Mon Sep 17 00:00:00 2001
From: oliexdev <olie.xdev@googlemail.com>
Date: Tue, 24 Nov 2020 06:45:02 +0100
Subject: [PATCH] fixed background and image colour in dark mode

---
 .../app/src/main/res/layout/slide_bluetooth.xml      | 12 ++++++------
 .../app/src/main/res/layout/slide_metrics.xml        |  8 ++++----
 .../app/src/main/res/layout/slide_opensource.xml     |  8 ++++----
 .../app/src/main/res/layout/slide_privacy.xml        |  8 ++++----
 .../app/src/main/res/layout/slide_support.xml        |  8 ++++----
 android_app/app/src/main/res/layout/slide_user.xml   | 12 ++++++------
 .../app/src/main/res/layout/slide_welcome.xml        |  6 +++---
 7 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/android_app/app/src/main/res/layout/slide_bluetooth.xml b/android_app/app/src/main/res/layout/slide_bluetooth.xml
index 19525dfb..8d7fd07a 100644
--- a/android_app/app/src/main/res/layout/slide_bluetooth.xml
+++ b/android_app/app/src/main/res/layout/slide_bluetooth.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@android:color/white">
+    android:background="?android:attr/windowBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -48,8 +48,8 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_marginBottom="40dp"
-            app:srcCompat="@drawable/ic_bluetooth_device_supported"
-            android:tint="@color/widgetTextColor"/>
+            app:tint="?android:attr/textColorSecondary"
+            app:srcCompat="@drawable/ic_bluetooth_device_supported" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -82,15 +82,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/flat_selector"
-            android:text="Add Bluetooth scale"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
+            android:text="Add Bluetooth scale"
             android:textColor="@android:color/white"
-            android:textSize="14sp"/>
+            android:textSize="14sp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="250px"/>
+            android:layout_marginBottom="250px" />
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/layout/slide_metrics.xml b/android_app/app/src/main/res/layout/slide_metrics.xml
index 629638fa..e4c3d0ed 100644
--- a/android_app/app/src/main/res/layout/slide_metrics.xml
+++ b/android_app/app/src/main/res/layout/slide_metrics.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    android:background="?android:attr/windowBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -48,8 +48,8 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_marginBottom="40dp"
-            app:srcCompat="@drawable/ic_preferences_graph"
-            android:tint="@color/widgetTextColor" />
+            app:tint="?android:attr/textColorSecondary"
+            app:srcCompat="@drawable/ic_preferences_graph" />
 
         <TextView
             android:id="@+id/slideMainText"
@@ -65,6 +65,6 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="250px"/>
+            android:layout_marginBottom="250px" />
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/layout/slide_opensource.xml b/android_app/app/src/main/res/layout/slide_opensource.xml
index 03bb70b2..42a10d8d 100644
--- a/android_app/app/src/main/res/layout/slide_opensource.xml
+++ b/android_app/app/src/main/res/layout/slide_opensource.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    android:background="?android:attr/windowBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -48,8 +48,8 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_marginBottom="40dp"
-            app:srcCompat="@drawable/ic_slide_opensource"
-            android:tint="@color/widgetTextColor" />
+            app:tint="?android:attr/textColorSecondary"
+            app:srcCompat="@drawable/ic_slide_opensource" />
 
         <TextView
             android:id="@+id/slideMainText"
@@ -65,7 +65,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="250px"/>
+            android:layout_marginBottom="250px" />
 
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/layout/slide_privacy.xml b/android_app/app/src/main/res/layout/slide_privacy.xml
index bd5920b7..bf49c28c 100644
--- a/android_app/app/src/main/res/layout/slide_privacy.xml
+++ b/android_app/app/src/main/res/layout/slide_privacy.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    android:background="?android:attr/windowBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -48,8 +48,8 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_marginBottom="40dp"
-            app:srcCompat="@drawable/ic_slide_privacy"
-            android:tint="@color/widgetTextColor" />
+            app:tint="?android:attr/textColorSecondary"
+            app:srcCompat="@drawable/ic_slide_privacy" />
 
         <TextView
             android:id="@+id/slideMainText"
@@ -65,6 +65,6 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="250px"/>
+            android:layout_marginBottom="250px" />
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/layout/slide_support.xml b/android_app/app/src/main/res/layout/slide_support.xml
index f4e25983..c521af13 100644
--- a/android_app/app/src/main/res/layout/slide_support.xml
+++ b/android_app/app/src/main/res/layout/slide_support.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    android:background="?android:attr/windowBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -48,8 +48,8 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_marginBottom="40dp"
-            app:srcCompat="@drawable/ic_slide_support"
-            android:tint="@color/widgetTextColor" />
+            app:tint="?android:attr/textColorSecondary"
+            app:srcCompat="@drawable/ic_slide_support" />
 
         <TextView
             android:id="@+id/slideMainText"
@@ -65,6 +65,6 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="250px"/>
+            android:layout_marginBottom="250px" />
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/layout/slide_user.xml b/android_app/app/src/main/res/layout/slide_user.xml
index d56fd3ca..d9241f65 100644
--- a/android_app/app/src/main/res/layout/slide_user.xml
+++ b/android_app/app/src/main/res/layout/slide_user.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@android:color/white">
+    android:background="?android:attr/windowBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -48,8 +48,8 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_marginBottom="40dp"
-            app:srcCompat="@drawable/ic_slide_group"
-            android:tint="@color/widgetTextColor" />
+            app:tint="?android:attr/textColorSecondary"
+            app:srcCompat="@drawable/ic_slide_group" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -72,15 +72,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/flat_selector"
-            android:text="@string/label_add_user"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
+            android:text="@string/label_add_user"
             android:textColor="@android:color/white"
-            android:textSize="14sp"/>
+            android:textSize="14sp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="250px"/>
+            android:layout_marginBottom="250px" />
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/layout/slide_welcome.xml b/android_app/app/src/main/res/layout/slide_welcome.xml
index ecb50276..c75dc9fe 100644
--- a/android_app/app/src/main/res/layout/slide_welcome.xml
+++ b/android_app/app/src/main/res/layout/slide_welcome.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    android:background="?android:attr/windowBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -23,8 +23,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="40dp"
-            android:text="@string/label_slide_welcome_top_text"
             android:gravity="center"
+            android:text="@string/label_slide_welcome_top_text"
             android:textSize="26sp"
             android:textStyle="bold" />
 
@@ -41,6 +41,6 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="250px"/>
+            android:layout_marginBottom="250px" />
     </LinearLayout>
 </ScrollView>
\ No newline at end of file