Update in_app_purchases part 1

Author: domesticmouse

in_app_purchases/codelab_rebuild.yaml

@@ -14,7 +14,7 @@ steps:
         patch-u: |
           --- b/in_app_purchases/step_00/app/.gitignore
           +++ a/in_app_purchases/step_00/app/.gitignore
-          @@ -41,3 +41,9 @@ app.*.map.json
+          @@ -43,3 +43,9 @@ app.*.map.json
            /android/app/debug
            /android/app/profile
            /android/app/release
@@ -26,7 +26,7 @@ steps:
           +lib/firebase_options.dart
       - name: Add app dependencies
         path: steps/app
-        flutter: pub add cloud_firestore cupertino_icons firebase_auth firebase_core google_sign_in http in_app_purchase in_app_purchase_platform_interface intl provider
+        flutter: pub add cloud_firestore cupertino_icons firebase_auth firebase_core google_sign_in http intl provider
       - name: Patch app/pubspec.yaml
         path: steps/app/pubspec.yaml
         patch-u: |
@@ -39,7 +39,7 @@ steps:
            publish_to: 'none'
            version: 0.1.0
 
-          @@ -27,3 +27,6 @@ dev_dependencies:
+          @@ -25,3 +25,6 @@ dev_dependencies:
 
            flutter:
              uses-material-design: true
@@ -16720,9 +16720,6 @@ steps:
       - name: Add dependencies
         path: steps/dart-backend
         dart: pub add googleapis googleapis_auth http app_store_server_sdk
-      - name: Remove not required dependency
-        path: steps/dart-backend
-        dart: pub remove args
       - name: Replace .github
         path: steps/dart-backend/.gitignore
         replace-contents: |
@@ -17182,6 +17179,18 @@ steps:
           from: steps
           to: step_00
 
+  - name: step_03
+    steps:
+      - name: Remove step_03
+        rmdir: step_03
+      - name: Add dependencies
+        path: steps/app
+        flutter: pub add in_app_purchase dev:in_app_purchase_platform_interface
+      - name: Copy to step_03
+        copydir:
+          from: steps
+          to: step_03
+
   - name: step_07
     steps:
       - name: Remove step_07
@@ -18546,98 +18555,16 @@ steps:
           from: steps
           to: step_10
 
-  - name: complete
+  - name: step_11
     steps:
-      - name: Remove complete
-        rmdir: complete
+      - name: Remove step_11
+        rmdir: step_11
       - name: Patch app/lib/logic/dash_purchases.dart
         path: steps/app/lib/logic/dash_purchases.dart
         patch-u: |
