WT1.1.2f login fix

i18n/en.json

@@ -206,5 +206,6 @@
   "hu_with": " ",
   "Are you sure to delete this exercise?": "Are you sure to delete this exercise?",
 
-  "I forgot the password":"I forgot the password"
+  "I forgot the password":"I forgot the password",
+  "Exception: Instance of 'NotFoundException'": "Customer with the email not found. Please register or reset your password"
 }

i18n/hu.json

@@ -208,5 +208,6 @@
   "Summary of your test":"A teszt összefoglalása:",
 
   "Are you sure to delete this exercise?": "Biztos, hogy törlöd a gyakorlatot?",
-  "I forgot the password":"Elfelejtett jelszó"
+  "I forgot the password":"Elfelejtett jelszó",
+  "Exception: Instance of 'NotFoundException'": "Ezzel az email címmel nem található felhasználó. Kérlek regisztálj vagy kérj jelszóemlékeztetőt"
 }

ios/Runner.xcodeproj/project.pbxproj

@@ -362,7 +362,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 28;
+				CURRENT_PROJECT_VERSION = 29;
 				DEVELOPMENT_TEAM = SFJJBDCU6Z;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -505,7 +505,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 28;
+				CURRENT_PROJECT_VERSION = 29;
 				DEVELOPMENT_TEAM = SFJJBDCU6Z;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -540,7 +540,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 28;
+				CURRENT_PROJECT_VERSION = 29;
 				DEVELOPMENT_TEAM = SFJJBDCU6Z;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

lib/service/firebase_api.dart

