Skip to content

Commit 0a9a180

Browse files
author
ADFA
committed
Daily merge from stage to main
2 parents 93fc161 + 1daa343 commit 0a9a180

21 files changed

Lines changed: 334 additions & 76 deletions

File tree

‎app/src/main/java/com/itsaky/androidide/actions/debug/KillVmAction.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.itsaky.androidide.actions.debug
33
import android.content.Context
44
import com.itsaky.androidide.R
55
import com.itsaky.androidide.actions.ActionData
6+
import com.itsaky.androidide.idetooltips.TooltipTag
67

78
/**
89
* @author Akash Yadav
@@ -13,6 +14,7 @@ class KillVmAction(
1314
override val id = "ide.debug.stop-vm"
1415
override var label = context.getString(R.string.debugger_kill)
1516
override val order = 4
17+
override var tooltipTag = TooltipTag.DEBUGGER_ACTION_KILL
1618

1719
override suspend fun execAction(data: ActionData) {
1820
debugClient.killVm()

‎app/src/main/java/com/itsaky/androidide/actions/debug/RestartVmAction.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.content.Context
44
import com.itsaky.androidide.R
55
import com.itsaky.androidide.actions.ActionData
66
import com.itsaky.androidide.actions.requireContext
7+
import com.itsaky.androidide.idetooltips.TooltipTag
78
import com.itsaky.androidide.utils.IntentUtils
89
import kotlinx.coroutines.Dispatchers
910
import kotlinx.coroutines.delay
@@ -19,6 +20,7 @@ class RestartVmAction(
1920
override val id = "ide.debug.restart-vm"
2021
override var label = context.getString(R.string.debugger_restart)
2122
override val order = 5
23+
override var tooltipTag = TooltipTag.DEBUGGER_ACTION_RESTART
2224

2325
companion object {
2426
val RESTART_DELAY = 1.seconds

‎app/src/main/java/com/itsaky/androidide/actions/debug/StepIntoAction.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.itsaky.androidide.actions.debug
33
import android.content.Context
44
import com.itsaky.androidide.R
55
import com.itsaky.androidide.actions.ActionData
6+
import com.itsaky.androidide.idetooltips.TooltipTag
67

78
/**
89
* @author Akash Yadav
@@ -13,6 +14,7 @@ class StepIntoAction(
1314
override val id = "ide.debug.step-into"
1415
override var label = context.getString(R.string.debugger_step_into)
1516
override val order = 2
17+
override var tooltipTag = TooltipTag.DEBUGGER_ACTION_STEP_INTO
1618

1719
override suspend fun execAction(data: ActionData) {
1820
debugClient.stepInto()

‎app/src/main/java/com/itsaky/androidide/actions/debug/StepOutAction.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.itsaky.androidide.actions.debug
33
import android.content.Context
44
import com.itsaky.androidide.R
55
import com.itsaky.androidide.actions.ActionData
6+
import com.itsaky.androidide.idetooltips.TooltipTag
67

78
/**
89
* @author Akash Yadav
@@ -13,6 +14,7 @@ class StepOutAction(
1314
override val id = "ide.debug.step-out"
1415
override var label = context.getString(R.string.debugger_step_out)
1516
override val order = 3
17+
override var tooltipTag = TooltipTag.DEBUGGER_ACTION_STEP_OUT
1618

1719
override suspend fun execAction(data: ActionData) {
1820
debugClient.stepOut()

‎app/src/main/java/com/itsaky/androidide/actions/debug/StepOverAction.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.itsaky.androidide.actions.debug
33
import android.content.Context
44
import com.itsaky.androidide.R
55
import com.itsaky.androidide.actions.ActionData
6+
import com.itsaky.androidide.idetooltips.TooltipTag
67

78
/**
89
* @author Akash Yadav
@@ -13,6 +14,7 @@ class StepOverAction(
1314
override val id = "ide.debug.step-over"
1415
override var label = context.getString(R.string.debugger_step_over)
1516
override val order = 1
17+
override var tooltipTag = TooltipTag.DEBUGGER_ACTION_STEP_OVER
1618

1719
override suspend fun execAction(data: ActionData) {
1820
debugClient.stepOver()

‎app/src/main/java/com/itsaky/androidide/actions/debug/SuspendResumeVmAction.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.core.content.ContextCompat
55
import com.itsaky.androidide.R
66
import com.itsaky.androidide.actions.ActionData
77
import com.itsaky.androidide.actions.requireContext
8+
import com.itsaky.androidide.idetooltips.TooltipTag
89

910
/**
1011
* @author Akash Yadav
@@ -16,6 +17,7 @@ class SuspendResumeVmAction(
1617
override val id = "ide.debug.suspend-resume"
1718
override var label = context.getString(R.string.debugger_suspend)
1819
override val order = 0
20+
override var tooltipTag = TooltipTag.DEBUGGER_ACTION_PAUSE_RESUME
1921

2022
override fun prepare(data: ActionData) {
2123
super.prepare(data)

‎app/src/main/java/com/itsaky/androidide/actions/etc/FindInProjectAction.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class FindInProjectAction() : EditorActivityAction() {
6666

6767
override suspend fun execAction(data: ActionData): Boolean {
6868
val context = data.getActivity() ?: return false
69-
val dialog = context.findInProjectDialog
69+
val dialog = context.findInProjectDialog ?: return false
7070

7171
return run {
7272
dialog.show()

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

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ import com.itsaky.androidide.databinding.LayoutDiagnosticInfoBinding
8787
import com.itsaky.androidide.events.InstallationEvent
8888
import com.itsaky.androidide.fragments.debug.DebuggerFragment
8989
import com.itsaky.androidide.fragments.output.ShareableOutputFragment
90-
import com.itsaky.androidide.fragments.sidebar.EditorSidebarFragment
9190
import com.itsaky.androidide.fragments.sidebar.FileTreeFragment
9291
import com.itsaky.androidide.handlers.EditorActivityLifecyclerObserver
9392
import com.itsaky.androidide.handlers.LspHandler.registerLanguageServers
@@ -351,6 +350,7 @@ abstract class BaseEditorActivity :
351350
private val flingVelocityThreshold by lazy { SizeUtils.dp2px(100f) }
352351

353352
private var editorAppBarInsetTop: Int = 0
353+
private var sidebarLastInsetTop: Int = 0
354354

355355
companion object {
356356
private const val TAG = "ResizePanelDebugger"
@@ -452,15 +452,32 @@ abstract class BaseEditorActivity :
452452

453453
override fun onApplyWindowInsets(insets: WindowInsetsCompat) {
454454
super.onApplyWindowInsets(insets)
455-
val height = contentCardRealHeight ?: return
455+
456456
val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
457+
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
457458

458-
_binding?.content?.bottomSheet?.setImeVisible(imeInsets.bottom > 0)
459-
_binding?.contentCard?.updateLayoutParams<ViewGroup.LayoutParams> {
460-
this.height = height - imeInsets.bottom
461-
}
459+
_binding?.content?.editorAppBarLayout?.updatePadding(top = systemBars.top)
460+
applySidebarInsets(systemBars)
462461

463462
val isImeVisible = imeInsets.bottom > 0
463+
_binding?.content?.bottomSheet?.setImeVisible(isImeVisible)
464+
465+
_binding?.contentCard?.apply {
466+
when {
467+
isImeVisible -> {
468+
contentCardRealHeight?.let { baseHeight ->
469+
updateLayoutParams<ViewGroup.LayoutParams> {
470+
height = (baseHeight - imeInsets.bottom).coerceAtLeast(0)
471+
}
472+
}
473+
}
474+
else -> {
475+
updateLayoutParams<ViewGroup.LayoutParams> { height = ViewGroup.LayoutParams.MATCH_PARENT }
476+
post { contentCardRealHeight = measuredHeight }
477+
}
478+
}
479+
}
480+
464481
if (this.isImeVisible != isImeVisible) {
465482
this.isImeVisible = isImeVisible
466483
onSoftInputChanged()
@@ -470,16 +487,13 @@ abstract class BaseEditorActivity :
470487
override fun onApplySystemBarInsets(insets: Insets) {
471488
super.onApplySystemBarInsets(insets)
472489
editorAppBarInsetTop = insets.top
473-
this._binding?.apply {
474-
(supportFragmentManager.findFragmentById(R.id.drawer_sidebar) as? EditorSidebarFragment)
475-
?.onApplyWindowInsets(insets)
490+
}
476491

477-
content.apply {
478-
editorAppBarLayout.updatePadding(
479-
top = insets.top,
480-
)
481-
}
482-
}
492+
private fun applySidebarInsets(systemBars: Insets) {
493+
val sidebar = _binding?.drawerSidebar ?: return
494+
val baseTop = sidebar.paddingTop - sidebarLastInsetTop
495+
sidebarLastInsetTop = systemBars.top
496+
sidebar.updatePadding(top = baseTop + systemBars.top)
483497
}
484498

485499
@Subscribe(threadMode = MAIN)

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import com.itsaky.androidide.models.OpenedFile
6060
import com.itsaky.androidide.models.OpenedFilesCache
6161
import com.itsaky.androidide.models.Range
6262
import com.itsaky.androidide.models.SaveResult
63+
import com.itsaky.androidide.plugins.manager.fragment.PluginFragmentFactory
6364
import com.itsaky.androidide.plugins.manager.ui.PluginEditorTabManager
6465
import com.itsaky.androidide.preferences.internal.GeneralPreferences
6566
import com.itsaky.androidide.projects.ProjectManagerImpl
@@ -96,6 +97,7 @@ open class EditorHandlerActivity :
9697

9798
companion object {
9899
const val PREF_KEY_OPEN_FILES_CACHE = "open_files_cache_v1"
100+
const val PREF_KEY_OPEN_PLUGIN_TABS = "open_plugin_tabs_v1"
99101
}
100102

101103
protected val isOpenedFilesSaved = AtomicBoolean(false)
@@ -141,6 +143,7 @@ open class EditorHandlerActivity :
141143
}
142144

143145
override fun onCreate(savedInstanceState: Bundle?) {
146+
setupPluginFragmentFactory()
144147
mBuildEventListener.setActivity(this)
145148
super.onCreate(savedInstanceState)
146149

@@ -208,10 +211,23 @@ open class EditorHandlerActivity :
208211
ActionContextProvider.clearActivity()
209212
if (!isOpenedFilesSaved.get()) {
210213
saveOpenedFiles()
214+
saveOpenedPluginTabs()
211215
saveAllAsync(notify = false)
212216
}
213217
}
214218

219+
private fun saveOpenedPluginTabs() {
220+
val prefs = (application as BaseApplication).prefManager
221+
val openPluginTabIds = pluginTabIndices.keys.toList()
222+
if (openPluginTabIds.isEmpty()) {
223+
prefs.putString(PREF_KEY_OPEN_PLUGIN_TABS, null)
224+
return
225+
}
226+
val json = Gson().toJson(openPluginTabIds)
227+
prefs.putString(PREF_KEY_OPEN_PLUGIN_TABS, json)
228+
Log.d("EditorHandlerActivity", "Saved open plugin tabs: $openPluginTabIds")
229+
}
230+
215231
override fun onResume() {
216232
super.onResume()
217233
ActionContextProvider.setActivity(this)
@@ -298,6 +314,28 @@ open class EditorHandlerActivity :
298314
log.error("Failed to reopen recently opened files", err)
299315
}
300316
}
317+
318+
restoreOpenedPluginTabs()
319+
}
320+
321+
private fun restoreOpenedPluginTabs() {
322+
try {
323+
val prefs = (application as BaseApplication).prefManager
324+
val json = prefs.getString(PREF_KEY_OPEN_PLUGIN_TABS, null) ?: return
325+
326+
val tabIds = Gson().fromJson(json, Array<String>::class.java)?.toList() ?: return
327+
Log.d("EditorHandlerActivity", "Restoring plugin tabs: $tabIds")
328+
329+
tabIds.forEach { tabId ->
330+
if (!pluginTabIndices.containsKey(tabId)) {
331+
selectPluginTabById(tabId)
332+
}
333+
}
334+
335+
prefs.putString(PREF_KEY_OPEN_PLUGIN_TABS, null)
336+
} catch (e: Exception) {
337+
Log.e("EditorHandlerActivity", "Failed to restore plugin tabs", e)
338+
}
301339
}
302340

303341
private fun onReadOpenedFilesCache(cache: OpenedFilesCache?) {
@@ -1042,6 +1080,16 @@ open class EditorHandlerActivity :
10421080
}
10431081
}
10441082

1083+
private fun setupPluginFragmentFactory() {
1084+
try {
1085+
val defaultFactory = supportFragmentManager.fragmentFactory
1086+
supportFragmentManager.fragmentFactory = PluginFragmentFactory(defaultFactory)
1087+
Log.d("EditorHandlerActivity", "PluginFragmentFactory installed")
1088+
} catch (e: Exception) {
1089+
Log.e("EditorHandlerActivity", "Failed to setup PluginFragmentFactory", e)
1090+
}
1091+
}
1092+
10451093
fun loadPluginTabs() {
10461094
try {
10471095
val pluginManager =

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
111111
private val buildViewModel by viewModels<BuildViewModel>()
112112
protected var initializingFuture: CompletableFuture<out InitializeResult?>? = null
113113

114-
val findInProjectDialog: AlertDialog
114+
val findInProjectDialog: AlertDialog?
115115
get() {
116116
if (mFindInProjectDialog == null) {
117117
createFindInProjectDialog()
118118
}
119-
return mFindInProjectDialog!!
119+
return mFindInProjectDialog
120120
}
121121

122122
fun findActionDialog(actionData: ActionData): FindActionDialog {

0 commit comments

Comments
 (0)