From d39d5e74a44ef881e5549f7d9b8aeb1cf472e0f1 Mon Sep 17 00:00:00 2001 From: Robeee <49735982+Robeee@users.noreply.github.com> Date: Fri, 1 Apr 2022 21:03:04 -0400 Subject: [PATCH 1/4] Theme changes. maybe dark mode --- android/local.properties | 4 +- lib/Model/Setting.dart | 24 +- lib/Screens/Calendar/Calendar.dart | 15 +- lib/Screens/Calendar/CalendarFormatBar.dart | 2 +- lib/Screens/Main.dart | 3 + lib/Screens/Menu/Menu.dart | 15 +- lib/Screens/Note/SaveNote.dart | 30 ++- lib/Screens/Note/ViewNote.dart | 4 + lib/Screens/Profile/UserProfile.dart | 7 + lib/Screens/Profile/add_allergy_card.dart | 7 + lib/Screens/Profile/add_careteam_card.dart | 7 + lib/Screens/Profile/add_contact_card.dart | 8 + .../Profile/add_medical_history_card.dart | 7 + lib/Screens/Profile/add_medication_card.dart | 7 + .../Profile/add_transportation_card.dart | 7 + lib/Screens/Profile/allergy_card.dart | 20 +- lib/Screens/Profile/care_team_card.dart | 20 +- lib/Screens/Profile/contact_card.dart | 20 +- lib/Screens/Profile/edit_profile_page.dart | 9 + lib/Screens/Profile/medical_history_card.dart | 20 +- lib/Screens/Profile/medication_card.dart | 20 +- lib/Screens/Profile/profile_card.dart | 5 + lib/Screens/Profile/transportation_card.dart | 21 +- lib/Screens/Settings/Setting.dart | 222 +++++++++++++----- lib/Screens/Tasks/TaskTable.dart | 4 + lib/Screens/Tasks/saveNewTask.dart | 39 ++- lib/Utility/ThemeUtil.dart | 147 ++++++++++++ 27 files changed, 583 insertions(+), 111 deletions(-) diff --git a/android/local.properties b/android/local.properties index 771acd9..803d6be 100644 --- a/android/local.properties +++ b/android/local.properties @@ -1,5 +1,5 @@ -sdk.dir=/Users/daryleurrea/Library/Android/sdk -flutter.sdk=/Users/daryleurrea/developer/flutter +sdk.dir=C:\\JavaStuff\\DartAndFluttterStuff\\Android\\sdk +flutter.sdk=C:\\JavaStuff\\DartAndFluttterStuff\\flutter flutter.buildMode=debug flutter.versionName=99.99.99 flutter.versionCode=99 \ No newline at end of file diff --git a/lib/Model/Setting.dart b/lib/Model/Setting.dart index 6a279e2..843bf09 100644 --- a/lib/Model/Setting.dart +++ b/lib/Model/Setting.dart @@ -12,7 +12,7 @@ enum FontSize { LARGE, } -enum AppTheme { BLUE, PINK } /// prob needs to be changed +enum AppTheme { BLUE, PINK, RED, ORANGE, GREEN, DARK, LIGHT, PURPLE, YELLOW} /// prob needs to be changed fontSizeStringToEnum(String fontSizeString) { switch (fontSizeString) { @@ -31,9 +31,25 @@ appThemeStringToEnum(String appTheme) { ///needs to be changed with appTheme return AppTheme.BLUE; case 'AppTheme.PINK': return AppTheme.PINK; + case 'AppTheme.RED': + return AppTheme.RED; + case 'AppTheme.ORANGE': + return AppTheme.ORANGE; + case 'AppTheme.GREEN': + return AppTheme.GREEN; + case 'AppTheme.DARK': + return AppTheme.DARK; + case 'AppTheme.LIGHT': + return AppTheme.LIGHT; + case 'AppTheme.PURPLE': + return AppTheme.PURPLE; + case 'AppTheme.YELLOW': + return AppTheme.YELLOW; } } +const DEFAULT_DARK_MODE = false; + const DEFAULT_FONT_SIZE = FontSize.MEDIUM; const DEFAULT_DAYS_TO_KEEP_FILES = "7"; @@ -80,7 +96,7 @@ const DEFAULT_ENABLE_VOICE_OVER_TEXT = true; const DEFAULT_MINUTES_BEFORE_NOTE_NOTIFICATIONS = "3"; -const DEFAULT_MINUTES_BEFORE_TASK_NOTIFICATIONS = "1"; +const DEFAULT_MINUTES_BEFORE_TASK_NOTIFICATIONS = "3"; const DEFAULT_ENABLE_NOTES_NOTIFICATIONS = true; @@ -98,6 +114,8 @@ class Setting { //bool to track if the app is newly installed bool isFirstRun = DEFAULT_IS_FIRST_RUN; + bool darkMode = DEFAULT_DARK_MODE; + // language of preference Locale locale = DEFAULT_LOCALE; @@ -124,6 +142,7 @@ class Setting { String jsonStr = """{"daysToKeepFiles": "${this.daysToKeepFiles}", "locale": "${this.locale.toString()}", "isFirstRun": ${this.isFirstRun}, + "darkMode": ${this.darkMode}, "enableVoiceOverText": ${this.enableVoiceOverText}, "appTheme": "${this.appTheme.toString()}", "noteFontSize": "${this.noteFontSize.toString()}", @@ -148,6 +167,7 @@ class Setting { setting.locale = DEFAULT_LOCALE; } setting.daysToKeepFiles = jsonObj['daysToKeepFiles']?.toString() ?? DEFAULT_DAYS_TO_KEEP_FILES; + setting.darkMode = jsonObj['darkMode'] ?? DEFAULT_DARK_MODE; setting.isFirstRun = jsonObj['isFirstRun'] ?? DEFAULT_IS_FIRST_RUN; setting.enableVoiceOverText = jsonObj['enableVoiceOverText'] ?? DEFAULT_ENABLE_VOICE_OVER_TEXT; setting.noteFontSize = fontSizeStringToEnum(jsonObj['noteFontSize']) ?? DEFAULT_FONT_SIZE; diff --git a/lib/Screens/Calendar/Calendar.dart b/lib/Screens/Calendar/Calendar.dart index aff90ce..43b98a2 100644 --- a/lib/Screens/Calendar/Calendar.dart +++ b/lib/Screens/Calendar/Calendar.dart @@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:intl/intl.dart'; +import 'package:memorez/Utility/ThemeUtil.dart'; import 'package:table_calendar/table_calendar.dart'; import 'package:memorez/Model/CalendarEvent.dart'; import 'package:memorez/Model/Note.dart'; @@ -16,6 +17,8 @@ final viewCalendarScaffoldKey = GlobalKey(); //Variable Definitions ---------------------------------------- bool _filteredNotesIsVisible = false; +Color? textCol; + DateTime _focusedDay = DateTime.now(); List _events = []; ValueNotifier _dayAndEventsUpdated = ValueNotifier(false); @@ -37,6 +40,8 @@ class CalendarState extends State { final calendarObserver = Provider.of(context); final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); + calendarObserver.setNoteObserver(noteObserver); calendarObserver.generateDailyTiles(); List _daysAndEvents = calendarObserver.generateDailyTiles(); @@ -116,11 +121,11 @@ class CalendarState extends State { child: new ListTile( //onTap: () => print('${value[index]}'), title: Text("${_matchedEvents[index].text}", - style: TextStyle(color: Colors.black), + style: TextStyle(color: textCol), textAlign: TextAlign.center), subtitle: Text( "${DateFormat('MM-dd-yyyy').format(DateTime.parse((_matchedEvents[index].eventDate)))} \t at \t ${_matchedEvents[index].eventTime}", - style: TextStyle(color: Colors.black), + style: TextStyle(color: textCol), textAlign: TextAlign.center), ), ), @@ -175,7 +180,11 @@ class CalendarState extends State { if (_events.length > 0) { calendarObserver.weekView(); - calendarObserver.getNotesOnDay(); + try { + calendarObserver.getNotesOnDay(); + }catch (error) { + print('setttttttttttttttt state errrrrrrrrrrrrrrror'); + } } (context as Element).reassemble(); }, diff --git a/lib/Screens/Calendar/CalendarFormatBar.dart b/lib/Screens/Calendar/CalendarFormatBar.dart index dd58a2b..812ea49 100644 --- a/lib/Screens/Calendar/CalendarFormatBar.dart +++ b/lib/Screens/Calendar/CalendarFormatBar.dart @@ -82,7 +82,7 @@ class _calendarFormatBarState extends State { }, ), VerticalDivider( - color: Colors.black, + color: Colors.tealAccent, thickness: 2, width: 20, indent: 10, diff --git a/lib/Screens/Main.dart b/lib/Screens/Main.dart index 9e30602..6325688 100644 --- a/lib/Screens/Main.dart +++ b/lib/Screens/Main.dart @@ -17,6 +17,7 @@ import 'package:memorez/generated/i18n.dart'; import 'package:memorez/Screens/Settings/Help.dart'; import '../DatabaseHandler/DBHelper.dart'; import '../Model/UserModel.dart'; +import '../Utility/ThemeUtil.dart'; import 'Profile/UserProfile.dart'; import 'Settings/Setting.dart'; import 'Note/Note.dart'; @@ -259,6 +260,8 @@ class _MainNavigatorState extends State { final menuObserver = Provider.of(context); return Observer( builder: (_) => Scaffold( + /// + backgroundColor: backgroundMode(settingObserver.userSettings.darkMode), resizeToAvoidBottomInset:screenNav.currentScreen!=MAIN_SCREENS.CALENDAR, appBar: AppBar( //removes the backbutton in the appbar diff --git a/lib/Screens/Menu/Menu.dart b/lib/Screens/Menu/Menu.dart index 2c46d49..b4269f6 100644 --- a/lib/Screens/Menu/Menu.dart +++ b/lib/Screens/Menu/Menu.dart @@ -7,6 +7,7 @@ import 'package:memorez/generated/i18n.dart'; import '../../Observables/MenuObservable.dart'; import 'package:provider/provider.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; +import '../../Observables/SettingObservable.dart'; import '../../Observables/TaskObservable.dart'; import '../../Utility/Constant.dart'; import 'package:memorez/Screens/Settings/Trigger.dart'; @@ -14,6 +15,8 @@ import 'package:memorez/Screens/Settings/Help.dart'; import 'package:memorez/Screens/Settings/SyncToCloud.dart'; import 'package:memorez/Screens/Main.dart'; +import '../../Utility/ThemeUtil.dart'; + class Menu extends StatefulWidget { @override MenuState createState() => MenuState(); @@ -28,10 +31,12 @@ class MenuState extends State { final menuObserver = Provider.of(context, listen: false); final taskObserver = Provider.of(context, listen: false); final screenNav = Provider.of(context); + final settingObserver = Provider.of(context); return Observer( builder: (_) => (menuObserver.currentScreen == MENU_SCREENS.MENU) ? Scaffold( + backgroundColor: backgroundMode(settingObserver.userSettings.darkMode), body: Column( children: [ @@ -50,7 +55,7 @@ class MenuState extends State { child: TextButton( style: TextButton.styleFrom( primary: Colors.white, - backgroundColor: Colors.deepPurple, + backgroundColor: accent2(settingObserver.userSettings.appTheme), textStyle: TextStyle( fontSize: 40, ), @@ -87,7 +92,7 @@ class MenuState extends State { child: TextButton( style: TextButton.styleFrom( primary: Colors.white, - backgroundColor: Colors.blueAccent, + backgroundColor: accent1(settingObserver.userSettings.appTheme), textStyle: TextStyle( fontSize: 40, ), @@ -123,7 +128,7 @@ class MenuState extends State { child: TextButton( style: TextButton.styleFrom( primary: Colors.white, - backgroundColor: Colors.lightBlueAccent, + backgroundColor: accent3(settingObserver.userSettings.appTheme), textStyle: TextStyle( fontSize: 40, ), @@ -158,7 +163,7 @@ class MenuState extends State { child: TextButton( style: TextButton.styleFrom( primary: Colors.white, - backgroundColor: Colors.blueAccent, + backgroundColor: accent1(settingObserver.userSettings.appTheme), textStyle: TextStyle( fontSize: 40, ), @@ -193,7 +198,7 @@ class MenuState extends State { child: TextButton( style: TextButton.styleFrom( primary: Colors.white, - backgroundColor: Colors.deepPurple, + backgroundColor: accent2(settingObserver.userSettings.appTheme), textStyle: TextStyle( fontSize: 40, ), diff --git a/lib/Screens/Note/SaveNote.dart b/lib/Screens/Note/SaveNote.dart index 077b142..367db9d 100644 --- a/lib/Screens/Note/SaveNote.dart +++ b/lib/Screens/Note/SaveNote.dart @@ -3,6 +3,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:fluttertoast/fluttertoast.dart'; +import 'package:memorez/Utility/ThemeUtil.dart'; import 'package:provider/provider.dart'; import 'package:memorez/Model/Note.dart'; import 'package:memorez/Observables/SettingObservable.dart'; @@ -15,6 +16,8 @@ import 'package:awesome_notifications/awesome_notifications.dart'; final saveNoteScaffoldKey = GlobalKey(); +Color? textCol; + /// Save Note page class SaveNote extends StatefulWidget { bool isCheckListEvent; @@ -115,13 +118,27 @@ class _SaveNoteState extends State { {required String title, required String value, required Function onChanged}) { + + return Theme( + data: ThemeData(unselectedWidgetColor: textCol),child: RadioListTile( + value: value, + groupValue: _reminderNotification, + onChanged: (newValue) => + setState(() => _reminderNotification = newValue.toString()), + title: Text(title, style: TextStyle(color: textCol), + ), + activeColor: textCol, + selected: false, + ), + ); return RadioListTile( value: value, groupValue: _reminderNotification, onChanged: (newValue) => setState(() => _reminderNotification = newValue.toString()), - title: Text(title), - activeColor: Colors.black, + title: Text(title, style: TextStyle(color: textCol), + ), + activeColor: textCol, selected: false, ); } @@ -221,6 +238,7 @@ class _SaveNoteState extends State { Widget build(BuildContext context) { final noteObserver = Provider.of(context, listen: false); final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); String noteId = ""; //VIEW_NOTE MODE: Populated the details of the targeted notes into the UI if (noteObserver.currNoteForDetails != null) { @@ -240,6 +258,7 @@ class _SaveNoteState extends State { var noteWidth = MediaQuery.of(context).size.width * 0.87; return Scaffold( + backgroundColor: backgroundMode(settingObserver.userSettings.darkMode), key: saveNoteScaffoldKey, body: Observer( builder: (context) => SingleChildScrollView( @@ -252,7 +271,8 @@ class _SaveNoteState extends State { style: TextStyle(fontSize: fontSize), decoration: InputDecoration( border: OutlineInputBorder(), - hintText: I18n.of(context)!.enterNoteText), + hintText: I18n.of(context)!.enterNoteText, + hintStyle: TextStyle(color: Colors.green)), ), SizedBox(height: verticalColSpace), _selectDate(noteObserver.newNoteIsCheckList, I18n.of(context), @@ -262,13 +282,13 @@ class _SaveNoteState extends State { alignment: Alignment.centerLeft, child: Text( 'Setting a date and time will add the note to your calendar', - style: TextStyle(fontSize: 12, color: Colors.black54))), + style: TextStyle(fontSize: 12, color: textCol))), Container( padding: EdgeInsets.fromLTRB(20, 20, 0, 0), alignment: Alignment.centerLeft, child: Text('Send Reminder Notification?', style: TextStyle( - fontSize: 12, fontWeight: FontWeight.bold))), + fontSize: 12, fontWeight: FontWeight.bold, color: textCol))), _checkBox(noteObserver.currNoteForDetails), SizedBox(height: verticalColSpace), Column( diff --git a/lib/Screens/Note/ViewNote.dart b/lib/Screens/Note/ViewNote.dart index 4e62e3e..6307f0e 100644 --- a/lib/Screens/Note/ViewNote.dart +++ b/lib/Screens/Note/ViewNote.dart @@ -1,11 +1,13 @@ import 'dart:io'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:memorez/Utility/ThemeUtil.dart'; import 'package:timeago/timeago.dart' as timeago; import 'package:provider/provider.dart'; import 'package:memorez/Utility/Constant.dart'; import 'package:memorez/generated/i18n.dart'; import '../../Observables/NoteObservable.dart'; +import '../../Observables/SettingObservable.dart'; import 'NoteTable.dart'; final viewNotesScaffoldKey = GlobalKey(); @@ -27,9 +29,11 @@ class _ViewNotesState extends State { final noteObserver = Provider.of(context); noteObserver.resetCurrNoteIdForDetails(); + final settingObserver = Provider.of(context); //noteObserver.changeScreen(NOTE_SCREENS.NOTE); return Scaffold( + backgroundColor: backgroundMode(settingObserver.userSettings.darkMode), resizeToAvoidBottomInset: true, body: NoteTable(noteObserver.usersNotes, () => print("done")), diff --git a/lib/Screens/Profile/UserProfile.dart b/lib/Screens/Profile/UserProfile.dart index 21a59ac..0d048d4 100644 --- a/lib/Screens/Profile/UserProfile.dart +++ b/lib/Screens/Profile/UserProfile.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:memorez/Screens/Profile/allergy_card.dart'; +import 'package:memorez/Utility/ThemeUtil.dart'; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:memorez/Screens/Profile/profile_card.dart'; @@ -10,6 +11,7 @@ import 'package:memorez/Model/UserModel.dart'; import 'package:memorez/Screens/Profile/transportation_card.dart'; import '../../Model/UserModel.dart'; import '../../Observables/ScreenNavigator.dart'; +import '../../Observables/SettingObservable.dart'; import '../../Utility/Constant.dart'; import '../../generated/i18n.dart'; import 'care_team_card.dart'; @@ -45,6 +47,8 @@ class _ProfilePageState extends State { }); } + Color? textCol; + void removeSP(String key) async { final prefs = await SharedPreferences.getInstance(); prefs.remove("user_id"); @@ -54,9 +58,12 @@ class _ProfilePageState extends State { Widget build(BuildContext context) { final screenNav = Provider.of(context); final user = UserPreferences.getUser(); + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); return Builder( builder: (context) => Scaffold( + backgroundColor: backgroundMode(settingObserver.userSettings.darkMode), body: ListView( physics: BouncingScrollPhysics(), children: [ diff --git a/lib/Screens/Profile/add_allergy_card.dart b/lib/Screens/Profile/add_allergy_card.dart index cfac649..1a2cdff 100644 --- a/lib/Screens/Profile/add_allergy_card.dart +++ b/lib/Screens/Profile/add_allergy_card.dart @@ -1,7 +1,10 @@ import 'package:flutter/material.dart'; import 'package:memorez/DatabaseHandler/database_helper_allergy.dart'; +import 'package:provider/provider.dart'; import '../../Model/Allergy.dart'; +import '../../Observables/SettingObservable.dart'; import '../../Utility/EncryptionUtil.dart'; +import '../../Utility/ThemeUtil.dart'; import '../../generated/i18n.dart'; @@ -15,6 +18,8 @@ class AddAllergyCard extends StatefulWidget { _UserProfileState createState() => _UserProfileState(); } +Color? textCol; + class _UserProfileState extends State { final _formKey = GlobalKey(); @@ -62,6 +67,8 @@ class _UserProfileState extends State { @override Widget build(BuildContext context) { + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); return Scaffold( body: GestureDetector( onTap: () => FocusScope.of(context).unfocus(), diff --git a/lib/Screens/Profile/add_careteam_card.dart b/lib/Screens/Profile/add_careteam_card.dart index a311bd6..33f6089 100644 --- a/lib/Screens/Profile/add_careteam_card.dart +++ b/lib/Screens/Profile/add_careteam_card.dart @@ -1,6 +1,9 @@ import 'package:flutter/material.dart'; import 'package:memorez/DatabaseHandler/database_helper_careteam.dart'; import 'package:memorez/Model/CareTeam.dart'; +import 'package:provider/provider.dart'; +import '../../Observables/SettingObservable.dart'; +import '../../Utility/ThemeUtil.dart'; import '../../generated/i18n.dart'; @@ -14,6 +17,8 @@ class AddCareTeamCard extends StatefulWidget { _UserProfileState createState() => _UserProfileState(); } +Color? textCol; + class _UserProfileState extends State { final _formKey = GlobalKey(); @@ -56,6 +61,8 @@ class _UserProfileState extends State { @override Widget build(BuildContext context) { + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); return Scaffold( body: GestureDetector( onTap: () => FocusScope.of(context).unfocus(), diff --git a/lib/Screens/Profile/add_contact_card.dart b/lib/Screens/Profile/add_contact_card.dart index c283662..d703895 100644 --- a/lib/Screens/Profile/add_contact_card.dart +++ b/lib/Screens/Profile/add_contact_card.dart @@ -2,6 +2,10 @@ import 'package:flutter/material.dart'; import 'package:memorez/generated/i18n.dart'; import 'package:memorez/DatabaseHandler/database_helper_contacts.dart'; import 'package:memorez/Model/Contacts.dart'; +import 'package:provider/provider.dart'; + +import '../../Observables/SettingObservable.dart'; +import '../../Utility/ThemeUtil.dart'; class AddContactCard extends StatefulWidget { @@ -14,6 +18,8 @@ class AddContactCard extends StatefulWidget { _UserProfileState createState() => _UserProfileState(); } +Color? textCol; + class _UserProfileState extends State { final _formKey = GlobalKey(); @@ -56,6 +62,8 @@ class _UserProfileState extends State { @override Widget build(BuildContext context) { + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); return Scaffold( body: GestureDetector( onTap: () => FocusScope.of(context).unfocus(), diff --git a/lib/Screens/Profile/add_medical_history_card.dart b/lib/Screens/Profile/add_medical_history_card.dart index b942fce..2c9a2f0 100644 --- a/lib/Screens/Profile/add_medical_history_card.dart +++ b/lib/Screens/Profile/add_medical_history_card.dart @@ -2,7 +2,10 @@ import 'package:flutter/material.dart'; import 'package:memorez/generated/i18n.dart'; import 'package:memorez/DatabaseHandler/databse_helper_history.dart'; import 'package:memorez/Model/History.dart'; +import 'package:provider/provider.dart'; +import '../../Observables/SettingObservable.dart'; import '../../Utility/EncryptionUtil.dart'; +import '../../Utility/ThemeUtil.dart'; class AddHistoryCard extends StatefulWidget { @@ -15,6 +18,8 @@ class AddHistoryCard extends StatefulWidget { _UserProfileState createState() => _UserProfileState(); } +Color? textCol; + class _UserProfileState extends State { final _formKey = GlobalKey(); @@ -58,6 +63,8 @@ class _UserProfileState extends State { @override Widget build(BuildContext context) { + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); return Scaffold( body: GestureDetector( onTap: () => FocusScope.of(context).unfocus(), diff --git a/lib/Screens/Profile/add_medication_card.dart b/lib/Screens/Profile/add_medication_card.dart index e9d93c2..9acea9f 100644 --- a/lib/Screens/Profile/add_medication_card.dart +++ b/lib/Screens/Profile/add_medication_card.dart @@ -2,6 +2,9 @@ import 'package:flutter/material.dart'; import 'package:memorez/Model/MedicationModel.dart'; import 'package:memorez/DatabaseHandler/database_helper.dart'; import 'package:memorez/Utility/EncryptionUtil.dart'; +import 'package:provider/provider.dart'; +import '../../Observables/SettingObservable.dart'; +import '../../Utility/ThemeUtil.dart'; import '../../generated/i18n.dart'; @@ -15,6 +18,8 @@ class AddMedicationCard extends StatefulWidget { _UserProfileState createState() => _UserProfileState(); } +Color? textCol; + class _UserProfileState extends State { final _formKey = GlobalKey(); @@ -61,6 +66,8 @@ class _UserProfileState extends State { @override Widget build(BuildContext context) { + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); return Scaffold( body: GestureDetector( onTap: () => FocusScope.of(context).unfocus(), diff --git a/lib/Screens/Profile/add_transportation_card.dart b/lib/Screens/Profile/add_transportation_card.dart index 0f5a0d5..716c7ea 100644 --- a/lib/Screens/Profile/add_transportation_card.dart +++ b/lib/Screens/Profile/add_transportation_card.dart @@ -2,6 +2,10 @@ import 'package:flutter/material.dart'; import 'package:memorez/generated/i18n.dart'; import 'package:memorez/DatabaseHandler/database_helper_transportation.dart'; import 'package:memorez/Model/Transportation.dart'; +import 'package:provider/provider.dart'; + +import '../../Observables/SettingObservable.dart'; +import '../../Utility/ThemeUtil.dart'; class AddTransportationCard extends StatefulWidget { @@ -13,6 +17,7 @@ class AddTransportationCard extends StatefulWidget { @override _UserProfileState createState() => _UserProfileState(); } +Color? textCol; class _UserProfileState extends State { final _formKey = GlobalKey(); @@ -57,6 +62,8 @@ class _UserProfileState extends State { @override Widget build(BuildContext context) { + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); return Scaffold( body: GestureDetector( onTap: () => FocusScope.of(context).unfocus(), diff --git a/lib/Screens/Profile/allergy_card.dart b/lib/Screens/Profile/allergy_card.dart index 36df898..3ff9906 100644 --- a/lib/Screens/Profile/allergy_card.dart +++ b/lib/Screens/Profile/allergy_card.dart @@ -2,12 +2,15 @@ import 'package:flutter/material.dart'; import 'package:memorez/Model/Allergy.dart'; import 'package:memorez/Screens/Profile/add_allergy_card.dart'; import 'package:memorez/generated/i18n.dart'; +import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:memorez/DatabaseHandler/database_helper_profile.dart'; import 'package:memorez/Model/UserModel.dart'; import 'package:memorez/Screens/Profile/profile_constants.dart'; import 'package:memorez/DatabaseHandler/database_helper_allergy.dart'; +import '../../Observables/SettingObservable.dart'; import '../../Utility/EncryptionUtil.dart'; +import '../../Utility/ThemeUtil.dart'; class AllergyCard extends StatefulWidget { @@ -30,6 +33,7 @@ class _AllergyCardState extends State { }); } + Color? textCol; Future>? _allergyList; @override @@ -61,18 +65,25 @@ String allergyR = EncryptUtil.decryptNote(allergy.reaction!); ListTile( title: Text( allergyN, - style: kLabelTextStyle, + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.w900, + color: textCol, + ), ), subtitle: Text( allergyR, - style: kSubText, + style: TextStyle( + fontSize: 12.0, + color: textCol, + ), ), trailing: Visibility( visible: _conUserId.text == 'Admin', child: IconButton( - icon: Icon(Icons.edit), + icon: Icon(Icons.edit, color: textCol,), onPressed: () { Navigator.push( context, @@ -95,6 +106,9 @@ String allergyR = EncryptUtil.decryptNote(allergy.reaction!); Widget build(BuildContext context) { print('xxxxxxxxxxxxxxxxxx${_conUserId.text}'); + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); + return Row( children: [ FutureBuilder( diff --git a/lib/Screens/Profile/care_team_card.dart b/lib/Screens/Profile/care_team_card.dart index fb97f02..9dfa54c 100644 --- a/lib/Screens/Profile/care_team_card.dart +++ b/lib/Screens/Profile/care_team_card.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:memorez/DatabaseHandler/database_helper_profile.dart'; import 'package:memorez/Model/UserModel.dart'; @@ -6,6 +7,8 @@ import 'package:memorez/Screens/Profile/profile_constants.dart'; import 'package:memorez/DatabaseHandler/database_helper_careteam.dart'; import 'package:memorez/Model/CareTeam.dart'; import 'package:memorez/Screens/Profile/add_careteam_card.dart'; +import '../../Observables/SettingObservable.dart'; +import '../../Utility/ThemeUtil.dart'; import '../../generated/i18n.dart'; @@ -29,6 +32,7 @@ class _CareTeamCardState extends State { }); } + Color? textCol; Future>? _careTeamList; @override @@ -57,18 +61,25 @@ class _CareTeamCardState extends State { ListTile( title: Text( careTeam.name!, - style: kLabelTextStyle, + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.w900, + color: textCol, + ), ), subtitle: Text( careTeam.phone!, - style: kSubText, + style: TextStyle( + fontSize: 12.0, + color: textCol, + ), ), trailing: Visibility( visible: _conUserId.text == 'Admin', child: IconButton( - icon: Icon(Icons.edit), + icon: Icon(Icons.edit, color: textCol,), onPressed: () { Navigator.push( context, @@ -91,6 +102,9 @@ class _CareTeamCardState extends State { Widget build(BuildContext context) { print('xxxxxxxxxxxxxxxxxx${_conUserId.text}'); + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); + return Row( children: [ FutureBuilder( diff --git a/lib/Screens/Profile/contact_card.dart b/lib/Screens/Profile/contact_card.dart index 833915f..27f7370 100644 --- a/lib/Screens/Profile/contact_card.dart +++ b/lib/Screens/Profile/contact_card.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:memorez/generated/i18n.dart'; +import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:memorez/DatabaseHandler/database_helper_profile.dart'; import 'package:memorez/Model/UserModel.dart'; @@ -8,6 +9,9 @@ import 'package:memorez/DatabaseHandler/database_helper_contacts.dart'; import 'package:memorez/Model/Contacts.dart'; import 'package:memorez/Screens/Profile/add_contact_card.dart'; +import '../../Observables/SettingObservable.dart'; +import '../../Utility/ThemeUtil.dart'; + class ContactCard extends StatefulWidget { @override @@ -29,6 +33,7 @@ class _ContactCardState extends State { }); } + Color? textCol; Future>? _contactList; @override @@ -57,18 +62,25 @@ class _ContactCardState extends State { ListTile( title: Text( contact.name!, - style: kLabelTextStyle, + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.w900, + color: textCol, + ), ), subtitle: Text( contact.phone!, - style: kSubText, + style: TextStyle ( + fontSize: 12.0, + color: textCol + ), ), trailing: Visibility( visible: _conUserId.text == 'Admin', child: IconButton( - icon: Icon(Icons.edit), + icon: Icon(Icons.edit, color: textCol), onPressed: () { Navigator.push( context, @@ -90,6 +102,8 @@ class _ContactCardState extends State { @override Widget build(BuildContext context) { print('xxxxxxxxxxxxxxxxxx${_conUserId.text}'); + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); return Row( children: [ diff --git a/lib/Screens/Profile/edit_profile_page.dart b/lib/Screens/Profile/edit_profile_page.dart index 9377e47..777d020 100644 --- a/lib/Screens/Profile/edit_profile_page.dart +++ b/lib/Screens/Profile/edit_profile_page.dart @@ -16,6 +16,8 @@ import 'package:memorez/Screens/Profile/widget/textfield_widget.dart'; import 'package:path/path.dart'; import '../../Comm/comHelper.dart'; import '../../Observables/ScreenNavigator.dart'; +import '../../Observables/SettingObservable.dart'; +import '../../Utility/ThemeUtil.dart'; class EditProfilePage extends StatefulWidget { @override @@ -31,16 +33,23 @@ class _EditProfilePageState extends State { user = UserPreferences.getUser(); } + Color? textCol; @override Widget build(BuildContext context) { + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); final screenNav = Provider.of(context); return Builder( builder: (context) => Scaffold( + backgroundColor: backgroundMode(settingObserver.userSettings.darkMode), body: ListView( padding: EdgeInsets.symmetric(horizontal: 32), physics: BouncingScrollPhysics(), children: [ + SizedBox( + height: 10, + ), Text( I18n.of(context)!.aboutMe, style: kSectionTitleTextStyle, diff --git a/lib/Screens/Profile/medical_history_card.dart b/lib/Screens/Profile/medical_history_card.dart index a043bc5..9ebb142 100644 --- a/lib/Screens/Profile/medical_history_card.dart +++ b/lib/Screens/Profile/medical_history_card.dart @@ -1,11 +1,14 @@ import 'package:flutter/material.dart'; import 'package:memorez/Utility/EncryptionUtil.dart'; +import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:memorez/DatabaseHandler/database_helper_profile.dart'; import 'package:memorez/Model/UserModel.dart'; import 'package:memorez/Screens/Profile/profile_constants.dart'; import 'package:memorez/DatabaseHandler/databse_helper_history.dart'; import 'package:memorez/Model/History.dart'; +import '../../Observables/SettingObservable.dart'; +import '../../Utility/ThemeUtil.dart'; import '../../generated/i18n.dart'; import 'add_medical_history_card.dart'; @@ -30,6 +33,7 @@ class _HistoryCardState extends State { }); } + Color? textCol; Future>? _historyList; @override @@ -59,18 +63,25 @@ class _HistoryCardState extends State { ListTile( title: Text( mh, - style: kLabelTextStyle, + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.w900, + color: textCol + ), ), subtitle: Text( dh, - style: kSubText, + style: TextStyle( + fontSize: 12.0, + color: textCol, + ), ), trailing: Visibility( visible: _conUserId.text == 'Admin', child: IconButton( - icon: Icon(Icons.edit), + icon: Icon(Icons.edit, color: textCol,), onPressed: () { Navigator.push( context, @@ -92,7 +103,8 @@ class _HistoryCardState extends State { @override Widget build(BuildContext context) { print('xxxxxxxxxxxxxxxxxx${_conUserId.text}'); - + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); return Row( children: [ FutureBuilder( diff --git a/lib/Screens/Profile/medication_card.dart b/lib/Screens/Profile/medication_card.dart index 16a9221..1ac7495 100644 --- a/lib/Screens/Profile/medication_card.dart +++ b/lib/Screens/Profile/medication_card.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:memorez/Screens/Profile/add_medication_card.dart'; import 'package:memorez/Utility/EncryptionUtil.dart'; import 'package:memorez/generated/i18n.dart'; +import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:memorez/DatabaseHandler/database_helper_profile.dart'; import 'package:memorez/Model/UserModel.dart'; @@ -9,6 +10,9 @@ import 'package:memorez/Screens/Profile/profile_constants.dart'; import 'package:memorez/Model/MedicationModel.dart'; import 'package:memorez/DatabaseHandler/database_helper.dart'; +import '../../Observables/SettingObservable.dart'; +import '../../Utility/ThemeUtil.dart'; + class MedicationCard extends StatefulWidget { @override @@ -30,6 +34,7 @@ class _MedicationCardState extends State { }); } + Color? textCol; Future>? _medicationList; @override @@ -63,18 +68,25 @@ class _MedicationCardState extends State { title: Text( _mTitle, - style: kLabelTextStyle, + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.w900, + color: textCol + ), ), subtitle: Text( _mDose, - style: kSubText, + style: TextStyle( + fontSize: 12.0, + color: textCol, + ), ), trailing: Visibility( visible: _conUserId.text == 'Admin', child: IconButton( - icon: Icon(Icons.edit), + icon: Icon(Icons.edit, color: textCol,), onPressed: () { Navigator.push( context, @@ -97,6 +109,8 @@ class _MedicationCardState extends State { @override Widget build(BuildContext context) { print('xxxxxxxxxxxxxxxxxx${_conUserId.text}'); + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); return Row( children: [ diff --git a/lib/Screens/Profile/profile_card.dart b/lib/Screens/Profile/profile_card.dart index 58d48e2..86810e8 100644 --- a/lib/Screens/Profile/profile_card.dart +++ b/lib/Screens/Profile/profile_card.dart @@ -10,6 +10,8 @@ import 'package:memorez/Screens/Profile/profile_constants.dart'; import 'package:memorez/Screens/Profile/widget/profile_widget.dart'; import 'package:memorez/utils/user_preferences.dart'; import '../../Observables/ScreenNavigator.dart'; +import '../../Observables/SettingObservable.dart'; +import '../../Utility/ThemeUtil.dart'; class ProfileCard extends StatefulWidget { @@ -23,6 +25,7 @@ class _UserProfileState extends State { late DbHelper dbHelper; var _conUserId = TextEditingController(); + Color? textCol; UserModel? get userData => null; @override @@ -49,6 +52,8 @@ class _UserProfileState extends State { @override Widget build(BuildContext context) { + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); final user = UserPreferences.getUser(); final screenNav = Provider.of(context); return Builder(builder: (context) => buildProfileCard(user)); diff --git a/lib/Screens/Profile/transportation_card.dart b/lib/Screens/Profile/transportation_card.dart index d083216..57888f3 100644 --- a/lib/Screens/Profile/transportation_card.dart +++ b/lib/Screens/Profile/transportation_card.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:memorez/generated/i18n.dart'; +import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:memorez/DatabaseHandler/database_helper_profile.dart'; import 'package:memorez/Model/UserModel.dart'; @@ -8,6 +9,9 @@ import 'package:memorez/DatabaseHandler/database_helper_transportation.dart'; import 'package:memorez/Model/Transportation.dart'; import 'package:memorez/Screens/Profile/add_transportation_card.dart'; +import '../../Observables/SettingObservable.dart'; +import '../../Utility/ThemeUtil.dart'; + class TransportationCard extends StatefulWidget { @override @@ -30,6 +34,7 @@ class _TransportationCardState extends State { } Future>? _transportationList; + Color? textCol; @override void initState() { @@ -57,18 +62,25 @@ class _TransportationCardState extends State { ListTile( title: Text( transportation.name!, - style: kLabelTextStyle, + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.w900, + color: textCol, + ), ), subtitle: Text( transportation.phone!, - style: kSubText, + style: TextStyle ( + fontSize: 12.0, + color: textCol + ), ), trailing: Visibility( visible: _conUserId.text == 'Admin', child: IconButton( - icon: Icon(Icons.edit), + icon: Icon(Icons.edit, color: textCol), onPressed: () { Navigator.push( context, @@ -90,7 +102,8 @@ class _TransportationCardState extends State { @override Widget build(BuildContext context) { print('xxxxxxxxxxxxxxxxxx${_conUserId.text}'); - + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); return Row( children: [ FutureBuilder( diff --git a/lib/Screens/Settings/Setting.dart b/lib/Screens/Settings/Setting.dart index e5b16e9..384e1f4 100644 --- a/lib/Screens/Settings/Setting.dart +++ b/lib/Screens/Settings/Setting.dart @@ -13,17 +13,20 @@ import 'dart:math' as math; import '../../DatabaseHandler/database_helper_profile.dart'; import '../../Model/UserModel.dart'; import '../../Observables/ScreenNavigator.dart'; +import '../../Utility/ThemeUtil.dart'; List fontSizes = [FontSize.SMALL, FontSize.MEDIUM, FontSize.LARGE]; List _minutesBeforeNoteNotification = ['1', '2', '3', '5', '10', '30']; List _minutesBeforeTaskNotification = ['1', '2', '3', '5', '10', '30']; -List themes = [AppTheme.BLUE, AppTheme.PINK]; +List themes = [AppTheme.BLUE, AppTheme.PINK, AppTheme.RED, + AppTheme.GREEN, AppTheme.ORANGE, AppTheme.DARK, AppTheme.LIGHT, + AppTheme.PURPLE, AppTheme.YELLOW]; List _daysToKeepFilesOptions = ["1", "3", "5", "7", "14", "Forever"]; bool careMode = false; -/// days to keep Notes??? +Color? textCol; class Settings extends StatefulWidget { @override @@ -71,6 +74,9 @@ class _SettingState extends State { final supportedLocales = GeneratedLocalizationsDelegate().supportedLocales; _conUserId.text == 'Admin'? careMode = true : careMode = false; + ///text color based on dark mode + textCol = textMode(settingObserver.userSettings.darkMode); + ///Helper method to convert theme names from all caps to normal text. _themeToDisplayName(AppTheme appTheme) { switch (appTheme) { @@ -82,6 +88,34 @@ class _SettingState extends State { { return I18n.of(context)!.pink; } + case AppTheme.RED: + { + return 'RED'; + } + case AppTheme.GREEN: + { + return 'GREEN'; + } + case AppTheme.ORANGE: + { + return 'ORANGE'; + } + case AppTheme.DARK: + { + return 'DARK'; + } + case AppTheme.LIGHT: + { + return 'LIGHT'; + } + case AppTheme.PURPLE: + { + return 'PURPLE'; + } + case AppTheme.YELLOW: + { + return 'YELLOW'; + } default: throw new UnimplementedError('not implemented'); } @@ -118,6 +152,7 @@ class _SettingState extends State { final double _iconSize = 40.00; return Scaffold( + backgroundColor: backgroundMode(settingObserver.userSettings.darkMode), body: SingleChildScrollView( padding: EdgeInsets.all(15.0), child: Column( @@ -153,7 +188,10 @@ class _SettingState extends State { //'Enable Notifications', I18n.of(context)!.enableNotifications, style: TextStyle( - fontSize: _bodyFontSize, fontWeight: FontWeight.bold), + fontSize: _bodyFontSize, + fontWeight: FontWeight.bold, + color: textCol + ), ), Switch( value: @@ -182,10 +220,12 @@ class _SettingState extends State { style: TextStyle( fontSize: _bodyFontSize, fontWeight: FontWeight.bold, + color: textCol ), ), ), DropdownButton( + dropdownColor: backgroundMode(settingObserver.userSettings.darkMode), alignment: Alignment.center, value: settingObserver .userSettings.minutesBeforeNoteNotifications, @@ -199,6 +239,7 @@ class _SettingState extends State { value, style: TextStyle( fontSize: _bodyFontSize, + color: textCol ), ), ); @@ -210,53 +251,57 @@ class _SettingState extends State { }); }, ), - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Flexible( - child: Text( - I18n.of(context)!.daysToKeepNotes, - //'Days To Keep Notes', - style: TextStyle( - fontSize: _bodyFontSize, - fontWeight: FontWeight.bold, - ), - ), - ), - DropdownButton( - alignment: Alignment.center, - - /// This may need to be changed to new variable.***************** - value: settingObserver.userSettings.daysToKeepFiles, - items: _daysToKeepFilesOptions - .map>((String value) { - return DropdownMenuItem( - value: value, - child: Text( - value, - style: TextStyle( - fontSize: _bodyFontSize, - ), - ), - ); - }).toList(), - onChanged: (String? newValue) { - setState(() { - settingObserver.userSettings.daysToKeepFiles = - newValue!; - - /// This may need to be changed to new variable.***************** - //null check - }); - }, - ), ], ), - addTopDivider(), - addBotDivider(), + SizedBox( + height: 10.0, + ), + // Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // Flexible( + // child: Text( + // I18n.of(context)!.daysToKeepNotes, + // //'Days To Keep Notes', + // style: TextStyle( + // fontSize: _bodyFontSize, + // fontWeight: FontWeight.bold, + // ), + // ), + // ), + // DropdownButton( + // alignment: Alignment.center, + // + // /// This may need to be changed to new variable.***************** + // value: settingObserver.userSettings.daysToKeepFiles, + // items: _daysToKeepFilesOptions + // .map>((String value) { + // return DropdownMenuItem( + // value: value, + // child: Text( + // value, + // style: TextStyle( + // fontSize: _bodyFontSize, + // ), + // ), + // ); + // }).toList(), + // onChanged: (String? newValue) { + // setState(() { + // settingObserver.userSettings.daysToKeepFiles = + // newValue!; + // + // /// This may need to be changed to new variable.***************** + // + // //null check + // }); + // }, + // ), + // ], + // ), + addTopDivider(settingObserver), + addBotDivider(settingObserver), /** * Tasks section @@ -287,6 +332,7 @@ class _SettingState extends State { style: TextStyle( fontSize: _bodyFontSize, fontWeight: FontWeight.bold, + color: textCol ), ), Switch( @@ -316,10 +362,12 @@ class _SettingState extends State { style: TextStyle( fontSize: _bodyFontSize, fontWeight: FontWeight.bold, + color: textCol ), ), ), DropdownButton( + dropdownColor: backgroundMode(settingObserver.userSettings.darkMode), alignment: Alignment.center, value: settingObserver .userSettings.minutesBeforeTaskNotifications, @@ -331,6 +379,7 @@ class _SettingState extends State { value, style: TextStyle( fontSize: _bodyFontSize, + color: textCol ), ), ); @@ -344,8 +393,11 @@ class _SettingState extends State { ), ], ), - addTopDivider(), - addBotDivider(), + SizedBox( + height: 10.0, + ), + addTopDivider(settingObserver), + addBotDivider(settingObserver), ], /** * App Settings Section @@ -378,10 +430,12 @@ class _SettingState extends State { style: TextStyle( fontSize: _bodyFontSize, fontWeight: FontWeight.bold, + color: textCol, ), ), ), DropdownButton( + dropdownColor: backgroundMode(settingObserver.userSettings.darkMode), alignment: Alignment.center, value: settingObserver.userSettings.menuFontSize, items: fontSizes @@ -392,6 +446,7 @@ class _SettingState extends State { _fontToDisplayName(value), style: TextStyle( fontSize: _bodyFontSize, + color: textCol ), ), ); @@ -413,6 +468,7 @@ class _SettingState extends State { style: TextStyle( fontSize: _bodyFontSize, fontWeight: FontWeight.bold, + color: textCol ), ), @@ -454,6 +510,7 @@ class _SettingState extends State { /// DropdownButton( + dropdownColor: backgroundMode(settingObserver.userSettings.darkMode), alignment: Alignment.center, //value: note1, value: settingObserver.userSettings.locale, @@ -465,6 +522,7 @@ class _SettingState extends State { valueItem.languageCode)["name"]), style: TextStyle( fontSize: _bodyFontSize, + color: textCol ), ), ); @@ -488,9 +546,11 @@ class _SettingState extends State { style: TextStyle( fontSize: _bodyFontSize, fontWeight: FontWeight.bold, + color: textCol ), ), DropdownButton( + dropdownColor: backgroundMode(settingObserver.userSettings.darkMode), alignment: Alignment.center, value: settingObserver.userSettings.appTheme, items: themes @@ -501,6 +561,7 @@ class _SettingState extends State { _themeToDisplayName(value), style: TextStyle( fontSize: _bodyFontSize, + color: textCol ), ), ); @@ -513,8 +574,38 @@ class _SettingState extends State { ), ], ), - addTopDivider(), - addBotDivider(), + + /// Dark mode selection + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Dark Mode', + style: TextStyle( + fontSize: _bodyFontSize, fontWeight: FontWeight.bold, + color: textCol), + ), + Switch( + value: + settingObserver.userSettings.darkMode, + onChanged: (bool newValue) { + setState(() { + settingObserver + .userSettings.darkMode = newValue; + }); + }, + inactiveThumbColor: themeToColor(settingObserver.userSettings.appTheme), + inactiveTrackColor: Colors.grey, + activeTrackColor: Colors.green, + activeColor: themeToColor(settingObserver.userSettings.appTheme), + ), + ], + ), + SizedBox( + height: 10.0, //for spacing + ), + addTopDivider(settingObserver), + addBotDivider(settingObserver), /// Caregiver Mode Button @@ -590,7 +681,8 @@ class _SettingState extends State { Radius.circular(12.0), ), ), - backgroundColor: Color(0xFF0D47A1), + //backgroundColor: themeToColor(settingObserver.userSettings.appTheme), + backgroundColor: Color(0xFF0D47A1),////////////////////////////////////////////// ), ), // Padding( @@ -619,8 +711,8 @@ class _SettingState extends State { ), ), - addTopDivider(), - addBotDivider(), + addTopDivider(settingObserver), + addBotDivider(settingObserver), Row( mainAxisAlignment: MainAxisAlignment.spaceAround, @@ -646,7 +738,9 @@ class _SettingState extends State { I18n.of(context)!.cancel, style: TextStyle( fontSize: _bodyFontSize, - fontWeight: FontWeight.bold), + fontWeight: FontWeight.bold, + color: textCol, + ), ) ], )), @@ -670,7 +764,9 @@ class _SettingState extends State { I18n.of(context)!.save, style: TextStyle( fontSize: _bodyFontSize, - fontWeight: FontWeight.bold), + fontWeight: FontWeight.bold, + color: textCol + ), ) ], ), @@ -701,7 +797,9 @@ class _SettingState extends State { I18n.of(context)!.resetSettings, style: TextStyle( fontSize: _bodyFontSize, - fontWeight: FontWeight.bold), + fontWeight: FontWeight.bold, + color: textCol, + ), ), ], ), @@ -714,18 +812,20 @@ class _SettingState extends State { } } -Divider addTopDivider() { +Divider addTopDivider(SettingObserver ob) { return Divider( + color: dividerColor(ob.userSettings.darkMode), thickness: 2.0, - indent: 5, + indent: 1, endIndent: 5, ); } -Divider addBotDivider() { +Divider addBotDivider(SettingObserver ob) { return Divider( + color: dividerColor(ob.userSettings.darkMode), thickness: 2.0, - indent: 5, + indent: 1, height: 40, endIndent: 5, ); diff --git a/lib/Screens/Tasks/TaskTable.dart b/lib/Screens/Tasks/TaskTable.dart index ada6b22..b98f8eb 100644 --- a/lib/Screens/Tasks/TaskTable.dart +++ b/lib/Screens/Tasks/TaskTable.dart @@ -1,8 +1,10 @@ import 'package:flutter/material.dart'; import 'package:memorez/Services/TaskService.dart'; +import 'package:memorez/Utility/ThemeUtil.dart'; import 'package:provider/provider.dart'; import 'package:memorez/Model/Task.dart'; import 'package:memorez/Utility/Constant.dart'; +import '../../Observables/SettingObservable.dart'; import '../../Observables/TaskObservable.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:timeago/timeago.dart' as timeago; @@ -18,6 +20,7 @@ class _TaskTableState extends State { @override Widget build(BuildContext context) { final taskObserver = Provider.of(context); + final settingObserver = Provider.of(context); inactiveTasksUpdated = taskObserver.inactiveTasksUpdated; taskObserver.resetCurrTaskIdForDetails(); @@ -61,6 +64,7 @@ class _TaskTableState extends State { // taskObserver.changeScreen(TASK_SCREENS.TASK); return Scaffold( + backgroundColor: backgroundMode(settingObserver.userSettings.darkMode), body: ListView(children: [ Column( children: [ diff --git a/lib/Screens/Tasks/saveNewTask.dart b/lib/Screens/Tasks/saveNewTask.dart index 1488d20..fd58ae6 100644 --- a/lib/Screens/Tasks/saveNewTask.dart +++ b/lib/Screens/Tasks/saveNewTask.dart @@ -13,10 +13,14 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:awesome_notifications/awesome_notifications.dart'; +import '../../Utility/ThemeUtil.dart'; + final saveTaskScaffoldKey = GlobalKey(); enum responseText { start, Yes, No } //enum for Text Response, Schedule enum responseSchedule { start, Now, Future } //enum for Text Response, Schedule +Color? textCol; + /// Save Task page class SaveNewTask extends StatefulWidget { bool isCheckListEvent; @@ -79,7 +83,9 @@ class _SaveNewTaskState extends State { @override Widget build(BuildContext context) { final taskObserver = Provider.of(context, listen: false); + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); List getSteps() => [ // Screen 1 Step( @@ -103,11 +109,17 @@ class _SaveNewTaskState extends State { fontWeight: FontWeight.bold), ), )), - const SizedBox( - height: 55.0, child: Text('\n Select Task Type')), + SizedBox( + height: 55.0, + child: Text( + '\n Select Task Type', + style: TextStyle(color: textCol), + )), Container( - constraints: - const BoxConstraints.tightFor(width: 400, height: 70), + constraints: BoxConstraints.tightFor(width: 400, height: 70), + decoration: BoxDecoration( + border: Border.all(color: Colors.grey), + ), child: OutlinedButton.icon( onPressed: () { //muted @@ -126,17 +138,19 @@ class _SaveNewTaskState extends State { size: 40, color: Colors.green, ), - label: const Text( - '\t\t\t\t\t\t\t\t Send A task for the patient \n \t\t\t\t\t\t\t to review', - style: TextStyle(color: Colors.black), + label: Text( + '\t\t\t\t\t\t\t\t Send a task for the patient \n \t\t\t\t\t\t\t to review', + style: TextStyle(color: textCol), )), ), const SizedBox( height: 10.0, ), Container( - constraints: - const BoxConstraints.tightFor(width: 400, height: 70), + constraints: BoxConstraints.tightFor(width: 400, height: 70), + decoration: BoxDecoration( + border: Border.all(color: Colors.grey), + ), child: OutlinedButton.icon( onPressed: () { setState(() { @@ -157,9 +171,9 @@ class _SaveNewTaskState extends State { size: 40, color: Colors.red, ), - label: const Text( - '\t\t\t\t\t\t\t\t Send A task for the patient \n \t\t\t\t\t\t\t to perform an action', - style: TextStyle(color: Colors.black), + label: Text( + '\t\t\t\t\t\t\t\t Send a task for the patient \n \t\t\t\t\t\t\t to perform an action', + style: TextStyle(color: textCol), )), ), const SizedBox( @@ -661,6 +675,7 @@ class _SaveNewTaskState extends State { } return Scaffold( + backgroundColor: backgroundMode(settingObserver.userSettings.darkMode), resizeToAvoidBottomInset: true, key: saveTaskScaffoldKey, body: Stepper( diff --git a/lib/Utility/ThemeUtil.dart b/lib/Utility/ThemeUtil.dart index f63605d..6670071 100644 --- a/lib/Utility/ThemeUtil.dart +++ b/lib/Utility/ThemeUtil.dart @@ -9,5 +9,152 @@ Color themeToColor(AppTheme theme) { } case AppTheme.BLUE: return Color(0xFF33ACE3); + + case AppTheme.RED: + return Color(0xFFE00C25); + + case AppTheme.ORANGE: + return Color(0xFFFF5C13); + + case AppTheme.GREEN: + return Color(0xff1ca71b); + + case AppTheme.LIGHT: + return Color(0xE8C4C3C3); + + case AppTheme.DARK: + return Color(0xFF070101); + + case AppTheme.PURPLE: + return Color(0x9F6308BF); + + case AppTheme.YELLOW: + return Color(0xFFEFD018); + } +} + +Color backgroundMode(bool dark) { + if (dark) return Color(0xFF282727); + return Colors.white; +} + +Color textMode(bool dark) { + if (dark) return Colors.white; + return Colors.black; +} + +Color dividerColor(bool dark) { + if (dark) return Color(0x56ffffff); + return Colors.grey; +} + +Color? accent2(AppTheme theme) { + switch (theme) { + case AppTheme.PINK: + { + //return Color(0xFFf774ab); + return Color(0xFFA32A59); + } + case AppTheme.BLUE: + return Color(0xFF673AB7); + //return Colors.deepPurple; + + case AppTheme.RED: + return Color(0xFF921546); + + case AppTheme.ORANGE: + return Color(0xFFFF5C13); + + case AppTheme.GREEN: + return Colors.green[900]; + + case AppTheme.LIGHT: + return Color(0xD76C6C6C); + + case AppTheme.DARK: + return Color(0x9F070101); + + case AppTheme.PURPLE: + //return Color(0x9F6308BF); + return Colors.deepPurple; + + case AppTheme.YELLOW: + //return Color(0xFFFFDE1C); + return Colors.orange[900]; + } +} + +Color? accent1(AppTheme theme) { + switch (theme) { + case AppTheme.PINK: + { + // return Color(0xFFf774ab); + return Color(0xFFC74C74); + } + case AppTheme.BLUE: + return Color(0xFF448AFF); + // return Colors.blueAccent; + + case AppTheme.RED: + return Color(0xFF9E435E); + + case AppTheme.ORANGE: + return Color(0xFFFF5C13); + + case AppTheme.GREEN: + //return Color(0xff1ca71b); + return Colors.green[700]; + + case AppTheme.LIGHT: + return Color(0xE29E9E9E); + + case AppTheme.DARK: + return Color(0x9F070101); + + case AppTheme.PURPLE: + // return Color(0x9F6308BF); + return Colors.deepPurple[400]; + + case AppTheme.YELLOW: + //return Color(0xFFFFDE1C); + //return Colo + return Colors.orange[600]; + } +} + +Color? accent3(AppTheme theme) { + switch (theme) { + case AppTheme.PINK: + { + //return Color(0xFFf774ab); + return Color(0xFFDB7798); + } + case AppTheme.BLUE: + return Color(0xFF40C4FF); + //return Colors.lightBlueAccent; + + case AppTheme.RED: + return Color(0xFFDB7798); + + case AppTheme.ORANGE: + return Color(0xFFFF5C13); + + case AppTheme.GREEN: + //return Color(0xff1ca71b); + return Colors.green[500]; + + case AppTheme.LIGHT: + return Color(0xE2BDBBBB); + + case AppTheme.DARK: + return Color(0x9F070101); + + case AppTheme.PURPLE: + //return Color(0x9F6308BF); + return Colors.deepPurple[200]; + + case AppTheme.YELLOW: + //return Color(0xFFFFDE1C); + return Colors.orange[300]; } } From fb8236344ac4f03ea7e929ed9e4f679bbfb10b40 Mon Sep 17 00:00:00 2001 From: Robeee <49735982+Robeee@users.noreply.github.com> Date: Fri, 1 Apr 2022 21:54:18 -0400 Subject: [PATCH 2/4] changed color of tasks --- lib/Screens/Profile/UserProfile.dart | 1 - lib/Screens/Tasks/completeActivity.dart | 26 +++++++++++++++++----- lib/Screens/Tasks/completeHealthCheck.dart | 5 +++-- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/lib/Screens/Profile/UserProfile.dart b/lib/Screens/Profile/UserProfile.dart index 0d048d4..b34e154 100644 --- a/lib/Screens/Profile/UserProfile.dart +++ b/lib/Screens/Profile/UserProfile.dart @@ -59,7 +59,6 @@ class _ProfilePageState extends State { final screenNav = Provider.of(context); final user = UserPreferences.getUser(); final settingObserver = Provider.of(context); - textCol = textMode(settingObserver.userSettings.darkMode); return Builder( builder: (context) => Scaffold( diff --git a/lib/Screens/Tasks/completeActivity.dart b/lib/Screens/Tasks/completeActivity.dart index 50d6796..f0f1866 100644 --- a/lib/Screens/Tasks/completeActivity.dart +++ b/lib/Screens/Tasks/completeActivity.dart @@ -11,6 +11,8 @@ import 'dart:math' as math; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import '../../Utility/ThemeUtil.dart'; + final saveTaskScaffoldKey = GlobalKey(); /// Save Task page @@ -23,6 +25,8 @@ class CompleteActivity extends StatefulWidget { State createState() => _TaskDetails(readOnly: this.readOnly); } +Color? textCol; + class _TaskDetails extends State { /// Text task service to use for I/O operations against local system final TextTaskService textTaskService = new TextTaskService(); @@ -34,7 +38,8 @@ class _TaskDetails extends State { @override Widget build(BuildContext context) { final taskObserver = Provider.of(context, listen: false); - + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); try { responseText = taskObserver.currTaskForDetails!.responseText; @@ -57,7 +62,9 @@ class _TaskDetails extends State { Text( taskObserver.currTaskForDetails!.taskType, style: - TextStyle(fontSize: 40, fontWeight: FontWeight.bold), + TextStyle(fontSize: 40, + fontWeight: FontWeight.bold, + color: textCol), ), Spacer(), FaIcon(getIcon(taskObserver.currTaskForDetails!.icon), @@ -69,6 +76,7 @@ class _TaskDetails extends State { 'This activity task is assigned to you to perform an action.', style: TextStyle( fontSize: 20.0, + color: textCol, ), ), Padding( @@ -81,12 +89,15 @@ class _TaskDetails extends State { style: TextStyle( fontSize: 35, fontWeight: FontWeight.bold, + color: textCol, ), ), Text( taskObserver.currTaskForDetails!.description, softWrap: true, - style: TextStyle(fontSize: 25.0), + style: TextStyle(fontSize: 25.0, + color: textCol, + ), ), ], ), @@ -98,8 +109,13 @@ class _TaskDetails extends State { child: TextField( textInputAction: TextInputAction.done, maxLines: 3, - style: TextStyle(fontSize: 30), - decoration: InputDecoration(hintText: "--Response--"), + style: TextStyle(fontSize: 30, color: textCol), + decoration: InputDecoration( + hintText: "--Response--", + hintStyle: TextStyle( + color: textCol, + ), + ), onChanged: (text) { setState(() { responseText = text; diff --git a/lib/Screens/Tasks/completeHealthCheck.dart b/lib/Screens/Tasks/completeHealthCheck.dart index 36ffda5..8d545f6 100644 --- a/lib/Screens/Tasks/completeHealthCheck.dart +++ b/lib/Screens/Tasks/completeHealthCheck.dart @@ -271,7 +271,7 @@ class _TaskHealthCheck extends State { child: IconButton( onPressed: () { setState(() { - ///User has seleced Bad, move onto the next screen + ///User has selected Bad, move onto the next screen screen = '2'; firstSelection = 'Bad'; }); @@ -280,7 +280,8 @@ class _TaskHealthCheck extends State { FontAwesomeIcons.solidAngry, color: Colors.red, size: ICON_SIZE, - )), + ), + ), ), Text( 'Bad', From e2fafdea71edcc65e89e2caae97e5fe2a354ab49 Mon Sep 17 00:00:00 2001 From: Robeee <49735982+Robeee@users.noreply.github.com> Date: Fri, 1 Apr 2022 23:14:54 -0400 Subject: [PATCH 3/4] changed color of help --- lib/Screens/Calendar/Calendar.dart | 6 +++- lib/Screens/Note/NoteTable.dart | 1 + lib/Screens/Profile/profile_card.dart | 42 +++++++++++++++++++++++---- lib/Screens/Settings/Help.dart | 42 +++++++++++++++++++-------- lib/Screens/Tasks/saveNewTask.dart | 1 - 5 files changed, 72 insertions(+), 20 deletions(-) diff --git a/lib/Screens/Calendar/Calendar.dart b/lib/Screens/Calendar/Calendar.dart index 43b98a2..c79a550 100644 --- a/lib/Screens/Calendar/Calendar.dart +++ b/lib/Screens/Calendar/Calendar.dart @@ -97,7 +97,11 @@ class CalendarState extends State { decoration: InputDecoration( border: OutlineInputBorder(), hintText: '--Search For A Note--', - )), + hintStyle: TextStyle( + color: Colors.grey, + ), + ), + ), const SizedBox( height: 15, ), diff --git a/lib/Screens/Note/NoteTable.dart b/lib/Screens/Note/NoteTable.dart index f0528e2..cea2870 100644 --- a/lib/Screens/Note/NoteTable.dart +++ b/lib/Screens/Note/NoteTable.dart @@ -107,6 +107,7 @@ class _NoteTableState extends State { decoration: InputDecoration( border: OutlineInputBorder(), hintText: '--Search For A Note--', + hintStyle: TextStyle(color: Colors.grey) ), onChanged: (value) { _runFilter(value); diff --git a/lib/Screens/Profile/profile_card.dart b/lib/Screens/Profile/profile_card.dart index 86810e8..8d6164a 100644 --- a/lib/Screens/Profile/profile_card.dart +++ b/lib/Screens/Profile/profile_card.dart @@ -73,21 +73,51 @@ class _UserProfileState extends State { SizedBox( height: 20.0, ), - Text(I18n.of(context)!.name, style: kLabelTextStyle), - Text(user.name), + Text(I18n.of(context)!.name, + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.w900, + color: textCol, + ), + ), + Text(user.name, + style: TextStyle( + color: textCol, + ), + ), SizedBox( height: 20.0, ), - Text(I18n.of(context)!.dateOfBirth, style: kLabelTextStyle), - Text(EncryptUtil.decryptNote(user.bday)), + Text(I18n.of(context)!.dateOfBirth, + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.w900, + color: textCol, + ), + ), + Text(EncryptUtil.decryptNote(user.bday), + style: TextStyle( + color: textCol + ), + ), SizedBox( height: 20.0, ), SizedBox( height: 20.0, ), - Text(I18n.of(context)!.phoneNumber, style: kLabelTextStyle), - Text(user.phone), + Text(I18n.of(context)!.phoneNumber, + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.w900, + color: textCol, + ), + ), + Text(user.phone, + style: TextStyle( + color: textCol, + ), + ), ], ), ), diff --git a/lib/Screens/Settings/Help.dart b/lib/Screens/Settings/Help.dart index e4a75bc..0efa314 100644 --- a/lib/Screens/Settings/Help.dart +++ b/lib/Screens/Settings/Help.dart @@ -7,12 +7,17 @@ import 'package:memorez/Observables/ScreenNavigator.dart'; import 'package:memorez/Screens/Components/VideoPlayer.dart'; import 'package:memorez/generated/i18n.dart'; +import '../../Observables/SettingObservable.dart'; +import '../../Utility/ThemeUtil.dart'; + class Help extends StatefulWidget { @override HelpState createState() => HelpState(); } +Color? textCol; + class HelpState extends State { @override Widget build(BuildContext context) { @@ -20,8 +25,11 @@ class HelpState extends State { final helpObserver = Provider.of(context); final MenuObserver menuObserver = Provider.of(context); final MainNavObserver navObserver = Provider.of(context); + final settingObserver = Provider.of(context); + textCol = textMode(settingObserver.userSettings.darkMode); return Scaffold( + backgroundColor: backgroundMode(settingObserver.userSettings.darkMode), body: SingleChildScrollView( child: HelpTable(helpObserver.helpItems, () => {"Displayed Help Content"}), @@ -40,16 +48,18 @@ class HelpState extends State { } } -Divider addTopDivider() { +Divider addTopDivider(SettingObserver ob) { return Divider( + color: dividerColor(ob.userSettings.darkMode), thickness: 2.0, indent: 5, endIndent: 5, ); } -Divider addBotDivider() { +Divider addBotDivider(SettingObserver ob) { return Divider( + color: dividerColor(ob.userSettings.darkMode), thickness: 2.0, indent: 5, height: 20, @@ -75,6 +85,8 @@ class HelpTable extends StatelessWidget { @override Widget build(BuildContext context) { + final settingObserver = Provider.of(context); + ///Font size for section headers double _sectionFontSize = (Theme.of(context).textTheme.bodyText1?.fontSize)! * 1.2; @@ -109,6 +121,7 @@ class HelpTable extends StatelessWidget { style: TextStyle( fontSize: _sectionFontSize, fontWeight: FontWeight.bold, + color: textCol ), ), ListView.builder( @@ -170,8 +183,8 @@ class HelpTable extends StatelessWidget { }, ), - addTopDivider(), - addBotDivider(), + addTopDivider(settingObserver), + addBotDivider(settingObserver), /// Notes section Text( @@ -179,6 +192,7 @@ class HelpTable extends StatelessWidget { style: TextStyle( fontSize: _sectionFontSize, fontWeight: FontWeight.bold, + color: textCol ), ), ListView.builder( @@ -237,8 +251,8 @@ class HelpTable extends StatelessWidget { }, ), - addTopDivider(), - addBotDivider(), + addTopDivider(settingObserver), + addBotDivider(settingObserver), /// Calendar section Text( @@ -246,6 +260,7 @@ class HelpTable extends StatelessWidget { style: TextStyle( fontSize: _sectionFontSize, fontWeight: FontWeight.bold, + color: textCol ), ), ListView.builder( @@ -299,8 +314,8 @@ class HelpTable extends StatelessWidget { }, ), - addTopDivider(), - addBotDivider(), + addTopDivider(settingObserver), + addBotDivider(settingObserver), /// Profile section Text( @@ -308,6 +323,7 @@ class HelpTable extends StatelessWidget { style: TextStyle( fontSize: _sectionFontSize, fontWeight: FontWeight.bold, + color: textCol ), ), ListView.builder( @@ -364,8 +380,8 @@ class HelpTable extends StatelessWidget { ]); }, ), - addTopDivider(), - addBotDivider(), + addTopDivider(settingObserver), + addBotDivider(settingObserver), /// Settings section Text( @@ -373,6 +389,7 @@ class HelpTable extends StatelessWidget { style: TextStyle( fontSize: _sectionFontSize, fontWeight: FontWeight.bold, + color: textCol ), ), ListView.builder( @@ -430,8 +447,8 @@ class HelpTable extends StatelessWidget { }, ), - addTopDivider(), - addBotDivider(), + addTopDivider(settingObserver), + addBotDivider(settingObserver), /// Chat section Text( @@ -439,6 +456,7 @@ class HelpTable extends StatelessWidget { style: TextStyle( fontSize: _sectionFontSize, fontWeight: FontWeight.bold, + color: textCol ), ), ListView.builder( diff --git a/lib/Screens/Tasks/saveNewTask.dart b/lib/Screens/Tasks/saveNewTask.dart index fd58ae6..6279ae9 100644 --- a/lib/Screens/Tasks/saveNewTask.dart +++ b/lib/Screens/Tasks/saveNewTask.dart @@ -84,7 +84,6 @@ class _SaveNewTaskState extends State { Widget build(BuildContext context) { final taskObserver = Provider.of(context, listen: false); final settingObserver = Provider.of(context); - textCol = textMode(settingObserver.userSettings.darkMode); List getSteps() => [ // Screen 1 From 8a16b2c56295eac33a01f05e6f9fd316b43cedf9 Mon Sep 17 00:00:00 2001 From: Robeee <49735982+Robeee@users.noreply.github.com> Date: Sat, 2 Apr 2022 04:58:35 -0400 Subject: [PATCH 4/4] Fixed some Theme formatting/names. Fixed green text in Notes. Help buttons need more work to be translated because the text on buttons comes straight from the title attribute. --- i18n/ar-SY.json | 20 +- i18n/en-US.json | 20 +- i18n/es-US.json | 20 +- i18n/pt-BR.json | 20 +- i18n/zh-CN.json | 20 +- lib/Model/Setting.dart | 6 +- lib/Screens/Note/SaveNote.dart | 2 +- lib/Screens/Settings/Setting.dart | 34 +- lib/Utility/ThemeUtil.dart | 48 +- lib/generated/i18n.dart | 1354 +++++++++++++++++------------ 10 files changed, 952 insertions(+), 592 deletions(-) diff --git a/i18n/ar-SY.json b/i18n/ar-SY.json index 63e6e3a..aee2893 100644 --- a/i18n/ar-SY.json +++ b/i18n/ar-SY.json @@ -134,5 +134,23 @@ "week": "أسبوع", "month": "شهر", "bad": "سيئة", - "sendTask": "إرسال المهمة" + "sendTask": "إرسال المهمة", + "green": "أخضر", + "orange": "البرتقالي", + "yellow": "الأصفر", + "purple": "أرجواني", + "grey": "رمادي", + "darkMode": "الوضع الداكن", + "overviewOfTasks": "ملخص المهام", + "overviewOfNotes": "ملخص الملاحظات", + "overviewOfCalendar": "ملخص التقويم", + "overviewOfProfile": "ملخص الملف الشخصي", + "overviewOfSettings": "ملخص الإعدادات", + "overviewOfChat": "ملخص الدردشة", + "howToCreateATask": "كيفية إنشاء مهمة", + "howToCompleteATask": "كيف تكمل مهمة", + "otherNotes": "موضوعات الملاحظات الأخرى", + "otherCalendar": "مواضيع التقويم الأخرى", + "otherProfile": "مواضيع الملف الشخصي الأخرى", + "otherSettings": "مواضيع الإعدادات الأخرى" } \ No newline at end of file diff --git a/i18n/en-US.json b/i18n/en-US.json index 5f4b2e1..48f0644 100644 --- a/i18n/en-US.json +++ b/i18n/en-US.json @@ -132,5 +132,23 @@ "week": "Week", "month": "Month", "bad": "Bad", - "sendTask": "Send Task" + "sendTask": "Send Task", + "green": "Green", + "orange": "Orange", + "yellow": "Yellow", + "purple": "Purple", + "grey": "Grey", + "darkMode": "Dark Mode", + "overviewOfTasks": "Overview of Tasks", + "overviewOfNotes": "Overview of Notes", + "overviewOfCalendar": "Overview of Calendar", + "overviewOfProfile": "Overview of Profile", + "overviewOfSettings": "Overview of Settings", + "overviewOfChat": "Overview of Chat", + "howToCreateATask": "How to create a Task", + "howToCompleteATask": "How to complete a Task", + "otherNotes": "Other topics on Notes", + "otherCalendar": "Other topics on Calendar", + "otherProfile": "Other topics on Profile", + "otherSettings": "Other topics on Settings" } \ No newline at end of file diff --git a/i18n/es-US.json b/i18n/es-US.json index bd620d8..c13388c 100644 --- a/i18n/es-US.json +++ b/i18n/es-US.json @@ -134,5 +134,23 @@ "week": "Semana", "month": "Mes", "bad": "Malo", - "sendTask": "Enviar tarea" + "sendTask": "Enviar tarea", + "green": "Verde", + "orange": "Naranja", + "yellow": "Amarillo", + "purple": "Morado", + "grey": "Gris", + "darkMode": "Modo oscuro", + "overviewOfTasks": "Resumen de Tareas", + "overviewOfNotes": "Resumen de Notas", + "overviewOfCalendar": "Resumen del Calendario", + "overviewOfProfile": "Resumen del Perfil", + "overviewOfSettings": "Resumen de Configuraciones", + "overviewOfChat": "Resumen de la Charla", + "howToCreateATask": "Cómo crear una Tarea", + "howToCompleteATask": "Cómo completar una Tarea", + "otherNotes": "Otros temas de Notas", + "otherCalendar": "Otros temas del Calendario", + "otherProfile": "Otros temas de Perfil", + "otherSettings": "Otros temas de Configuraciones" } \ No newline at end of file diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json index 4da2ecf..d267bbd 100644 --- a/i18n/pt-BR.json +++ b/i18n/pt-BR.json @@ -134,5 +134,23 @@ "week": "Semana", "month": "Mês", "bad": "Mau", - "sendTask": "Enviar tarefa" + "sendTask": "Enviar tarefa", + "green": "Verde", + "orange": "laranja", + "yellow": "Amarelo", + "purple": "Roxo", + "grey": "Cinza", + "darkMode": "Modo escuro", + "overviewOfTasks": "Resumo das Tarefas", + "overviewOfNotes": "Resumo das Notas", + "overviewOfCalendar": "Resumo do Calendário", + "overviewOfProfile": "Resumo do perfil", + "overviewOfSettings": "Resumo das configurações", + "overviewOfChat": "Resumo do bate-papo", + "howToCreateATask": "Como criar uma Tarefa", + "howToCompleteATask": "Como concluir uma Tarefa", + "otherNotes": "Outros tópicos de Notas", + "otherCalendar": "Outros tópicos do Agenda", + "otherProfile": "Outros tópicos do Perfil", + "otherSettings": "Outros tópicos de configurações" } \ No newline at end of file diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json index 20f0175..8c37a98 100644 --- a/i18n/zh-CN.json +++ b/i18n/zh-CN.json @@ -134,5 +134,23 @@ "week": "星期", "month": "月", "bad": "坏的", - "sendTask": "发送任务" + "sendTask": "发送任务", + "green": "绿色的", + "orange": "橘子", + "yellow": "黄色的", + "purple": "紫色的", + "grey": "灰色的", + "darkMode": "黑暗模式", + "overviewOfTasks": "任务总结", + "overviewOfNotes": "笔记摘要", + "overviewOfCalendar": "日历摘要", + "overviewOfProfile": "简介概要", + "overviewOfSettings": "设置摘要", + "overviewOfChat": "聊天总结", + "howToCreateATask": "如何创建任务", + "howToCompleteATask": "如何完成任务", + "otherNotes": "其他笔记主题", + "otherCalendar": "其他日历主题", + "otherProfile": "其他个人资料主题", + "otherSettings": "其他设置主题" } \ No newline at end of file diff --git a/lib/Model/Setting.dart b/lib/Model/Setting.dart index 843bf09..a1606cd 100644 --- a/lib/Model/Setting.dart +++ b/lib/Model/Setting.dart @@ -12,7 +12,7 @@ enum FontSize { LARGE, } -enum AppTheme { BLUE, PINK, RED, ORANGE, GREEN, DARK, LIGHT, PURPLE, YELLOW} /// prob needs to be changed +enum AppTheme { BLUE, PINK, RED, ORANGE, GREEN, DARK, GREY, PURPLE, YELLOW} /// prob needs to be changed fontSizeStringToEnum(String fontSizeString) { switch (fontSizeString) { @@ -39,8 +39,8 @@ appThemeStringToEnum(String appTheme) { ///needs to be changed with appTheme return AppTheme.GREEN; case 'AppTheme.DARK': return AppTheme.DARK; - case 'AppTheme.LIGHT': - return AppTheme.LIGHT; + case 'AppTheme.GREY': + return AppTheme.GREY; case 'AppTheme.PURPLE': return AppTheme.PURPLE; case 'AppTheme.YELLOW': diff --git a/lib/Screens/Note/SaveNote.dart b/lib/Screens/Note/SaveNote.dart index da16807..f9ecdc0 100644 --- a/lib/Screens/Note/SaveNote.dart +++ b/lib/Screens/Note/SaveNote.dart @@ -260,7 +260,7 @@ class _SaveNoteState extends State { decoration: InputDecoration( border: OutlineInputBorder(), hintText: I18n.of(context)!.enterNoteText, - hintStyle: TextStyle(color: Colors.green)), + hintStyle: TextStyle(color: Colors.grey)), ), SizedBox(height: verticalColSpace), _selectDate(noteObserver.newNoteIsCheckList, I18n.of(context), diff --git a/lib/Screens/Settings/Setting.dart b/lib/Screens/Settings/Setting.dart index 123b959..be415cd 100644 --- a/lib/Screens/Settings/Setting.dart +++ b/lib/Screens/Settings/Setting.dart @@ -18,8 +18,8 @@ import '../../Utility/ThemeUtil.dart'; List fontSizes = [FontSize.SMALL, FontSize.MEDIUM, FontSize.LARGE]; List _minutesBeforeNoteNotification = ['1', '2', '3', '5', '10', '30']; List _minutesBeforeTaskNotification = ['1', '2', '3', '5', '10', '30']; -List themes = [AppTheme.BLUE, AppTheme.PINK, AppTheme.RED, - AppTheme.GREEN, AppTheme.ORANGE, AppTheme.DARK, AppTheme.LIGHT, +List themes = [AppTheme.BLUE, AppTheme.PINK, + AppTheme.GREEN, AppTheme.ORANGE, AppTheme.GREY, AppTheme.PURPLE, AppTheme.YELLOW]; List _daysToKeepFilesOptions = ["1", "3", "5", "7", "14", "Forever"]; @@ -87,33 +87,33 @@ class _SettingState extends State { { return I18n.of(context)!.pink; } - case AppTheme.RED: - { - return 'RED'; - } + // case AppTheme.RED: + // { + // return 'RED'; + // } case AppTheme.GREEN: { - return 'GREEN'; + return I18n.of(context)!.green; } case AppTheme.ORANGE: { - return 'ORANGE'; - } - case AppTheme.DARK: - { - return 'DARK'; + return I18n.of(context)!.orange; } - case AppTheme.LIGHT: + // case AppTheme.DARK: + // { + // return 'DARK'; + // } + case AppTheme.GREY: { - return 'LIGHT'; + return I18n.of(context)!.grey; } case AppTheme.PURPLE: { - return 'PURPLE'; + return I18n.of(context)!.purple; } case AppTheme.YELLOW: { - return 'YELLOW'; + return I18n.of(context)!.yellow; } default: throw new UnimplementedError('not implemented'); @@ -493,7 +493,7 @@ class _SettingState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - 'Dark Mode', + I18n.of(context)!.darkMode, style: TextStyle( fontSize: _bodyFontSize, fontWeight: FontWeight.bold, color: textCol), diff --git a/lib/Utility/ThemeUtil.dart b/lib/Utility/ThemeUtil.dart index 6670071..11aad09 100644 --- a/lib/Utility/ThemeUtil.dart +++ b/lib/Utility/ThemeUtil.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:memorez/Model/Setting.dart'; +///Main Theme color Color themeToColor(AppTheme theme) { switch (theme) { case AppTheme.PINK: @@ -10,8 +11,8 @@ Color themeToColor(AppTheme theme) { case AppTheme.BLUE: return Color(0xFF33ACE3); - case AppTheme.RED: - return Color(0xFFE00C25); + // case AppTheme.RED: + // return Color(0xFFE00C25); case AppTheme.ORANGE: return Color(0xFFFF5C13); @@ -19,35 +20,41 @@ Color themeToColor(AppTheme theme) { case AppTheme.GREEN: return Color(0xff1ca71b); - case AppTheme.LIGHT: + case AppTheme.GREY: return Color(0xE8C4C3C3); - case AppTheme.DARK: - return Color(0xFF070101); + // case AppTheme.DARK: + // return Color(0xFF070101); case AppTheme.PURPLE: return Color(0x9F6308BF); case AppTheme.YELLOW: return Color(0xFFEFD018); + default: + return Color(0xFF33ACE3); } } +///Dark or Light Mode background color Color backgroundMode(bool dark) { if (dark) return Color(0xFF282727); return Colors.white; } +///Font color depending on Dark or Light Mode Color textMode(bool dark) { if (dark) return Colors.white; return Colors.black; } +///Divider color depending on Dark or Light Mode Color dividerColor(bool dark) { if (dark) return Color(0x56ffffff); return Colors.grey; } +///Darker accent color Color? accent2(AppTheme theme) { switch (theme) { case AppTheme.PINK: @@ -59,20 +66,20 @@ Color? accent2(AppTheme theme) { return Color(0xFF673AB7); //return Colors.deepPurple; - case AppTheme.RED: - return Color(0xFF921546); + // case AppTheme.RED: + // return Color(0xFF921546); case AppTheme.ORANGE: - return Color(0xFFFF5C13); + return Color(0xFF893105); case AppTheme.GREEN: return Colors.green[900]; - case AppTheme.LIGHT: + case AppTheme.GREY: return Color(0xD76C6C6C); - case AppTheme.DARK: - return Color(0x9F070101); + // case AppTheme.DARK: + // return Color(0x9F070101); case AppTheme.PURPLE: //return Color(0x9F6308BF); @@ -81,9 +88,13 @@ Color? accent2(AppTheme theme) { case AppTheme.YELLOW: //return Color(0xFFFFDE1C); return Colors.orange[900]; + + default: + return Color(0xFF673AB7); } } +///Middle accent color Color? accent1(AppTheme theme) { switch (theme) { case AppTheme.PINK: @@ -99,13 +110,13 @@ Color? accent1(AppTheme theme) { return Color(0xFF9E435E); case AppTheme.ORANGE: - return Color(0xFFFF5C13); + return Color(0xFFC15227); case AppTheme.GREEN: //return Color(0xff1ca71b); return Colors.green[700]; - case AppTheme.LIGHT: + case AppTheme.GREY: return Color(0xE29E9E9E); case AppTheme.DARK: @@ -119,9 +130,13 @@ Color? accent1(AppTheme theme) { //return Color(0xFFFFDE1C); //return Colo return Colors.orange[600]; + + default: + return Color(0xFF448AFF); } } +///Light accent color Color? accent3(AppTheme theme) { switch (theme) { case AppTheme.PINK: @@ -137,13 +152,13 @@ Color? accent3(AppTheme theme) { return Color(0xFFDB7798); case AppTheme.ORANGE: - return Color(0xFFFF5C13); + return Color(0xFFD0693F); case AppTheme.GREEN: //return Color(0xff1ca71b); return Colors.green[500]; - case AppTheme.LIGHT: + case AppTheme.GREY: return Color(0xE2BDBBBB); case AppTheme.DARK: @@ -156,5 +171,8 @@ Color? accent3(AppTheme theme) { case AppTheme.YELLOW: //return Color(0xFFFFDE1C); return Colors.orange[300]; + + default: + return Color(0xFF40C4FF); } } diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index d7b7e26..8b46021 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -298,6 +298,42 @@ class I18n implements WidgetsLocalizations { String get bad => "Bad"; /// "Send Task" String get sendTask => "Send Task"; + /// "Green" + String get green => "Green"; + /// "Orange" + String get orange => "Orange"; + /// "Yellow" + String get yellow => "Yellow"; + /// "Purple" + String get purple => "Purple"; + /// "Grey" + String get grey => "Grey"; + /// "Dark Mode" + String get darkMode => "Dark Mode"; + /// "Overview of Tasks" + String get overviewOfTasks => "Overview of Tasks"; + /// "Overview of Notes" + String get overviewOfNotes => "Overview of Notes"; + /// "Overview of Calendar" + String get overviewOfCalendar => "Overview of Calendar"; + /// "Overview of Profile" + String get overviewOfProfile => "Overview of Profile"; + /// "Overview of Settings" + String get overviewOfSettings => "Overview of Settings"; + /// "Overview of Chat" + String get overviewOfChat => "Overview of Chat"; + /// "How to create a Task" + String get howToCreateATask => "How to create a Task"; + /// "How to complete a Task" + String get howToCompleteATask => "How to complete a Task"; + /// "Other topics on Notes" + String get otherNotes => "Other topics on Notes"; + /// "Other topics on Calendar" + String get otherCalendar => "Other topics on Calendar"; + /// "Other topics on Profile" + String get otherProfile => "Other topics on Profile"; + /// "Other topics on Settings" + String get otherSettings => "Other topics on Settings"; /// "Ayuda" String get helpScreen => "Ayuda"; /// "Palabras Claves" @@ -712,832 +748,994 @@ class _I18n_es_US extends I18n { /// "Enviar tarea" @override String get sendTask => "Enviar tarea"; -} -class _I18n_zh_CN extends I18n { - const _I18n_zh_CN(); - @override - TextDirection get textDirection => TextDirection.ltr; - /// "家" + /// "Verde" @override - String get homeScreenName => "家"; - /// "菜单" + String get green => "Verde"; + /// "Naranja" @override - String get menuScreenName => "菜单"; - /// "笔记" + String get orange => "Naranja"; + /// "Amarillo" @override - String get notesScreenName => "笔记"; - /// "通知" + String get yellow => "Amarillo"; + /// "Morado" @override - String get notificationsScreenName => "通知"; - /// "环境" + String get purple => "Morado"; + /// "Gris" @override - String get settingScreenName => "环境"; - /// "日历" + String get grey => "Gris"; + /// "Modo oscuro" @override - String get calendarScreenName => "日历"; - /// "麦克风" + String get darkMode => "Modo oscuro"; + /// "Resumen de Tareas" @override - String get micButton => "麦克风"; - /// "按录制" + String get overviewOfTasks => "Resumen de Tareas"; + /// "Resumen de Notas" @override - String get pressToRecord => "按录制"; - /// "是的" + String get overviewOfNotes => "Resumen de Notas"; + /// "Resumen del Calendario" @override - String get yes => "是的"; - /// "保存注释" + String get overviewOfCalendar => "Resumen del Calendario"; + /// "Resumen del Perfil" @override - String get saveNote => "保存注释"; - /// "日期" + String get overviewOfProfile => "Resumen del Perfil"; + /// "Resumen de Configuraciones" @override - String get date => "日期"; - /// "笔记" + String get overviewOfSettings => "Resumen de Configuraciones"; + /// "Resumen de la Charla" @override - String get note => "笔记"; - /// "笔记详情" + String get overviewOfChat => "Resumen de la Charla"; + /// "Cómo crear una Tarea" @override - String get notesDetailScreenName => "笔记详情"; - /// "添加注释" + String get howToCreateATask => "Cómo crear una Tarea"; + /// "Cómo completar una Tarea" @override - String get addNotesScreenName => "添加注释"; - /// "清单" + String get howToCompleteATask => "Cómo completar una Tarea"; + /// "Otros temas de Notas" @override - String get checklistScreenName => "清单"; - /// "帮助" + String get otherNotes => "Otros temas de Notas"; + /// "Otros temas del Calendario" @override - String get helpScreen => "帮助"; - /// "扳机" + String get otherCalendar => "Otros temas del Calendario"; + /// "Otros temas de Perfil" @override - String get triggerScreen => "扳机"; - /// "同步到云端" + String get otherProfile => "Otros temas de Perfil"; + /// "Otros temas de Configuraciones" @override - String get syncToCloudScreen => "同步到云端"; - /// "云设置" + String get otherSettings => "Otros temas de Configuraciones"; +} +class _I18n_pt_BR extends I18n { + const _I18n_pt_BR(); + @override + TextDirection get textDirection => TextDirection.ltr; + /// "Casa" @override - String get onboardCloudSetup => "云设置"; - /// "允许" + String get homeScreenName => "Casa"; + /// "Cardápio" @override - String get onboardPermissionSetup => "允许"; - /// "选择语言" + String get menuScreenName => "Cardápio"; + /// "Notas" @override - String get onboardLangSetup => "选择语言"; - /// "介绍" + String get notesScreenName => "Notas"; + /// "Notificações" @override - String get walkthroughScreen => "介绍"; - /// "您想设置一个云帐户吗？" + String get notificationsScreenName => "Notificações"; + /// "Configuração" @override - String get cloudSetupPrompt => "您想设置一个云帐户吗？"; - /// "不" + String get settingScreenName => "Configuração"; + /// "Calendário" @override - String get no => "不"; - /// "欢迎来到记忆魔法" + String get calendarScreenName => "Calendário"; + /// "Microfone" @override - String get welcome => "欢迎来到记忆魔法"; - /// "后退" + String get micButton => "Microfone"; + /// "Pressione para gravar" @override - String get back => "后退"; - /// "下一个" + String get pressToRecord => "Pressione para gravar"; + /// "sim" @override - String get next => "下一个"; - /// "请选择您的主要语言。" + String get yes => "sim"; + /// "SALVAR NOTA" @override - String get selectLanguage => "请选择您的主要语言。"; - /// "语" + String get saveNote => "SALVAR NOTA"; + /// "Encontro" @override - String get language => "语"; - /// "我们是否有权访问您的麦克风？" + String get date => "Encontro"; + /// "Observação" @override - String get promptPermission => "我们是否有权访问您的麦克风？"; - /// "为笔记选择字体大小" + String get note => "Observação"; + /// "Detalhes das notas" @override - String get promptNoteFontSize => "为笔记选择字体大小"; - /// "为菜单选择字体大小" + String get notesDetailScreenName => "Detalhes das notas"; + /// "Adicionar notas" @override - String get promptMenuFontSize => "为菜单选择字体大小"; - /// "选择笔记删除时间线" + String get addNotesScreenName => "Adicionar notas"; + /// "Lista de controle" @override - String get promptNoteDeletionTimeline => "选择笔记删除时间线"; - /// "小的" + String get checklistScreenName => "Lista de controle"; + /// "Ajuda" @override - String get small => "小的"; - /// "中等的" + String get helpScreen => "Ajuda"; + /// "Desencadear" @override - String get medium => "中等的"; - /// "大的" + String get triggerScreen => "Desencadear"; + /// "Sincronizar com a nuvem" @override - String get large => "大的"; - /// "取消" + String get syncToCloudScreen => "Sincronizar com a nuvem"; + /// "Configuração da nuvem" @override - String get cancel => "取消"; - /// "节省" + String get onboardCloudSetup => "Configuração da nuvem"; + /// "Permissão" @override - String get save => "节省"; - /// "安全设定" + String get onboardPermissionSetup => "Permissão"; + /// "Selecione o idioma" @override - String get securitySettings => "安全设定"; - /// "注意：此权限将允许所有类型的语音交互。" + String get onboardLangSetup => "Selecione o idioma"; + /// "Introdução" @override - String get permissionNote => "注意：此权限将允许所有类型的语音交互。"; - /// "记笔记的天数" + String get walkthroughScreen => "Introdução"; + /// "Você gostaria de configurar uma conta na nuvem?" @override - String get daysToKeepNotes => "记笔记的天数"; - /// "注释字体大小" + String get cloudSetupPrompt => "Você gostaria de configurar uma conta na nuvem?"; + /// "Não" @override - String get noteFontSize => "注释字体大小"; - /// "菜单字体大小" + String get no => "Não"; + /// "Bem-vindo ao Memory Magic" @override - String get menuFontSize => "菜单字体大小"; - /// "帮助" + String get welcome => "Bem-vindo ao Memory Magic"; + /// "Voltar" @override - String get help => "帮助"; - /// "扳机" + String get back => "Voltar"; + /// "Próximo" @override - String get trigger => "扳机"; - /// "同步到云端" + String get next => "Próximo"; + /// "Selecione seu idioma principal." @override - String get syncToCloud => "同步到云端"; - /// "加载中" + String get selectLanguage => "Selecione seu idioma principal."; + /// "Língua" @override - String get loading => "加载中"; - /// "编辑笔记" + String get language => "Língua"; + /// "Temos permissão para acessar seu microfone?" @override - String get editNote => "编辑笔记"; - /// "删除笔记" + String get promptPermission => "Temos permissão para acessar seu microfone?"; + /// "Selecione o tamanho da fonte para as notas" @override - String get deleteNote => "删除笔记"; - /// "确认笔记删除" + String get promptNoteFontSize => "Selecione o tamanho da fonte para as notas"; + /// "Selecione o tamanho da fonte para o menu" @override - String get confirmNoteDeletion => "确认笔记删除"; - /// "你确定要删除这条笔记么？" + String get promptMenuFontSize => "Selecione o tamanho da fonte para o menu"; + /// "Selecione o cronograma de exclusão de notas" @override - String get areYouSureYouWantToDelete => "你确定要删除这条笔记么？"; - /// "笔记已保存" + String get promptNoteDeletionTimeline => "Selecione o cronograma de exclusão de notas"; + /// "Pequena" @override - String get noteSaved => "笔记已保存"; - /// "输入笔记的文本" + String get small => "Pequena"; + /// "Médio" @override - String get enterNoteText => "输入笔记的文本"; - /// "好的" + String get medium => "Médio"; + /// "Grande" @override - String get ok => "好的"; - /// "笔记已成功保存。" + String get large => "Grande"; + /// "Cancelar" @override - String get noteSavedSuccess => "笔记已成功保存。"; - /// "添加注释" + String get cancel => "Cancelar"; + /// "Salve" @override - String get addNote => "添加注释"; - /// "您想发言还是写笔记？" + String get save => "Salve"; + /// "Configurações de segurança" @override - String get speakOrWritePrompt => "您想发言还是写笔记？"; - /// "选择应用主题" + String get securitySettings => "Configurações de segurança"; + /// "NOTA: Esta permissão permitirá todos os tipos de interação por voz." @override - String get promptTheme => "选择应用主题"; - /// "主题" + String get permissionNote => "NOTA: Esta permissão permitirá todos os tipos de interação por voz."; + /// "Dias para manter notas" @override - String get theme => "主题"; - /// "蓝色" + String get daysToKeepNotes => "Dias para manter notas"; + /// "Tamanho da fonte da nota" @override - String get blue => "蓝色"; - /// "粉色的" + String get noteFontSize => "Tamanho da fonte da nota"; + /// "Tamanho da fonte do menu" @override - String get pink => "粉色的"; - /// "我怎么帮你" + String get menuFontSize => "Tamanho da fonte do menu"; + /// "Ajuda" @override - String get howCanIHelpYou => "我怎么帮你"; - /// "打开笔记通知" + String get help => "Ajuda"; + /// "Desencadear" @override - String get turnOnNotesNotification => "打开笔记通知"; - /// "开启活动前提醒" + String get trigger => "Desencadear"; + /// "Sincronizar com a nuvem" @override - String get turnOnEventReminder => "开启活动前提醒"; - /// "注意：提醒在活动开始前 15 分钟开始。" + String get syncToCloud => "Sincronizar com a nuvem"; + /// "Carregando" @override - String get reminderStartTime => "注意：提醒在活动开始前 15 分钟开始。"; - /// "活动通知" + String get loading => "Carregando"; + /// "Editar nota" @override - String get activitiesNotifications => "活动通知"; - /// "打开每小时步行的通知" + String get editNote => "Editar nota"; + /// "Apagar Nota" @override - String get turnOnHourlyWalkNotification => "打开每小时步行的通知"; - /// "打开每小时水的通知" + String get deleteNote => "Apagar Nota"; + /// "Confirmar exclusão de nota" @override - String get turnOnHourlyWaterNotification => "打开每小时水的通知"; - /// "打开浴室通知" + String get confirmNoteDeletion => "Confirmar exclusão de nota"; + /// "Tem certeza de que deseja excluir esta anotação?" @override - String get turnOnBathroomNotification => "打开浴室通知"; - /// "以下视频简要介绍了如何使用 Memory Magic App" + String get areYouSureYouWantToDelete => "Tem certeza de que deseja excluir esta anotação?"; + /// "Nota salva" @override - String get walkthroughVideoLine => "以下视频简要介绍了如何使用 Memory Magic App"; - /// "功能将受到限制，不允许访问您的麦克风。" + String get noteSaved => "Nota salva"; + /// "Insira o texto da sua nota" @override - String get micLimitedAccess => "功能将受到限制，不允许访问您的麦克风。"; - /// "笔记通知" + String get enterNoteText => "Insira o texto da sua nota"; + /// "OK" @override - String get notesNotificiations => "笔记通知"; - /// "设置" + String get ok => "OK"; + /// "A nota foi salva com sucesso." @override - String get generalSettingsScreen => "设置"; - /// "重启" + String get noteSavedSuccess => "A nota foi salva com sucesso."; + /// "Adicionar nota" @override - String get resetSettings => "重启"; - /// "设置" + String get addNote => "Adicionar nota"; + /// "Você gostaria de falar ou escrever uma nota?" @override - String get generalSetting => "设置"; - /// "我应该创建一个笔记吗？" + String get speakOrWritePrompt => "Você gostaria de falar ou escrever uma nota?"; + /// "Selecione o tema do aplicativo" @override - String get shouldICreateANote => "我应该创建一个笔记吗？"; - /// "好的，我不会创建笔记。" + String get promptTheme => "Selecione o tema do aplicativo"; + /// "Tema" @override - String get willNotCreateNote => "好的，我不会创建笔记。"; - /// "当然！我怎么帮你？" + String get theme => "Tema"; + /// "Azul" @override - String get sureHowCanIHelp => "当然！我怎么帮你？"; - /// "好的谢谢！再见。" + String get blue => "Azul"; + /// "Cor de rosa" @override - String get thxBye => "好的谢谢！再见。"; - /// "创建了以下注释：" + String get pink => "Cor de rosa"; + /// "Como posso ajudá-lo?" @override - String get createdTheFollowingNote => "创建了以下注释："; - /// "开始日期" + String get howCanIHelpYou => "Como posso ajudá-lo?"; + /// "Ativar notificações para notas" @override - String get startDate => "开始日期"; - /// "选择日期" + String get turnOnNotesNotification => "Ativar notificações para notas"; + /// "Ativar lembrete antes de um evento" @override - String get selectDate => "选择日期"; - /// "输入时间" + String get turnOnEventReminder => "Ativar lembrete antes de um evento"; + /// "Nota: o lembrete começa 15 minutos antes do evento." @override - String get enterTime => "输入时间"; - /// "清空选项" + String get reminderStartTime => "Nota: o lembrete começa 15 minutos antes do evento."; + /// "Notificações de atividades" @override - String get clearSelection => "清空选项"; - /// "启用通知" + String get activitiesNotifications => "Notificações de atividades"; + /// "Ativar notificação para caminhada de hora em hora" @override - String get enableNotifications => "启用通知"; - /// "通知前几分钟" + String get turnOnHourlyWalkNotification => "Ativar notificação para caminhada de hora em hora"; + /// "Ativar notificação para água de hora em hora" @override - String get minutesBeforeNotifications => "通知前几分钟"; - /// "任务" + String get turnOnHourlyWaterNotification => "Ativar notificação para água de hora em hora"; + /// "Ativar notificação para banheiro" @override - String get tasks => "任务"; - /// "字体大小" + String get turnOnBathroomNotification => "Ativar notificação para banheiro"; + /// "Aqui está um vídeo com um breve passo a passo de como usar o aplicativo Memory Magic" @override - String get fontSize => "字体大小"; - /// "应用设置" + String get walkthroughVideoLine => "Aqui está um vídeo com um breve passo a passo de como usar o aplicativo Memory Magic"; + /// "Os recursos serão limitados sem permitir o acesso ao seu microfone." @override - String get appSettings => "应用设置"; - /// "轮廓" + String get micLimitedAccess => "Os recursos serão limitados sem permitir o acesso ao seu microfone."; + /// "Notificações de notas" @override - String get profile => "轮廓"; - /// "聊天" + String get notesNotificiations => "Notificações de notas"; + /// "Definições" @override - String get chat => "聊天"; - /// "帮助主题" + String get generalSettingsScreen => "Definições"; + /// "Redefinir" @override - String get helpTopics => "帮助主题"; - /// "编辑患者信息" + String get resetSettings => "Redefinir"; + /// "Definições" @override - String get editpatientinformation => "编辑患者信息"; - /// "姓名" + String get generalSetting => "Definições"; + /// "Devo criar uma nota?" @override - String get name => "姓名"; - /// "出生日期" + String get shouldICreateANote => "Devo criar uma nota?"; + /// "Ok, não vou criar uma nota." @override - String get dateOfBirth => "出生日期"; - /// "电话号码" + String get willNotCreateNote => "Ok, não vou criar uma nota."; + /// "Certo! Como posso ajudá-lo?" @override - String get phoneNumber => "电话号码"; - /// "联系人" + String get sureHowCanIHelp => "Certo! Como posso ajudá-lo?"; + /// "Ok, obrigado! Bye Bye." @override - String get contacts => "联系人"; - /// "护理团队" + String get thxBye => "Ok, obrigado! Bye Bye."; + /// "Criou a seguinte nota:" @override - String get careTeam => "护理团队"; - /// "运输" + String get createdTheFollowingNote => "Criou a seguinte nota:"; + /// "Data de início" @override - String get transportation => "运输"; - /// "药物" + String get startDate => "Data de início"; + /// "Selecione a data" @override - String get medications => "药物"; - /// "药物" + String get selectDate => "Selecione a data"; + /// "Digite o tempo" @override - String get medication => "药物"; - /// "过敏" + String get enterTime => "Digite o tempo"; + /// "Seleção clara" @override - String get allergies => "过敏"; - /// "病史" + String get clearSelection => "Seleção clara"; + /// "Ativar notificações" @override - String get medicalHistory => "病史"; - /// "关于我" + String get enableNotifications => "Ativar notificações"; + /// "Minutos antes das notificações" @override - String get aboutMe => "关于我"; - /// "电话" + String get minutesBeforeNotifications => "Minutos antes das notificações"; + /// "Tarefas" @override - String get phone => "电话"; - /// "添加" + String get tasks => "Tarefas"; + /// "Tamanho da fonte" @override - String get add => "添加"; - /// "编辑" + String get fontSize => "Tamanho da fonte"; + /// "Configurações do aplicativo" @override - String get edit => "编辑"; - /// "更新" + String get appSettings => "Configurações do aplicativo"; + /// "Perfil" @override - String get update => "更新"; - /// "请输入" + String get profile => "Perfil"; + /// "bater papo" @override - String get pleaseEnter => "请输入"; - /// "删除" + String get chat => "bater papo"; + /// "Tópicos de ajuda" @override - String get delete => "删除"; - /// "剂量" + String get helpTopics => "Tópicos de ajuda"; + /// "Editar informações do paciente" @override - String get dose => "剂量"; - /// "联系" + String get editpatientinformation => "Editar informações do paciente"; + /// "Nome" @override - String get contact => "联系"; - /// "过敏" + String get name => "Nome"; + /// "Data de nascimento" @override - String get allergy => "过敏"; - /// "过敏反应" + String get dateOfBirth => "Data de nascimento"; + /// "Número de telefone" @override - String get allergyReaction => "过敏反应"; - /// "活动任务" + String get phoneNumber => "Número de telefone"; + /// "Contatos" @override - String get activeTasks => "活动任务"; - /// "添加护理团队成员" + String get contacts => "Contatos"; + /// "Equipe de atendimento" @override - String get addCareTeamMember => "添加护理团队成员"; - /// "已完成的任务" + String get careTeam => "Equipe de atendimento"; + /// "Transporte" @override - String get completedTasks => "已完成的任务"; - /// "继续" + String get transportation => "Transporte"; + /// "Medicamentos" @override - String get continueWord => "继续"; - /// "描述" + String get medications => "Medicamentos"; + /// "Medicamento" @override - String get description => "描述"; - /// "细节" + String get medication => "Medicamento"; + /// "Alergias" @override - String get details => "细节"; - /// "启用看护人模式" + String get allergies => "Alergias"; + /// "Histórico médico" @override - String get enableCaregiverMode => "启用看护人模式"; - /// "退出看护人" + String get medicalHistory => "Histórico médico"; + /// "Sobre mim" @override - String get exitCaregiver => "退出看护人"; - /// "更新看护人" + String get aboutMe => "Sobre mim"; + /// "telefone" @override - String get updateCaregiver => "更新看护人"; - /// "提醒" + String get phone => "telefone"; + /// "Adicionar" @override - String get reminder => "提醒"; - /// "日程" + String get add => "Adicionar"; + /// "Editar" @override - String get schedule => "日程"; - /// "搜索笔记" + String get edit => "Editar"; + /// "Atualizar" @override - String get searchForNote => "搜索笔记"; - /// "选择任务类型" + String get update => "Atualizar"; + /// "Por favor entrar" @override - String get selectTaskType => "选择任务类型"; - /// "更新护理团队成员" + String get pleaseEnter => "Por favor entrar"; + /// "Excluir" @override - String get updateCareTeamMember => "更新护理团队成员"; - /// "返回笔记" + String get delete => "Excluir"; + /// "dosagem" @override - String get backToNotes => "返回笔记"; - /// "发送提醒通知？" + String get dose => "dosagem"; + /// "Contato" @override - String get sendReminderNotification => "发送提醒通知？"; - /// "设置日期和时间会将注释添加到您的日历中" + String get contact => "Contato"; + /// "Alergia" @override - String get settingDateAndTime => "设置日期和时间会将注释添加到您的日历中"; - /// "日" + String get allergy => "Alergia"; + /// "Reação Alérgica" @override - String get day => "日"; - /// "星期" + String get allergyReaction => "Reação Alérgica"; + /// "Tarefas ativas" @override - String get week => "星期"; - /// "月" + String get activeTasks => "Tarefas ativas"; + /// "Adicionar Membro Da Equipe De Atendimento" @override - String get month => "月"; - /// "坏的" + String get addCareTeamMember => "Adicionar Membro Da Equipe De Atendimento"; + /// "Tarefas Concluídas" @override - String get bad => "坏的"; - /// "发送任务" + String get completedTasks => "Tarefas Concluídas"; + /// "Continuar" @override - String get sendTask => "发送任务"; + String get continueWord => "Continuar"; + /// "Descrição" + @override + String get description => "Descrição"; + /// "Detalhes" + @override + String get details => "Detalhes"; + /// "Ativar O Modo De Cuidador" + @override + String get enableCaregiverMode => "Ativar O Modo De Cuidador"; + /// "Sair Do Cuidador" + @override + String get exitCaregiver => "Sair Do Cuidador"; + /// "Atualizar Cuidador" + @override + String get updateCaregiver => "Atualizar Cuidador"; + /// "Lembrete" + @override + String get reminder => "Lembrete"; + /// "Agendar" + @override + String get schedule => "Agendar"; + /// "Procurar Uma Nota" + @override + String get searchForNote => "Procurar Uma Nota"; + /// "Selecione O Tipo De Tarefa" + @override + String get selectTaskType => "Selecione O Tipo De Tarefa"; + /// "Atualizar membro da equipe de cuidados" + @override + String get updateCareTeamMember => "Atualizar membro da equipe de cuidados"; + /// "VOLTAR ÀS NOTAS" + @override + String get backToNotes => "VOLTAR ÀS NOTAS"; + /// "Enviar notificação de lembrete?" + @override + String get sendReminderNotification => "Enviar notificação de lembrete?"; + /// "Definir uma data e hora adicionará a nota ao seu calendário" + @override + String get settingDateAndTime => "Definir uma data e hora adicionará a nota ao seu calendário"; + /// "Dia" + @override + String get day => "Dia"; + /// "Semana" + @override + String get week => "Semana"; + /// "Mês" + @override + String get month => "Mês"; + /// "Mau" + @override + String get bad => "Mau"; + /// "Enviar tarefa" + @override + String get sendTask => "Enviar tarefa"; + /// "Verde" + @override + String get green => "Verde"; + /// "laranja" + @override + String get orange => "laranja"; + /// "Amarelo" + @override + String get yellow => "Amarelo"; + /// "Roxo" + @override + String get purple => "Roxo"; + /// "Cinza" + @override + String get grey => "Cinza"; + /// "Modo escuro" + @override + String get darkMode => "Modo escuro"; + /// "Resumo das Tarefas" + @override + String get overviewOfTasks => "Resumo das Tarefas"; + /// "Resumo das Notas" + @override + String get overviewOfNotes => "Resumo das Notas"; + /// "Resumo do Calendário" + @override + String get overviewOfCalendar => "Resumo do Calendário"; + /// "Resumo do perfil" + @override + String get overviewOfProfile => "Resumo do perfil"; + /// "Resumo das configurações" + @override + String get overviewOfSettings => "Resumo das configurações"; + /// "Resumo do bate-papo" + @override + String get overviewOfChat => "Resumo do bate-papo"; + /// "Como criar uma Tarefa" + @override + String get howToCreateATask => "Como criar uma Tarefa"; + /// "Como concluir uma Tarefa" + @override + String get howToCompleteATask => "Como concluir uma Tarefa"; + /// "Outros tópicos de Notas" + @override + String get otherNotes => "Outros tópicos de Notas"; + /// "Outros tópicos do Agenda" + @override + String get otherCalendar => "Outros tópicos do Agenda"; + /// "Outros tópicos do Perfil" + @override + String get otherProfile => "Outros tópicos do Perfil"; + /// "Outros tópicos de configurações" + @override + String get otherSettings => "Outros tópicos de configurações"; } -class _I18n_pt_BR extends I18n { - const _I18n_pt_BR(); +class _I18n_zh_CN extends I18n { + const _I18n_zh_CN(); @override TextDirection get textDirection => TextDirection.ltr; - /// "Casa" + /// "家" @override - String get homeScreenName => "Casa"; - /// "Cardápio" + String get homeScreenName => "家"; + /// "菜单" @override - String get menuScreenName => "Cardápio"; - /// "Notas" + String get menuScreenName => "菜单"; + /// "笔记" @override - String get notesScreenName => "Notas"; - /// "Notificações" + String get notesScreenName => "笔记"; + /// "通知" + @override + String get notificationsScreenName => "通知"; + /// "环境" + @override + String get settingScreenName => "环境"; + /// "日历" + @override + String get calendarScreenName => "日历"; + /// "麦克风" + @override + String get micButton => "麦克风"; + /// "按录制" + @override + String get pressToRecord => "按录制"; + /// "是的" + @override + String get yes => "是的"; + /// "保存注释" + @override + String get saveNote => "保存注释"; + /// "日期" + @override + String get date => "日期"; + /// "笔记" + @override + String get note => "笔记"; + /// "笔记详情" + @override + String get notesDetailScreenName => "笔记详情"; + /// "添加注释" + @override + String get addNotesScreenName => "添加注释"; + /// "清单" + @override + String get checklistScreenName => "清单"; + /// "帮助" + @override + String get helpScreen => "帮助"; + /// "扳机" + @override + String get triggerScreen => "扳机"; + /// "同步到云端" + @override + String get syncToCloudScreen => "同步到云端"; + /// "云设置" + @override + String get onboardCloudSetup => "云设置"; + /// "允许" + @override + String get onboardPermissionSetup => "允许"; + /// "选择语言" + @override + String get onboardLangSetup => "选择语言"; + /// "介绍" @override - String get notificationsScreenName => "Notificações"; - /// "Configuração" + String get walkthroughScreen => "介绍"; + /// "您想设置一个云帐户吗？" @override - String get settingScreenName => "Configuração"; - /// "Calendário" + String get cloudSetupPrompt => "您想设置一个云帐户吗？"; + /// "不" @override - String get calendarScreenName => "Calendário"; - /// "Microfone" + String get no => "不"; + /// "欢迎来到记忆魔法" @override - String get micButton => "Microfone"; - /// "Pressione para gravar" + String get welcome => "欢迎来到记忆魔法"; + /// "后退" @override - String get pressToRecord => "Pressione para gravar"; - /// "sim" + String get back => "后退"; + /// "下一个" @override - String get yes => "sim"; - /// "SALVAR NOTA" + String get next => "下一个"; + /// "请选择您的主要语言。" @override - String get saveNote => "SALVAR NOTA"; - /// "Encontro" + String get selectLanguage => "请选择您的主要语言。"; + /// "语" @override - String get date => "Encontro"; - /// "Observação" + String get language => "语"; + /// "我们是否有权访问您的麦克风？" @override - String get note => "Observação"; - /// "Detalhes das notas" + String get promptPermission => "我们是否有权访问您的麦克风？"; + /// "为笔记选择字体大小" @override - String get notesDetailScreenName => "Detalhes das notas"; - /// "Adicionar notas" + String get promptNoteFontSize => "为笔记选择字体大小"; + /// "为菜单选择字体大小" @override - String get addNotesScreenName => "Adicionar notas"; - /// "Lista de controle" + String get promptMenuFontSize => "为菜单选择字体大小"; + /// "选择笔记删除时间线" @override - String get checklistScreenName => "Lista de controle"; - /// "Ajuda" + String get promptNoteDeletionTimeline => "选择笔记删除时间线"; + /// "小的" @override - String get helpScreen => "Ajuda"; - /// "Desencadear" + String get small => "小的"; + /// "中等的" @override - String get triggerScreen => "Desencadear"; - /// "Sincronizar com a nuvem" + String get medium => "中等的"; + /// "大的" @override - String get syncToCloudScreen => "Sincronizar com a nuvem"; - /// "Configuração da nuvem" + String get large => "大的"; + /// "取消" @override - String get onboardCloudSetup => "Configuração da nuvem"; - /// "Permissão" + String get cancel => "取消"; + /// "节省" @override - String get onboardPermissionSetup => "Permissão"; - /// "Selecione o idioma" + String get save => "节省"; + /// "安全设定" @override - String get onboardLangSetup => "Selecione o idioma"; - /// "Introdução" + String get securitySettings => "安全设定"; + /// "注意：此权限将允许所有类型的语音交互。" @override - String get walkthroughScreen => "Introdução"; - /// "Você gostaria de configurar uma conta na nuvem?" + String get permissionNote => "注意：此权限将允许所有类型的语音交互。"; + /// "记笔记的天数" @override - String get cloudSetupPrompt => "Você gostaria de configurar uma conta na nuvem?"; - /// "Não" + String get daysToKeepNotes => "记笔记的天数"; + /// "注释字体大小" @override - String get no => "Não"; - /// "Bem-vindo ao Memory Magic" + String get noteFontSize => "注释字体大小"; + /// "菜单字体大小" @override - String get welcome => "Bem-vindo ao Memory Magic"; - /// "Voltar" + String get menuFontSize => "菜单字体大小"; + /// "帮助" @override - String get back => "Voltar"; - /// "Próximo" + String get help => "帮助"; + /// "扳机" @override - String get next => "Próximo"; - /// "Selecione seu idioma principal." + String get trigger => "扳机"; + /// "同步到云端" @override - String get selectLanguage => "Selecione seu idioma principal."; - /// "Língua" + String get syncToCloud => "同步到云端"; + /// "加载中" @override - String get language => "Língua"; - /// "Temos permissão para acessar seu microfone?" + String get loading => "加载中"; + /// "编辑笔记" @override - String get promptPermission => "Temos permissão para acessar seu microfone?"; - /// "Selecione o tamanho da fonte para as notas" + String get editNote => "编辑笔记"; + /// "删除笔记" @override - String get promptNoteFontSize => "Selecione o tamanho da fonte para as notas"; - /// "Selecione o tamanho da fonte para o menu" + String get deleteNote => "删除笔记"; + /// "确认笔记删除" @override - String get promptMenuFontSize => "Selecione o tamanho da fonte para o menu"; - /// "Selecione o cronograma de exclusão de notas" + String get confirmNoteDeletion => "确认笔记删除"; + /// "你确定要删除这条笔记么？" @override - String get promptNoteDeletionTimeline => "Selecione o cronograma de exclusão de notas"; - /// "Pequena" + String get areYouSureYouWantToDelete => "你确定要删除这条笔记么？"; + /// "笔记已保存" @override - String get small => "Pequena"; - /// "Médio" + String get noteSaved => "笔记已保存"; + /// "输入笔记的文本" @override - String get medium => "Médio"; - /// "Grande" + String get enterNoteText => "输入笔记的文本"; + /// "好的" @override - String get large => "Grande"; - /// "Cancelar" + String get ok => "好的"; + /// "笔记已成功保存。" @override - String get cancel => "Cancelar"; - /// "Salve" + String get noteSavedSuccess => "笔记已成功保存。"; + /// "添加注释" @override - String get save => "Salve"; - /// "Configurações de segurança" + String get addNote => "添加注释"; + /// "您想发言还是写笔记？" @override - String get securitySettings => "Configurações de segurança"; - /// "NOTA: Esta permissão permitirá todos os tipos de interação por voz." + String get speakOrWritePrompt => "您想发言还是写笔记？"; + /// "选择应用主题" @override - String get permissionNote => "NOTA: Esta permissão permitirá todos os tipos de interação por voz."; - /// "Dias para manter notas" + String get promptTheme => "选择应用主题"; + /// "主题" @override - String get daysToKeepNotes => "Dias para manter notas"; - /// "Tamanho da fonte da nota" + String get theme => "主题"; + /// "蓝色" @override - String get noteFontSize => "Tamanho da fonte da nota"; - /// "Tamanho da fonte do menu" + String get blue => "蓝色"; + /// "粉色的" @override - String get menuFontSize => "Tamanho da fonte do menu"; - /// "Ajuda" + String get pink => "粉色的"; + /// "我怎么帮你" @override - String get help => "Ajuda"; - /// "Desencadear" + String get howCanIHelpYou => "我怎么帮你"; + /// "打开笔记通知" @override - String get trigger => "Desencadear"; - /// "Sincronizar com a nuvem" + String get turnOnNotesNotification => "打开笔记通知"; + /// "开启活动前提醒" @override - String get syncToCloud => "Sincronizar com a nuvem"; - /// "Carregando" + String get turnOnEventReminder => "开启活动前提醒"; + /// "注意：提醒在活动开始前 15 分钟开始。" @override - String get loading => "Carregando"; - /// "Editar nota" + String get reminderStartTime => "注意：提醒在活动开始前 15 分钟开始。"; + /// "活动通知" @override - String get editNote => "Editar nota"; - /// "Apagar Nota" + String get activitiesNotifications => "活动通知"; + /// "打开每小时步行的通知" @override - String get deleteNote => "Apagar Nota"; - /// "Confirmar exclusão de nota" + String get turnOnHourlyWalkNotification => "打开每小时步行的通知"; + /// "打开每小时水的通知" @override - String get confirmNoteDeletion => "Confirmar exclusão de nota"; - /// "Tem certeza de que deseja excluir esta anotação?" + String get turnOnHourlyWaterNotification => "打开每小时水的通知"; + /// "打开浴室通知" @override - String get areYouSureYouWantToDelete => "Tem certeza de que deseja excluir esta anotação?"; - /// "Nota salva" + String get turnOnBathroomNotification => "打开浴室通知"; + /// "以下视频简要介绍了如何使用 Memory Magic App" @override - String get noteSaved => "Nota salva"; - /// "Insira o texto da sua nota" + String get walkthroughVideoLine => "以下视频简要介绍了如何使用 Memory Magic App"; + /// "功能将受到限制，不允许访问您的麦克风。" @override - String get enterNoteText => "Insira o texto da sua nota"; - /// "OK" + String get micLimitedAccess => "功能将受到限制，不允许访问您的麦克风。"; + /// "笔记通知" @override - String get ok => "OK"; - /// "A nota foi salva com sucesso." + String get notesNotificiations => "笔记通知"; + /// "设置" @override - String get noteSavedSuccess => "A nota foi salva com sucesso."; - /// "Adicionar nota" + String get generalSettingsScreen => "设置"; + /// "重启" @override - String get addNote => "Adicionar nota"; - /// "Você gostaria de falar ou escrever uma nota?" + String get resetSettings => "重启"; + /// "设置" @override - String get speakOrWritePrompt => "Você gostaria de falar ou escrever uma nota?"; - /// "Selecione o tema do aplicativo" + String get generalSetting => "设置"; + /// "我应该创建一个笔记吗？" @override - String get promptTheme => "Selecione o tema do aplicativo"; - /// "Tema" + String get shouldICreateANote => "我应该创建一个笔记吗？"; + /// "好的，我不会创建笔记。" @override - String get theme => "Tema"; - /// "Azul" + String get willNotCreateNote => "好的，我不会创建笔记。"; + /// "当然！我怎么帮你？" @override - String get blue => "Azul"; - /// "Cor de rosa" + String get sureHowCanIHelp => "当然！我怎么帮你？"; + /// "好的谢谢！再见。" @override - String get pink => "Cor de rosa"; - /// "Como posso ajudá-lo?" + String get thxBye => "好的谢谢！再见。"; + /// "创建了以下注释：" @override - String get howCanIHelpYou => "Como posso ajudá-lo?"; - /// "Ativar notificações para notas" + String get createdTheFollowingNote => "创建了以下注释："; + /// "开始日期" @override - String get turnOnNotesNotification => "Ativar notificações para notas"; - /// "Ativar lembrete antes de um evento" + String get startDate => "开始日期"; + /// "选择日期" @override - String get turnOnEventReminder => "Ativar lembrete antes de um evento"; - /// "Nota: o lembrete começa 15 minutos antes do evento." + String get selectDate => "选择日期"; + /// "输入时间" @override - String get reminderStartTime => "Nota: o lembrete começa 15 minutos antes do evento."; - /// "Notificações de atividades" + String get enterTime => "输入时间"; + /// "清空选项" @override - String get activitiesNotifications => "Notificações de atividades"; - /// "Ativar notificação para caminhada de hora em hora" + String get clearSelection => "清空选项"; + /// "启用通知" @override - String get turnOnHourlyWalkNotification => "Ativar notificação para caminhada de hora em hora"; - /// "Ativar notificação para água de hora em hora" + String get enableNotifications => "启用通知"; + /// "通知前几分钟" @override - String get turnOnHourlyWaterNotification => "Ativar notificação para água de hora em hora"; - /// "Ativar notificação para banheiro" + String get minutesBeforeNotifications => "通知前几分钟"; + /// "任务" @override - String get turnOnBathroomNotification => "Ativar notificação para banheiro"; - /// "Aqui está um vídeo com um breve passo a passo de como usar o aplicativo Memory Magic" + String get tasks => "任务"; + /// "字体大小" @override - String get walkthroughVideoLine => "Aqui está um vídeo com um breve passo a passo de como usar o aplicativo Memory Magic"; - /// "Os recursos serão limitados sem permitir o acesso ao seu microfone." + String get fontSize => "字体大小"; + /// "应用设置" @override - String get micLimitedAccess => "Os recursos serão limitados sem permitir o acesso ao seu microfone."; - /// "Notificações de notas" + String get appSettings => "应用设置"; + /// "轮廓" @override - String get notesNotificiations => "Notificações de notas"; - /// "Definições" + String get profile => "轮廓"; + /// "聊天" @override - String get generalSettingsScreen => "Definições"; - /// "Redefinir" + String get chat => "聊天"; + /// "帮助主题" @override - String get resetSettings => "Redefinir"; - /// "Definições" + String get helpTopics => "帮助主题"; + /// "编辑患者信息" @override - String get generalSetting => "Definições"; - /// "Devo criar uma nota?" + String get editpatientinformation => "编辑患者信息"; + /// "姓名" @override - String get shouldICreateANote => "Devo criar uma nota?"; - /// "Ok, não vou criar uma nota." + String get name => "姓名"; + /// "出生日期" @override - String get willNotCreateNote => "Ok, não vou criar uma nota."; - /// "Certo! Como posso ajudá-lo?" + String get dateOfBirth => "出生日期"; + /// "电话号码" @override - String get sureHowCanIHelp => "Certo! Como posso ajudá-lo?"; - /// "Ok, obrigado! Bye Bye." + String get phoneNumber => "电话号码"; + /// "联系人" @override - String get thxBye => "Ok, obrigado! Bye Bye."; - /// "Criou a seguinte nota:" + String get contacts => "联系人"; + /// "护理团队" @override - String get createdTheFollowingNote => "Criou a seguinte nota:"; - /// "Data de início" + String get careTeam => "护理团队"; + /// "运输" @override - String get startDate => "Data de início"; - /// "Selecione a data" + String get transportation => "运输"; + /// "药物" @override - String get selectDate => "Selecione a data"; - /// "Digite o tempo" + String get medications => "药物"; + /// "药物" @override - String get enterTime => "Digite o tempo"; - /// "Seleção clara" + String get medication => "药物"; + /// "过敏" @override - String get clearSelection => "Seleção clara"; - /// "Ativar notificações" + String get allergies => "过敏"; + /// "病史" @override - String get enableNotifications => "Ativar notificações"; - /// "Minutos antes das notificações" + String get medicalHistory => "病史"; + /// "关于我" @override - String get minutesBeforeNotifications => "Minutos antes das notificações"; - /// "Tarefas" + String get aboutMe => "关于我"; + /// "电话" @override - String get tasks => "Tarefas"; - /// "Tamanho da fonte" + String get phone => "电话"; + /// "添加" @override - String get fontSize => "Tamanho da fonte"; - /// "Configurações do aplicativo" + String get add => "添加"; + /// "编辑" @override - String get appSettings => "Configurações do aplicativo"; - /// "Perfil" + String get edit => "编辑"; + /// "更新" @override - String get profile => "Perfil"; - /// "bater papo" + String get update => "更新"; + /// "请输入" @override - String get chat => "bater papo"; - /// "Tópicos de ajuda" + String get pleaseEnter => "请输入"; + /// "删除" @override - String get helpTopics => "Tópicos de ajuda"; - /// "Editar informações do paciente" + String get delete => "删除"; + /// "剂量" @override - String get editpatientinformation => "Editar informações do paciente"; - /// "Nome" + String get dose => "剂量"; + /// "联系" @override - String get name => "Nome"; - /// "Data de nascimento" + String get contact => "联系"; + /// "过敏" @override - String get dateOfBirth => "Data de nascimento"; - /// "Número de telefone" + String get allergy => "过敏"; + /// "过敏反应" @override - String get phoneNumber => "Número de telefone"; - /// "Contatos" + String get allergyReaction => "过敏反应"; + /// "活动任务" @override - String get contacts => "Contatos"; - /// "Equipe de atendimento" + String get activeTasks => "活动任务"; + /// "添加护理团队成员" @override - String get careTeam => "Equipe de atendimento"; - /// "Transporte" + String get addCareTeamMember => "添加护理团队成员"; + /// "已完成的任务" @override - String get transportation => "Transporte"; - /// "Medicamentos" + String get completedTasks => "已完成的任务"; + /// "继续" @override - String get medications => "Medicamentos"; - /// "Medicamento" + String get continueWord => "继续"; + /// "描述" @override - String get medication => "Medicamento"; - /// "Alergias" + String get description => "描述"; + /// "细节" @override - String get allergies => "Alergias"; - /// "Histórico médico" + String get details => "细节"; + /// "启用看护人模式" @override - String get medicalHistory => "Histórico médico"; - /// "Sobre mim" + String get enableCaregiverMode => "启用看护人模式"; + /// "退出看护人" @override - String get aboutMe => "Sobre mim"; - /// "telefone" + String get exitCaregiver => "退出看护人"; + /// "更新看护人" @override - String get phone => "telefone"; - /// "Adicionar" + String get updateCaregiver => "更新看护人"; + /// "提醒" @override - String get add => "Adicionar"; - /// "Editar" + String get reminder => "提醒"; + /// "日程" @override - String get edit => "Editar"; - /// "Atualizar" + String get schedule => "日程"; + /// "搜索笔记" @override - String get update => "Atualizar"; - /// "Por favor entrar" + String get searchForNote => "搜索笔记"; + /// "选择任务类型" @override - String get pleaseEnter => "Por favor entrar"; - /// "Excluir" + String get selectTaskType => "选择任务类型"; + /// "更新护理团队成员" @override - String get delete => "Excluir"; - /// "dosagem" + String get updateCareTeamMember => "更新护理团队成员"; + /// "返回笔记" @override - String get dose => "dosagem"; - /// "Contato" + String get backToNotes => "返回笔记"; + /// "发送提醒通知？" @override - String get contact => "Contato"; - /// "Alergia" + String get sendReminderNotification => "发送提醒通知？"; + /// "设置日期和时间会将注释添加到您的日历中" @override - String get allergy => "Alergia"; - /// "Reação Alérgica" + String get settingDateAndTime => "设置日期和时间会将注释添加到您的日历中"; + /// "日" @override - String get allergyReaction => "Reação Alérgica"; - /// "Tarefas ativas" + String get day => "日"; + /// "星期" @override - String get activeTasks => "Tarefas ativas"; - /// "Adicionar Membro Da Equipe De Atendimento" + String get week => "星期"; + /// "月" @override - String get addCareTeamMember => "Adicionar Membro Da Equipe De Atendimento"; - /// "Tarefas Concluídas" + String get month => "月"; + /// "坏的" @override - String get completedTasks => "Tarefas Concluídas"; - /// "Continuar" + String get bad => "坏的"; + /// "发送任务" @override - String get continueWord => "Continuar"; - /// "Descrição" + String get sendTask => "发送任务"; + /// "绿色的" @override - String get description => "Descrição"; - /// "Detalhes" + String get green => "绿色的"; + /// "橘子" @override - String get details => "Detalhes"; - /// "Ativar O Modo De Cuidador" + String get orange => "橘子"; + /// "黄色的" @override - String get enableCaregiverMode => "Ativar O Modo De Cuidador"; - /// "Sair Do Cuidador" + String get yellow => "黄色的"; + /// "紫色的" @override - String get exitCaregiver => "Sair Do Cuidador"; - /// "Atualizar Cuidador" + String get purple => "紫色的"; + /// "灰色的" @override - String get updateCaregiver => "Atualizar Cuidador"; - /// "Lembrete" + String get grey => "灰色的"; + /// "黑暗模式" @override - String get reminder => "Lembrete"; - /// "Agendar" + String get darkMode => "黑暗模式"; + /// "任务总结" @override - String get schedule => "Agendar"; - /// "Procurar Uma Nota" + String get overviewOfTasks => "任务总结"; + /// "笔记摘要" @override - String get searchForNote => "Procurar Uma Nota"; - /// "Selecione O Tipo De Tarefa" + String get overviewOfNotes => "笔记摘要"; + /// "日历摘要" @override - String get selectTaskType => "Selecione O Tipo De Tarefa"; - /// "Atualizar membro da equipe de cuidados" + String get overviewOfCalendar => "日历摘要"; + /// "简介概要" @override - String get updateCareTeamMember => "Atualizar membro da equipe de cuidados"; - /// "VOLTAR ÀS NOTAS" + String get overviewOfProfile => "简介概要"; + /// "设置摘要" @override - String get backToNotes => "VOLTAR ÀS NOTAS"; - /// "Enviar notificação de lembrete?" + String get overviewOfSettings => "设置摘要"; + /// "聊天总结" @override - String get sendReminderNotification => "Enviar notificação de lembrete?"; - /// "Definir uma data e hora adicionará a nota ao seu calendário" + String get overviewOfChat => "聊天总结"; + /// "如何创建任务" @override - String get settingDateAndTime => "Definir uma data e hora adicionará a nota ao seu calendário"; - /// "Dia" + String get howToCreateATask => "如何创建任务"; + /// "如何完成任务" @override - String get day => "Dia"; - /// "Semana" + String get howToCompleteATask => "如何完成任务"; + /// "其他笔记主题" @override - String get week => "Semana"; - /// "Mês" + String get otherNotes => "其他笔记主题"; + /// "其他日历主题" @override - String get month => "Mês"; - /// "Mau" + String get otherCalendar => "其他日历主题"; + /// "其他个人资料主题" @override - String get bad => "Mau"; - /// "Enviar tarefa" + String get otherProfile => "其他个人资料主题"; + /// "其他设置主题" @override - String get sendTask => "Enviar tarefa"; + String get otherSettings => "其他设置主题"; } class _I18n_ar_SY extends I18n { const _I18n_ar_SY(); @@ -1951,6 +2149,60 @@ class _I18n_ar_SY extends I18n { /// "إرسال المهمة" @override String get sendTask => "إرسال المهمة"; + /// "أخضر" + @override + String get green => "أخضر"; + /// "البرتقالي" + @override + String get orange => "البرتقالي"; + /// "الأصفر" + @override + String get yellow => "الأصفر"; + /// "أرجواني" + @override + String get purple => "أرجواني"; + /// "رمادي" + @override + String get grey => "رمادي"; + /// "الوضع الداكن" + @override + String get darkMode => "الوضع الداكن"; + /// "ملخص المهام" + @override + String get overviewOfTasks => "ملخص المهام"; + /// "ملخص الملاحظات" + @override + String get overviewOfNotes => "ملخص الملاحظات"; + /// "ملخص التقويم" + @override + String get overviewOfCalendar => "ملخص التقويم"; + /// "ملخص الملف الشخصي" + @override + String get overviewOfProfile => "ملخص الملف الشخصي"; + /// "ملخص الإعدادات" + @override + String get overviewOfSettings => "ملخص الإعدادات"; + /// "ملخص الدردشة" + @override + String get overviewOfChat => "ملخص الدردشة"; + /// "كيفية إنشاء مهمة" + @override + String get howToCreateATask => "كيفية إنشاء مهمة"; + /// "كيف تكمل مهمة" + @override + String get howToCompleteATask => "كيف تكمل مهمة"; + /// "موضوعات الملاحظات الأخرى" + @override + String get otherNotes => "موضوعات الملاحظات الأخرى"; + /// "مواضيع التقويم الأخرى" + @override + String get otherCalendar => "مواضيع التقويم الأخرى"; + /// "مواضيع الملف الشخصي الأخرى" + @override + String get otherProfile => "مواضيع الملف الشخصي الأخرى"; + /// "مواضيع الإعدادات الأخرى" + @override + String get otherSettings => "مواضيع الإعدادات الأخرى"; } class GeneratedLocalizationsDelegate extends LocalizationsDelegate { const GeneratedLocalizationsDelegate();