Skip to content

ADFA-6346 | Fix app bar flicker on bottom sheet scroll #2131

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
Oct 13, 2026
Merged

ADFA-6346 | Fix app bar flicker on bottom sheet scroll #2131

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
e6d1153
style(editor): reformat content_editor layouts with spotless
jatezzz Oct 12, 2026
786dc68
fix(editor): stop app bar flicker on bottom sheet scroll
jatezzz Oct 12, 2026
d935180
Merge branch 'stage' into fix/ADFA-6346-appbar-flicker-on-scroll
jatezzz Oct 13, 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
351 changes: 172 additions & 179 deletions app/src/main/res/layout-land/content_editor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,181 +1,174 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ This file is part of AndroidIDE.
~
~ AndroidIDE is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ AndroidIDE is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>.
-->

<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/realContainer"
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.google.android.material.appbar.AppBarLayout
android:id="@+id/editor_appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:fitsSystemWindows="false"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior">

<LinearLayout
android:id="@+id/editor_appbar_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_scrollFlags="scroll|enterAlways|snap">

<!-- Landscape: project name and project actions toolbar in one row; long name truncates so toolbar stays visible -->
<com.google.android.flexbox.FlexboxLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:flexWrap="wrap"
app:alignItems="center">

<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/title_toolbar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_flexGrow="1"
app:layout_flexShrink="0"
android:minHeight="0dp"
android:padding="0dp"
app:contentInsetStartWithNavigation="0dp"
app:contentInsetStart="0dp"
app:contentInsetEnd="0dp">

<TextView
android:id="@+id/title_text"
style="@style/TextAppearance.Material3.TitleMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="8dp"
android:paddingTop="0dp"
android:paddingBottom="0dp"
android:gravity="start|center_vertical"
android:maxLines="1"
android:ellipsize="end" />

</com.google.android.material.appbar.MaterialToolbar>

<com.itsaky.androidide.ui.ProjectActionsToolbar
android:id="@+id/project_actions_toolbar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
app:layout_flexShrink="0"
android:minHeight="0dp"
android:paddingTop="0dp"
android:paddingBottom="0dp" />

</com.google.android.flexbox.FlexboxLayout>

<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progress_indicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true" />

<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
style="@style/AppTheme.TabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="8dp"
app:tabGravity="start" />
</LinearLayout>

</com.google.android.material.appbar.AppBarLayout>

<ViewFlipper
android:id="@+id/view_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="16dp"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

<!--Views in this flipper are dynamically added and must be instances of CodeEditorView-->
<ViewFlipper
android:id="@+id/editor_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/editor_sheet_collapsed_height" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/no_editor_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">

<TextView
android:id="@+id/no_editor_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/project_options"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textColor="?attr/colorOnSurface"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.30" />

<TextView
android:id="@+id/no_editor_summary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="start"
android:textAlignment="viewStart"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
android:textColor="?attr/colorOnSurfaceVariant"
android:textSize="13sp"
android:paddingHorizontal="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/no_editor_title"
tools:text="Open right drawer for files\nSwipe from bottom for build output" />


</androidx.constraintlayout.widget.ConstraintLayout>

</ViewFlipper>

<ImageButton
android:id="@+id/btn_fullscreen_toggle"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="bottom|start"
android:layout_marginBottom="16dp"
android:layout_marginStart="16dp"
android:padding="12dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_fullscreen"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/desc_enter_fullscreen" />

<com.itsaky.androidide.ui.EditorBottomSheet
android:id="@+id/bottom_sheet"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:behavior_hideable="false"
app:behavior_peekHeight="@dimen/editor_sheet_collapsed_height"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" />

<include
android:id="@+id/diagnosticInfo"
layout="@layout/layout_diagnostic_info" />
<?xml version="1.0" encoding="utf-8"?><!-- ~ This file is part of AndroidIDE. ~ ~ AndroidIDE is free software: you can redistribute
it and/or modify ~ it under the terms of the GNU General Public License as published by ~ the Free Software Foundation, either
version 3 of the License, or ~ (at your option) any later version. ~ ~ AndroidIDE is distributed in the hope that it will
be useful, ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the ~ GNU General Public License for more details. ~ ~ You should have received a copy of the GNU General Public
License ~ along with AndroidIDE. If not, see <https://www.gnu.org/licenses/>. -->

<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/realContainer"
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.google.android.material.appbar.AppBarLayout
android:id="@+id/editor_appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:fitsSystemWindows="false"
app:elevation="0dp"
app:liftOnScroll="false"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior">

<LinearLayout
android:id="@+id/editor_appbar_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_scrollFlags="scroll|enterAlways|snap">

<!-- Landscape: project name and project actions toolbar in one row; long name truncates so toolbar stays visible -->
<com.google.android.flexbox.FlexboxLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:flexWrap="wrap"
app:alignItems="center">

<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/title_toolbar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_flexGrow="1"
app:layout_flexShrink="0"
android:minHeight="0dp"
android:padding="0dp"
app:contentInsetStartWithNavigation="0dp"
app:contentInsetStart="0dp"
app:contentInsetEnd="0dp">

<TextView
android:id="@+id/title_text"
style="@style/TextAppearance.Material3.TitleMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="8dp"
android:paddingTop="0dp"
android:paddingBottom="0dp"
android:gravity="start|center_vertical"
android:maxLines="1"
android:ellipsize="end" />

</com.google.android.material.appbar.MaterialToolbar>

<com.itsaky.androidide.ui.ProjectActionsToolbar
android:id="@+id/project_actions_toolbar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
app:layout_flexShrink="0"
android:minHeight="0dp"
android:paddingTop="0dp"
android:paddingBottom="0dp" />

</com.google.android.flexbox.FlexboxLayout>

<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/progress_indicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true" />

<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
style="@style/AppTheme.TabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="8dp"
app:tabGravity="start" />
</LinearLayout>

</com.google.android.material.appbar.AppBarLayout>

<ViewFlipper
android:id="@+id/view_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="16dp"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

<!--Views in this flipper are dynamically added and must be instances of CodeEditorView -->
<ViewFlipper
android:id="@+id/editor_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/editor_sheet_collapsed_height" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/no_editor_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">

<TextView
android:id="@+id/no_editor_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/project_options"
android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
android:textColor="?attr/colorOnSurface"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.30" />

<TextView
android:id="@+id/no_editor_summary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="start"
android:textAlignment="viewStart"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
android:textColor="?attr/colorOnSurfaceVariant"
android:textSize="13sp"
android:paddingHorizontal="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/no_editor_title"
tools:text="Open right drawer for files\nSwipe from bottom for build output" />


</androidx.constraintlayout.widget.ConstraintLayout>

</ViewFlipper>

<ImageButton
android:id="@+id/btn_fullscreen_toggle"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="bottom|start"
android:layout_marginBottom="16dp"
android:layout_marginStart="16dp"
android:padding="12dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_fullscreen"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/desc_enter_fullscreen" />

<com.itsaky.androidide.ui.EditorBottomSheet
android:id="@+id/bottom_sheet"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:behavior_hideable="false"
app:behavior_peekHeight="@dimen/editor_sheet_collapsed_height"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" />

<include
android:id="@+id/diagnosticInfo"
layout="@layout/layout_diagnostic_info" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>
Loading
Loading