From e904d37db6da500397c105f37eb11cd7b31873f7 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 15 Oct 2019 18:22:54 +0200 Subject: [PATCH] Tweak purchase page designs --- Habitica/build.gradle | 2 +- Habitica/res/layout/activity_gift_gems.xml | 11 +++++-- Habitica/res/layout/fragment_gem_purchase.xml | 32 +++++++++++-------- Habitica/res/layout/fragment_subscription.xml | 5 +-- Habitica/res/values/strings.xml | 1 + .../ui/activities/GiftSubscriptionActivity.kt | 2 +- .../ui/fragments/GemsPurchaseFragment.kt | 2 +- .../ui/fragments/SubscriptionFragment.kt | 2 +- 8 files changed, 35 insertions(+), 22 deletions(-) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 5adce1d14..7c26ff13a 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -149,7 +149,7 @@ android { multiDexEnabled true resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW" - versionCode 2261 + versionCode 2263 versionName "2.2" } diff --git a/Habitica/res/layout/activity_gift_gems.xml b/Habitica/res/layout/activity_gift_gems.xml index 8ed8688fd..52ec41986 100644 --- a/Habitica/res/layout/activity_gift_gems.xml +++ b/Habitica/res/layout/activity_gift_gems.xml @@ -79,7 +79,6 @@ android:layout_weight="1" app:gemAmount="4" app:gemDrawable="@drawable/gems_4" - android:layout_marginRight="16dp" android:layout_marginEnd="16dp" /> + diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml index ed948d8f1..d9fd4dc6c 100644 --- a/Habitica/res/layout/fragment_gem_purchase.xml +++ b/Habitica/res/layout/fragment_gem_purchase.xml @@ -5,7 +5,8 @@ android:layout_height="match_parent" android:scrollbarSize="3dp" android:scrollbarThumbVertical="@color/scrollbarThumb" - android:scrollbars="vertical"> + android:scrollbars="vertical" + android:background="@color/white"> @@ -137,20 +139,22 @@ android:textColor="?colorAccent" android:textAllCaps="false"/> - + + android:layout_marginTop="16dp" + android:drawablePadding="@dimen/spacing_medium"/> \ No newline at end of file diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index 9e1f1514d..5db927fbf 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -855,4 +855,5 @@ Gift\nGems Gift\nSubscription Want to bestow a shiny haul of Gems to someone else? + Habitica will never require you to gift gems to other players. Begging people for gems is a violation of the Community Guidelines and should be reported to admin@habitica.com. diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt index d24a7b696..9d5f7cce7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt @@ -112,7 +112,7 @@ class GiftSubscriptionActivity : BaseActivity() { purchaseHandler?.startListening() purchaseHandler?.getAllGiftSubscriptionProducts { - //skus = it.skus + skus = it.skus for (sku in it.skus) { updateButtonLabel(sku, sku.price, it) } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.kt index 805d5a961..fc89b906e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.kt @@ -67,7 +67,7 @@ class GemsPurchaseFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen gems84View?.setOnPurchaseClickListener(View.OnClickListener { purchaseGems(PurchaseTypes.Purchase84Gems) }) val heartDrawable = BitmapDrawable(resources, HabiticaIconsHelper.imageOfHeartLarge()) - supportTextView?.setCompoundDrawables(null, null, null, heartDrawable) + supportTextView?.setCompoundDrawablesWithIntrinsicBounds(null, null, null, heartDrawable) compositeSubscription.add(userRepository.getUser().subscribe(Consumer { subscriptionPromoView?.visibility = if (it.isSubscribed) View.GONE else View.VISIBLE diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.kt index 08286a913..a941b1ed3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.kt @@ -119,7 +119,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen this.subscribeListitem4Box?.setOnClickListener { toggleDescriptionView(this.subscribeListitem4Button, this.subscribeListItem4Description) } val heartDrawable = BitmapDrawable(resources, HabiticaIconsHelper.imageOfHeartLarge()) - supportTextView?.setCompoundDrawables(null, null, null, heartDrawable) + supportTextView?.setCompoundDrawablesWithIntrinsicBounds(null, null, null, heartDrawable) subscribeButton.setOnClickListener { subscribeUser() }