sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle basic monthly subscription user receive hourglass on four month

Browse source
This commit is contained in:
Hafiz 2022-05-15 14:13:03 -04:00
parent e756b48c78
commit b4655d5f73
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/res/values/strings.xml
View file

@ -432,7 +432,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</string>
<string name="monthly_gem_cap">Monthly gem cap</string>
<string name="inactive">Inactive</string>
<string name="one_month">1 Month</string>

17
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
View file

@ -4,8 +4,6 @@ import android.content.Context
import android.content.Intent
import android.graphics.drawable.BitmapDrawable
import android.net.Uri
import android.text.format.DateUtils
import android.text.format.DateUtils.getRelativeTimeSpanString
import android.util.AttributeSet
import android.view.View
import android.widget.LinearLayout
@ -15,7 +13,6 @@ import com.habitrpg.android.habitica.extensions.layoutInflater
import com.habitrpg.android.habitica.models.user.SubscriptionPlan
import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
import java.text.DateFormat
import java.time.Instant
import java.time.LocalDate
import java.time.format.DateTimeFormatter
import java.util.*
@ -50,21 +47,23 @@ class SubscriptionDetailsView : LinearLayout {
updateSubscriptionStatusPill(plan)
var duration: String? = null
var subscriptionRenewalDuration = 3
var renewalUntilNextHourglass = 3
if (plan.planId != null && plan.dateTerminated == null) {
if (plan.planId == SubscriptionPlan.PLANID_BASIC || plan.planId == SubscriptionPlan.PLANID_BASICEARNED) {
duration = resources.getString(R.string.month)
subscriptionRenewalDuration = 3;
renewalUntilNextHourglass = 3;
//If user has a initial basic monthly subscription, receive hourglasses on fourth month
plan.consecutive?.count.let { if (it!! < 3) { renewalUntilNextHourglass + 1 } }
} else if (plan.planId == SubscriptionPlan.PLANID_BASIC3MONTH) {
duration = resources.getString(R.string.three_months)
subscriptionRenewalDuration = 3;
renewalUntilNextHourglass = 3;
} else if (plan.planId == SubscriptionPlan.PLANID_BASIC6MONTH || plan.planId == SubscriptionPlan.PLANID_GOOGLE6MONTH) {
duration = resources.getString(R.string.six_months)
subscriptionRenewalDuration = 6;
renewalUntilNextHourglass = 6;
} else if (plan.planId == SubscriptionPlan.PLANID_BASIC12MONTH) {
duration = resources.getString(R.string.twelve_months)
subscriptionRenewalDuration = 12;
renewalUntilNextHourglass = 12;
}
}
@ -110,7 +109,7 @@ class SubscriptionDetailsView : LinearLayout {
binding.gemCapTextView.text = plan.totalNumberOfGems.toString()
if (plan.consecutive?.count != null) {
val monthsTillNextHourglass = subscriptionRenewalDuration - (plan.consecutive?.count!! % subscriptionRenewalDuration)
val monthsTillNextHourglass = renewalUntilNextHourglass - (plan.consecutive?.count!! % renewalUntilNextHourglass)
val nextHourglassMonth = LocalDate.now().plusMonths(monthsTillNextHourglass.toLong())
val nextHourGlassMonthString = nextHourglassMonth.format(DateTimeFormatter.ofPattern("MMM"));
binding.nextHourglassTextView.text = nextHourGlassMonthString