Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a lot of breaking changes and refactors #87

Merged
merged 10 commits into from
Oct 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions lib/src/app_config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
// 🌎 Project imports:
import 'package:enzitech_app/src/app_widget.dart';
import 'package:enzitech_app/src/shared/external/http_driver/dio_client.dart';
import 'package:enzitech_app/src/shared/services/user_prefs_service.dart';
import 'package:enzitech_app/src/shared/business/infra/implementations/services/user_prefs_service.dart';

Future<String?> getToken() async {
UserPrefsServices userPrefsServices = UserPrefsServices();
Expand Down Expand Up @@ -34,5 +34,3 @@ Future<void> initApp() async {
),
);
}

class AppConfig {}
98 changes: 12 additions & 86 deletions lib/src/app_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,16 @@ import 'package:flutter/material.dart';

// 📦 Package imports:
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:form_builder_validators/form_builder_validators.dart';
import 'package:provider/provider.dart';

// 🌎 Project imports:
import 'package:enzitech_app/src/features/auth/auth_controller.dart';
import 'package:enzitech_app/src/features/create_account/create_account_controller.dart';
import 'package:enzitech_app/src/features/create_enzyme/create_enzyme_controller.dart';
import 'package:enzitech_app/src/features/create_experiment/create_experiment_controller.dart';
import 'package:enzitech_app/src/features/create_treatment/create_treatment_controller.dart';
import 'package:enzitech_app/src/features/experiment_detailed/experiment_detailed_controller.dart';
import 'package:enzitech_app/src/features/home/fragments/account/account_controller.dart';
import 'package:enzitech_app/src/features/home/fragments/enzymes/enzymes_controller.dart';
import 'package:enzitech_app/src/features/home/fragments/experiments/experiments_controller.dart';
import 'package:enzitech_app/src/features/home/fragments/treatments/treatments_controller.dart';
import 'package:enzitech_app/src/features/home/home_controller.dart';
import 'package:enzitech_app/src/features/recover_password/recover_password_controller.dart';
import 'package:enzitech_app/src/shared/business/infra/implementations/providers/config_providers.dart';
import 'package:enzitech_app/src/shared/business/infra/implementations/providers/repo_providers.dart';
import 'package:enzitech_app/src/shared/business/infra/implementations/providers/viewmodel_providers.dart';
import 'package:enzitech_app/src/shared/external/http_driver/dio_client.dart';
import 'package:enzitech_app/src/shared/routes/route_generator.dart';
import 'package:enzitech_app/src/shared/services/auth_service.dart';
import 'package:enzitech_app/src/shared/services/enzymes_service.dart';
import 'package:enzitech_app/src/shared/services/experiments_service.dart';
import 'package:enzitech_app/src/shared/services/treatments_service.dart';
import 'package:enzitech_app/src/shared/services/user_prefs_service.dart';
import 'package:enzitech_app/src/shared/themes/app_complete_theme.dart';
import 'package:enzitech_app/src/shared/ui/themes/themes.dart';
import 'package:enzitech_app/src/shared/utilities/routes/route_generator.dart';

