Minor UI tweaks.

3 files changed, 37 insertions, 51 deletions

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c9bfd7d1..4e6dd8aa 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -47,7 +47,7 @@
                             android:layout_height="24dp"
                             android:layout_marginEnd="32dp"
                             android:layout_gravity="center_vertical"
-                            android:src="@drawable/ic_account_circle_grey_24dp"/>
+                            android:src="@drawable/ic_outline_account_circle_24px"/>
 
                         <TextView
                             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml
index c9020ae9..5880a9d3 100644
--- a/app/src/main/res/layout/activity_view_post_detail.xml
+++ b/app/src/main/res/layout/activity_view_post_detail.xml
@@ -17,7 +17,7 @@
             android:orientation="vertical"
             android:descendantFocusability="blocksDescendants">
 
-            <android.support.v7.widget.CardView
+            <android.support.design.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -30,12 +30,7 @@
                         android:id="@+id/relative_layout_view_post_detail"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginRight="16dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginTop="16dp">
+                        android:layout_margin="16dp">
 
                         <de.hdodenhof.circleimageview.CircleImageView
                             android:id="@+id/subreddit_icon_circle_image_view_view_post_detail"
@@ -79,7 +74,6 @@
                         android:id="@+id/content_html_text_view_view_post_detail"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
                         android:layout_marginEnd="16dp"
                         android:layout_marginLeft="16dp"
                         android:layout_marginRight="16dp"
@@ -91,36 +85,35 @@
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp">
 
-                        <TextView
+                        <android.support.design.chip.Chip
                             android:id="@+id/type_text_view_view_post_detail"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
                             android:layout_marginEnd="8dp"
-                            android:layout_centerVertical="true"
                             android:textSize="12sp"
-                            android:background="@drawable/rounded_corner"
-                            android:textColor="@android:color/white" />
+                            android:textColor="@android:color/white"
+                            app:chipBackgroundColor="@color/colorPrimaryDark"/>
 
                         <ImageView
                             android:id="@+id/gilded_image_view_view_post_detail"
                             android:layout_width="24dp"
                             android:layout_height="24dp"
+                            android:layout_marginTop="8dp"
                             android:layout_toEndOf="@id/type_text_view_view_post_detail"
-                            android:layout_centerVertical="true"
                             android:visibility="gone"/>
 
                         <TextView
                             android:id="@+id/gilded_number_text_view_view_post_detail"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="8dp"
                             android:layout_marginStart="4dp"
                             android:layout_marginEnd="8dp"
                             android:layout_toEndOf="@id/gilded_image_view_view_post_detail"
-                            android:layout_centerVertical="true"
                             android:visibility="gone"
                             android:textSize="20sp"
                             android:textColor="@color/gold"/>
@@ -129,25 +122,26 @@
                             android:id="@+id/crosspost_image_view_view_post_detail"
                             android:layout_width="24dp"
                             android:layout_height="24dp"
+                            android:layout_marginTop="8dp"
                             android:layout_marginStart="8dp"
                             android:layout_marginEnd="8dp"
                             android:layout_toStartOf="@id/nsfw_text_view_item_best_post"
                             android:layout_toEndOf="@id/gilded_number_text_view_view_post_detail"
-                            android:layout_centerVertical="true"
                             android:src="@drawable/crosspost"
                             android:tint="@color/colorAccent"
                             android:visibility="gone"/>
 
-                        <TextView
+                        <android.support.design.chip.Chip
                             android:id="@+id/nsfw_text_view_view_post_detail"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/nsfw"
                             android:layout_alignParentEnd="true"
+                            android:layout_marginTop="8dp"
                             android:layout_marginStart="8dp"
-                            android:background="@drawable/nsfw_rounded_corner"
                             android:textColor="@android:color/white"
-                            android:visibility="gone" />
+                            android:visibility="gone"
+                            app:chipBackgroundColor="@color/colorAccent"/>
 
                     </RelativeLayout>
 
@@ -249,14 +243,14 @@
                             android:clickable="true"
                             android:focusable="true"
                             android:padding="16dp"
