WT 1.1.11+5 bug fixes customer change

i18n/en.json

@@ -438,6 +438,7 @@
   "Development":"Development",
   "How can serve you this result?":"How can serve you this result?",
   "Go":"Go",
-  "Result":"Result"
+  "Result":"Result",
+  "Name too short":"Name too short"
 
 }

i18n/hu.json

@@ -433,5 +433,6 @@
   "Get the Fastlane to your":"Kapd el a gyorsítósávot a optimális",
   "Development":"Fejlődésedhez",
   "Go":"Érdekel",
-  "Result":"Értékelés"
+  "Result":"Értékelés",
+  "Name too short":"A név túl rövid"
 }

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 = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = SFJJBDCU6Z;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -531,7 +531,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = SFJJBDCU6Z;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -566,7 +566,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = SFJJBDCU6Z;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

lib/bloc/customer_change/customer_change_bloc.dart

@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:aitrainer_app/model/cache.dart';
 import 'package:aitrainer_app/repository/customer_repository.dart';
 import 'package:aitrainer_app/util/common.dart';
-import 'package:aitrainer_app/util/trans.dart';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
@@ -14,7 +13,7 @@ import '../../model/fitness_state.dart';
 part 'customer_change_event.dart';
 part 'customer_change_state.dart';
 
