mirror of
https://github.com/home-assistant/android
synced 2024-10-04 15:19:30 +00:00
Set Wear theme background color to black (#3572)
* Set Wear theme background color to black * Remove background color in individual screens
This commit is contained in:
parent
e8fae5dc50
commit
5d1801cb01
|
@ -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)
|
||||
)
|
||||
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 {
|
||||
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 = onRefresh,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
colors = ButtonDefaults.secondaryButtonColors()
|
||||
) {
|
||||
Text(stringResource(commonR.string.refresh))
|
||||
}
|
||||
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 = 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))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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">
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue