From c263d27e7c59e13224d306ed3c9b80bdfc43e658 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 14 Dec 2022 15:45:07 +0100
Subject: [PATCH] correct hourglass calculation

---
 Habitica/res/layout/subscription_details.xml  |  6 +++---
 .../habitica/models/user/SubscriptionPlan.kt  | 21 +++++++++++++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
index 1b8aebf3f..db97d2ad0 100644
--- a/Habitica/res/layout/subscription_details.xml
+++ b/Habitica/res/layout/subscription_details.xml
@@ -175,7 +175,7 @@
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="8dp"
                 android:text="@string/months_subscribed"
-                android:textAlignment="center"
+                android:gravity="center"
                 android:fontFamily="sans-serif-medium"/>
 
             <TextView
@@ -221,7 +221,7 @@
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="5dp"
                 android:text="@string/monthly_gem_cap"
-                android:textAlignment="center"
+                android:gravity="center"
                 android:fontFamily="sans-serif-medium" />
 
             <TextView
@@ -239,7 +239,7 @@
             android:id="@+id/next_hourglass_container"
             style="@style/subscriptionBox"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="wrap_content"
             android:layout_below="@id/months_subscribed_layout">
 
             <ImageView
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt
index ea478b96e..f47e7a6f3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.kt
@@ -54,12 +54,25 @@ open class SubscriptionPlan : RealmObject(), BaseObject {
       else receive on third month (subtract 1 from total consecutive count)
      */
 
-    val monthsUntilNextHourglass: Int?
+    val subMonthCount: Int
+    get() {
+        return when (planId) {
+            "basic_earned" -> 1
+            "basic_3mo" -> 3
+            "basic_6mo" -> 6
+            "google_6mo" -> 6
+            "basic_12mo" -> 12
+            "group_plan_auto" -> 1
+            else -> 0
+        }
+    }
+
+    val monthsUntilNextHourglass: Int
         get() {
-            return if (consecutive?.offset == 0) {
-                (3 - (((consecutive?.count ?: 0)) % 3))
+            return if (subMonthCount > 0) {
+                (consecutive?.offset ?: 0) + 1
             } else {
-                consecutive?.offset
+                (3 - (((consecutive?.count ?: 0)) % 3))
             }
         }