From 760c3c234057618476fecee1f842b442f93739a1 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 2 Nov 2017 13:41:23 +0100
Subject: [PATCH] improve gold display. Fixes #843

---
 Habitica/res/layout/dialog_purchase_shopitem.xml    |  1 +
 Habitica/res/layout/row_shopitem.xml                | 13 +++++++------
 Habitica/res/values/attrs.xml                       |  4 +++-
 .../android/habitica/ui/views/CurrencyView.kt       |  8 +++++++-
 .../android/habitica/ui/views/CurrencyViews.kt      |  1 -
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Habitica/res/layout/dialog_purchase_shopitem.xml b/Habitica/res/layout/dialog_purchase_shopitem.xml
index efeaec50d..401afbc67 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem.xml
@@ -90,6 +90,7 @@
                 tools:text="10"
                 tools:textColor="@color/green_10"
                 style="@style/Body1"
+                app:hasLightBackground="true"
                 android:layout_marginLeft="12dp"/>
         </LinearLayout>
         <Button
diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml
index 0f826cb2d..da6735a04 100644
--- a/Habitica/res/layout/row_shopitem.xml
+++ b/Habitica/res/layout/row_shopitem.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:fresco="http://schemas.android.com/apk/res-auto"
-    android:clickable="true"
-    android:background="@color/white">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:clickable="true"
+                android:background="@color/white">
     <LinearLayout
         android:id="@+id/container"
         android:layout_marginTop="6dp"
@@ -34,6 +34,7 @@
                 android:textColor="@color/gray_300"
                 tools:text="150"
                 style="@style/Body1"
+                app:hasLightBackground="true"
                 android:textSize="15sp" />
         </LinearLayout>
     </LinearLayout>
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 9eecd2238..916d1caa3 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -1,6 +1,7 @@
 <resources>
     <attr name="statsColor" format="color" />
     <attr name="statsTitle" format="string" />
+    <attr name="hasLightBackground" format="boolean" />
     <declare-styleable name="AvatarView">
         <attr name="showBackground" format="boolean" />
         <attr name="showMount" format="boolean" />
@@ -40,9 +41,10 @@
     </declare-styleable>
     <declare-styleable name="CurrencyView">
         <attr name="currency" format="string" />
+        <attr name="hasLightBackground" />
     </declare-styleable>
     <declare-styleable name="CurrencyViews">
-        <attr name="hasLightBackground" format="boolean" />
+        <attr name="hasLightBackground" />
     </declare-styleable>
     <declare-styleable name="FixValuesEditText">
         <attr name="fixIconName" format="string" />
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
index 027c8f619..2a4866fc3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
@@ -24,7 +24,13 @@ class CurrencyView : android.support.v7.widget.AppCompatTextView {
             updateVisibility()
         }
 
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {}
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+        val attributes = context.theme?.obtainStyledAttributes(
+                attrs,
+                R.styleable.CurrencyViews,
+                0, 0)
+        lightBackground = attributes?.getBoolean(R.styleable.CurrencyView_hasLightBackground, true) ?: true
+    }
 
     constructor(context: Context, currency: String, lightbackground: Boolean) : super(context) {
         this.lightBackground = lightbackground
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt
index 00d3de7b2..afc6e87c9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt
@@ -30,7 +30,6 @@ class CurrencyViews : LinearLayout {
 
 
     constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) {
-
         val attributes = context?.theme?.obtainStyledAttributes(
                 attrs,
                 R.styleable.CurrencyViews,