From 7ac30c819bbc5868dd267ca7b157f691883d6736 Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Tue, 6 Sep 2022 07:38:06 -0400
Subject: [PATCH 1/4] Updated sub benefit UI

---
 Habitica/res/drawable/calendar_ic.xml         |  22 +
 Habitica/res/drawable/gem_ic.xml              |  40 ++
 Habitica/res/layout/subscription_details.xml  | 486 +++++++++++-------
 Habitica/res/values-de/strings.xml            |   2 +-
 Habitica/res/values-en-rGB/strings.xml        |   2 +-
 Habitica/res/values-es/strings.xml            |   2 +-
 Habitica/res/values-fr/strings.xml            |   2 +-
 Habitica/res/values-in/strings.xml            |   2 +-
 Habitica/res/values-it/strings.xml            |   2 +-
 Habitica/res/values-ja/strings.xml            |   2 +-
 Habitica/res/values-ko/strings.xml            |   2 +-
 Habitica/res/values-nl/strings.xml            |   2 +-
 Habitica/res/values-pt-rBR/strings.xml        |   2 +-
 Habitica/res/values-pt-rPT/strings.xml        |   2 +-
 Habitica/res/values-ru/strings.xml            |   2 +-
 Habitica/res/values-sv/strings.xml            |   2 +-
 Habitica/res/values-tr/strings.xml            |   2 +-
 Habitica/res/values-uk/strings.xml            |   2 +-
 Habitica/res/values-vi/strings.xml            |   2 +-
 Habitica/res/values-zh-rTW/strings.xml        |   2 +-
 Habitica/res/values-zh/strings.xml            |   2 +-
 Habitica/res/values/strings.xml               |   6 +-
 Habitica/res/values/styles.xml                |  17 +
 .../subscriptions/SubscriptionDetailsView.kt  |  15 +-
 24 files changed, 405 insertions(+), 217 deletions(-)
 create mode 100644 Habitica/res/drawable/calendar_ic.xml
 create mode 100644 Habitica/res/drawable/gem_ic.xml

diff --git a/Habitica/res/drawable/calendar_ic.xml b/Habitica/res/drawable/calendar_ic.xml
new file mode 100644
index 000000000..7238df7af
--- /dev/null
+++ b/Habitica/res/drawable/calendar_ic.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.571,3.429V0h-3.428v3.429H6.857V0H3.43v3.429A3.428,3.428 0,0 0,0 6.857v13.714A3.428,3.428 0,0 0,3.429 24H20.57A3.428,3.428 0,0 0,24 20.571V6.857a3.428,3.428 0,0 0,-3.429 -3.428z"
+      android:fillColor="#9A62FF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3.429,20.571H20.57V10.286H3.43z"
+      android:fillColor="#D5C8FF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3.429,13.286H20.57v-3H3.43z"
+      android:fillColor="#9A62FF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3.429,13.286H20.57v-3H3.43z"
+      android:fillColor="#BDA8FF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/Habitica/res/drawable/gem_ic.xml b/Habitica/res/drawable/gem_ic.xml
new file mode 100644
index 000000000..6da6bbb84
--- /dev/null
+++ b/Habitica/res/drawable/gem_ic.xml
@@ -0,0 +1,40 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m0,9 l5,-7h14l5,7 -12,13z"
+      android:fillColor="#24CC8F"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7,8.8 L6,4h6zM17,8.8L18,4h-6z"
+      android:strokeAlpha="0.25"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.25"/>
+  <path
+      android:pathData="M7,8.8 L12,4l5,4.8zM2.6,8.8L6,4l1,4.8z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M21.4,8.8 L18,4l-1,4.8zM2.6,8.8L7,8.8l5,10.3z"
+      android:strokeAlpha="0.11"
+      android:fillColor="#34313A"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.11"/>
+  <path
+      android:pathData="M21.4,8.8H17l-5,10.3z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M7,8.8h10l-5,10.3z"
+      android:strokeAlpha="0.25"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.25"/>
+</vector>
diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
index 253fd7434..076605376 100644
--- a/Habitica/res/layout/subscription_details.xml
+++ b/Habitica/res/layout/subscription_details.xml
@@ -1,227 +1,337 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/subscriptionDetails"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:background="@color/content_background">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/subscription_credit_card"
+        android:layout_width="match_parent"
+        android:layout_height="75dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        app:cardCornerRadius="8dp"
+        app:strokeColor="@color/green_50"
+        app:strokeWidth="1dp">
+
+        <TextView
+            android:id="@+id/subscription_credit_text_view"
+            style="@style/subscriptionBoxText.Subtitle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:padding="4dp"
+            android:text="@string/subscription_credit_canceling"
+            android:textColor="@color/green_50" />
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <LinearLayout
+        style="@style/subscriptionBox"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/subscriptionBoxText.Title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/subscription" />
+
+            <TextView
+                android:id="@+id/subscriptionDurationTextView"
+                style="@style/subscriptionBoxText.Subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="Recurring every 3 months" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/subscriptionStatusActive"
+            style="@style/Pill.Selected.Green"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/active" />
+
+        <TextView
+            android:id="@+id/subscriptionStatusNotRecurring"
+            style="@style/Pill.Selected.Yellow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/not_recurring"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/subscriptionStatusInactive"
+            style="@style/Pill.Selected.Red"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/inactive"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/subscriptionStatusCancelled"
+            style="@style/Pill.Selected.Red"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/cancelled"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/subscription_status_group_plan"
+            style="@style/Pill.Selected"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/group_plan"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/payment_processor_wrapper"
+        style="@style/subscriptionBox"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/subscriptionBoxText.Title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/payment_method" />
+
+            <TextView
+                android:id="@+id/subscription_payment_method_textview"
+                style="@style/subscriptionBoxText.Subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="Recurring every 3 months" />
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/paymentProcessorImageView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <View
+            android:id="@+id/divider"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_centerHorizontal="true"
+            android:visibility="invisible" />
+
+        <RelativeLayout
+            android:id="@+id/months_subscribed_layout"
+            style="@style/subscriptionBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="5dp"
+            android:layout_marginBottom="6dp"
+            android:layout_toStartOf="@id/divider">
+
+            <View
+                android:id="@+id/months_divider"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_centerHorizontal="true" />
+
+            <ImageView
+                android:id="@+id/calendar_icon"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_marginTop="8dp"
+                android:layout_toStartOf="@id/months_divider"
+                android:src="@drawable/calendar_ic" />
+
+            <TextView
+                style="@style/subscriptionBoxCompactText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/calendar_icon"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="6dp"
+                android:text="@string/months_subscribed" />
+
+            <TextView
+                android:id="@+id/monthsSubscribedTextView"
+                style="@style/subscriptionBoxCompactNumber"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="8dp"
+                android:layout_toEndOf="@id/calendar_icon"
+                android:gravity="center"
+                tools:text="2" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            style="@style/subscriptionBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:layout_marginBottom="6dp"
+            android:layout_toEndOf="@id/divider">
+
+            <View
+                android:id="@+id/gem_divider"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_centerInParent="true" />
+
+            <ImageView
+                android:id="@+id/gem_icon"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_marginTop="10dp"
+                android:layout_toStartOf="@id/gem_divider"
+                android:src="@drawable/gem_ic" />
+
+
+            <TextView
+                style="@style/subscriptionBoxCompactText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/gem_icon"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="5dp"
+                android:text="@string/monthly_gem_cap" />
+
+            <TextView
+                android:id="@+id/gemCapTextView"
+                style="@style/subscriptionBoxCompactNumber"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="10dp"
+                android:layout_toEndOf="@id/gem_icon"
+                tools:text="50" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            style="@style/subscriptionBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/months_subscribed_layout">
+
+            <ImageView
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="16dp"
+                android:src="@drawable/sub_benefits_hourglasses" />
+
+            <ImageView
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="16dp"
+                android:src="@drawable/sub_benefits_hourglasses" />
+
+            <TextView
+                android:id="@+id/next_hourglass_textview"
+                style="@style/subscriptionBoxCompactTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_marginBottom="16dp"
+                tools:text="4" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/next_hourglass_textview"
+                android:layout_centerHorizontal="true"
+                android:fontFamily="sans-serif-medium"
+                android:text="@string/next_hourglass"
+                android:textColor="@color/black_50_alpha" />
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center"
+        android:paddingStart="50dp"
+        android:paddingEnd="50dp"
+        android:text="@string/subscribers_mythic_hourglasses" />
+
     <ImageView
         android:id="@+id/heart_icon"
         android:layout_width="20dp"
         android:layout_height="20dp"
-        android:layout_gravity="center_horizontal"/>
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="12dp" />
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/thanks_for_subscribing"
-        style="@style/Body2"
-        android:textColor="@color/text_quad"
         android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="12dp"
         android:layout_marginTop="4dp"
-        />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/subscriptionBox">
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/subscription"
-                style="@style/subscriptionBoxText.Title"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/subscriptionDurationTextView"
-                tools:text="Recurring every 3 months"
-                style="@style/subscriptionBoxText.Subtitle" />
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/active"
-            style="@style/Pill.Selected.Green"
-            android:id="@+id/subscriptionStatusActive"
-            android:layout_gravity="center_vertical"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/not_recurring"
-            style="@style/Pill.Selected.Yellow"
-            android:id="@+id/subscriptionStatusNotRecurring"
-            android:layout_gravity="center_vertical"
-            android:visibility="gone"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/inactive"
-            style="@style/Pill.Selected.Red"
-            android:id="@+id/subscriptionStatusInactive"
-            android:layout_gravity="center_vertical"
-            android:visibility="gone"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/cancelled"
-            style="@style/Pill.Selected.Red"
-            android:id="@+id/subscriptionStatusCancelled"
-            android:layout_gravity="center_vertical"
-            android:visibility="gone"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/group_plan"
-            style="@style/Pill.Selected"
-            android:id="@+id/subscription_status_group_plan"
-            android:layout_gravity="center_vertical"
-            android:visibility="gone"/>
-    </LinearLayout>
-    <LinearLayout
-        android:id="@+id/payment_processor_wrapper"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/subscriptionBox">
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/payment_method"
-                style="@style/subscriptionBoxText.Title" />
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/subscription_payment_method_textview"
-                tools:text="Recurring every 3 months"
-                style="@style/subscriptionBoxText.Subtitle" />
-        </LinearLayout>
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/paymentProcessorImageView"
-            android:layout_gravity="center_vertical"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/subscriptionBox"
-        android:orientation="vertical">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/current_bonuses"
-            style="@style/subscriptionBoxText.Title"
-            android:layout_marginBottom="4dp"/>
-        <LinearLayout
-            android:id="@+id/subscription_credit_wrapper"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="6dp">
-            <TextView
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:text="@string/subscription_credit"
-                style="@style/subscriptionBoxText.Subtitle"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Pill"
-                android:id="@+id/subscription_credit_text_view"
-                tools:text="32 Months" />
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="6dp">
-            <TextView
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:text="@string/months_subscribed"
-                style="@style/subscriptionBoxText.Subtitle"/>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Pill"
-                android:id="@+id/monthsSubscribedTextView"
-                tools:text="32 Months" />
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="6dp">
-            <TextView
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:text="@string/monthly_gem_cap"
-                style="@style/subscriptionBoxText.Subtitle" />
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Pill"
-                android:id="@+id/gemCapTextView"
-                tools:text="50 Gems" />
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <TextView
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:text="@string/next_hourglass"
-                style="@style/subscriptionBoxText.Subtitle" />
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Pill"
-                android:id="@+id/next_hourglass_textview"
-                tools:text="4" />
-        </LinearLayout>
-    </LinearLayout>
+        android:layout_marginBottom="12dp"
+        android:fontFamily="sans-serif-medium"
+        android:text="@string/thanks_for_supporting"
+        android:textColor="@color/text_quad" />
 
     <LinearLayout
         android:id="@+id/change_subscription_wrapper"
+        style="@style/subscriptionBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="@style/subscriptionBox"
         android:orientation="vertical">
+
         <TextView
             android:id="@+id/change_subscription_title"
+            style="@style/subscriptionBoxText.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/cancel_subscription"
-            style="@style/subscriptionBoxText.Title" />
+            android:text="@string/cancel_subscription" />
+
         <TextView
             android:id="@+id/change_subscription_description"
+            style="@style/subscriptionBoxText.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            style="@style/subscriptionBoxText.Subtitle"
-            android:text="@string/cancel_subscription_notgoogle_description"
             android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"/>
+            android:layout_marginBottom="8dp"
+            android:text="@string/cancel_subscription_notgoogle_description" />
+
         <Button
             android:id="@+id/change_subscription_button"
+            style="@style/HabiticaButton.Purple"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/visit_website"
             android:layout_gravity="center"
