dan9i10/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-05-08 14:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: minor fixes (#2477)

Browse Source
This commit is contained in:
vkamn
2026-04-14 16:27:46 +08:00
committed by GitHub
parent ebe3a5dac6
commit 4c18ceaa50
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/ui/models/api/apiServicesModel.cpp
View File

@@ -91,6 +91,12 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
} }
return true; return true;
} }
case IsPremiumRole: {
return serviceType == serviceType::amneziaPremium;
}
case HasSubscriptionPlansRole: {
return !apiServiceData.subscriptionPlansJson.isEmpty();
}
case PriceRole: { case PriceRole: {
return apiServiceData.minPriceLabel; return apiServiceData.minPriceLabel;
} }
@@ -233,6 +239,8 @@ QHash<int, QByteArray> ApiServicesModel::roleNames() const
roles[CardDescriptionRole] = "cardDescription"; roles[CardDescriptionRole] = "cardDescription";
roles[ServiceDescriptionRole] = "serviceDescription"; roles[ServiceDescriptionRole] = "serviceDescription";
roles[IsServiceAvailableRole] = "isServiceAvailable"; roles[IsServiceAvailableRole] = "isServiceAvailable";
roles[IsPremiumRole] = "isPremium";
roles[HasSubscriptionPlansRole] = "hasSubscriptionPlans";
roles[PriceRole] = "price"; roles[PriceRole] = "price";
roles[EndDateRole] = "endDate"; roles[EndDateRole] = "endDate";
roles[TermsOfUseUrlRole] = "termsOfUseUrl"; roles[TermsOfUseUrlRole] = "termsOfUseUrl";

2
client/ui/models/api/apiServicesModel.h
View File

@@ -54,6 +54,8 @@ public:
CardDescriptionRole, CardDescriptionRole,
ServiceDescriptionRole, ServiceDescriptionRole,
IsServiceAvailableRole, IsServiceAvailableRole,
IsPremiumRole,
HasSubscriptionPlansRole,
PriceRole, PriceRole,
EndDateRole, EndDateRole,
TermsOfUseUrlRole, TermsOfUseUrlRole,

3
client/ui/qml/Pages2/PageSetupWizardApiServicesList.qml
View File

@@ -67,8 +67,11 @@ PageType {
} }
delegate: ColumnLayout { delegate: ColumnLayout {
property bool hideCard: isPremium && !hasSubscriptionPlans
width: listView.width width: listView.width
visible: !hideCard
height: hideCard ? 0 : implicitHeight
enabled: isServiceAvailable enabled: isServiceAvailable