Добавление функции оплаты и подготовка к релизу в AppStore

frontend/ios/Podfile.lock

@@ -1,21 +1,38 @@
 PODS:
   - Flutter (1.0.0)
+  - purchases_flutter (5.8.2):
+    - Flutter
+    - PurchasesHybridCommon (= 6.3.2)
+  - PurchasesHybridCommon (6.3.2):
+    - RevenueCat (= 4.26.1)
+  - RevenueCat (4.26.1)
   - sqflite (0.0.3):
     - Flutter
     - FlutterMacOS
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
+  - purchases_flutter (from `.symlinks/plugins/purchases_flutter/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/darwin`)
 
+SPEC REPOS:
+  trunk:
+    - PurchasesHybridCommon
+    - RevenueCat
+
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
+  purchases_flutter:
+    :path: ".symlinks/plugins/purchases_flutter/ios"
   sqflite:
     :path: ".symlinks/plugins/sqflite/darwin"
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  purchases_flutter: 32697fa7b2aceb2af2dde25826c5f8b74021fcd1
+  PurchasesHybridCommon: 98af59169dd9c418eac0725c43f02db92a643b79
+  RevenueCat: 4e8899a69fd57180ef166237d1eb670023be05de
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796

frontend/ios/Runner.xcodeproj/project.pbxproj

@@ -473,8 +473,8 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = JVX7U43WRX;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = HC3NQ49D3T;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ChessKnock;
@@ -484,7 +484,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = band.effective.chessknock;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.effective.chessknock;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
@@ -664,8 +664,8 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = JVX7U43WRX;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = HC3NQ49D3T;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ChessKnock;
@@ -675,7 +675,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = band.effective.chessknock;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.effective.chessknock;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
@@ -695,8 +695,8 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = JVX7U43WRX;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = HC3NQ49D3T;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ChessKnock;
@@ -706,7 +706,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = band.effective.chessknock;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.effective.chessknock;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;

frontend/ios/Runner/Info.plist

@@ -24,6 +24,8 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
@@ -38,7 +40,5 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
 </dict>
 </plist>

frontend/lib/constants/constants.dart

@@ -1,4 +1,3 @@
 export "colors.dart";
 export "text_styles.dart";
-export "string_constants.dart";
 export 'gradient_consts.dart';

frontend/lib/data_sources/in_app_purchase_data_source.dart

@@ -0,0 +1,4 @@
+abstract interface class IInAppPurchaseDataSource {
+  Future<bool> buyProduct(String productId);
+  Future<bool> checkStatus(String productId);
+}

frontend/lib/data_sources/revenuecat_data_source.dart

@@ -0,0 +1,19 @@
+import 'package:frontend/data_sources/in_app_purchase_data_source.dart';
+import 'package:purchases_flutter/purchases_flutter.dart';
+
+class RevenueCatDataSource implements IInAppPurchaseDataSource {
+  @override
+  Future<bool> buyProduct(String productId) async {
+    final product = (await Purchases.getProducts([productId])).first;
+    return (await Purchases.purchaseStoreProduct(product))
+            .entitlements
+            .active[productId] !=
+        null;
+  }
+
+  @override
+  Future<bool> checkStatus(String productId) async {
+    final customerInfo = await Purchases.getCustomerInfo();
+    return customerInfo.entitlements.active.containsKey(productId);
+  }
+}

frontend/lib/l10n/en.arb

@@ -103,5 +103,6 @@
     "moveBackModal": "Ability to return\nthe game board one move back",
     "threatsModal": "Display of danger\nof your piece being captured",
     "hintsModal": "Display of hints\nfor possible moves",
-    "description": "Description"
+    "description": "Description",
+    "price": "1.99 $"
 }

frontend/lib/l10n/ru.arb

@@ -103,5 +103,6 @@
     "moveBackModal": "Возможность вернуть\nигровое поле на ход назад",
     "threatsModal": "Отображение опасности\nвзятия вашей фигуры",
     "hintsModal": "Отображение подсказок\nвозможных ходов",
-    "description": "Описание"
+    "description": "Описание",
+    "price": "199 ₽"
 }

frontend/lib/main.dart

@@ -1,13 +1,29 @@
+import "dart:io";
+
+import "package:frontend/data_sources/revenuecat_data_source.dart";
 import "package:frontend/exports.dart";
 import "package:flutter/material.dart";
 import "package:flutter/services.dart";
+import "package:frontend/repositories/in_app_purchase_repository.dart";
 import "package:provider/provider.dart";
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import "package:purchases_flutter/purchases_flutter.dart";
 
-void main() {
+void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+  if (Platform.isIOS) {
+    await configureRevenueCat();
+  }
   runApp(const MyApp());
 }
 
+const _revenueCatApiKey = 'appl_XXuSbFegqvobEdAwmWZnhIlglOX';
+
+Future<void> configureRevenueCat() async {
+  Purchases.setLogLevel(LogLevel.debug);
+  Purchases.configure(PurchasesConfiguration(_revenueCatApiKey));
+}
+
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
 
