Fix toolbar color broken on android 5 & 6 (Closes #2571)

AndBible · Apr 15, 2023 · dbb5e6f · dbb5e6f
1 parent 684bbab
commit dbb5e6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 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
@@ -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
@@ -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>