From b38025882d7b03adb0a3acad136b90d4bafdcf0a Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 9 Dec 2020 00:29:22 +0800
Subject: Add custom theme entries for read posts. Fix crash in
 ViewUserDetailActivity.

---
 .../res/layout/activity_view_subreddit_detail.xml  |  2 +-
 .../main/res/layout/activity_view_user_detail.xml  |  2 +-
 app/src/main/res/layout/app_bar_main.xml           |  2 +-
 app/src/main/res/layout/bottom_app_bar.xml         | 66 ++++++++++++++++++++++
 .../res/layout/bottom_app_bar_other_activities.xml | 66 ----------------------
 5 files changed, 69 insertions(+), 69 deletions(-)
 create mode 100644 app/src/main/res/layout/bottom_app_bar.xml
 delete mode 100644 app/src/main/res/layout/bottom_app_bar_other_activities.xml

(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 ef26b762..fbaf0fab 100644
--- a/app/src/main/res/layout/activity_view_subreddit_detail.xml
+++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml
@@ -173,7 +173,7 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <include
-        layout="@layout/bottom_app_bar_other_activities"
+        layout="@layout/bottom_app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom" />
diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml
index 3ace2e08..8cad86b9 100644
--- a/app/src/main/res/layout/activity_view_user_detail.xml
+++ b/app/src/main/res/layout/activity_view_user_detail.xml
@@ -140,7 +140,7 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <include
-        layout="@layout/bottom_app_bar_other_activities"
+        layout="@layout/bottom_app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom" />
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index c17ef9f7..85db79c9 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -52,7 +52,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     <include
-        layout="@layout/bottom_app_bar_other_activities"
+        layout="@layout/bottom_app_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom" />
diff --git a/app/src/main/res/layout/bottom_app_bar.xml b/app/src/main/res/layout/bottom_app_bar.xml
new file mode 100644
index 00000000..fa1d886f
--- /dev/null
+++ b/app/src/main/res/layout/bottom_app_bar.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.bottomappbar.BottomAppBar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/bottom_app_bar_bottom_app_bar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:visibility="gone"
+    app:fabAlignmentMode="center">
+
+    <LinearLayout
+        android:id="@+id/linear_layout_bottom_app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="6dp"
+        android:weightSum="5">
+
+        <ImageView
+            android:id="@+id/option_1_bottom_app_bar"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:background="?attr/selectableItemBackgroundBorderless" />
+
+        <ImageView
+            android:id="@+id/option_2_bottom_app_bar"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:background="?attr/selectableItemBackgroundBorderless" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@android:color/transparent"/>
+
+        <ImageView
+            android:id="@+id/option_3_bottom_app_bar"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:background="?attr/selectableItemBackgroundBorderless" />
+
+        <ImageView
+            android:id="@+id/option_4_bottom_app_bar"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginEnd="16dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:gravity="center"
+            android:background="?attr/selectableItemBackgroundBorderless" />
+
+    </LinearLayout>
+
+</com.google.android.material.bottomappbar.BottomAppBar>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_app_bar_other_activities.xml b/app/src/main/res/layout/bottom_app_bar_other_activities.xml
deleted file mode 100644
index fa1d886f..00000000
--- a/app/src/main/res/layout/bottom_app_bar_other_activities.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.bottomappbar.BottomAppBar xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/bottom_app_bar_bottom_app_bar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:visibility="gone"
-    app:fabAlignmentMode="center">
-
-    <LinearLayout
-        android:id="@+id/linear_layout_bottom_app_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="6dp"
-        android:weightSum="5">
-
-        <ImageView
-            android:id="@+id/option_1_bottom_app_bar"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:background="?attr/selectableItemBackgroundBorderless" />
-
-        <ImageView
-            android:id="@+id/option_2_bottom_app_bar"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:background="?attr/selectableItemBackgroundBorderless" />
-
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@android:color/transparent"/>
-
-        <ImageView
-            android:id="@+id/option_3_bottom_app_bar"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:background="?attr/selectableItemBackgroundBorderless" />
-
-        <ImageView
-            android:id="@+id/option_4_bottom_app_bar"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginEnd="16dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:gravity="center"
-            android:background="?attr/selectableItemBackgroundBorderless" />
-
-    </LinearLayout>
-
-</com.google.android.material.bottomappbar.BottomAppBar>
\ No newline at end of file
-- 
cgit v1.2.3