Skip to content

Commit a2bbe7a

Browse files
committed
More cleanup
1 parent 8ca4943 commit a2bbe7a

File tree

4 files changed

+7
-13
lines changed

4 files changed

+7
-13
lines changed

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt

+1-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import androidx.compose.runtime.Composable
1313
import androidx.compose.ui.Alignment
1414
import androidx.compose.ui.Modifier
1515
import androidx.compose.ui.graphics.Color
16-
import androidx.compose.ui.graphics.ColorFilter
1716
import androidx.compose.ui.res.painterResource
1817
import androidx.compose.ui.text.style.TextOverflow
1918
import androidx.compose.ui.tooling.preview.Preview
@@ -67,10 +66,7 @@ fun NavigationComposeCell(
6766
showWarning: Boolean = false,
6867
textColor: Color = MaterialTheme.colorScheme.onSurface,
6968
bodyView: @Composable () -> Unit = {
70-
DefaultNavigationView(
71-
chevronContentDescription = title,
72-
tint = textColor
73-
)
69+
DefaultNavigationView(chevronContentDescription = title, tint = textColor)
7470
},
7571
isRowEnabled: Boolean = true,
7672
onClick: () -> Unit,

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ApiAccessListScreen.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import androidx.compose.runtime.Composable
1313
import androidx.compose.runtime.getValue
1414
import androidx.compose.ui.Alignment
1515
import androidx.compose.ui.Modifier
16-
import androidx.compose.ui.graphics.ColorFilter
1716
import androidx.compose.ui.platform.testTag
1817
import androidx.compose.ui.res.painterResource
1918
import androidx.compose.ui.res.stringResource
@@ -189,8 +188,8 @@ private fun ApiAccessMethodItem(
189188
subtitleColor = MaterialTheme.colorScheme.onSecondary,
190189
bodyView = {
191190
DefaultNavigationView(
192-
apiAccessMethodSetting.name.value,
193-
ColorFilter.tint(MaterialTheme.colorScheme.onSecondary)
191+
chevronContentDescription = apiAccessMethodSetting.name.value,
192+
tint = MaterialTheme.colorScheme.onSecondary
194193
)
195194
},
196195
onCellClicked = { onApiAccessMethodClick(apiAccessMethodSetting) }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ private fun Content(onPrivacyPolicyLinkClicked: () -> Unit) {
189189
.padding(start = 2.dp, top = 2.dp)
190190
.width(10.dp)
191191
.height(10.dp),
192-
tint = Color.Unspecified
192+
tint = MaterialTheme.colorScheme.onSurface
193193
)
194194
}
195195
}

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import androidx.compose.material3.Text
1414
import androidx.compose.runtime.Composable
1515
import androidx.compose.runtime.getValue
1616
import androidx.compose.ui.Modifier
17-
import androidx.compose.ui.graphics.ColorFilter
1817
import androidx.compose.ui.platform.LocalContext
1918
import androidx.compose.ui.platform.testTag
2019
import androidx.compose.ui.res.stringResource
@@ -214,7 +213,7 @@ private fun FaqAndGuides(context: Context) {
214213
@Composable {
215214
DefaultExternalLinkView(
216215
chevronContentDescription = faqGuideLabel,
217-
colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface)
216+
tint = MaterialTheme.colorScheme.onSurface
218217
)
219218
},
220219
onClick = {
@@ -231,8 +230,8 @@ private fun PrivacyPolicy(context: Context, state: SettingsUiState) {
231230
bodyView =
232231
@Composable {
233232
DefaultExternalLinkView(
234-
privacyPolicyLabel,
235-
ColorFilter.tint(MaterialTheme.colorScheme.onSurface)
233+
chevronContentDescription = privacyPolicyLabel,
234+
tint = MaterialTheme.colorScheme.onSurface
236235
)
237236
},
238237
onClick = {

0 commit comments

Comments
 (0)