@@ -23,7 +39,11 @@ class MyApp extends StatelessWidget {
           create: (context) => ThemeProvider(),
         ),
         ChangeNotifierProvider(
-          create: (context) => ProVersionProvider(),
+          create: (context) => ProVersionProvider(
+            repository: InAppPurchaseRepository(
+              dataSource: RevenueCatDataSource(),
+            ),
+          ),
         )
       ],
       child: Builder(builder: (context) {

frontend/lib/providers/pro_version_provider.dart

@@ -1,15 +1,39 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
+import 'package:frontend/repositories/in_app_purchase_repository.dart';
+import 'package:purchases_flutter/purchases_flutter.dart';
+
+//The key of a product should be the same as an entitlement name attached to it
+const _proVersionKey = 'chessknock_pro_version';
 
 class ProVersionProvider extends ChangeNotifier {
   bool _isProStatus = false;
 
+  final InAppPurchaseRepository _repository;
+
+  ProVersionProvider({required InAppPurchaseRepository repository})
+      : _repository = repository {
+    _init();
+  }
+
+  void _init() async {
+    if (Platform.isIOS) {
+      Purchases.addCustomerInfoUpdateListener((info) {
+        info.entitlements.active.containsKey(_proVersionKey)
+            ? _setProStatus(true)
+            : _setProStatus(false);
+      });
+    }
+  }
+
   void _setProStatus(bool status) {
     _isProStatus = status;
     notifyListeners();
   }
 
-  void upgradeToPro() {
-    _setProStatus(true);
+  void upgradeToPro() async {
+    _setProStatus(await _repository.buyProduct(_proVersionKey));
   }
 
   void downgradeFromPro() {

frontend/lib/repositories/in_app_purchase_repository.dart

@@ -0,0 +1,15 @@
+import 'package:frontend/data_sources/in_app_purchase_data_source.dart';
+
+class InAppPurchaseRepository {
+  final IInAppPurchaseDataSource dataSource;
+
+  InAppPurchaseRepository({required this.dataSource});
+
+  Future<bool> buyProduct(String productId) async {
+    return dataSource.buyProduct(productId);
+  }
+
+  Future<bool> checkStatus(String productId) {
+    return dataSource.checkStatus(productId);
+  }
+}

frontend/lib/views/guide_view/guide_chose_view.dart

@@ -102,7 +102,7 @@ class GuideChoseView extends StatelessWidget {
                       )
                     : ProFunctionsTooltip(
                         isPro: isPro,
-                        modalHeader: StringConstants.partyHistory,
+                        modalHeader: l10n.partyHistoryPage,
                         child: GuideChosePieceButton(
                           iconName: null,
                           label: l10n.partyHistoryPage,

frontend/lib/views/menu_view/components/menu_app_bar.dart

@@ -26,7 +26,7 @@ class MenuAppBar extends StatelessWidget {
                 children: [
                   CustomSwitch(provider),
                   const SizedBox(width: 16),
-                  ProStatusIndicator(onTap: () => context.push(promoScreenRoute)),
+                  const ProStatusIndicator(),
                 ],
               )
             : UpgradeToProButton(onTap: () => context.push(promoScreenRoute)),

frontend/lib/views/menu_view/components/pro_status_indicator.dart

@@ -6,37 +6,31 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 class ProStatusIndicator extends StatelessWidget {
   const ProStatusIndicator({
     super.key,
-    required this.onTap,
   });
 
-  final VoidCallback onTap;
-
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: onTap,
-      child: Row(
-        children: [
-          ShaderMask(
-              shaderCallback: (Rect bounds) {
-                return GradientConsts.orange.createShader(
-                    Rect.fromLTWH(0, 0, bounds.width, bounds.height));
-              },
-              child: Text(
-                AppLocalizations.of(context)!.pro,
-                style:
-                    TextStyles.body1.copyWith(color: ColorsConst.neutralColor0),
-              )),
-          ShaderMask(
-              shaderCallback: (Rect bounds) {
-                return GradientConsts.orange.createShader(
-                    Rect.fromLTWH(0, 0, bounds.width, bounds.height));
-              },
-              child: SvgPicture.asset(
-                'assets/images/icons/pro_sparkles.svg',
-              )),
-        ],
-      ),
+    return Row(
+      children: [
+        ShaderMask(
+            shaderCallback: (Rect bounds) {
+              return GradientConsts.orange.createShader(
+                  Rect.fromLTWH(0, 0, bounds.width, bounds.height));
+            },
+            child: Text(
+              AppLocalizations.of(context)!.pro,
+              style:
+                  TextStyles.body1.copyWith(color: ColorsConst.neutralColor0),
+            )),
+        ShaderMask(
+            shaderCallback: (Rect bounds) {
+              return GradientConsts.orange.createShader(
+                  Rect.fromLTWH(0, 0, bounds.width, bounds.height));
+            },
+            child: SvgPicture.asset(
+              'assets/images/icons/pro_sparkles.svg',
+            )),
+      ],
     );
   }
 }

frontend/lib/views/menu_view/components/upgrade_to_pro_button.dart

@@ -12,7 +12,7 @@ class UpgradeToProButton extends StatelessWidget {
   });
 
   final VoidCallback onTap;
-  final int? price;
+  final String? price;
 
   @override
   Widget build(BuildContext context) {
@@ -71,7 +71,7 @@ class UpgradeToProButton extends StatelessWidget {
                 ),
                 if (price != null) ...[
                   Text(
-                    '$price ₽',
+                    price!,
                     style: style,
                   )
                 ]

frontend/lib/views/menu_view/constants/menu_page_string_const.dart

@@ -1,6 +1,3 @@
 class MenuPageStringConst {
-  static String slogan = "Побеждать\nв шахматах — \nпобеждать\nв жизни";
-  static String sloganWide = "Побеждать в шахматах — \nпобеждать в жизни";
-  static String localButton = "Начать игру";
   static String pathToIcon = "assets/images/icons/";
 }

frontend/lib/views/menu_view/tablet_menu_layout.dart

@@ -77,7 +77,7 @@ class TabletMenuView extends StatelessWidget {
                 child: MenuButton(
                   gameModel: gameModel,
                   height: height * 0.24,
-                  buttonText: MenuPageStringConst.localButton,
+                  buttonText: AppLocalizations.of(context)!.startGame,
                   settingsScreenRoute: RouteLocations.settingsScreen,
                 ),
               ),