-            style="@style/HabiticaButton.Purple"
-            android:layout_marginTop="@dimen/spacing_medium"/>
+            android:layout_marginTop="@dimen/spacing_medium"
+            android:text="@string/visit_website" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index 3b003383e..9cca6f9bd 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -733,7 +733,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="resubscribe_description">Willst Du weiter Deine Vorteile genießen\? Du kannst ein neues Abonnement abschließen, bevor dieses ausläuft, um Deine Vorteile zu behalten.</string>
     <string name="resubscribe">Erneut abonnieren</string>
     <string name="renew_subscription">Abonnement erneuern</string>
-    <string name="thanks_for_subscribing">Danke für das Abonnieren</string>
+    <string name="thanks_for_supporting">Danke für das Abonnieren</string>
     <string name="subscribe_options_title">Wähle die Abonnementlänge, die für Dich passt</string>
     <string name="ending_on">Endet am %s</string>
     <string name="not_recurring">Einmalig</string>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index e7cb15aca..5f12180e0 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -709,7 +709,7 @@
     <string name="resubscribe_description">Want to continue your benefits\? You can start a new subscription before this one runs out to keep your benefits active.</string>
     <string name="resubscribe">Resubscribe</string>
     <string name="renew_subscription">Renew Subscription</string>
-    <string name="thanks_for_subscribing">Thanks for subscribing</string>
+    <string name="thanks_for_supporting">Thanks for subscribing</string>
     <string name="subscribe_options_title">Choose the Subscription length that works for you</string>
     <string name="ending_on">Ending on %s</string>
     <string name="not_recurring">Not Recurring</string>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index 80dba4dfb..17b1f7794 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -722,7 +722,7 @@
     <string name="party_invite_short">Invitar amigos</string>
     <string name="login_incentive_count">Desbloqueado al conectarse en Habitica %d veces.</string>
     <string name="user_level_with_class_unabbreviated">Nivel %1$d %2$s</string>
-    <string name="thanks_for_subscribing">Gracias por suscribirte</string>
+    <string name="thanks_for_supporting">Gracias por suscribirte</string>
     <string name="subscribe_options_title">Elige el tiempo de suscripción que mejor funcione para tí</string>
     <string name="cancelled">Cancelado</string>
     <string name="send_invites">Enviar invitaciones</string>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index bf1f4c98b..decd113f3 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -908,7 +908,7 @@
     <string name="resubscribe_description">Vous voulez encore profiter des bonus \? Vous pouvez commencer un nouvel abonnement avant que celui-ci ne se termine pour les conserver.</string>
     <string name="resubscribe">Se réinscrire</string>
     <string name="renew_subscription">Renouveler l\'abonnement</string>
-    <string name="thanks_for_subscribing">Merci d\'avoir souscrit un abonnement</string>
+    <string name="thanks_for_supporting">Merci d\'avoir souscrit un abonnement</string>
     <string name="subscribe_options_title">Choisissez la durée d\'abonnement qui marche pour vous</string>
     <string name="ending_on">Termine le %s</string>
     <string name="not_recurring">Ne se renouvelle pas</string>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index 40ad6c1ee..4947755bd 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -917,7 +917,7 @@
     <string name="gifted">Telah diberikan</string>
     <string name="resubscribe">Berlangganan Kembali</string>
     <string name="renew_subscription">Memperbarui Berlangganan</string>
-    <string name="thanks_for_subscribing">Terima kasih telah berlangganan</string>
+    <string name="thanks_for_supporting">Terima kasih telah berlangganan</string>
     <string name="subscribe_options_title">Pilih masa Berlangganan yang kamu inginkan</string>
     <string name="ending_on">Berakhir pada %s</string>
     <string name="not_recurring">Tidak Berulang</string>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index f5903a9c5..a916414af 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -908,7 +908,7 @@
     <string name="resubscribe_description">Vuoi continuare ad avere i tuoi vantaggi\? Puoi iniziare un nuovo abbonamento prima che questo scada per mantenerli attivi.</string>
     <string name="resubscribe">Riabbonati</string>
     <string name="renew_subscription">Rinnova l\'Abbonamento</string>
-    <string name="thanks_for_subscribing">Grazie per esserti iscritto</string>
+    <string name="thanks_for_supporting">Grazie per esserti iscritto</string>
     <string name="subscribe_options_title">Scegli la durata dell\'abbonamento che fa per te</string>
     <string name="ending_on">Termina il %s</string>
     <string name="not_recurring">Non ricorrente</string>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 03f3bf957..0c43dc437 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -897,7 +897,7 @@
     <string name="resubscribe_description">特典を受け続けたいですか？この有料プランの有効期限が切れる前に新しい有料プランをはじめることで、特典を有効に受け続けられます。</string>
     <string name="resubscribe">有料プランの再開</string>
     <string name="renew_subscription">有料プランを再開する</string>
-    <string name="thanks_for_subscribing">有料プランにご加入いただきありがとうございます</string>
+    <string name="thanks_for_supporting">有料プランにご加入いただきありがとうございます</string>
     <string name="subscribe_options_title">有料プランの期間をあなたのご都合に合わせて選びましょう</string>
     <string name="ending_on">%sに止める</string>
     <string name="not_recurring">くり返さない</string>
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index bba1dea98..7814f3190 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -911,7 +911,7 @@
     <string name="resubscribe_description">혜택을 계속 받고 싶으신가요\? 이번 구독기간이 끝나기 전에 새로 시작하시면 현재 받고 계신 혜택을 계속 유지시킬 수 있습니다.</string>
     <string name="resubscribe">재구독</string>
     <string name="renew_subscription">구독 갱신</string>
-    <string name="thanks_for_subscribing">구독해주셔서 감사합니다</string>
+    <string name="thanks_for_supporting">구독해주셔서 감사합니다</string>
     <string name="subscribe_options_title">원하시는 구독 기간을 정하세요</string>
     <string name="ending_on">%s 에 종료</string>
     <string name="not_recurring">자동 반복 안됨</string>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index b587f6737..9164ec894 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -751,7 +751,7 @@
     <string name="copy_userid">Gebruikers ID kopiëren</string>
     <string name="resubscribe">Opnieuw abonneren</string>
     <string name="renew_subscription">Abonnement vernieuwen</string>
-    <string name="thanks_for_subscribing">Bedankt voor het abonneren</string>
+    <string name="thanks_for_supporting">Bedankt voor het abonneren</string>
     <string name="subscribe_options_title">Kies de abonnementslengte die voor u werkt</string>
     <string name="ending_on">Eindigend op %s</string>
     <string name="not_recurring">Niet Terugkerend</string>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index 5b1c74b30..5c667bec9 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -709,7 +709,7 @@
     <string name="resubscribe_description">Você quer continuar com seus benefícios\? Você pode iniciar uma nova assinatura antes que esta acabe para manter seus benefícios ativos.</string>
     <string name="resubscribe">Assinar novamente</string>
     <string name="renew_subscription">Renovar assinatura</string>
-    <string name="thanks_for_subscribing">Obrigado por assinar</string>
+    <string name="thanks_for_supporting">Obrigado por assinar</string>
     <string name="subscribe_options_title">Escolha o tempo de assinatura que funciona para você</string>
     <string name="ending_on">Finalizando em %s</string>
     <string name="not_recurring">Não recorrente</string>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index ef1556fdd..f3a13ddef 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -710,7 +710,7 @@
     <string name="subscription_credit">Crédito de Subscrição</string>
     <string name="save_20">Economize 20%</string>
     <string name="renew_subscription">Renovar Subscrição</string>
-    <string name="thanks_for_subscribing">Obrigado por subscrever-se</string>
+    <string name="thanks_for_supporting">Obrigado por subscrever-se</string>
     <string name="class_equipment">Equipamento</string>
     <string name="allocating_points">Distribuindo Pontos</string>
     <string name="distribute_task_help">Distribui pontos baseado nas categorias Força, Inteligência, Constituição e Percepção associadas com as tarefas que completastes.</string>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index d95b62ede..b8aa283af 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -954,7 +954,7 @@
     <string name="usually_x_gems">Обычно %d самоцветов</string>
     <string name="resubscribe">Подписаться снова</string>
     <string name="renew_subscription">Обновить подписку</string>
-    <string name="thanks_for_subscribing">Благодарим за подписку</string>
+    <string name="thanks_for_supporting">Благодарим за подписку</string>
     <string name="gifted">Подарено</string>
     <string name="number_responded">Ответ от %1$d/%2$d</string>
     <string name="ending_on">Заканчивается %s</string>
diff --git a/Habitica/res/values-sv/strings.xml b/Habitica/res/values-sv/strings.xml
index 8cc12bcfd..6ae194068 100755
--- a/Habitica/res/values-sv/strings.xml
+++ b/Habitica/res/values-sv/strings.xml
@@ -564,7 +564,7 @@
     <string name="g1g1_duration">Dec 17 till Jan 6</string>
     <string name="resubscribe">Abonnera igen</string>
     <string name="copy_username">Kopiera Användarnamn</string>
-    <string name="thanks_for_subscribing">Tack för att du prenumererar</string>
+    <string name="thanks_for_supporting">Tack för att du prenumererar</string>
     <string name="ending_on">Sluta på %s</string>
     <string name="view_achievements">Visa Prestationer</string>
     <string name="purchase">Köpa</string>
diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml
index 5c8986894..a09886280 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -961,7 +961,7 @@
     <string name="resubscribe_description">Faydalardan yararlanmaya devam etmek ister misin\? Faydalarını etkin tutmak için bu abonelik bitmeden yeni bir abonelik başlatabilirsin.</string>
     <string name="renew_subscription">Aboneliği Yenile</string>
     <string name="resubscribe">Yeniden abone ol</string>
-    <string name="thanks_for_subscribing">Abone olduğun için teşekkürler</string>
+    <string name="thanks_for_supporting">Abone olduğun için teşekkürler</string>
     <string name="not_recurring">Yinelenmiyor</string>
     <string name="cancelled">İptal Edildi</string>
     <string name="send_invites">Davet Gönder</string>
diff --git a/Habitica/res/values-uk/strings.xml b/Habitica/res/values-uk/strings.xml
index 3b7901355..2c455db26 100755
--- a/Habitica/res/values-uk/strings.xml
+++ b/Habitica/res/values-uk/strings.xml
@@ -857,7 +857,7 @@
     <string name="group_plan">Груповий план</string>
     <string name="resubscribe_description">Хочеш надалі використовувати свої переваги\? Ти можеш розпочати нову підписку до закінчення актуальної підтиски, щоб зберегти свої переваги.</string>
     <string name="subscribe_options_title">Вибери час підписки, який тобі найбільше підходить</string>
-    <string name="thanks_for_subscribing">Дякуємо за підписку</string>
+    <string name="thanks_for_supporting">Дякуємо за підписку</string>
     <string name="resubscribe">Підписатися знову</string>
     <string name="renew_subscription">Оновити підписку</string>
     <string name="save_20">Заощадити 20%</string>
diff --git a/Habitica/res/values-vi/strings.xml b/Habitica/res/values-vi/strings.xml
index 116dbd083..6adafc6df 100755
--- a/Habitica/res/values-vi/strings.xml
+++ b/Habitica/res/values-vi/strings.xml
@@ -868,7 +868,7 @@
     <string name="resubscribe_description">Muốn tiếp tục những lợi ích của bạn\? Bạn có thể bắt đầu một Gói đăng ký mới trước khi cái này kết thúc để giữ những lợi ích của bạn được hoạt động.</string>
     <string name="resubscribe">Đăng ký lại</string>
     <string name="renew_subscription">Làm mới Gói đăng ký</string>
-    <string name="thanks_for_subscribing">Cảm ơn vì đăng ký</string>
+    <string name="thanks_for_supporting">Cảm ơn vì đăng ký</string>
     <string name="subscribe_options_title">Chọn độ dài Gói đăng ký mà thích hợp với bạn</string>
     <string name="ending_on">Kết thúc vào %s</string>
     <string name="not_recurring">Không lặp lại</string>
diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml
index 4c40fcd08..a8d453b05 100644
--- a/Habitica/res/values-zh-rTW/strings.xml
+++ b/Habitica/res/values-zh-rTW/strings.xml
@@ -863,7 +863,7 @@
     <string name="not_recurring">不重複</string>
     <string name="ending_on">在%s結束</string>
     <string name="subscribe_options_title">選擇最適合的訂閱計劃</string>
-    <string name="thanks_for_subscribing">感謝您的訂閱</string>
+    <string name="thanks_for_supporting">感謝您的訂閱</string>
     <string name="renew_subscription">更新訂閱</string>
     <string name="resubscribe">重新訂閱</string>
     <string name="resubscribe_description">要繼續用您的訂閱增值？您可以在現在的訂閱結束前開始新的訂閱，就能繼續使用。</string>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index fbbbccf15..52ba59dc5 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -842,7 +842,7 @@
     <string name="not_recurring">不重复</string>
     <string name="ending_on">在%s结束</string>
     <string name="subscribe_options_title">选择最适合的订阅计划</string>
