Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ inline fun baseProject(
language: EnumParameter<Language> = projectLanguageParameter(),
projectVersionData: ProjectVersionData = ProjectVersionData(),
isToml: Boolean = false,
showUseKts: Boolean = true,
crossinline block: ProjectTemplateBuilder.() -> Unit
): ProjectTemplate {
return ProjectTemplateBuilder().apply {
Expand Down Expand Up @@ -100,13 +101,21 @@ inline fun baseProject(
widgets(
TextFieldWidget(projectName), TextFieldWidget(packageName),
TextFieldWidget(saveLocation), SpinnerWidget(language),
SpinnerWidget(minSdk), CheckBoxWidget(useKts)
SpinnerWidget(minSdk)
)

if (showUseKts) {
widgets(CheckBoxWidget(useKts))
}

// Setup the required properties before executing the recipe
preRecipe = {
this@apply._executor = this

if (!showUseKts) {
useKts.setValue(true, notify = false)
}

this@apply._data = ProjectTemplateData(
projectName.value,
File(saveLocation.value, projectName.value), projectVersionData,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,12 @@ internal inline fun baseProjectImpl(
language: EnumParameter<Language> = projectLanguageParameter(),
projectVersionData: ProjectVersionData = ProjectVersionData(),
isToml: Boolean = false,
showUseKts: Boolean = true,
crossinline block: ProjectTemplateBuilder.() -> Unit
): ProjectTemplate =
baseProject(projectName = projectName, packageName = packageName,
useKts = useKts, minSdk = minSdk, language = language,
projectVersionData = projectVersionData, isToml = isToml) {
projectVersionData = projectVersionData, isToml = isToml, showUseKts = showUseKts) {
block()

// make sure we return a proper result
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ fun composeActivityProject() =
baseProjectImpl(
language = composeLanguageParameter(),
projectVersionData = ProjectVersionData(kotlin = composeKotlinVersion),
isToml = true
isToml = true,
showUseKts = false
) {

templateName = R.string.template_compose
Expand Down