From 0d5cf54af5de84b35a10ec0b4b2e12dbe09715a0 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Sat, 20 Jul 2019 00:21:00 +0800
Subject: Fixed bugs when posting without a flair specified. Minor UI tweaks.

---
 .../main/java/ml/docilealligator/infinityforreddit/SubmitPost.java | 7 ++++---
 app/src/main/res/layout/item_post.xml                              | 7 ++-----
 app/src/main/res/layout/item_post_detail.xml                       | 7 ++-----
 3 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubmitPost.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubmitPost.java
index 3d63b97a..50a1107b 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubmitPost.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubmitPost.java
@@ -159,7 +159,6 @@ class SubmitPost {
                 } else {
                     submitPostListener.submitFailed(response.message());
                 }
-                Log.i("image", "dddd" + response.code());
             }
 
             @Override
@@ -199,7 +198,10 @@ class SubmitPost {
                 params.put(RedditUtils.VIDEO_POSTER_URL_KEY, posterUrl);
                 break;
         }
-        params.put(RedditUtils.FLAIR_TEXT_KEY, flair);
+
+        if(flair != null) {
+            params.put(RedditUtils.FLAIR_TEXT_KEY, flair);
+        }
         params.put(RedditUtils.SPOILER_KEY, Boolean.toString(isSpoiler));
         params.put(RedditUtils.NSFW_KEY, Boolean.toString(isNSFW));
 
@@ -297,7 +299,6 @@ class SubmitPost {
                 } else {
                     uploadImageListener.uploadFailed(response.message());
                 }
-                Log.i("image", "dddd" + response.body());
             }
 
             @Override
diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml
index e6e41b81..7598375d 100644
--- a/app/src/main/res/layout/item_post.xml
+++ b/app/src/main/res/layout/item_post.xml
@@ -157,9 +157,8 @@
                 android:layout_marginStart="16dp"
                 android:text="@string/spoiler"
                 android:textSize="12sp"
-                android:textColor="@color/primaryTextColor"
+                android:textColor="@android:color/white"
                 android:padding="4dp"
-                android:background="@color/textColorPrimaryDark"
                 android:visibility="gone"
                 app:lib_setRadius="3dp"
                 app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
@@ -173,9 +172,8 @@
                 android:layout_gravity="center"
                 android:layout_marginStart="16dp"
                 android:textSize="12sp"
-                android:textColor="@color/primaryTextColor"
+                android:textColor="@android:color/white"
                 android:padding="4dp"
-                android:background="@color/textColorPrimaryDark"
                 android:visibility="gone"
                 app:lib_setRadius="3dp"
                 app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
@@ -236,7 +234,6 @@
             android:id="@+id/image_view_no_preview_link_item_post"
             android:layout_width="match_parent"
             android:layout_height="150dp"
-            android:layout_marginTop="16dp"
             android:scaleType="center"
             android:src="@drawable/ic_link"
             android:tint="@android:color/tab_indicator_text"
diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml
index fc48202e..fade8588 100644
--- a/app/src/main/res/layout/item_post_detail.xml
+++ b/app/src/main/res/layout/item_post_detail.xml
@@ -149,9 +149,8 @@
                 android:layout_marginStart="16dp"
                 android:text="@string/spoiler"
                 android:textSize="12sp"
-                android:textColor="@color/primaryTextColor"
+                android:textColor="@android:color/white"
                 android:padding="4dp"
-                android:background="@color/textColorPrimaryDark"
                 android:visibility="gone"
                 app:lib_setRadius="3dp"
                 app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
@@ -165,9 +164,8 @@
                 android:layout_gravity="center"
                 android:layout_marginStart="16dp"
                 android:textSize="12sp"
-                android:textColor="@color/primaryTextColor"
+                android:textColor="@android:color/white"
                 android:padding="4dp"
-                android:background="@color/textColorPrimaryDark"
                 android:visibility="gone"
                 app:lib_setRadius="3dp"
                 app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
@@ -229,7 +227,6 @@
             android:id="@+id/image_view_no_preview_link_item_post_detail"
             android:layout_width="match_parent"
             android:layout_height="150dp"
-            android:layout_marginTop="16dp"
             android:background="@color/grey"
             android:scaleType="center"
             android:src="@drawable/ic_link"
-- 
cgit v1.2.3