-    <string name="thanks_for_subscribing">感谢您的订阅</string>
+    <string name="thanks_for_supporting">感谢您的订阅</string>
     <string name="renew_subscription">更新订阅</string>
     <string name="resubscribe">重新订阅</string>
     <string name="resubscribe_description">要继续用您的订阅增值？您可以在现在的订阅结束前开始新的订阅，就能继续使用。</string>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index d1f8f5528..523c6c827 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -388,6 +388,7 @@
     <string name="subscription_hourglasses">+%d Mystic Hourglass</string>
     <string name="payment_method">Payment method</string>
     <string name="subscription">Subscription</string>
+    <string name="subscription_credit_canceling">"Your <b>+%d</b> months of subscription credit will activate after canceling</string>
     <string name="active">Active</string>
     <string name="due">Due</string>
     <string name="cancel_subscription">Cancel Subscription</string>
@@ -397,7 +398,7 @@
     <string name="current_bonuses">Current Bonuses</string>
     <string name="months_subscribed">Months subscribed</string>
     <string name="current_hourclasses">Current Mystic Hourglasses</string>
-    <string name="next_hourglass">Next Hourglass</string>
+    <string name="next_hourglass">Next Hourglass delivery</string>
     <string name="monthly_gem_cap">Monthly gem cap</string>
     <string name="inactive">Inactive</string>
     <string name="one_month">1 Month</string>
@@ -909,7 +910,8 @@
     <string name="not_recurring">Not Recurring</string>
     <string name="ending_on">Ending on %s</string>
     <string name="subscribe_options_title">Choose the Subscription length that works for you</string>
-    <string name="thanks_for_subscribing">Thanks for subscribing</string>
+    <string name="thanks_for_supporting">Thanks for supporting Habitica</string>
+    <string name="subscribers_mythic_hourglasses"><i>Subscribers receive Mystic Hourglasses within the first three days of the month.</i></string>
     <string name="renew_subscription">Renew Subscription</string>
     <string name="resubscribe">Resubscribe</string>
     <string name="resubscribe_description">Want to continue your benefits? You can start a new subscription before this one runs out to keep your benefits active.</string>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 48e23d006..c43540263 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -559,6 +559,23 @@
         <item name="android:layout_marginEnd">16dp</item>
     </style>
 
+    <style name="subscriptionBoxCompactText">
+        <item name="android:fontFamily">sans-serif-black</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <style name="subscriptionBoxCompactTitle">
+        <item name="android:textColor">@color/text_primary</item>
+        <item name="android:fontFamily">sans-serif-black</item>
+        <item name="android:textSize">24sp</item>
+    </style>
+
+    <style name="subscriptionBoxCompactNumber">
+        <item name="android:textColor">@color/text_primary</item>
+        <item name="android:fontFamily">sans-serif-black</item>
+        <item name="android:textSize">20sp</item>
+    </style>
+
     <style name="HabiticaButton.Purple" parent="HabiticaButton">
         <item name="android:backgroundTint">@color/color_accent</item>
         <item name="android:textColor">@color/white</item>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
index 992ab947b..ab117b0c1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
@@ -67,14 +67,14 @@ class SubscriptionDetailsView : LinearLayout {
         }
 
         if ((plan.extraMonths ?: 0) > 0) {
-            binding.subscriptionCreditWrapper.visibility = View.VISIBLE
+            binding.subscriptionCreditCard.visibility = View.VISIBLE
             if (plan.extraMonths == 1) {
-                binding.subscriptionCreditTextView.text = resources.getString(R.string.one_month)
+                binding.subscriptionCreditTextView.text = resources.getString(R.string.subscription_credit_canceling, 1)
             } else {
-                binding.subscriptionCreditTextView.text = resources.getString(R.string.x_months, plan.extraMonths)
+                binding.subscriptionCreditTextView.text = resources.getString(R.string.subscription_credit_canceling, plan.extraMonths)
             }
         } else {
-            binding.subscriptionCreditWrapper.visibility = View.GONE
+            binding.subscriptionCreditCard.visibility = View.GONE
         }
 
         when (plan.paymentMethod) {
@@ -93,11 +93,8 @@ class SubscriptionDetailsView : LinearLayout {
             }
         }
 
-        if (plan.consecutive?.count == 1) {
-            binding.monthsSubscribedTextView.text = resources.getString(R.string.one_month)
-        } else {
-            binding.monthsSubscribedTextView.text = resources.getString(R.string.x_months, plan.consecutive?.count ?: 0)
-        }
+        binding.monthsSubscribedTextView.text = plan.consecutive?.count.toString()
+
 
         binding.gemCapTextView.text = plan.totalNumberOfGems.toString()
 

From 4b811dad706c84e6e304f924b158dbc14841bd6a Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Tue, 6 Sep 2022 07:40:01 -0400
Subject: [PATCH 2/4] color fix

---
 Habitica/res/layout/subscription_details.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
index 076605376..4e57771ee 100644
--- a/Habitica/res/layout/subscription_details.xml
+++ b/Habitica/res/layout/subscription_details.xml
@@ -269,7 +269,7 @@
                 android:layout_centerHorizontal="true"
                 android:fontFamily="sans-serif-medium"
                 android:text="@string/next_hourglass"
-                android:textColor="@color/black_50_alpha" />
+                android:textColor="@color/text_primary" />
         </RelativeLayout>
 
     </RelativeLayout>

From db371e3da840c9025e286249b289a529cd2e472f Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Mon, 12 Sep 2022 23:19:49 -0400
Subject: [PATCH 3/4] Subscription detail updates

---
 Habitica/res/layout/subscription_details.xml |  7 +++----
 Habitica/res/values/strings.xml              | 10 +++++-----
 Habitica/res/values/styles.xml               |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
index 4e57771ee..c0868371a 100644
--- a/Habitica/res/layout/subscription_details.xml
+++ b/Habitica/res/layout/subscription_details.xml
@@ -174,7 +174,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/calendar_icon"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="6dp"
+                android:layout_marginTop="8dp"
                 android:text="@string/months_subscribed" />
 
             <TextView
@@ -326,12 +326,11 @@
 
         <Button
             android:id="@+id/change_subscription_button"
-            style="@style/HabiticaButton.Purple"
+            style="@style/HabiticaButton.Yellow"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginTop="@dimen/spacing_medium"
-            android:text="@string/visit_website" />
+            android:layout_marginTop="@dimen/spacing_medium"/>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 523c6c827..553e10ee4 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -305,7 +305,7 @@
     <string name="share_levelup">I got to level %d in #Habitica by improving my real-life habits!</string>
     <string name="share_hatched">I just hatched a %1$s %2$s pet in #Habitica by completing my real-life tasks!</string>
     <string name="share_raised">I just gained a %1$s mount in #Habitica by completing my real-life tasks!</string>
