Removed most color references

Signed-off-by: Percy Wegmann <percy@tailscale.com>

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,
+                style = MaterialTheme.typography.bodyMedium)
-                color = MaterialTheme.colorScheme.secondary)
           }
         },
         trailingContent = {

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))
+  return Modifier.clip(shape = RoundedCornerShape(8.dp)).fillMaxWidth()
-      .background(color = MaterialTheme.colorScheme.secondaryContainer)
-      .fillMaxWidth()
-}
-
-@Composable
-fun defaultPaddingModifier(): Modifier {
-  return Modifier.padding(8.dp)
 }

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,
+                    fontSize = MaterialTheme.typography.titleLarge.fontSize)
-                    color = MaterialTheme.colorScheme.primary)
                 Text(
                     text = BuildConfig.VERSION_NAME,
                     fontWeight = MaterialTheme.typography.bodyMedium.fontWeight,
-                    fontSize = MaterialTheme.typography.bodyMedium.fontSize,
+                    fontSize = MaterialTheme.typography.bodyMedium.fontSize)
-                    color = MaterialTheme.colorScheme.secondary)
               }
           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)
         }
   }

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(
+  Box(contentAlignment = Alignment.Center, modifier = Modifier.size(size.dp).clip(CircleShape)) {
-      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))
 
     profile?.UserProfile?.ProfilePicURL?.let { url ->
-          AsyncImage(
+      AsyncImage(model = url, modifier = Modifier.size((size * 1.2f).dp), contentDescription = null)
-              model = url, modifier = Modifier.size((size * 1.2f).dp), contentDescription = null)
     }
   }
 }

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)
           })
     }

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

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)

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(text = stateStr, style = MaterialTheme.typography.bodyMedium)
-                        text = stateStr,
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.secondary)
                   } else {
-                    Text(
+                    Text(text = stateStr, style = MaterialTheme.typography.bodyMedium)
-                        text = stateStr,
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.secondary)
                   }
                 },
                 trailingContent = {
@@ -129,10 +123,7 @@ fun MainView(navigation: MainViewNavigation, viewModel: MainViewModel = viewMode
                 PromptPermissionsIfNecessary(permissions = Permissions.all)
 
                 val selfPeerId = viewModel.selfPeerId.collectAsState(initial = "")
-                Row(
+                Row(modifier = Modifier.padding(top = 10.dp, bottom = 20.dp)) {
-                    modifier =
-                        Modifier.background(MaterialTheme.colorScheme.secondaryContainer)
-                            .padding(top = 10.dp, bottom = 20.dp)) {
                   ExitNodeStatus(
                       navAction = navigation.onNavigateToExitNodes, viewModel = viewModel)
                 }
@@ -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,27 +223,21 @@ fun ConnectView(
     loginAction: () -> Unit
 ) {
   Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth()) {
-    Column(
+    Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.fillMaxWidth()) {
-        horizontalAlignment = Alignment.CenterHorizontally,
-        modifier =
-            Modifier.background(MaterialTheme.colorScheme.secondaryContainer).fillMaxWidth()) {
       Column(
           modifier = Modifier.padding(8.dp).fillMaxWidth(0.7f).fillMaxHeight(),
-              verticalArrangement =
+          verticalArrangement = Arrangement.spacedBy(8.dp, alignment = Alignment.CenterVertically),
-                  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),
+              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 ?: ""
@@ -260,7 +245,6 @@ fun ConnectView(
               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))
@@ -275,12 +259,10 @@ fun ConnectView(
           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) {
@@ -326,8 +308,7 @@ fun PeerList(
               containerColor = Color.Transparent, dividerColor = Color.Transparent),
       modifier = Modifier.fillMaxWidth()) {
         LazyColumn(
-            modifier =
+            modifier = Modifier.fillMaxSize(),
-                Modifier.fillMaxSize().background(MaterialTheme.colorScheme.secondaryContainer),
         ) {
           peerList.value.forEach { peerSet ->
             item {
@@ -369,8 +350,7 @@ fun PeerList(
                   supportingContent = {
                     Text(
                         text = peer.Addresses?.first()?.split("/")?.first() ?: "",
-                        style = MaterialTheme.typography.bodyMedium,
+                        style = MaterialTheme.typography.bodyMedium)
-                        color = MaterialTheme.colorScheme.secondary)
                   })
             }
           }

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(text = model.nodeName, style = MaterialTheme.typography.titleLarge)
-          text = model.nodeName,
-          style = MaterialTheme.typography.titleLarge,
-          color = MaterialTheme.colorScheme.primary)
       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,
+            style = MaterialTheme.typography.bodyMedium)
-            color = MaterialTheme.colorScheme.primary)
       }
       Column(modifier = Modifier.fillMaxHeight()) {
         Text(
             text = stringResource(id = R.string.addresses_section),
-            style = MaterialTheme.typography.titleMedium,
+            style = MaterialTheme.typography.titleMedium)
-            color = MaterialTheme.colorScheme.primary)
 
         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(text = type, fontSize = MaterialTheme.typography.labelLarge.fontSize)
-              text = type,
-              fontSize = MaterialTheme.typography.labelLarge.fontSize,
-              color = MaterialTheme.colorScheme.secondary)
         }
         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)
     }
   }
 }

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) },

