Remove all cases of unspecified that could be removed

Pururun · Pururun · commit 3ebaae7339aa · 2024-08-15T09:56:31.000+02:00
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/AnimatedIconButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/AnimatedIconButton.kt
@@ -20,8 +20,8 @@ fun AnimatedIconButton(
     defaultIcon: Painter,
     secondaryIcon: Painter,
     pressEffectDuration: Long = PRESS_EFFECT_TIME_SPAN,
-    defaultIconTint: Color = Color.Unspecified,
-    secondaryIconTint: Color = Color.Unspecified,
+    defaultIconTint: Color,
+    secondaryIconTint: Color,
     contentDescription: String,
     isToggleButton: Boolean = false,
     onClick: () -> Unit
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt
@@ -95,7 +95,6 @@ fun StatusRelayItemCell(
                             .background(
                                 color =
                                     when {
-                                        isSelected -> Color.Unspecified
                                         item is RelayItem.CustomList && item.locations.isEmpty() ->
                                             disabledColor
                                         item.active -> activeColor
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/FilterChip.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/FilterChip.kt
@@ -58,7 +58,7 @@ fun MullvadFilterChip(text: String, onRemoveClick: () -> Unit) {
             Icon(
                 painter = painterResource(id = R.drawable.icon_close),
                 contentDescription = null,
-                tint = Color.Unspecified,
+                tint = MaterialTheme.colorScheme.onPrimary,
                 modifier = Modifier.size(Dimens.smallIconSize).clickable { onRemoveClick() }
             )
         }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Text.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Text.kt
@@ -1,6 +1,7 @@
 package net.mullvad.mullvadvpn.compose.component
 
 import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -26,7 +27,7 @@ fun AutoResizeText(
     textSizeStep: TextUnit = DEFAULT_TEXT_STEP,
     style: TextStyle = LocalTextStyle.current,
     maxLines: Int = Int.MAX_VALUE,
-    color: Color = Color.Unspecified
+    color: Color = MaterialTheme.colorScheme.onSurface
 ) {
     var adjustedFontSize by remember { mutableFloatStateOf(maxTextSize.value) }
     var isReadyToDraw by remember { mutableStateOf(false) }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt
@@ -121,7 +121,7 @@ fun MullvadTopBar(
                         painter = painterResource(id = R.drawable.logo_icon),
                         contentDescription = null, // No meaningful user info or action.
                         modifier = Modifier.size(40.dp),
-                        tint = Color.Unspecified
+                        tint = Color.Unspecified // Logo should not be tinted
                     )
                     // Dynamically show Mullvad VPN Text if it fits, to avoid overlapping icons.
                     BoxWithConstraints {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeleteConfirmationDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeleteConfirmationDialog.kt
@@ -13,7 +13,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -40,7 +39,7 @@ private fun PreviewDeleteConfirmationDialogError() {
     AppTheme {
         DeleteConfirmationDialog(
             message = "Do you want to delete Cookie?",
-            errorMessage = "Cookie can not be deleted"
+            errorMessage = "An error occured"
         )
     }
 }
@@ -59,7 +58,7 @@ fun DeleteConfirmationDialog(
                 modifier = Modifier.fillMaxWidth().height(Dimens.dialogIconHeight),
                 painter = painterResource(id = R.drawable.icon_alert),
                 contentDescription = stringResource(id = R.string.remove_button),
-                tint = Color.Unspecified
+                tint = MaterialTheme.colorScheme.error
             )
         },
         title = {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RemoveDeviceConfirmationDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RemoveDeviceConfirmationDialog.kt
@@ -9,7 +9,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -50,7 +49,7 @@ fun RemoveDeviceConfirmation(navigator: ResultBackNavigator<DeviceId>, device: D
                 modifier = Modifier.fillMaxWidth().height(Dimens.dialogIconHeight),
                 painter = painterResource(id = R.drawable.icon_alert),
                 contentDescription = stringResource(id = R.string.remove_button),
-                tint = Color.Unspecified
+                tint = MaterialTheme.colorScheme.error
             )
         },
         text = {
@@ -63,18 +62,18 @@ fun RemoveDeviceConfirmation(navigator: ResultBackNavigator<DeviceId>, device: D
             HtmlText(htmlFormattedString = htmlFormattedDialogText, textSize = 16.sp.value)
         },
         dismissButton = {
-            NegativeButton(
-                onClick = dropUnlessResumed { navigator.navigateBack(result = device.id) },
-                text = stringResource(id = R.string.confirm_removal)
-            )
-        },
-        confirmButton = {
             PrimaryButton(
                 modifier = Modifier.focusRequester(FocusRequester()),
                 onClick = dropUnlessResumed { navigator.navigateBack() },
                 text = stringResource(id = R.string.back)
             )
         },
+        confirmButton = {
+            NegativeButton(
+                onClick = dropUnlessResumed { navigator.navigateBack(result = device.id) },
+                text = stringResource(id = R.string.confirm_removal)
+            )
+        },
         containerColor = MaterialTheme.colorScheme.background
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt
@@ -8,7 +8,6 @@ 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.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -40,7 +39,7 @@ fun ReportProblemNoEmail(resultBackNavigator: ResultBackNavigator<Boolean>) {
                 painter = painterResource(id = R.drawable.icon_alert),
                 contentDescription = null,
                 modifier = Modifier.size(Dimens.dialogIconHeight),
-                tint = Color.Unspecified
+                tint = MaterialTheme.colorScheme.error
             )
         },
         text = {
@@ -52,17 +51,17 @@ fun ReportProblemNoEmail(resultBackNavigator: ResultBackNavigator<Boolean>) {
             )
         },
         dismissButton = {
-            NegativeButton(
+            PrimaryButton(
                 modifier = Modifier.fillMaxWidth(),
-                onClick = dropUnlessResumed { resultBackNavigator.navigateBack(result = true) },
-                text = stringResource(id = R.string.send_anyway)
+                onClick = dropUnlessResumed { resultBackNavigator.navigateBack() },
+                text = stringResource(id = R.string.back)
             )
         },
         confirmButton = {
-            PrimaryButton(
+            NegativeButton(
                 modifier = Modifier.fillMaxWidth(),
-                onClick = dropUnlessResumed { resultBackNavigator.navigateBack() },
-                text = stringResource(id = R.string.back)
+                onClick = dropUnlessResumed { resultBackNavigator.navigateBack(result = true) },
+                text = stringResource(id = R.string.send_anyway)
             )
         },
         containerColor = MaterialTheme.colorScheme.background
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
@@ -30,7 +30,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -61,7 +60,6 @@ import net.mullvad.mullvadvpn.lib.common.util.openLink
 import net.mullvad.mullvadvpn.lib.common.util.openVpnSettings
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
-import net.mullvad.mullvadvpn.lib.theme.color.AlphaDescription
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaInvisible
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaVisible
 import net.mullvad.mullvadvpn.service.constant.IS_PLAY_BUILD
@@ -230,8 +228,7 @@ private fun CarouselNavigationButton(
         Icon(
             painter = painterResource(id = R.drawable.icon_chevron),
             contentDescription = null,
-            tint = Color.Unspecified,
-            modifier = Modifier.rotate(rotation).alpha(AlphaDescription)
+            modifier = Modifier.rotate(rotation)
         )
     }
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
@@ -36,7 +36,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
@@ -269,7 +268,6 @@ private fun ColumnScope.LoginInput(
         label = {
             Text(
                 text = stringResource(id = R.string.login_description),
-                color = Color.Unspecified,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis
             )
@@ -404,7 +402,6 @@ private fun AccountDropDownItem(
                 painter = painterResource(id = R.drawable.account_history_remove_pressed),
                 contentDescription = null,
                 modifier = Modifier.size(Dimens.listIconSize),
-                tint = Color.Unspecified
             )
         }
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ fun MullvadFilterChip(text: String, onRemoveClick: () -> Unit) {`
`58`	`58`	`Icon(`
`59`	`59`	`painter = painterResource(id = R.drawable.icon_close),`
`60`	`60`	`contentDescription = null,`
`61`		`- tint = Color.Unspecified,`
	`61`	`+ tint = MaterialTheme.colorScheme.onPrimary,`
`62`	`62`	`modifier = Modifier.size(Dimens.smallIconSize).clickable { onRemoveClick() }`
`63`	`63`	`)`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ fun MullvadTopBar(`
`121`	`121`	`painter = painterResource(id = R.drawable.logo_icon),`
`122`	`122`	`contentDescription = null, // No meaningful user info or action.`
`123`	`123`	`modifier = Modifier.size(40.dp),`
`124`		`- tint = Color.Unspecified`
	`124`	`+ tint = Color.Unspecified // Logo should not be tinted`
`125`	`125`	`)`
`126`	`126`	`// Dynamically show Mullvad VPN Text if it fits, to avoid overlapping icons.`
`127`	`127`	`BoxWithConstraints {`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ import androidx.compose.ui.Alignment`
`13`	`13`	`import androidx.compose.ui.Modifier`
`14`	`14`	`import androidx.compose.ui.focus.FocusRequester`
`15`	`15`	`import androidx.compose.ui.focus.focusRequester`
`16`		`-import androidx.compose.ui.graphics.Color`
`17`	`16`	`import androidx.compose.ui.res.painterResource`
`18`	`17`	`import androidx.compose.ui.res.stringResource`
`19`	`18`	`import androidx.compose.ui.tooling.preview.Preview`
`@@ -40,7 +39,7 @@ private fun PreviewDeleteConfirmationDialogError() {`
`40`	`39`	`AppTheme {`
`41`	`40`	`DeleteConfirmationDialog(`
`42`	`41`	`message = "Do you want to delete Cookie?",`
`43`		`- errorMessage = "Cookie can not be deleted"`
	`42`	`+ errorMessage = "An error occured"`
`44`	`43`	`)`
`45`	`44`	`}`
`46`	`45`	`}`
`@@ -59,7 +58,7 @@ fun DeleteConfirmationDialog(`
`59`	`58`	`modifier = Modifier.fillMaxWidth().height(Dimens.dialogIconHeight),`
`60`	`59`	`painter = painterResource(id = R.drawable.icon_alert),`
`61`	`60`	`contentDescription = stringResource(id = R.string.remove_button),`
`62`		`- tint = Color.Unspecified`
	`61`	`+ tint = MaterialTheme.colorScheme.error`
`63`	`62`	`)`
`64`	`63`	`},`
`65`	`64`	`title = {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ import androidx.compose.ui.Modifier`
`36`	`36`	`import androidx.compose.ui.draw.clip`
`37`	`37`	`import androidx.compose.ui.focus.FocusRequester`
`38`	`38`	`import androidx.compose.ui.focus.focusProperties`
`39`		`-import androidx.compose.ui.graphics.Color`
`40`	`39`	`import androidx.compose.ui.layout.ContentScale`
`41`	`40`	`import androidx.compose.ui.platform.testTag`
`42`	`41`	`import androidx.compose.ui.res.painterResource`
`@@ -269,7 +268,6 @@ private fun ColumnScope.LoginInput(`
`269`	`268`	`label = {`
`270`	`269`	`Text(`
`271`	`270`	`text = stringResource(id = R.string.login_description),`
`272`		`- color = Color.Unspecified,`
`273`	`271`	`maxLines = 1,`
`274`	`272`	`overflow = TextOverflow.Ellipsis`
`275`	`273`	`)`
`@@ -404,7 +402,6 @@ private fun AccountDropDownItem(`
`404`	`402`	`painter = painterResource(id = R.drawable.account_history_remove_pressed),`
`405`	`403`	`contentDescription = null,`
`406`	`404`	`modifier = Modifier.size(Dimens.listIconSize),`
`407`		`- tint = Color.Unspecified`
`408`	`405`	`)`
`409`	`406`	`}`
`410`	`407`	`}`