Display a crosspost icon if the post is a crosspost. Hide the thumbtack icon if the post is not viewed in its subreddit. Tweak the post layout. Minor bugs fixed.

3 files changed, 217 insertions, 200 deletions

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 025f8ef1..b9c13bcb 100644
--- a/app/src/main/res/layout/activity_view_post_detail.xml
+++ b/app/src/main/res/layout/activity_view_post_detail.xml
@@ -98,7 +98,7 @@
                             android:id="@+id/type_text_view_view_post_detail"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginEnd="16dp"
+                            android:layout_marginEnd="8dp"
                             android:layout_centerVertical="true"
                             android:background="@drawable/rounded_corner"
                             android:textColor="@android:color/white" />
@@ -118,12 +118,24 @@
                             android:layout_marginStart="4dp"
                             android:layout_marginEnd="8dp"
                             android:layout_toEndOf="@id/gilded_image_view_view_post_detail"
-                            android:layout_toStartOf="@id/nsfw_text_view_view_post_detail"
                             android:layout_centerVertical="true"
                             android:visibility="gone"
                             android:textSize="20sp"
                             android:textColor="@color/gold"/>
 
+                        <ImageView
+                            android:id="@+id/crosspost_image_view_view_post_detail"
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            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:id="@+id/nsfw_text_view_view_post_detail"
                             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/item_footer_progress_bar.xml b/app/src/main/res/layout/item_footer_progress_bar.xml
index a84af3bc..270fc6ef 100644
--- a/app/src/main/res/layout/item_footer_progress_bar.xml
+++ b/app/src/main/res/layout/item_footer_progress_bar.xml
@@ -10,7 +10,7 @@
         android:id="@+id/progress_bar_footer_progress_bar_item"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:layout_marginBottom="16dp"
         android:layout_gravity="center" />
 
@@ -18,11 +18,9 @@
         android:id="@+id/relative_layout_footer_progress_bar_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:layout_marginBottom="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginEnd="16dp"
         android:visibility="gone">
 
diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml
index 8549d735..900e9817 100644
--- a/app/src/main/res/layout/item_post.xml
+++ b/app/src/main/res/layout/item_post.xml
@@ -1,233 +1,240 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     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.support.v7.widget.CardView>-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="#FFFFFF"
-    android:id="@+id/linear_layout_view_post_detail">
 
-    <RelativeLayout
-        android:id="@+id/relative_view_item_best_post"
+    <LinearLayout
         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">
-
-        <de.hdodenhof.circleimageview.CircleImageView
-            android:id="@+id/subreddit_icon_circle_image_view_best_post_item"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"/>
+        android:orientation="vertical"
+        android:background="#FFFFFF">
 
-        <TextView
-            android:id="@+id/subreddit_text_view_best_post_item"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+        <RelativeLayout
+            android:id="@+id/relative_view_item_best_post"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
             android:layout_marginStart="16dp"
-            android:layout_marginEnd="8dp"
-            android:layout_toStartOf="@id/stickied_post_image_view_best_post_item"
-            android:layout_toEndOf="@id/subreddit_icon_circle_image_view_best_post_item"
-            android:layout_centerVertical="true"
-            android:textColor="#E91E63"/>
+            android:layout_marginEnd="16dp"
+            android:layout_marginTop="16dp">
 
-        <ImageView
-            android:id="@+id/stickied_post_image_view_best_post_item"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_toStartOf="@id/post_time_text_view_best_post_item"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:tint="@color/colorPrimary"
-            android:visibility="gone"/>
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/subreddit_icon_circle_image_view_best_post_item"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"/>
 
-        <TextView
-            android:id="@+id/post_time_text_view_best_post_item"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:gravity="center_vertical"/>
-
-    </RelativeLayout>
-
-    <TextView
-        android:id="@+id/title_text_view_best_post_item"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginEnd="16dp"
-        android:textSize="18sp"
-        android:textColor="#000000"/>
-
-    <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:id="@+id/subreddit_text_view_best_post_item"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="8dp"
+                android:layout_toStartOf="@id/stickied_post_image_view_best_post_item"
+                android:layout_toEndOf="@id/subreddit_icon_circle_image_view_best_post_item"
+                android:layout_centerVertical="true"
+                android:textColor="#E91E63"/>
+
+            <ImageView
+                android:id="@+id/stickied_post_image_view_best_post_item"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_toStartOf="@id/post_time_text_view_best_post_item"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:tint="@color/colorPrimary"
+                android:visibility="gone"/>
 
-        <TextView
-            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:textColor="@android:color/white"/>
+            <TextView
+                android:id="@+id/post_time_text_view_best_post_item"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:gravity="center_vertical"/>
 
-        <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:visibility="gone"/>
+        </RelativeLayout>
 
         <TextView
-            android:id="@+id/gilded_number_text_view_item_best_post"
-            android:layout_width="wrap_content"
+            android:id="@+id/title_text_view_best_post_item"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
-            android:layout_marginEnd="8dp"
-            android:layout_toEndOf="@id/gilded_image_view_item_best_post"
-            android:layout_toStartOf="@id/nsfw_text_view_item_best_post"
-            android:layout_centerVertical="true"
-            android:visibility="gone"
-            android:textSize="20sp"
-            android:textColor="@color/gold"/>
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginEnd="16dp"
+            android:textSize="18sp"
+            android:textColor="#000000"/>
 
