Skip to content

Commit fd05d7d

Browse files
committed
Refactor SettingsContent to move save action to GeneralSettingsTab for improved structure and clarity
1 parent dbee049 commit fd05d7d

1 file changed

Lines changed: 16 additions & 23 deletions

File tree

  • src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/manager/settings

src/main/kotlin/com/github/cnrture/quickprojectwizard/toolwindow/manager/settings/SettingsContent.kt

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -50,28 +50,6 @@ fun SettingsContent() {
5050
.background(QPWTheme.colors.black)
5151
.padding(24.dp),
5252
backgroundColor = QPWTheme.colors.black,
53-
bottomBar = {
54-
Box(
55-
modifier = Modifier
56-
.fillMaxWidth()
57-
.padding(16.dp),
58-
contentAlignment = Alignment.CenterEnd,
59-
) {
60-
QPWActionCard(
61-
title = "Save",
62-
icon = Icons.Rounded.Save,
63-
actionColor = QPWTheme.colors.lightGray,
64-
type = QPWActionCardType.MEDIUM,
65-
onClick = {
66-
currentSettings = currentSettings.copy(
67-
defaultPackageName = packageName,
68-
preferredModuleType = selectedModuleType
69-
)
70-
settings.loadState(currentSettings)
71-
},
72-
)
73-
}
74-
}
7553
) { padding ->
7654
Column(
7755
modifier = Modifier
@@ -127,6 +105,13 @@ fun SettingsContent() {
127105
"general" -> GeneralSettingsTab(
128106
defaultPackageName = packageName,
129107
preferredModuleType = selectedModuleType,
108+
onSaveClick = {
109+
currentSettings = currentSettings.copy(
110+
defaultPackageName = packageName,
111+
preferredModuleType = selectedModuleType
112+
)
113+
settings.loadState(currentSettings)
114+
},
130115
onPackageNameChange = { packageName = it },
131116
onModuleTypeChange = { selectedModuleType = it }
132117
)
@@ -338,6 +323,7 @@ private fun ModuleTemplateCard(
338323
private fun GeneralSettingsTab(
339324
defaultPackageName: String,
340325
preferredModuleType: String,
326+
onSaveClick: () -> Unit,
341327
onPackageNameChange: (String) -> Unit,
342328
onModuleTypeChange: (String) -> Unit,
343329
) {
@@ -354,7 +340,6 @@ private fun GeneralSettingsTab(
354340
onValueChange = onPackageNameChange,
355341
)
356342
}
357-
358343
SettingItem("Preferred Module Type") {
359344
Row(
360345
modifier = Modifier.fillMaxWidth(),
@@ -377,6 +362,14 @@ private fun GeneralSettingsTab(
377362
)
378363
}
379364
}
365+
QPWActionCard(
366+
modifier = Modifier.align(Alignment.End),
367+
title = "Save",
368+
icon = Icons.Rounded.Save,
369+
actionColor = QPWTheme.colors.lightGray,
370+
type = QPWActionCardType.MEDIUM,
371+
onClick = onSaveClick,
372+
)
380373
}
381374
}
382375

0 commit comments

Comments
 (0)