Make nav bar white in day theme and change it to the same color as background color in some activities. Fixed nav bar icon color in dark theme. Minor UI tweaks.

5 files changed, 383 insertions, 397 deletions

diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index d949904a..89db5a2f 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -1,140 +1,134 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/card_view_item_comment"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/linear_layout_item_comment"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
+    <View
+        android:id="@+id/vertical_block_item_post_comment"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:background="@color/textColorPrimaryDark"/>
+
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <View
-            android:id="@+id/vertical_block_item_post_comment"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="@color/textColorPrimaryDark"/>
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginBottom="12dp"
+        android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="12dp"
-            android:orientation="vertical">
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp">
-
-                <TextView
-                    android:id="@+id/author_text_view_item_post_comment"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginEnd="16dp"
-                    android:textColor="@color/textColorPrimaryDark"/>
-
-                <TextView
-                    android:id="@+id/comment_time_text_view_item_post_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="end" />
-
-            </LinearLayout>
-
-            <CustomView.CustomMarkwonView
-                android:id="@+id/comment_markdown_view_item_post_comment"
-                android:layout_width="match_parent"
+            <TextView
+                android:id="@+id/author_text_view_item_post_comment"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginStart="32dp"
-                android:layout_marginEnd="32dp"
-                android:layout_marginBottom="8dp"
-                android:textColor="@color/primaryTextColor"/>
-
-            <RelativeLayout
-                android:id="@+id/relative_layout_item_post_comment"
-                android:layout_width="match_parent"
+                android:layout_weight="1"
+                android:layout_marginEnd="16dp"
+                android:textColor="@color/textColorPrimaryDark"/>
+
+            <TextView
+                android:id="@+id/comment_time_text_view_item_post_comment"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp">
-
-                <ImageView
-                    android:id="@+id/plus_button_item_post_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:src="@drawable/ic_arrow_upward_black_20dp"
-                    android:layout_centerVertical="true"
-                    android:tint="@android:color/tab_indicator_text"
-                    android:background="?actionBarItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"/>
-
-                <TextView
-                    android:id="@+id/score_text_view_item_post_comment"
-                    android:layout_width="64dp"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toEndOf="@id/plus_button_item_post_comment"
-                    android:gravity="center"/>
-
-                <ImageView
-                    android:id="@+id/minus_button_item_post_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toEndOf="@id/score_text_view_item_post_comment"
-                    android:src="@drawable/ic_arrow_downward_black_20dp"
-                    android:tint="@android:color/tab_indicator_text"
-                    android:background="?actionBarItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"/>
-
-                <ImageView
-                    android:id="@+id/expand_button_item_post_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toStartOf="@id/share_button_item_post_comment"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="16dp"
-                    android:src="@drawable/ic_expand_less_black_20dp"
-                    android:tint="@android:color/tab_indicator_text"
-                    android:background="?actionBarItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:visibility="gone"/>
-
-                <ImageView
-                    android:id="@+id/share_button_item_post_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toStartOf="@id/reply_button_item_post_comment"
-                    android:layout_centerVertical="true"
-                    android:layout_marginEnd="16dp"
-                    android:src="@drawable/ic_outline_share_20px"
-                    android:tint="@android:color/tab_indicator_text"
-                    android:background="?actionBarItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"/>
-
-                <ImageView
-                    android:id="@+id/reply_button_item_post_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_alignParentEnd="true"
-                    android:src="@drawable/ic_reply_black_20dp"
-                    android:tint="@android:color/tab_indicator_text"
-                    android:background="?actionBarItemBackground"
-                    android:clickable="true"
-                    android:focusable="true"/>
-
-            </RelativeLayout>
+                android:gravity="end" />
 
         </LinearLayout>
 
