From 5c77e8377ceff07dcca16df705e9b8a17d24bce4 Mon Sep 17 00:00:00 2001 From: Percy Wegmann Date: Fri, 29 Mar 2024 07:41:45 -0500 Subject: [PATCH] Removed most color references Signed-off-by: Percy Wegmann --- .../ipn/ui/util/ClipboardValueView.kt | 3 +- .../java/com/tailscale/ipn/ui/util/Styles.kt | 12 +- .../com/tailscale/ipn/ui/view/AboutView.kt | 7 +- .../java/com/tailscale/ipn/ui/view/Avatar.kt | 27 ++-- .../tailscale/ipn/ui/view/BugReportView.kt | 1 - .../java/com/tailscale/ipn/ui/view/Buttons.kt | 17 +-- .../ipn/ui/view/MDMSettingsDebugView.kt | 2 - .../com/tailscale/ipn/ui/view/MainView.kt | 134 ++++++++---------- .../com/tailscale/ipn/ui/view/PeerDetails.kt | 18 +-- .../com/tailscale/ipn/ui/view/PeerView.kt | 2 +- .../tailscale/ipn/ui/view/RunExitNodeView.kt | 9 +- .../com/tailscale/ipn/ui/view/SettingsView.kt | 8 +- .../com/tailscale/ipn/ui/view/SharedViews.kt | 16 +-- .../ipn/ui/view/TailscaleLogoView.kt | 5 +- .../com/tailscale/ipn/ui/view/TintedSwitch.kt | 4 +- 15 files changed, 87 insertions(+), 178 deletions(-) diff --git a/android/src/main/java/com/tailscale/ipn/ui/util/ClipboardValueView.kt b/android/src/main/java/com/tailscale/ipn/ui/util/ClipboardValueView.kt index 9fac0c6..20c0d8c 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/util/ClipboardValueView.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/util/ClipboardValueView.kt @@ -49,8 +49,7 @@ fun ClipboardValueView( Text( subtitle, modifier = Modifier.padding(top = 8.dp), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.secondary) + style = MaterialTheme.typography.bodyMedium) } }, trailingContent = { diff --git a/android/src/main/java/com/tailscale/ipn/ui/util/Styles.kt b/android/src/main/java/com/tailscale/ipn/ui/util/Styles.kt index 8d75cb0..0df28ae 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/util/Styles.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/util/Styles.kt @@ -3,11 +3,8 @@ package com.tailscale.ipn.ui.util -import androidx.compose.foundation.background import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -15,12 +12,5 @@ import androidx.compose.ui.unit.dp @Composable fun settingsRowModifier(): Modifier { - return Modifier.clip(shape = RoundedCornerShape(8.dp)) - .background(color = MaterialTheme.colorScheme.secondaryContainer) - .fillMaxWidth() -} - -@Composable -fun defaultPaddingModifier(): Modifier { - return Modifier.padding(8.dp) + return Modifier.clip(shape = RoundedCornerShape(8.dp)).fillMaxWidth() } diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/AboutView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/AboutView.kt index 9862cdf..bbbfc85 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/AboutView.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/AboutView.kt @@ -54,13 +54,11 @@ fun AboutView(nav: BackNavigation) { Text( stringResource(R.string.about_view_title), fontWeight = FontWeight.SemiBold, - fontSize = MaterialTheme.typography.titleLarge.fontSize, - color = MaterialTheme.colorScheme.primary) + fontSize = MaterialTheme.typography.titleLarge.fontSize) Text( text = BuildConfig.VERSION_NAME, fontWeight = MaterialTheme.typography.bodyMedium.fontWeight, - fontSize = MaterialTheme.typography.bodyMedium.fontSize, - color = MaterialTheme.colorScheme.secondary) + fontSize = MaterialTheme.typography.bodyMedium.fontSize) } Column( verticalArrangement = @@ -75,7 +73,6 @@ fun AboutView(nav: BackNavigation) { stringResource(R.string.about_view_footnotes), fontWeight = FontWeight.Normal, fontSize = MaterialTheme.typography.labelMedium.fontSize, - color = MaterialTheme.colorScheme.tertiary, textAlign = TextAlign.Center) } } diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/Avatar.kt b/android/src/main/java/com/tailscale/ipn/ui/view/Avatar.kt index 0adf759..aa11924 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/Avatar.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/Avatar.kt @@ -3,14 +3,12 @@ package com.tailscale.ipn.ui.view -import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Person import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -23,21 +21,14 @@ import com.tailscale.ipn.ui.model.IpnLocal @OptIn(ExperimentalCoilApi::class) @Composable fun Avatar(profile: IpnLocal.LoginProfile?, size: Int = 50) { - Box( - contentAlignment = Alignment.Center, - modifier = - Modifier.size(size.dp) - .clip(CircleShape) - .background(MaterialTheme.colorScheme.tertiaryContainer)) { - Icon( - imageVector = Icons.Default.Person, - contentDescription = null, - tint = MaterialTheme.colorScheme.onTertiaryContainer, - modifier = Modifier.size((size * .8f).dp)) + Box(contentAlignment = Alignment.Center, modifier = Modifier.size(size.dp).clip(CircleShape)) { + Icon( + imageVector = Icons.Default.Person, + contentDescription = null, + modifier = Modifier.size((size * .8f).dp)) - profile?.UserProfile?.ProfilePicURL?.let { url -> - AsyncImage( - model = url, modifier = Modifier.size((size * 1.2f).dp), contentDescription = null) - } - } + profile?.UserProfile?.ProfilePicURL?.let { url -> + AsyncImage(model = url, modifier = Modifier.size((size * 1.2f).dp), contentDescription = null) + } + } } diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/BugReportView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/BugReportView.kt index 27502e1..53806a6 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/BugReportView.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/BugReportView.kt @@ -58,7 +58,6 @@ fun BugReportView(nav: BackNavigation, model: BugReportViewModel = viewModel()) text = stringResource(id = R.string.bug_report_id_desc), modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Left, - color = MaterialTheme.colorScheme.secondary, style = MaterialTheme.typography.bodySmall) }) } diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/Buttons.kt b/android/src/main/java/com/tailscale/ipn/ui/view/Buttons.kt index 271fa0b..9891912 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/Buttons.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/Buttons.kt @@ -11,30 +11,19 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Clear import androidx.compose.material.icons.outlined.Close import androidx.compose.material3.Button -import androidx.compose.material3.ButtonColors -import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.unit.dp -import com.tailscale.ipn.ui.theme.ts_color_light_blue @Composable fun PrimaryActionButton(onClick: () -> Unit, content: @Composable RowScope.() -> Unit) { Button( onClick = onClick, - colors = - ButtonColors( - containerColor = ts_color_light_blue, - contentColor = Color.White, - disabledContainerColor = MaterialTheme.colorScheme.secondary, - disabledContentColor = MaterialTheme.colorScheme.onSecondary), contentPadding = PaddingValues(vertical = 12.dp), modifier = Modifier.fillMaxWidth(), content = content) @@ -47,10 +36,7 @@ fun OpenURLButton(title: String, url: String) { Button( onClick = { handler.openUri(url) }, content = { Text(title) }, - colors = - ButtonDefaults.buttonColors( - contentColor = MaterialTheme.colorScheme.secondary, - containerColor = MaterialTheme.colorScheme.secondaryContainer)) + ) } @Composable @@ -60,7 +46,6 @@ fun ClearButton(onClick: () -> Unit) { } } - @Composable fun CloseButton() { val focusManager = LocalFocusManager.current diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/MDMSettingsDebugView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/MDMSettingsDebugView.kt index 64118bb..c3b91c9 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/MDMSettingsDebugView.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/MDMSettingsDebugView.kt @@ -45,13 +45,11 @@ fun MDMSettingView(setting: MDMSetting<*>) { Text( setting.key, fontSize = MaterialTheme.typography.labelSmall.fontSize, - color = MaterialTheme.colorScheme.tertiary, fontFamily = FontFamily.Monospace) }, trailingContent = { Text( value.toString(), - color = MaterialTheme.colorScheme.secondary, fontFamily = FontFamily.Monospace, maxLines = 1, fontWeight = FontWeight.SemiBold) diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt index f918d90..4f04b3a 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt @@ -100,15 +100,9 @@ fun MainView(navigation: MainViewNavigation, viewModel: MainViewModel = viewMode }, supportingContent = { if (username.isNotEmpty()) { - Text( - text = stateStr, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.secondary) + Text(text = stateStr, style = MaterialTheme.typography.bodyMedium) } else { - Text( - text = stateStr, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.secondary) + Text(text = stateStr, style = MaterialTheme.typography.bodyMedium) } }, trailingContent = { @@ -129,13 +123,10 @@ fun MainView(navigation: MainViewNavigation, viewModel: MainViewModel = viewMode PromptPermissionsIfNecessary(permissions = Permissions.all) val selfPeerId = viewModel.selfPeerId.collectAsState(initial = "") - Row( - modifier = - Modifier.background(MaterialTheme.colorScheme.secondaryContainer) - .padding(top = 10.dp, bottom = 20.dp)) { - ExitNodeStatus( - navAction = navigation.onNavigateToExitNodes, viewModel = viewModel) - } + Row(modifier = Modifier.padding(top = 10.dp, bottom = 20.dp)) { + ExitNodeStatus( + navAction = navigation.onNavigateToExitNodes, viewModel = viewModel) + } PeerList( searchTerm = viewModel.searchTerm, state = viewModel.ipnState, @@ -217,7 +208,7 @@ fun SettingsButton(user: IpnLocal.LoginProfile?, action: () -> Unit) { @Composable fun StartingView() { Column( - modifier = Modifier.fillMaxSize().background(MaterialTheme.colorScheme.secondaryContainer), + modifier = Modifier.fillMaxSize(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally) { TailscaleLogoView(animated = true, Modifier.size(72.dp)) @@ -232,65 +223,56 @@ fun ConnectView( loginAction: () -> Unit ) { Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) { - Column( - horizontalAlignment = Alignment.CenterHorizontally, - modifier = - Modifier.background(MaterialTheme.colorScheme.secondaryContainer).fillMaxWidth()) { - Column( - modifier = Modifier.padding(8.dp).fillMaxWidth(0.7f).fillMaxHeight(), - verticalArrangement = - Arrangement.spacedBy(8.dp, alignment = Alignment.CenterVertically), - horizontalAlignment = Alignment.CenterHorizontally, - ) { - if (state != Ipn.State.NeedsLogin && user != null && !user.isEmpty()) { - Icon( - painter = painterResource(id = R.drawable.power), - contentDescription = null, - modifier = Modifier.size(48.dp), - tint = MaterialTheme.colorScheme.secondary) - Text( - text = stringResource(id = R.string.not_connected), - fontSize = MaterialTheme.typography.titleMedium.fontSize, - fontWeight = FontWeight.SemiBold, - color = MaterialTheme.colorScheme.primary, - textAlign = TextAlign.Center, - fontFamily = MaterialTheme.typography.titleMedium.fontFamily) - val tailnetName = user.NetworkProfile?.DomainName ?: "" - Text( - stringResource(id = R.string.connect_to_tailnet, tailnetName), - fontSize = MaterialTheme.typography.titleMedium.fontSize, - fontWeight = FontWeight.Normal, - color = MaterialTheme.colorScheme.secondary, - textAlign = TextAlign.Center, - ) - Spacer(modifier = Modifier.size(1.dp)) - PrimaryActionButton(onClick = connectAction) { - Text( - text = stringResource(id = R.string.connect), - fontSize = MaterialTheme.typography.titleMedium.fontSize) - } - } else { - TailscaleLogoView(modifier = Modifier.size(50.dp)) - Spacer(modifier = Modifier.size(1.dp)) - Text( - text = stringResource(id = R.string.welcome_to_tailscale), - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.primary, - textAlign = TextAlign.Center) - Text( - stringResource(R.string.login_to_join_your_tailnet), - style = MaterialTheme.typography.titleSmall, - color = MaterialTheme.colorScheme.secondary, - textAlign = TextAlign.Center) - Spacer(modifier = Modifier.size(1.dp)) - PrimaryActionButton(onClick = loginAction) { - Text( - text = stringResource(id = R.string.log_in), - fontSize = MaterialTheme.typography.titleMedium.fontSize) - } - } + Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.fillMaxWidth()) { + Column( + modifier = Modifier.padding(8.dp).fillMaxWidth(0.7f).fillMaxHeight(), + verticalArrangement = Arrangement.spacedBy(8.dp, alignment = Alignment.CenterVertically), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + if (state != Ipn.State.NeedsLogin && user != null && !user.isEmpty()) { + Icon( + painter = painterResource(id = R.drawable.power), + contentDescription = null, + modifier = Modifier.size(48.dp)) + Text( + text = stringResource(id = R.string.not_connected), + fontSize = MaterialTheme.typography.titleMedium.fontSize, + fontWeight = FontWeight.SemiBold, + textAlign = TextAlign.Center, + fontFamily = MaterialTheme.typography.titleMedium.fontFamily) + val tailnetName = user.NetworkProfile?.DomainName ?: "" + Text( + stringResource(id = R.string.connect_to_tailnet, tailnetName), + fontSize = MaterialTheme.typography.titleMedium.fontSize, + fontWeight = FontWeight.Normal, + textAlign = TextAlign.Center, + ) + Spacer(modifier = Modifier.size(1.dp)) + PrimaryActionButton(onClick = connectAction) { + Text( + text = stringResource(id = R.string.connect), + fontSize = MaterialTheme.typography.titleMedium.fontSize) + } + } else { + TailscaleLogoView(modifier = Modifier.size(50.dp)) + Spacer(modifier = Modifier.size(1.dp)) + Text( + text = stringResource(id = R.string.welcome_to_tailscale), + style = MaterialTheme.typography.titleMedium, + textAlign = TextAlign.Center) + Text( + stringResource(R.string.login_to_join_your_tailnet), + style = MaterialTheme.typography.titleSmall, + textAlign = TextAlign.Center) + Spacer(modifier = Modifier.size(1.dp)) + PrimaryActionButton(onClick = loginAction) { + Text( + text = stringResource(id = R.string.log_in), + fontSize = MaterialTheme.typography.titleMedium.fontSize) } } + } + } } } @@ -326,8 +308,7 @@ fun PeerList( containerColor = Color.Transparent, dividerColor = Color.Transparent), modifier = Modifier.fillMaxWidth()) { LazyColumn( - modifier = - Modifier.fillMaxSize().background(MaterialTheme.colorScheme.secondaryContainer), + modifier = Modifier.fillMaxSize(), ) { peerList.value.forEach { peerSet -> item { @@ -369,8 +350,7 @@ fun PeerList( supportingContent = { Text( text = peer.Addresses?.first()?.split("/")?.first() ?: "", - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.secondary) + style = MaterialTheme.typography.bodyMedium) }) } } diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/PeerDetails.kt b/android/src/main/java/com/tailscale/ipn/ui/view/PeerDetails.kt index a3796b1..9554aea 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/PeerDetails.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/PeerDetails.kt @@ -50,10 +50,7 @@ fun PeerDetails( .padding(horizontal = 16.dp) .padding(top = 22.dp), ) { - Text( - text = model.nodeName, - style = MaterialTheme.typography.titleLarge, - color = MaterialTheme.colorScheme.primary) + Text(text = model.nodeName, style = MaterialTheme.typography.titleLarge) Row(verticalAlignment = Alignment.CenterVertically) { Box( modifier = @@ -63,14 +60,12 @@ fun PeerDetails( Spacer(modifier = Modifier.size(8.dp)) Text( text = stringResource(id = model.connectedStrRes), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.primary) + style = MaterialTheme.typography.bodyMedium) } Column(modifier = Modifier.fillMaxHeight()) { Text( text = stringResource(id = R.string.addresses_section), - style = MaterialTheme.typography.titleMedium, - color = MaterialTheme.colorScheme.primary) + style = MaterialTheme.typography.titleMedium) Column(modifier = settingsRowModifier()) { model.addresses.forEach { AddressRow(address = it.address, type = it.typeString) } @@ -99,10 +94,7 @@ fun AddressRow(address: String, type: String) { .clickable(onClick = { localClipboardManager.setText(AnnotatedString(address)) })) { Column { Text(text = address) - Text( - text = type, - fontSize = MaterialTheme.typography.labelLarge.fontSize, - color = MaterialTheme.colorScheme.secondary) + Text(text = type, fontSize = MaterialTheme.typography.labelLarge.fontSize) } Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.CenterEnd) { Icon( @@ -118,7 +110,7 @@ fun ValueRow(title: String, value: String) { Row(modifier = Modifier.padding(horizontal = 8.dp, vertical = 8.dp).fillMaxWidth()) { Text(text = title) Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.CenterEnd) { - Text(text = value, color = MaterialTheme.colorScheme.secondary) + Text(text = value) } } } diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/PeerView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/PeerView.kt index b363019..bfa4131 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/PeerView.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/PeerView.kt @@ -32,7 +32,7 @@ fun PeerView( onClick: (Tailcfg.Node) -> Unit = {}, trailingContent: @Composable () -> Unit = {} ) { - val textColor = if (disabled) Color.Gray else MaterialTheme.colorScheme.primary + val textColor = if (disabled) Color.Gray else Color.Unspecified ListItem( modifier = Modifier.clickable { onClick(peer) }, diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/RunExitNodeView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/RunExitNodeView.kt index 7356e4c..6ce06a5 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/RunExitNodeView.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/RunExitNodeView.kt @@ -45,8 +45,7 @@ fun RunExitNodeView( LoadingIndicator.Wrap { Column( horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = - Arrangement.spacedBy(16.dp, alignment = Alignment.Top), + verticalArrangement = Arrangement.spacedBy(16.dp, alignment = Alignment.Top), modifier = Modifier.padding(innerPadding).padding(16.dp).fillMaxHeight()) { RunExitNodeGraphic() @@ -83,11 +82,7 @@ fun RunExitNodeView( fun RunExitNodeGraphic() { @Composable fun ArrowForward() { - Icon( - Icons.AutoMirrored.Outlined.ArrowForward, - "Arrow Forward", - tint = MaterialTheme.colorScheme.secondary, - modifier = Modifier.size(24.dp)) + Icon(Icons.AutoMirrored.Outlined.ArrowForward, "Arrow Forward", modifier = Modifier.size(24.dp)) } Row( diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/SettingsView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/SettingsView.kt index a97f05c..2ee3341 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/SettingsView.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/SettingsView.kt @@ -109,9 +109,7 @@ private fun TextRow(setting: Setting) { Text( setting.title ?: stringResource(setting.titleRes), style = MaterialTheme.typography.bodyMedium, - color = - if (setting.destructive) ts_color_dark_desctrutive_text - else MaterialTheme.colorScheme.primary) + color = if (setting.destructive) MaterialTheme.colorScheme.error else Color.Unspecified) }, ) } @@ -141,9 +139,7 @@ private fun NavRow(setting: Setting) { Text( setting.title ?: stringResource(setting.titleRes), style = MaterialTheme.typography.bodyMedium, - color = - if (setting.destructive) ts_color_dark_desctrutive_text - else MaterialTheme.colorScheme.primary) + color = if (setting.destructive) ts_color_dark_desctrutive_text else Color.Unspecified) }) } diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/SharedViews.kt b/android/src/main/java/com/tailscale/ipn/ui/view/SharedViews.kt index 6b90218..7604faa 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/SharedViews.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/SharedViews.kt @@ -14,10 +14,8 @@ import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.LinearProgressIndicator -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource @@ -33,11 +31,6 @@ data class BackNavigation( @Composable fun Header(@StringRes title: Int = 0, titleText: String? = null, onBack: (() -> Unit)? = null) { TopAppBar( - colors = - TopAppBarDefaults.topAppBarColors( - containerColor = MaterialTheme.colorScheme.surfaceContainer, - titleContentColor = MaterialTheme.colorScheme.primary, - ), title = { Text(titleText ?: stringResource(title)) }, navigationIcon = { onBack?.let { BackArrow(action = it) } }, ) @@ -60,17 +53,14 @@ fun CheckedIndicator() { fun SimpleActivityIndicator(size: Int = 32) { CircularProgressIndicator( modifier = Modifier.width(size.dp), - color = ts_color_light_blue, - trackColor = MaterialTheme.colorScheme.secondary, ) } @Composable fun ActivityIndicator(progress: Double, size: Int = 32) { LinearProgressIndicator( - progress = { progress.toFloat() }, - modifier = Modifier.width(size.dp), - color = ts_color_light_blue, - trackColor = MaterialTheme.colorScheme.secondary, + progress = { progress.toFloat() }, + modifier = Modifier.width(size.dp), + color = ts_color_light_blue, ) } diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/TailscaleLogoView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/TailscaleLogoView.kt index b655670..96f472f 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/TailscaleLogoView.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/TailscaleLogoView.kt @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.size -import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier @@ -33,8 +32,8 @@ val logoDotsMatrix: DotsMatrix = @Composable fun TailscaleLogoView(animated: Boolean = false, modifier: Modifier) { - val primaryColor: Color = MaterialTheme.colorScheme.secondary - val secondaryColor: Color = MaterialTheme.colorScheme.secondary.copy(alpha = 0.3f) + val primaryColor: Color = Color(0xFF706E6D) + val secondaryColor: Color = primaryColor.copy(alpha = 0.3f) val currentDotsMatrix: StateFlow = MutableStateFlow(logoDotsMatrix) var currentDotsMatrixIndex = 0 diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/TintedSwitch.kt b/android/src/main/java/com/tailscale/ipn/ui/view/TintedSwitch.kt index 69f1ccb..d019d53 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/TintedSwitch.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/TintedSwitch.kt @@ -3,7 +3,6 @@ package com.tailscale.ipn.ui.view -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Switch import androidx.compose.material3.SwitchDefaults import androidx.compose.runtime.Composable @@ -19,6 +18,5 @@ fun TintedSwitch(checked: Boolean, onCheckedChange: ((Boolean) -> Unit)?, enable SwitchDefaults.colors( checkedBorderColor = ts_color_light_blue, checkedThumbColor = ts_color_light_blue, - checkedTrackColor = ts_color_light_blue.copy(alpha = 0.3f), - uncheckedTrackColor = MaterialTheme.colorScheme.secondaryContainer)) + checkedTrackColor = ts_color_light_blue.copy(alpha = 0.3f))) }