Skip to content

Commit aa4464f

Browse files
committed
fix menu item tint
1 parent ddf7b49 commit aa4464f

3 files changed

Lines changed: 25 additions & 8 deletions

File tree

  • common/src/androidMain/kotlin/com/dimension/maskbook/common/ui/widget/button
  • setting/src/androidMain/kotlin/com/dimension/maskbook/setting/ui/scenes
  • wallet/src/androidMain/kotlin/com/dimension/maskbook/wallet/ui/scenes/wallets/management

common/src/androidMain/kotlin/com/dimension/maskbook/common/ui/widget/button/MaskListButton.kt

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ package com.dimension.maskbook.common.ui.widget.button
2323
import androidx.annotation.DrawableRes
2424
import androidx.compose.foundation.Image
2525
import androidx.compose.foundation.layout.size
26+
import androidx.compose.material.Icon
2627
import androidx.compose.material.MaterialTheme
2728
import androidx.compose.runtime.Composable
2829
import androidx.compose.ui.Modifier
30+
import androidx.compose.ui.graphics.Color
2931
import androidx.compose.ui.res.painterResource
3032
import androidx.compose.ui.unit.dp
3133
import com.dimension.maskbook.common.ext.applyTextStyle
@@ -36,16 +38,26 @@ fun MaskListItemButton(
3638
onClick: () -> Unit,
3739
@DrawableRes icon: Int,
3840
trailing: @Composable (() -> Unit)? = null,
41+
tint: Color? = null,
3942
text: @Composable (() -> Unit),
4043
) {
4144
MaskButton(onClick = onClick) {
4245
MaskListItem(
4346
icon = {
44-
Image(
45-
painter = painterResource(icon),
46-
contentDescription = null,
47-
modifier = Modifier.size(32.dp),
48-
)
47+
if (tint != null) {
48+
Icon(
49+
painter = painterResource(icon),
50+
contentDescription = null,
51+
modifier = Modifier.size(32.dp),
52+
tint = tint,
53+
)
54+
} else {
55+
Image(
56+
painter = painterResource(icon),
57+
contentDescription = null,
58+
modifier = Modifier.size(32.dp),
59+
)
60+
}
4961
},
5062
text = text,
5163
trailing = applyTextStyle(MaterialTheme.typography.h5, trailing),

setting/src/androidMain/kotlin/com/dimension/maskbook/setting/ui/scenes/SettingsScene.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,10 @@ fun SettingsItem(
322322
Text(text = title)
323323
},
324324
icon = {
325-
Icon(
325+
Image(
326326
painter = painterResource(id = icon),
327327
contentDescription = null,
328328
modifier = Modifier.size(32.dp),
329-
tint = MaterialTheme.colors.primary,
330329
)
331330
},
332331
trailing = {

wallet/src/androidMain/kotlin/com/dimension/maskbook/wallet/ui/scenes/wallets/management/WalletManagementModal.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import androidx.compose.foundation.layout.Arrangement
2424
import androidx.compose.foundation.layout.Column
2525
import androidx.compose.foundation.layout.fillMaxWidth
2626
import androidx.compose.material.ExperimentalMaterialApi
27+
import androidx.compose.material.MaterialTheme
2728
import androidx.compose.material.Text
2829
import androidx.compose.runtime.Composable
2930
import androidx.compose.ui.Modifier
@@ -65,26 +66,30 @@ fun WalletManagementModal(
6566
},
6667
trailing = {
6768
Text(text = walletData?.name.orEmpty())
68-
}
69+
},
70+
tint = MaterialTheme.colors.primary,
6971
)
7072
if (walletData != null && !walletData.fromWalletConnect) {
7173
MaskListItemButton(
7274
onClick = onBackup,
7375
icon = R.drawable.ic_back_up,
76+
tint = MaterialTheme.colors.primary,
7477
) {
7578
Text(text = stringResource(R.string.scene_personas_action_backup))
7679
}
7780
}
7881
MaskListItemButton(
7982
onClick = onTransactionHistory,
8083
icon = R.drawable.ic_transaction_history,
84+
tint = MaterialTheme.colors.primary,
8185
) {
8286
Text(text = stringResource(R.string.scene_wallet_detail_wallet_items_history))
8387
}
8488
if (walletData != null && walletData.fromWalletConnect) {
8589
MaskListItemButton(
8690
onClick = onDisconnect,
8791
icon = R.drawable.ic_disconnect,
92+
tint = MaterialTheme.colors.primary,
8893
) {
8994
Text(
9095
text = stringResource(R.string.scene_wallet_connect_disconnect),
@@ -95,6 +100,7 @@ fun WalletManagementModal(
95100
MaskListItemButton(
96101
onClick = onDelete,
97102
icon = R.drawable.ic_delete_wallet,
103+
tint = MaterialTheme.colors.primary,
98104
) {
99105
Text(
100106
text = stringResource(R.string.scene_wallet_edit_item_delete),

0 commit comments

Comments
 (0)