+        <CustomView.CustomMarkwonView
+            android:id="@+id/comment_markdown_view_item_post_comment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="8dp"
+            android:textColor="@color/primaryTextColor"/>
+
+        <RelativeLayout
+            android:id="@+id/relative_layout_item_post_comment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp">
+
+            <ImageView
+                android:id="@+id/plus_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:src="@drawable/ic_arrow_upward_black_20dp"
+                android:layout_centerVertical="true"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"/>
+
+            <TextView
+                android:id="@+id/score_text_view_item_post_comment"
+                android:layout_width="64dp"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/plus_button_item_post_comment"
+                android:gravity="center"/>
+
+            <ImageView
+                android:id="@+id/minus_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/score_text_view_item_post_comment"
+                android:src="@drawable/ic_arrow_downward_black_20dp"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"/>
+
+            <ImageView
+                android:id="@+id/expand_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toStartOf="@id/share_button_item_post_comment"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="16dp"
+                android:src="@drawable/ic_expand_less_black_20dp"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:visibility="gone"/>
+
+            <ImageView
+                android:id="@+id/share_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toStartOf="@id/reply_button_item_post_comment"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="16dp"
+                android:src="@drawable/ic_outline_share_20px"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"/>
+
+            <ImageView
+                android:id="@+id/reply_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentEnd="true"
+                android:src="@drawable/ic_reply_black_20dp"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"/>
+
+        </RelativeLayout>
+
     </LinearLayout>
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_load_more_comments_placeholder.xml b/app/src/main/res/layout/item_load_more_comments_placeholder.xml
index 5a006ff5..e9333e6e 100644
--- a/app/src/main/res/layout/item_load_more_comments_placeholder.xml
+++ b/app/src/main/res/layout/item_load_more_comments_placeholder.xml
@@ -1,27 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <View
-            android:id="@+id/vertical_block_item_load_more_comments"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:background="@color/textColorPrimaryDark" />
+    <View
+        android:id="@+id/vertical_block_item_load_more_comments"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:background="@color/textColorPrimaryDark" />
 
-        <TextView
-            android:id="@+id/placeholder_text_view_item_load_more_comments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/comment_load_more_comments"
-            android:textColor="@color/primaryTextColor" />
-
-    </LinearLayout>
+    <TextView
+        android:id="@+id/placeholder_text_view_item_load_more_comments"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:padding="8dp"
+        android:text="@string/comment_load_more_comments"
+        android:textColor="@color/primaryTextColor" />
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml
index 7d85466f..18cae54c 100644
--- a/app/src/main/res/layout/item_post_detail.xml
+++ b/app/src/main/res/layout/item_post_detail.xml
@@ -1,302 +1,296 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:orientation="vertical">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/relative_layout_item_post_detail"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="wrap_content">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/relative_layout_item_post_detail"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        <RelativeLayout
+            android:id="@+id/subreddit_icon_name_relative_layout_item_post_detail"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/post_time_text_view_item_post_detail"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <CustomView.AspectRatioGifImageView
+                android:id="@+id/icon_gif_image_view_item_post_detail"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_centerVertical="true" />
 
-            <RelativeLayout
-                android:id="@+id/subreddit_icon_name_relative_layout_item_post_detail"
-                android:layout_width="0dp"
+            <TextView
+                android:id="@+id/subreddit_text_view_item_post_detail"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="16dp"
-                app:layout_constrainedWidth="true"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/post_time_text_view_item_post_detail"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <CustomView.AspectRatioGifImageView
-                    android:id="@+id/icon_gif_image_view_item_post_detail"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_centerVertical="true" />
-
-                <TextView
-                    android:id="@+id/subreddit_text_view_item_post_detail"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_toEndOf="@id/icon_gif_image_view_item_post_detail"
-                    android:textColor="@color/colorAccent" />
-
-                <TextView
-                    android:id="@+id/user_text_view_item_post_detail"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_alignParentBottom="true"
-                    android:layout_below="@id/subreddit_text_view_item_post_detail"
-                    android:layout_toEndOf="@id/icon_gif_image_view_item_post_detail"
-                    android:textColor="@color/textColorPrimaryDark" />
-
-            </RelativeLayout>
+                android:layout_marginStart="16dp"
+                android:layout_alignParentTop="true"
+                android:layout_toEndOf="@id/icon_gif_image_view_item_post_detail"
+                android:textColor="@color/colorAccent" />
 
             <TextView
