diff --git a/assets/langs/en.yaml b/assets/langs/en.yaml index 3f51a752..9f210e0c 100644 --- a/assets/langs/en.yaml +++ b/assets/langs/en.yaml @@ -255,5 +255,5 @@ purchase_screen: desc: 'GitJournal is completely open source and is the result of significant development work. It has no venture capital or corporation backing. Your support directly sustains development. -GitJournal operates on a "pay what you want model (with a minimum)". No matter what you pay you will get access to all the Pro features.' +GitJournal operates on a "pay what you want model (with a minimum)".' restore: Restore Purchase diff --git a/lib/screens/purchase_screen.dart b/lib/screens/purchase_screen.dart index bf474104..cbcc719b 100644 --- a/lib/screens/purchase_screen.dart +++ b/lib/screens/purchase_screen.dart @@ -35,11 +35,11 @@ class PurchaseScreen extends StatelessWidget { const SizedBox(height: 32.0), PurchaseCards( children: [ - const SizedBox(width: 16.0), - const MonthlyRentalWidget(), const SizedBox(width: 16.0), const YearlyPurchaseWidget(), const SizedBox(width: 16.0), + const MonthlyRentalWidget(), + const SizedBox(width: 16.0), ], ), const SizedBox(height: 32.0), @@ -96,7 +96,9 @@ class MonthlyRentalWidget extends StatelessWidget { child: Column( children: [ // TODO: Translate this - Text("Monthly Rental", style: textTheme.headline5), + Text("One Time Purchase", style: textTheme.headline5), + const SizedBox(height: 8.0), + Text("Paid Monthly", style: textTheme.subtitle1), const SizedBox(height: 32.0), PurchaseWidget( skus: _generateSkus(), @@ -106,7 +108,7 @@ class MonthlyRentalWidget extends StatelessWidget { ), const SizedBox(height: 32.0), const Text( - "After 12 months of rental or after paying the min yearly amount, you will automatically get all the benefits of a Yearly Purchase."), + "After 12 months or after paying the minimum 'One Time Purchase' amount, you will get all the benefits of a standard 'One Time Purchase'"), ], mainAxisAlignment: MainAxisAlignment.start, ), @@ -134,17 +136,18 @@ class YearlyPurchaseWidget extends StatelessWidget { return PurchaseCard( child: Column( children: [ - Text("Yearly Purchase", style: textTheme.headline5), + Text("One Time Purchase", style: textTheme.headline5), + const Spacer(), const SizedBox(height: 32.0), PurchaseWidget( skus: _generateSkus(), - defaultSku: "sku_sub_yearly_1", + defaultSku: "sku_yearly_1", timePeriod: "Year", isSubscription: false, ), const SizedBox(height: 32.0), const Text( - "Enables all Pro features currently in GitJournal and new features added in the following 12 months. These features will be yours forever.") + "Permanently enable all Pro features currently in GitJournal and new features added in the following 12 months."), ], mainAxisAlignment: MainAxisAlignment.start, ), @@ -154,7 +157,7 @@ class YearlyPurchaseWidget extends StatelessWidget { Set _generateSkus() { var list = {}; for (var i = 0; i <= 20; i++) { - list.add("sku_sub_yearly_$i"); + list.add("sku_yearly_$i"); } return list; } diff --git a/lib/widgets/purchase_widget.dart b/lib/widgets/purchase_widget.dart index 76fcc8df..05ffa481 100644 --- a/lib/widgets/purchase_widget.dart +++ b/lib/widgets/purchase_widget.dart @@ -26,8 +26,8 @@ class PurchaseButton extends StatelessWidget { return RaisedButton( child: subscription - ? Text('Subscribe for $price / $timePeriod') - : Text('Purchase for $price / $timePeriod'), + ? Text('Purchase for $price / $timePeriod') + : Text('Purchase for $price'), color: Theme.of(context).primaryColor, padding: const EdgeInsets.fromLTRB(32.0, 16.0, 32.0, 16.0), onPressed: product != null ? () => _initPurchase(context) : null, diff --git a/pubspec.lock b/pubspec.lock index 78f6d5b6..91d60c81 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -445,7 +445,7 @@ packages: name: in_app_purchase url: "https://pub.dartlang.org" source: hosted - version: "0.3.4+1" + version: "0.3.4+5" intl: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index ff099ca6..c66034fd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,7 +54,7 @@ dependencies: easy_localization_loader: ^0.0.2 quick_actions: ^0.4.0+5 receive_sharing_intent: ^1.4.0+2 - in_app_purchase: ^0.3.4+1 + in_app_purchase: ^0.3.4+5 flutter_plugin_android_lifecycle: ^1.0.8 # for fixing the build dev_dependencies: