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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:shape="rectangle">
+            <solid android:color="@android:color/transparent"/>
+        </shape>
+    </item>
+    <item
+        android:gravity="bottom">
+        <shape>
+            <size android:height="1dp" />
+            <solid android:color="?attr/colorSurfaceVariant" />
+        </shape>
+    </item>
+</layer-list>
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 @@
 
         <!-- Remove background color so rounded sheet corners work -->
         <com.google.android.material.tabs.TabLayout
-            style="@style/Widget.Tachiyomi.TabLayout"
             android:id="@+id/tabs"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
+            android:background="@drawable/transparent_tabs_background"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/menu"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/navigation_view_group.xml b/app/src/main/res/layout/navigation_view_group.xml
index fd44021994..8c3c90303b 100644
--- a/app/src/main/res/layout/navigation_view_group.xml
+++ b/app/src/main/res/layout/navigation_view_group.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:background="?android:attr/colorBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:paddingStart="?attr/listPreferredItemPaddingStart"