consumer on welcome & language & font

merge-update-with-lab-changes
Aamir Muhammad 5 months ago committed by haroon amjad
parent 5fd4aee7ea
commit 90eea4d0d7

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 614 KiB

@ -499,7 +499,7 @@ class _RegisterInfo extends State<RegisterInfo> {
}, textColor: Colors.white, color: isValid() == true ? Color(0xff359846) : Colors.grey)),
),
],
)));
)),);
}
nextPage() async {

@ -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<RegisterNew> {
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<ProjectViewModel>(), context: context);
},
body: SingleChildScrollView(
child: Container(
height: SizeConfig.realScreenHeight! * .9,

@ -91,7 +91,6 @@ class _WelcomeLogin extends State<WelcomeLogin> {
var dob;
late int isHijri;
var healthId;
int _selectedLanguage = 0;
@override
void initState() {
@ -99,28 +98,9 @@ class _WelcomeLogin extends State<WelcomeLogin> {
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<GAnalytics>().hamburgerMenu.logMenuItemClick('change language to english');
} else {
_selectedLanguage = 0;
projectViewModel.changeLanguage('ar');
locator<GAnalytics>().hamburgerMenu.logMenuItemClick('change language to arabic');
}
var themeNotifier = Provider.of<ThemeNotifier>(context, listen: false);
themeNotifier.setTheme(defaultTheme(fontName: projectViewModel.isArabic ? 'Cairo' : 'Poppins'));
}
@override
Widget build(BuildContext context) {
projectViewModel = context.read<ProjectViewModel>();
// final initialProjectViewModel = Provider.of<ProjectViewModel>(context, listen: false);
// _selectedLanguage = initialProjectViewModel.isArabic ? 0 : 1;
return SafeArea(
child: AppScaffold(
@ -134,15 +114,11 @@ class _WelcomeLogin extends State<WelcomeLogin> {
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: <Widget>[
Expanded(

@ -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<GAnalytics>().hamburgerMenu.logMenuItemClick('change language to english');
// } else {
// _selectedLanguage = 0;
// projectViewModel.changeLanguage('ar');
// locator<GAnalytics>().hamburgerMenu.logMenuItemClick('change language to arabic');
// }
// var themeNotifier = Provider.of<ThemeNotifier>(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<GAnalytics>().hamburgerMenu.logMenuItemClick('change language to english');
} else {
selectedLanguage = 0; // 0 for Arabic
projectViewModel.changeLanguage('ar'); // This will call notifyListeners in ViewModel
locator<GAnalytics>().hamburgerMenu.logMenuItemClick('change language to arabic');
}
}
static var navigationProjectsList = [
{
"Desciption": "Sahafa Hospital",

Loading…
Cancel
Save