update no currency dialogs

Habitica/res/layout/dialog_habitica_base.xml

@@ -64,7 +64,8 @@
             android:id="@+id/scrolling_separator"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/gray_600" />
+            android:background="@color/gray_600"
+            android:visibility="gone"/>
         <LinearLayout
             android:id="@+id/buttons_wrapper"
             android:layout_width="match_parent"

Habitica/res/layout/dialog_insufficient_currency.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal" android:layout_width="match_parent"
+    android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical">
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="@dimen/shopitem_image_size"
-        android:layout_height="@dimen/shopitem_image_size"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_margin="12dp"
         android:scaleType="center" />
     <TextView
         android:id="@+id/textView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"/>
 </LinearLayout>

Habitica/res/values/strings.xml

@@ -918,4 +918,5 @@
     <string name="levelup_title_10">Class System unlocked!</string>
     <string name="pin">Pin</string>
     <string name="unpin">Unpin</string>
+    <string name="take_me_back">Take me Back</string>
 </resources>

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt

@@ -54,7 +54,7 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
         } else if ("gems" == currency) {
             icon = HabiticaIconsHelper.imageOfGem()
             if (lightBackground) {
-                setTextColor(ContextCompat.getColor(context, R.color.green_100))
+                setTextColor(ContextCompat.getColor(context, R.color.green_10))
             } else {
                 setTextColor(ContextCompat.getColor(context, R.color.green_50))
             }

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt

@@ -4,14 +4,14 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.ui.views.HabiticaAlertDialog
 
 /**
  * Created by phillip on 27.09.17.
  */
 
-abstract class InsufficientCurrencyDialog(context: Context) : AlertDialog(context) {
+abstract class InsufficientCurrencyDialog(context: Context) : HabiticaAlertDialog(context) {
 
     protected var imageView: ImageView
     protected var textView: TextView
@@ -19,13 +19,11 @@ abstract class InsufficientCurrencyDialog(context: Context) : AlertDialog(contex
     init {
 
         val inflater = LayoutInflater.from(context)
-        val view = inflater.inflate(R.layout.dialog_insufficient_currency, null)
-        setView(view)
+        val view = inflater.inflate(R.layout.dialog_insufficient_currency, contentView, false)
+        setAdditionalContentView(view)
 
         imageView = view.findViewById(R.id.imageView)
         textView = view.findViewById(R.id.textView)
-
-        this.setButton(BUTTON_NEUTRAL, context.getString(R.string.close)) { _, _ -> this.dismiss() }
     }
 
 }

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt

@@ -1,9 +1,8 @@
 package com.habitrpg.android.habitica.ui.views.insufficientCurrency
 
-import android.app.AlertDialog
 import android.content.Context
-
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 
 /**
@@ -13,10 +12,10 @@ import com.habitrpg.android.habitica.helpers.MainNavigationController
 class InsufficientGemsDialog(context: Context) : InsufficientCurrencyDialog(context) {
 
     init {
-
         imageView.setImageResource(R.drawable.gems_84)
         textView.setText(R.string.insufficientGems)
 
-        setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.purchase_gems)) { _, _ -> MainNavigationController.navigate(R.id.gemPurchaseActivity) }
+        addButton(R.string.purchase_gems, true) { _, _ -> MainNavigationController.navigate(R.id.gemPurchaseActivity) }
+        addCloseButton()
     }
 }

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGoldDialog.kt

@@ -1,15 +1,14 @@
 package com.habitrpg.android.habitica.ui.views.insufficientCurrency
 
 import android.content.Context
-
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class InsufficientGoldDialog(context: Context) : InsufficientCurrencyDialog(context) {
     init {
-
-        imageView.setImageBitmap(HabiticaIconsHelper.imageOfGoldReward())
+        imageView.setImageResource(R.drawable.gold_multiple)
         textView.text = context.getString(R.string.insufficientGold)
         setTitle(R.string.insufficientGoldTitle)
+
+        addButton(R.string.take_me_back, true)
     }
 }

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt

@@ -2,15 +2,16 @@ package com.habitrpg.android.habitica.ui.views.insufficientCurrency
 
 import android.content.Context
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class InsufficientHourglassesDialog(context: Context) : InsufficientCurrencyDialog(context) {
     init {
-
         imageView.setImageBitmap(HabiticaIconsHelper.imageOfHourglassShop())
         textView.setText(R.string.insufficientHourglasses)
 
-        setButton(BUTTON_POSITIVE, context.getString(R.string.get_hourglasses)) { _, _ -> MainNavigationController.navigate(R.id.gemPurchaseActivity) }
+        addButton(R.string.get_hourglasses, true) { _, _ -> MainNavigationController.navigate(R.id.gemPurchaseActivity)  }
+        addCloseButton()
     }
 }

Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientSubscriberGemsDialog.kt

@@ -1,14 +1,12 @@
 package com.habitrpg.android.habitica.ui.views.insufficientCurrency
 
 import android.content.Context
-
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class InsufficientSubscriberGemsDialog(context: Context) : InsufficientCurrencyDialog(context) {
     init {
-
-        imageView.setImageBitmap(HabiticaIconsHelper.imageOfGem_36())
+        imageView.setImageResource(R.drawable.subscriber_gem_cap)
         textView.text = context.getString(R.string.insufficientSubscriberGems)
+        addButton(R.string.take_me_back, true)
     }
 }