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

Made Navigation Bar transparent and added some MD3 themes

Browse source
This commit is contained in:
Prathamesh More 2021-09-12 19:50:33 +05:30
parent 9f17bf6378
commit 3722347305
29 changed files with 76 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/drawable/popup_background.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?attr/colorSurface" />
<corners android:radius="12dp" />
<corners android:radius="20dp" />
</shape>

3
app/src/main/res/layout-land/fragment_album_details.xml
View file

@ -7,7 +7,8 @@
android:background="?attr/colorSurface"
android:orientation="vertical"
android:transitionName="@string/transition_album_art"
tools:ignore="UnusedAttribute">
tools:ignore="UnusedAttribute"
android:fitsSystemWindows="true">
<FrameLayout
android:id="@+id/toolbarContainer"

1
app/src/main/res/layout-land/fragment_artist_details.xml
View file

@ -6,6 +6,7 @@
android:layout_height="match_parent"
android:background="?attr/colorSurface"
android:orientation="vertical"
android:fitsSystemWindows="true"
tools:ignore="UnusedAttribute">
<FrameLayout

8
app/src/main/res/layout-land/fragment_banner_home.xml
View file

@ -16,13 +16,15 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:transitionGroup="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:liftOnScroll="true">
app:liftOnScroll="true"
android:fitsSystemWindows="true">
<FrameLayout
android:layout_width="match_parent"
@ -33,7 +35,6 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorSurface"
app:navigationIcon="@drawable/ic_search"
app:popupTheme="?attr/toolbarPopupTheme"
app:title="@null"
@ -113,7 +114,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:retroCornerSize="21dp"
tools:srcCompat="@tools:sample/avatars" />
tools:srcCompat="@tools:sample/avatars"
android:transitionName="user_image"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"

8
app/src/main/res/layout-land/fragment_home.xml
View file

@ -16,13 +16,15 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:transitionGroup="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:liftOnScroll="true">
app:liftOnScroll="true"
android:fitsSystemWindows="true">
<FrameLayout
android:layout_width="match_parent"
@ -33,7 +35,6 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorSurface"
app:navigationIcon="@drawable/ic_search"
app:popupTheme="?attr/toolbarPopupTheme"
app:title="@null"
@ -83,7 +84,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:retroCornerSize="21dp"
tools:srcCompat="@tools:sample/avatars" />
tools:srcCompat="@tools:sample/avatars"
android:transitionName="user_image"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"

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

@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"

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

@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"

4
app/src/main/res/layout/fragment_banner_home.xml
View file

@ -16,12 +16,14 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:transitionGroup="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
app:liftOnScroll="true">
<FrameLayout
@ -33,7 +35,6 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorSurface"
app:navigationIcon="@drawable/ic_search"
app:popupTheme="?attr/toolbarPopupTheme"
app:title="@null"
@ -107,6 +108,7 @@
android:layout_marginStart="16dp"
android:layout_marginBottom="8dp"
android:scaleType="centerCrop"
android:transitionName="user_image"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:retroCornerSize="21dp"

3
app/src/main/res/layout/fragment_folder.xml
View file

@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:transitionGroup="true">
android:transitionGroup="true"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"

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

@ -4,13 +4,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:transitionGroup="true">
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:liftOnScroll="true">
android:fitsSystemWindows="true">
<FrameLayout
android:layout_width="match_parent"
@ -21,7 +21,6 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorSurface"
app:navigationIcon="@drawable/ic_search"
app:popupTheme="?attr/toolbarPopupTheme"
app:title="@null"

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

@ -5,7 +5,8 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:transitionGroup="true">
android:transitionGroup="true"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"

3
app/src/main/res/layout/fragment_search.xml
View file

@ -5,7 +5,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorSurface"
android:orientation="vertical">
android:orientation="vertical"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"

10
app/src/main/res/layout/sliding_music_panel_layout.xml
View file

@ -6,10 +6,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/mainContentFrame"
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:background="?colorSurface"
app:defaultNavHost="true"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
<View
android:id="@+id/dimBackground"

4
app/src/main/res/navigation/main_graph.xml
View file

@ -123,5 +123,7 @@
android:label=""
tools:layout="@layout/fragment_banner_home" />
<fragment
android:id="@+id/user_info_fragment"
android:name="code.name.monkey.retromusic.fragments.UserInfoFragment" />
</navigation>

2
app/src/main/res/values-night-v27/styles.xml
View file

@ -30,6 +30,6 @@
<item name="android:windowLightNavigationBar">false</item>
<item name="colorSurface">@color/darkColorSurface</item>
<item name="materialCardViewStyle">@style/Widget.MaterialComponents.CardView</item>
<item name="bottomSheetTint">@color/darkColorSurface</item>
<item name="bottomSheetTint">@color/bottomSheetColor</item>
</style>
</resources>

1
app/src/main/res/values-night/colors.xml
View file

@ -3,4 +3,5 @@
<color name="window_color">@android:color/black</color>
<color name="bottomSheetColor">#202020</color>
</resources>

2
app/src/main/res/values-night/styles.xml
View file

@ -31,6 +31,6 @@
<item name="colorSurface">@color/darkColorSurface</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
<item name="bottomSheetTint">@color/darkColorSurface</item>
<item name="bottomSheetTint">@color/bottomSheetColor</item>
</style>
</resources>

