From dbb5e6f9ad50cf5d3a7c9bf1c1be39f785e206c8 Mon Sep 17 00:00:00 2001
From: Tuomas Airaksinen <tuomas.airaksinen@vrt.fi>
Date: Sat, 15 Apr 2023 18:20:17 +0300
Subject: [PATCH] Fix toolbar color broken on android 5 & 6 (Closes #2571)

---
 .../android/view/activity/page/MainBibleActivity.kt      | 9 ++++++++-
 app/src/main/res/values/barstyles.xml                    | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/net/bible/android/view/activity/page/MainBibleActivity.kt b/app/src/main/java/net/bible/android/view/activity/page/MainBibleActivity.kt
index 659b0c1664..ed88aa08cc 100644
--- a/app/src/main/java/net/bible/android/view/activity/page/MainBibleActivity.kt
+++ b/app/src/main/java/net/bible/android/view/activity/page/MainBibleActivity.kt
@@ -1169,7 +1169,14 @@ class MainBibleActivity : CustomTitlebarActivityBase() {
                     resources.getColor(R.color.actionbar_background_night, theme)
                 else
                     workspaceSettings.workspaceColor ?: defaultWorkspaceColor
-                binding.toolbarLayout.setBackgroundColor(toolbarColor)
+
+                binding.run {
+                    homeButton.setBackgroundColor(toolbarColor)
+                    pageTitle.setBackgroundColor(toolbarColor)
+                    documentTitle.setBackgroundColor(toolbarColor)
+                    toolbarButtonLayout.setBackgroundColor(toolbarColor)
+                }
+
                 if (ScreenSettings.nightMode){
                     binding.homeButton.drawable.setTint(workspaceSettings.workspaceColor ?: defaultWorkspaceColor)
                 }
diff --git a/app/src/main/res/values/barstyles.xml b/app/src/main/res/values/barstyles.xml
index 4d80236eb3..2e50f9ae70 100644
--- a/app/src/main/res/values/barstyles.xml
+++ b/app/src/main/res/values/barstyles.xml
@@ -74,6 +74,7 @@
 	</style>
 	<style name="MainBibleActionBar">
 		<item name="actionOverflowButtonStyle">@style/OptionsButtonsStyle</item>
+		<item name="android:background">@color/actionbar_background</item>
 	</style>
 	<style name="MainBibleActionBarButtons" parent="MainBibleActionBar">
 		<item name="android:textColorSecondary">@color/white</item>