android/src/main/java/com/tailscale/ipn/ui/view/RunExitNodeView.kt

@@ -45,8 +45,7 @@ fun RunExitNodeView(
         LoadingIndicator.Wrap {
           Column(
               horizontalAlignment = Alignment.CenterHorizontally,
-              verticalArrangement =
+              verticalArrangement = Arrangement.spacedBy(16.dp, alignment = Alignment.Top),
-                  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(
+    Icon(Icons.AutoMirrored.Outlined.ArrowForward, "Arrow Forward", modifier = Modifier.size(24.dp))
-        Icons.AutoMirrored.Outlined.ArrowForward,
-        "Arrow Forward",
-        tint = MaterialTheme.colorScheme.secondary,
-        modifier = Modifier.size(24.dp))
   }
 
   Row(

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 =
+            color = if (setting.destructive) MaterialTheme.colorScheme.error else Color.Unspecified)
-                if (setting.destructive) ts_color_dark_desctrutive_text
-                else MaterialTheme.colorScheme.primary)
       },
   )
 }
@@ -141,9 +139,7 @@ private fun NavRow(setting: Setting) {
         Text(
             setting.title ?: stringResource(setting.titleRes),
             style = MaterialTheme.typography.bodyMedium,
-            color =
+            color = if (setting.destructive) ts_color_dark_desctrutive_text else Color.Unspecified)
-                if (setting.destructive) ts_color_dark_desctrutive_text
-                else MaterialTheme.colorScheme.primary)
       })
 }
 

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,8 +53,6 @@ fun CheckedIndicator() {
 fun SimpleActivityIndicator(size: Int = 32) {
   CircularProgressIndicator(
       modifier = Modifier.width(size.dp),
-      color = ts_color_light_blue,
-      trackColor = MaterialTheme.colorScheme.secondary,
   )
 }
 
@@ -71,6 +62,5 @@ fun ActivityIndicator(progress: Double, size: Int = 32) {
       progress = { progress.toFloat() },
       modifier = Modifier.width(size.dp),
       color = ts_color_light_blue,
-          trackColor = MaterialTheme.colorScheme.secondary,
   )
 }

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 primaryColor: Color = Color(0xFF706E6D)
-  val secondaryColor: Color = MaterialTheme.colorScheme.secondary.copy(alpha = 0.3f)
+  val secondaryColor: Color = primaryColor.copy(alpha = 0.3f)
 
   val currentDotsMatrix: StateFlow<DotsMatrix> = MutableStateFlow(logoDotsMatrix)
   var currentDotsMatrixIndex = 0

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),
+              checkedTrackColor = ts_color_light_blue.copy(alpha = 0.3f)))
-              uncheckedTrackColor = MaterialTheme.colorScheme.secondaryContainer))
 }