-class CustomerChangeBloc extends Bloc<CustomerChangeEvent, CustomerChangeState> with Trans {
+class CustomerChangeBloc extends Bloc<CustomerChangeEvent, CustomerChangeState> {
   final CustomerRepository customerRepository;
   bool visiblePassword = false;
   int? year = 1990;
@@ -138,33 +137,27 @@ class CustomerChangeBloc extends Bloc<CustomerChangeEvent, CustomerChangeState>
   }
 
   bool validation() {
+    if (customerRepository.customer == null) throw Exception("Customer object not defined");
     return true;
-    /* print("f " + customerRepository.customer.firstname);
+    /* return (emailValidation(customerRepository.customer!.email) == null) &&
-    return (emailValidation(customerRepository.customer.email) == null) &&
+        (passwordValidation(customerRepository.customer!.password) == null) &&
-        (passwordValidation(customerRepository.customer.password) == null) &&
+        (nameValidation(customerRepository.customer!.firstname) == null) &&
-        (nameValidation(customerRepository.customer.firstname) == null) &&
+        (nameValidation(customerRepository.customer!.name) == null); */
-        (nameValidation(customerRepository.customer.name) == null); */
   }
 
-  String? emailValidation(String email) {
+  String? emailValidation(String? email) {
     String? message = Common.emailValidation(email);
-    if (message != null) {
-      message = t(message);
-    }
     return message;
   }
 
-  String? passwordValidation(String value) {
+  String? passwordValidation(String? value) {
     String? message = Common.passwordValidation(value);
-    if (message != null) {
-      message = t(message);
-    }
     return message;
   }
 
   String? nameValidation(String? value) {
     if (value == null || value.length == 0) {
-      return t("Name too short");
+      return "Name too short";
     }
     return null;
   }

lib/repository/customer_repository.dart

@@ -101,27 +101,27 @@ class CustomerRepository with Logging {
   }
 
   setName(String name) {
-    if (this.customer == null) return;
+    if (this.customer == null) throw Exception("Initialize the customer object");
     this.customer!.name = name;
   }
 
   setFirstName(String firstName) {
-    if (this.customer == null) return;
+    if (this.customer == null) throw Exception("Initialize the customer object");
     this.customer!.firstname = firstName;
   }
 
   setPassword(String password) {
-    if (this.customer == null) return;
+    if (this.customer == null) throw Exception("Initialize the customer object");
     this.customer!.password = password;
   }
 
   setEmail(String email) {
-    if (this.customer == null) return;
+    if (this.customer == null) throw Exception("Initialize the customer object");
     this.customer!.email = email;
   }
 
   setSex(String sex) {
-    if (this.customer == null) return;
+    if (this.customer == null) throw Exception("Initialize the customer object");
     this.customer!.sex = sex;
   }
 

lib/view/customer_fitness_page.dart

@@ -82,7 +82,12 @@ class _CustomerFitnessPageState extends State<CustomerFitnessPage> with Trans {
                             Text(
                               t("Your Fitness State"),
                               textAlign: TextAlign.center,
-                              style: TextStyle(color: Colors.orange, fontSize: 42, fontFamily: 'Arial', fontWeight: FontWeight.w900),
+                              style: TextStyle(
+                                color: Colors.orange,
+                                fontSize: 42,
+                                fontFamily: 'Arial',
+                                fontWeight: FontWeight.w900,
+                              ),
                             )
                           ]),
                       Divider(),

lib/view/customer_goal_page.dart

@@ -68,14 +68,17 @@ class _CustomerGoalPage extends State<CustomerGoalPage> with Trans {
                 child: Column(
                   children: [
                     Divider(),
-                    InkWell(
+                    Wrap(alignment: WrapAlignment.center, children: [
-                      child: Text(
+                      Text(
                         AppLocalizations.of(context)!.translate("Set Your Goals"),
-                        style:
+                        style: GoogleFonts.archivoBlack(
-                            GoogleFonts.archivoBlack(color: Colors.orange, fontSize: 30, fontWeight: FontWeight.w900),
+                          color: Colors.orange,
+                          fontSize: 42,
+                          fontWeight: FontWeight.w900,
+                        ),
                       ),
-                      highlightColor: Colors.white,
+                    ]),
-                    ),
+                    Divider(),
                     Stack(alignment: Alignment.bottomLeft, children: [
                       TextButton(
                           style: TextButton.styleFrom(

lib/view/customer_modify_page.dart

@@ -114,19 +114,19 @@ class CustomerModifyPage extends StatelessWidget with Trans {
                         ),
                       ),
                       initialValue: customerBloc.customerRepository.customer!.email,
-                      autovalidateMode: AutovalidateMode.always,
+                      autovalidateMode: AutovalidateMode.onUserInteraction,
                       validator: (val) {
-                        String? validator = customerBloc.emailValidation(val!);
+                        String? validator = customerBloc.emailValidation(val);
                         return validator == null ? null : t(validator);
                       },
                       keyboardType: TextInputType.emailAddress,
                       style: new TextStyle(fontSize: 16, color: Colors.indigo),
-                    )
+                      onChanged: (value) => {customerBloc.add(CustomerEmailChange(email: value))})
                   : Offstage(),
               Divider(
                 color: Colors.transparent,
               ),
-              Cache().getLoginType() == LoginType.email
+              /*  Cache().getLoginType() == LoginType.email
                   ? TextFormField(
                       key: LibraryKeys.loginPasswordField,
                       obscureText: true,
@@ -149,13 +149,14 @@ class CustomerModifyPage extends StatelessWidget with Trans {
                       initialValue: customerBloc.customerRepository.customer!.password,
                       autovalidateMode: AutovalidateMode.onUserInteraction,
                       validator: (val) {
-                        String? validator = customerBloc.passwordValidation(val!);
+                        String? validator = customerBloc.passwordValidation(val);
                         return validator == null ? null : t(validator);
                       },
                       keyboardType: TextInputType.visiblePassword,
                       style: new TextStyle(fontSize: 16, color: Colors.indigo),
+                      onChanged: (value) => {customerBloc.add(CustomerPasswordChange(password: value))})
                     )
-                  : Offstage(),
+                  : Offstage(), */
               Divider(
                 color: Colors.transparent,
               ),
@@ -175,7 +176,8 @@ class CustomerModifyPage extends StatelessWidget with Trans {
                       initialValue: customerBloc.customerRepository.customer!.name,
                       autovalidateMode: AutovalidateMode.onUserInteraction,
                       validator: (val) {
-                        return customerBloc.nameValidation(val);
+                        String? validator = customerBloc.nameValidation(val);
+                        return validator == null ? null : t(validator);
                       },
                       keyboardType: TextInputType.name,
                       style: new TextStyle(fontSize: 16, color: Colors.indigo),
@@ -200,7 +202,8 @@ class CustomerModifyPage extends StatelessWidget with Trans {
                       initialValue: customerBloc.customerRepository.customer!.firstname,
                       autovalidateMode: AutovalidateMode.onUserInteraction,
                       validator: (val) {
-                        return customerBloc.nameValidation(val);
+                        String? validator = customerBloc.nameValidation(val);
+                        return validator == null ? null : t(validator);
                       },
                       keyboardType: TextInputType.name,
                       style: new TextStyle(fontSize: 16, color: Colors.indigo),

lib/widgets/menu_page_widget.dart

@@ -348,9 +348,6 @@ class _MenuPageWidgetState extends State<MenuPageWidget> with Trans, Logging {
                         );
                       }))
               : Offstage(),
-          SizedBox(
-            width: 10,
-          ),
         ]));
     return sliverAppBar;
   }

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.10+63
+version: 1.1.10+64
 
 environment:
   sdk: ">=2.12.0 <3.0.0"