@@ -73,7 +73,13 @@ class FirebaseApi {
       } else if (e.code == 'email-already-in-use') {
         print('The account already exists for that email.');
         rc = REGISTER_EMAIL_IN_USE;
-        throw Exception("Customer exists");
+        userCredential = await FirebaseAuth.instance.signInWithEmailAndPassword(
+            email: email,
+            password: password
+        );
+        if ( rc != null ) {
+          String rc = SIGN_IN_OK;
+        }
       }
     } catch (e) {
       print(e);

lib/view/exercise_new_page.dart

@@ -62,7 +62,6 @@ class _ExerciseNewPageState extends State<ExerciseNewPage> with Trans{
     exerciseBloc.exerciseRepository.exerciseType.nameTranslation;
 
     return Form(
-      autovalidate: true,
       child: Scaffold(
         resizeToAvoidBottomInset: true,
         appBar: AppBarNav(depth: 1),
@@ -168,7 +167,7 @@ class _ExerciseNewPageState extends State<ExerciseNewPage> with Trans{
             },
             listViewHeight: 80,
             textStyle: TextStyle(fontSize: 24),
-            textStyleHighlighted: TextStyle(fontSize: 40, color: Colors.orange, fontWeight: FontWeight.bold),
+            textStyleHighlighted: TextStyle(fontSize: 38, color: Colors.orange, fontWeight: FontWeight.bold),
             //decoration: _decoration,
           ),
 
@@ -197,7 +196,7 @@ class _ExerciseNewPageState extends State<ExerciseNewPage> with Trans{
               },
               listViewHeight: 80,
               textStyle: TextStyle(fontSize: 24),
-              textStyleHighlighted: TextStyle(fontSize: 40, color: Colors.orange, fontWeight: FontWeight.bold),
+              textStyleHighlighted: TextStyle(fontSize: 38, color: Colors.orange, fontWeight: FontWeight.bold),
               //decoration: _decoration,
             ),
 

lib/view/login.dart

@@ -4,6 +4,7 @@ import 'package:aitrainer_app/localization/app_localization.dart';
 import 'package:aitrainer_app/repository/user_repository.dart';
 import 'package:aitrainer_app/util/common.dart';
 import 'package:aitrainer_app/util/trans.dart';
+import 'package:aitrainer_app/widgets/app_bar_min.dart';
 import 'package:aitrainer_app/widgets/splash.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
@@ -43,6 +44,7 @@ class _LoginWidget extends State<LoginWidget> with Common, Trans {
           final loginBloc = BlocProvider.of<LoginFormBloc>(context);
           return Scaffold(
             key: _scaffoldKey,
+            appBar: AppBarMin(),
             body: FormBlocListener<LoginFormBloc, String, String>(
               onSubmitting: (context, state) {
                 LoadingDialog.show(context);
@@ -53,8 +55,11 @@ class _LoginWidget extends State<LoginWidget> with Common, Trans {
               },
               onFailure: (context, state) {
                 LoadingDialog.hide(context);
-                showInSnackBar(state.failureResponse);
+                showInSnackBar(t(state.failureResponse));
               },
+              child: SafeArea(
+                top: false,
+                bottom: false,
                 child: Container(
                   decoration: BoxDecoration(
                     image: DecorationImage(
@@ -65,6 +70,7 @@ class _LoginWidget extends State<LoginWidget> with Common, Trans {
                   ),
                   child: buildLoginForm(loginBloc, accountBloc),
                 ),
+              )
             ),
           );
         }));

lib/view/registration.dart

@@ -4,6 +4,7 @@ import 'package:aitrainer_app/localization/app_localization.dart';
 import 'package:aitrainer_app/util/common.dart';
 import 'package:aitrainer_app/repository/customer_repository.dart';
 import 'package:aitrainer_app/repository/user_repository.dart';
+import 'package:aitrainer_app/widgets/app_bar_min.dart';
 import 'package:aitrainer_app/widgets/splash.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
@@ -45,14 +46,15 @@ class _RegistrationWidget extends State<RegistrationWidget> with Common {
     final accountBloc = BlocProvider.of<AccountBloc>(context);
     return BlocProvider(
         create: (context) => RegistrationFormBloc(
-          userRepository: UserRepository(),
+            userRepository: UserRepository(), accountBloc: accountBloc),
-          accountBloc: accountBloc),
         child: Builder(builder: (context) {
           // ignore: close_sinks
-          final registrationBloc = BlocProvider.of<RegistrationFormBloc>(context);
+          final registrationBloc =
+              BlocProvider.of<RegistrationFormBloc>(context);
 
           return Scaffold(
             key: _scaffoldKey,
+            appBar: AppBarMin(),
             body: FormBlocListener<RegistrationFormBloc, String, String>(
               onSubmitting: (context, state) {
                 LoadingDialog.show(context);
@@ -65,6 +67,8 @@ class _RegistrationWidget extends State<RegistrationWidget> with Common {
                 LoadingDialog.hide(context);
                 showInSnackBar(state.failureResponse);
               },
+              child: SafeArea(
+                bottom: false,
                 child: Container(
                   decoration: BoxDecoration(
                     image: DecorationImage(
@@ -84,7 +88,9 @@ class _RegistrationWidget extends State<RegistrationWidget> with Common {
                             padding: EdgeInsets.only(top: 150.0),
                             //mainAxisAlignment: MainAxisAlignment.spaceAround,
                             children: <Widget>[
-                            Divider(color: Colors.transparent,),
+                              Divider(
+                                color: Colors.transparent,
+                              ),
                               //Spacer(flex:4),
 
                               /* FlatButton(
@@ -147,7 +153,8 @@ class _RegistrationWidget extends State<RegistrationWidget> with Common {
                                             width: 100,
                                             height: 100),
                                         onPressed: () => {
-                                        registrationBloc.add(SubmitFormBloc())
+                                              registrationBloc
+                                                  .add(SubmitFormBloc())
                                             }),
                                   ]),
                               Row(
@@ -155,17 +162,19 @@ class _RegistrationWidget extends State<RegistrationWidget> with Common {
                                       MainAxisAlignment.spaceAround,
                                   children: <Widget>[
                                     new InkWell(
-                                    child: new Text(AppLocalizations.of(context)
+                                      child: new Text(
+                                          AppLocalizations.of(context)
                                               .translate('Login')),
                                       onTap: () => Navigator.of(context)
                                           .pushNamed('login'),
                                     ),
                                     Spacer(flex: 1),
                                     new InkWell(
-                                    child: new Text(AppLocalizations.of(context)
+                                      child: new Text(
+                                          AppLocalizations.of(context)
                                               .translate('Privacy')),
-                                    onTap: () =>
+                                      onTap: () => Navigator.of(context)
-                                        Navigator.of(context).pushNamed('gdpr'),
+                                          .pushNamed('gdpr'),
                                     ),
                                     Spacer(flex: 2),
                                   ]),
@@ -174,6 +183,7 @@ class _RegistrationWidget extends State<RegistrationWidget> with Common {
                   ),
                 ),
               ),
+            ),
           );
         }));
   }

lib/view/reset_password.dart

@@ -6,6 +6,7 @@ import 'package:aitrainer_app/repository/user_repository.dart';
 import 'package:aitrainer_app/service/firebase_api.dart';
 import 'package:aitrainer_app/util/common.dart';
 import 'package:aitrainer_app/util/trans.dart';
+import 'package:aitrainer_app/widgets/app_bar_min.dart';
 import 'package:aitrainer_app/widgets/splash.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
@@ -30,6 +31,7 @@ class ResetPasswordPage extends StatelessWidget with Trans {
           final loginBloc = BlocProvider.of<ResetPasswordFormBloc>(context);
           return Scaffold(
             key: _scaffoldKey,
+            appBar: AppBarMin(),
             body: FormBlocListener<ResetPasswordFormBloc, String, String>(
               onSubmitting: (context, state) {
                 LoadingDialog.show(context);
@@ -42,6 +44,8 @@ class ResetPasswordPage extends StatelessWidget with Trans {
                 LoadingDialog.hide(context);
                 showInSnackBar(state.failureResponse);
               },
+              child: SafeArea(
+                bottom: false,
                 child: Container(
                   decoration: BoxDecoration(
                     image: DecorationImage(
@@ -55,18 +59,19 @@ class ResetPasswordPage extends StatelessWidget with Trans {
                   child: buildResetPasswordForm(loginBloc),
                 ),
               ),
+            ),
           );
         }));
   }
 
   Widget buildResetPasswordForm(ResetPasswordFormBloc formBloc) {
-
     return Form(
       key: _formKey,
       child: Container(
-          padding: const EdgeInsets.only(left: 25, right: 100),
+          padding: const EdgeInsets.only(left: 25, right: 50),
-          child:
+          child: ListView(
-              ListView(shrinkWrap: false, padding: EdgeInsets.only(top: 120.0),
+              shrinkWrap: false,
+              padding: EdgeInsets.only(top: 150.0),
               children: <Widget>[
                 Divider(),
                 Row(
@@ -74,7 +79,8 @@ class ResetPasswordPage extends StatelessWidget with Trans {
                   children: [
                     new InkWell(
                       child: new Text(
-                          AppLocalizations.of(context).translate('I forgot the password'),
+                          AppLocalizations.of(context)
+                              .translate('I forgot the password'),
                           style: TextStyle(
                               fontWeight: FontWeight.bold, fontSize: 24)),
                     ),
@@ -103,9 +109,7 @@ class ResetPasswordPage extends StatelessWidget with Trans {
                           key: LibraryKeys.loginOKButton,
                           child: Image.asset('asset/image/WT_OK.png',
                               width: 100, height: 100),
-                          onPressed: () => {
+                          onPressed: () => {formBloc.add(SubmitFormBloc())}),
-                            formBloc.add(SubmitFormBloc())
-                          }),
                     ]),
                 Divider(
                   color: Colors.transparent,
@@ -116,8 +120,7 @@ class ResetPasswordPage extends StatelessWidget with Trans {
                       new InkWell(
                         child: new Text(
                             AppLocalizations.of(context).translate('Login')),
-                        onTap: () =>
+                        onTap: () => Navigator.of(context).pushNamed('login'),
-                            Navigator.of(context).pushNamed('login'),
                       ),
                       Spacer(flex: 1),
                     ]),
@@ -125,11 +128,9 @@ class ResetPasswordPage extends StatelessWidget with Trans {
     );
   }
 
-
   void showInSnackBar(String error) {
     _scaffoldKey.currentState.showSnackBar(SnackBar(
         backgroundColor: Colors.orange,
         content: Text(error, style: TextStyle(color: Colors.white))));
   }
-
 }

lib/widgets/app_bar.dart

@@ -119,7 +119,7 @@ class _AppBarNav extends State<AppBarNav>  with SingleTickerProviderStateMixin,
     int sizeExerciseList = Cache().getExercises() == null? 0 : Cache().getExercises().length;
     if ( sizeExerciseList == 0  ) {
       String text = AppLocalizations.of(context).translate("Make your first test");
-      double fontSize = text.length > 24 ? 10 : 16;
+      double fontSize = text.length > 24 ? 13 : 16;
       return Stack(
         alignment: Alignment.topLeft,
         overflow: Overflow.clip,

lib/widgets/app_bar_min.dart

@@ -0,0 +1,61 @@
+import 'dart:async';
+
+import 'package:aitrainer_app/bloc/menu/menu_bloc.dart';
+import 'package:aitrainer_app/localization/app_localization.dart';
+import 'package:aitrainer_app/model/cache.dart';
+import 'package:aitrainer_app/repository/exercise_repository.dart';
+import 'package:aitrainer_app/util/common.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:percent_indicator/linear_percent_indicator.dart';
+import 'package:rainbow_color/rainbow_color.dart';
+
+
+class AppBarMin extends StatefulWidget implements PreferredSizeWidget  {
+  const AppBarMin();
+
+  @override
+  _AppBarNav createState() => _AppBarNav();
+
+  @override
+  Size get preferredSize => const Size.fromHeight(50);
+}
+
+class _AppBarNav extends State<AppBarMin>  with Common {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+
+    return AppBar(
+        backgroundColor: Colors.black,
+        title: Row(
+          mainAxisAlignment: MainAxisAlignment.end,
+          children: <Widget>[
+            Image.asset(
+              'asset/image/WT_long_logo.png',
+              //fit: BoxFit.cover,
+              height: 45.0,
+            ),
+          ],
+        ),
+        leading: IconButton(
+          icon: Icon(Icons.arrow_back, color: Colors.black),
+          onPressed: () =>
+          {
+
+          },
+        )
+    );
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+}

lib/widgets/loading.dart

@@ -1,3 +1,4 @@
+import 'package:aitrainer_app/widgets/app_bar_min.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -12,6 +13,7 @@ class LoadingScreenMain extends StatelessWidget {
     );
     return Scaffold(
       backgroundColor: Colors.white,
+      appBar: AppBarMin(),
       body: new InkWell(
         child: new Stack(
           fit: StackFit.expand,
@@ -23,17 +25,20 @@ class LoadingScreenMain extends StatelessWidget {
             ),
             /// Render the background image
             new Container(
+              child: SafeArea(
+                bottom: false,
                 child: _backgroundImage,
+              )
             ),
             /// Render the Title widget, loader and messages below each other
             new Column(
-              mainAxisAlignment: MainAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.center,
               children: <Widget>[
                 new Expanded(
                   flex: 3,
                   child: new Container(
                     child: new Column(
-                      mainAxisAlignment: MainAxisAlignment.start,
+                      mainAxisAlignment: MainAxisAlignment.center,
                       children: <Widget>[
                         new Padding(
                           padding: const EdgeInsets.only(top: 30.0),