From 0d9db83dc37e7c8f784cbff87b0b19bb602821fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20Ho=C5=99=C3=A1nek?= Date: Wed, 20 Jan 2021 00:09:04 +0100 Subject: [PATCH 1/2] Redesigned the BottomNavigationView for better clarity + to match the Material Guidelines --- .../instagrabber/activities/MainActivity.java | 2 +- app/src/main/res/drawable/ic_discover.xml | 9 ------ app/src/main/res/drawable/ic_explore_24.xml | 10 ++++++ app/src/main/res/drawable/ic_feed.xml | 9 ------ app/src/main/res/drawable/ic_home_24.xml | 10 ++++++ app/src/main/res/drawable/ic_message_24.xml | 10 ++++++ app/src/main/res/drawable/ic_person_24.xml | 10 ++++++ app/src/main/res/layout/activity_main.xml | 2 +- .../logged_out_bottom_navigation_menu.xml | 2 +- .../res/menu/main_bottom_navigation_menu.xml | 31 ++++++++++--------- 10 files changed, 60 insertions(+), 35 deletions(-) delete mode 100755 app/src/main/res/drawable/ic_discover.xml create mode 100644 app/src/main/res/drawable/ic_explore_24.xml delete mode 100755 app/src/main/res/drawable/ic_feed.xml create mode 100644 app/src/main/res/drawable/ic_home_24.xml create mode 100644 app/src/main/res/drawable/ic_message_24.xml create mode 100644 app/src/main/res/drawable/ic_person_24.xml diff --git a/app/src/main/java/awais/instagrabber/activities/MainActivity.java b/app/src/main/java/awais/instagrabber/activities/MainActivity.java index d488b69b..513c6e9e 100644 --- a/app/src/main/java/awais/instagrabber/activities/MainActivity.java +++ b/app/src/main/java/awais/instagrabber/activities/MainActivity.java @@ -394,7 +394,7 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage if (!TextUtils.isEmpty(defaultTabResNameString)) { navId = getResources().getIdentifier(defaultTabResNameString, "navigation", getPackageName()); } - final int defaultNavId = navId <= 0 ? R.navigation.profile_nav_graph + final int defaultNavId = navId <= 0 ? R.navigation.feed_nav_graph : navId; final int index = mainNavList.indexOf(defaultNavId); if (index >= 0) firstFragmentGraphIndex = index; diff --git a/app/src/main/res/drawable/ic_discover.xml b/app/src/main/res/drawable/ic_discover.xml deleted file mode 100755 index 7a1ab400..00000000 --- a/app/src/main/res/drawable/ic_discover.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_explore_24.xml b/app/src/main/res/drawable/ic_explore_24.xml new file mode 100644 index 00000000..0ac168a2 --- /dev/null +++ b/app/src/main/res/drawable/ic_explore_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_feed.xml b/app/src/main/res/drawable/ic_feed.xml deleted file mode 100755 index c163a23d..00000000 --- a/app/src/main/res/drawable/ic_feed.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_home_24.xml b/app/src/main/res/drawable/ic_home_24.xml new file mode 100644 index 00000000..3a4c7dac --- /dev/null +++ b/app/src/main/res/drawable/ic_home_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_message_24.xml b/app/src/main/res/drawable/ic_message_24.xml new file mode 100644 index 00000000..a7adce5a --- /dev/null +++ b/app/src/main/res/drawable/ic_message_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_person_24.xml b/app/src/main/res/drawable/ic_person_24.xml new file mode 100644 index 00000000..6bdced2d --- /dev/null +++ b/app/src/main/res/drawable/ic_person_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 866770aa..cd599480 100755 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - app:labelVisibilityMode="labeled" + app:labelVisibilityMode="selected" app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior" app:menu="@menu/main_bottom_navigation_menu" /> \ No newline at end of file diff --git a/app/src/main/res/menu/logged_out_bottom_navigation_menu.xml b/app/src/main/res/menu/logged_out_bottom_navigation_menu.xml index e93193a0..4eb3da02 100644 --- a/app/src/main/res/menu/logged_out_bottom_navigation_menu.xml +++ b/app/src/main/res/menu/logged_out_bottom_navigation_menu.xml @@ -2,7 +2,7 @@ - - + + + + + - - - - + + + + Date: Wed, 20 Jan 2021 01:14:35 +0100 Subject: [PATCH 2/2] BottomNavigationView: show labels when selected only when logged in (more than or equal to 4 items) and always shown when logged out (less than 4 items) --- app/src/main/res/layout/activity_main.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index cd599480..d21d42a6 100755 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - app:labelVisibilityMode="selected" + app:labelVisibilityMode="auto" app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior" app:menu="@menu/main_bottom_navigation_menu" /> \ No newline at end of file