From f46d389b835a33ca38ca8b293992267364addd19 Mon Sep 17 00:00:00 2001
From: Adam Kasprzycki <66315787+santoni0@users.noreply.github.com>
Date: Sat, 22 Oct 2022 16:27:04 +0200
Subject: [PATCH] Change drawer header, dark bottombar color

---
 app/src/main/AndroidManifest.xml                      |  2 +-
 .../java/pl/szczodrzynski/edziennik/MainActivity.kt   |  7 -------
 app/src/main/res/layout/card_home.xml                 |  1 -
 app/src/main/res/layout/material_drawer_header.xml    | 11 ++++++-----
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c5c273b4..9e7499e7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <!-- PowerPermission uses minSdk 21, it's safe to override as it is used only in >= 23 -->
-    <uses-sdk tools:overrideLibrary="com.qifan.powerpermission.coroutines, com.qifan.powerpermission.core" />
+    <uses-sdk tools:overrideLibrary="com.qifan.powerpermission.coroutines, com.qifan.powerpermission.core, com.mikepenz:materialdrawer, com.mikepenz.iconics.typeface.library.navlibfont" />
 
     <application
         android:name=".App"
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
index 7197ea10..e5fa5bd3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@@ -390,13 +390,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
                 fabExtendable = true
                 fabExtended = false
                 fabGravity = Gravity.CENTER
-                if (Themes.isDark) {
-                    setBackgroundColor(blendColors(
-                        getColorFromAttr(context, R.attr.colorSurface),
-                        getColorFromRes(R.color.colorSurface_4dp)
-                    ))
-                    elevation = dpToPx(4).toFloat()
-                }
             }
 
             bottomSheet.apply {
diff --git a/app/src/main/res/layout/card_home.xml b/app/src/main/res/layout/card_home.xml
index 123d591d..7162bc44 100644
--- a/app/src/main/res/layout/card_home.xml
+++ b/app/src/main/res/layout/card_home.xml
@@ -10,5 +10,4 @@
     android:layout_marginVertical="8dp"
     android:clickable="true"
     android:focusable="true"
-    android:background="?colorSurfaceVariant"
     style="?attr/materialCardViewFilledStyle" />
diff --git a/app/src/main/res/layout/material_drawer_header.xml b/app/src/main/res/layout/material_drawer_header.xml
index 51fffb92..f515831b 100644
--- a/app/src/main/res/layout/material_drawer_header.xml
+++ b/app/src/main/res/layout/material_drawer_header.xml
@@ -14,7 +14,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="gone" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/material_drawer_statusbar_guideline"
@@ -25,9 +26,9 @@
 
     <com.mikepenz.materialdrawer.view.BezelImageView
         android:id="@+id/material_drawer_account_header_current"
+        android:layout_width="0.1dp"
+        android:layout_height="0.1dp"
         style="@style/BezelImageView"
-        android:layout_width="@dimen/material_drawer_account_header_selected"
-        android:layout_height="@dimen/material_drawer_account_header_selected"
         android:layout_marginStart="@dimen/material_drawer_vertical_padding"
         android:layout_marginLeft="@dimen/material_drawer_vertical_padding"
         android:layout_marginTop="@dimen/material_drawer_account_header_horizontal_top"
@@ -41,8 +42,8 @@
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/material_drawer_account_header_current_badge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:elevation="4dp"
         android:fontFamily="sans-serif"
         android:gravity="center"