test: criado service_dto_test

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
-    repositories {
+    ext.kotlin_version = '1.7.10'
+        repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

lib/app_module.dart

@@ -0,0 +1,32 @@
+import 'package:flutter_modular/flutter_modular.dart';
+import 'package:agenda/modules/clients/data/datasources/client_datasource.dart';
+import 'package:agenda/modules/clients/data/datasources/local/client_datasource_local_datasource_impl.dart';
+import 'package:agenda/modules/professional/professional_module.dart';
+//view
+import '../modules/start/presenter/view/start_page.dart';
+//controller
+import '../modules/start/presenter/controller/start_controller.dart';
+//module
+import 'package:agenda/modules/clients/clients_module.dart';
+
+
+class AppModule extends Module {
+  @override
+  List<Bind> get binds => [
+        Bind.singleton((i) => StartController()),
+        Bind.singleton<ClientDataSource>((i) => ClientLocalDataSourceImpl()),
+
+      ];
+
+  @override
+  List<ModularRoute> get routes => [
+        ChildRoute(
+          '/',
+          child: (context, args) => const StartPage(),
+          children: [
+            ModuleRoute('/clients', module: ClientsModule()),
+            ModuleRoute('/professional', module: ProfessionalModule()),
+          ],
+        ),
+      ];
+}

lib/src/appwidget.dart → lib/appwidget.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_modular/flutter_modular.dart';
-import 'shared/utils/app_theme.dart';
+import 'package:agenda/core/utils/app_theme.dart';
 
 class MyApp extends StatelessWidget {
   const MyApp({Key? key}) : super(key: key);

lib/core/utils/app_textstyle.dart

@@ -33,4 +33,20 @@ class AppTextStyle {
     fontSize: 14,
     fontWeight: FontWeight.normal,
   );
+
+  TextStyle appBar = TextStyle(
+    fontWeight: FontWeight.bold,
+    fontSize: 20,
+    color: AppColor.instance.primary,
+  );
+
+  TextStyle titleLarge = TextStyle(
+    color: AppColor.instance.primaryText,
+    fontSize: 13,
+  );
+
+  TextStyle labelText = TextStyle(
+    color: AppColor.instance.primaryText,
+    fontSize: 14,
+  );
 }

lib/core/utils/app_theme.dart

@@ -12,16 +12,10 @@ class AppTheme {
       dividerColor: AppColor.instance.accent3,
       scaffoldBackgroundColor: AppColor.instance.primaryBackground,
       textTheme: TextTheme(
-        headline6: TextStyle(
-          color: AppColor.instance.primaryText,
-          fontSize: 13,
-        ),
+        titleLarge: AppTextStyle.instance.titleLarge,
       ),
       inputDecorationTheme: InputDecorationTheme(
-        labelStyle: TextStyle(
-          color: AppColor.instance.primaryText,
-          fontSize: 14,
-        ),
+        labelStyle:AppTextStyle.instance.labelText,
         hintStyle: AppTextStyle.instance.hintText,
         contentPadding: const EdgeInsets.symmetric(
           vertical: 20.0,

lib/main.dart

@@ -1,8 +1,8 @@
-import 'package:agenda/src/app_module.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_modular/flutter_modular.dart';
-import 'src/appwidget.dart';
 import 'package:intl/date_symbol_data_local.dart';
+import 'package:agenda/app_module.dart';
+import 'package:agenda/appwidget.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();

lib/src/features/clients/clients_module.dart → lib/modules/clients/clients_module.dart

@@ -1,10 +1,9 @@
 import 'package:flutter_modular/flutter_modular.dart';
 //contoller
-//import 'home/store/clientehome_store.dart';
-import 'newclient/controller/newclient_controller.dart';
+import 'presenter/newclient/controller/newclient_controller.dart';
 //view
-import 'home/view/home.dart';
-import 'newclient/view/newclient.dart';
+import 'presenter/home/view/client_view.dart';
+import 'presenter/newclient/view/newclient_view.dart';
 
 class ClientsModule extends Module {
   @override

lib/modules/clients/data/datasources/local/client_datasource_local_datasource_impl.dart

@@ -10,7 +10,7 @@ import '../client_datasource.dart';
 
 class ClientLocalDataSourceImpl implements ClientDataSource {
   Database? _dataBase;
-  final _clienteStore = intMapStoreFactory.store('clientes');
+  final _clientStore = intMapStoreFactory.store('client');
 
 
   ClientLocalDataSourceImpl();
@@ -23,7 +23,7 @@ class ClientLocalDataSourceImpl implements ClientDataSource {
     } else {
       _dir = await Directory.systemTemp.createTemp();
     }
-    final dBPath = join(_dir.path, 'Clientes.db');
+    final dBPath = join(_dir.path, 'client.db');
     _dataBase = await databaseFactoryIo.openDatabase(dBPath);
     return _dataBase;
   }
@@ -34,7 +34,7 @@ class ClientLocalDataSourceImpl implements ClientDataSource {
       //ordem alfabetica
       SortOrder('name'),
     ]);
-    final recordSnapshots = await _clienteStore.find(
+    final recordSnapshots = await _clientStore.find(
       await _initDatabase() as Database,
       finder: finder,
     );
@@ -48,7 +48,7 @@ class ClientLocalDataSourceImpl implements ClientDataSource {
   Future<ClientDto> getClient({required int id}) async{
     final filter = Finder(filter: Filter.equals('id', id));
     var dataBase = await _initDatabase() as Database;
-    var snapshot = await _clienteStore.query(finder: filter).getSnapshot(dataBase);
+    var snapshot = await _clientStore.query(finder: filter).getSnapshot(dataBase);
     final result = ClientDto.fromJson(snapshot!.value);
     return result;
   }
@@ -57,15 +57,15 @@ class ClientLocalDataSourceImpl implements ClientDataSource {
   Future<void> deleteClient({required int id}) async {
     final find = Finder(filter: Filter.equals('id', id));
     var dataBase =  await _initDatabase() as Database;
-    await _clienteStore.delete(dataBase, finder: find);
+    await _clientStore.delete(dataBase, finder: find);
   }
 
   @override
   Future<ClientDto> updateClient({required ClientDto client}) async{
     final find = Finder(filter: Filter.equals('id', client.id));
     var dataBase =  await _initDatabase() as Database;
-    await _clienteStore.update(dataBase, client.toJson(), finder: find);
-    var snapshot = await _clienteStore.query(finder: find).getSnapshot(dataBase);
+    await _clientStore.update(dataBase, client.toJson(), finder: find);
+    var snapshot = await _clientStore.query(finder: find).getSnapshot(dataBase);
     final ClientDto result = ClientDto.fromJson(snapshot!.value);
     return result;
   }
@@ -80,9 +80,9 @@ class ClientLocalDataSourceImpl implements ClientDataSource {
     final result = await dataBase.transaction(
       (txn) async {
         // Add the object, get the auto incremented id
-        var key = await _clienteStore.add(txn, client.toJson());
+        var key = await _clientStore.add(txn, client.toJson());
         // Set the Id in our object
-        await _clienteStore.update(txn, {'id': key}, finder: find);
+        await _clientStore.update(txn, {'id': key}, finder: find);
       },
     );
     return result;