Merge pull request #278 from DimensionDev/bugfix/ui

Bugfix/UI

Author: Tlaster

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

@@ -23,14 +23,12 @@ package com.dimension.maskbook.common.ui.widget
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.LocalContentAlpha
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.sp
@@ -41,11 +39,9 @@ fun NameImage(
     modifier: Modifier = Modifier,
     color: Color = MaterialTheme.colors.primary,
     style: TextStyle? = null,
-    alpha: Float = LocalContentAlpha.current,
 ) {
     BoxWithConstraints(
         modifier = modifier
-            .alpha(alpha)
             .background(color, shape = CircleShape),
         contentAlignment = Alignment.Center,
     ) {

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

@@ -23,9 +23,11 @@ package com.dimension.maskbook.common.ui.widget.button
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.size
+import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 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.unit.dp
 import com.dimension.maskbook.common.ext.applyTextStyle
@@ -36,16 +38,26 @@ fun MaskListItemButton(
     onClick: () -> Unit,
     @DrawableRes icon: Int,
     trailing: @Composable (() -> Unit)? = null,
+    tint: Color? = null,
     text: @Composable (() -> Unit),
 ) {
     MaskButton(onClick = onClick) {
         MaskListItem(
             icon = {
-                Image(
-                    painter = painterResource(icon),
-                    contentDescription = null,
-                    modifier = Modifier.size(32.dp),
-                )
+                if (tint != null) {
+                    Icon(
+                        painter = painterResource(icon),
+                        contentDescription = null,
+                        modifier = Modifier.size(32.dp),
+                        tint = tint,
+                    )
+                } else {
+                    Image(
+                        painter = painterResource(icon),
+                        contentDescription = null,
+                        modifier = Modifier.size(32.dp),
+                    )
+                }
             },
             text = text,
             trailing = applyTextStyle(MaterialTheme.typography.h5, trailing),

persona/src/androidMain/kotlin/com/dimension/maskbook/persona/ui/scenes/PersonaMenuScene.kt

@@ -22,7 +22,6 @@ package com.dimension.maskbook.persona.ui.scenes
 
 import android.net.Uri
 import android.util.Base64
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -223,10 +222,11 @@ private fun MenuItem(
             modifier = Modifier.padding(16.dp),
             verticalAlignment = Alignment.CenterVertically,
         ) {
-            Image(
+            Icon(
                 painterResource(id = icon),
                 contentDescription = null,
-                modifier = Modifier.size(32.dp)
+                modifier = Modifier.size(32.dp),
+                tint = MaterialTheme.colors.primary,
             )
             Spacer(modifier = Modifier.width(8.dp))
             Text(text = title, style = MaterialTheme.typography.h5, modifier = Modifier.weight(1f))

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

@@ -24,6 +24,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -65,19 +66,22 @@ fun WalletManagementModal(
                 },
                 trailing = {
                     Text(text = walletData?.name.orEmpty())
-                }
+                },
+                tint = MaterialTheme.colors.primary,
             )
             if (walletData != null && !walletData.fromWalletConnect) {
                 MaskListItemButton(
                     onClick = onBackup,
                     icon = R.drawable.ic_back_up,
+                    tint = MaterialTheme.colors.primary,
                 ) {
                     Text(text = stringResource(R.string.scene_personas_action_backup))
                 }
             }
             MaskListItemButton(
                 onClick = onTransactionHistory,
                 icon = R.drawable.ic_transaction_history,
+                tint = MaterialTheme.colors.primary,
             ) {
                 Text(text = stringResource(R.string.scene_wallet_detail_wallet_items_history))
             }

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

@@ -190,7 +190,6 @@ fun WalletSwitchSceneModal(
                             NameImage(
                                 name = wallet.name,
                                 modifier = Modifier.size(32.dp),
-                                alpha = 1f,
                                 color = wallet.name.walletColor
                             )
                         },