Use WearCredentialSelectorTheme in app
Bug: 323607982
Test: Manual. See go/credential-selector-ui
Change-Id: Id05df152bc6dfb031e79dffa0fc74a0e53ff8ef8
diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/CredentialSelectorActivity.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/CredentialSelectorActivity.kt
index 0fe35e6..652e62c 100644
--- a/packages/CredentialManager/wear/src/com/android/credentialmanager/CredentialSelectorActivity.kt
+++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/CredentialSelectorActivity.kt
@@ -21,7 +21,7 @@
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.viewModels
-import androidx.wear.compose.material.MaterialTheme
+import com.android.credentialmanager.ui.theme.WearCredentialSelectorTheme
import com.android.credentialmanager.ui.WearApp
import com.google.android.horologist.annotations.ExperimentalHorologistApi
import dagger.hilt.android.AndroidEntryPoint
@@ -36,7 +36,7 @@
super.onCreate(savedInstanceState)
setTheme(android.R.style.Theme_DeviceDefault)
setContent {
- MaterialTheme {
+ WearCredentialSelectorTheme {
WearApp(
flowEngine = viewModel,
onCloseApp = { finish() },
diff --git a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/Texts.kt b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/Texts.kt
index e7a854f..22f6bf0 100644
--- a/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/Texts.kt
+++ b/packages/CredentialManager/wear/src/com/android/credentialmanager/ui/components/Texts.kt
@@ -26,7 +26,6 @@
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
-import com.android.compose.theme.LocalAndroidColorScheme
import androidx.wear.compose.material.MaterialTheme as WearMaterialTheme
@Composable
@@ -34,7 +33,7 @@
Text(
modifier = modifier.wrapContentSize(),
text = text,
- color = LocalAndroidColorScheme.current.onSurface,
+ color = WearMaterialTheme.colors.onSurface,
textAlign = TextAlign.Center,
style = WearMaterialTheme.typography.title3,
)
@@ -45,7 +44,7 @@
Text(
modifier = modifier.wrapContentSize(),
text = text,
- color = LocalAndroidColorScheme.current.onSurface,
+ color = WearMaterialTheme.colors.onSurfaceVariant,
textAlign = TextAlign.Center,
overflow = TextOverflow.Ellipsis,
maxLines = 2,
@@ -56,28 +55,30 @@
@Composable
fun WearUsernameText(
text: String,
+ textAlign: TextAlign = TextAlign.Center,
modifier: Modifier = Modifier,
onTextLayout: (TextLayoutResult) -> Unit = {},
) {
Text(
modifier = modifier.padding(start = 8.dp, end = 8.dp).wrapContentSize(),
text = text,
- color = LocalAndroidColorScheme.current.onSurfaceVariant,
+ color = WearMaterialTheme.colors.onSurfaceVariant,
style = WearMaterialTheme.typography.caption1,
overflow = TextOverflow.Ellipsis,
- textAlign = TextAlign.Center,
+ textAlign = textAlign,
maxLines = 2,
onTextLayout = onTextLayout,
)
}
+// used for primary label in button
@Composable
fun WearButtonText(
text: String,
textAlign: TextAlign,
maxLines: Int = 1,
modifier: Modifier = Modifier,
- color: Color = LocalAndroidColorScheme.current.onSurface,
+ color: Color = WearMaterialTheme.colors.onSurface,
onTextLayout: (TextLayoutResult) -> Unit = {},
) {
Text(
@@ -101,8 +102,8 @@
Text(
modifier = modifier.wrapContentSize(),
text = text,
- color = LocalAndroidColorScheme.current.onSurfaceVariant,
- style = WearMaterialTheme.typography.button,
+ color = WearMaterialTheme.colors.onSurfaceVariant,
+ style = WearMaterialTheme.typography.caption1,
overflow = TextOverflow.Ellipsis,
textAlign = TextAlign.Start,
maxLines = 1,