diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 70e512272..3427583b4 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -80,6 +80,12 @@ android:screenOrientation="unspecified" tools:ignore="UnusedAttribute"> + + diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml index d64e90220..fbc2ce732 100644 --- a/Habitica/res/layout/activity_full_profile.xml +++ b/Habitica/res/layout/activity_full_profile.xml @@ -16,6 +16,7 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:theme="@style/Toolbar.Modern" + style="@style/ToolbarTitleStyle" app:layout_scrollFlags="scroll|enterAlways" app:popupTheme="@style/PopupTheme"/> diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml index e315be0ef..3136ba6e7 100644 --- a/Habitica/res/layout/activity_gem_purchase.xml +++ b/Habitica/res/layout/activity_gem_purchase.xml @@ -36,6 +36,8 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:background="?attr/colorContentBackground" + android:theme="@style/Toolbar.Modern" + style="@style/ToolbarTitleStyle" app:layout_collapseMode="pin" app:popupTheme="@style/PopupTheme" /> diff --git a/Habitica/res/layout/activity_guidelines.xml b/Habitica/res/layout/activity_guidelines.xml index a238dbd6b..6ef2504fa 100644 --- a/Habitica/res/layout/activity_guidelines.xml +++ b/Habitica/res/layout/activity_guidelines.xml @@ -17,6 +17,7 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:theme="@style/Toolbar.Modern" + style="@style/ToolbarTitleStyle" app:layout_scrollFlags="scroll|enterAlways" app:popupTheme="@style/PopupTheme"/> diff --git a/Habitica/res/layout/activity_notifications.xml b/Habitica/res/layout/activity_notifications.xml index 46347d711..1a7909054 100644 --- a/Habitica/res/layout/activity_notifications.xml +++ b/Habitica/res/layout/activity_notifications.xml @@ -17,6 +17,7 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:theme="@style/Toolbar.Modern" + style="@style/ToolbarTitleStyle" app:layout_scrollFlags="scroll|enterAlways" app:popupTheme="@style/PopupTheme" /> diff --git a/Habitica/res/layout/activity_party_invite.xml b/Habitica/res/layout/activity_party_invite.xml index f7b1fbf0c..46a04fbc3 100644 --- a/Habitica/res/layout/activity_party_invite.xml +++ b/Habitica/res/layout/activity_party_invite.xml @@ -20,6 +20,7 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:theme="@style/Toolbar.Modern" + style="@style/ToolbarTitleStyle" app:layout_scrollFlags="scroll|enterAlways" app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/> diff --git a/Habitica/res/layout/activity_prefs.xml b/Habitica/res/layout/activity_prefs.xml index 482e64cd2..7dc723d62 100644 --- a/Habitica/res/layout/activity_prefs.xml +++ b/Habitica/res/layout/activity_prefs.xml @@ -17,6 +17,7 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:theme="@style/Toolbar.Modern" + style="@style/ToolbarTitleStyle" app:layout_scrollFlags="scroll|enterAlways" app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/> diff --git a/Habitica/res/layout/activity_skill_members.xml b/Habitica/res/layout/activity_skill_members.xml index b7d5e1a27..16b161655 100644 --- a/Habitica/res/layout/activity_skill_members.xml +++ b/Habitica/res/layout/activity_skill_members.xml @@ -17,6 +17,7 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:theme="@style/Toolbar.Modern" + style="@style/ToolbarTitleStyle" app:layout_scrollFlags="scroll|enterAlways" app:popupTheme="@style/PopupTheme"/> diff --git a/Habitica/res/layout/activity_skill_tasks.xml b/Habitica/res/layout/activity_skill_tasks.xml index 9b97485b9..7bd804109 100644 --- a/Habitica/res/layout/activity_skill_tasks.xml +++ b/Habitica/res/layout/activity_skill_tasks.xml @@ -17,6 +17,7 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:theme="@style/Toolbar.Modern" + style="@style/ToolbarTitleStyle" app:layout_scrollFlags="scroll|enterAlways" app:popupTheme="@style/PopupTheme"/> diff --git a/Habitica/res/layout/form_stepper_value.xml b/Habitica/res/layout/form_stepper_value.xml index e67bb83d4..5b83e3e8c 100644 --- a/Habitica/res/layout/form_stepper_value.xml +++ b/Habitica/res/layout/form_stepper_value.xml @@ -37,7 +37,7 @@ android:layout_height="match_parent" android:layout_centerHorizontal="true" android:background="@color/transparent" - android:textColor="?colorPrimaryDark" + android:textColor="?textColorTintedPrimary" android:textSize="16sp" tools:text="100.0" android:inputType="numberDecimal" diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml index b071f1d1e..60be7e08a 100644 --- a/Habitica/res/layout/fragment_gem_purchase.xml +++ b/Habitica/res/layout/fragment_gem_purchase.xml @@ -10,6 +10,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> + + + + + + + + + @color/gray_300 @color/gray_200 @color/gray_10 - @color/brand_400 + @color/brand_600 @color/brand_500 @color/red_100 @color/orange_100 diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml index fc8a0b66a..9bba9c726 100644 --- a/Habitica/res/values/attrs.xml +++ b/Habitica/res/values/attrs.xml @@ -9,6 +9,8 @@ + + diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index 5ba2d3c47..0b2018581 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -60,6 +60,8 @@ Start Date Positive Negative + positive + negative On Off Selected @@ -739,8 +741,8 @@ Choose the gem packet you’d like to gift below! Server Your gift was sent! - You sent %s a %s-month Habitica subscription and the same subscription was applied to your account for our Gift One Get One promotion! - You sent @%s a %s-month Habitica subscription. + You sent %1$s a %2$s-month Habitica subscription and the same subscription was applied to your account for our Gift One Get One promotion! + You sent @%1$s a %2$s-month Habitica subscription. You sent @%s %s gems. You are now subscribed for 1 month You are now subscribed for %s months @@ -1048,11 +1050,11 @@ View Onboarding Tasks You still need a %s Egg to hatch this pet You still need a %s Potion to hatch this pet - You need a %s and %s Potion to hatch this pet + You need a %1$s and %2$s Potion to hatch this pet You still need a %s Egg to hatch this pet again You still need a %s Potion to hatch this pet again - You need a %s and %s Potion to hatch this pet again - Combine your %s Egg and %s Potion to hatch this pet! + You need a %1$s and %2$s Potion to hatch this pet again + Combine your %1$s Egg and %2$s Potion to hatch this pet! Hatch Pet Unhatched Pet Hatch Pet again @@ -1081,7 +1083,7 @@ Private Messages are disabled You can still send messages, but no one can send them to you. You can enable again from Settings. Usually %d Gems - %s to %s + %1$s to %2$s How it works Limitations Between %s and %s, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases! @@ -1259,10 +1261,10 @@ Copy shared tasks Group Plan Settings Task Summary - This is a **%s** Habit that is **%s**. - This is a **%s** Task that is due **%s**. - This is a **%s** Task that does not have a due date. - This is a **%s** Task that repeats **%s**. + This is a **%1$s** Habit that is **%2$s**. + This is a **%1$s** Task that is due **%2$s**. + This is a **%1$s** Task that does not have a due date. + This is a **%1$s** Task that repeats **%2$s%3$s**. positive and negative Assigned to Completed at %s @@ -1293,6 +1295,36 @@ PayPal Stripe Shadow muted, hidden + Assigned to you by @%1$s on %2$s + never + on %s + on weekdays + on weekends + on every day of the week + %1$s and %2$s + on the %s + first + on the %1$s %2$s of the month + second + third + fourth + fifth + Animated Gryphatrice Pet + Celebrate Habitica’s 10th birthday with gifts and exclusive items below! + Limited Edition + The rare, mystical Gryphatrice joins the birthday bash! Don’t miss your chance to own this exclusive animated Pet. + Thanks for your support! + Plenty of Potions + For for Free + Buy for %s + Buy for + We’re bringing back 10 of the community’s favorite Magic Hatching Potions. Head over to the Market to fill out your collection! + To keep the party going, we’ll be giving away Party Robes, 20 Gems, and a limited edition Cape set and Background! + This is a limited time event that starts on January 23rd at 8:00 AM ET (13:00 UTC) and will end February 1st at 8:00 PM ET (01:00 UTC). The Limited Edition Gryphatrice and ten Magic Hatching Potions will be available to buy during this time. The other Gifts will be automatically delivered to all accounts active in the previous 30 days. + Visit the Market + Exclusive items and gifts await + Ends in %s + See More You You, %d other @@ -1302,4 +1334,24 @@ %d person %d people + + every day + every other day + every %d days + + + every week + every other week + every %d weeks + + + every month + every other month + every %d months + + + every year + every other year + every %d years + diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml index 044d6aea9..e49d36bd7 100644 --- a/Habitica/res/values/styles.xml +++ b/Habitica/res/values/styles.xml @@ -41,6 +41,8 @@ @color/window_background @color/brand_800 @color/brand_700 + @color/brand_sub_text + @color/brand_100 @style/PopupTheme @style/PopupTheme @@ -70,11 +72,14 @@ @color/brand_50 @color/gray_10 @color/gray_200 + @color/white @color/white @color/brand_00 @color/brand_0 + @color/brand_500 @color/brand_600 @color/brand_400 + @color/brand_700 @@ -98,6 +103,8 @@ @color/red_1 @color/red_700 @color/red_600 + @color/red_sub_text + @color/red_100