* fix(#290): use LocalHermesStatusColors instead of magic colors (CODE-33) * fix(#290): replace boolean-flag params with sealed NavIcon class (CODE-37) * fix(#290): resolve compilation errors — Color import + nullable NavIcon params --------- Co-authored-by: M57 <hy4ri@users.noreply.github.com>
This commit is contained in:
1 parent
cc40658661
commit
f190b67ee6
22 files changed
+73
-42
No files matched your search
@@ -49,6 +49,7 @@ import com.m57.hermescontrol.ui.common.ErrorState
|
||||
import com.m57.hermescontrol.ui.common.FilterChipRow
|
||||
import com.m57.hermescontrol.ui.common.HermesScaffold
|
||||
import com.m57.hermescontrol.ui.common.LoadingState
|
||||
import com.m57.hermescontrol.ui.common.NavIcon
|
||||
import com.m57.hermescontrol.ui.common.SearchBar
|
||||
import com.m57.hermescontrol.ui.common.ToastEffect
|
||||
import com.m57.hermescontrol.ui.common.listContentPadding
|
||||
@@ -113,7 +114,7 @@ fun SkillsScreen(
|
||||
|
||||
HermesScaffold(
|
||||
title = { Text(stringResource(R.string.screen_skills)) },
|
||||
onOpenDrawer = onOpenDrawer,
|
||||
navigationIcon = onOpenDrawer?.let { NavIcon.Menu(it) },
|
||||
isRefreshing = state.isLoading,
|
||||
onRefresh = { viewModel.loadSkills() },
|
||||
) {
|
||||
@@ -378,14 +379,16 @@ fun SkillEditorDialog(
|
||||
) {
|
||||
HermesScaffold(
|
||||
title = { Text(stringResource(R.string.skills_edit_title, skillName)) },
|
||||
onBack = {
|
||||
if (hasChanges) {
|
||||
showDiscardConfirm = true
|
||||
} else {
|
||||
onDismiss()
|
||||
}
|
||||
},
|
||||
showBack = true,
|
||||
navigationIcon =
|
||||
NavIcon.Back(
|
||||
onBack = {
|
||||
if (hasChanges) {
|
||||
showDiscardConfirm = true
|
||||
} else {
|
||||
onDismiss()
|
||||
}
|
||||
},
|
||||
),
|
||||
actions = {
|
||||
if (!isLoading) {
|
||||
IconButton(
|
||||
|
||||
Reference in new issue
Block a user