ADFA-4171: (fix) close editor/bottom-sheet gap and prevent sheet from covering find-in-file (#1348)

Author: Daniel-ADFA

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

@@ -1507,6 +1507,10 @@ abstract class BaseEditorActivity :
 		}
 	}
 
+	fun setEditorSearchModeActive(isActive: Boolean) {
+		contentOrNull?.bottomSheet?.setSearchModeActive(isActive)
+	}
+
 	private fun observeFileOperations() {
 		lifecycleScope.launch {
 			repeatOnLifecycle(Lifecycle.State.STARTED) {

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

@@ -110,11 +110,6 @@ class FullscreenManager(
 
     private var isFullscreenState = false
 
-    private val defaultEditorBottomMargin =
-        (editorContainer.layoutParams as ViewGroup.MarginLayoutParams).bottomMargin
-
-
-
     private val offsetListener = AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
         val totalScrollRange = appBarLayout.totalScrollRange
         val effectiveScrollRange = if (totalScrollRange > 0) totalScrollRange else appBarLayout.height
@@ -124,18 +119,11 @@ class FullscreenManager(
             appBarContent.alpha = 1f - collapseFraction
         }
 
-        if (!isFullscreenState) {
-            val visibleAppBarHeight = effectiveScrollRange + verticalOffset
-            editorContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                bottomMargin = defaultEditorBottomMargin + visibleAppBarHeight
-            }
-
-            if (verticalOffset == 0) {
-                val params = appBarContent.layoutParams as AppBarLayout.LayoutParams
-                if (params.scrollFlags != 0) {
-                    params.scrollFlags = 0
-                    appBarContent.layoutParams = params
-                }
+        if (!isFullscreenState && verticalOffset == 0) {
+            val params = appBarContent.layoutParams as AppBarLayout.LayoutParams
+            if (params.scrollFlags != 0) {
+                params.scrollFlags = 0
+                appBarContent.layoutParams = params
             }
         }
     }

app/src/main/java/com/itsaky/androidide/ui/CodeEditorView.kt

@@ -252,7 +252,12 @@ class CodeEditorView(
 			true
 		}
 
-		_searchLayout = EditorSearchLayout(context, binding.editor)
+		_searchLayout = EditorSearchLayout(context, binding.editor).apply {
+			onSearchModeChanged = { isActive ->
+				(this@CodeEditorView.context as? BaseEditorActivity)
+					?.setEditorSearchModeActive(isActive)
+			}
+		}
 		orientation = VERTICAL
 
 		removeAllViews()

app/src/main/java/com/itsaky/androidide/ui/EditorBottomSheet.kt

@@ -112,6 +112,7 @@ constructor(
 
 	private var anchorOffset = 0
 	private var isImeVisible = false
+	private var isSearchModeActive = false
 	private var windowInsets: Insets? = null
 
 	private val insetBottom: Int
@@ -340,7 +341,20 @@ constructor(
 	fun setImeVisible(isVisible: Boolean) {
 		isImeVisible = isVisible
 		behavior.isGestureInsetBottomIgnored = true
-        behavior.peekHeight = if (isVisible) 0 else collapsedHeight.toInt()
+		applyPeekHeight()
+	}
+
+
+	fun setSearchModeActive(isActive: Boolean) {
+		isSearchModeActive = isActive
+		if (isActive && behavior.state != BottomSheetBehavior.STATE_COLLAPSED) {
+			behavior.state = BottomSheetBehavior.STATE_COLLAPSED
+		}
+		applyPeekHeight()
+	}
+
+	private fun applyPeekHeight() {
+		behavior.peekHeight = if (isImeVisible || isSearchModeActive) 0 else collapsedHeight.toInt()
 	}
 
 	fun setOffsetAnchor(view: View) {

editor/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt

@@ -53,6 +53,8 @@ class EditorSearchLayout(context: Context, val editor: IDEEditor) : FrameLayout(
   private val collapsedSheetMargin =
     context.resources.getDimensionPixelSize(R.dimen.editor_sheet_peek_height)
 
+  var onSearchModeChanged: ((isActive: Boolean) -> Unit)? = null
+
   private var searchInputTextWatcher: TextWatcher? = null
   private var searchOptions = SearchOptions(true, false)
   private val findInFileBinding: LayoutFindInFileBinding = LayoutFindInFileBinding.inflate(LayoutInflater.from(context))
@@ -216,6 +218,7 @@ class EditorSearchLayout(context: Context, val editor: IDEEditor) : FrameLayout(
       false
     }
     findInFileBinding.root.visibility = VISIBLE
+    onSearchModeChanged?.invoke(true)
 
     findInFileBinding.searchInput.requestFocus()
     findInFileBinding.searchInput.post {
@@ -233,6 +236,7 @@ class EditorSearchLayout(context: Context, val editor: IDEEditor) : FrameLayout(
       findInFileBinding.root.visibility = GONE
       this.searchInputTextWatcher = null
       searcher.onClose()
+      onSearchModeChanged?.invoke(false)
     }
     if (!searcher.hasQuery()) {
       return