Merge pull request #1 from vojta-horanek/bottombar_redesign

Bottombar redesign
4 years ago · d1e985505c
10 changed files with 57 additions and 32 deletions
--- a/app/src/main/java/awais/instagrabber/activities/MainActivity.java
+++ b/app/src/main/java/awais/instagrabber/activities/MainActivity.java
@ -453,7 +453,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;
--- a/app/src/main/res/drawable/ic_discover.xml
+++ b/app/src/main/res/drawable/ic_discover.xml
@ -1,9 +0,0 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
        android:fillColor="@android:color/white"
        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z" />
 </vector>
--- a/app/src/main/res/drawable/ic_explore_24.xml
+++ b/app/src/main/res/drawable/ic_explore_24.xml
@ -0,0 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="@android:color/white"
      android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_feed.xml
+++ b/app/src/main/res/drawable/ic_feed.xml
@ -1,9 +0,0 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
        android:fillColor="@android:color/white"
        android:pathData="M13.5,0.67s0.74,2.65 0.74,4.8c0,2.06 -1.35,3.73 -3.41,3.73 -2.07,0 -3.63,-1.67 -3.63,-3.73l0.03,-0.36C5.21,7.51 4,10.62 4,14c0,4.42 3.58,8 8,8s8,-3.58 8,-8C20,8.61 17.41,3.8 13.5,0.67zM11.71,19c-1.78,0 -3.22,-1.4 -3.22,-3.14 0,-1.62 1.05,-2.76 2.81,-3.12 1.77,-0.36 3.6,-1.21 4.62,-2.58 0.39,1.29 0.59,2.65 0.59,4.04 0,2.65 -2.15,4.8 -4.8,4.8z" />
 </vector>
--- a/app/src/main/res/drawable/ic_home_24.xml
+++ b/app/src/main/res/drawable/ic_home_24.xml
@ -0,0 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="@android:color/white"
      android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_message_24.xml
+++ b/app/src/main/res/drawable/ic_message_24.xml
@ -0,0 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="@android:color/white"
      android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_person_24.xml
+++ b/app/src/main/res/drawable/ic_person_24.xml
@ -0,0 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="@android:color/white"
      android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
 </vector>
--- 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="auto"
        app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior"
        app:menu="@menu/main_bottom_navigation_menu" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- 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 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
    <item
        android:id="@+id/profile_nav_graph"
        android:icon="@drawable/ic_profile_24"
        android:icon="@drawable/ic_person_24"
        android:title="@string/profile" />
    <item
--- a/app/src/main/res/menu/main_bottom_navigation_menu.xml
+++ b/app/src/main/res/menu/main_bottom_navigation_menu.xml
@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
    <item
        android:id="@+id/profile_nav_graph"
        android:icon="@drawable/ic_person_24"
        android:title="@string/profile" />
    <item
        android:id="@+id/direct_messages_nav_graph"
        android:icon="@drawable/ic_round_send_24"
        android:icon="@drawable/ic_message_24"
        android:title="@string/title_dm" />
    <item
        android:id="@+id/feed_nav_graph"
        android:icon="@drawable/ic_feed"
        android:icon="@drawable/ic_home_24"
        android:title="@string/feed" />
    <item
        android:id="@+id/profile_nav_graph"
        android:icon="@drawable/ic_profile_24"
        android:title="@string/profile" />
    <item
        android:id="@+id/discover_nav_graph"
        android:icon="@drawable/ic_discover"
        android:icon="@drawable/ic_explore_24"
        android:title="@string/title_discover" />
    <!--<item-->
    <!--    android:id="@+id/favouritesFragment"-->
    <!--    android:icon="@drawable/ic_star_24"-->
    <!--    android:title="@string/title_favorites"/>-->
 <!--    <item-->
 <!--        android:id="@+id/favouritesFragment"-->
 <!--        android:icon="@drawable/ic_star_24"-->
 <!--        android:title="@string/title_favorites"/>-->
    <item
        android:id="@+id/more_nav_graph"