Skip to content

Commit 4c89963

Browse files
committed
fixed ui bugs in settings
1 parent 1cf3da6 commit 4c89963

5 files changed

Lines changed: 20 additions & 8 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import androidx.compose.runtime.CompositionLocalProvider
3434
import androidx.compose.ui.Alignment
3535
import androidx.compose.ui.Modifier
3636
import androidx.compose.ui.res.stringResource
37+
import androidx.compose.ui.text.font.FontWeight
3738
import androidx.compose.ui.unit.dp
3839
import com.dimension.maskbook.localization.R
3940
import com.dimension.maskbook.setting.export.model.BackupMeta
@@ -78,10 +79,10 @@ fun MetaItem(
7879
Row(
7980
verticalAlignment = Alignment.CenterVertically,
8081
) {
81-
Text(text = title)
82+
Text(text = title, style = MaterialTheme.typography.h5.copy(fontWeight = FontWeight.W500))
8283
Spacer(modifier = Modifier.weight(1f))
8384
CompositionLocalProvider(
84-
LocalTextStyle provides MaterialTheme.typography.button
85+
LocalTextStyle provides MaterialTheme.typography.h5
8586
) {
8687
Text(text = value)
8788
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fun EmailInputModal(
7070
maxLines = 1,
7171
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email),
7272
)
73-
if (!emailValid) {
73+
if (!emailValid && email.isNotEmpty()) {
7474
Spacer(modifier = Modifier.height(8.dp))
7575
Text(text = stringResource(R.string.scene_restore_tip_invalid_email_address), color = Color.Red)
7676
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.RowScope
2828
import androidx.compose.foundation.layout.padding
2929
import androidx.compose.runtime.Composable
3030
import androidx.compose.runtime.remember
31+
import androidx.compose.ui.Alignment
3132
import androidx.compose.ui.Modifier
3233
import androidx.compose.ui.semantics.Role
3334

@@ -36,6 +37,7 @@ fun MaskTransparentButton(
3637
onClick: () -> Unit,
3738
modifier: Modifier = Modifier,
3839
enabled: Boolean = true,
40+
verticalAlignment: Alignment.Vertical = Alignment.Top,
3941
contentPadding: PaddingValues = MaskButtonDefaults.defaultPaddingValues,
4042
content: @Composable RowScope.() -> Unit
4143
) {
@@ -49,7 +51,8 @@ fun MaskTransparentButton(
4951
onClick = { clickFlow.tryEmit(onClick) },
5052
role = Role.Button
5153
)
52-
.padding(contentPadding)
54+
.padding(contentPadding),
55+
verticalAlignment = verticalAlignment
5356
) {
5457
content()
5558
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fun PhoneInputModal(
7777
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Phone),
7878
)
7979
}
80-
if (!phoneValid) {
80+
if (!phoneValid && phone.isNotEmpty()) {
8181
Spacer(modifier = Modifier.height(8.dp))
8282
Text(text = stringResource(R.string.scene_restore_tip_invalid_mobile_number), color = Color.Red)
8383
}

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import androidx.compose.foundation.layout.width
3333
import androidx.compose.foundation.rememberScrollState
3434
import androidx.compose.foundation.verticalScroll
3535
import androidx.compose.material.Checkbox
36+
import androidx.compose.material.CheckboxDefaults
3637
import androidx.compose.material.CircularProgressIndicator
3738
import androidx.compose.material.Text
3839
import androidx.compose.runtime.Composable
@@ -42,6 +43,7 @@ import androidx.compose.runtime.getValue
4243
import androidx.compose.runtime.snapshotFlow
4344
import androidx.compose.ui.Alignment
4445
import androidx.compose.ui.Modifier
46+
import androidx.compose.ui.graphics.Color
4547
import androidx.compose.ui.res.stringResource
4648
import androidx.compose.ui.text.input.ImeAction
4749
import androidx.compose.ui.unit.dp
@@ -175,10 +177,16 @@ fun BackupLocalScene(
175177
onClick = {
176178
viewModel.setWithWallet(!withWallet)
177179
},
180+
verticalAlignment = Alignment.CenterVertically
178181
) {
179-
Checkbox(checked = withWallet, onCheckedChange = {
180-
viewModel.setWithWallet(it)
181-
})
182+
Checkbox(
183+
checked = withWallet, onCheckedChange = {
184+
viewModel.setWithWallet(it)
185+
},
186+
colors = CheckboxDefaults.colors(
187+
checkedColor = Color(0xFF1FB885)
188+
)
189+
)
182190
Spacer(modifier = Modifier.width(10.dp))
183191
MetaItem(
184192
title = stringResource(R.string.scene_setting_local_backup_local_wallet),

0 commit comments

Comments
 (0)