Skip to content

ADFA-1788 | Fix sidebar overlap with status bar on split-screen resize #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jatezzz merged 3 commits into from
Jan 19, 2026
Merged

ADFA-1788 | Fix sidebar overlap with status bar on split-screen resize #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf6bbca
fix: prevent editor sidebar from overlapping system bars on split-scr…
jatezzz Jan 15, 2026
0ba96f5
refactor: restructuring to ensure the state update always executes
jatezzz Jan 16, 2026
348606c
fix: Clamp IME-adjusted height to avoid negative layout params
jatezzz Jan 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 29 additions & 15 deletions app/src/main/java/com/itsaky/androidide/activities/editor/BaseEditorActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ import com.itsaky.androidide.databinding.LayoutDiagnosticInfoBinding
import com.itsaky.androidide.events.InstallationEvent
import com.itsaky.androidide.fragments.debug.DebuggerFragment
import com.itsaky.androidide.fragments.output.ShareableOutputFragment
import com.itsaky.androidide.fragments.sidebar.EditorSidebarFragment
import com.itsaky.androidide.fragments.sidebar.FileTreeFragment
import com.itsaky.androidide.handlers.EditorActivityLifecyclerObserver
import com.itsaky.androidide.handlers.LspHandler.registerLanguageServers
Expand Down Expand Up @@ -351,6 +350,7 @@ abstract class BaseEditorActivity :
private val flingVelocityThreshold by lazy { SizeUtils.dp2px(100f) }

private var editorAppBarInsetTop: Int = 0
private var sidebarLastInsetTop: Int = 0

companion object {
private const val TAG = "ResizePanelDebugger"
Expand Down Expand Up @@ -452,15 +452,32 @@ abstract class BaseEditorActivity :

override fun onApplyWindowInsets(insets: WindowInsetsCompat) {
super.onApplyWindowInsets(insets)
val height = contentCardRealHeight ?: return

val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())

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

val isImeVisible = imeInsets.bottom > 0
_binding?.content?.bottomSheet?.setImeVisible(isImeVisible)

_binding?.contentCard?.apply {
when {
isImeVisible -> {
contentCardRealHeight?.let { baseHeight ->
updateLayoutParams<ViewGroup.LayoutParams> {
height = (baseHeight - imeInsets.bottom).coerceAtLeast(0)
}
}
}
else -> {
updateLayoutParams<ViewGroup.LayoutParams> { height = ViewGroup.LayoutParams.MATCH_PARENT }
post { contentCardRealHeight = measuredHeight }
}
}
}

if (this.isImeVisible != isImeVisible) {
this.isImeVisible = isImeVisible
onSoftInputChanged()
Expand All @@ -470,16 +487,13 @@ abstract class BaseEditorActivity :
override fun onApplySystemBarInsets(insets: Insets) {
super.onApplySystemBarInsets(insets)
editorAppBarInsetTop = insets.top
this._binding?.apply {
(supportFragmentManager.findFragmentById(R.id.drawer_sidebar) as? EditorSidebarFragment)
?.onApplyWindowInsets(insets)
}

content.apply {
editorAppBarLayout.updatePadding(
top = insets.top,
)
}
}
private fun applySidebarInsets(systemBars: Insets) {
val sidebar = _binding?.drawerSidebar ?: return
val baseTop = sidebar.paddingTop - sidebarLastInsetTop
sidebarLastInsetTop = systemBars.top
sidebar.updatePadding(top = baseTop + systemBars.top)
}

@Subscribe(threadMode = MAIN)
Expand Down
29 changes: 1 addition & 28 deletions app/src/main/java/com/itsaky/androidide/fragments/sidebar/EditorSidebarFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,6 @@ package com.itsaky.androidide.fragments.sidebar

import android.os.Bundle
import android.view.View
import android.view.ViewGroup.MarginLayoutParams
import androidx.core.graphics.Insets
import androidx.core.view.marginBottom
import androidx.core.view.marginTop
import androidx.core.view.updateLayoutParams
import androidx.core.view.updateMarginsRelative
import androidx.core.view.updatePadding
import com.itsaky.androidide.activities.editor.EditorHandlerActivity
import com.itsaky.androidide.databinding.FragmentEditorSidebarBinding
import com.itsaky.androidide.fragments.FragmentWithBinding
Expand All @@ -41,26 +34,6 @@ class EditorSidebarFragment : FragmentWithBinding<FragmentEditorSidebarBinding>(
FragmentEditorSidebarBinding::inflate
) {

internal fun onApplyWindowInsets(insets: Insets) {
_binding?.apply {
title.updateLayoutParams<MarginLayoutParams> {
updateMarginsRelative(
top = title.marginTop + insets.top,
)
}
editorSidebarFragmentContainer.updateLayoutParams<MarginLayoutParams> {
updateMarginsRelative(
bottom = editorSidebarFragmentContainer.marginBottom + insets.bottom,
)
}
navigation.updatePadding(
top = navigation.paddingTop + insets.top,
bottom = navigation.paddingBottom + insets.bottom,
left = navigation.paddingLeft + insets.left,
)
}
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
EditorSidebarActions.setup(this)
Expand All @@ -83,4 +56,4 @@ class EditorSidebarFragment : FragmentWithBinding<FragmentEditorSidebarBinding>(
* Get the (nullable) binding object for this fragment.
*/
internal fun getBinding() = _binding
}
}