-        <TextView
-            android:id="@+id/nsfw_text_view_item_best_post"
-            android:text="@string/nsfw"
-            android:layout_width="wrap_content"
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/nsfw_rounded_corner"
-            android:layout_alignParentEnd="true"
-            android:layout_marginStart="8dp"
-            android:layout_centerVertical="true"
-            android:textColor="@android:color/white"
-            android:visibility="gone"/>
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp">
 
-    </RelativeLayout>
+            <TextView
+                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:textColor="@android:color/white"/>
+
+            <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:visibility="gone"/>
 
-    <RelativeLayout
-        android:id="@+id/image_view_wrapper_item_best_post"
-        android:layout_width="match_parent"
-        android:layout_height="350dp"
-        android:layout_marginTop="16dp"
-        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_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"/>
+
+            <ImageView
+                android:id="@+id/crosspost_image_view_item_best_post"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                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"/>
 
-        <ProgressBar
-            android:id="@+id/progress_bar_best_post_item"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true" />
+            <TextView
+                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_marginStart="8dp"
+                android:layout_centerVertical="true"
+                android:textColor="@android:color/white"
+                android:visibility="gone"/>
 
-        <ImageView
-            android:id="@+id/image_view_best_post_item"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop" />
+        </RelativeLayout>
 
-        <LinearLayout
-            android:id="@+id/load_image_error_linear_layout_best_post_item"
+        <RelativeLayout
+            android:id="@+id/image_view_wrapper_item_best_post"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="350dp"
+            android:layout_marginTop="16dp"
             android:visibility="gone">
 
-            <TextView
-                android:layout_width="match_parent"
+            <ProgressBar
+                android:id="@+id/progress_bar_best_post_item"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/ic_error_outline_black_24dp"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:text="@string/tap_to_retry" />
+                android:layout_centerInParent="true" />
 
-        </LinearLayout>
+            <ImageView
+                android:id="@+id/image_view_best_post_item"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop" />
 
-    </RelativeLayout>
+            <LinearLayout
+                android:id="@+id/load_image_error_linear_layout_best_post_item"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone">
 
-    <ImageView
-        android:id="@+id/image_view_no_preview_link_best_post_item"
-        android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:layout_marginTop="16dp"
-        android:scaleType="center"
-        android:src="@drawable/ic_link"
-        android:background="#E0E0E0"
-        android:visibility="gone"/>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:drawableTop="@drawable/ic_error_outline_black_24dp"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="@string/tap_to_retry" />
 
-        <ImageView
-            android:id="@+id/plus_button_item_best_post"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:padding="16dp"
-            android:src="@drawable/ic_arrow_upward_black_24dp"
-            android:layout_centerVertical="true"
-            android:tint="@android:color/tab_indicator_text"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"/>
+            </LinearLayout>
 
-        <TextView
-            android:id="@+id/score_text_view_item_best_post"
-            android:layout_width="64dp"
-            android:layout_height="match_parent"
-            android:layout_toEndOf="@id/plus_button_item_best_post"
-            android:layout_alignBottom="@id/plus_button_item_best_post"
-            android:layout_alignParentTop="true"
-            android:gravity="center"/>
+        </RelativeLayout>
 
         <ImageView
-            android:id="@+id/minus_button_item_best_post"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toEndOf="@id/score_text_view_item_best_post"
-            android:padding="16dp"
-            android:src="@drawable/ic_arrow_downward_black_24dp"
-            android:tint="@android:color/tab_indicator_text"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"/>
+            android:id="@+id/image_view_no_preview_link_best_post_item"
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:layout_marginTop="16dp"
+            android:scaleType="center"
+            android:src="@drawable/ic_link"
+            android:background="#E0E0E0"
+            android:visibility="gone"/>
 
-        <ImageView
-            android:id="@+id/share_button_item_best_post"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:padding="16dp"
-            android:src="@drawable/ic_share_black_24dp"
-            android:tint="@android:color/tab_indicator_text"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true" />
-
-    </RelativeLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="#F0F0F0"/>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/plus_button_item_best_post"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:padding="16dp"
+                android:src="@drawable/ic_arrow_upward_black_24dp"
+                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_best_post"
+                android:layout_width="64dp"
+                android:layout_height="match_parent"
+                android:layout_toEndOf="@id/plus_button_item_best_post"
+                android:layout_alignBottom="@id/plus_button_item_best_post"
+                android:layout_alignParentTop="true"
+                android:gravity="center"/>
+
+            <ImageView
+                android:id="@+id/minus_button_item_best_post"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toEndOf="@id/score_text_view_item_best_post"
+                android:padding="16dp"
+                android:src="@drawable/ic_arrow_downward_black_24dp"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"/>
+
+            <ImageView
+                android:id="@+id/share_button_item_best_post"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:padding="16dp"
+                android:src="@drawable/ic_share_black_24dp"
+                android:tint="@android:color/tab_indicator_text"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true" />
+
+        </RelativeLayout>
+
+    </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v7.widget.CardView>
\ No newline at end of file