anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-2595 Membership | Fix | Active tier state (#1392)

Browse source
This commit is contained in:
Konstantin Ivanov 2024-07-12 09:33:12 +02:00 • committed by konstantiniiv
parent 7b3ddd992f
commit a8be6f3e93
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
payments/src/main/java/com/anytypeio/anytype/payments/mapping/MembershipExt.kt
View file

@ -219,13 +219,13 @@ private fun MembershipTierData.mapActiveTierButtonAndNameStates(
) {
TierButton.Manage.Android.Enabled(androidProductId) to TierAnyName.Hidden
} else {
TierButton.Manage.Android.Disabled to TierAnyName.Hidden
TierButton.HiddenWithText.ManageOnAnotherAccount to TierAnyName.Hidden
}
}
else -> TierButton.Manage.Android.Disabled to TierAnyName.Hidden
else -> TierButton.HiddenWithText.ManageOnAnotherAccount to TierAnyName.Hidden
}
} else {
TierButton.Manage.Android.Disabled to TierAnyName.Hidden
TierButton.HiddenWithText.ManageOnAnotherAccount to TierAnyName.Hidden
}
}

1
payments/src/main/java/com/anytypeio/anytype/payments/models/MembershipModels.kt
View file

@ -64,6 +64,7 @@ sealed class TierButton {
data object MoreThenOnePurchase : HiddenWithText()
data object ManageOnDesktop : HiddenWithText()
data object ManageOnIOS : HiddenWithText()
data object ManageOnAnotherAccount : HiddenWithText()
}
sealed class Submit : TierButton() {
data object Enabled : Submit()

5
payments/src/main/java/com/anytypeio/anytype/payments/screens/TierScreen.kt
View file

@ -379,6 +379,10 @@ private fun SecondaryButton(
val text = stringResource(id = R.string.membership_manage_tier_ios)
SupportText(text = text)
}
TierButton.HiddenWithText.ManageOnAnotherAccount -> {
val text = stringResource(id = R.string.membership_manage_tier_another_account)
SupportText(text = text)
}
else -> {
val (stringRes, enabled) = getButtonText(buttonState)
ButtonSecondary(
@ -421,6 +425,7 @@ private fun getButtonText(buttonState: TierButton): Pair<Int, Boolean> {
TierButton.HiddenWithText.MoreThenOnePurchase -> Pair(0, false)
TierButton.HiddenWithText.ManageOnDesktop -> Pair(0, false)
TierButton.HiddenWithText.ManageOnIOS -> Pair(0, false)
TierButton.HiddenWithText.ManageOnAnotherAccount -> Pair(0, false)
}
}

4
payments/src/test/java/com/anytypeio/anytype/payments/TierAndroidActiveTests.kt
View file

@ -136,7 +136,7 @@ class TierAndroidActiveTests : MembershipTestsSetup() {
period = validPeriod
),
expectedAnyName = TierAnyName.Hidden,
expectedButtonState = TierButton.Manage.Android.Disabled,
expectedButtonState = TierButton.HiddenWithText.ManageOnAnotherAccount,
tier = result.tier,
expectedEmailState = TierEmail.Hidden
)
@ -193,7 +193,7 @@ class TierAndroidActiveTests : MembershipTestsSetup() {
period = validPeriod
),
expectedAnyName = TierAnyName.Hidden,
expectedButtonState = TierButton.Manage.Android.Disabled,
expectedButtonState = TierButton.HiddenWithText.ManageOnAnotherAccount,
tier = result.tier,
expectedEmailState = TierEmail.Hidden
)