Merge branch 'stage' into ADFA-2883-git-pull-push

Author: dara-abijo-adfa

app/src/main/java/com/itsaky/androidide/activities/MainActivity.kt

@@ -400,7 +400,7 @@ class MainActivity : EdgeToEdgeIDEActivity() {
 		builder.show()
 	}
 
-	internal fun openProject(root: File, project: RecentProject? = null) {
+	internal fun openProject(root: File, project: RecentProject? = null, hasTemplateIssues: Boolean = false) {
 		ProjectManagerImpl.getInstance().projectPath = root.absolutePath
         GeneralPreferences.lastOpenedProject = root.absolutePath
 
@@ -416,7 +416,7 @@ class MainActivity : EdgeToEdgeIDEActivity() {
         }
 
 		// Track project open in Firebase Analytics
-		analyticsManager.trackProjectOpened(root.absolutePath)
+        analyticsManager.trackProjectOpened(root.absolutePath)
 
 		if (isFinishing) {
 			return
@@ -425,6 +425,9 @@ class MainActivity : EdgeToEdgeIDEActivity() {
 		val intent =
 			Intent(this, EditorActivityKt::class.java).apply {
 				putExtra("PROJECT_PATH", root.absolutePath)
+                if (hasTemplateIssues) {
+                    putExtra("HAS_TEMPLATE_ISSUES", true)
+                }
 				addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
 			}
 

app/src/main/java/com/itsaky/androidide/activities/editor/BaseEditorActivity.kt

@@ -178,6 +178,7 @@ abstract class BaseEditorActivity :
 	private val fileManagerViewModel by viewModels<FileManagerViewModel>()
 	private var feedbackButtonManager: FeedbackButtonManager? = null
 	private var immersiveController: LandscapeImmersiveController? = null
+	private val topEdgeThreshold by lazy { SizeUtils.dp2px(TOP_EDGE_SWIPE_THRESHOLD_DP) }
 
 	var isDestroying = false
 		protected set
@@ -398,6 +399,7 @@ abstract class BaseEditorActivity :
 		protected val log: Logger = LoggerFactory.getLogger(BaseEditorActivity::class.java)
 
 		private const val OPTIONS_MENU_INVALIDATION_DELAY = 150L
+		private const val TOP_EDGE_SWIPE_THRESHOLD_DP = 60f
 
 		const val EDITOR_CONTAINER_SCALE_FACTOR = 0.87f
 		const val KEY_BOTTOM_SHEET_SHOWN = "editor_bottomSheetShown"
@@ -1436,16 +1438,39 @@ abstract class BaseEditorActivity :
 						velocityX: Float,
 						velocityY: Float,
 					): Boolean {
+						if (e1 == null) return false
+
+						val diffX = e2.x - e1.x
+						val diffY = e2.y - e1.y
+
+						val isVerticalSwipe = abs(diffY) > abs(diffX)
+						val isHorizontalSwipe = abs(diffX) > abs(diffY)
+
+						val hasDownFlingDistance = diffY > flingDistanceThreshold
+						val hasRightFlingDistance = diffX > flingDistanceThreshold
+
+						val hasVerticalVelocity = abs(velocityY) > flingVelocityThreshold
+						val hasHorizontalVelocity = abs(velocityX) > flingVelocityThreshold
+
+						// Check for a swipe down (to show top bar)
+						// This is placed before the noFilesOpen check so it works while editing
+						val isLandscape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+						val startedNearTopEdge = e1.y < topEdgeThreshold
+
+						if (isLandscape && startedNearTopEdge && hasDownFlingDistance && hasVerticalVelocity && isVerticalSwipe) {
+							immersiveController?.showTopBar()
+							return true
+						}
+
 						// Check if no files are open by looking at the displayedChild of the view flipper
 						val noFilesOpen = content.viewContainer.displayedChild == 1
 						if (!noFilesOpen) {
 							return false // If files are open, do nothing
 						}
 
-						val diffX = e2.x - (e1?.x ?: 0f)
-
 						// Check for a right swipe (to open left drawer) - This part is still correct
-						if (diffX > flingDistanceThreshold && abs(velocityX) > flingVelocityThreshold) {
+						// Added abs(diffX) > abs(diffY) to prevent diagonal swipes from triggering this
+						if (hasRightFlingDistance && hasHorizontalVelocity && isHorizontalSwipe) {
 							// Use the correct binding for the drawer layout
 							binding.editorDrawerLayout.openDrawer(GravityCompat.START)
 							return true

app/src/main/java/com/itsaky/androidide/activities/editor/LandscapeImmersiveController.kt

@@ -230,7 +230,7 @@ class LandscapeImmersiveController(
         bottomToggle.isVisible = visible
     }
 
-    private fun showTopBar(animate: Boolean = true) {
+     fun showTopBar(animate: Boolean = true) {
         isTopBarRequestedVisible = true
         topBar.setExpanded(true, animate)
     }

app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt

@@ -214,6 +214,11 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 
 		observeStates()
 		startServices()
+
+        if (intent.getBooleanExtra("HAS_TEMPLATE_ISSUES", false)) {
+            flashError(getString(string.msg_template_warnings))
+        }
+
 	}
 
 	private fun observeStates() {

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

@@ -138,7 +138,8 @@ class TemplateDetailsFragment :
                     // open the project
                     (requireActivity() as MainActivity).openProject(
                         result.data.projectDir,
-                        project = project
+                        project = project,
+                        hasTemplateIssues = result.hasErrorsWarnings
                     )
                 }
             }

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

@@ -29,6 +29,8 @@ import com.itsaky.androidide.idetooltips.TooltipManager
 import com.itsaky.androidide.idetooltips.TooltipTag.EXIT_TO_MAIN
 import com.itsaky.androidide.templates.ITemplateProvider
 import com.itsaky.androidide.templates.ProjectTemplate
+import com.itsaky.androidide.templates.impl.TemplateProviderImpl
+import com.itsaky.androidide.utils.flashError
 import com.itsaky.androidide.viewmodel.MainViewModel
 import org.slf4j.LoggerFactory
 
@@ -115,11 +117,9 @@ class TemplateListFragment :
 
 		log.debug("Reloading templates...")
 
-		val templates =
-			ITemplateProvider
-				.getInstance(reload = true)
-				.getTemplates()
-				.filterIsInstance<ProjectTemplate>()
+        val provider = ITemplateProvider.getInstance(reload = true)
+        val templates = provider.getTemplates().filterIsInstance<ProjectTemplate>()
+		val warnings = (provider as? TemplateProviderImpl)?.warnings.orEmpty()
 
 		adapter =
 			TemplateListAdapter(
@@ -140,5 +140,9 @@ class TemplateListFragment :
 			)
 		binding.list.adapter = adapter
 		updateSpanCount()
-	}
+
+		if (warnings.isNotEmpty()) {
+			requireActivity().flashError(warnings.joinToString("\n"))
+		}
+    }
 }

resources/src/main/res/values/strings.xml

@@ -1016,6 +1016,8 @@
 	<string name="checkbox_delete_source_after_install">Delete installation file after install</string>
 	<string name="init_failed_with_reason">%1$s: %2$s</string>
 
+	<string name="msg_template_warnings">\n\nProject creation finished with warnings/errors. Open IDE Logs for details.</string>
+
 	<!-- Name of the notification channel which is used to show notifications for wireless debugging -->
 	<string name="notification_channel_adb_pairing">Wireless debugging pairing</string>
 

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

@@ -58,7 +58,10 @@ val data: D
 /**
  * Result of recipe execution for a [ProjectTemplate].
  */
-interface ProjectTemplateRecipeResult : TemplateRecipeResultWithData<ProjectTemplateData>
+interface ProjectTemplateRecipeResult : TemplateRecipeResultWithData<ProjectTemplateData> {
+    val hasErrorsWarnings: Boolean
+        get() = false
+}
 
 /**
  * Result of recipe execution for a [ModuleTemplate].

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

@@ -44,6 +44,7 @@ class TemplateProviderImpl : ITemplateProvider {
     }
 
     private val templates = mutableMapOf<String, Template<*>>()
+    val warnings: MutableList<String> = mutableListOf()
 
     init {
         reload()
@@ -55,14 +56,15 @@ class TemplateProviderImpl : ITemplateProvider {
 
         for (zipFile in list) {
             try {
-                val zipTemplates = ZipTemplateReader.read(zipFile) { json, params, path, data, defModule ->
+                val zipTemplates = ZipTemplateReader.read(zipFile, warnings) { json, params, path, data, defModule ->
                     ZipRecipeExecutor({ ZipFile(zipFile) }, json, params, path, data, defModule)
                 }
 
                 for (t in zipTemplates) {
                     templates[t.templateId] = t
                 }
             } catch (e: Exception) {
+                warnings.add("Failed to load template archive $zipFile error: ${e.message}")
                 log.error("Failed to load template from archive: $zipFile", e)
             }
         }
@@ -78,6 +80,7 @@ class TemplateProviderImpl : ITemplateProvider {
 
     override fun reload() {
         release()
+        warnings.clear()
         initializeTemplates()
     }
 

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

@@ -25,17 +25,18 @@ import com.itsaky.androidide.templates.base.ModuleTemplateBuilder
 import com.itsaky.androidide.templates.base.ProjectTemplateBuilder
 
 data class ProjectTemplateRecipeResultImpl(
-  override val data: ProjectTemplateData
+    override val data: ProjectTemplateData,
+    override val hasErrorsWarnings: Boolean = false
 ) : ProjectTemplateRecipeResult
 
 data class ModuleTemplateRecipeResultImpl(override val data: ModuleTemplateData
 ) : ModuleTemplateRecipeResult
 
 
 internal fun ProjectTemplateBuilder.recipeResult(): ProjectTemplateRecipeResult {
-  return ProjectTemplateRecipeResultImpl(data)
+    return ProjectTemplateRecipeResultImpl(data)
 }
 
 internal fun ModuleTemplateBuilder.recipeResult(): ModuleTemplateRecipeResult {
-  return ModuleTemplateRecipeResultImpl(data)
+    return ModuleTemplateRecipeResultImpl(data)
 }