refactor(form_flow): support for patterns

NoScopeDevs · Jul 24, 2023 · ec39cd3 · ec39cd3
1 parent 1b69a9d
commit ec39cd3
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 64 deletions.
diff --git a/examples/form_flow/lib/app/bloc/app_event.dart b/examples/form_flow/lib/app/bloc/app_event.dart
@@ -1,15 +1,15 @@
 part of 'app_bloc.dart';
 
-abstract class AppEvent extends Equatable {
+sealed class AppEvent extends Equatable {
   const AppEvent();
 
   @override
   List<Object> get props => [];
 }
 
-class AppLogoutRequested extends AppEvent {}
+final class AppLogoutRequested extends AppEvent {}
 
-class AppSignUpCompleted extends AppEvent {
+final class AppSignUpCompleted extends AppEvent {
   const AppSignUpCompleted(this.user);
 
   final User user;

diff --git a/examples/form_flow/lib/app/bloc/app_state.dart b/examples/form_flow/lib/app/bloc/app_state.dart
@@ -1,15 +1,15 @@
 part of 'app_bloc.dart';
 
-abstract class AppState extends Equatable {
+sealed class AppState extends Equatable {
   const AppState();
 
   @override
   List<Object> get props => [];
 }
 
-class AppUnauthenticated extends AppState {}
+final class AppUnauthenticated extends AppState {}
 
-class AppAuthenticated extends AppState {
+final class AppAuthenticated extends AppState {
   const AppAuthenticated(this.user);
 
   final User user;

diff --git a/examples/form_flow/lib/app/routes/routes.dart b/examples/form_flow/lib/app/routes/routes.dart
@@ -7,9 +7,8 @@ List<Page<void>> onGenerateAppViewPages(
   AppState state,
   List<Page<void>> pages,
 ) {
-  if (state is AppAuthenticated) {
-    return [ProfilePage.page(state.user)];
-  } else {
-    return [SignUpPage.page()];
-  }
+  return switch (state) {
+    AppAuthenticated() => [ProfilePage.page(state.user)],
+    AppUnauthenticated() => [SignUpPage.page()],
+  };
 }
diff --git a/examples/form_flow/lib/signup/bloc/sign_up_event.dart b/examples/form_flow/lib/signup/bloc/sign_up_event.dart
@@ -1,10 +1,10 @@
 part of 'sign_up_bloc.dart';
 
-abstract class SignUpEvent extends Equatable {
+sealed class SignUpEvent extends Equatable {
   const SignUpEvent();
 }
 
-class SignUpCredentialsSubmitted extends SignUpEvent {
+final class SignUpCredentialsSubmitted extends SignUpEvent {
   const SignUpCredentialsSubmitted({
     required this.email,
     required this.name,
@@ -17,7 +17,7 @@ class SignUpCredentialsSubmitted extends SignUpEvent {
   List<Object> get props => [email, name];
 }
 
-class SignUpBiographySubmitted extends SignUpEvent {
+final class SignUpBiographySubmitted extends SignUpEvent {
   const SignUpBiographySubmitted(this.biography);
 
   final String biography;
@@ -26,7 +26,7 @@ class SignUpBiographySubmitted extends SignUpEvent {
   List<Object> get props => [biography];
 }
 
-class SignUpPinSubmitted extends SignUpEvent {
+final class SignUpPinSubmitted extends SignUpEvent {
   const SignUpPinSubmitted(this.pin);
 
   final String pin;

diff --git a/examples/form_flow/lib/signup/credentials/view/credentials_form.dart b/examples/form_flow/lib/signup/credentials/view/credentials_form.dart
@@ -31,18 +31,13 @@ class _EmailInput extends StatelessWidget {
         return TextField(
           key: const Key('credentialsForm_emailInput_textField'),
           autocorrect: false,
-          onChanged: (email) {
-            context.read<CredentialsCubit>().changeEmail(email);
-          },
+          onChanged: context.read<CredentialsCubit>().changeEmail,
           decoration: InputDecoration(
             labelText: l10n.emailInputLabelText,
-            errorText: () {
-              if (state.isPure) return null;
-              return switch (state.error) {
-                EmailValidationError.invalid => l10n.invalidEmailInputErrorText,
-                null => null,
-              };
-            }(),
+            errorText: switch (state.error) {
+              EmailValidationError.invalid => l10n.invalidEmailInputErrorText,
+              null => null,
+            },
           ),
         );
       },
@@ -63,18 +58,13 @@ class _NameInput extends StatelessWidget {
           key: const Key('credentialsForm_nameInput_textField'),
           autocorrect: false,
           textCapitalization: TextCapitalization.words,
-          onChanged: (name) {
-            context.read<CredentialsCubit>().changeName(name);
-          },
+          onChanged: context.read<CredentialsCubit>().changeName,
           decoration: InputDecoration(
             labelText: l10n.nameInputLabelText,
-            errorText: () {
-              if (state.isPure) return null;
-              return switch (state.error) {
-                NameValidationError.tooShort => l10n.shortNameInputErrorText,
-                null => null,
-              };
-            }(),
+            errorText: switch (state.error) {
+              NameValidationError.tooShort => l10n.shortNameInputErrorText,
+              null => null,
+            },
           ),
         );
       },

diff --git a/examples/form_flow/lib/signup/credentials/view/credentials_page.dart b/examples/form_flow/lib/signup/credentials/view/credentials_page.dart
@@ -6,8 +6,11 @@ import 'package:form_flow/signup/signup.dart';
 class CredentialsPage extends StatelessWidget {
   const CredentialsPage({super.key});
 
-  static Page<void> page() =>
-      const MaterialPage<void>(child: CredentialsPage());
+  static Page<void> page() {
+    return const MaterialPage<void>(
+      child: CredentialsPage(),
+    );
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -43,9 +46,7 @@ class _SubmitButton extends StatelessWidget {
     final l10n = context.l10n;
     return BlocBuilder<CredentialsCubit, CredentialsState>(
       builder: (context, state) {
-        if (!state.isValid || state.isPure) {
-          return const SizedBox.shrink();
-        }
+        if (!state.isValid || state.isPure) return const SizedBox.shrink();
 
         return FloatingActionButton.extended(
           key: const Key('credentialsPage_submitButton_floatingActionButton'),

diff --git a/examples/form_flow/lib/signup/pin/view/pin_page.dart b/examples/form_flow/lib/signup/pin/view/pin_page.dart
@@ -49,20 +49,17 @@ class _PinInput extends StatelessWidget {
           key: const Key('pinView_pinInput_textField'),
           autocorrect: false,
           obscureText: true,
-          onChanged: (pin) => context.read<PinCubit>().changePin(pin),
-          decoration: InputDecoration(
-            labelText: l10n.pinInputLabelText,
-            errorText: () {
-              if (state.isPure) return null;
-              return switch (state.error) {
-                PinValidationError.invalid => l10n.invalidPinInputErrorText,
-                null => null
-              };
-            }(),
-          ),
+          onChanged: context.read<PinCubit>().changePin,
           inputFormatters: [
             LengthLimitingTextInputFormatter(PinFormInput.maxLength),
           ],
+          decoration: InputDecoration(
+            labelText: l10n.pinInputLabelText,
+            errorText: switch (state.error) {
+              PinValidationError.invalid => l10n.invalidPinInputErrorText,
+              null => null
+            },
+          ),
         );
       },
     );

diff --git a/examples/form_flow/lib/signup/routes/routes.dart b/examples/form_flow/lib/signup/routes/routes.dart
@@ -5,11 +5,12 @@ List<Page<void>> onGenerateSignUpPages(
   SignUpState state,
   List<Page<void>> pages,
 ) {
-  if (state.user.email.isEmpty && state.user.name.isEmpty) {
-    return [CredentialsPage.page()];
-  } else if (state.user.biography.isEmpty) {
-    return [BiographyPage.page()];
-  } else {
-    return [PinPage.page()];
-  }
+  return switch (state) {
+    SignUpState(user: final user) when user.email.isEmpty && user.pin.isEmpty =>
+      [CredentialsPage.page()],
+    SignUpState(user: final user) when user.biography.isEmpty => [
+        BiographyPage.page()
+      ],
+    _ => [PinPage.page()],
+  };
 }
diff --git a/examples/form_flow/test/helpers/mocks.dart b/examples/form_flow/test/helpers/mocks.dart
@@ -35,14 +35,8 @@ class MockUser extends Mock implements User {}
 
 class FakeBloc extends Fake implements Bloc<Object, Object> {}
 
-class FakeAppState extends Fake implements AppState {}
-
-class FakeAppEvent extends Fake implements AppEvent {}
-
 class FakeSignUpState extends Fake implements SignUpState {}
 
-class FakeSignUpEvent extends Fake implements SignUpEvent {}
-
 class FakeCredentialsState extends Fake implements CredentialsState {}
 
 class FakeBiographyState extends Fake implements BiographyState {}