-    <string name="open_in_store">Open in play store</string>
+    <string name="open_in_store">Open Play Store</string>
     <string name="change_class_confirmation">Are you sure you want to change your class? This will cost 3 gems.</string>
     <string name="change_class_equipment_warning">Warning: You will no longer be able to buy equipment from the %s class.</string>
     <string name="confirm">Confirm</string>
@@ -364,7 +364,7 @@
     <string name="belongs_to_challenge">Belongs to Challenge</string>
     <string name="has_reminder">Has Reminder</string>
     <string name="has_tag">Has Tag</string>
-    <string name="subscribe_title">Subscribing supports the developers and helps keep Habitica running</string>
+    <string name="subscribe_title">Subscribing supports our small team and help keeps Habitica running, thank you!</string>
     <string name="subscribe_prompt">Become a subscriber to receive these exclusive benefits!</string>
     <string name="subscribe_listitem1">Gold for Gems</string>
     <string name="subscribe_listitem2">Mystic Hourglasses</string>
@@ -392,14 +392,14 @@
     <string name="active">Active</string>
     <string name="due">Due</string>
     <string name="cancel_subscription">Cancel Subscription</string>
-    <string name="cancel_subscription_google_description">No longer want to subscribe? You can find the option to unsubscribe in the “My Apps” section of the Google Play Store. Any months of subscription credit will be applied after your subscription has ended.</string>
+    <string name="cancel_subscription_google_description">You can cancel your subscription from the Google Play Store app. Any months of Subscription credit will be applied after your recurring Subscription has ended.</string>
     <string name="cancel_subscription_notgoogle_description">No longer want to subscribe? Due to constraints on mobile payments, you\'ll need to cancel via our website. To do this, tap the button below, log in to your account, tap the User icon in the top right, then go to Subscription. Any months of subscription credit will be applied after your subscription has ended. We\'ll miss you!</string>
     <string name="visit_habitica_website">Visit Habitica Website</string>
     <string name="current_bonuses">Current Bonuses</string>
-    <string name="months_subscribed">Months subscribed</string>
+    <string name="months_subscribed">Months Subscribed</string>
     <string name="current_hourclasses">Current Mystic Hourglasses</string>
     <string name="next_hourglass">Next Hourglass delivery</string>
-    <string name="monthly_gem_cap">Monthly gem cap</string>
+    <string name="monthly_gem_cap">Monthly Gem Cap</string>
     <string name="inactive">Inactive</string>
     <string name="one_month">1 Month</string>
     <string name="x_months">%d Months</string>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index c43540263..599ae83dd 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -561,7 +561,7 @@
 
     <style name="subscriptionBoxCompactText">
         <item name="android:fontFamily">sans-serif-black</item>
-        <item name="android:textSize">12sp</item>
+        <item name="android:textSize">14sp</item>
     </style>
 
     <style name="subscriptionBoxCompactTitle">

From c500630746cd1285d4ca17aab1acdcd52afc3d9e Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Tue, 13 Sep 2022 16:10:15 -0400
Subject: [PATCH 4/4] fancy hourglass icons added

---
 Habitica/res/drawable/hourglass_fancy_left.png  | Bin 0 -> 5020 bytes
 Habitica/res/drawable/hourglass_fancy_right.png | Bin 0 -> 4826 bytes
 Habitica/res/layout/subscription_details.xml    |   5 +++--
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 Habitica/res/drawable/hourglass_fancy_left.png
 create mode 100644 Habitica/res/drawable/hourglass_fancy_right.png

