Proton/protoncore_android
1
0
Fork 0
mirror of https://github.com/ProtonMail/protoncore_android.git synced 2026-05-15 09:50:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(plan): Add support for additional plans. Default current plan layout.

Browse Source
This commit is contained in:
dkadrikj
2023-07-27 14:56:58 +02:00
committed by Dino Kadrikj
parent 20def25967
commit 9f2d1cda01
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plan/presentation/src/main/kotlin/me/proton/core/plan/presentation/view/PlanItemView.kt
+9 -6
View File
@@ -68,16 +68,19 @@ class PlanItemView @JvmOverloads constructor(
private val mappedFreePlanLayouts by lazy { context.getStringArrayByName(R.array.plan_mapping_free_plan_layouts) }
private val mappedPaidPlanLayouts by lazy { context.getStringArrayByName(R.array.plan_mapping_paid_plan_layouts) }
private fun getMappedLayout(plan: PlanDetailsItem, mappedPlanLayouts: Array<String>?): String {
val indexOfPlanName = mappedPlanIds?.indexOf(plan.name) ?: return "plan_id_${plan.name}"
return mappedPlanLayouts?.getOrNull(indexOfPlanName) ?: "plan_id_${plan.name}"
private fun getMappedLayout(planName: String, mappedPlanLayouts: Array<String>?, defaultLayout: String): String {
val indexOfPlanName = mappedPlanIds?.indexOf(planName) ?: return defaultLayout
return mappedPlanLayouts?.getOrNull(indexOfPlanName) ?: defaultLayout
}
private fun getCurrentLayout(plan: PlanDetailsItem) = getMappedLayout(plan, mappedCurrentPlanLayouts)
private fun getCurrentLayout(plan: PlanDetailsItem) =
getMappedLayout(plan.name, mappedCurrentPlanLayouts, "plan_current")
private fun getFreeLayout(plan: PlanDetailsItem) = getMappedLayout(plan, mappedFreePlanLayouts)
private fun getFreeLayout(plan: PlanDetailsItem) =
getMappedLayout(plan.name, mappedFreePlanLayouts, "plan_id_${plan.name}")
private fun getPaidLayout(plan: PlanDetailsItem) = getMappedLayout(plan, mappedPaidPlanLayouts)
private fun getPaidLayout(plan: PlanDetailsItem) =
getMappedLayout(plan.name, mappedPaidPlanLayouts, "plan_id_${plan.name}")
/**
* Sets plans data and binds to according plan item UIs.
plan/presentation/src/main/res/values/plans_mapping.xml
+22
View File
@@ -30,6 +30,11 @@
<item>bundle2022</item>
<item>pass2023</item>
<item>family2022</item>
<item>mailpro2022</item>
<item>bundlepro2022</item>
<item>enterprise2022</item>
<item>vpnpro2023</item>
<item>vpnbiz2023</item>
</string-array>
<!-- region current plan mapping -->
<string-array name="plan_mapping_current_plan_layouts">
@@ -45,6 +50,11 @@
<item>plan_current</item>
<item>plan_current</item>
<item>plan_current</item>
<item>plan_current</item>
<item>plan_current</item>
<item>plan_current</item>
<item>plan_current</item>
<item>plan_current</item>
</string-array>
<!-- endregion -->
<!-- region free plan mapping -->
@@ -61,6 +71,12 @@
<item>plan_id_bundle2022</item>
<item>plan_id_pass2023</item>
<item>plan_id_family2022</item>
<item>plan_id_mailpro2022</item>
<item>plan_id_bundlepro2022</item>
<item>plan_id_enterprise2022</item>
<item>plan_id_vpnpro2023</item>
<item>plan_id_vpnbiz2023</item>
</string-array>
<!-- endregion -->
<!-- region paid plan mapping -->
@@ -77,6 +93,12 @@
<item>plan_id_bundle2022</item>
<item>plan_id_pass2023</item>
<item>plan_id_family2022</item>
<item>plan_id_mailpro2022</item>
<item>plan_id_bundlepro2022</item>
<item>plan_id_enterprise2022</item>
<item>plan_id_vpnpro2023</item>
<item>plan_id_vpnbiz2023</item>
</string-array>
<!-- endregion -->