fix: отказ от реактивного спобоса обновления статуса пользователя в пользу более простой реализации логики взаимодействия компонентов + вынесения апи ключа в .env файл

Author: neekeetuh

frontend/.env.example

@@ -0,0 +1 @@
+REVENUE_CAT_API_KEY=

frontend/.gitignore

@@ -1,3 +1,5 @@
+*.env
+
 # Miscellaneous
 *.class
 *.log

frontend/lib/data_sources/in_app_purchase_data_source.dart

@@ -1,7 +1,4 @@
-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

@@ -1,10 +1,7 @@
-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;
@@ -18,17 +15,4 @@ class RevenueCatDataSource implements IInAppPurchaseDataSource {
     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/main.dart

@@ -1,5 +1,6 @@
 import "dart:io";
 
+import "package:flutter_dotenv/flutter_dotenv.dart";
 import "package:frontend/data_sources/revenuecat_data_source.dart";
 import "package:frontend/exports.dart";
 import "package:flutter/material.dart";
@@ -10,18 +11,18 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import "package:purchases_flutter/purchases_flutter.dart";
 
 void main() async {
+  await dotenv.load(fileName: ".env");
   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));
+  final apiKey = dotenv.env['REVENUE_CAT_API_KEY'];
+  Purchases.configure(PurchasesConfiguration(apiKey!));
 }
 
 class MyApp extends StatelessWidget {
@@ -43,7 +44,6 @@ class MyApp extends StatelessWidget {
             repository: InAppPurchaseRepository(
               //TODO: choose data source based off of a platform
               dataSource: RevenueCatDataSource(),
-              proStatusNotifier: ValueNotifier<bool>(false),
             ),
           ),
         )

frontend/lib/providers/pro_version_provider.dart

@@ -16,7 +16,8 @@ class ProVersionProvider extends ChangeNotifier {
   }
 
   void _init() async {
-    _setProStatus(_repository.getStatus());
+    final isPro = await _repository.checkStatus(_proVersionKey);
+    _setProStatus(isPro);
   }
 
   void _setProStatus(bool status) {
@@ -32,7 +33,7 @@ class ProVersionProvider extends ChangeNotifier {
   Future<void> upgradeToPro() async {
     try {
       await _repository.buyProduct(_proVersionKey);
-      final isPro = _repository.getStatus();
+      final isPro = await _repository.checkStatus(_proVersionKey);
       _setProStatus(isPro);
       _setPurchaseError(false);
     } catch (_) {

frontend/lib/repositories/in_app_purchase_repository.dart

@@ -1,17 +1,11 @@
-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();
-  }
+  InAppPurchaseRepository({
+    required IInAppPurchaseDataSource dataSource,
+  }) : _dataSource = dataSource;
 
   Future<bool> buyProduct(String productId) {
     return _dataSource.buyProduct(productId);
@@ -20,12 +14,4 @@ class InAppPurchaseRepository {
   Future<bool> checkStatus(String productId) {
     return _dataSource.checkStatus(productId);
   }
-
-  void _init() {
-    _dataSource.init(_proStatusNotifier);
-  }
-
-  bool getStatus() {
-    return _proStatusNotifier.value;
-  }
 }

frontend/pubspec.lock

@@ -126,6 +126,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_dotenv:
+    dependency: "direct main"
+    description:
+      name: flutter_dotenv
+      sha256: b7c7be5cd9f6ef7a78429cabd2774d3c4af50e79cb2b7593e3d5d763ef95c61b
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.2.1"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:

frontend/pubspec.yaml

@@ -28,6 +28,7 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   purchases_flutter: ^5.8.0
+  flutter_dotenv: ^5.2.1
 
 dev_dependencies:
   flutter_test:
@@ -52,6 +53,7 @@ flutter:
     - assets/images/small_pieces/
     - assets/images/icons/
     - assets/images/guide_boards/
+    - .env
 
   fonts:
     - family: Roboto