Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Remove unnecessary FrameLayouts in some fragments

Browse source
This commit is contained in:
Prathamesh More 2023-03-09 12:45:39 +05:30
parent bb99213848
commit ba59bf8216
13 changed files with 53 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/res/layout/collapsing_appbar_layout.xml
View file

@ -22,9 +22,4 @@
app:navigationIcon="@drawable/ic_search"
app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
tools:title="@string/songs" />
<FrameLayout
android:id="@+id/toolbar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.appbar.CollapsingToolbarLayout>

16
app/src/main/res/layout/fragment_album_details.xml
View file

@ -14,18 +14,12 @@
android:fitsSystemWindows="true"
app:liftOnScroll="true">
<FrameLayout
android:id="@+id/toolbar_container"
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:navigationIcon="@drawable/ic_arrow_back" />
</FrameLayout>
android:layout_height="wrap_content"
app:navigationIcon="@drawable/ic_arrow_back" />
</com.google.android.material.appbar.AppBarLayout>

16
app/src/main/res/layout/fragment_artist_details.xml
View file

@ -14,18 +14,12 @@
android:fitsSystemWindows="true"
app:liftOnScroll="true">
<FrameLayout
android:id="@+id/toolbar_container"
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:navigationIcon="@drawable/ic_arrow_back" />
</FrameLayout>
android:layout_height="wrap_content"
app:navigationIcon="@drawable/ic_arrow_back" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView

20
app/src/main/res/layout/fragment_playlist_detail.xml
View file

@ -15,19 +15,13 @@
android:fitsSystemWindows="true"
app:liftOnScroll="true">
<FrameLayout
android:id="@+id/toolbar_container"
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_scrollFlags="scroll|enterAlways">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:navigationIcon="@drawable/ic_arrow_back"
app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
</FrameLayout>
app:layout_scrollFlags="scroll|enterAlways"
app:navigationIcon="@drawable/ic_arrow_back"
app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
</com.google.android.material.appbar.AppBarLayout>
<code.name.monkey.retromusic.views.insets.InsetsRecyclerView
@ -35,10 +29,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:overScrollMode="@integer/overScrollMode"
android:scrollbars="none"
android:layoutAnimation="@anim/layout_anim_fade"
android:overScrollMode="@integer/overScrollMode"
android:paddingBottom="@dimen/mini_player_height"
android:scrollbars="none"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
<LinearLayout

27
app/src/main/res/layout/simple_appbar_layout.xml
View file

@ -1,25 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.appbar.MaterialToolbar xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar_container"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_scrollFlags="scroll|enterAlways">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:navigationIcon="@drawable/ic_search"
app:popupTheme="?attr/toolbarPopupTheme"
app:title="@null">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/appNameText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textAppearance="@style/TextViewHeadline6"
android:textStyle="bold" />
</androidx.appcompat.widget.Toolbar>
</FrameLayout>
app:layout_scrollFlags="scroll|enterAlways"
app:navigationIcon="@drawable/ic_search"
app:popupTheme="?attr/toolbarPopupTheme"
app:titleCentered="true" />