From 81c259edcb557e231766e17980bf7a20906ee983 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Thu, 26 Sep 2019 21:57:51 +0800
Subject: Fixed UI issues in dark theme.

---
 .../res/layout/activity_account_saved_thing.xml    | 19 ++++++++-------
 app/src/main/res/layout/activity_search_result.xml | 28 ++++------------------
 .../layout/activity_subscribed_thing_listing.xml   |  8 +++----
 app/src/main/res/layout/app_bar_main.xml           |  8 -------
 4 files changed, 18 insertions(+), 45 deletions(-)

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

diff --git a/app/src/main/res/layout/activity_account_saved_thing.xml b/app/src/main/res/layout/activity_account_saved_thing.xml
index 868f3b37..c57323a0 100644
--- a/app/src/main/res/layout/activity_account_saved_thing.xml
+++ b/app/src/main/res/layout/activity_account_saved_thing.xml
@@ -6,12 +6,6 @@
     android:layout_height="match_parent"
     tools:context=".AccountPostsActivity">
 
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/view_pager_account_saved_thing_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_account_saved_thing_activity"
         android:layout_width="match_parent"
@@ -30,8 +24,9 @@
                 android:id="@+id/toolbar_account_saved_thing_activity"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                app:popupTheme="@style/AppTheme.PopupOverlay"
-                app:navigationIcon="?attr/homeAsUpIndicator" />
+                app:layout_collapseMode="pin"
+                app:layout_scrollFlags="scroll|enterAlways"
+                app:popupTheme="@style/AppTheme.PopupOverlay" />
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
@@ -40,7 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            android:background="@color/colorPrimary"
+            android:background="@color/greyTabBackgroundColor"
             app:layout_scrollFlags="scroll|enterAlways"
             app:tabGravity="fill"
             app:tabIndicatorColor="@android:color/white"
@@ -53,4 +48,10 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/view_pager_account_saved_thing_activity"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_result.xml b/app/src/main/res/layout/activity_search_result.xml
index 839820c6..32c4309c 100644
--- a/app/src/main/res/layout/activity_search_result.xml
+++ b/app/src/main/res/layout/activity_search_result.xml
@@ -18,31 +18,11 @@
             app:titleEnabled="false"
             app:toolbarId="@+id/toolbar_search_result_activity">
 
-            <FrameLayout
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar_search_result_activity"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar_search_result_activity"
-                    android:layout_width="match_parent"
-                    android:layout_height="?attr/actionBarSize"
-                    app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-                <com.ferfalk.simplesearchview.SimpleSearchView
-                    android:id="@+id/search_view_search_result_activity"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:textColor="@android:color/white"
-                    app:voiceSearch="true"
-                    app:searchBackground="@color/colorPrimary"
-                    app:cursorColor="@android:color/white"
-                    app:hintColor="#E0E0E0"
-                    app:iconsTint="@android:color/white"
-                    app:backIconTint="@android:color/white"
-                    app:iconsAlpha="1"
-                    app:backIconAlpha="1" />
-
-            </FrameLayout>
+                android:layout_height="?attr/actionBarSize"
+                app:popupTheme="@style/AppTheme.PopupOverlay" />
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
diff --git a/app/src/main/res/layout/activity_subscribed_thing_listing.xml b/app/src/main/res/layout/activity_subscribed_thing_listing.xml
index 6a48ec15..9198a636 100644
--- a/app/src/main/res/layout/activity_subscribed_thing_listing.xml
+++ b/app/src/main/res/layout/activity_subscribed_thing_listing.xml
@@ -23,7 +23,8 @@
                 android:id="@+id/toolbar_subscribed_thing_listing_activity"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
+                app:layout_collapseMode="pin"
+                app:layout_scrollFlags="scroll|enterAlways"
                 app:popupTheme="@style/AppTheme.PopupOverlay" />
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
@@ -32,7 +33,7 @@
             android:id="@+id/tab_layout_subscribed_thing_listing_activity"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/colorPrimary"
+            android:background="@color/greyTabBackgroundColor"
             app:layout_scrollFlags="scroll|enterAlways"
             app:tabGravity="fill"
             app:tabMode="fixed"
@@ -49,7 +50,6 @@
         android:id="@+id/view_pager_subscribed_thing_listing_activity"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:application=".SubscribedThingListingActivity" />
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index b834c1ff..7c4fd126 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -49,14 +49,6 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <View
-        android:id="@+id/transparent_overlay_main_activity"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#40000000"
-        android:elevation="1dp"
-        android:visibility="gone" />
-
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager_main_activity"
         android:layout_width="match_parent"
-- 
cgit v1.2.3