Skip to content

Commit d9aa0dc

Browse files
authored
Merge pull request #17034 from wordpress-mobile/issue/bottom-navigation-bar-and-notification-badge-colors
Fixes bottom navigation bar color and notification badge color
2 parents af4f5e8 + 257b6b3 commit d9aa0dc

6 files changed

Lines changed: 10 additions & 2 deletions

File tree

WordPress/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<!-- Main tab activity -->
9191
<activity
9292
android:name=".ui.main.WPMainActivity"
93-
android:theme="@style/WordPress.NoActionBar"
93+
android:theme="@style/Wordpress.BottomBar"
9494
android:label="" />
9595

9696
<!-- Account activities -->

WordPress/src/main/res/drawable/bg_nav_badge.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
<solid android:color="@color/accent"/>
55
<stroke
66
android:width="1dp"
7-
android:color="@android:color/white"/>
7+
android:color="@color/bottom_bar_notification_badge"/>
88
</shape>

WordPress/src/main/res/values-night/colors.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<!-- Switch to attribute after dropping support for api 21-23 -->
66
<color name="placeholder">#1AFFFFFF</color>
77
<color name="p2_author_bg_stroke">#1E1E1E</color>
8+
<color name="bottom_bar_notification_badge">@color/background_dark_elevated</color>
89

910
<!-- Login Prologue -->
1011
<color name="promo_indicator_color_default">@color/white_translucent_20</color>

WordPress/src/main/res/values-night/styles.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,8 @@
128128

129129
<!-- Domains -->
130130
<style name="Domains.Button.Primary.Unelevated.OnPrimarySurface" parent="WordPress.Button.Primary.Unelevated" />
131+
132+
<style name="Wordpress.BottomBar" parent="WordPress.NoActionBar">
133+
<item name="android:navigationBarColor">@color/background_dark_elevated</item>
134+
</style>
131135
</resources>

WordPress/src/main/res/values/colors.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<color name="background_snackbar">@color/neutral_80</color>
1212
<color name="link_reader">@color/primary</color>
1313
<color name="link_stats">@color/accent</color>
14+
<color name="bottom_bar_notification_badge">@android:color/white</color>
1415

1516
<!-- Switch to attribute after dropping support for api 21-23 -->
1617
<color name="placeholder">#1A000000</color>

WordPress/src/main/res/values/styles.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@
199199
<!-- We need to keep this here so we can override it in values-vXY -->
200200
</style>
201201

202+
<style name="Wordpress.BottomBar" parent="WordPress.NoActionBar"/>
203+
202204
<style name="WordPress.NoActionBar" parent="WordPress">
203205
<item name="windowActionBar">false</item>
204206
<item name="windowNoTitle">true</item>

0 commit comments

Comments
 (0)