next gen template initial version

app/build.gradle.kts

@@ -541,6 +541,7 @@ fun createAssetsZip(arch: String) {
 			"documentation.db",
 			bootstrapName,
 			"plugin-artifacts.zip",
+            "core.cgt"
 		).forEach { fileName ->
 			val filePath = sourceDir.resolve(fileName)
 			if (!filePath.exists()) {
@@ -1059,6 +1060,12 @@ val debugAssets =
 			"localMvnRepository.zip",
 			"debug",
 		),
+        Asset(
+          "assets/core.cgt",
+          "https://appdevforall.org/dev-assets/debug/core.cgt",
+          "core.cgt",
+          "debug",
+        ),
 	)
 
 val releaseAssets =
@@ -1111,6 +1118,12 @@ val releaseAssets =
 			"v8/bootstrap.zip.br",
 			"release",
 		),
+        Asset(
+          "assets/release/common/data/common/core.cgt.br",
+          "https://appdevforall.org/dev-assets/release/core.cgt.br",
+          "core.cgt.br",
+          "release",
+        ),
 	)
 
 fun assetsBatch(

app/src/main/java/com/itsaky/androidide/adapters/TemplateListAdapter.kt

@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.blankj.utilcode.util.ConvertUtils
+import com.bumptech.glide.Glide
 import com.google.android.material.shape.CornerFamily
 import com.itsaky.androidide.adapters.TemplateListAdapter.ViewHolder
 import com.itsaky.androidide.databinding.LayoutTemplateListItemBinding
@@ -37,6 +38,7 @@ class TemplateListAdapter(
 	private val onClick: ((Template<*>, ViewHolder) -> Unit)? = null,
 	private val onLongClick: ((Template<*>, View) -> Unit)? = null,
 ) : RecyclerView.Adapter<ViewHolder>() {
+
 	private val templates = templates.toMutableList()
 
 	class ViewHolder(
@@ -61,14 +63,24 @@ class TemplateListAdapter(
 		holder: ViewHolder,
 		position: Int,
 	) {
-		holder.binding.apply {
-			val template = templates[position]
-			if (template == Template.EMPTY) {
+
+        holder.binding.apply {
+            val template = templates[position]
+            if (template == Template.EMPTY) {
 				root.visibility = View.INVISIBLE
 				return@apply
 			}
-			templateName.text = templateName.context.getString(template.templateName)
-			templateIcon.setImageResource(template.thumb)
+
+            templateName.text = template.templateNameStr
+            if (template.thumbData != null) {
+                Glide.with(templateIcon.context)
+                    .asBitmap()
+                    .load(template.thumbData)
+                    .into(templateIcon)
+            } else {
+                templateIcon.setImageResource(template.thumb)
+            }
+
 			templateIcon.shapeAppearanceModel =
 				templateIcon.shapeAppearanceModel
 					.toBuilder()

app/src/main/java/com/itsaky/androidide/assets/AssetsInstallationHelper.kt

@@ -20,6 +20,7 @@ import org.adfa.constants.DOCUMENTATION_DB
 import org.adfa.constants.GRADLE_API_NAME_JAR_ZIP
 import org.adfa.constants.GRADLE_DISTRIBUTION_ARCHIVE_NAME
 import org.adfa.constants.LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME
+import org.adfa.constants.TEMPLATE_CORE_ARCHIVE
 import org.slf4j.LoggerFactory
 import com.itsaky.androidide.resources.R
 import java.io.File
@@ -113,7 +114,8 @@ object AssetsInstallationHelper {
 				BOOTSTRAP_ENTRY_NAME,
 				GRADLE_API_NAME_JAR_ZIP,
                 LLAMA_AAR,
-                PLUGIN_ARTIFACTS_ZIP
+                PLUGIN_ARTIFACTS_ZIP,
+                TEMPLATE_CORE_ARCHIVE,
 			)
 
 		val stagingDir = Files.createTempDirectory(UUID.randomUUID().toString())

app/src/main/java/com/itsaky/androidide/assets/BundledAssetsInstaller.kt

@@ -20,6 +20,8 @@ import org.adfa.constants.GRADLE_API_NAME_JAR_BR
 import org.adfa.constants.GRADLE_API_NAME_JAR_ZIP
 import org.adfa.constants.GRADLE_DISTRIBUTION_ARCHIVE_NAME
 import org.adfa.constants.LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME
+import org.adfa.constants.TEMPLATE_CORE_ARCHIVE
+import org.adfa.constants.TEMPLATE_CORE_ARCHIVE_BR
 import org.slf4j.LoggerFactory
 import java.io.File
 import java.io.FileNotFoundException
@@ -78,26 +80,36 @@ data object BundledAssetsInstaller : BaseAssetsInstaller() {
 					}
 				}
 
-				AssetsInstallationHelper.BOOTSTRAP_ENTRY_NAME -> {
+                TEMPLATE_CORE_ARCHIVE -> {
+                    val assetPath = ToolsManager.getCommonAsset(TEMPLATE_CORE_ARCHIVE_BR)
+                    BrotliInputStream(assets.open(assetPath)).use { input ->
+                        val destFile = Environment.TEMPLATES_DIR.resolve(TEMPLATE_CORE_ARCHIVE)
+                        destFile.outputStream().use { output ->
+                            input.copyTo(output)
+                        }
+                    }
+                }
+
+                AssetsInstallationHelper.BOOTSTRAP_ENTRY_NAME -> {
 					val assetPath =
 						ToolsManager.getCommonAsset("${AssetsInstallationHelper.BOOTSTRAP_ENTRY_NAME}.br")
 
 					val result = retryOnceOnNoSuchFile (
 						onFirstFailure = { Files.createDirectories(stagingDir) },
 						onSecondFailure = { e2 ->
-            	throw IOException(
-								context.getString(R.string.terminal_installation_failed_low_storage),
-								e2
-							)
-						}
-					) {
-						withTempZipChannel(
-							stagingDir = stagingDir,
-							prefix = "bootstrap",
-							writeTo = { path -> writeBrotliAssetToPath(context, assetPath, path) },
-							useChannel = { ch -> TerminalInstaller.installIfNeeded(context, ch) }
-						)
-					}
+                            throw IOException(
+                                            context.getString(R.string.terminal_installation_failed_low_storage),
+                                            e2
+                                        )
+                                    }
+                        ) {
+                            withTempZipChannel(
+                                stagingDir = stagingDir,
+                                prefix = "bootstrap",
+                                writeTo = { path -> writeBrotliAssetToPath(context, assetPath, path) },
+                                useChannel = { ch -> TerminalInstaller.installIfNeeded(context, ch) }
+                            )
+					    }
 
 					when (result) {
 						is TerminalInstaller.InstallResult.Success -> {}
@@ -217,6 +229,7 @@ data object BundledAssetsInstaller : BaseAssetsInstaller() {
         AssetsInstallationHelper.BOOTSTRAP_ENTRY_NAME -> 124120151L
         GRADLE_API_NAME_JAR_ZIP           -> 29447748L
         AssetsInstallationHelper.PLUGIN_ARTIFACTS_ZIP -> 86442L
+        TEMPLATE_CORE_ARCHIVE               -> 133120L
         else -> 0L
     }
 

app/src/main/java/com/itsaky/androidide/assets/SplitAssetsInstaller.kt

@@ -15,6 +15,7 @@ import org.adfa.constants.DOCUMENTATION_DB
 import org.adfa.constants.GRADLE_API_NAME_JAR_ZIP
 import org.adfa.constants.GRADLE_DISTRIBUTION_ARCHIVE_NAME
 import org.adfa.constants.LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME
+import org.adfa.constants.TEMPLATE_CORE_ARCHIVE
 import org.slf4j.LoggerFactory
 import java.io.File
 import java.io.FileNotFoundException
@@ -72,6 +73,13 @@ data object SplitAssetsInstaller : BaseAssetsInstaller() {
 								logger.debug("Completed extracting '{}' to dir: {}", entry.name, destDir)
 							}
 
+                            TEMPLATE_CORE_ARCHIVE -> {
+                                val coreCgt = Environment.TEMPLATES_DIR.resolve(TEMPLATE_CORE_ARCHIVE)
+                                coreCgt.outputStream().use { output ->
+                                    zipInput.copyTo(output)
+                                }
+                            }
+
                             AssetsInstallationHelper.BOOTSTRAP_ENTRY_NAME -> {
 								logger.debug("Extracting 'bootstrap.zip' to dir: {}", stagingDir)
 
@@ -194,6 +202,7 @@ data object SplitAssetsInstaller : BaseAssetsInstaller() {
         LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME -> 215389106L
         AssetsInstallationHelper.BOOTSTRAP_ENTRY_NAME -> 456462823L
         GRADLE_API_NAME_JAR_ZIP           -> 46758608L
+        TEMPLATE_CORE_ARCHIVE               -> 702001L
         else -> 0L
     }
 
@@ -203,6 +212,7 @@ data object SplitAssetsInstaller : BaseAssetsInstaller() {
 			ANDROID_SDK_ZIP -> Environment.ANDROID_HOME
 			LOCAL_MAVEN_REPO_ARCHIVE_ZIP_NAME -> Environment.LOCAL_MAVEN_DIR
 			GRADLE_API_NAME_JAR_ZIP -> Environment.GRADLE_GEN_JARS
+            TEMPLATE_CORE_ARCHIVE -> Environment.TEMPLATES_DIR
 			else -> throw IllegalStateException("Entry '$entryName' is not expected to be an archive")
 		}
 

app/src/main/java/com/itsaky/androidide/fragments/TemplateDetailsFragment.kt

@@ -136,8 +136,8 @@ class TemplateDetailsFragment :
                         name = result.data.name,
                         createdAt = now,
                         lastModified = now,
-                        templateName = getString(template.templateName),
-                        language = result.data.language.name
+                        templateName = template.templateNameStr,
+                        language = result.data.language?.name ?: "unknown"
                     )
                 )
 
@@ -163,6 +163,6 @@ class TemplateDetailsFragment :
         template ?: return
 
         binding.widgets.adapter = TemplateWidgetsListAdapter(template.widgets)
-        binding.title.setText(template.templateName)
+        binding.title.text = template.templateNameStr
     }
 }

common/src/main/java/com/itsaky/androidide/utils/Environment.java

@@ -120,6 +120,8 @@ public final class Environment {
 	public static final String NDK_TAR_XZ = "ndk-cmake.tar.xz";
 	public static File NDK_DIR;
 
+	public static File TEMPLATES_DIR;
+
 	public static String getArchitecture() {
 		return IDEBuildConfigProvider.getInstance().getCpuAbiName();
 	}
@@ -188,6 +190,8 @@ public static void init(Context context) {
 
 		NDK_DIR = new File(ANDROID_HOME, "ndk");
 
+		TEMPLATES_DIR = mkdirIfNotExists(new File(ANDROIDIDE_HOME, "templates"));
+
 		isInitialized.set(true);
 	}
 

composite-builds/build-deps-common/constants/src/main/java/org/adfa/constants/constants.kt

@@ -76,3 +76,8 @@ const val LOGSENDER_AAR_NAME = "logsender.aar"
 const val GRADLE_API_NAME_JAR = "gradle-api-$GRADLE_DISTRIBUTION_VERSION.jar"
 const val GRADLE_API_NAME_JAR_ZIP = "${GRADLE_API_NAME_JAR}.zip"
 const val GRADLE_API_NAME_JAR_BR = "${GRADLE_API_NAME_JAR}.br"
+
+// Templates archive
+const val TEMPLATE_ARCHIVE_EXTENSION = "cgt"
+const val TEMPLATE_CORE_ARCHIVE = "core.$TEMPLATE_ARCHIVE_EXTENSION"
+const val TEMPLATE_CORE_ARCHIVE_BR = "${TEMPLATE_CORE_ARCHIVE}.br"

gradle/libs.versions.toml

@@ -78,6 +78,9 @@ compose-compiler = "2.1.21"
 
 leakcanary = "2.14"
 
+pebble = "4.1.1"
+
+
 [libraries]
 
 # Dependencies in composite build
@@ -307,6 +310,8 @@ androidx-monitor = { group = "androidx.test", name = "monitor", version.ref = "m
 monitor = { group = "androidx.test", name = "monitor", version.ref = "monitorVersion" }
 org-json = { module = "org.json:json", version = "20210307"}
 
+pebble = { module = "io.pebbletemplates:pebble", version.ref = "pebble" }
+
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }

templates-api/build.gradle.kts

@@ -39,4 +39,6 @@ dependencies {
 	api(libs.androidx.annotation)
 	api(libs.androidx.appcompat)
 	api(libs.google.material)
+
+    implementation(libs.google.gson)
 }

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

@@ -199,5 +199,7 @@ class ProjectTemplateBuilder : ExecutorDataTemplateBuilder<ProjectTemplateRecipe
 			tooltipTag,
 			widgets!!,
 			recipe!!,
+            templateNameStr!!,
+            thumbData!!
 		)
 }

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

@@ -321,3 +321,103 @@ inline fun <R : FileTemplateRecipeResult> baseFile(
     return FileTemplateBuilder<R>(dir).apply(configurator)
         .build() as FileTemplate<R>
 }
+
+/**
+ * Setup base files for zip project templates.
+ *
+ * @param block Function to configure the template.
+ */
+inline fun baseZipProject(
+    projectName: StringParameter = projectNameParameter(),
+    packageName: StringParameter = packageNameParameter(),
+    useKts: BooleanParameter = useKtsParameter(),
+    minSdk: EnumParameter<Sdk> = minSdkParameter(),
+    language: EnumParameter<Language> = projectLanguageParameter(),
+    projectVersionData: ProjectVersionData = ProjectVersionData(),
+    isToml: Boolean = false,
+    showUseKts: Boolean = false,
+    showMinSdk: Boolean = true,
+    showLanguage: Boolean = true,
+    crossinline block: ProjectTemplateBuilder.() -> Unit
+): ProjectTemplate {
+    return ProjectTemplateBuilder().apply {
+
+        // When project name is changed, change the package name accordingly
+        projectName.observe { name ->
+            val newPackage = AndroidUtils.appNameToPackageName(name.value, packageName.value)
+            packageName.setValue(newPackage)
+        }
+
+        Environment.mkdirIfNotExists(Environment.PROJECTS_DIR)
+
+        val saveLocation = stringParameter {
+            name = R.string.wizard_save_location
+            default = Environment.PROJECTS_DIR.absolutePath
+            endIcon = { R.drawable.ic_folder }
+            constraints = listOf(NONEMPTY, DIRECTORY, EXISTS)
+            inputType =
+            android.text.InputType.TYPE_CLASS_TEXT or android.text.InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
+            imeOptions = android.view.inputmethod.EditorInfo.IME_ACTION_DONE
+            maxLines = 1
+            tooltipTag = "setup.save.location"
+        }
+
+        projectName.doBeforeCreateView {
+            it.setValue(getNewProjectName(saveLocation.value, projectName.value))
+        }
+
+        widgets(
+            TextFieldWidget(projectName), TextFieldWidget(packageName),
+            TextFieldWidget(saveLocation)
+        )
+
+        if (showLanguage) {
+            widgets(SpinnerWidget(language))
+        }
+
+        if (showMinSdk) {
+            widgets(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,
+                language = if (showLanguage) language.value else null,
+                useKts = useKts.value,
+                useToml = isToml
+            )
+
+            if (data.projectDir.exists() && data.projectDir.listFiles()
+                ?.isNotEmpty() == true
+            ) {
+                throw IllegalArgumentException("Project directory already exists")
+            }
+
+            setDefaultModuleData(
+                ModuleTemplateData(
+                    ":app", appName = data.name, packageName.value,
+                    data.moduleNameToDir(":app"), type = AndroidApp,
+                    language = if (showLanguage) language.value else null,
+                    minSdk = if (showMinSdk) minSdk.value else null,
+                    useKts = data.useKts, useToml = isToml
+                )
+            )
+        }
+
+        block()
+
+    }.build() as ProjectTemplate
+}