From 878328c01c309c3cd9b79eb832c6070df4ef2afd Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Fri, 25 Sep 2020 19:05:17 +0800
Subject: Customizing bottom app bar and fab in ViewSubredditDetailActivity is
 available.

---
 .../res/layout/activity_view_subreddit_detail.xml   | 21 +++++++++++----------
 app/src/main/res/layout/app_bar_main.xml            | 13 +------------
 2 files changed, 12 insertions(+), 22 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml
index 5c700094..4b58eb6d 100644
--- a/app/src/main/res/layout/activity_view_subreddit_detail.xml
+++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml
@@ -7,12 +7,6 @@
     android:id="@+id/coordinator_layout_view_subreddit_detail_activity"
     tools:application=".Activity.ViewSubredditDetailActivity">
 
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/view_pager_view_subreddit_detail_activity"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_view_subreddit_detail_activity"
         android:layout_width="match_parent"
@@ -172,6 +166,12 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/view_pager_view_subreddit_detail_activity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
     <com.google.android.material.bottomappbar.BottomAppBar
         android:id="@+id/bottom_navigation_view_subreddit_detail_activity"
         android:layout_width="match_parent"
@@ -184,10 +184,11 @@
             android:id="@+id/linear_layout_bottom_app_bar_view_subreddit_detail_activity"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingTop="6dp"
             android:weightSum="5">
 
             <ImageView
-                android:id="@+id/go_back_to_main_page_bottom_app_bar_view_subreddit_detail_activity"
+                android:id="@+id/option_1_bottom_app_bar_view_subreddit_detail_activity"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -198,7 +199,7 @@
                 android:background="?attr/selectableItemBackgroundBorderless" />
 
             <ImageView
-                android:id="@+id/subscriptions_bottom_app_bar_view_subreddit_detail_activity"
+                android:id="@+id/option_2_bottom_app_bar_view_subreddit_detail_activity"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -215,7 +216,7 @@
                 android:background="@android:color/transparent"/>
 
             <ImageView
-                android:id="@+id/message_bottom_app_bar_view_subreddit_detail_activity"
+                android:id="@+id/option_3_bottom_app_bar_view_subreddit_detail_activity"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -226,7 +227,7 @@
                 android:background="?attr/selectableItemBackgroundBorderless" />
 
             <ImageView
-                android:id="@+id/profile_bottom_app_bar_view_subreddit_detail_activity"
+                android:id="@+id/option_4_bottom_app_bar_view_subreddit_detail_activity"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 210988ad..1465b8f5 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -45,18 +45,6 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <!--<com.google.android.material.tabs.TabLayout
-        android:id="@+id/tab_layout_main_activity"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        app:layout_scrollFlags="scroll|enterAlways"
-        app:tabGravity="fill"
-        app:tabIndicatorHeight="3dp"
-        app:tabMode="fixed"
-        app:tabRippleColor="?attr/colorControlHighlight"
-        app:tabUnboundedRipple="false" />-->
-
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/view_pager_main_activity"
         android:layout_width="match_parent"
@@ -75,6 +63,7 @@
             android:id="@+id/linear_layout_bottom_app_bar_main_activity"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingTop="6dp"
             android:weightSum="5">
 
             <ImageView
-- 
cgit v1.2.3