merge: W52C —— 退出登录从小图标按钮改成带文字的危险行条目,图标换 Remove
This commit is contained in:
commit
aace581fb0
1 file changed
+15
-17
@@ -1,11 +1,8 @@
|
|||||||
package top.yeij.cyrene.ui.settings
|
package top.yeij.cyrene.ui.settings
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.rememberScrollState
|
import androidx.compose.foundation.rememberScrollState
|
||||||
@@ -14,7 +11,6 @@ import androidx.compose.runtime.Composable
|
|||||||
import androidx.compose.runtime.collectAsState
|
import androidx.compose.runtime.collectAsState
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
import androidx.compose.runtime.rememberCoroutineScope
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
@@ -25,15 +21,16 @@ import top.yeij.cyrene.core.prefs.InterruptMode
|
|||||||
import top.yeij.cyrene.core.prefs.ThemeMode
|
import top.yeij.cyrene.core.prefs.ThemeMode
|
||||||
import top.yeij.cyrene.ui.common.PreferenceCard
|
import top.yeij.cyrene.ui.common.PreferenceCard
|
||||||
import top.yukonga.miuix.kmp.basic.BasicComponent
|
import top.yukonga.miuix.kmp.basic.BasicComponent
|
||||||
|
import top.yukonga.miuix.kmp.basic.BasicComponentDefaults
|
||||||
import top.yukonga.miuix.kmp.basic.Icon
|
import top.yukonga.miuix.kmp.basic.Icon
|
||||||
import top.yukonga.miuix.kmp.basic.IconButton
|
import top.yukonga.miuix.kmp.basic.IconButton
|
||||||
import top.yukonga.miuix.kmp.basic.Scaffold
|
import top.yukonga.miuix.kmp.basic.Scaffold
|
||||||
import top.yukonga.miuix.kmp.basic.SmallTopAppBar
|
import top.yukonga.miuix.kmp.basic.SmallTopAppBar
|
||||||
import top.yukonga.miuix.kmp.basic.Text
|
import top.yukonga.miuix.kmp.basic.Text
|
||||||
import top.yukonga.miuix.kmp.icon.MiuixIcons
|
import top.yukonga.miuix.kmp.icon.MiuixIcons
|
||||||
import top.yukonga.miuix.kmp.icon.extended.Back
|
|
||||||
import top.yukonga.miuix.kmp.icon.extended.ChevronBackward
|
import top.yukonga.miuix.kmp.icon.extended.ChevronBackward
|
||||||
import top.yukonga.miuix.kmp.icon.extended.ChevronForward
|
import top.yukonga.miuix.kmp.icon.extended.ChevronForward
|
||||||
|
import top.yukonga.miuix.kmp.icon.extended.Remove
|
||||||
import top.yukonga.miuix.kmp.preference.SwitchPreference
|
import top.yukonga.miuix.kmp.preference.SwitchPreference
|
||||||
import top.yukonga.miuix.kmp.theme.MiuixTheme
|
import top.yukonga.miuix.kmp.theme.MiuixTheme
|
||||||
|
|
||||||
@@ -149,22 +146,23 @@ fun SettingsScreen(
|
|||||||
}
|
}
|
||||||
|
|
||||||
Spacer(Modifier.height(32.dp))
|
Spacer(Modifier.height(32.dp))
|
||||||
|
// 图标不能再用 Back(左箭头)——真机上它看着就是「返回」,这条曾经难找得主人翻了半天。
|
||||||
|
// Miuix 没有专门的登出/退出字形(Basic 只有 7 个图标),extended 里最贴切的是 Remove:
|
||||||
|
// 它画的是「箭头离开方框」,语义就是移出/离开。
|
||||||
PreferenceCard {
|
PreferenceCard {
|
||||||
Row(
|
BasicComponent(
|
||||||
modifier = Modifier
|
title = "退出登录",
|
||||||
.fillMaxWidth()
|
titleColor = BasicComponentDefaults.titleColor(color = MiuixTheme.colorScheme.error),
|
||||||
.padding(vertical = 8.dp),
|
startAction = {
|
||||||
horizontalArrangement = Arrangement.Center,
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
) {
|
|
||||||
IconButton(onClick = onLogout) {
|
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = MiuixIcons.Back,
|
imageVector = MiuixIcons.Remove,
|
||||||
contentDescription = "登出",
|
// 文字已经把这条读出来了,图标再说一遍只会让读屏重复。
|
||||||
|
contentDescription = null,
|
||||||
tint = MiuixTheme.colorScheme.error,
|
tint = MiuixTheme.colorScheme.error,
|
||||||
)
|
)
|
||||||
}
|
},
|
||||||
}
|
onClick = onLogout,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
Spacer(Modifier.height(32.dp))
|
Spacer(Modifier.height(32.dp))
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user