Skip to content

Commit f6878b1

Browse files
authored
ADFA-2117 | Force KTS and hide checkbox in Compose Activity template (#637)
feat(template): hide KTS checkbox and always enable KTS for Compose Activity ensures Compose projects are generated with Kotlin Script only
1 parent aec95c2 commit f6878b1

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

templates-api/src/main/java/com/itsaky/androidide/templates/base/base.kt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ inline fun baseProject(
6868
language: EnumParameter<Language> = projectLanguageParameter(),
6969
projectVersionData: ProjectVersionData = ProjectVersionData(),
7070
isToml: Boolean = false,
71+
showUseKts: Boolean = true,
7172
crossinline block: ProjectTemplateBuilder.() -> Unit
7273
): ProjectTemplate {
7374
return ProjectTemplateBuilder().apply {
@@ -100,13 +101,21 @@ inline fun baseProject(
100101
widgets(
101102
TextFieldWidget(projectName), TextFieldWidget(packageName),
102103
TextFieldWidget(saveLocation), SpinnerWidget(language),
103-
SpinnerWidget(minSdk), CheckBoxWidget(useKts)
104+
SpinnerWidget(minSdk)
104105
)
105106

107+
if (showUseKts) {
108+
widgets(CheckBoxWidget(useKts))
109+
}
110+
106111
// Setup the required properties before executing the recipe
107112
preRecipe = {
108113
this@apply._executor = this
109114

115+
if (!showUseKts) {
116+
useKts.setValue(true, notify = false)
117+
}
118+
110119
this@apply._data = ProjectTemplateData(
111120
projectName.value,
112121
File(saveLocation.value, projectName.value), projectVersionData,

templates-impl/src/main/java/com/itsaky/androidide/templates/impl/base.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,12 @@ internal inline fun baseProjectImpl(
6262
language: EnumParameter<Language> = projectLanguageParameter(),
6363
projectVersionData: ProjectVersionData = ProjectVersionData(),
6464
isToml: Boolean = false,
65+
showUseKts: Boolean = true,
6566
crossinline block: ProjectTemplateBuilder.() -> Unit
6667
): ProjectTemplate =
6768
baseProject(projectName = projectName, packageName = packageName,
6869
useKts = useKts, minSdk = minSdk, language = language,
69-
projectVersionData = projectVersionData, isToml = isToml) {
70+
projectVersionData = projectVersionData, isToml = isToml, showUseKts = showUseKts) {
7071
block()
7172

7273
// make sure we return a proper result

templates-impl/src/main/java/com/itsaky/androidide/templates/impl/composeActivity/composeActivityTemplate.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ fun composeActivityProject() =
4141
baseProjectImpl(
4242
language = composeLanguageParameter(),
4343
projectVersionData = ProjectVersionData(kotlin = composeKotlinVersion),
44-
isToml = true
44+
isToml = true,
45+
showUseKts = false
4546
) {
4647

4748
templateName = R.string.template_compose

0 commit comments

Comments
 (0)