-          --- b/in_app_purchases/complete/app/lib/logic/dash_purchases.dart
-          +++ a/in_app_purchases/complete/app/lib/logic/dash_purchases.dart
-          @@ -1,3 +1,5 @@
-          +// ignore_for_file: avoid_print
-          +
-           import 'dart:async';
-           import 'dart:convert';
-           
-          @@ -17,10 +19,10 @@ import 'firebase_notifier.dart';
-           class DashPurchases extends ChangeNotifier {
-             DashCounter counter;
-             FirebaseNotifier firebaseNotifier;
-          +  IAPRepo iapRepo;
-             StoreState storeState = StoreState.loading;
-             late StreamSubscription<List<PurchaseDetails>> _subscription;
-             List<PurchasableProduct> products = [];
-          -  IAPRepo iapRepo;
-           
-             bool get beautifiedDash => _beautifiedDashUpgrade;
-             bool _beautifiedDashUpgrade = false;
-          @@ -44,6 +46,7 @@ class DashPurchases extends ChangeNotifier {
-                 notifyListeners();
-                 return;
-               }
-          +
-               const ids = <String>{
-                 storeKeyConsumable,
-                 storeKeySubscription,
-          @@ -58,8 +61,8 @@ class DashPurchases extends ChangeNotifier {
-           
-             @override
-             void dispose() {
-          -    _subscription.cancel();
-               iapRepo.removeListener(purchasesUpdate);
-          +    _subscription.cancel();
-               super.dispose();
-             }
-           
-          @@ -126,8 +129,10 @@ class DashPurchases extends ChangeNotifier {
-                 headers: headers,
-               );
-               if (response.statusCode == 200) {
-          +      print('Successfully verified purchase');
-                 return true;
-               } else {
-          +      print('failed request: ${response.statusCode} - ${response.body}');
-                 return false;
-               }
-             }
-          @@ -137,7 +142,7 @@ class DashPurchases extends ChangeNotifier {
-             }
-           
-             void _updateStreamOnError(dynamic error) {
-          -    //Handle error here
-          +    print(error);
-             }
-           
-             void purchasesUpdate() {
-          @@ -158,21 +163,21 @@ class DashPurchases extends ChangeNotifier {
-               // purchases page.
-               if (iapRepo.hasActiveSubscription) {
-                 counter.applyPaidMultiplier();
-          -      for (var element in subscriptions) {
-          +      for (final element in subscriptions) {
-                   _updateStatus(element, ProductStatus.purchased);
-                 }
-               } else {
-                 counter.removePaidMultiplier();
-          -      for (var element in subscriptions) {
-          +      for (final element in subscriptions) {
-                   _updateStatus(element, ProductStatus.purchasable);
-                 }
-               }
-           
-          -    // Set the Dash beautifier and show/hide purchased on
-          +    // Set the dash beautifier and show/hide purchased on
-               // the purchases page.
-               if (iapRepo.hasUpgrade != _beautifiedDashUpgrade) {
-                 _beautifiedDashUpgrade = iapRepo.hasUpgrade;
-          -      for (var element in upgrades) {
-          +      for (final element in upgrades) {
-                   _updateStatus(
-                       element,
-                       _beautifiedDashUpgrade
-          @@ -184,8 +189,8 @@ class DashPurchases extends ChangeNotifier {
+          --- b/in_app_purchases/step_11/app/lib/logic/dash_purchases.dart
+          +++ a/in_app_purchases/step_11/app/lib/logic/dash_purchases.dart
+          @@ -184,8 +184,8 @@ class DashPurchases extends ChangeNotifier {
              }
 
              void _updateStatus(PurchasableProduct product, ProductStatus status) {
@@ -18693,10 +18620,10 @@ steps:
               expect(token, 'TOKEN');
             });
           }
-      - name: Copy to complete
+      - name: Copy to step_11
         copydir:
           from: steps
-          to: complete
+          to: step_11
 
   - name: Cleanup
     steps:

in_app_purchases/complete/app/lib/firebase_options.dart

@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related

in_app_purchases/complete/dart-backend/lib/constants.dart

@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ^3.5.4
+  sdk: ^3.6.0
 
 dependencies:
   flutter:
@@ -15,15 +15,13 @@ dependencies:
   firebase_core: ^3.8.1
   google_sign_in: ^6.2.2
   http: ^1.2.2
-  in_app_purchase: ^3.2.0
-  in_app_purchase_platform_interface: ^1.4.0
   intl: ^0.20.1
   provider: ^6.1.2
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
 
 flutter:
   uses-material-design: true

in_app_purchases/step_00/app/.gitignore

@@ -4,7 +4,7 @@ version: 1.0.0
 # repository: https://github.com/my_org/my_repo
 
 environment:
-  sdk: ^3.5.4
+  sdk: ^3.6.0
 
 dependencies:
   app_store_server_sdk: ^1.2.9
@@ -15,5 +15,5 @@ dependencies:
   shelf_router: ^1.1.0
 
 dev_dependencies:
-  lints: ^4.0.0
+  lints: ^5.0.0
   test: ^1.24.0

in_app_purchases/step_00/app/pubspec.yaml

@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related