From 5d1801cb01878a2a4108d762f6e2f81435a57b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joris=20Pelgr=C3=B6m?= <jpelgrom@users.noreply.github.com>
Date: Mon, 19 Jun 2023 20:09:44 +0200
Subject: [PATCH] Set Wear theme background color to black (#3572)

* Set Wear theme background color to black

* Remove background color in individual screens
---
 .../phoneinstall/PhoneInstallView.kt          | 84 +++++++++----------
 .../main/res/layout/activity_integration.xml  |  1 -
 .../main/res/layout/activity_manual_setup.xml |  1 -
 .../main/res/layout/activity_onboarding.xml   |  1 -
 wear/src/main/res/layout/view_loading.xml     |  3 +-
 wear/src/main/res/values/colors.xml           |  2 +-
 6 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/wear/src/main/java/io/homeassistant/companion/android/onboarding/phoneinstall/PhoneInstallView.kt b/wear/src/main/java/io/homeassistant/companion/android/onboarding/phoneinstall/PhoneInstallView.kt
index 64dc10abb53..d7d7386d16a 100644
--- a/wear/src/main/java/io/homeassistant/companion/android/onboarding/phoneinstall/PhoneInstallView.kt
+++ b/wear/src/main/java/io/homeassistant/companion/android/onboarding/phoneinstall/PhoneInstallView.kt
@@ -1,8 +1,6 @@
 package io.homeassistant.companion.android.onboarding.phoneinstall
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -41,50 +39,48 @@ fun PhoneInstallView(
         },
         timeText = { TimeText(scalingLazyListState = scrollState) }
     ) {
-        Box(modifier = Modifier.background(MaterialTheme.colors.background)) {
-            ThemeLazyColumn(state = scrollState) {
-                item {
-                    Image(
-                        painter = painterResource(R.drawable.app_icon),
-                        contentDescription = null,
-                        modifier = Modifier.size(48.dp)
-                    )
-                }
-                item {
-                    Text(
-                        text = stringResource(commonR.string.install_phone_to_continue),
-                        style = MaterialTheme.typography.title3,
-                        textAlign = TextAlign.Center,
-                        modifier = Modifier.fillMaxWidth().padding(vertical = 16.dp)
-                    )
-                }
-                item {
-                    Button(
-                        onClick = onInstall,
-                        modifier = Modifier.fillMaxWidth()
-                    ) {
-                        Text(stringResource(commonR.string.install))
-                    }
+        ThemeLazyColumn(state = scrollState) {
+            item {
+                Image(
+                    painter = painterResource(R.drawable.app_icon),
+                    contentDescription = null,
+                    modifier = Modifier.size(48.dp)
+                )
+            }
+            item {
+                Text(
+                    text = stringResource(commonR.string.install_phone_to_continue),
+                    style = MaterialTheme.typography.title3,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.fillMaxWidth().padding(vertical = 16.dp)
+                )
+            }
+            item {
+                Button(
+                    onClick = onInstall,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    Text(stringResource(commonR.string.install))
                 }
-                item {
-                    Button(
-                        onClick = onRefresh,
-                        modifier = Modifier.fillMaxWidth(),
-                        colors = ButtonDefaults.secondaryButtonColors()
-                    ) {
-                        Text(stringResource(commonR.string.refresh))
-                    }
+            }
+            item {
+                Button(
+                    onClick = onRefresh,
+                    modifier = Modifier.fillMaxWidth(),
+                    colors = ButtonDefaults.secondaryButtonColors()
+                ) {
+                    Text(stringResource(commonR.string.refresh))
                 }
-                item {
-                    Button(
-                        onClick = onAdvanced,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(top = 16.dp),
-                        colors = ButtonDefaults.secondaryButtonColors()
-                    ) {
-                        Text(stringResource(commonR.string.advanced))
-                    }
+            }
+            item {
+                Button(
+                    onClick = onAdvanced,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(top = 16.dp),
+                    colors = ButtonDefaults.secondaryButtonColors()
+                ) {
+                    Text(stringResource(commonR.string.advanced))
                 }
             }
         }
diff --git a/wear/src/main/res/layout/activity_integration.xml b/wear/src/main/res/layout/activity_integration.xml
index 71cb2e63ee3..b8d555ff4d8 100644
--- a/wear/src/main/res/layout/activity_integration.xml
+++ b/wear/src/main/res/layout/activity_integration.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/black"
     android:padding="@dimen/box_inset_layout_padding"
     tools:context=".onboarding.integration.MobileAppIntegrationActivity"
     tools:deviceIds="wear">
diff --git a/wear/src/main/res/layout/activity_manual_setup.xml b/wear/src/main/res/layout/activity_manual_setup.xml
index d3baa90c648..a1dadfc9668 100644
--- a/wear/src/main/res/layout/activity_manual_setup.xml
+++ b/wear/src/main/res/layout/activity_manual_setup.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/black"
     android:padding="@dimen/box_inset_layout_padding"
     tools:deviceIds="wear">
 
diff --git a/wear/src/main/res/layout/activity_onboarding.xml b/wear/src/main/res/layout/activity_onboarding.xml
index 24b238e0e28..54681eae81b 100644
--- a/wear/src/main/res/layout/activity_onboarding.xml
+++ b/wear/src/main/res/layout/activity_onboarding.xml
@@ -5,7 +5,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:background="@android:color/black"
     android:layout_height="match_parent">
 
     <androidx.wear.widget.WearableRecyclerView
diff --git a/wear/src/main/res/layout/view_loading.xml b/wear/src/main/res/layout/view_loading.xml
index febd671d06f..eaddc499fff 100644
--- a/wear/src/main/res/layout/view_loading.xml
+++ b/wear/src/main/res/layout/view_loading.xml
@@ -4,8 +4,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center"
-    android:background="@android:color/black">
+    android:gravity="center">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/loading_text"
diff --git a/wear/src/main/res/values/colors.xml b/wear/src/main/res/values/colors.xml
index ea59aa4a954..6316bbb7958 100644
--- a/wear/src/main/res/values/colors.xml
+++ b/wear/src/main/res/values/colors.xml
@@ -3,7 +3,7 @@
     <color name="colorDialogBackground">#111111</color>
     <color name="colorDialogMessage">@android:color/white</color>
     <color name="colorDialogTitle">@android:color/white</color>
-    <color name="colorActivityBackground">#1c1c1c</color>
+    <color name="colorActivityBackground">@android:color/black</color>
     <color name="colorPrimary">#03A9F4</color>
     <color name="colorPrimaryDark">#111111</color>
     <color name="colorAccent">#03A9F4</color>