-                android:id="@+id/post_time_text_view_item_post_detail"
+                android:id="@+id/user_text_view_item_post_detail"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/subreddit_icon_name_relative_layout_item_post_detail"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
+                android:layout_marginStart="16dp"
+                android:layout_alignParentBottom="true"
+                android:layout_below="@id/subreddit_text_view_item_post_detail"
+                android:layout_toEndOf="@id/icon_gif_image_view_item_post_detail"
+                android:textColor="@color/textColorPrimaryDark" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </RelativeLayout>
 
         <TextView
-            android:id="@+id/title_text_view_item_post_detail"
-            android:layout_width="match_parent"
+            android:id="@+id/post_time_text_view_item_post_detail"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:textColor="@color/primaryTextColor"
-            android:textSize="18sp" />
+            android:layout_gravity="center"
+            android:layout_marginEnd="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/subreddit_icon_name_relative_layout_item_post_detail"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
 
-        <CustomView.CustomMarkwonView
-            android:id="@+id/content_markdown_view_item_post_detail"
-            android:layout_width="match_parent"
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <TextView
+        android:id="@+id/title_text_view_item_post_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:textColor="@color/primaryTextColor"
+        android:textSize="18sp" />
+
+    <CustomView.CustomMarkwonView
+        android:id="@+id/content_markdown_view_item_post_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:layout_marginTop="16dp"
+        android:visibility="gone" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="16dp">
+
+        <com.google.android.material.chip.Chip
+            android:id="@+id/type_text_view_item_post_detail"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:layout_marginTop="16dp"
-            android:visibility="gone" />
+            android:layout_marginEnd="16dp"
+            android:textColor="@android:color/white"
+            android:layout_centerVertical="true"
+            app:chipBackgroundColor="@color/backgroundColorPrimaryDark"/>
 
-        <RelativeLayout
-            android:layout_width="match_parent"
+        <ImageView
+            android:id="@+id/gilded_image_view_item_post_detail"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_toEndOf="@id/type_text_view_item_post_detail"
+            android:layout_centerVertical="true"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/gilded_number_text_view_item_post_detail"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:paddingTop="16dp">
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="8dp"
+            android:layout_toEndOf="@id/gilded_image_view_item_post_detail"
+            android:layout_centerVertical="true"
+            android:visibility="gone"
+            android:textSize="20sp"
+            android:textColor="@color/gold"/>
 
-            <com.google.android.material.chip.Chip
-                android:id="@+id/type_text_view_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:textColor="@android:color/white"
-                android:layout_centerVertical="true"
-                app:chipBackgroundColor="@color/backgroundColorPrimaryDark"/>
+        <ImageView
+            android:id="@+id/crosspost_image_view_item_post_detail"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_toEndOf="@id/gilded_number_text_view_item_post_detail"
+            android:layout_centerVertical="true"
+            android:src="@drawable/crosspost"
+            android:tint="@color/colorAccent"
+            android:visibility="gone"/>
 
-            <ImageView
-                android:id="@+id/gilded_image_view_item_post_detail"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_toEndOf="@id/type_text_view_item_post_detail"
-                android:layout_centerVertical="true"
-                android:visibility="gone"/>
+        <com.google.android.material.chip.Chip
+            android:id="@+id/nsfw_text_view_item_post_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/nsfw"
+            android:layout_alignParentEnd="true"
+            android:layout_marginStart="8dp"
+            android:textColor="@android:color/white"
+            android:visibility="gone"
+            android:layout_centerVertical="true"
+            app:chipBackgroundColor="@color/colorAccent"/>
 
