Merge branch 'stage' into feat/ADFA-3125-filetree-drag-and-drop

Author: jatezzz

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

@@ -23,6 +23,7 @@ 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 com.itsaky.androidide.utils.flashError
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
@@ -131,7 +132,7 @@ object AssetsInstallationHelper {
 				true
 			} catch (e: FileNotFoundException) {
 				logger.error("ZIP file not found: {}", e.message)
-				onProgress(Progress("${e.message}"))
+                flashError("File not found - ${e.message}")
 				false
 			} catch (e: ZipException) {
 				logger.error("Invalid ZIP format: {}", e.message)

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

@@ -37,7 +37,8 @@ data object SplitAssetsInstaller : BaseAssetsInstaller() {
 	): Unit =
 		withContext(Dispatchers.IO) {
 			if (!Environment.SPLIT_ASSETS_ZIP.exists()) {
-				throw FileNotFoundException("Assets zip file not found at path: ${Environment.SPLIT_ASSETS_ZIP.path}")
+				throw FileNotFoundException("Assets zip file not found at path: ${Environment.SPLIT_ASSETS_ZIP.path}." +
+                        " Please check Slack #qa-testing-builds channel for the latest version.")
 			}
 
 			zipFile = ZipFile(Environment.SPLIT_ASSETS_ZIP)

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

@@ -10,6 +10,7 @@ data class TemplateJson(
     val version: String?,
     val tooltipTag: String = "",
     val defaultSaveLocation: String? = null,
+    val defaultAppName: String? = null,
     val parameters: ParametersJson? = null,
     val system: SystemParametersJson? = null
 )

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

@@ -37,6 +37,7 @@ class ZipRecipeExecutor(
 
     companion object {
         private val log = LoggerFactory.getLogger(ZipRecipeExecutor::class.java)
+        private val CLASS_NAME_PATTERN = Regex("[^a-zA-Z0-9]")
     }
 
     override fun execute(
@@ -73,7 +74,10 @@ class ZipRecipeExecutor(
                 .syntax(customSyntax)
                 .build()
 
-            val (identifiers, warnings) = metaJson.pebbleParams(data, defModule, params)
+            val className = data.name.replace(CLASS_NAME_PATTERN, "")
+            val (baseIdentifiers, warnings) = metaJson.pebbleParams(data, defModule, params)
+            val identifiers = baseIdentifiers + (KEY_CLASS_NAME to className)
+
             if (warnings.isNotEmpty()) {
                 warn("Identifier warnings: ${warnings.joinToString(System.lineSeparator())}")
             }
@@ -98,6 +102,7 @@ class ZipRecipeExecutor(
 
                 val relativePath = normalized.removePrefix("$basePath/")
                     .replace(packageName.value, defModule.packageName.replace(".", "/"))
+                .replace(KEY_CLASS_NAME, className)
 
                 val outFile = File(projectDir, relativePath.removeSuffix(TEMPLATE_EXTENSION)).canonicalFile
 
@@ -223,10 +228,8 @@ class ZipRecipeExecutor(
         if (saveLocation.usedDefault) warnings += "Missing 'saveLocation', defaulted to $KEY_SAVE_LOCATION"
 
         val language = resolveString(parameters?.optional?.language?.identifier, KEY_LANGUAGE)
-        if (language.usedDefault) warnings += "Missing 'language', defaulted to $KEY_LANGUAGE"
 
         val minSdk = resolveString(parameters?.optional?.minsdk?.identifier, KEY_MIN_SDK)
-        if (minSdk.usedDefault) warnings += "Missing 'minsdk', defaulted to $KEY_MIN_SDK"
 
         val agpVersion = resolveString(system?.agpVersion?.identifier, KEY_AGP_VERSION)
         if (agpVersion.usedDefault) warnings += "Missing 'agpVersion', defaulted to $KEY_AGP_VERSION"

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

@@ -17,6 +17,7 @@ const val DELIM_COMMENT_CLOSE = "#}"
 
 const val KEY_PACKAGE_NAME  = "PACKAGE_NAME"
 const val KEY_APP_NAME = "APP_NAME"
+const val KEY_CLASS_NAME = "CLASS_NAME"
 const val KEY_SAVE_LOCATION = "SAVE_LOCATION"
 const val KEY_AGP_VERSION = "AGP_VERSION"
 const val KEY_KOTLIN_VERSION = "KOTLIN_VERSION"

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

@@ -13,6 +13,7 @@ import com.itsaky.androidide.templates.TextFieldWidget
 import com.itsaky.androidide.templates.Widget
 import com.itsaky.androidide.templates.base.baseZipProject
 import com.itsaky.androidide.templates.booleanParameter
+import com.itsaky.androidide.templates.projectNameParameter
 import com.itsaky.androidide.templates.stringParameter
 import com.itsaky.androidide.utils.FeatureFlags
 import org.slf4j.LoggerFactory
@@ -35,7 +36,10 @@ object ZipTemplateReader {
         try {
             ZipFile(zipFile).use { zip ->
 
-                val indexEntry = zip.getEntry(ARCHIVE_JSON) ?: return emptyList()
+                val indexEntry = requireNotNull(zip.getEntry(ARCHIVE_JSON)) {
+                    "${zip.name} does not contain $ARCHIVE_JSON"
+                }
+
                 val indexJson = zip.getInputStream(indexEntry).bufferedReader().use {
                     gson.fromJson(it, TemplatesIndex::class.java)
                 }
@@ -86,6 +90,9 @@ object ZipTemplateReader {
                         }
 
                         val project = baseZipProject(
+                            projectName = projectNameParameter {
+                                metaJson.defaultAppName?.let { default = it }
+                            },
                             showLanguage = (metaJson.parameters?.optional?.language != null),
                             showMinSdk = (metaJson.parameters?.optional?.minsdk != null),
                             showPackageName = (metaJson.parameters?.required?.packageName != null),