From 44e2987a848ec07fd866f8ed76bb29c66b03e60a Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Sun, 4 Aug 2019 11:11:52 +0800
Subject: Fixed UI in dark theme. Minor bugs fixed.

---
 app/src/main/res/layout/app_bar_main.xml |  1 +
 app/src/main/res/layout/item_post.xml    |  8 ++++----
 app/src/main/res/values-night/colors.xml | 14 ++++++++++++++
 app/src/main/res/values/colors.xml       | 12 ++++++++++++
 4 files changed, 31 insertions(+), 4 deletions(-)

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

diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 530663ca..3c1aeb21 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -28,6 +28,7 @@
                     android:id="@+id/toolbar"
                     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" />
diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml
index 7598375d..e3be0913 100644
--- a/app/src/main/res/layout/item_post.xml
+++ b/app/src/main/res/layout/item_post.xml
@@ -19,7 +19,7 @@
             android:layout_height="wrap_content">
 
             <LinearLayout
-                android:id="@+id/subreddit_icon_name_linear_layout_view_item_post"
+                android:id="@+id/icon_name_linear_layout_view_item_post"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 app:layout_constrainedWidth="true"
@@ -30,13 +30,13 @@
                 app:layout_constraintTop_toTopOf="parent">
 
                 <CustomView.AspectRatioGifImageView
-                    android:id="@+id/subreddit_icon_gif_image_view_item_post"
+                    android:id="@+id/icon_gif_image_view_item_post"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_gravity="center"/>
 
                 <TextView
-                    android:id="@+id/subreddit_text_view_item_post"
+                    android:id="@+id/name_text_view_item_post"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
@@ -53,7 +53,7 @@
                 android:layout_marginEnd="8dp"
                 android:tint="@color/backgroundColorPrimaryDark"
                 android:visibility="gone"
-                app:layout_constraintStart_toEndOf="@id/subreddit_icon_name_linear_layout_view_item_post"
+                app:layout_constraintStart_toEndOf="@id/icon_name_linear_layout_view_item_post"
                 app:layout_constraintEnd_toStartOf="@+id/post_time_text_view_best_item_post"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintTop_toTopOf="parent"/>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index a08dfe08..e79b7fa2 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -27,4 +27,18 @@
     <color name="roundedBottomSheetPrimaryBackground">#242424</color>
 
     <color name="roundedBottomSheetPrimaryNavigationBarColor">#000000</color>
+
+    <color name="voteUnavailableVoteButtonColor">#3C3C3C</color>
+
+    <color name="tabLayoutWithExpandedCollapsingToolbarTextColor">#FFFFFF</color>
+
+    <color name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</color>
+
+    <color name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">@color/tabLayoutWithExpandedCollapsingToolbarTextColor</color>
+
+    <color name="tabLayoutWithCollapsedCollapsingToolbarTextColor">#FFFFFF</color>
+
+    <color name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</color>
+
+    <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6bbfc9c6..b69907f3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -29,4 +29,16 @@
     <color name="roundedBottomSheetPrimaryNavigationBarColor">#000000</color>
 
     <color name="voteUnavailableVoteButtonColor">#F0F0F0</color>
+
+    <color name="tabLayoutWithExpandedCollapsingToolbarTextColor">@color/colorPrimary</color>
+
+    <color name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</color>
+
+    <color name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">@color/tabLayoutWithExpandedCollapsingToolbarTextColor</color>
+
+    <color name="tabLayoutWithCollapsedCollapsingToolbarTextColor">#FFFFFF</color>
+
+    <color name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</color>
+
+    <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>
 </resources>
-- 
cgit v1.2.3