-            <TextView
-                android:id="@+id/gilded_number_text_view_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
-                android:layout_marginEnd="8dp"
-                android:layout_toEndOf="@id/gilded_image_view_item_post_detail"
-                android:layout_centerVertical="true"
-                android:visibility="gone"
-                android:textSize="20sp"
-                android:textColor="@color/gold"/>
-
-            <ImageView
-                android:id="@+id/crosspost_image_view_item_post_detail"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_toEndOf="@id/gilded_number_text_view_item_post_detail"
-                android:layout_centerVertical="true"
-                android:src="@drawable/crosspost"
-                android:tint="@color/colorAccent"
-                android:visibility="gone"/>
-
-            <com.google.android.material.chip.Chip
-                android:id="@+id/nsfw_text_view_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/nsfw"
-                android:layout_alignParentEnd="true"
-                android:layout_marginStart="8dp"
-                android:textColor="@android:color/white"
-                android:visibility="gone"
-                android:layout_centerVertical="true"
-                app:chipBackgroundColor="@color/colorAccent"/>
+    </RelativeLayout>
 
-        </RelativeLayout>
+    <LinearLayout
+        android:id="@+id/spoiler_flair_linear_layout_item_post_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:visibility="gone">
 
-        <LinearLayout
-            android:id="@+id/spoiler_flair_linear_layout_item_post_detail"
-            android:layout_width="match_parent"
+        <com.libRG.CustomTextView
+            android:id="@+id/spoiler_custom_text_view_item_post_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="16dp"
+            android:text="@string/spoiler"
+            android:textSize="12sp"
+            android:textColor="@android:color/white"
+            android:padding="4dp"
+            android:visibility="gone"
+            app:lib_setRadius="3dp"
+            app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
+            app:lib_setRoundedView="true"
+            app:lib_setShape="rectangle" />
+
+        <com.libRG.CustomTextView
+            android:id="@+id/flair_custom_text_view_item_post_detail"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:visibility="gone">
+            android:layout_gravity="center"
+            android:layout_marginStart="16dp"
+            android:textSize="12sp"
+            android:textColor="@android:color/white"
+            android:padding="4dp"
+            android:visibility="gone"
+            app:lib_setRadius="3dp"
+            app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
+            app:lib_setRoundedView="true"
+            app:lib_setShape="rectangle" />
 
-            <com.libRG.CustomTextView
-                android:id="@+id/spoiler_custom_text_view_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="16dp"
-                android:text="@string/spoiler"
-                android:textSize="12sp"
-                android:textColor="@android:color/white"
-                android:padding="4dp"
-                android:visibility="gone"
-                app:lib_setRadius="3dp"
-                app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
-                app:lib_setRoundedView="true"
-                app:lib_setShape="rectangle" />
-
-            <com.libRG.CustomTextView
-                android:id="@+id/flair_custom_text_view_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="16dp"
-                android:textSize="12sp"
-                android:textColor="@android:color/white"
-                android:padding="4dp"
-                android:visibility="gone"
-                app:lib_setRadius="3dp"
-                app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
-                app:lib_setRoundedView="true"
-                app:lib_setShape="rectangle" />
+    </LinearLayout>
 
-        </LinearLayout>
+    <TextView
+        android:id="@+id/link_text_view_item_post_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:textSize="12sp"
+        android:visibility="gone"/>
+
+    <RelativeLayout
+        android:id="@+id/image_view_wrapper_item_post_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone">
 
-        <TextView
-            android:id="@+id/link_text_view_item_post_detail"
+        <com.santalu.aspectratioimageview.AspectRatioImageView
+            android:id="@+id/image_view_item_post_detail"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:textSize="12sp"
-            android:visibility="gone"/>
+            android:adjustViewBounds="true"
+            android:scaleType="fitStart"/>
 
         <RelativeLayout
-            android:id="@+id/image_view_wrapper_item_post_detail"
+            android:id="@+id/load_wrapper_item_post_detail"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone">
+            android:layout_centerInParent="true">
 
