From 27f3e5645b2aeee9534018a938e753444f2a8814 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Fri, 3 Feb 2017 13:21:42 +0100 Subject: [PATCH] subscription layout changes --- Habitica/AndroidManifest.xml | 2 +- Habitica/build.gradle | 1 + .../ic_keyboard_arrow_down_black_24dp.xml | 2 +- .../ic_keyboard_arrow_up_black_24dp.xml | 4 + Habitica/res/layout/challenge_item.xml | 2 +- Habitica/res/layout/fragment_subscription.xml | 247 +++++++++++------- Habitica/res/values/colors.xml | 2 +- Habitica/res/values/strings.xml | 10 +- Habitica/res/values/styles.xml | 25 +- .../ui/fragments/SubscriptionFragment.java | 52 ++++ 10 files changed, 235 insertions(+), 112 deletions(-) create mode 100644 Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index a7964dff7..a676ada8f 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 29e3ab6e5..1e24d535e 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -150,6 +150,7 @@ android { defaultConfig { applicationId "com.habitrpg.android.habitica" + vectorDrawables.useSupportLibrary = true } lintOptions { diff --git a/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml b/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml index b904f8cf3..91fb946f2 100644 --- a/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml +++ b/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml @@ -1,4 +1,4 @@ - + diff --git a/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml b/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml new file mode 100644 index 000000000..0f8503e44 --- /dev/null +++ b/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml @@ -0,0 +1,4 @@ + + + + diff --git a/Habitica/res/layout/challenge_item.xml b/Habitica/res/layout/challenge_item.xml index dc9819fc3..2efee0584 100644 --- a/Habitica/res/layout/challenge_item.xml +++ b/Habitica/res/layout/challenge_item.xml @@ -174,6 +174,6 @@ + app:srcCompat="@drawable/ic_keyboard_arrow_right_gray_24dp"/> \ No newline at end of file diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml index fe3696b6f..e013c328b 100644 --- a/Habitica/res/layout/fragment_subscription.xml +++ b/Habitica/res/layout/fragment_subscription.xml @@ -1,6 +1,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:id="@+id/subscriptionDetails" + android:layout_marginTop="24dp"/> - + - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml index d19d041a4..de5379624 100644 --- a/Habitica/res/values/colors.xml +++ b/Habitica/res/values/colors.xml @@ -110,5 +110,5 @@ #CCBEED #24cc8f #b1000000 - #deddde + #efefef diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index b5f980bf9..9d88520f7 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -457,10 +457,10 @@ To start, which parts of your life do you want to improve? Subscriptions Recurring every %s Subscribe - Alexander the Merchant will sell you Gems at a cost of 20 gold per gem. His monthly shipments are initially capped at 25 Gems per month, but this cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month! - Makes completed To-Dos and task history available for longer. - Complete your stable faster! - Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items. + Alexander the Merchant will now sell you gems for 20 gold each!\n\nHis monthly shipments are initially capped at 25 Gems per month, but can increase based on your subscription length.\n\nThe cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month! + Each month you will receive a unique cosmetic item for your avatar!\n\nPlus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items. + Makes completed To-Dos and task history available for longer. + Double drop caps will let you receive more items from your completed tasks every day, helping you complete your stable faster! Gem cap starts at 25 Gem cap raised to 30 Gem cap raised to 35 @@ -470,7 +470,7 @@ To start, which parts of your life do you want to improve? Subscription Active Cancel Subscription - No longer want to subscribe? You can find the option to unsubscribe in the "My Apps" section of the Google Play Store. + No longer want to subscribe? You can find the option to unsubscribe in the “My Apps” section of the Google Play Store. No longer want to subscribe? Due to your payment method, you can only unsubscribe through the website. Click the button below, to open the site in your browser! Visit Habitica Website Current Bonuses diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml index 9734254c5..02f1a82c8 100644 --- a/Habitica/res/values/styles.xml +++ b/Habitica/res/values/styles.xml @@ -192,6 +192,12 @@ 4dp + + + +