diff --git a/Habitica/res/drawable-hdpi/gold_multiple.png b/Habitica/res/drawable-hdpi/gold_multiple.png new file mode 100644 index 000000000..783b313f4 Binary files /dev/null and b/Habitica/res/drawable-hdpi/gold_multiple.png differ diff --git a/Habitica/res/drawable-hdpi/subscriber_gem_cap.png b/Habitica/res/drawable-hdpi/subscriber_gem_cap.png new file mode 100644 index 000000000..6dc845457 Binary files /dev/null and b/Habitica/res/drawable-hdpi/subscriber_gem_cap.png differ diff --git a/Habitica/res/drawable-mdpi/gold_multiple.png b/Habitica/res/drawable-mdpi/gold_multiple.png new file mode 100644 index 000000000..aef3e16cd Binary files /dev/null and b/Habitica/res/drawable-mdpi/gold_multiple.png differ diff --git a/Habitica/res/drawable-mdpi/subscriber_gem_cap.png b/Habitica/res/drawable-mdpi/subscriber_gem_cap.png new file mode 100644 index 000000000..f371535d2 Binary files /dev/null and b/Habitica/res/drawable-mdpi/subscriber_gem_cap.png differ diff --git a/Habitica/res/drawable-xhdpi/gold_multiple.png b/Habitica/res/drawable-xhdpi/gold_multiple.png new file mode 100644 index 000000000..51b423a7c Binary files /dev/null and b/Habitica/res/drawable-xhdpi/gold_multiple.png differ diff --git a/Habitica/res/drawable-xhdpi/subscriber_gem_cap.png b/Habitica/res/drawable-xhdpi/subscriber_gem_cap.png new file mode 100644 index 000000000..46001072a Binary files /dev/null and b/Habitica/res/drawable-xhdpi/subscriber_gem_cap.png differ diff --git a/Habitica/res/drawable-xxhdpi/gold_multiple.png b/Habitica/res/drawable-xxhdpi/gold_multiple.png new file mode 100644 index 000000000..391bf301d Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/gold_multiple.png differ diff --git a/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.png b/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.png new file mode 100644 index 000000000..db1ad8110 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.png differ diff --git a/Habitica/res/drawable-xxxhdpi/gold_multiple.png b/Habitica/res/drawable-xxxhdpi/gold_multiple.png new file mode 100644 index 000000000..cd274bdf4 Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/gold_multiple.png differ diff --git a/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.png b/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.png new file mode 100644 index 000000000..9f5338f03 Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.png differ diff --git a/Habitica/res/layout/dialog_habitica_base.xml b/Habitica/res/layout/dialog_habitica_base.xml index f40525510..8017d8a67 100644 --- a/Habitica/res/layout/dialog_habitica_base.xml +++ b/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"/> + android:layout_height="wrap_content" + android:gravity="center_horizontal"/> \ No newline at end of file diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index f46c63a99..8a4f6791f 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -918,4 +918,5 @@ Class System unlocked! Pin Unpin + Take me Back 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 902006969..6893b57b1 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 @@ -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)) } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt index 4fde46308..cfe0d6752 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientCurrencyDialog.kt +++ b/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() } } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt index dc13c4c4c..7ae236ca0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt +++ b/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() } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGoldDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGoldDialog.kt index 9e17dea93..05ca6d340 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGoldDialog.kt +++ b/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) } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt index dd896b420..85ff263f8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt +++ b/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() } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientSubscriberGemsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientSubscriberGemsDialog.kt index cdc884817..52b6048f6 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientSubscriberGemsDialog.kt +++ b/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) } }