-            <com.santalu.aspectratioimageview.AspectRatioImageView
-                android:id="@+id/image_view_item_post_detail"
-                android:layout_width="match_parent"
+            <ProgressBar
+                android:id="@+id/progress_bar_item_post_detail"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
-                android:scaleType="fitStart"/>
+                android:layout_centerInParent="true" />
 
-            <RelativeLayout
-                android:id="@+id/load_wrapper_item_post_detail"
+            <TextView
+                android:id="@+id/load_image_error_text_view_item_post_detail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true">
-
-                <ProgressBar
-                    android:id="@+id/progress_bar_item_post_detail"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true" />
-
-                <TextView
-                    android:id="@+id/load_image_error_text_view_item_post_detail"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableTop="@drawable/ic_error_outline_black_24dp"
-                    android:layout_centerInParent="true"
-                    android:gravity="center"
-                    android:text="@string/tap_to_retry"
-                    android:visibility="gone" />
-
-            </RelativeLayout>
+                android:drawableTop="@drawable/ic_error_outline_black_24dp"
+                android:layout_centerInParent="true"
+                android:gravity="center"
+                android:text="@string/tap_to_retry"
+                android:visibility="gone" />
 
         </RelativeLayout>
 
-        <ImageView
-            android:id="@+id/image_view_no_preview_link_item_post_detail"
-            android:layout_width="match_parent"
-            android:layout_height="150dp"
-            android:background="@color/grey"
-            android:scaleType="center"
-            android:src="@drawable/ic_link"
-            android:tint="@android:color/tab_indicator_text"
-            android:visibility="gone" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+    </RelativeLayout>
 
-            <ImageView
-                android:id="@+id/plus_button_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="16dp"
-                android:src="@drawable/ic_arrow_upward_black_24dp"
-                android:tint="@android:color/tab_indicator_text" />
-
-            <TextView
-                android:id="@+id/score_text_view_item_post_detail"
-                android:layout_width="64dp"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/plus_button_item_post_detail"
-                android:gravity="center" />
+    <ImageView
+        android:id="@+id/image_view_no_preview_link_item_post_detail"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:background="@color/grey"
+        android:scaleType="center"
+        android:src="@drawable/ic_link"
+        android:tint="@android:color/tab_indicator_text"
+        android:visibility="gone" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-            <ImageView
-                android:id="@+id/minus_button_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/score_text_view_item_post_detail"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="16dp"
-                android:src="@drawable/ic_arrow_downward_black_24dp"
-                android:tint="@android:color/tab_indicator_text" />
-
-            <ImageView
-                android:id="@+id/share_button_item_post_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="16dp"
-                android:src="@drawable/ic_outline_share_24px"
-                android:tint="@android:color/tab_indicator_text" />
+        <ImageView
+            android:id="@+id/plus_button_item_post_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:background="?actionBarItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:padding="16dp"
+            android:src="@drawable/ic_arrow_upward_black_24dp"
+            android:tint="@android:color/tab_indicator_text" />
 
-        </RelativeLayout>
+        <TextView
+            android:id="@+id/score_text_view_item_post_detail"
+            android:layout_width="64dp"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/plus_button_item_post_detail"
+            android:gravity="center" />
 
-    </LinearLayout>
+        <ImageView
+            android:id="@+id/minus_button_item_post_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/score_text_view_item_post_detail"
+            android:background="?actionBarItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:padding="16dp"
+            android:src="@drawable/ic_arrow_downward_black_24dp"
+            android:tint="@android:color/tab_indicator_text" />
 
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+        <ImageView
+            android:id="@+id/share_button_item_post_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:background="?actionBarItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:padding="16dp"
+            android:src="@drawable/ic_outline_share_24px"
+            android:tint="@android:color/tab_indicator_text" />
+
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 4827628f..590ba6ce 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -41,4 +41,6 @@
     <color name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</color>
 
     <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>
+
+    <color name="navBarColor">@color/backgroundColor</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2f5b389f..8b9eb013 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -41,4 +41,6 @@
     <color name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</color>
 
     <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>
+
+    <color name="navBarColor">#FFFFFF</color>
 </resources>