From 0c44813a0e3486b6a5befb485b27a371bd24d0c2 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 20 Jan 2017 12:41:05 +0100
Subject: [PATCH] fix minor graphical issues

---
 Habitica/res/drawable/checklist_checkbox.xml      |  8 ++++++++
 Habitica/res/drawable/checklist_checked.xml       | 15 +++++++++++++++
 Habitica/res/drawable/checklist_unchecked.xml     |  8 ++++++++
 Habitica/res/layout/checklist_item_row.xml        |  2 +-
 Habitica/res/values/colors.xml                    |  2 +-
 .../adapter/social/ChallengesListViewAdapter.java |  7 +------
 6 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 Habitica/res/drawable/checklist_checkbox.xml
 create mode 100644 Habitica/res/drawable/checklist_checked.xml
 create mode 100644 Habitica/res/drawable/checklist_unchecked.xml

diff --git a/Habitica/res/drawable/checklist_checkbox.xml b/Habitica/res/drawable/checklist_checkbox.xml
new file mode 100644
index 000000000..4fd2f1cad
--- /dev/null
+++ b/Habitica/res/drawable/checklist_checkbox.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_checked="true" android:drawable="@drawable/checklist_checked" />
+    <item android:state_checked="false" android:drawable="@drawable/checklist_unchecked" />
+
+</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/checklist_checked.xml b/Habitica/res/drawable/checklist_checked.xml
new file mode 100644
index 000000000..7ab67c248
--- /dev/null
+++ b/Habitica/res/drawable/checklist_checked.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+            <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
+            <solid android:color="@color/checkbox_checklist_fill" />
+            <size android:height="@dimen/checkbox_size" android:width="@dimen/checkbox_size" />
+            <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+        </shape>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/ic_check" android:gravity="center" />
+    </item>
+</layer-list>
diff --git a/Habitica/res/drawable/checklist_unchecked.xml b/Habitica/res/drawable/checklist_unchecked.xml
new file mode 100644
index 000000000..187f36542
--- /dev/null
+++ b/Habitica/res/drawable/checklist_unchecked.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
+    <solid android:color="@color/checkbox_checklist_fill" />
+    <size android:height="@dimen/checkbox_size" android:width="@dimen/checkbox_size" />
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/checklist_item_row.xml b/Habitica/res/layout/checklist_item_row.xml
index db83ce5ff..5f58bf83f 100644
--- a/Habitica/res/layout/checklist_item_row.xml
+++ b/Habitica/res/layout/checklist_item_row.xml
@@ -16,7 +16,7 @@
             android:layout_height="@dimen/checkbox_size"
             android:layout_centerInParent="true"
             android:gravity="center"
-            android:button="@drawable/daily_checkbox"
+            android:button="@drawable/checklist_checkbox"
             android:layout_gravity="center_horizontal" />
         </RelativeLayout>
         <net.pherth.android.emoji_library.EmojiTextView
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 1fa65951b..da169231f 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -91,7 +91,7 @@
     <color name="task_gray">#b7b7b7</color>
     <color name="checkbox_fill">#50ffffff</color>
     <color name="checkbox_checked_fill">#c8ffffff</color>
-    <color name="checkbox_stroke">#32000000</color>
+    <color name="checkbox_checklist_fill">#23000000</color>
 
     <color name="habit_inactive_gray">#F9F9F9</color>
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java
index 4fc0a090f..7f98d841d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java
@@ -157,12 +157,7 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
                 arrowImage.setVisibility(View.GONE);
             }
 
-            if (challenge.prize == 0) {
-                //gem_prize_layout.setVisibility(View.GONE);
-            } else {
-                //gem_prize_layout.setVisibility(View.VISIBLE);
-                gemPrizeTextView.setText(String.valueOf(challenge.prize));
-            }
+            gemPrizeTextView.setText(String.valueOf(challenge.prize));
         }
 
         public static String getLabelByTypeAndCount(Context context, String type, int count) {