diff --git a/Habitica/res/drawable/hourglass_fancy_left.png b/Habitica/res/drawable/hourglass_fancy_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce840e5de7f8956d6b49f05f330da0ad37e989cd
GIT binary patch
literal 5020
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

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable/hourglass_fancy_right.png b/Habitica/res/drawable/hourglass_fancy_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..20a5a97b4ace9938e999c7209b6ef1591401d556
GIT binary patch
literal 4826
zcmV<05+&`4P)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010000`
zpaTE|000010000`000005-4tU000tANkl<ZcmeHP3v?F8b-pvZ|6Bh<4<tYcBq5B9
zF;Gl^5;q9f_OTnM!EP+@Ikv&A>yxxiEBCZ%`ZVrw+{8(1B_wH1+Y{r)CoysxJE@(f
z2}aNu{5UwFU_gM-0}y&4B>nHl?oRLBU;F?2KZGRoOJK|#qnVwZxpU{+JNMqXGrs{o
zB5CKNfgLk3RX!6$uQi%Gw+9+DP@bZ^(7b&l0JOW{86kxr5(<5}&;YVR6TFt_k;E0x
z<zKE{Ev@VA_Cwb(KX_af2cjYPo6qlZ?<)ka*R2GS&a>K~wWN}*lWhP?*ScWIs!~wY
z*vCPL)<WsT>lVPz|GRrfJPMn7+SCI|3?MWtLGPIuMEvXkFt&-_7eWF*5;R`=V(6Wp
z><o*4{lmapg`V(rD}iR9hWoTHo;#)j={|G)jq(%_D3s2d!jLzb-aud$5V&Ujz!y3@
z?H)0=LIqJF6wM<^))7V1h9h!s&to+;(OJM|QbSxb0DiwCSRo1dHU?si5aKrEzB1no
z7-J(`Q~u;LOWeouy`SwmdA0{MkN47P;jv2byM?CQ2O3)rpn)(q$WumeeJYc`fUmaY
zc|Ge@S49F_PREuBE*=${*1#BC(MJ@ZZr@tx{$SP-%Np>Cn9rgy>BpAN_$r|&j|--*
zCs9N2E}J9{+->0&34jL@T0E|SYII=0w_y3I131AH40flNx10=D3JLxKscg6$r6QSI
zDxAz+?vRT-R&d%SW;NP(2eiS%L-AhYSqM<LJ@H$ORo+WR-POovR03OtkS}&bAHm5!
z4j^z#pPOtFNDEz(ugWbKyDiL_+ag)Bpoo_o9fp2YLq&;+mcAC1AHd?jC0ksbzcU74
zOJ{KIKu7dz82PBrH#G#yR$pwHGuOe3IfJ|_K~)4ua`KhLK&o}izSE;hTH+YH?`i{>
zm+^cPo=V-z9l@1MNMA+pO0xSAaLY?973B`ei&B{}emttd-tTww13zu&XFD%IG!|s*
zZ(pN5`R#SO?h7d*y61fCl$j=q_5GXcoafASvso^<1h$-xY}8co6<{KRHW`FvK1+GE
zTbh%UxU|C(7z8-EpYe`^5+4}wu)edy1fGsV+mTKLd7WN%$;|Gya$6v-VSp-`(4+o1
zmR>fVXFJcB<a7uBVS8+O0@Q!N8E4QfwQ<L7b1aJ-a@r`+ScC1rKKL2q=l>7k7RhDo
zahAdAo9=;qhhM@L=&YzI!>hA5-^tx4O#ou$di?j{2e7qO$O91h5>6&%Icdg=JyOZC
zVoRl2&kdht@cyeHT{s4L!)Y$N7i7tT(c?IjmSt*z5*v3R*^5M*67EdOlBKKjH$zgU
z!$R-;K%E3~#`bHePcEzX$@2}m8Vb{)R~SFJ7dW|rMtyd!VMA3@^y*E&bF*%BjW#l8
znV@UJZoIo1c_uT{-~gSF^VmIMCV_sO#r%Bab;jHFf^<3XsQpN20PT+k#ojV;&-UsJ
z0LiH~)5Nck*F7?~naOenGt(KUv77~QJ^hcF#u>jlgo2i`7F8>SuvjPD?t(vrRt3|i
zA6u6J9@QlX*;z=RUH{+JlNqL90McMW;=9d*266j!F{%cPy3%S8o1YQN@_Rw8xCt~@
zaegpk@h~_Y?i}eOI{vtb81yK|uhVXRE=0Mhq16{pX!|Iih+e^TAPuy&+IC`hdkFWZ
z6j@28PQQAw%+5W=vjbULeScbtqJDth6O0{y6ZlY9a(Pyj-wgE|ydq26=_E$tS_Xiq
zO-~xM3zhqW;U)oM5#>m8$K~i2R03%rCP^7C#f7jM9FB>kQ<sMmJ3?EtPKZzbl~C{g
zQ=wF^721X^9`)hBt<Usdu&;vmGkQY;Ax|ew<8A4u>6e~;^xaYv>n04Fk$5*vB!vYB
zu(sOvCc@Znp30F+i3|9g(uL-C=JMQn5TAG))D@q^=wKcjeJ-dCDMCxrVJsxY1Bc8s
zrdy82;(v+K=T$`<85Z6#DIAw<!2w*uSb}r*b@PZLF)fOF*gkXJRLh8(hBVM9nUi>}
z@s{#&rQ6(cGG&rB*}|Skw#BH0K&N5?DJ(dEH28zH_MhPrIBaJ6_^>kA;a3ODbyF$#
zg|*R$;T%#&1}fu@A54YD<=PT>F*Ux^iaQ-@=P9wFFB;ROa5NBV9&ahn2!O-@m!z*!
z%#O-NI(jM5cl=VKM-|DClu<vK9IbgMqn&_XG}f?bNj1?UV19Sa8$0}gaF^A=AEvtE
zayv9UPy^mMDK~Z-y{C5BK<3djM4~Y12d5(qoMT`Cqf%yy6ga)LRGvS_!9B>pq<DCL
zAklR`teOl6+qtFA@uHdTRLTT|uHVRDpsp*M?|{X(`ru=C&4<CBFtV&*C{2Q%_7EI;
zvlqhtq%2_MZ4^0f_7pjroA+%RnH2L=VJy3COGorBJo}(Ma*njyBrYv-b6=%PD)w9^
zm`XH{UQ*6=_?6)_efG=7#rDtQUU<rmH95)T=aH*owM#m1o|5Dip7J?WF5DAnaPE{J
zP9M1hp-}~5VHN+G>=&?ZtA#hrIDj<amiEXUIP_nmM#dOm{zMU*Rb`f{A`8pAx9y8)
z!|(RTGva<2z&VZpzRaw)*2XH9=^y4FCRLj)fljvtd}TIRd-pu}`O97KYYk=a-ku(a
z1U3Bf5(O>vzOycY2FI^=i{fBB@&)AME~73xmoaAeiFvl#e4%}^!mT~=Q*^kL-4CBJ
zEGSx;Wckm=8f%8}%F{NZ$_(U!B}LxVo94og{^c~#k|sma@xh4RJ{vfL$dn}TpSMS<
zKex-#Wpuuh{FV0b2K3|}WSspvTI!sg5K5r+j!N52$XL#jAB}0@U-ZX2jB}BE<D;bf
z*ygc6|LHj_wS~;rF1t=Q4mRc64G%1Q$N<n{#XE&vx|j5#*X?Q|otND&hso>)#xq@)
zO{mH)<M~SS2kV>%w=8i!Y2o&JP*XpL|GLbyf(a4t4Qn}!QX8+0J2%d^)%t9F+z1SQ
zl;4hyMqg<;6S>_?ccQWmPE7uTk%3s)XgfL-LwmtS#{-YrO&UO<;+{~z#zNh6zrTi!
zAdoGMb&f`4@_mD8%KLHqXMQ%9-7<4-oM*e~H|E)DYTQyWEqn9(WLcD<f%r$#y}9qk
zuOSeF{>1mFMLecKIDn2cTHJh+XHdyAxbZ5T6KI;MZsh2U=s>1lO}j)^lyR}gOem&`
zq|Y!`*?y3*?qA|mQc1898*{HHwN%|(WncEOa_a(z#52_ax=xx9&rVem@qW(Vk<<l8
z;=1&ayOJ6<PhnC35@_LA031GjYf~^OH2BdpvD7G2Zk1TdZw%t*?cgqu_kV}UKYfl#
zqdg`Zu`M1Ia6Bg|xuepulqAwjht7_1Nk50KR0e%>o9y!EzP56Jqz(_pCX_zvJ0XDj
zlEtNqM-&i>jq2kSQVQvU5psHuc_O7YDRsbpu`?Z37-$Fn<EKIXc{7tb-ewHHX)0l;
zUm}UTrPxxDs!SFzge(3$tM0OoBy}i--4jV45t$G`1FWJF2BAO*j~j7ERX|;6Wzh$a
zkCg96I<3;hON<%zpE5698X8#dao}&g0CLNpF?sJ!Ceb04k?Oos#nNKA%y_08rEpbC
zdobf8ncruZN#~K1d^z1`^tmj6hV;37xE8EQCIg{i{k*~e)*y5xc`LdxxGmml?py1T
z$uQ_kSV51k>%H+mG987UKMMSfFM-^CAT6o&Udy~<o0R$}N&3<sw;U50Cx+&6v&-Lk
z=iaXDx_r-h0eoS*@adPbHF&MOhQsnZWT?71IX1T{;4DkvJ`py4<B`C==~(6d_V5Z6
zs0?YTE|TULjN$<lN2ek!Ud9Vku3>QdQlOu``t^1x7BO~pf~_c#DoxE$az#0_$L==Q
z6{4JBxd^zR7HkSC!6s)h^H#5tz~$p$E5cv;)VSb6rwvV;2Rt4pkfRV75*vd<q7{MM
zk7|F%RDV9jIj_g%m6}I|gBKZx?^JzaPrjgjvUxCa3A+1^LeJ1CNZ>DN7&cX6zYjJ?
zQYO$>bj^24Zj6YhG$ls(wqWnqQv(*DpaW<IPO^e`!7UP$S98GK0=P>Vkp82?wL2fK
zg0qJKhR!1^3Ik6W1E*KOXuq~G8iXkWi6GUR=TMCMVdEL~9E<pKr7s!}!O3&)K+j+s
zNtMwYR;{^JxO^G%0JR>e%nTqlzq#d1?AFG`wxg+z(=5o}d_<SH9mtBl(Wk@jkzNfF
zxHTuws&oMdP30il5JaB92t^pqpNs+NCrSje-QoaQ#wCu%1wA+&NQ)$IpLp9RmL#bp
z|9Y%x00-LBI?ZU)g%a0x_CV^;-Kei9pD&*L#`>Hylu|o)(`BYWLZt4}fY7C|U;uKL
z<l2R58qGH7K8g-tpMZfb{AEv2z+jgK7fz`tZRADE(AyE$!K3NftTu4rsgMqyF&hT@
za-JAG>X5latz*W6-i-F8Z*IkvD7@G9UvR8ze-3yH7AzFc?7mO2xiY1XXi!@0kxP@M
z<X?2I?|ijW_{??FDa()TVzlqvfy=m=^dH8GF~A7k1jaWAJhH$GmdOwv#bq1kFt^$X
zgJ;o8SM0!PYht7^;HIJnahw=_hg330s*Qa`1aE1*d*VkBikd=!*aO`@v7uqL_@m~v
zYObuNNYWz5|I!KD$_X{R7;7@NkLeauE2Tc$ctD0m1a$sN1*?;xf@WZmZ0O!wKp6J>
z3V<_MMDWr}3oG$HrC~<F;blTm6Y%!&A3`K%3PfYO%F2b}iKlN@>eps$JPfj_oX%kA
z7$H@m7uaYt<S5utXbM1MkPIM|P%|p(Z38HY3zrKWKr|TW2jb$RB`?F~sYskLMk;4)
zNGCQ{fv0yN+?MI6RMZL4cJ^QjJhZZ+rnVM7wQYsEVe`BUsY=lsE8vGv4qr^1>j|YT
zu+au>;om>Hl4YK+7%#6N&jHY&K|tcNCYNS20_Ht`LIoFEW3;x(gnDyY;2{+z*t>|t
zoyM5GAuX_MOsE#D0Aa_|*&0VJtlUto{pLf}TKS@skv6*I<QNJYK02iIW}M)Swc;GU
z@?foFe@>@qRG3vzUNYoRqp$i@5xO%K=v1FMr0UXFBo|eWNo(GIlc}V8)I#MMei;T+
zm!RdG7^$oQMq(m#d?e8~7}4@cR}@d`pL%Gq0}uTRn+#1hF4ZDlq+94P>cZ|LW1a#^
z-*myF0UK+I`cSENm<R9jXCI!M-{zKwqFUhX{`i^wy|FX-z{7A^ALIP@W&%9oW<mgU
zpb#)}Z^-u}-AAD2PUXsKRH6OE-1BTu43iEs*JYQZD#SbeTL0b)@wT`6;++F|qz+XB
zZgSXvfZM*cvDRMj3rGe}<LW@80p$c3xj4v_mwd)TNS{I9E+t-ztF|ZbS>J5a-IsF#
zb-2cp-V@^)isr{#S%WBT{ShsQQkM$58+5YrQvm9-TbIoIPr)YCfd*q^!G)$m=sts{
zk?%eec?#v_Q^qr$7nj<Yll;OEo{<C<4I{Y|C;Y(e66fFjOpR?1MY<>MG5r>kl0X`U
zq%b5xBZZVcgMFOzZoG}30x+g(>V+_*f&fOl@p1&~FnW;RYpk>XFP0I<*-Mj_z?o)g
z_vy%Y(XYYq*5nex)GIiD!zQ#huB#u~Om6zQtprp4i81+GxRmK<47myK0%Dl`R|xX^
z8s~=^7g^h8TiSA&(v51q>Z?;n=Oei5u0zQx=71Z1O$(x=^@GLL2h}jx$XHIq<?3*H
zW7Hc6+(6(40yhwtH3V8;71gsg*enk;;a+&U{2+KfJdxN(`E+Sri~VODK)epwq{g*H
zlwXSgOqZt_-HDLY;i*Y?=#uKeLkz#&#}{q7Uq6GHF5lNo{~41&ed)%b*@ib|X||z@
zst14k(|o-x<$_Bf0YuByQ3Ox=%D_Xv*w>Fm@o<s;7do*B_!Dt>o?D^$dXUC~0*K&M
zlfiI#VUcs}K0clNTDXP>^LX?0EZzp!&s1<&#=4me8W6;;Yi2!O0V4%n!UP6_vMT6@
zr-%E&AI8&22j2AaRwS>9xZEg(ocjf5PgA=OJ9vb5K_$@q0Sz5Ew;HzLO)k71ht}jc
zyomqbj;8Bj=^AsLF#u@*0?}rLZg(+w0>j{s#o>k(Hjtl8PLdW0!t-Igbwl~}BzeaC
z3#tPRqUM~eZD<s_DL2>OC{F<avd&Xz{-J96|DfVlS1yyfWB>pF07*qoM6N<$g13z?
A#{d8T

literal 0
HcmV?d00001

diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
index c0868371a..d6198d575 100644
--- a/Habitica/res/layout/subscription_details.xml
+++ b/Habitica/res/layout/subscription_details.xml
@@ -243,7 +243,7 @@
                 android:layout_height="60dp"
                 android:layout_centerVertical="true"
                 android:layout_marginStart="16dp"
-                android:src="@drawable/sub_benefits_hourglasses" />
+                android:src="@drawable/hourglass_fancy_left" />
 
             <ImageView
                 android:layout_width="60dp"
@@ -251,7 +251,8 @@
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
                 android:layout_marginEnd="16dp"
-                android:src="@drawable/sub_benefits_hourglasses" />
+
+                android:src="@drawable/hourglass_fancy_right" />
 
             <TextView
                 android:id="@+id/next_hourglass_textview"