Fix bugs

longhoang2984 · Nov 26, 2021 · b5f08b7 · b5f08b7
1 parent dfeccb4
commit b5f08b7
Show file tree

Hide file tree

Showing 4 changed files with 434 additions and 391 deletions.
diff --git a/lib/domain/core/value_validators.dart b/lib/domain/core/value_validators.dart
@@ -6,7 +6,7 @@ Either<ValueFailure<String>, String> validateEmail(String value) {
   const String pattern =
       r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$';
   final RegExp regex = RegExp(pattern);
-  if (!regex.hasMatch(value) && value.isNotEmpty) {
+  if (!regex.hasMatch(value)) {
     return left(
       ValueFailure.invalidEmail(failedValue: value),
     );
@@ -16,7 +16,7 @@ Either<ValueFailure<String>, String> validateEmail(String value) {
 }
 
 Either<ValueFailure<String>, String> validatePassword(String value) {
-  if (value.isNotEmpty && value.length < 6) {
+  if (value.length < 6) {
     return left(
       ValueFailure.shortPassword(failedValue: value),
     );

diff --git a/lib/presentation/home/widgets/notes_body.dart b/lib/presentation/home/widgets/notes_body.dart
@@ -48,67 +48,73 @@ class NoteBody extends HookWidget {
           ),
         ),
       ),
-      body: BlocBuilder<NoteWatcherBloc, NoteWatcherState>(
-        builder: (context, state) {
-          return WidgetHUD(
-            showHUD: state == const NoteWatcherState.loadInProgress(),
-            hud: HUD(
-              progressIndicator: const CircularProgressIndicator(
-                color: ColorName.primarySecond,
-              ),
-            ),
-            builder: (context) {
-              return Container(
-                padding: const EdgeInsets.only(
-                  top: 70.0,
-                  bottom: 40.0,
-                  left: 48.0,
-                  right: 8.0,
-                ),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Row(
-                      children: [
-                        Expanded(
-                          child: Text(
-                            LocaleKeys.notes.tr(),
-                            style: BaseTextStyle.style(
-                              style: FontStyle.extrabold,
-                              fontSize: 40.0,
-                            ),
-                          ),
-                        ),
-                        GestureDetector(
-                          onTap: () => context
-                              .read<AuthBloc>()
-                              .add(const AuthEvent.logout()),
-                          child: Container(
-                            width: 40,
-                            height: 40,
-                            padding: const EdgeInsets.all(8.0),
-                            child: Assets.images.icLogout.image(
-                              height: 20.0,
-                            ),
-                          ),
-                        )
-                      ],
+      body: Container(
+        padding: const EdgeInsets.only(
+          top: 70.0,
+          bottom: 40.0,
+          left: 48.0,
+          right: 8.0,
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: Text(
+                    LocaleKeys.notes.tr(),
+                    style: BaseTextStyle.style(
+                      style: FontStyle.extrabold,
+                      fontSize: 40.0,
                     ),
-                    NoteStatus(
-                      onNoteStatusChanged: (status) {
-                        toggleState.value = status;
-                      },
+                  ),
+                ),
+                GestureDetector(
+                  onTap: () =>
+                      context.read<AuthBloc>().add(const AuthEvent.logout()),
+                  child: Container(
+                    width: 40,
+                    height: 40,
+                    padding: const EdgeInsets.all(8.0),
+                    child: Assets.images.icLogout.image(
+                      height: 20.0,
                     ),
-                    NotesList(
-                      onNoteChanged: () =>
-                          _onNoteChanged(context, toggleState.value),
+                  ),
+                )
+              ],
+            ),
+            NoteStatus(
+              onNoteStatusChanged: (status) {
+                toggleState.value = status;
+              },
+            ),
+            const SizedBox(
+              height: 20,
+            ),
+            BlocBuilder<NoteWatcherBloc, NoteWatcherState>(
+              builder: (context, state) {
+                return WidgetHUD(
+                  showHUD: state == const NoteWatcherState.loadInProgress(),
+                  hud: HUD(
+                    color: Colors.transparent,
+                    opacity: 0,
+                    progressIndicator: const LinearProgressIndicator(
+                      color: ColorName.primarySecond,
                     ),
-                  ],
-                ),
-              );
-            },
-          );
-        },
+                  ),
+                  builder: (context) {
+                    return NotesList(
+                      onNoteChanged: () {
+                        toggleState.value = false;
+                        _onNoteChanged(context, toggleState.value);
+                      },
+                    );
+                  },
+                );
+              },
+            ),
+          ],
+        ),
       ),
     );
   }