Добавление функции оплаты и подготовка к релизу в 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/l10n.yaml

@@ -1,3 +1,4 @@
 arb-dir: lib/l10n
 template-arb-file: en.arb
 output-localization-file: app_localizations.dart
+nullable-getter: false

frontend/lib/constants/assets.dart

@@ -0,0 +1,28 @@
+sealed class Assets {
+  static const handbook = "assets/images/icons/handbook.svg";
+  static const loading = "assets/images/icons/loading.svg";
+  static const board = "assets/images/board.svg";
+  static const advantage = 'assets/images/icons/advantage.svg';
+  static const backArrowIcon = "assets/images/icons/back_arrow_icon.svg";
+  static const pointLight = "assets/images/icons/point_light.svg";
+  static const darkSwitch = "assets/images/icons/dark_switch.svg";
+  static const lightSwitch = "assets/images/icons/light_switch.svg";
+  static const proSparkles = 'assets/images/icons/pro_sparkles.svg';
+  static const sun = 'assets/images/icons/sun.svg';
+  static const moon = 'assets/images/icons/moon.svg';
+  static const explosion = 'assets/images/icons/explosion.svg';
+  static const lamp = 'assets/images/icons/lamp.svg';
+  static const book = 'assets/images/icons/book.svg';
+  static const chessPiece = 'assets/images/icons/chess_piece.svg';
+  static const leftBigArrowIcon = "assets/images/icons/left_big_arrow_icon.svg";
+  static const rightBigArrowIcon =
+      "assets/images/icons/right_big_arrow_icon.svg";
+  static const questionIcon = "assets/images/icons/question_icon.svg";
+}
+
+sealed class AssetsPieces {
+  static const bishop = 'assets/images/pieces/bishop.svg';
+  static const rook = 'assets/images/pieces/rook.svg';
+  static const knight = 'assets/images/pieces/knight.svg';
+  static const queen = 'assets/images/pieces/queen.svg';
+}

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,7 @@
+import 'package:flutter/material.dart';
+
+abstract interface class IInAppPurchaseDataSource {
+  Future<bool> buyProduct(String productId);
+  Future<bool> checkStatus(String productId);
+  void init(ValueNotifier<bool> notifier);
+}

frontend/lib/data_sources/revenuecat_data_source.dart

@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import 'package:frontend/data_sources/in_app_purchase_data_source.dart';
+import 'package:purchases_flutter/purchases_flutter.dart';
+
+class RevenueCatDataSource implements IInAppPurchaseDataSource {
+  //The key of a product should be the same as an entitlement name attached to it
+  static const _proVersionKey = 'chessknock_pro_version';
+  @override
+  Future<bool> buyProduct(String productId) async {
+    final product = (await Purchases.getProducts([productId])).first;
+    final customerInfo = await Purchases.purchaseStoreProduct(product);
+    final isPro = customerInfo.entitlements.active[productId] != null;
+    return isPro;
+  }
+
+  @override
+  Future<bool> checkStatus(String productId) async {
+    final customerInfo = await Purchases.getCustomerInfo();
+    return customerInfo.entitlements.active.containsKey(productId);
+  }
+
+  @override
+  void init(ValueNotifier<bool> notifier) {
+    try {
+      Purchases.addCustomerInfoUpdateListener((info) {
+        info.entitlements.active.containsKey(_proVersionKey)
+            ? notifier.value = true
+            : notifier.value = false;
+      });
+    } catch (e) {
+      throw Exception('function type should be void Function(bool)');
+    }
+  }
+}

frontend/lib/l10n/en.arb

@@ -103,5 +103,7 @@
     "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 $",
+    "purchaseError": "Could not buy the product. Try again later"
+}

