yilsem/aiturk-mobil
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

refactor(skills): reconcile duplicate components and drop dead category filter

Browse Source 
Use extracted components/SkillEditorDialog and SourceBadge.
Drop unused CategoryFilter enum.
This commit is contained in:
Hy4ri committed 2026-09-11 17:45:33 +03:00
1 parent 06f170e2a8
commit 4287723ab0
2 files changed
+2 -168
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/m57/hermescontrol/ui/skills/SkillsScreen.kt
+2 -164
View File
@@ -89,6 +89,8 @@ import com.m57.hermescontrol.ui.common.SkeletonListState
import com.m57.hermescontrol.ui.common.ToastEffect
import com.m57.hermescontrol.ui.common.listItemSpacing
import com.m57.hermescontrol.ui.common.toDetailRows
import com.m57.hermescontrol.ui.skills.components.SkillEditorDialog
import com.m57.hermescontrol.ui.skills.components.SourceBadge
internal const val CATEGORY_ALL = "All"
@@ -515,29 +517,6 @@ private fun SkillCard(
}
}
}
// ── Source Badge ───────────────────────────────────────────────────────
@Composable
private fun SourceBadge(source: String) {
val (color, label) =
when (source) {
"hub" -> MaterialTheme.colorScheme.tertiary to "hub"
"built-in" -> MaterialTheme.colorScheme.secondary to "built-in"
"optional" -> MaterialTheme.colorScheme.outline to "opt"
else -> MaterialTheme.colorScheme.outline to source
}
Surface(
color = color.copy(alpha = 0.15f),
shape = MaterialTheme.shapes.small,
) {
Text(
text = label,
style = MaterialTheme.typography.labelSmall,
color = color,
modifier = Modifier.padding(horizontal = 6.dp, vertical = 2.dp),
)
}
}
// ── Hub Browse View ─────────────────────────────────────────────────────
@@ -1270,144 +1249,3 @@ fun SkillPreviewDialog(
}
}
}
// ── Skill Editor Dialog (existing, preserved unchanged) ────────────────
@Composable
fun SkillEditorDialog(
skillName: String,
isLoading: Boolean,
initialContent: String?,
isSaving: Boolean,
saveSuccess: Boolean,
onSave: (String) -> Unit,
onDismiss: () -> Unit,
onClearSaveSuccess: () -> Unit,
) {
var contentText by remember(initialContent) { mutableStateOf(initialContent.orEmpty()) }
var showDiscardConfirm by remember { mutableStateOf(false) }
val hasChanges =
remember(initialContent, contentText) {
val original = initialContent.orEmpty()
original != contentText
}
LaunchedEffect(saveSuccess) {
if (saveSuccess) {
onClearSaveSuccess()
onDismiss()
}
}
Dialog(
onDismissRequest = {
if (hasChanges) {
showDiscardConfirm = true
} else {
onDismiss()
}
},
properties = DialogProperties(usePlatformDefaultWidth = false),
) {
Card(
modifier =
Modifier
.fillMaxSize()
.padding(16.dp),
colors =
CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surface,
),
) {
HermesScaffold(
title = { Text(stringResource(R.string.skills_edit_title, skillName)) },
navigationIcon =
NavIcon.Back(
onBack = {
if (hasChanges) {
showDiscardConfirm = true
} else {
onDismiss()
}
},
),
actions = {
if (!isLoading) {
IconButton(
onClick = { onSave(contentText) },
enabled = !isSaving,
) {
if (isSaving) {
CircularProgressIndicator(
modifier = Modifier.fillMaxSize(0.6f),
strokeWidth = 2.dp,
color = MaterialTheme.colorScheme.onSurface,
)
} else {
Icon(
imageVector = Icons.Filled.Save,
contentDescription = stringResource(R.string.content_desc_save_changes),
)
}
}
}
},
) { padding ->
Box(
modifier =
Modifier
.fillMaxSize(),
) {
when {
isLoading -> {
LoadingState()
}
else -> {
OutlinedTextField(
value = contentText,
onValueChange = { contentText = it },
modifier =
Modifier
.fillMaxSize()
.padding(16.dp),
textStyle =
TextStyle(
fontFamily = FontFamily.Monospace,
color = MaterialTheme.colorScheme.onSurface,
),
placeholder = {
Text(stringResource(R.string.skills_content_placeholder))
},
)
}
}
}
}
}
}
if (showDiscardConfirm) {
AlertDialog(
onDismissRequest = { showDiscardConfirm = false },
title = { Text(stringResource(R.string.skills_discard_title)) },
text = { Text(stringResource(R.string.skills_discard_message)) },
confirmButton = {
TextButton(
onClick = {
showDiscardConfirm = false
onDismiss()
},
) {
Text(stringResource(R.string.action_discard))
}
},
dismissButton = {
TextButton(onClick = { showDiscardConfirm = false }) {
Text(stringResource(R.string.action_cancel))
}
},
)
}
}
app/src/main/java/com/m57/hermescontrol/ui/skills/SkillsViewModel.kt
-4
View File
@@ -39,10 +39,6 @@ enum class SkillFilter(
DISABLED(R.string.skills_status_disabled),
}
enum class CategoryFilter {
ALL,
}
data class SkillsUiState(
val isLoading: Boolean = false,
val skills: List<Skill> = emptyList(),