ADFA-3494 | Remove top bar auto-hide in landscape mode (#1134)

refactor: remove top bar auto-hide in landscape immersive mode
Drop TouchObservingLinearLayout and explicitly handle window insets on attach.

Author: jatezzz

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

@@ -630,7 +630,6 @@ abstract class BaseEditorActivity :
 		immersiveController = LandscapeImmersiveController(
 			contentBinding = content,
 			bottomSheetBehavior = editorBottomSheet!!,
-			coroutineScope = lifecycleScope,
 		).also {
 			it.bind()
 			it.onConfigurationChanged(resources.configuration)
@@ -853,7 +852,6 @@ abstract class BaseEditorActivity :
 	}
 
 	override fun onResume() {
-		immersiveController?.onResume()
 		super.onResume()
 		invalidateOptionsMenu()
 

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

@@ -2,8 +2,6 @@ package com.itsaky.androidide.activities.editor
 
 import android.annotation.SuppressLint
 import android.content.res.Configuration
-import android.view.InputDevice
-import android.view.MotionEvent
 import android.view.View
 import android.view.View.OnLayoutChangeListener
 import android.view.ViewGroup
@@ -13,19 +11,14 @@ import androidx.core.view.updateLayoutParams
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.appbar.AppBarLayout
 import com.itsaky.androidide.databinding.ContentEditorBinding
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import kotlin.math.roundToInt
 
 /**
  * Controls immersive behavior for the editor in landscape mode.
  *
  * Top bar:
  * - expands/collapses through AppBarLayout behavior
- * - supports auto-hide after being shown
- * - pauses auto-hide while the user is interacting with the top bar
+ * - stays visible until the user manually hides it
  *
  * Bottom bar:
  * - remains backed by BottomSheetBehavior
@@ -34,7 +27,6 @@ import kotlin.math.roundToInt
 class LandscapeImmersiveController(
     contentBinding: ContentEditorBinding,
     private val bottomSheetBehavior: BottomSheetBehavior<out View?>,
-    private val coroutineScope: CoroutineScope,
 ) {
     private val topBar = contentBinding.editorAppBarLayout
     private val appBarContent = contentBinding.editorAppbarContent
@@ -44,15 +36,13 @@ class LandscapeImmersiveController(
     private val topToggle = contentBinding.btnToggleTopBar
     private val bottomToggle = contentBinding.btnToggleBottomBar
 
-    private var autoHideJob: Job? = null
     private var isBound = false
 
     private var isLandscape = false
     private var isTopBarRequestedVisible = true
     private var isBottomBarRequestedVisible = true
     private var isBottomBarShown = true
     private var isPendingBottomBarHideAfterCollapse = false
-    private var isUserInteractingWithTopBar = false
 
     private var statusBarTopInset = 0
     private var currentAppBarOffset = 0
@@ -115,30 +105,6 @@ class LandscapeImmersiveController(
         setupClickListeners()
     }
 
-    private val topBarTouchObserver: (MotionEvent) -> Unit = { event ->
-        when (event.actionMasked) {
-            MotionEvent.ACTION_DOWN -> onTopBarInteractionStarted()
-            MotionEvent.ACTION_UP,
-            MotionEvent.ACTION_CANCEL -> onTopBarInteractionEnded()
-        }
-    }
-
-    /**
-     * Observes mouse hover events to manage the top bar's auto-hide behavior.
-     * It pauses the auto-hide timer while the cursor is over the bar (or its buttons),
-     * and resumes it when the cursor leaves.
-     */
-    private val topBarHoverObserver: (MotionEvent) -> Unit = { event ->
-        if (event.isFromSource(InputDevice.SOURCE_MOUSE)) {
-            when (event.actionMasked) {
-                MotionEvent.ACTION_HOVER_ENTER,
-                MotionEvent.ACTION_HOVER_MOVE -> onTopBarInteractionStarted()
-
-                MotionEvent.ACTION_HOVER_EXIT -> onTopBarInteractionEnded()
-            }
-        }
-    }
-
     @SuppressLint("ClickableViewAccessibility")
     fun bind() {
         if (isBound) return
@@ -147,13 +113,9 @@ class LandscapeImmersiveController(
         topBar.addOnOffsetChangedListener(topBarOffsetListener)
         appBarContent.addOnLayoutChangeListener(appBarLayoutChangeListener)
         bottomSheetBehavior.addBottomSheetCallback(bottomSheetCallback)
-        appBarContent.onTouchEventObserved = topBarTouchObserver
-        appBarContent.onHoverEventObserved = topBarHoverObserver
     }
 
     fun onPause() {
-        cancelAutoHide()
-        isUserInteractingWithTopBar = false
         cancelBottomSheetAnimation()
         setBottomSheetTranslation(
             if (!isBottomBarShown && bottomSheetBehavior.state == BottomSheetBehavior.STATE_COLLAPSED) {
@@ -164,12 +126,6 @@ class LandscapeImmersiveController(
         )
     }
 
-    fun onResume() {
-        if (isLandscape && isTopBarRequestedVisible && !isUserInteractingWithTopBar) {
-            scheduleTopBarAutoHide()
-        }
-    }
-
     @SuppressLint("ClickableViewAccessibility")
     fun destroy() {
         onPause()
@@ -183,8 +139,6 @@ class LandscapeImmersiveController(
         topBar.removeOnOffsetChangedListener(topBarOffsetListener)
         appBarContent.removeOnLayoutChangeListener(appBarLayoutChangeListener)
         bottomSheetBehavior.removeBottomSheetCallback(bottomSheetCallback)
-        appBarContent.onTouchEventObserved = null
-        appBarContent.onHoverEventObserved = null
     }
 
     fun onConfigurationChanged(newConfig: Configuration) {
@@ -217,7 +171,7 @@ class LandscapeImmersiveController(
     private fun setupClickListeners() {
         topToggle.setOnClickListener {
             if (!isLandscape) return@setOnClickListener
-            if (isTopBarRequestedVisible) hideTopBar() else showTopBar(autoHide = true)
+            if (isTopBarRequestedVisible) hideTopBar() else showTopBar()
         }
 
         bottomToggle.setOnClickListener {
@@ -226,18 +180,6 @@ class LandscapeImmersiveController(
         }
     }
 
-    private fun onTopBarInteractionStarted() {
-        if (!isLandscape || !isTopBarRequestedVisible) return
-        isUserInteractingWithTopBar = true
-        cancelAutoHide()
-    }
-
-    private fun onTopBarInteractionEnded() {
-        if (!isLandscape || !isTopBarRequestedVisible) return
-        isUserInteractingWithTopBar = false
-        scheduleTopBarAutoHide()
-    }
-
     private fun onBottomBarExpandedOrHalfExpanded() {
         cancelBottomSheetAnimation()
         setBottomSheetTranslation(0f)
@@ -268,8 +210,6 @@ class LandscapeImmersiveController(
     }
 
     private fun disableImmersiveMode() {
-        cancelAutoHide()
-        isUserInteractingWithTopBar = false
         setTogglesVisible(false)
 
         isTopBarRequestedVisible = true
@@ -290,16 +230,12 @@ class LandscapeImmersiveController(
         bottomToggle.isVisible = visible
     }
 
-    private fun showTopBar(autoHide: Boolean, animate: Boolean = true) {
-        cancelAutoHide()
+    private fun showTopBar(animate: Boolean = true) {
         isTopBarRequestedVisible = true
         topBar.setExpanded(true, animate)
-        if (autoHide) scheduleTopBarAutoHide()
     }
 
     private fun hideTopBar(animate: Boolean = true) {
-        cancelAutoHide()
-        isUserInteractingWithTopBar = false
         isTopBarRequestedVisible = false
         topBar.setExpanded(false, animate)
     }
@@ -309,22 +245,6 @@ class LandscapeImmersiveController(
         currentAppBarOffset = -topBar.totalScrollRange
     }
 
-    private fun scheduleTopBarAutoHide() {
-        if (isUserInteractingWithTopBar || !isTopBarRequestedVisible) return
-
-        autoHideJob = coroutineScope.launch {
-            delay(TOP_BAR_AUTO_HIDE_DELAY_MS)
-            if (!isUserInteractingWithTopBar && isTopBarRequestedVisible) {
-                hideTopBar()
-            }
-        }
-    }
-
-    private fun cancelAutoHide() {
-        autoHideJob?.cancel()
-        autoHideJob = null
-    }
-
     private fun showBottomBar(animate: Boolean = true, expandHalfWay: Boolean = false) {
         isBottomBarRequestedVisible = true
         isBottomBarShown = true
@@ -419,7 +339,6 @@ class LandscapeImmersiveController(
     }
 
     private companion object {
-        const val TOP_BAR_AUTO_HIDE_DELAY_MS = 3500L
         const val BOTTOM_BAR_ANIMATION_DURATION_MS = 200L
     }
 }

app/src/main/java/com/itsaky/androidide/utils/WindowInsetsExtensions.kt

@@ -68,7 +68,7 @@ fun View.applyRootSystemInsetsAsPadding(
 ) {
     val initial = getOrStoreInitialPadding()
 
-    ViewCompat.setOnApplyWindowInsetsListener(this) { view, windowInsets ->
+    fun applyInsets(view: View, windowInsets: WindowInsetsCompat) {
         val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
 
         view.updatePadding(
@@ -77,10 +77,20 @@ fun View.applyRootSystemInsetsAsPadding(
             right = initial.right + if (applyRight) insets.right else 0,
             bottom = initial.bottom + if (applyBottom) insets.bottom else 0
         )
+    }
+
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, windowInsets ->
+        applyInsets(view, windowInsets)
         windowInsets
     }
 
-    doOnAttach { it.requestApplyInsets() }
+    doOnAttach { view ->
+        ViewCompat.requestApplyInsets(view)
+
+        ViewCompat.getRootWindowInsets(view)?.let { rootInsets ->
+            applyInsets(view, rootInsets)
+        }
+    }
 }
 
 /**

app/src/main/res/layout-land/content_editor.xml

@@ -30,7 +30,7 @@
         android:fitsSystemWindows="false"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior">
 
-        <com.itsaky.androidide.ui.TouchObservingLinearLayout
+        <LinearLayout
             android:id="@+id/editor_appbar_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
             android:layout_height="wrap_content"
             android:paddingHorizontal="8dp"
             app:tabGravity="start" />
-        </com.itsaky.androidide.ui.TouchObservingLinearLayout>
+        </LinearLayout>
 
     </com.google.android.material.appbar.AppBarLayout>
 

app/src/main/res/layout/content_editor.xml

@@ -31,7 +31,7 @@
         android:fitsSystemWindows="false"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior">
 
-        <com.itsaky.androidide.ui.TouchObservingLinearLayout
+        <LinearLayout
             android:id="@+id/editor_appbar_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -94,7 +94,7 @@
                 android:paddingHorizontal="8dp"
                 app:tabGravity="start" />
 
-        </com.itsaky.androidide.ui.TouchObservingLinearLayout>
+        </LinearLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <ViewFlipper
@@ -192,4 +192,4 @@
             android:visibility="gone"
             tools:visibility="gone" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>