frontend/lib/l10n/ru.arb

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

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,13 @@ class MyApp extends StatelessWidget {
           create: (context) => ThemeProvider(),
         ),
         ChangeNotifierProvider(
-          create: (context) => ProVersionProvider(),
+          create: (context) => ProVersionProvider(
+            repository: InAppPurchaseRepository(
+              //TODO: choose data source based off of a platform
+              dataSource: RevenueCatDataSource(),
+              proStatusNotifier: ValueNotifier<bool>(false),
+            ),
+          ),
         )
       ],
       child: Builder(builder: (context) {

frontend/lib/providers/pro_version_provider.dart

@@ -1,20 +1,51 @@
 import 'package:flutter/material.dart';
+import 'package:frontend/repositories/in_app_purchase_repository.dart';
 
 class ProVersionProvider extends ChangeNotifier {
+  //The key of a product should be the same as an entitlement name attached to it
+  static const _proVersionKey = 'chessknock_pro_version';
+
   bool _isProStatus = false;
+  bool _isPurchaseError = false;
+
+  final InAppPurchaseRepository _repository;
+
+  ProVersionProvider({required InAppPurchaseRepository repository})
+      : _repository = repository {
+    _init();
+  }
+
+  void _init() async {
+    _setProStatus(_repository.getStatus());
+  }
 
   void _setProStatus(bool status) {
     _isProStatus = status;
     notifyListeners();
   }
 
-  void upgradeToPro() {
-    _setProStatus(true);
+  void _setPurchaseError(bool isError) {
+    _isPurchaseError = isError;
+    notifyListeners();
+  }
+
+  Future<void> upgradeToPro() async {
+    try {
+      await _repository.buyProduct(_proVersionKey);
+      final isPro = _repository.getStatus();
+      _setProStatus(isPro);
+      _setPurchaseError(false);
+    } catch (_) {
+      _setPurchaseError(true);
+      await Future.delayed(const Duration(milliseconds: 100));
+      _setPurchaseError(false);
+    }
   }
 
   void downgradeFromPro() {
     _setProStatus(false);
   }
 
   bool get isPro => _isProStatus;
+  bool get isPurchaseError => _isPurchaseError;
 }

frontend/lib/repositories/in_app_purchase_repository.dart

@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:frontend/data_sources/in_app_purchase_data_source.dart';
+
+class InAppPurchaseRepository {
+  final IInAppPurchaseDataSource _dataSource;
+  final ValueNotifier<bool> _proStatusNotifier;
+
+  InAppPurchaseRepository(
+      {required IInAppPurchaseDataSource dataSource,
+      required ValueNotifier<bool> proStatusNotifier})
+      : _dataSource = dataSource,
+        _proStatusNotifier = proStatusNotifier {
+    _init();
+  }
+
+  Future<bool> buyProduct(String productId) {
+    return _dataSource.buyProduct(productId);
+  }
+
+  Future<bool> checkStatus(String productId) {
+    return _dataSource.checkStatus(productId);
+  }
+
+  void _init() {
+    _dataSource.init(_proStatusNotifier);
+  }
+
+  bool getStatus() {
+    return _proStatusNotifier.value;
+  }
+}

frontend/lib/views/components/button_to_guide.dart

@@ -1,5 +1,6 @@
 import "package:flutter/material.dart";
 import "package:flutter_svg/svg.dart";
+import "package:frontend/constants/assets.dart";
 
 class ButtonToGuide extends StatelessWidget {
   const ButtonToGuide(
@@ -29,7 +30,7 @@ class ButtonToGuide extends StatelessWidget {
         constraints: const BoxConstraints(),
         color: backGroundColor,
         icon: SvgPicture.asset(
-          "assets/images/icons/handbook.svg",
+          Assets.handbook,
         ),
       ),
     );

frontend/lib/views/components/loading_widget.dart

@@ -1,5 +1,6 @@
 import "package:flutter/material.dart";
 import "package:flutter_svg/flutter_svg.dart";
+import "package:frontend/constants/assets.dart";
 import "package:frontend/exports.dart";
 
 class LoadingWidget extends StatelessWidget {
@@ -16,7 +17,7 @@ class LoadingWidget extends StatelessWidget {
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
             SvgPicture.asset(
-              "assets/images/icons/loading.svg",
+              Assets.loading,
               colorFilter: ColorFilter.mode(scheme.primary, BlendMode.srcIn),
             ),
             const SizedBox(