Merge branch 'stage' into ADFA-4322

Author: Daniel-ADFA

.github/workflows/gh2jira.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           project: 'ADFA' 
           issuetype: 'Story' 
-          summary: 'GitHub Issue: ${{ github.event.issue.title }}'
+          summary: 'GHI: ${{ github.event.issue.title }}'
           description: |
             *GitHub Issue:* #${{ github.event.issue.number }}
             *URL:* ${{ github.event.issue.html_url }}

.mcp.json

@@ -3,6 +3,15 @@
     "sentry": {
       "type": "http",
       "url": "https://mcp.sentry.dev/mcp"
+    },
+    "sonarqube": {
+      "command": "sonar",
+      "args": [
+        "run",
+        "mcp",
+        "--project",
+        "appdevforall_CodeOnTheGo"
+      ]
     }
   }
-}
+}

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

@@ -82,6 +82,7 @@ import com.google.android.material.tabs.TabLayout.Tab
 import com.itsaky.androidide.FeedbackButtonManager
 import com.itsaky.androidide.R
 import com.itsaky.androidide.R.string
+import com.itsaky.androidide.activities.MainActivity
 import com.itsaky.androidide.actions.build.DebugAction
 import com.itsaky.androidide.adapters.DiagnosticsAdapter
 import com.itsaky.androidide.adapters.SearchListAdapter
@@ -111,6 +112,7 @@ import com.itsaky.androidide.models.Range
 import com.itsaky.androidide.models.SearchResult
 import com.itsaky.androidide.plugins.manager.ui.PluginEditorTabManager
 import com.itsaky.androidide.preferences.internal.BuildPreferences
+import com.itsaky.androidide.preferences.internal.GeneralPreferences
 import com.itsaky.androidide.projects.IProjectManager
 import com.itsaky.androidide.projects.ProjectManagerImpl
 import com.itsaky.androidide.services.debug.DebuggerService
@@ -631,11 +633,35 @@ abstract class BaseEditorActivity :
 		builder.show()
 	}
 
+	/**
+	 * Restores the project path on recreation (saved state, launch intent, or last opened
+	 * project) and routes back to MainActivity if none is available, rather than crashing while
+	 * building the editor UI.
+	 */
 	override fun onCreate(savedInstanceState: Bundle?) {
-		savedInstanceState?.getString(KEY_PROJECT_PATH)
-			?.let(ProjectManagerImpl.getInstance()::projectPath::set)
+		// The OS can recreate EditorActivity after process death without routing through
+		// MainActivity, leaving the ProjectManagerImpl singleton's lateinit projectPath unset.
+		// Restore it from the saved state, the launch intent, or the last opened project.
+		val restoredProjectPath =
+			savedInstanceState?.getString(KEY_PROJECT_PATH)?.takeIf { it.isNotBlank() }
+				?: intent?.getStringExtra("PROJECT_PATH")?.takeIf { it.isNotBlank() }
+				?: GeneralPreferences.lastOpenedProject
+					.takeIf { it.isNotBlank() && it != GeneralPreferences.NO_OPENED_PROJECT }
+		if (restoredProjectPath != null) {
+			ProjectManagerImpl.getInstance().projectPath = restoredProjectPath
+		}
 		super.onCreate(savedInstanceState)
 
+		// If we still have no project path after every fallback, we cannot safely build the
+		// editor UI (setupToolbar -> getProjectName dereferences the project path). Route the
+		// user back to MainActivity instead of crashing.
+		if (ProjectManagerImpl.getInstance().projectDirPath.isBlank()) {
+			log.warn("No project path available in EditorActivity.onCreate(); returning to MainActivity")
+			startActivity(Intent(this, MainActivity::class.java))
+			finish()
+			return
+		}
+
 		editorViewModel.isBuildInProgress = false
 		editorViewModel.isInitializing = false
 
@@ -670,6 +696,7 @@ abstract class BaseEditorActivity :
 
 		setupStateObservers()
 		setupFullscreenObserver()
+		setupBottomSheetObserver()
 		setupViews()
 
 		fullscreenManager = FullscreenManager(
@@ -1327,11 +1354,29 @@ abstract class BaseEditorActivity :
 			repeatOnLifecycle(Lifecycle.State.STARTED) {
 				editorViewModel.uiState.collectLatest { uiState ->
 					fullscreenManager?.render(uiState.isFullscreen, animate = true)
+					updateSwipeRevealDragState()
 				}
 			}
 		}
 	}
 
