From d3302ad75dcec9e4d3419f8f325f6dbbc76852e2 Mon Sep 17 00:00:00 2001 From: 12aw Date: Fri, 15 Dec 2023 23:38:46 +0100 Subject: [PATCH] Bottom nav styling fixes jumping icon (cherry picked from commit f60e516f455b0e25aac9acb96da74d996cd84ce8) --- src/main/res/layout-w945dp/activity_conversations.xml | 2 +- src/main/res/layout/activity_conversations.xml | 2 +- src/main/res/layout/activity_start_conversation.xml | 2 +- src/main/res/values/styles.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/res/layout-w945dp/activity_conversations.xml b/src/main/res/layout-w945dp/activity_conversations.xml index 2df26f6f3..215046bd4 100644 --- a/src/main/res/layout-w945dp/activity_conversations.xml +++ b/src/main/res/layout-w945dp/activity_conversations.xml @@ -37,7 +37,7 @@ android:layout_height="70dp" android:layout_gravity="end|bottom" android:background="?attr/color_background_secondary" - app:labelVisibilityMode="selected" + app:labelVisibilityMode="labeled" app:itemActiveIndicatorStyle="@style/monocles.Active.Indicator" app:menu="@menu/bottom_navigation_menu" android:animateLayoutChanges="true" /> diff --git a/src/main/res/layout/activity_conversations.xml b/src/main/res/layout/activity_conversations.xml index c8c2415dd..b49f1b5d7 100644 --- a/src/main/res/layout/activity_conversations.xml +++ b/src/main/res/layout/activity_conversations.xml @@ -51,7 +51,7 @@ android:layout_gravity="end|bottom" android:layout_below="@+id/main_fragment" android:background="?attr/color_background_secondary" - app:labelVisibilityMode="selected" + app:labelVisibilityMode="labeled" app:itemActiveIndicatorStyle="@style/monocles.Active.Indicator" app:menu="@menu/bottom_navigation_menu" android:animateLayoutChanges="true" /> diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml index 683593cd7..3c67c69d6 100644 --- a/src/main/res/layout/activity_start_conversation.xml +++ b/src/main/res/layout/activity_start_conversation.xml @@ -65,7 +65,7 @@ android:layout_gravity="end|bottom" android:layout_below="@+id/start_conversation_view_pager" android:background="?attr/color_background_secondary" - app:labelVisibilityMode="selected" + app:labelVisibilityMode="labeled" app:itemActiveIndicatorStyle="@style/monocles.Active.Indicator" app:menu="@menu/bottom_navigation_menu" android:animateLayoutChanges="true" /> diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 64de3b8b2..db9ef4ad5 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -271,7 +271,7 @@ \ No newline at end of file