-                            android:src="@drawable/ic_share_black_24dp"
+                            android:src="@drawable/ic_outline_share_24px"
                             android:tint="@android:color/tab_indicator_text" />
 
                     </RelativeLayout>
 
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </android.support.design.card.MaterialCardView>
 
             <com.lsjwzh.widget.materialloadingprogressbar.CircleProgressBar
                 android:id="@+id/comment_progress_bar_view_post_detail"
@@ -292,11 +286,6 @@
                         android:textColor="#000000"
                         android:textSize="18sp" />
 
-                    <!--<android.support.v7.widget.RecyclerView
-                        android:id="@+id/recycler_view_view_post_detail"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />-->
-
                     <com.multilevelview.MultiLevelRecyclerView
                         android:id="@+id/recycler_view_view_post_detail"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml
index 79a545e6..1021a3b0 100644
--- a/app/src/main/res/layout/item_post.xml
+++ b/app/src/main/res/layout/item_post.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.card.MaterialCardView 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"
     android:layout_marginTop="8dp"
     android:layout_marginBottom="8dp"
-    android:id="@+id/card_view_view_post_detail">
+    android:id="@+id/card_view_view_post_detail"
+    app:cardCornerRadius="16dp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:background="#FFFFFF">
+        android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="16dp">
+            android:layout_margin="16dp">
 
             <CustomView.AspectRatioGifImageView
                 android:id="@+id/subreddit_icon_gif_image_view_best_post_item"
@@ -73,37 +71,35 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp">
 
-            <TextView
+            <android.support.design.chip.Chip
                 android:id="@+id/type_text_view_item_best_post"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/rounded_corner"
-                android:layout_marginEnd="8dp"
-                android:layout_centerVertical="true"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="16dp"
                 android:textSize="12sp"
-                android:textColor="@android:color/white"/>
+                android:textColor="@android:color/white"
+                app:chipBackgroundColor="@color/colorPrimaryDark"/>
 
             <ImageView
                 android:id="@+id/gilded_image_view_item_best_post"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_toEndOf="@id/type_text_view_item_best_post"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
                 android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/gilded_number_text_view_item_best_post"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
                 android:layout_marginStart="4dp"
                 android:layout_marginEnd="8dp"
                 android:layout_toEndOf="@id/gilded_image_view_item_best_post"
-                android:layout_centerVertical="true"
                 android:visibility="gone"
                 android:textSize="20sp"
                 android:textColor="@color/gold"/>
@@ -112,26 +108,27 @@
                 android:id="@+id/crosspost_image_view_item_best_post"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
+                android:layout_marginTop="8dp"
                 android:layout_marginStart="8dp"
                 android:layout_marginEnd="8dp"
                 android:layout_toStartOf="@id/nsfw_text_view_item_best_post"
                 android:layout_toEndOf="@id/gilded_number_text_view_item_best_post"
-                android:layout_centerVertical="true"
                 android:src="@drawable/crosspost"
                 android:tint="@color/colorAccent"
                 android:visibility="gone"/>
 
-            <TextView
+            <android.support.design.chip.Chip
                 android:id="@+id/nsfw_text_view_item_best_post"
                 android:text="@string/nsfw"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/nsfw_rounded_corner"
                 android:layout_alignParentEnd="true"
+                android:layout_marginTop="8dp"
                 android:layout_marginStart="8dp"
-                android:layout_centerVertical="true"
+                android:textSize="12sp"
                 android:textColor="@android:color/white"
-                android:visibility="gone"/>
+                android:visibility="gone"
+                app:chipBackgroundColor="@color/colorAccent"/>
 
         </RelativeLayout>
 
@@ -230,7 +227,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
                 android:padding="16dp"
-                android:src="@drawable/ic_share_black_24dp"
+                android:src="@drawable/ic_outline_share_24px"
                 android:tint="@android:color/tab_indicator_text"
                 android:background="?actionBarItemBackground"
                 android:clickable="true"
@@ -240,4 +237,4 @@
 
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</android.support.design.card.MaterialCardView>
\ No newline at end of file