WT1.1.5+52 bug fix: Google login only Android

controll exercises fix

ios/Runner.xcodeproj/project.pbxproj

@@ -388,7 +388,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = SFJJBDCU6Z;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -410,7 +410,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
@@ -531,7 +531,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = SFJJBDCU6Z;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -554,7 +554,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -566,7 +566,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = SFJJBDCU6Z;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -588,7 +588,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

lib/bloc/exercise_control/exercise_control_bloc.dart

@@ -56,6 +56,9 @@ class ExerciseControlBloc extends Bloc<ExerciseControlEvent, ExerciseControlStat
           scrollOffset = step * 400.0;
 
           quantity = origQuantity;
+          if (exerciseRepository.exercise.quantity == null) {
+            exerciseRepository.setQuantity(12);
+          }
           exerciseRepository.end = DateTime.now();
           await exerciseRepository.addExercise();
 

lib/util/purchases.dart

@@ -47,6 +47,9 @@ class RevenueCatPurchases with Logging {
         log("Purchaserinfo not reachable " + e.toString());
       }
     }
+    if (Cache().userLoggedIn.admin == 1) {
+      Cache().hasPurchased = true;
+    }
   }
 
   Future<Offering> getOfferings() async {

lib/view/login.dart

@@ -83,13 +83,15 @@ class LoginPage extends StatelessWidget with Trans {
                   ),
                   onPressed: () => {loginBloc.add(LoginFB())},
                 ),
-                FlatButton(
+                Platform.isAndroid
+                    ? FlatButton(
                         child: Image.asset(
                           'asset/image/button_google.png',
                           width: 60,
                         ),
                         onPressed: () => {loginBloc.add(LoginGoogle())},
-                ),
+                      )
+                    : Offstage(),
                 Platform.isIOS
                     ? FlatButton(
                         child: Image.asset(

lib/view/registration.dart

@@ -88,13 +88,15 @@ class RegistrationPage extends StatelessWidget with Trans {
                   ),
                   onPressed: () => {loginBloc.add(RegistrationFB())},
                 ),
-                FlatButton(
+                Platform.isAndroid
+                    ? FlatButton(
                         child: Image.asset(
                           'asset/image/button_google.png',
                           width: 60,
                         ),
                         onPressed: () => {loginBloc.add(RegistrationGoogle())},
-                ),
+                      )
+                    : Offstage(),
                 Platform.isIOS
                     ? FlatButton(
                         child: Image.asset(

lib/widgets/menu_page_widget.dart

@@ -10,7 +10,6 @@ import 'package:aitrainer_app/model/workout_menu_tree.dart';
 import 'package:aitrainer_app/service/logging.dart';
 import 'package:aitrainer_app/util/trans.dart';
 import 'package:aitrainer_app/widgets/dialog_common.dart';
-import 'package:auto_animated/auto_animated.dart';
 import 'package:badges/badges.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

pubspec.lock

@@ -50,13 +50,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.5.0-nullsafety.1"
-  auto_animated:
-    dependency: "direct main"
-    description:
-      name: auto_animated
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
   badges:
     dependency: "direct main"
     description:
@@ -1146,13 +1139,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.4+1"
-  visibility_detector:
-    dependency: transitive
-    description:
-      name: visibility_detector
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.5"
   vm_service:
     dependency: transitive
     description:

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.1.5+51
+version: 1.1.5+52
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
@@ -63,7 +63,7 @@ dependencies:
   crypto: ^2.1.5
   transparent_image: ^1.0.0
   #flutter_fadein: ^1.1.1
-  auto_animated: ^2.1.0
+  #auto_animated: ^2.1.0
 
   flurry: ^0.0.7