From a9b813f29a189245bf599e1efb297afafd143c01 Mon Sep 17 00:00:00 2001 From: Reginaldo Date: Fri, 14 Apr 2023 17:25:14 -0300 Subject: [PATCH] =?UTF-8?q?ajustes=20nas=20telas=20configura=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/{utils => config}/color_palette.dart | 0 lib/{utils => config}/const_variable.dart | 0 lib/{utils => config}/routes.dart | 10 ++-- lib/main.dart | 4 +- lib/screens/attendance_list_screen.dart | 4 +- .../{ => configurations}/about_screen.dart | 43 +++++++++---- .../clear_data_screen.dart | 60 +++++++++++++------ .../import_sigtap_screen.dart | 49 ++++++++++----- .../main_procedures_screen.dart | 12 ++-- .../sinc_data_screen.dart | 44 ++++++++++---- lib/screens/edit_procedures_screen.dart | 4 +- lib/screens/home_screen.dart | 4 +- lib/screens/load_init_screen.dart | 5 +- lib/screens/login/login_load_screen.dart | 4 +- lib/screens/login/login_saved_screen.dart | 4 +- lib/screens/login/sync_login_screen.dart | 4 +- .../register_citizen_screen.dart | 6 +- .../register_home_screen.dart | 4 +- .../register_individual_screen.dart | 4 +- .../select_service/service_home_screen.dart | 4 +- .../service_individual_screen.dart | 4 +- lib/screens/splash_screen.dart | 2 +- lib/screens/sync_init_screen.dart | 2 +- lib/widgets/alert_dialog_default.dart | 6 +- lib/widgets/alert_dialog_search_stateful.dart | 2 +- lib/widgets/alert_dialog_settings.dart | 2 +- lib/widgets/appbar_default.dart | 2 +- lib/widgets/button_default.dart | 4 +- lib/widgets/check_box_subtitle.dart | 2 +- lib/widgets/check_box_two_subtitle.dart | 2 +- lib/widgets/dropdown_button_city.dart | 6 +- lib/widgets/dropdown_button_default.dart | 5 +- lib/widgets/dropdown_with_subtitle.dart | 5 +- lib/widgets/icon_button_default.dart | 2 +- lib/widgets/input_search_text.dart | 4 +- lib/widgets/input_text.dart | 3 +- lib/widgets/input_with_subtitle.dart | 3 +- lib/widgets/item_alert_settings.dart | 4 +- lib/widgets/item_citizen.dart | 4 +- lib/widgets/onbackbutton.dart | 3 +- lib/widgets/subtitle_appbar_citizen.dart | 2 +- lib/widgets/subtitle_containers.dart | 2 +- lib/widgets/switch_with_subtitle.dart | 2 +- lib/widgets/text_default.dart | 2 +- lib/widgets/title_containers.dart | 4 +- 45 files changed, 209 insertions(+), 139 deletions(-) rename lib/{utils => config}/color_palette.dart (100%) rename lib/{utils => config}/const_variable.dart (100%) rename lib/{utils => config}/routes.dart (86%) rename lib/screens/{ => configurations}/about_screen.dart (69%) rename lib/screens/{ => configurations}/clear_data_screen.dart (58%) rename lib/screens/{ => configurations}/import_sigtap_screen.dart (59%) rename lib/screens/{ => configurations}/main_procedures_screen.dart (96%) rename lib/screens/{ => configurations}/sinc_data_screen.dart (66%) diff --git a/lib/utils/color_palette.dart b/lib/config/color_palette.dart similarity index 100% rename from lib/utils/color_palette.dart rename to lib/config/color_palette.dart diff --git a/lib/utils/const_variable.dart b/lib/config/const_variable.dart similarity index 100% rename from lib/utils/const_variable.dart rename to lib/config/const_variable.dart diff --git a/lib/utils/routes.dart b/lib/config/routes.dart similarity index 86% rename from lib/utils/routes.dart rename to lib/config/routes.dart index 33850a8..0d0e3f9 100644 --- a/lib/utils/routes.dart +++ b/lib/config/routes.dart @@ -1,13 +1,13 @@ -import 'package:rkm/screens/about_screen.dart'; +import 'package:rkm/screens/configurations/about_screen.dart'; import 'package:rkm/screens/attendance_list_screen.dart'; import 'package:rkm/screens/home_screen.dart'; import 'package:rkm/screens/select_service/eligibility_assessment_screen.dart'; import 'package:rkm/screens/splash_screen.dart'; -import '../screens/clear_data_screen.dart'; +import '../screens/configurations/clear_data_screen.dart'; import '../screens/edit_procedures_screen.dart'; -import '../screens/import_sigtap_screen.dart'; +import '../screens/configurations/import_sigtap_screen.dart'; import '../screens/login/login_load_screen.dart'; -import '../screens/main_procedures_screen.dart'; +import '../screens/configurations/main_procedures_screen.dart'; import '../screens/registers_citizen/register_citizen_screen.dart'; import '../screens/select_service/complementary_sheet_screen.dart'; import '../screens/select_service/consumption_markers_screen.dart'; @@ -16,7 +16,7 @@ import '../screens/select_service/procedures_screen.dart'; import '../screens/select_service/service_dental_screen.dart'; import '../screens/select_service/service_home_screen.dart'; import '../screens/select_service/service_individual_screen.dart'; -import '../screens/sinc_data_screen.dart'; +import '../screens/configurations/sinc_data_screen.dart'; var routes = { '/home': (context) => HomeScreen(), diff --git a/lib/main.dart b/lib/main.dart index 685b098..032b854 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; -import 'package:rkm/utils/routes.dart'; +import 'package:rkm/config/color_palette.dart'; +import 'package:rkm/config/routes.dart'; void main() { runApp(const MyApp()); } diff --git a/lib/screens/attendance_list_screen.dart b/lib/screens/attendance_list_screen.dart index 37a896b..43fe84d 100644 --- a/lib/screens/attendance_list_screen.dart +++ b/lib/screens/attendance_list_screen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/color_palette.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/text_default.dart'; import '../widgets/appbar_default.dart'; diff --git a/lib/screens/about_screen.dart b/lib/screens/configurations/about_screen.dart similarity index 69% rename from lib/screens/about_screen.dart rename to lib/screens/configurations/about_screen.dart index 30f0625..f78201e 100644 --- a/lib/screens/about_screen.dart +++ b/lib/screens/configurations/about_screen.dart @@ -1,10 +1,12 @@ import 'package:flutter/material.dart'; import 'package:package_info_plus/package_info_plus.dart'; -import 'package:rkm/utils/color_palette.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/color_palette.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/button_default.dart'; import 'package:rkm/widgets/text_default.dart'; +import '../../service/shared_preferences/shared_preferences_service.dart'; + class AboutScreen extends StatefulWidget { @override @@ -16,6 +18,22 @@ class _AboutScreenState extends State { String version = ''; + String mode =''; + + @override + void initState() { + super.initState(); + dataSQLite(); + } + + dataSQLite()async{ + final PrefService _preferences = PrefService(); + _preferences.readCacheModel('user', 'password', 'city', 'mode').then((list){ + setState(() { + mode = list[3]; + }); + }); + } getVersion()async{ await PackageInfo.fromPlatform().then((value){ @@ -51,21 +69,20 @@ class _AboutScreenState extends State { body: Container( width: double.infinity, height: double.infinity, - decoration: ConstVariable().backgroundGradient, + decoration: BoxDecoration( + color: ColorPalette.grayBackground, + image: DecorationImage( + fit: BoxFit.fitHeight, + image: AssetImage('assets/images/load_image.png'), + ) + ), child: Container( padding: EdgeInsets.symmetric(vertical: 70), child: Column( children: [ Image.asset('assets/images/logo.PNG',width: width*0.5,), - Padding( - padding: const EdgeInsets.symmetric(vertical: 10.0), - child: TextDefault( - text: 'HOMOLOGAÇÃO', - color: ColorPalette.red, - fontSize: 30, - fontWeigth: FontWeight.bold, - ), - ), + mode == 'homologacao'?Image.asset('assets/images/homologacao.png',width: width*0.4):Container(), + mode == 'desenvolvimento'?Image.asset('assets/images/desenvolvimento.png',width: width*0.4):Container(), Padding( padding: const EdgeInsets.symmetric(vertical: 5.0), child: TextDefault( @@ -75,12 +92,14 @@ class _AboutScreenState extends State { fontWeigth: FontWeight.bold, ), ), + SizedBox(height: 100,), Padding( padding: const EdgeInsets.symmetric(vertical: 5.0), child: TextDefault( text: 'RKM Sistemas Ltda.\n\n' '(19) 2532-2668\n\n' '(19) 2532-2669', + maxLines: 5, textAlign: TextAlign.center, color: ColorPalette.black54, fontSize: 20, diff --git a/lib/screens/clear_data_screen.dart b/lib/screens/configurations/clear_data_screen.dart similarity index 58% rename from lib/screens/clear_data_screen.dart rename to lib/screens/configurations/clear_data_screen.dart index 0a95f5f..780f121 100644 --- a/lib/screens/clear_data_screen.dart +++ b/lib/screens/configurations/clear_data_screen.dart @@ -1,9 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/service/db/db_sqlite_sync.dart'; import 'package:rkm/widgets/button_default.dart'; - -import '../utils/color_palette.dart'; -import '../widgets/text_default.dart'; +import 'package:shared_preferences/shared_preferences.dart'; +import '../../service/db/db_sqlite_load.dart'; +import '../../service/shared_preferences/shared_preferences_service.dart'; +import '../../config/color_palette.dart'; +import '../../widgets/text_default.dart'; class ClearDataScreen extends StatefulWidget { const ClearDataScreen({Key? key}) : super(key: key); @@ -13,6 +15,24 @@ class ClearDataScreen extends StatefulWidget { } class _ClearDataScreenState extends State { + + String mode =''; + + @override + void initState() { + super.initState(); + dataSQLite(); + } + + dataSQLite()async{ + final PrefService _preferences = PrefService(); + _preferences.readCacheModel('user', 'password', 'city', 'mode').then((list){ + setState(() { + mode = list[3]; + }); + }); + } + @override Widget build(BuildContext context) { double width = MediaQuery.of(context).size.width; @@ -35,30 +55,30 @@ class _ClearDataScreenState extends State { ), body: Container( padding: EdgeInsets.only(top: 100), - decoration: ConstVariable().backgroundGradient, + decoration: BoxDecoration( + color: ColorPalette.grayBackground, + image: DecorationImage( + fit: BoxFit.fitHeight, + image: AssetImage('assets/images/load_image.png'), + ) + ), width: double.infinity, height: double.infinity, child: Column( children: [ Image.asset('assets/images/logo.PNG',width: width*0.5,), + mode == 'homologacao'?Image.asset('assets/images/homologacao.png',width: width*0.4):Container(), + mode == 'desenvolvimento'?Image.asset('assets/images/desenvolvimento.png',width: width*0.4):Container(), + SizedBox(height: 50), Padding( - padding: const EdgeInsets.symmetric(vertical: 10.0), - child: TextDefault( - text: 'HOMOLOGAÇÃO', - color: ColorPalette.red, - fontSize: 30, - fontWeigth: FontWeight.bold, - ), - ), - Padding( - padding: const EdgeInsets.symmetric(vertical: 5.0,horizontal: 5), + padding: const EdgeInsets.symmetric(vertical: 5.0,horizontal: 15), child: TextDefault( text: 'Todos os registros (dados Importados, Cadastros e Atendimentos) do aplicativo serão excluídos.\n\n' 'Para utilizar novamente o aplicativo deverá ser realizada uma nova Carga inicial.', maxLines: 5, textAlign: TextAlign.center, color: ColorPalette.black54, - fontSize: 20, + fontSize: 15, fontWeigth: FontWeight.bold, ), ), @@ -68,7 +88,13 @@ class _ClearDataScreenState extends State { textColor: ColorPalette.white, background: ColorPalette.appBar, borderColor: ColorPalette.appBar, - onPressed: ()=>Navigator.pushReplacementNamed(context, '/home'), + onPressed: ()async{ + await DbSqliteLoad().deleteLoad().then((_)async { + await DbSqliteSync().deleteSync().then((_){ + Navigator.pushReplacementNamed(context, '/splash'); + }); + }); + }, ) ], ), diff --git a/lib/screens/import_sigtap_screen.dart b/lib/screens/configurations/import_sigtap_screen.dart similarity index 59% rename from lib/screens/import_sigtap_screen.dart rename to lib/screens/configurations/import_sigtap_screen.dart index 4b8bb11..6151d05 100644 --- a/lib/screens/import_sigtap_screen.dart +++ b/lib/screens/configurations/import_sigtap_screen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import '../utils/color_palette.dart'; -import '../utils/const_variable.dart'; -import '../widgets/button_default.dart'; -import '../widgets/text_default.dart'; +import '../../config/color_palette.dart'; +import '../../config/const_variable.dart'; +import '../../service/shared_preferences/shared_preferences_service.dart'; +import '../../widgets/text_default.dart'; class ImportSigtapScreen extends StatefulWidget { const ImportSigtapScreen({Key? key}) : super(key: key); @@ -12,9 +12,29 @@ class ImportSigtapScreen extends StatefulWidget { } class _ImportSigtapScreenState extends State { + + String mode =''; + + @override + void initState() { + super.initState(); + dataSQLite(); + } + + dataSQLite()async{ + final PrefService _preferences = PrefService(); + _preferences.readCacheModel('user', 'password', 'city', 'mode').then((list){ + setState(() { + mode = list[3]; + }); + }); + } + @override Widget build(BuildContext context) { double width = MediaQuery.of(context).size.width; + double height = MediaQuery.of(context).size.height; + return Scaffold( bottomSheet: Container( color: ColorPalette.appBar, @@ -29,24 +49,23 @@ class _ImportSigtapScreenState extends State { ), body: Container( padding: EdgeInsets.only(top: 100), - decoration: ConstVariable().backgroundGradient, + decoration: BoxDecoration( + color: ColorPalette.grayBackground, + image: DecorationImage( + fit: BoxFit.fitHeight, + image: AssetImage('assets/images/load_image.png'), + ) + ), width: double.infinity, height: double.infinity, child: Column( children: [ Image.asset('assets/images/logo.PNG',width: width*0.5,), - Padding( - padding: const EdgeInsets.symmetric(vertical: 10.0), - child: TextDefault( - text: 'HOMOLOGAÇÃO', - color: ColorPalette.red, - fontSize: 30, - fontWeigth: FontWeight.bold, - ), - ), + mode == 'homologacao'?Image.asset('assets/images/homologacao.png',width: width*0.4):Container(), + mode == 'desenvolvimento'?Image.asset('assets/images/desenvolvimento.png',width: width*0.4):Container(), Padding( padding: const EdgeInsets.symmetric(vertical: 50.0), - child: CircularProgressIndicator(), + child: Image.asset('assets/images/loading.gif',width: width*0.2,height: height*0.1,), ), Padding( padding: const EdgeInsets.symmetric(vertical: 5.0,horizontal: 5), diff --git a/lib/screens/main_procedures_screen.dart b/lib/screens/configurations/main_procedures_screen.dart similarity index 96% rename from lib/screens/main_procedures_screen.dart rename to lib/screens/configurations/main_procedures_screen.dart index 73a387a..4821f71 100644 --- a/lib/screens/main_procedures_screen.dart +++ b/lib/screens/configurations/main_procedures_screen.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/color_palette.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/alert_dialog_default.dart'; import 'package:rkm/widgets/appbar_default.dart'; import 'package:rkm/widgets/button_default.dart'; -import '../widgets/dropdown_button_default.dart'; -import '../widgets/subtitle_containers.dart'; -import '../widgets/text_default.dart'; -import '../widgets/title_containers.dart'; +import '../../widgets/dropdown_button_default.dart'; +import '../../widgets/subtitle_containers.dart'; +import '../../widgets/text_default.dart'; +import '../../widgets/title_containers.dart'; class MainProceduresScreen extends StatefulWidget { const MainProceduresScreen({Key? key}) : super(key: key); diff --git a/lib/screens/sinc_data_screen.dart b/lib/screens/configurations/sinc_data_screen.dart similarity index 66% rename from lib/screens/sinc_data_screen.dart rename to lib/screens/configurations/sinc_data_screen.dart index 9c1849e..81f8f37 100644 --- a/lib/screens/sinc_data_screen.dart +++ b/lib/screens/configurations/sinc_data_screen.dart @@ -1,9 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/button_default.dart'; -import '../utils/color_palette.dart'; -import '../widgets/text_default.dart'; +import '../../config/color_palette.dart'; +import '../../service/shared_preferences/shared_preferences_service.dart'; +import '../../widgets/text_default.dart'; class SincDataScreen extends StatefulWidget { const SincDataScreen({Key? key}) : super(key: key); @@ -13,6 +14,24 @@ class SincDataScreen extends StatefulWidget { } class _SincDataScreenState extends State { + + String mode =''; + + dataSQLite()async{ + final PrefService _preferences = PrefService(); + _preferences.readCacheModel('user', 'password', 'city', 'mode').then((list){ + setState(() { + mode = list[3]; + }); + }); + } + + @override + void initState() { + super.initState(); + dataSQLite(); + } + @override Widget build(BuildContext context) { double width = MediaQuery.of(context).size.width; @@ -35,21 +54,20 @@ class _SincDataScreenState extends State { ), body: Container( padding: EdgeInsets.only(top: 100), - decoration: ConstVariable().backgroundGradient, + decoration: BoxDecoration( + color: ColorPalette.grayBackground, + image: DecorationImage( + fit: BoxFit.fitHeight, + image: AssetImage('assets/images/load_image.png'), + ) + ), width: double.infinity, height: double.infinity, child: Column( children: [ Image.asset('assets/images/logo.PNG',width: width*0.5,), - Padding( - padding: const EdgeInsets.symmetric(vertical: 10.0), - child: TextDefault( - text: 'HOMOLOGAÇÃO', - color: ColorPalette.red, - fontSize: 30, - fontWeigth: FontWeight.bold, - ), - ), + mode == 'homologacao'?Image.asset('assets/images/homologacao.png',width: width*0.4):Container(), + mode == 'desenvolvimento'?Image.asset('assets/images/desenvolvimento.png',width: width*0.4):Container(), Padding( padding: const EdgeInsets.symmetric(vertical: 5.0), child: TextDefault( diff --git a/lib/screens/edit_procedures_screen.dart b/lib/screens/edit_procedures_screen.dart index b4047f6..05e0d59 100644 --- a/lib/screens/edit_procedures_screen.dart +++ b/lib/screens/edit_procedures_screen.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/appbar_default.dart'; import 'package:rkm/widgets/input_text.dart'; import 'package:rkm/widgets/onbackbutton.dart'; import 'package:rkm/widgets/text_default.dart'; -import '../utils/color_palette.dart'; +import '../config/color_palette.dart'; import '../widgets/button_default.dart'; import '../widgets/dropdown_button_default.dart'; import '../widgets/subtitle_containers.dart'; diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart index 74d0170..5a3bf25 100644 --- a/lib/screens/home_screen.dart +++ b/lib/screens/home_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:line_icons/line_icons.dart'; import 'package:rkm/screens/registers_citizen/register_citizen_screen.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/icon_button_default.dart'; import 'package:rkm/widgets/input_search_text.dart'; import '../service/db/db_sqlite_load.dart'; @@ -137,7 +137,7 @@ class _HomeScreenState extends State { name: '${showResults[index]['NOME_CIDADAO']}', mother:'${showResults[index]['NOME_MAE']}', numberCNS: '${showResults[index]['CNS']}'=='null'||'${showResults[index]['CNS']}'==''?'999999999999999':'${showResults[index]['CNS']}', - numberMedicalRecord: '${showResults[index]['NUM_PRONTUARIO']}', + numberMedicalRecord: '${showResults[index]['NUM_PRONTUARIO']}'==''?'-----':'${showResults[index]['NUM_PRONTUARIO']}', onTap: ()=> Navigator.push( context, MaterialPageRoute(builder: (context) => RegisterCitizenScreen(select: '')), diff --git a/lib/screens/load_init_screen.dart b/lib/screens/load_init_screen.dart index 503b382..eee880d 100644 --- a/lib/screens/load_init_screen.dart +++ b/lib/screens/load_init_screen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:rkm/screens/login/sync_login_screen.dart'; -import 'package:rkm/utils/color_palette.dart'; +import 'package:rkm/config/color_palette.dart'; import 'package:rkm/widgets/alert_dialog_default.dart'; import 'package:rkm/widgets/button_default.dart'; import 'package:rkm/widgets/text_default.dart'; @@ -195,8 +195,7 @@ class _LoadInitScreenState extends State { color: ColorPalette.grayBackground, image: DecorationImage( fit: BoxFit.fitHeight, - image: AssetImage('assets/images/load_image.png' - ), + image: AssetImage('assets/images/load_image.png'), ) ), child: finish?ListView( diff --git a/lib/screens/login/login_load_screen.dart b/lib/screens/login/login_load_screen.dart index 814329c..d3025cd 100644 --- a/lib/screens/login/login_load_screen.dart +++ b/lib/screens/login/login_load_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:rkm/service/api/url_api_const.dart'; -import 'package:rkm/utils/color_palette.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/color_palette.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/button_default.dart'; import 'package:rkm/widgets/dropdown_button_city.dart'; import 'package:rkm/widgets/input_text.dart'; diff --git a/lib/screens/login/login_saved_screen.dart b/lib/screens/login/login_saved_screen.dart index a9ddecc..7f8bde0 100644 --- a/lib/screens/login/login_saved_screen.dart +++ b/lib/screens/login/login_saved_screen.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:rkm/screens/home_screen.dart'; import 'package:rkm/screens/login/sync_login_screen.dart'; -import 'package:rkm/utils/color_palette.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/color_palette.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/button_default.dart'; import 'package:rkm/widgets/input_text.dart'; import 'package:rkm/widgets/text_default.dart'; diff --git a/lib/screens/login/sync_login_screen.dart b/lib/screens/login/sync_login_screen.dart index 2b13b68..7091351 100644 --- a/lib/screens/login/sync_login_screen.dart +++ b/lib/screens/login/sync_login_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:rkm/screens/sync_init_screen.dart'; -import 'package:rkm/utils/color_palette.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/color_palette.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/button_default.dart'; import 'package:rkm/widgets/dropdown_button_default.dart'; import 'package:rkm/widgets/input_text.dart'; diff --git a/lib/screens/registers_citizen/register_citizen_screen.dart b/lib/screens/registers_citizen/register_citizen_screen.dart index 3244dfe..214f65d 100644 --- a/lib/screens/registers_citizen/register_citizen_screen.dart +++ b/lib/screens/registers_citizen/register_citizen_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; -import 'package:rkm/utils/color_palette.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/color_palette.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/alert_dialog_default.dart'; import 'package:rkm/widgets/button_default.dart'; import 'package:rkm/widgets/title_containers.dart'; @@ -10,7 +10,6 @@ import '../../controllers/main_controllers.dart'; import '../../service/db/db_querys.dart'; import '../../service/db/db_sqlite_load.dart'; import '../../service/db/db_sqlite_sync.dart'; -import '../../widgets/alert_dialog_search_stateful.dart'; import '../../widgets/appbar_default.dart'; import '../../widgets/dropdown_with_subtitle.dart'; import '../../widgets/error_default.dart'; @@ -120,6 +119,7 @@ class _RegisterCitizenScreenState extends State { String errorTopo = 'Existem campos obrigatórios não preenchidos.'; escolherprazoInicio(BuildContext context,String type) async { + var pickDate = await showDatePicker( context: context, initialDate: DateTime.now(), diff --git a/lib/screens/registers_citizen/register_home_screen.dart b/lib/screens/registers_citizen/register_home_screen.dart index b06bad8..c34f485 100644 --- a/lib/screens/registers_citizen/register_home_screen.dart +++ b/lib/screens/registers_citizen/register_home_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; -import 'package:rkm/utils/color_palette.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/color_palette.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/alert_dialog_default.dart'; import 'package:rkm/widgets/button_default.dart'; import 'package:rkm/widgets/title_containers.dart'; diff --git a/lib/screens/registers_citizen/register_individual_screen.dart b/lib/screens/registers_citizen/register_individual_screen.dart index 1d292d9..0caf4dd 100644 --- a/lib/screens/registers_citizen/register_individual_screen.dart +++ b/lib/screens/registers_citizen/register_individual_screen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:line_icons/line_icons.dart'; -import 'package:rkm/utils/color_palette.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/color_palette.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/alert_dialog_default.dart'; import 'package:rkm/widgets/button_default.dart'; import 'package:rkm/widgets/title_containers.dart'; diff --git a/lib/screens/select_service/service_home_screen.dart b/lib/screens/select_service/service_home_screen.dart index 7abcf3d..67c52fc 100644 --- a/lib/screens/select_service/service_home_screen.dart +++ b/lib/screens/select_service/service_home_screen.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:line_icons/line_icons.dart'; import 'package:rkm/models/check_model.dart'; -import 'package:rkm/utils/color_palette.dart'; +import 'package:rkm/config/color_palette.dart'; import 'package:rkm/widgets/alert_dialog_default.dart'; import 'package:rkm/widgets/appbar_default.dart'; -import '../../utils/const_variable.dart'; +import '../../config/const_variable.dart'; import '../../widgets/button_default.dart'; import '../../widgets/check_box_subtitle.dart'; import '../../widgets/dropdown_with_subtitle.dart'; diff --git a/lib/screens/select_service/service_individual_screen.dart b/lib/screens/select_service/service_individual_screen.dart index 134ac73..6ae658c 100644 --- a/lib/screens/select_service/service_individual_screen.dart +++ b/lib/screens/select_service/service_individual_screen.dart @@ -3,8 +3,8 @@ import 'package:intl/intl.dart'; import 'package:line_icons/line_icons.dart'; import 'package:rkm/widgets/input_text.dart'; import '../../models/check_model.dart'; -import '../../utils/color_palette.dart'; -import '../../utils/const_variable.dart'; +import '../../config/color_palette.dart'; +import '../../config/const_variable.dart'; import '../../widgets/alert_dialog_default.dart'; import '../../widgets/appbar_default.dart'; import '../../widgets/button_default.dart'; diff --git a/lib/screens/splash_screen.dart b/lib/screens/splash_screen.dart index abc987e..2232f3c 100644 --- a/lib/screens/splash_screen.dart +++ b/lib/screens/splash_screen.dart @@ -2,7 +2,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:rkm/screens/login/sync_login_screen.dart'; import 'package:rkm/service/api/url_api_const.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/const_variable.dart'; import '../service/db/db_sqlite_load.dart'; import '../service/shared_preferences/shared_preferences_service.dart'; import 'login/login_saved_screen.dart'; diff --git a/lib/screens/sync_init_screen.dart b/lib/screens/sync_init_screen.dart index 35ba53f..cd15613 100644 --- a/lib/screens/sync_init_screen.dart +++ b/lib/screens/sync_init_screen.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:rkm/screens/login/sync_login_screen.dart'; import 'package:rkm/service/api/api_data_sync.dart'; import 'package:rkm/service/db/db_sqlite_sync.dart'; -import 'package:rkm/utils/color_palette.dart'; +import 'package:rkm/config/color_palette.dart'; import 'package:rkm/widgets/alert_dialog_default.dart'; import 'package:rkm/widgets/button_default.dart'; import 'package:rkm/widgets/text_default.dart'; diff --git a/lib/widgets/alert_dialog_default.dart b/lib/widgets/alert_dialog_default.dart index e14f01d..9a5ddb3 100644 --- a/lib/widgets/alert_dialog_default.dart +++ b/lib/widgets/alert_dialog_default.dart @@ -1,12 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/color_palette.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/button_default.dart'; -import 'package:rkm/widgets/item_alert_settings.dart'; import 'package:rkm/widgets/switch_with_subtitle.dart'; import 'package:rkm/widgets/text_default.dart'; import 'package:rkm/widgets/title_containers.dart'; - import 'dropdown_button_default.dart'; import 'input_search_text.dart'; class AlertDialogDefault { diff --git a/lib/widgets/alert_dialog_search_stateful.dart b/lib/widgets/alert_dialog_search_stateful.dart index 90f4790..7857229 100644 --- a/lib/widgets/alert_dialog_search_stateful.dart +++ b/lib/widgets/alert_dialog_search_stateful.dart @@ -3,7 +3,7 @@ import 'package:rkm/widgets/text_default.dart'; import 'package:sqflite/sqflite.dart'; import '../screens/registers_citizen/register_citizen_screen.dart'; import '../service/db/db_sqlite_load.dart'; -import '../utils/color_palette.dart'; +import '../config/color_palette.dart'; import 'input_search_text.dart'; class AlertDialogSearchStateful extends StatefulWidget { diff --git a/lib/widgets/alert_dialog_settings.dart b/lib/widgets/alert_dialog_settings.dart index e900150..4915356 100644 --- a/lib/widgets/alert_dialog_settings.dart +++ b/lib/widgets/alert_dialog_settings.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/button_default.dart'; import 'package:rkm/widgets/item_alert_settings.dart'; import 'package:rkm/widgets/text_default.dart'; diff --git a/lib/widgets/appbar_default.dart b/lib/widgets/appbar_default.dart index a6e7d5f..0c7a5b2 100644 --- a/lib/widgets/appbar_default.dart +++ b/lib/widgets/appbar_default.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:rkm/widgets/alert_dialog_settings.dart'; import '../screens/login/login_saved_screen.dart'; -import '../utils/color_palette.dart'; +import '../config/color_palette.dart'; import 'icon_button_default.dart'; class AppBarDefault{ diff --git a/lib/widgets/button_default.dart b/lib/widgets/button_default.dart index 46c87ac..59eae13 100644 --- a/lib/widgets/button_default.dart +++ b/lib/widgets/button_default.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; +import 'package:rkm/config/color_palette.dart'; -import '../utils/const_variable.dart'; +import '../config/const_variable.dart'; class ButtonDefault extends StatelessWidget { var onPressed; String title; diff --git a/lib/widgets/check_box_subtitle.dart b/lib/widgets/check_box_subtitle.dart index ee737ab..d1865fe 100644 --- a/lib/widgets/check_box_subtitle.dart +++ b/lib/widgets/check_box_subtitle.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; +import 'package:rkm/config/color_palette.dart'; import 'package:rkm/widgets/text_default.dart'; class CheckBoxSubtitle extends StatelessWidget { diff --git a/lib/widgets/check_box_two_subtitle.dart b/lib/widgets/check_box_two_subtitle.dart index efb029c..d2299ea 100644 --- a/lib/widgets/check_box_two_subtitle.dart +++ b/lib/widgets/check_box_two_subtitle.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; +import 'package:rkm/config/color_palette.dart'; import 'package:rkm/widgets/text_default.dart'; class CheckBoxTwoSubtitle extends StatelessWidget { diff --git a/lib/widgets/dropdown_button_city.dart b/lib/widgets/dropdown_button_city.dart index abe46d8..632e732 100644 --- a/lib/widgets/dropdown_button_city.dart +++ b/lib/widgets/dropdown_button_city.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:rkm/widgets/text_default.dart'; - -import '../models/city_load_model.dart'; -import '../utils/color_palette.dart'; -import '../utils/const_variable.dart'; +import '../config/color_palette.dart'; +import '../config/const_variable.dart'; class DropDownButtonCity extends StatelessWidget { var onChanged; diff --git a/lib/widgets/dropdown_button_default.dart b/lib/widgets/dropdown_button_default.dart index c24b46a..ad1f644 100644 --- a/lib/widgets/dropdown_button_default.dart +++ b/lib/widgets/dropdown_button_default.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; import 'package:rkm/widgets/text_default.dart'; - -import '../utils/color_palette.dart'; -import '../utils/const_variable.dart'; +import '../config/color_palette.dart'; +import '../config/const_variable.dart'; class DropDownButtonDefault extends StatelessWidget { var onChanged; diff --git a/lib/widgets/dropdown_with_subtitle.dart b/lib/widgets/dropdown_with_subtitle.dart index 84c84f0..ee74874 100644 --- a/lib/widgets/dropdown_with_subtitle.dart +++ b/lib/widgets/dropdown_with_subtitle.dart @@ -1,9 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:rkm/widgets/text_default.dart'; -import '../utils/color_palette.dart'; -import '../utils/const_variable.dart'; +import '../config/color_palette.dart'; import 'dropdown_button_default.dart'; -import 'input_text.dart'; class DropdownWithSubtitle extends StatelessWidget { String subtitle; diff --git a/lib/widgets/icon_button_default.dart b/lib/widgets/icon_button_default.dart index bdae61b..bf42e09 100644 --- a/lib/widgets/icon_button_default.dart +++ b/lib/widgets/icon_button_default.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; +import 'package:rkm/config/color_palette.dart'; class IconButtonDefault extends StatelessWidget { var onPressed; diff --git a/lib/widgets/input_search_text.dart b/lib/widgets/input_search_text.dart index 6621321..7180048 100644 --- a/lib/widgets/input_search_text.dart +++ b/lib/widgets/input_search_text.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; -import '../utils/const_variable.dart'; +import 'package:rkm/config/color_palette.dart'; +import '../config/const_variable.dart'; class InputSearchText extends StatelessWidget { var controller; diff --git a/lib/widgets/input_text.dart b/lib/widgets/input_text.dart index 3478a9a..f0046a2 100644 --- a/lib/widgets/input_text.dart +++ b/lib/widgets/input_text.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; +import 'package:rkm/config/color_palette.dart'; import '../controllers/format_txt.dart'; -import '../utils/const_variable.dart'; class InputText extends StatelessWidget { bool obscure; diff --git a/lib/widgets/input_with_subtitle.dart b/lib/widgets/input_with_subtitle.dart index f7237f7..4a47b65 100644 --- a/lib/widgets/input_with_subtitle.dart +++ b/lib/widgets/input_with_subtitle.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:rkm/widgets/text_default.dart'; -import '../utils/color_palette.dart'; +import '../config/color_palette.dart'; import 'error_default.dart'; import 'input_text.dart'; diff --git a/lib/widgets/item_alert_settings.dart b/lib/widgets/item_alert_settings.dart index 938f412..262ed42 100644 --- a/lib/widgets/item_alert_settings.dart +++ b/lib/widgets/item_alert_settings.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:rkm/widgets/text_default.dart'; -import '../utils/color_palette.dart'; -import '../utils/const_variable.dart'; +import '../config/color_palette.dart'; +import '../config/const_variable.dart'; class ItemAlertSettings extends StatelessWidget { var onTap; diff --git a/lib/widgets/item_citizen.dart b/lib/widgets/item_citizen.dart index 6ae4543..834082a 100644 --- a/lib/widgets/item_citizen.dart +++ b/lib/widgets/item_citizen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:line_icons/line_icons.dart'; -import 'package:rkm/utils/color_palette.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/color_palette.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/alert_dialog_default.dart'; import 'package:rkm/widgets/text_default.dart'; diff --git a/lib/widgets/onbackbutton.dart b/lib/widgets/onbackbutton.dart index 46d8204..1173ae9 100644 --- a/lib/widgets/onbackbutton.dart +++ b/lib/widgets/onbackbutton.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:rkm/widgets/text_default.dart'; - -import '../utils/color_palette.dart'; +import '../config/color_palette.dart'; import 'button_default.dart'; class OnBackButton{ diff --git a/lib/widgets/subtitle_appbar_citizen.dart b/lib/widgets/subtitle_appbar_citizen.dart index 8230a44..905f88e 100644 --- a/lib/widgets/subtitle_appbar_citizen.dart +++ b/lib/widgets/subtitle_appbar_citizen.dart @@ -3,7 +3,7 @@ import 'package:rkm/widgets/text_default.dart'; import '../screens/registers_citizen/register_citizen_screen.dart'; import '../screens/registers_citizen/register_home_screen.dart'; import '../screens/registers_citizen/register_individual_screen.dart'; -import '../utils/color_palette.dart'; +import '../config/color_palette.dart'; class SubtitleAppbarCitizen extends StatelessWidget { int title; diff --git a/lib/widgets/subtitle_containers.dart b/lib/widgets/subtitle_containers.dart index 86d6b9a..ee7d7f1 100644 --- a/lib/widgets/subtitle_containers.dart +++ b/lib/widgets/subtitle_containers.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; +import 'package:rkm/config/color_palette.dart'; import 'package:rkm/widgets/text_default.dart'; class SubtitleContainers extends StatelessWidget { diff --git a/lib/widgets/switch_with_subtitle.dart b/lib/widgets/switch_with_subtitle.dart index e235bf6..2761a7a 100644 --- a/lib/widgets/switch_with_subtitle.dart +++ b/lib/widgets/switch_with_subtitle.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; +import 'package:rkm/config/color_palette.dart'; import 'package:rkm/widgets/text_default.dart'; class SwitchWithSubtitle extends StatelessWidget { diff --git a/lib/widgets/text_default.dart b/lib/widgets/text_default.dart index 7504719..61f06fa 100644 --- a/lib/widgets/text_default.dart +++ b/lib/widgets/text_default.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; +import 'package:rkm/config/color_palette.dart'; class TextDefault extends StatelessWidget { diff --git a/lib/widgets/title_containers.dart b/lib/widgets/title_containers.dart index b4ec097..22d33a3 100644 --- a/lib/widgets/title_containers.dart +++ b/lib/widgets/title_containers.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:rkm/utils/color_palette.dart'; -import 'package:rkm/utils/const_variable.dart'; +import 'package:rkm/config/color_palette.dart'; +import 'package:rkm/config/const_variable.dart'; import 'package:rkm/widgets/text_default.dart'; class TitleContainers extends StatelessWidget {