class AppWidget extends StatelessWidget {
final HttpDriverOptions httpDriverOptions;
Expand All @@ -37,72 +24,9 @@ class AppWidget extends StatelessWidget {
Widget build(BuildContext context) {
return MultiProvider(
providers: [
Provider(
create: (_) => DioClient(httpDriverOptions),
),
ChangeNotifierProvider(
create: (context) => AuthController(
context.read(),
AuthService(context.read()),
),
),
ChangeNotifierProvider(
create: (context) => CreateAccountController(
context.read(),
AuthService(context.read()),
),
),
ChangeNotifierProvider(
create: (context) => RecoverPasswordController(context.read()),
),
ChangeNotifierProvider(
create: (context) => AccountController(
UserPrefsServices(),
),
),
ChangeNotifierProvider(
create: (context) => ExperimentsController(
ExperimentsService(context.read()),
),
),
ChangeNotifierProvider(
create: (context) => CreateExperimentController(
ExperimentsService(context.read()),
),
),
ChangeNotifierProvider(
create: (context) => TreatmentsController(
TreatmentsService(context.read()),
),
),
ChangeNotifierProvider(
create: (context) => CreateTreatmentController(
TreatmentsService(context.read()),
),
),
ChangeNotifierProvider(
create: (context) => ExperimentDetailedController(
ExperimentsService(context.read()),
),
),
ChangeNotifierProvider(
create: (context) => EnzymesController(
EnzymesService(context.read()),
),
),
ChangeNotifierProvider(
create: (context) => CreateEnzymeController(
EnzymesService(context.read()),
),
),
ChangeNotifierProvider(
create: (context) => HomeController(
accountController: context.read(),
enzymesController: context.read(),
experimentsController: context.read(),
treatmentsController: context.read(),
),
),
...ConfigProviders.init(httpDriverOptions, context),
...RepoProviders.init(context),
...ViewmodelProviders.init(context),
],
child: GestureDetector(
onTap: () {
Expand All @@ -113,7 +37,7 @@ class AppWidget extends StatelessWidget {
},
child: MaterialApp(
debugShowCheckedModeBanner: false,
title: 'Flutter Demo',
title: 'Enzitech',
theme: ThemeData(
appBarTheme: const AppBarTheme(
iconTheme: IconThemeData(
Expand All @@ -128,7 +52,9 @@ class AppWidget extends StatelessWidget {
GlobalCupertinoLocalizations.delegate,
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
FormBuilderLocalizations.delegate,
],
supportedLocales: FormBuilderLocalizations.delegate.supportedLocales,
),
),
);
Expand Down
76 changes: 0 additions & 76 deletions lib/src/features/auth/auth_controller.dart

This file was deleted.

35 changes: 0 additions & 35 deletions lib/src/features/auth/components/auth_button.dart

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// 🐦 Flutter imports:

// 🐦 Flutter imports:
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
Expand All @@ -7,15 +9,16 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart';

// 🌎 Project imports:
import 'package:enzitech_app/src/features/auth/auth_controller.dart';
import 'package:enzitech_app/src/features/auth/components/auth_button.dart';
import 'package:enzitech_app/src/features/home/home_controller.dart';
import 'package:enzitech_app/src/shared/failures/failures.dart';
import 'package:enzitech_app/src/shared/routes/route_generator.dart';
import 'package:enzitech_app/src/shared/themes/app_complete_theme.dart';
import 'package:enzitech_app/src/shared/validator/validator.dart';
import 'package:enzitech_app/src/shared/widgets/ezt_snack_bar.dart';
import 'package:enzitech_app/src/shared/widgets/ezt_textfield.dart';
import 'package:enzitech_app/src/features/auth/ui/components/auth_button.dart';
import 'package:enzitech_app/src/features/auth/viewmodel/auth_viewmodel.dart';
import 'package:enzitech_app/src/features/home/viewmodel/home_viewmodel.dart';
import 'package:enzitech_app/src/shared/business/domain/enums/state_enum.dart';
import 'package:enzitech_app/src/shared/ui/themes/themes.dart';
import 'package:enzitech_app/src/shared/ui/widgets/ezt_snack_bar.dart';
import 'package:enzitech_app/src/shared/ui/widgets/ezt_textfield.dart';
import 'package:enzitech_app/src/shared/utilities/failures/failures.dart';
import 'package:enzitech_app/src/shared/utilities/routes/route_generator.dart';
import 'package:enzitech_app/src/shared/utilities/validator/validator.dart';

class AuthPage extends StatefulWidget {
const AuthPage({Key? key}) : super(key: key);
Expand All @@ -25,34 +28,36 @@ class AuthPage extends StatefulWidget {
}

class AuthPageState extends State<AuthPage> {
late final AuthController controller;
// late final AuthController controller;
late final AuthViewmodel viewmodel;

final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
final _emailFieldController = TextEditingController(text: '');
final _passwordFieldController = TextEditingController(text: '');

@override
void initState() {
super.initState();
controller = context.read<AuthController>();
viewmodel = context.read<AuthViewmodel>();

if (mounted) {
controller.addListener(() async {
if (controller.state == AuthState.error) {
viewmodel.addListener(() async {
if (viewmodel.state == StateEnum.error) {
EZTSnackBar.show(
context,
HandleFailure.of(
controller.failure!,
viewmodel.failure!,
overrideDefaultMessage: true,
),
eztSnackBarType: EZTSnackBarType.error,
);
} else if (controller.state == AuthState.success && mounted) {
Provider.of<HomeController>(context, listen: false)
} else if (viewmodel.state == StateEnum.success && mounted) {
Provider.of<HomeViewmodel>(context, listen: false)
.getContent()
.then((value) {
EZTSnackBar.show(
context,
"Bem vindo(a) ${controller.loggedName}!",
"Bem vindo(a) ${viewmodel.loggedName}!",
eztSnackBarType: EZTSnackBarType.success,
);

Expand Down Expand Up @@ -83,7 +88,7 @@ class AuthPageState extends State<AuthPage> {
usePrimaryColorOnFocusedBorder: true,
keyboardType: TextInputType.emailAddress,
controller: _emailFieldController,
onChanged: (value) => controller.setEmail(value),
onChanged: (value) => viewmodel.setEmail(value),
fieldValidator: fieldValidator,
disableSuffixIcon: true,
);
Expand All @@ -103,7 +108,7 @@ class AuthPageState extends State<AuthPage> {
labelText: "Senha",
usePrimaryColorOnFocusedBorder: true,
controller: _passwordFieldController,
onChanged: (value) => controller.setPassword(value),
onChanged: (value) => viewmodel.setPassword(value),
obscureText: true,
fieldValidator: fieldValidator,
);
Expand Down
36 changes: 36 additions & 0 deletions lib/src/features/auth/ui/components/auth_button.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// 🐦 Flutter imports:
import 'package:flutter/material.dart';

// 📦 Package imports:
import 'package:provider/provider.dart';

// 🌎 Project imports:
import 'package:enzitech_app/src/features/auth/viewmodel/auth_viewmodel.dart';
import 'package:enzitech_app/src/features/home/viewmodel/home_viewmodel.dart';
import 'package:enzitech_app/src/shared/business/domain/enums/state_enum.dart';
import 'package:enzitech_app/src/shared/ui/widgets/ezt_button.dart';

class AuthButton extends StatelessWidget {
final GlobalKey<FormState> formKey;
const AuthButton({Key? key, required this.formKey}) : super(key: key);

@override
Widget build(BuildContext context) {
final viewmodel = context.watch<AuthViewmodel>();

return EZTButton(
text: 'Entrar',
eztButtonType: EZTButtonType.checkout,
loading: viewmodel.state == StateEnum.loading ||
Provider.of<HomeViewmodel>(context, listen: false).state ==
StateEnum.loading,
onPressed: viewmodel.state == StateEnum.loading
? null
: () {
if (formKey.currentState!.validate()) {
viewmodel.loginAction();
}
},
);
}
}
Loading