+	private fun setupBottomSheetObserver() {
+		lifecycleScope.launch {
+			repeatOnLifecycle(Lifecycle.State.STARTED) {
+				bottomSheetViewModel.sheetState.collectLatest { _ ->
+					updateSwipeRevealDragState()
+				}
+			}
+		}
+	}
+
+	private fun updateSwipeRevealDragState() {
+		val isFullscreen = editorViewModel.isFullscreen
+		val isBottomSheetOpen = bottomSheetViewModel.sheetBehaviorState != STATE_COLLAPSED &&
+				bottomSheetViewModel.sheetBehaviorState != STATE_HIDDEN
+		binding.swipeReveal.setVerticalDragEnabled(!isFullscreen && !isBottomSheetOpen)
+	}
+
 	private fun setupViews() {
 		setupNoEditorView()
 		setupBottomSheet()
@@ -1583,7 +1628,13 @@ abstract class BaseEditorActivity :
 								hasHorizontalVelocity &&
 								isHorizontalSwipe
 
-						// Fullscreen mode can be dismissed with an inward fling from either vertical edge.
+						val isBottomSheetOpen = bottomSheetViewModel.sheetBehaviorState != STATE_COLLAPSED &&
+								bottomSheetViewModel.sheetBehaviorState != STATE_HIDDEN
+
+						if (isBottomSheetOpen) {
+							return false
+						}
+
 						if (isTopEdgeDismissFling && editorViewModel.isFullscreen) {
 							editorViewModel.exitFullscreen()
 							return true

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

@@ -24,6 +24,7 @@ import android.content.res.Configuration
 import android.os.Bundle
 import android.text.TextUtils
 import android.util.Log
+import android.util.TypedValue
 import android.view.KeyEvent
 import android.view.View
 import android.view.ViewGroup.LayoutParams
@@ -32,6 +33,8 @@ import androidx.collection.MutableIntObjectMap
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.GravityCompat
 import androidx.core.view.doOnNextLayout
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.lifecycleScope
 import com.blankj.utilcode.util.ImageUtils
 import com.google.android.material.tabs.TabLayout
@@ -63,6 +66,7 @@ import com.itsaky.androidide.eventbus.events.editor.DocumentChangeEvent
 import com.itsaky.androidide.eventbus.events.file.FileRenameEvent
 import com.itsaky.androidide.activities.PluginManagerActivity
 import com.itsaky.androidide.eventbus.events.plugin.PluginCrashedEvent
+import com.itsaky.androidide.eventbus.events.preferences.PreferenceChangeEvent
 import com.itsaky.androidide.idetooltips.TooltipManager
 import com.itsaky.androidide.idetooltips.TooltipTag
 import com.itsaky.androidide.interfaces.IEditorHandler
@@ -73,6 +77,7 @@ import com.itsaky.androidide.models.Range
 import com.itsaky.androidide.models.SaveResult
 import com.itsaky.androidide.plugins.manager.build.PluginBuildActionManager
 import com.itsaky.androidide.plugins.manager.fragment.PluginFragmentFactory
+import com.itsaky.androidide.preferences.internal.EditorPreferences
 import com.itsaky.androidide.plugins.manager.ui.PluginDrawableResolver
 import com.itsaky.androidide.plugins.manager.ui.PluginEditorTabManager
 import com.itsaky.androidide.projects.ProjectManagerImpl
@@ -90,6 +95,7 @@ import com.itsaky.androidide.utils.EditorSidebarActions
 import com.itsaky.androidide.utils.IntentUtils.openImage
 import com.itsaky.androidide.utils.UniqueNameBuilder
 import com.itsaky.androidide.utils.flashSuccess
+import com.itsaky.androidide.utils.forEachViewRecursively
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
@@ -98,6 +104,7 @@ import org.adfa.constants.CONTENT_KEY
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import java.io.File
+import java.util.WeakHashMap
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.atomic.AtomicBoolean
@@ -125,6 +132,22 @@ open class EditorHandlerActivity :
 
 	private val pluginTabIndices = mutableMapOf<String, Int>()
 	private val tabIndexToPluginId = mutableMapOf<Int, String>()
+	private var lastAppliedPluginFontScale = EditorPreferences.editorFontScale
+	private val pluginTextBaseSizes = WeakHashMap<TextView, Float>()
+
+	private val pluginFontScalingListener = object : FragmentManager.FragmentLifecycleCallbacks() {
+		override fun onFragmentViewCreated(
+			mFragmentManager: FragmentManager,
+			mFragment: Fragment,
+			view: View,
+			savedInstanceState: Bundle?
+		) {
+			val scale = EditorPreferences.editorFontScale
+			if (scale != 1f && isPluginFragment(mFragment)) {
+				applyPluginFontScale(view, scale)
+			}
+		}
+	}
 	private val shortcutManager by lazy { ShortcutManager(applicationContext) }
 
 	private var pluginEditorProvider: EditorProviderImpl? = null
@@ -194,6 +217,8 @@ open class EditorHandlerActivity :
 		mBuildEventListener.setActivity(this)
 		super.onCreate(savedInstanceState)
 
+		supportFragmentManager.registerFragmentLifecycleCallbacks(pluginFontScalingListener, true)
+
 		editorViewModel._displayedFile.observe(
 			this,
 		) { fileIndex ->
@@ -392,25 +417,38 @@ open class EditorHandlerActivity :
 		}
 
 		restoreOpenedPluginTabs()
+		syncPluginUiFontSize()
 	}
 
+	/**
+	 * Restores the plugin tabs cached from the previous session, running the
+	 * SharedPreferences IO and Gson decode off the main thread to avoid a startup UI stall.
+	 */
 	private fun restoreOpenedPluginTabs() {
-		try {
-			val prefs = (application as BaseApplication).prefManager
-			val json = prefs.getString(PREF_KEY_OPEN_PLUGIN_TABS, null) ?: return
+		lifecycleScope.launch {
+			try {
+				val prefs = (application as BaseApplication).prefManager
+				val json = withContext(Dispatchers.IO) {
+					prefs.getString(PREF_KEY_OPEN_PLUGIN_TABS, null)
+				} ?: return@launch
 
-			val tabIds = Gson().fromJson(json, Array<String>::class.java)?.toList() ?: return
-			Log.d("EditorHandlerActivity", "Restoring plugin tabs: $tabIds")
+				// Decoding the cached JSON off the main thread avoids a UI stall on startup.
+				val tabIds = withContext(Dispatchers.Default) {
+					Gson().fromJson(json, Array<String>::class.java)?.toList()
+				} ?: return@launch
+				Log.d("EditorHandlerActivity", "Restoring plugin tabs: $tabIds")
 
-			tabIds.forEach { tabId ->
-				if (!pluginTabIndices.containsKey(tabId)) {
-					selectPluginTabById(tabId)
+				// Tab selection touches UI state, so keep it on the main thread.
+				tabIds.forEach { tabId ->
+					if (!pluginTabIndices.containsKey(tabId)) {
+						selectPluginTabById(tabId)
+					}
 				}
-			}
 
-			prefs.putString(PREF_KEY_OPEN_PLUGIN_TABS, null)
-		} catch (e: Exception) {
-			Log.e("EditorHandlerActivity", "Failed to restore plugin tabs", e)
+				withContext(Dispatchers.IO) { prefs.putString(PREF_KEY_OPEN_PLUGIN_TABS, null) }
+			} catch (e: Exception) {
+				Log.e("EditorHandlerActivity", "Failed to restore plugin tabs", e)
+			}
 		}
 	}
 
@@ -1113,6 +1151,49 @@ open class EditorHandlerActivity :
 		showPluginCrashDialog(event)
 	}
 
+	@Subscribe(threadMode = ThreadMode.MAIN)
+	fun onPreferenceChanged(event: PreferenceChangeEvent) {
+		if (event.key == EditorPreferences.FONT_SIZE) {
+			syncPluginUiFontSize()
+		}
+	}
+
+	private fun syncPluginUiFontSize() {
+		val scale = EditorPreferences.editorFontScale
+		if (scale == lastAppliedPluginFontScale) {
+			return
+		}
+		lastAppliedPluginFontScale = scale
+
+		val pluginFragments = mutableListOf<Fragment>()
+		collectPluginFragments(supportFragmentManager, pluginFragments)
+		pluginFragments.forEach { fragment ->
+			fragment.view?.let { applyPluginFontScale(it, scale) }
+		}
+	}
+
+	private fun isPluginFragment(fragment: Fragment): Boolean =
+		fragment.javaClass.classLoader !== javaClass.classLoader
+
+	private fun applyPluginFontScale(root: View, scale: Float) {
+		root.forEachViewRecursively { view ->
+			if (view is TextView) {
+				val baseSize = pluginTextBaseSizes.getOrPut(view) { view.textSize }
+				view.setTextSize(TypedValue.COMPLEX_UNIT_PX, baseSize * scale)
+			}
+		}
+	}
+
+	private fun collectPluginFragments(manager: FragmentManager, into: MutableList<Fragment>) {
+		manager.fragments.forEach { fragment ->
+			if (isPluginFragment(fragment)) {
+				into.add(fragment)
+			} else {
+				collectPluginFragments(fragment.childFragmentManager, into)
+			}
+		}
+	}
+
 	private fun showPluginCrashDialog(event: PluginCrashedEvent) {
 		val dialogView = layoutInflater.inflate(R.layout.dialog_plugin_crash, null)
 		dialogView.findViewById<TextView>(R.id.plugin_crash_message).text =

app/src/main/java/com/itsaky/androidide/agent/fragments/AgentFragmentContainer.kt

@@ -21,6 +21,13 @@ class AgentFragmentContainer : EmptyStateFragment<FragmentAgentContainerBinding>
 		super.onViewCreated(view, savedInstanceState)
 		emptyStateViewModel.setEmptyMessage("No git actions yet")
 		emptyStateViewModel.setEmpty(false)
+	}
+
+	// Deferred to onResume so the disclaimer only fires when the Agent tab is
+	// actually visible. ViewPager2 + FragmentStateAdapter pre-creates adjacent
+	// pages through onViewCreated; only the visible page reaches onResume.
+	override fun onResume() {
+		super.onResume()
 		showDisclaimerDialogIfNeeded()
 	}