mirror of
https://github.com/amnezia-vpn/DefaultVPN.git
synced 2026-05-17 00:26:23 +03:00
* feat: iap for apple now use storekit2 * fix: fixed error 101 on connection event * feat: enhance StoreKit2Helper to handle entitlements and improve restore service from App Store functionality * chore: add isInAppPurchase and isTestPurchase in primary config * refactor: use end_date from primary config for renew ui * fix: hide renew button for free * fix: hide renew button for appstore purchases * feat: add new premium info page * feat: add new free info page * chore: minor fixes * refactor: move plan and benefits into separate models * fix: fixed expired status when configs without an end date * feat: add trial api support * chore: add api message parsing for 422 error * feat: move privacy policy and term of use to gateway * feat: add iap support for new premium info page * chore: minor fixes * chore: minor fix * chore: minor fixes * feat: additional parsing for storekit subscription plans * chore: minor codestyle fixes * chore: simplify benefits * chore: hide extend buttons on external premium * feat: add trial error processing * fix: remove wrong check from tiral handler * chore: cleanup --------- Co-authored-by: spectrum <yyy@amnezia.org>
199 lines
6.2 KiB
QML
199 lines
6.2 KiB
QML
import QtQuick
|
|
import QtQuick.Controls
|
|
import QtQuick.Layouts
|
|
|
|
import Style 1.0
|
|
|
|
import "./"
|
|
import "../Controls2"
|
|
import "../Controls2/TextTypes"
|
|
import "../Config"
|
|
import "../Components"
|
|
import PageEnum 1.0
|
|
|
|
PageType {
|
|
id: root
|
|
|
|
property int selectedPlanIndex: 0
|
|
property string premiumHeaderName: ""
|
|
property string premiumHeaderDescription: ""
|
|
|
|
readonly property var currentPlan: ApiSubscriptionPlansModel.planAt(selectedPlanIndex)
|
|
|
|
function syncFromModel() {
|
|
root.selectedPlanIndex = ApiSubscriptionPlansModel.recommendedRowIndex()
|
|
|
|
root.premiumHeaderName = String(ApiServicesModel.getSelectedServiceData("name"))
|
|
root.premiumHeaderDescription = String(ApiServicesModel.getSelectedServiceData("serviceDescription"))
|
|
}
|
|
|
|
Component.onCompleted: syncFromModel()
|
|
|
|
BackButtonType {
|
|
id: backButton
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: 20 + SettingsController.safeAreaTopMargin
|
|
|
|
onFocusChanged: {
|
|
if (activeFocus) {
|
|
flick.contentY = 0
|
|
}
|
|
}
|
|
}
|
|
|
|
FlickableType {
|
|
id: flick
|
|
|
|
anchors.top: backButton.bottom
|
|
anchors.bottom: continueButton.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
contentHeight: scrollColumn.implicitHeight + 24
|
|
|
|
ColumnLayout {
|
|
id: scrollColumn
|
|
|
|
width: flick.width
|
|
spacing: 0
|
|
|
|
BaseHeaderType {
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 8
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
Layout.bottomMargin: 24
|
|
|
|
headerText: root.premiumHeaderName
|
|
descriptionText: root.premiumHeaderDescription
|
|
}
|
|
|
|
Repeater {
|
|
model: ApiSubscriptionPlansModel
|
|
|
|
delegate: SubscriptionPlanCard {
|
|
required property int index
|
|
required property var model
|
|
|
|
Layout.fillWidth: true
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
Layout.bottomMargin: index === ApiSubscriptionPlansModel.rowCount() - 1 ? 24 : 12
|
|
|
|
selected: root.selectedPlanIndex === index
|
|
billingPeriod: String(model.billingPeriod)
|
|
priceLabel: String(model.priceLabel)
|
|
subtitle: String(model.subtitle)
|
|
showRecommendedBadge: !!model.recommended
|
|
recommendedText: qsTr("Recommended")
|
|
|
|
onSelectRequested: root.selectedPlanIndex = index
|
|
}
|
|
}
|
|
|
|
LabelTextType {
|
|
Layout.fillWidth: true
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
Layout.bottomMargin: 12
|
|
|
|
text: qsTr("Premium features")
|
|
color: AmneziaStyle.color.mutedGray
|
|
font.pixelSize: 13
|
|
}
|
|
|
|
BenefitsPanel {
|
|
Layout.fillWidth: true
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
Layout.bottomMargin: 24
|
|
|
|
benefitsModel: ApiBenefitsModel
|
|
}
|
|
|
|
ColumnLayout {
|
|
Layout.fillWidth: true
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
Layout.bottomMargin: 24
|
|
visible: Qt.platform.os === "ios" || IsMacOsNeBuild
|
|
spacing: 16
|
|
|
|
ParagraphTextType {
|
|
Layout.fillWidth: true
|
|
horizontalAlignment: Text.AlignHCenter
|
|
textFormat: Text.PlainText
|
|
color: AmneziaStyle.color.mutedGray
|
|
font.pixelSize: 12
|
|
|
|
text: qsTr("Charged to your Apple ID at confirmation. Renews automatically unless auto-renew is turned off at least 24 hours before period end. Manage in Apple ID settings.")
|
|
}
|
|
|
|
TermsAndPrivacyText {
|
|
termsUrl: "https://www.apple.com/legal/internet-services/itunes/dev/stdeula/"
|
|
privacyUrl: LanguageModel.getCurrentSiteUrl("policy")
|
|
}
|
|
}
|
|
|
|
TermsAndPrivacyText {
|
|
Layout.fillWidth: true
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
Layout.bottomMargin: 24
|
|
|
|
visible: !(Qt.platform.os === "ios" || IsMacOsNeBuild)
|
|
|
|
termsUrl: String(ApiServicesModel.getSelectedServiceData("termsOfUseUrl"))
|
|
privacyUrl: String(ApiServicesModel.getSelectedServiceData("privacyPolicyUrl"))
|
|
}
|
|
}
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: continueButton
|
|
|
|
z: 2
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.bottom: parent.bottom
|
|
anchors.leftMargin: 16
|
|
anchors.rightMargin: 16
|
|
anchors.bottomMargin: 16 + SettingsController.safeAreaBottomMargin
|
|
|
|
text: {
|
|
var plan = root.currentPlan
|
|
if (!plan) {
|
|
return qsTr("Continue")
|
|
}
|
|
return qsTr("Subscribe — %1 for %2").arg(String(plan.billingPeriod)).arg(String(plan.priceLabel))
|
|
}
|
|
|
|
clickedFunc: function() {
|
|
var plan = root.currentPlan
|
|
if (!plan) {
|
|
return
|
|
}
|
|
if (plan.isTrial) {
|
|
PageController.goToPage(PageEnum.PageSetupWizardApiTrialEmail)
|
|
return
|
|
}
|
|
if (Qt.platform.os === "ios" || IsMacOsNeBuild) {
|
|
PageController.showBusyIndicator(true)
|
|
var storeId = plan.storeProductId !== undefined ? String(plan.storeProductId) : ""
|
|
ApiConfigsController.importPremiumFromAppStore(storeId)
|
|
PageController.showBusyIndicator(false)
|
|
return
|
|
}
|
|
if (plan.checkoutUrl) {
|
|
Qt.openUrlExternally(plan.checkoutUrl)
|
|
PageController.closePage()
|
|
PageController.closePage()
|
|
return
|
|
}
|
|
}
|
|
}
|
|
}
|