From be0a23d9ad6a82ed9b26eaa6248807a80876db63 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com> Date: Sat, 4 Dec 2021 21:57:29 +0700 Subject: [PATCH] Tabbed bottom sheet adjustments (#6309) * SimpleNavigationView: Don't set background and elevation * Add divider for tabs in bottom sheet --- .../tachiyomi/widget/SimpleNavigationView.kt | 11 ----------- .../res/drawable/transparent_tabs_background.xml | 16 ++++++++++++++++ app/src/main/res/layout/common_tabbed_sheet.xml | 3 +-- .../main/res/layout/navigation_view_group.xml | 1 - 4 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 app/src/main/res/drawable/transparent_tabs_background.xml diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt index 5aa85d7535..c8ed0a1046 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt @@ -43,17 +43,6 @@ open class SimpleNavigationView @JvmOverloads constructor( R.style.Widget_Design_NavigationView ) - setBackground(a.getDrawable(R.styleable.NavigationView_android_background)) - - if (a.hasValue(R.styleable.NavigationView_elevation)) { - setElevation( - a.getDimensionPixelSize( - R.styleable.NavigationView_elevation, - 0 - ).toFloat() - ) - } - a.recycle() recycler.layoutManager = LinearLayoutManager(context) diff --git a/app/src/main/res/drawable/transparent_tabs_background.xml b/app/src/main/res/drawable/transparent_tabs_background.xml new file mode 100644 index 0000000000..a503ef6985 --- /dev/null +++ b/app/src/main/res/drawable/transparent_tabs_background.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/common_tabbed_sheet.xml b/app/src/main/res/layout/common_tabbed_sheet.xml index 9b7014fa53..8eb49fc365 100644 --- a/app/src/main/res/layout/common_tabbed_sheet.xml +++ b/app/src/main/res/layout/common_tabbed_sheet.xml @@ -12,11 +12,10 @@