From 1a136b6ade9b8d07d84635b9cb8622e6a44bd63b Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Sun, 14 Nov 2021 09:41:30 +0300
Subject: [PATCH] Replace action bar with material toolbar

---
 .../java/gq/kirmanak/mealie/MainActivity.kt    |  5 ++++-
 app/src/main/res/layout/main_activity.xml      | 18 +++++++++++++++++-
 app/src/main/res/values-night/themes.xml       |  2 +-
 app/src/main/res/values/themes.xml             |  2 +-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/gq/kirmanak/mealie/MainActivity.kt b/app/src/main/java/gq/kirmanak/mealie/MainActivity.kt
index 0be5194..13551b6 100644
--- a/app/src/main/java/gq/kirmanak/mealie/MainActivity.kt
+++ b/app/src/main/java/gq/kirmanak/mealie/MainActivity.kt
@@ -8,10 +8,13 @@ import timber.log.Timber
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
+    private lateinit var binding: MainActivityBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Timber.v("onCreate() called with: savedInstanceState = $savedInstanceState")
-        val binding = MainActivityBinding.inflate(layoutInflater)
+        binding = MainActivityBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        setSupportActionBar(binding.toolbar)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 1b06c4e..e174019 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -6,6 +6,22 @@
 	android:layout_height="match_parent"
 	tools:context=".MainActivity">
 
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/toolbar_holder"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
+
+		<com.google.android.material.appbar.MaterialToolbar
+			android:id="@+id/toolbar"
+			style="@style/Widget.MaterialComponents.Toolbar.Primary"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize" />
+
+	</com.google.android.material.appbar.AppBarLayout>
+
 	<androidx.fragment.app.FragmentContainerView
 		android:id="@+id/nav_host"
 		android:name="androidx.navigation.fragment.NavHostFragment"
@@ -15,6 +31,6 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/toolbar_holder"
 		app:navGraph="@navigation/nav_graph" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index fcc587f..f737be5 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 	<!-- Base application theme. -->
-	<style name="Theme.Mealie" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+	<style name="Theme.Mealie" parent="Theme.MaterialComponents.DayNight.NoActionBar">
 		<!-- Primary brand color. -->
 		<item name="colorPrimary">@color/purple_200</item>
 		<item name="colorPrimaryVariant">@color/purple_700</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 58c5916..3ba7a12 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 	<!-- Base application theme. -->
-	<style name="Theme.Mealie" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+	<style name="Theme.Mealie" parent="Theme.MaterialComponents.DayNight.NoActionBar">
 		<!-- Primary brand color. -->
 		<item name="colorPrimary">@color/purple_500</item>
 		<item name="colorPrimaryVariant">@color/purple_700</item>