Skip to content

ADFA-3987 | Fix persistent space obscuring Find in File dialog #1313

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 1 commit into from
May 19, 2026
+69 −66
Merged

ADFA-3987 | Fix persistent space obscuring Find in File dialog #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions app/src/main/res/layout/content_editor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@
<ViewFlipper
android:id="@+id/editor_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/editor_sheet_collapsed_height" />
android:layout_height="match_parent" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/no_editor_layout"
Expand Down
24 changes: 17 additions & 7 deletions editor/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import android.widget.PopupMenu
import android.widget.PopupWindow
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updateLayoutParams
import com.itsaky.androidide.editor.databinding.LayoutFindInFileBinding
import com.itsaky.androidide.editor.ui.ReplaceAction.doReplace
import com.itsaky.androidide.idetooltips.TooltipManager
Expand All @@ -49,17 +50,16 @@ import java.util.regex.Pattern
*/
@SuppressLint("ViewConstructor") // Always created dynamically
class EditorSearchLayout(context: Context, val editor: IDEEditor) : FrameLayout(context) {
private val collapsedSheetMargin =
context.resources.getDimensionPixelSize(R.dimen.editor_sheet_peek_height)

private var searchInputTextWatcher: TextWatcher? = null
private var searchOptions = SearchOptions(true, false)
private val findInFileBinding: LayoutFindInFileBinding
private val optionsMenu: PopupMenu

private var isSearching = false
private val findInFileBinding: LayoutFindInFileBinding = LayoutFindInFileBinding.inflate(LayoutInflater.from(context))
private val optionsMenu: PopupMenu

init {
findInFileBinding = LayoutFindInFileBinding.inflate(LayoutInflater.from(context))
findInFileBinding.prev.setOnClickListener(::onSearchActionClick)
findInFileBinding.prev.setOnClickListener(::onSearchActionClick)
findInFileBinding.next.setOnClickListener(::onSearchActionClick)
findInFileBinding.replace.setOnClickListener(::onSearchActionClick)
findInFileBinding.close.setOnClickListener(::onSearchActionClick)
Expand Down Expand Up @@ -115,6 +115,10 @@ class EditorSearchLayout(context: Context, val editor: IDEEditor) : FrameLayout(
true
}
}
ViewCompat.setOnApplyWindowInsetsListener(findInFileBinding.root) { _, insets ->
updateActionsBottomMargin(insets.isVisible(WindowInsetsCompat.Type.ime()))
insets
}

addView(
findInFileBinding.root,
Expand Down Expand Up @@ -269,7 +273,7 @@ class EditorSearchLayout(context: Context, val editor: IDEEditor) : FrameLayout(
try {
Pattern.compile(it)
it
} catch (error: Throwable) {
} catch (_: Throwable) {
""
}
} else {
Expand All @@ -282,4 +286,10 @@ class EditorSearchLayout(context: Context, val editor: IDEEditor) : FrameLayout(
}
}
}

private fun updateActionsBottomMargin(isImeVisible: Boolean) {
findInFileBinding.actionsContainer.updateLayoutParams<MarginLayoutParams> {
bottomMargin = if (isImeVisible) 0 else collapsedSheetMargin
}
}
}
108 changes: 51 additions & 57 deletions editor/src/main/res/layout/layout_find_in_file.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,68 +62,62 @@
app:layout_constraintTop_toTopOf="@id/search_input" />


<com.google.android.material.button.MaterialButton
android:id="@+id/prev"
style="@style/Widget.Material3.Button.TextButton"
<LinearLayout
android:id="@+id/actions_container"
android:layout_width="0dp"
android:layout_height="40dp"
android:text="@string/previous"
android:textAllCaps="true"
android:minWidth="0dp"
android:paddingHorizontal="4dp"
app:layout_constraintEnd_toStartOf="@+id/next"
app:layout_constraintHorizontal_weight="0.25"
android:layout_height="wrap_content"
android:layout_marginBottom="0dp"
android:orientation="horizontal"
android:weightSum="4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/search_input"
app:layout_constraintBottom_toBottomOf="parent" />
app:layout_constraintTop_toBottomOf="@id/search_input">

<com.google.android.material.button.MaterialButton
android:id="@+id/prev"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_weight="1"
android:minWidth="0dp"
android:paddingHorizontal="4dp"
android:text="@string/previous"
android:textAllCaps="true" />

<com.google.android.material.button.MaterialButton
android:id="@+id/next"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="0dp"
android:layout_height="40dp"
android:text="@string/next"
android:textAllCaps="true"
android:minWidth="0dp"
android:paddingHorizontal="4dp"
app:layout_constraintEnd_toStartOf="@+id/replace"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_weight="0.25"
app:layout_constraintStart_toEndOf="@+id/prev"
app:layout_constraintTop_toBottomOf="@+id/search_input"
app:layout_constraintBottom_toBottomOf="parent" />
<com.google.android.material.button.MaterialButton
android:id="@+id/next"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_weight="1"
android:minWidth="0dp"
android:paddingHorizontal="4dp"
android:text="@string/next"
android:textAllCaps="true" />

<com.google.android.material.button.MaterialButton
android:id="@+id/replace"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="0dp"
android:layout_height="40dp"
android:text="@string/replace"
android:textAllCaps="true"
android:minWidth="0dp"
android:paddingHorizontal="4dp"
app:layout_constraintEnd_toStartOf="@+id/close"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_weight="0.25"
app:layout_constraintStart_toEndOf="@+id/next"
app:layout_constraintTop_toBottomOf="@+id/search_input"
app:layout_constraintBottom_toBottomOf="parent" />
<com.google.android.material.button.MaterialButton
android:id="@+id/replace"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_weight="1"
android:minWidth="0dp"
android:paddingHorizontal="4dp"
android:text="@string/replace"
android:textAllCaps="true" />

<com.google.android.material.button.MaterialButton
android:id="@+id/close"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="0dp"
android:layout_height="40dp"
android:text="@string/btn_close"
android:textAllCaps="true"
android:minWidth="0dp"
android:paddingHorizontal="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_weight="0.25"
app:layout_constraintStart_toEndOf="@+id/replace"
app:layout_constraintTop_toBottomOf="@+id/search_input"
app:layout_constraintBottom_toBottomOf="parent" />
<com.google.android.material.button.MaterialButton
android:id="@+id/close"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_weight="1"
android:minWidth="0dp"
android:paddingHorizontal="4dp"
android:text="@string/btn_close"
android:textAllCaps="true" />

</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
Loading