diff --git a/assets/fonts/ge_ss_two/GE_SS_Two_Bold.otf b/assets/fonts/ge_ss_two/GE_SS_Two_Bold.otf new file mode 100755 index 00000000..da99274a Binary files /dev/null and b/assets/fonts/ge_ss_two/GE_SS_Two_Bold.otf differ diff --git a/assets/fonts/ge_ss_two/GE_SS_Two_Light.otf b/assets/fonts/ge_ss_two/GE_SS_Two_Light.otf new file mode 100755 index 00000000..60ea874e Binary files /dev/null and b/assets/fonts/ge_ss_two/GE_SS_Two_Light.otf differ diff --git a/assets/fonts/ge_ss_two/GE_SS_Two_Medium.otf b/assets/fonts/ge_ss_two/GE_SS_Two_Medium.otf new file mode 100755 index 00000000..ff4a1bfa Binary files /dev/null and b/assets/fonts/ge_ss_two/GE_SS_Two_Medium.otf differ diff --git a/assets/images/svg/qlogin.svg b/assets/images/svg/qlogin.svg new file mode 100644 index 00000000..3fcf2ffd --- /dev/null +++ b/assets/images/svg/qlogin.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/lib/pages/login/register-info.dart b/lib/pages/login/register-info.dart index 5164408b..b259752f 100644 --- a/lib/pages/login/register-info.dart +++ b/lib/pages/login/register-info.dart @@ -499,7 +499,7 @@ class _RegisterInfo extends State { }, textColor: Colors.white, color: isValid() == true ? Color(0xff359846) : Colors.grey)), ), ], - ))); + )),); } nextPage() async { diff --git a/lib/pages/login/register_new.dart b/lib/pages/login/register_new.dart index 6751b7ce..05cd500c 100644 --- a/lib/pages/login/register_new.dart +++ b/lib/pages/login/register_new.dart @@ -1,4 +1,5 @@ import 'package:hmg_patient_app/config/size_config.dart'; +import 'package:hmg_patient_app/core/viewModels/project_view_model.dart'; import 'package:hmg_patient_app/pages/login/login-type.dart'; import 'package:hmg_patient_app/pages/login/register-info.dart'; import 'package:hmg_patient_app/pages/login/register.dart'; @@ -10,6 +11,7 @@ import 'package:hmg_patient_app/uitl/utils.dart'; import 'package:hmg_patient_app/uitl/utils_new.dart'; import 'package:hmg_patient_app/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; class RegisterNew extends StatefulWidget { @override @@ -51,11 +53,19 @@ class _RegisterNew extends State { Widget build(BuildContext context) { return AppScaffold( appBarTitle: TranslationBase.of(context).register, - isShowAppBar: true, isShowDecPage: false, + isShowAppBar: true, + isshowBackButton: false, showNewAppBar: true, - - showNewAppBarTitle: true, + backgroundColor: Color(0xffF8F8F8), + showNewAppBarTitle: false, + showDropDown: true, + isShowLanguageChanger: true, + appBarIcons: [], + dropDownList: [], + dropDownIndexChange: (value) { + Utils.changeAppLanguage(projectViewModel: context.read(), context: context); + }, body: SingleChildScrollView( child: Container( height: SizeConfig.realScreenHeight! * .9, diff --git a/lib/pages/login/welcome.dart b/lib/pages/login/welcome.dart index 91787062..a4a4c2c6 100644 --- a/lib/pages/login/welcome.dart +++ b/lib/pages/login/welcome.dart @@ -91,7 +91,6 @@ class _WelcomeLogin extends State { var dob; late int isHijri; var healthId; - int _selectedLanguage = 0; @override void initState() { @@ -99,28 +98,9 @@ class _WelcomeLogin extends State { super.initState(); } - void changeLanguage(ProjectViewModel projectViewModel, int value) { - sharedPref.setBool(IS_ROBOT_INIT, false); - sharedPref.remove(CLINICS_LIST); - if (projectViewModel.isArabic) { - _selectedLanguage = 1; - projectViewModel.changeLanguage('en'); - - locator().hamburgerMenu.logMenuItemClick('change language to english'); - } else { - _selectedLanguage = 0; - projectViewModel.changeLanguage('ar'); - locator().hamburgerMenu.logMenuItemClick('change language to arabic'); - } - var themeNotifier = Provider.of(context, listen: false); - themeNotifier.setTheme(defaultTheme(fontName: projectViewModel.isArabic ? 'Cairo' : 'Poppins')); - } - @override Widget build(BuildContext context) { projectViewModel = context.read(); - // final initialProjectViewModel = Provider.of(context, listen: false); - // _selectedLanguage = initialProjectViewModel.isArabic ? 0 : 1; return SafeArea( child: AppScaffold( @@ -134,15 +114,11 @@ class _WelcomeLogin extends State { showDropDown: true, isShowLanguageChanger: true, appBarIcons: [], - dropDownList: [ - // TranslationBase.of(context).arabicChange, - // TranslationBase.of(context).english, - ], + dropDownList: [], dropDownIndexChange: (value) { - changeLanguage(projectViewModel, value!); + Utils.changeAppLanguage(projectViewModel: projectViewModel, context: context); }, - dropdownIndexValue: _selectedLanguage, - // Use the state variable + dropdownIndexValue: Utils.selectedLanguage, body: Column( children: [ Expanded( diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart index 6d1bbc22..ec54ecd9 100644 --- a/lib/uitl/utils.dart +++ b/lib/uitl/utils.dart @@ -8,6 +8,7 @@ import 'package:badges/badges.dart' as badge_import; import 'package:cached_network_image/cached_network_image.dart'; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:crypto/crypto.dart' as crypto; +import 'package:hmg_patient_app/analytics/google-analytics.dart'; import 'package:hmg_patient_app/config/config.dart'; import 'package:hmg_patient_app/config/shared_pref_kay.dart'; import 'package:hmg_patient_app/core/model/privilege/ProjectDetailListModel.dart'; @@ -67,6 +68,38 @@ AppSharedPreferences sharedPref = new AppSharedPreferences(); class Utils { // static ProgressDialog pr; + // void changeLanguage(ProjectViewModel projectViewModel, int value, Function onChange(int)) { + // sharedPref.setBool(IS_ROBOT_INIT, false); + // sharedPref.remove(CLINICS_LIST); + // if (projectViewModel.isArabic) { + // _selectedLanguage = 1; + // projectViewModel.changeLanguage('en'); + // locator().hamburgerMenu.logMenuItemClick('change language to english'); + // } else { + // _selectedLanguage = 0; + // projectViewModel.changeLanguage('ar'); + // locator().hamburgerMenu.logMenuItemClick('change language to arabic'); + // } + // var themeNotifier = Provider.of(context, listen: false); + // themeNotifier.setTheme(defaultTheme(fontName: projectViewModel.isArabic ? 'Cairo' : 'Poppins')); + // } + + static int selectedLanguage = 0; + + static void changeAppLanguage({required ProjectViewModel projectViewModel, required BuildContext context}) { + sharedPref.setBool(IS_ROBOT_INIT, false); + sharedPref.remove(CLINICS_LIST); + if (projectViewModel.isArabic) { + selectedLanguage = 1; // 1 for English + projectViewModel.changeLanguage('en'); // This will call notifyListeners in ViewModel + locator().hamburgerMenu.logMenuItemClick('change language to english'); + } else { + selectedLanguage = 0; // 0 for Arabic + projectViewModel.changeLanguage('ar'); // This will call notifyListeners in ViewModel + locator().hamburgerMenu.logMenuItemClick('change language to arabic'); + } + } + static var navigationProjectsList = [ { "Desciption": "Sahafa Hospital",