3
app/src/main/res/values-v21/styles.xml
View file

@ -10,7 +10,6 @@
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowSharedElementsUseOverlay">false</item>
<item name="android:textViewStyle">@style/TextViewStyleIm</item>
<item name="bottomSheetTint">@color/window_color_light</item>
</style>
<style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black">
@ -18,7 +17,6 @@
<item name="android:windowSharedElementsUseOverlay">false</item>
<item name="android:textViewStyle">@style/TextViewStyleIm</item>
<item name="android:windowBackground">@color/window_color_dark</item>
<item name="bottomSheetTint">@color/window_color_dark</item>
</style>
<style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
@ -26,7 +24,6 @@
<item name="android:windowSharedElementsUseOverlay">false</item>
<item name="android:textViewStyle">@style/TextViewStyleIm</item>
<item name="android:windowBackground">@color/window_color</item>
<item name="bottomSheetTint">?colorSurface</item>
</style>
<style name="Theme.RetroMusic.Notification" parent="@android:style/TextAppearance.Material.Notification" />

6
app/src/main/res/values-v27/styles_parents.xml
View file

@ -28,7 +28,7 @@
<item name="bottomNavigationStyle">@style/Widget.Material3.BottomNavigationView</item>
<item name="materialButtonStyle">@style/MaterialButtonTheme</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
<item name="bottomSheetTint">@color/darkColorSurface</item>
<item name="bottomSheetTint">@color/bottomSheetColor</item>
</style>
<style name="Theme.RetroMusic.Base" parent="Theme.Material3.DayNight.NoActionBar">
@ -50,7 +50,7 @@
<item name="bottomNavigationStyle">@style/Widget.Material3.BottomNavigationView</item>
<item name="android:windowBackground">@color/window_color_dark</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
<item name="bottomSheetTint">@color/darkColorSurface</item>
<item name="bottomSheetTint">@color/bottomSheetColorDark</item>
</style>
<style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
@ -68,6 +68,6 @@
<item name="materialButtonStyle">@style/MaterialButtonTheme</item>
<item name="bottomNavigationStyle">@style/Widget.Material3.BottomNavigationView</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
<item name="bottomSheetTint">@color/window_color_light</item>
<item name="bottomSheetTint">@color/bottomSheetColorLight</item>
</style>
</resources>

5
app/src/main/res/values/colors.xml
View file

@ -30,5 +30,10 @@
<color name="progress_gray">#FFD8D8D8</color>
<color name="default_blue_light">#ff33b5e5</color>
<color name="bottomSheetColorLight">#FFFFFF</color>
<color name="bottomSheetColorDark">#202020</color>
<color name="bottomSheetColorBlack">#111111</color>
<color name="bottomSheetColor">#FFFFFF</color>
</resources>

5
app/src/main/res/values/styles.xml
View file

@ -7,7 +7,6 @@
<item name="android:scrollbars">none</item>
<item name="dialogCornerRadius">16dp</item>
<item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
<item name="bottomSheetTint">@color/window_color_light</item>
</style>
<style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black">
@ -15,7 +14,6 @@
<item name="android:scrollbars">none</item>
<item name="dialogCornerRadius">16dp</item>
<item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
<item name="bottomSheetTint">@color/window_color_dark</item>
</style>
<style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
@ -23,7 +21,6 @@
<item name="android:scrollbars">none</item>
<item name="dialogCornerRadius">16dp</item>
<item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
<item name="bottomSheetTint">?colorSurface</item>
</style>
<style name="Theme.RetroMusic.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent" />
@ -185,7 +182,7 @@
<style name="BottomSheetStyle" parent="Widget.MaterialComponents.BottomSheet">
<item name="android:maxWidth">@empty</item>
<item name="backgroundTint">?bottomSheetTint</item>
<item name="android:backgroundTint">?attr/bottomSheetTint</item>
</style>
<style name="MaterialCardViewStroke">

7
app/src/main/res/values/styles_parents.xml
View file

@ -16,6 +16,7 @@
<item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
<item name="popupWindowStyle">@style/MaterialPopupMenuStyle</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
<item name="bottomSheetTint">@color/bottomSheetColor</item>
</style>
<style name="Theme.RetroMusic.Base" parent="Theme.Material3.DayNight.NoActionBar">
@ -36,7 +37,7 @@
<item name="android:windowBackground">@color/window_color_dark</item>
<item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
<item name="bottomSheetTint">@color/darkColorSurface</item>
<item name="bottomSheetTint">@color/bottomSheetColorDark</item>
</style>
<style name="Theme.RetroMusic.Base.Black" parent="Theme.Material3.DayNight.NoActionBar">
@ -55,7 +56,7 @@
<item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
<item name="bottomSheetTint">@color/blackColorSurface</item>
<item name="bottomSheetTint">@color/bottomSheetColorBlack</item>
</style>
<style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
@ -73,7 +74,7 @@
<item name="materialButtonStyle">@style/MaterialButtonTheme</item>
<item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
<item name="bottomSheetTint">@color/window_color_light</item>
<item name="bottomSheetTint">@color/bottomSheetColorLight</item>
</style>