From b56c16654be70ed905aa654ecec7f79183cb4d2f Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Fri, 10 Apr 2020 13:16:17 +0200 Subject: [PATCH] desgin tweaks --- Habitica/build.gradle | 2 +- Habitica/res/layout/fragment_faq_detail.xml | 19 ++++++----- Habitica/res/layout/fragment_faq_overview.xml | 31 +++++++++++++---- Habitica/res/layout/fragment_party_detail.xml | 3 +- .../res/layout/fragment_support_bug_fix.xml | 33 ++++++++----------- Habitica/res/layout/fragment_support_main.xml | 25 +++++++------- Habitica/res/layout/quest_collect.xml | 2 +- Habitica/res/values/strings.sidebar.xml | 2 +- Habitica/res/values/strings.xml | 18 +++++----- Habitica/res/values/styles.habitica.xml | 5 +-- Habitica/res/values/styles.xml | 2 ++ .../implementation/InventoryRepositoryImpl.kt | 2 -- .../models/inventory/QuestMember.java | 12 ------- .../habitica/models/inventory/QuestMember.kt | 10 ++++++ .../fragments/inventory/shops/ShopFragment.kt | 9 +++-- .../social/party/PartyDetailFragment.kt | 6 ++++ .../habitica/ui/helpers/DataBindingUtils.kt | 16 +++++++-- .../ui/viewmodels/NotificationsViewModel.kt | 8 ++--- .../habitica/ui/viewmodels/PartyViewModel.kt | 17 ++++++++-- .../ui/views/WrapContentDraweeView.kt | 4 +-- .../habitica/ui/views/shops/PurchaseDialog.kt | 18 ++++++---- .../views/tasks/form/StepperValueFormView.kt | 1 + 22 files changed, 149 insertions(+), 96 deletions(-) delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestMember.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestMember.kt diff --git a/Habitica/build.gradle b/Habitica/build.gradle index f7ce56161..1dee3bcbd 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -162,7 +162,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 2396 + versionCode 2398 versionName "2.5" } diff --git a/Habitica/res/layout/fragment_faq_detail.xml b/Habitica/res/layout/fragment_faq_detail.xml index a2a2f46de..1c51e1ab0 100644 --- a/Habitica/res/layout/fragment_faq_detail.xml +++ b/Habitica/res/layout/fragment_faq_detail.xml @@ -11,26 +11,27 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - > + android:paddingStart="30dp" + android:paddingEnd="30dp" + android:paddingTop="@dimen/spacing_large" + android:paddingBottom="@dimen/spacing_large"> + android:layout_gravity="center_horizontal"/> \ No newline at end of file diff --git a/Habitica/res/layout/fragment_faq_overview.xml b/Habitica/res/layout/fragment_faq_overview.xml index 94ec908d9..4ca622466 100644 --- a/Habitica/res/layout/fragment_faq_overview.xml +++ b/Habitica/res/layout/fragment_faq_overview.xml @@ -100,21 +100,38 @@ android:layout_height="wrap_content" android:text="@string/common_questions" style="@style/SectionHeaderCaps" - android:layout_marginTop="@dimen/spacing_large"/> + android:layout_marginTop="@dimen/spacing_large" + android:layout_marginBottom="@dimen/spacing_medium"/> + + + android:textSize="14sp" + android:textColor="@color/gray_50" + android:gravity="center"/> + \ No newline at end of file diff --git a/Habitica/res/layout/fragment_party_detail.xml b/Habitica/res/layout/fragment_party_detail.xml index 67038e64e..55057c186 100644 --- a/Habitica/res/layout/fragment_party_detail.xml +++ b/Habitica/res/layout/fragment_party_detail.xml @@ -86,8 +86,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" tools:text="3 Participants" - android:textColor="@color/gray_300" - android:visibility="gone"/> + android:textColor="@color/gray_300" /> - + android:layout_marginLeft="@dimen/spacing_medium" + android:layout_marginRight="@dimen/spacing_medium" + android:layout_marginBottom="@dimen/spacing_medium"> + android:layout_marginLeft="@dimen/spacing_medium" + android:layout_marginRight="@dimen/spacing_medium" + android:layout_marginBottom="@dimen/spacing_medium"> + android:layout_marginLeft="@dimen/spacing_medium" + android:layout_marginRight="@dimen/spacing_medium" + android:layout_marginBottom="@dimen/spacing_medium"> diff --git a/Habitica/res/layout/quest_collect.xml b/Habitica/res/layout/quest_collect.xml index e2b360138..1a97294cb 100644 --- a/Habitica/res/layout/quest_collect.xml +++ b/Habitica/res/layout/quest_collect.xml @@ -10,7 +10,7 @@ Guilds Challenges Inventory - Avatar + Avatar Customization Equipment Pets & Mounts News diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index b7c4cbc85..f92e40b8d 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -530,6 +530,7 @@ Leave Party Party Description %1$d Participants + %1$d/%2$d Responded Welcome Back Check off any Dailies you did yesterday: Start My Day @@ -956,7 +957,7 @@ You are not participating Quest completed! Using Habitica - Confused? We’ll go over the basics to get you up to speed. + We’ll explain the basics and answer common questions to get you up to speed Have input on how features could work better or an idea for something new? Tell us! Contact Us Get Help @@ -971,24 +972,24 @@ Not sure how to best use Habitica? Health Points - This represents your avatars life. Missing a Daily or doing a negative Habit **reduces your HP**.\n\n**Regain HP** by completing tasks, using a Health Potion, or a healing ability.\n\nIf your **HP reaches 0** your avatar will pass out (lose a level, all Gold, and one piece of equipment). Lost equipment can be re-purchased. + This represents your avatar’s life. Missing a Daily or doing a negative Habit **reduces your HP**.\n\n**Regain HP** by leveling up, using a Health Potion, or a class skill with healing ability.\n\nIf your **HP reaches 0** you will lose a level, all Gold, and one piece of equipment. Lost equipment can be re-purchased. Experience Points - Experience points represent your progress and allows you to level up. You’ll mainly **gain EXP** from completing tasks or quests.\n\nHigher difficulty or red colored tasks will give you **more EXP**. The **Intelligence** stat also raises your EXP gain. + Experience points represent your progress and allow you to level up. You’ll mainly **gain EXP** from completing tasks or quests, but there are also some class skills that give EXP.\n\nTasks of higher difficulty, or red-colored tasks will give you **more EXP**. The **Intelligence stat** also raises your rate of EXP gain. Mana Points - Gold is the **main form of currency** within Habitica and allows you to buy certain gear, quests, items, or even custom rewards you make for yourself.\n\n**Earn Gold** through completing tasks or quests. **Perception** raises the amount of Gold you earn. Rogue’s can also use an ability to get more Gold.\n\nIf you subscribe to Habitica, you can even use Gold to purchase Gems. - Mana points are unlocked with the class system at level 10 and allow you to **use Skills**.\n\nSome **MP is restored** naturally every day, but you can regain more by completing tasks or using a Mage ability. + Gold is the **main form of currency** within Habitica and allows you to buy certain gear, quests, items, or even custom rewards you make for yourself.\n\n**Earn Gold** through completing tasks or quests, or through some Class skills. Higher **Perception stats** raise the amount of Gold you earn.\n\nIf you subscribe to Habitica, you can even use Gold to purchase a number of Gems determined by the length of time you’ve been subscribed. + Mana points are unlocked with the class system at level 10 and allow you to **use Skills** once you begin learning them at level 11.\n\nSome **MP is restored** at day reset every day, but you can regain more by completing tasks or using a Mage class skill. Stat Allocation - All Habitica characters have four stats that affect the gameplay aspects of Habitica.\n\n**Strength (STR)** affects critical hits and raises damage done to a Quest Boss. Mainly for Warriors and Rogues.\n\n**Constitution (CON)** raises your HP and makes you take less damage. Mainly for Healers and Warriors.\n\n**Intelligence (INT)** raises the amount of EXP you earn and gives you more Mana. Mainly for Mages and Healers.\n\n**Perception (PER)** increases the gold you earn and the rate of finding items. Mainly for Rogues and Mages.\nnAfter level 10, you earn 1 Stat Point every level you gain that you can put into any stat you’d like. You can also equip gear that has different combinations of stat boosts. + All Habitica characters have four stats that affect the gameplay aspects of Habitica.\n\n**Strength (STR)** affects critical hits and raises damage done to a Quest Boss. Warriors and Rogues gain STR from their class equipment.\n\n**Constitution (CON)** raises your HP and makes you take less damage. Healers and Warriors gain CON from their class equipment.\n\n**Intelligence (INT)** raises the amount of EXP you earn and gives you more Mana. Mages and Healers gain INT from their class equipment.\n\n**Perception (PER)** increases the gold you earn and the rate of finding dropped items.Rogues and Mages gain PER from their class equipment.\n\nAfter level 10, you earn 1 Stat Point every level you gain that you can put into any stat you’d like. You can also equip gear that has different combinations of stat boosts. Standard Premium Currency Currency - Gems are a currency purchased with real money that allow you to buy extra content within Habitica and are one of the main source of financial support for the Habitica team alongside subscriptions.\n\nAll content purchased through Gems is purely cosmetic or can be obtained for free with time.\n\nYou can also receive Gems through gifts, Challenge prizes, contributing work to Habitica, or subscribing. + Gems are a currency purchased with real money that allow you to buy extra content within Habitica and are one of the main sources of financial support for the Habitica team alongside subscriptions.\n\nAll content purchased through Gems is purely cosmetic or can be obtained for free with time.\n\nYou can also receive Gems through gifts from other players, Challenge prizes, contributing to Habitica, or subscribing. Common Questions Game Mechanics Subscriber Currency Mystic Hourglasses - Mystic Hourglasses are an extremely rare form of currency you can only receive for subscribing to Habitica. They are used in the Time Traveler’s shop to buy past gear sets, pets, mounts, animated backgrounds, or even special quests.\n\nYou can receive up to four Mystic Hourglasses a year. The time they are rewarded is based on your subscription renewal schedule. They are sent out on the first day of a new month after your last subscription payment that qualified you for an hourglass. See the [Subscription] page for more details. + Mystic Hourglasses are an extremely rare form of currency you can only receive for subscribing to Habitica for three consecutive months or more. They are used in the Time Traveler’s shop to buy past gear sets, pets, mounts, animated backgrounds, or even special quests.\n\nYou can receive up to four Mystic Hourglasses a year. The time they are rewarded is based on your subscription renewal schedule. They are sent out on the first day of a new month after your last subscription payment that qualified you for an hourglass. See the [Subscription] page for more details. Clear your Cache Apps > Habitica, then tap Clear Cache.]]> Manual Sync or Restart @@ -1006,4 +1007,5 @@ Buy All Read More You are unable to buy that amount. + Still have a question? diff --git a/Habitica/res/values/styles.habitica.xml b/Habitica/res/values/styles.habitica.xml index 95326d2df..eeded5105 100644 --- a/Habitica/res/values/styles.habitica.xml +++ b/Habitica/res/values/styles.habitica.xml @@ -51,7 +51,8 @@ @@ -70,7 +71,7 @@