Merge pull request 'dev_aamir' (#8) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/8pull/13/head
commit
24b98626d2
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,29 @@
|
||||
import 'dart:convert';
|
||||
|
||||
class NationalityCountries {
|
||||
String? id;
|
||||
String? name;
|
||||
String? nameN;
|
||||
|
||||
NationalityCountries({
|
||||
this.id,
|
||||
this.name,
|
||||
this.nameN,
|
||||
});
|
||||
|
||||
factory NationalityCountries.fromRawJson(String str) => NationalityCountries.fromJson(json.decode(str));
|
||||
|
||||
String toRawJson() => json.encode(toJson());
|
||||
|
||||
factory NationalityCountries.fromJson(Map<String, dynamic> json) => NationalityCountries(
|
||||
id: json["ID"],
|
||||
name: json["Name"],
|
||||
nameN: json["NameN"],
|
||||
);
|
||||
|
||||
Map<String, dynamic> toJson() => {
|
||||
"ID": id,
|
||||
"Name": name,
|
||||
"NameN": nameN,
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,316 @@
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hmg_patient_app_new/core/app_assets.dart';
|
||||
import 'package:hmg_patient_app_new/core/app_state.dart';
|
||||
import 'package:hmg_patient_app_new/core/dependencies.dart';
|
||||
import 'package:hmg_patient_app_new/core/enums.dart';
|
||||
import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
|
||||
import 'package:hmg_patient_app_new/core/utils/utils.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart';
|
||||
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
|
||||
import 'package:hmg_patient_app_new/theme/colors.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/appbar/app_bar_widget.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/bottomsheet/generic_bottom_sheet.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart' show CustomButton;
|
||||
import 'package:hmg_patient_app_new/widgets/dropdown/country_dropdown_widget.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/dropdown/dropdown_widget.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/input_widget.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/otp/otp.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
class RegisterNew extends StatefulWidget {
|
||||
@override
|
||||
_RegisterNew createState() => _RegisterNew();
|
||||
}
|
||||
|
||||
class _RegisterNew extends State<RegisterNew> {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
AppState appState = getIt.get<AppState>();
|
||||
AuthenticationViewModel authVm = context.read<AuthenticationViewModel>();
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: AppColors.bgScaffoldColor,
|
||||
appBar: CustomAppBar(
|
||||
onBackPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
onLanguageChanged: (String value) {
|
||||
// context.setLocale(value == 'en' ? Locale('ar', 'SA') : Locale('en', 'US'));
|
||||
},
|
||||
),
|
||||
body: GestureDetector(
|
||||
onTap: () {
|
||||
FocusScope.of(context).unfocus();
|
||||
},
|
||||
child: ScrollConfiguration(
|
||||
behavior: ScrollConfiguration.of(context).copyWith(overscroll: false, physics: const ClampingScrollPhysics()),
|
||||
child: NotificationListener<OverscrollIndicatorNotification>(
|
||||
onNotification: (notification) {
|
||||
notification.disallowIndicator();
|
||||
return true;
|
||||
},
|
||||
child: SingleChildScrollView(
|
||||
physics: ClampingScrollPhysics(),
|
||||
padding: EdgeInsets.symmetric(horizontal: 24.h),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Utils.showLottie(context: context, assetPath: 'assets/animations/lottie/register.json', width: 200.h, height: 200.h, fit: BoxFit.cover, repeat: true),
|
||||
SizedBox(height: 16.h),
|
||||
LocaleKeys.prepareToElevate.tr().toText32(isBold: true),
|
||||
SizedBox(height: 24.h),
|
||||
Directionality(
|
||||
textDirection: Directionality.of(context),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(24)),
|
||||
padding: EdgeInsets.symmetric(horizontal: 16.h),
|
||||
child: Column(
|
||||
children: [
|
||||
CustomCountryDropdown(
|
||||
countryList: CountryEnum.values,
|
||||
onCountryChange: authVm.onCountryChange,
|
||||
isRtl: Directionality.of(context) == TextDirection.LTR,
|
||||
).withVerticalPadding(8.h),
|
||||
Divider(height: 1.h),
|
||||
TextInputWidget(
|
||||
labelText: LocaleKeys.nationalIdNumber.tr(),
|
||||
hintText: "xxxxxxxxx",
|
||||
controller: authVm.nationalIdController,
|
||||
isEnable: true,
|
||||
prefix: null,
|
||||
isAllowRadius: true,
|
||||
isBorderAllowed: false,
|
||||
isAllowLeadingIcon: true,
|
||||
autoFocus: true,
|
||||
padding: EdgeInsets.symmetric(vertical: 8.h),
|
||||
leadingIcon: AppAssets.student_card,
|
||||
// onChange: (value) {
|
||||
// print(value);
|
||||
// }
|
||||
).withVerticalPadding(8),
|
||||
Divider(height: 1),
|
||||
TextInputWidget(
|
||||
labelText: LocaleKeys.dob.tr(),
|
||||
hintText: "11 July, 1994",
|
||||
controller: authVm.dobController,
|
||||
isEnable: true,
|
||||
prefix: null,
|
||||
isAllowRadius: true,
|
||||
isBorderAllowed: false,
|
||||
isAllowLeadingIcon: true,
|
||||
padding: EdgeInsets.symmetric(vertical: 8.h),
|
||||
leadingIcon: AppAssets.birthday_cake,
|
||||
selectionType: SelectionTypeEnum.calendar,
|
||||
).withVerticalPadding(8),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(height: 25.h),
|
||||
GestureDetector(
|
||||
onTap: authVm.onTermAccepted,
|
||||
child: Row(
|
||||
children: [
|
||||
Selector<AuthenticationViewModel, bool>(
|
||||
selector: (_, viewModel) => viewModel.isTermsAccepted,
|
||||
shouldRebuild: (previous, next) => previous != next,
|
||||
builder: (context, isTermsAccepted, child) {
|
||||
return AnimatedContainer(
|
||||
duration: const Duration(milliseconds: 200),
|
||||
height: 24.h,
|
||||
width: 24.h,
|
||||
decoration: BoxDecoration(
|
||||
color: isTermsAccepted ? AppColors.primaryRedColor : Colors.transparent,
|
||||
borderRadius: BorderRadius.circular(6),
|
||||
border: Border.all(color: isTermsAccepted ? AppColors.primaryRedBorderColor : AppColors.greyColor, width: 2.h),
|
||||
),
|
||||
child: isTermsAccepted ? Icon(Icons.check, size: 16.fSize, color: Colors.white) : null,
|
||||
);
|
||||
},
|
||||
),
|
||||
SizedBox(width: 12.h),
|
||||
Expanded(
|
||||
child: Text(
|
||||
LocaleKeys.iAcceptTermsConditions.tr(),
|
||||
style: context.dynamicTextStyle(fontSize: 14.fSize, fontWeight: FontWeight.w500, color: Color(0xFF2E3039)),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
SizedBox(height: 25.h),
|
||||
CustomButton(
|
||||
text: "Register",
|
||||
icon: AppAssets.note_edit,
|
||||
onPressed: () {
|
||||
showRegisterModel(context: context, authVM: authVm);
|
||||
},
|
||||
),
|
||||
SizedBox(height: 14),
|
||||
Center(
|
||||
child: RichText(
|
||||
textAlign: TextAlign.center,
|
||||
text: TextSpan(
|
||||
style: context.dynamicTextStyle(
|
||||
color: Colors.black,
|
||||
fontSize: 16.fSize,
|
||||
height: 26 / 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
children: <TextSpan>[
|
||||
TextSpan(text: LocaleKeys.alreadyHaveAccount.tr(), style: context.dynamicTextStyle()),
|
||||
TextSpan(text: " "),
|
||||
TextSpan(
|
||||
text: LocaleKeys.loginNow.tr(),
|
||||
style: context.dynamicTextStyle(
|
||||
color: AppColors.primaryRedColor,
|
||||
fontSize: 16.fSize,
|
||||
height: 26 / 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
recognizer: TapGestureRecognizer()
|
||||
..onTap = () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(height: 30),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
));
|
||||
}
|
||||
|
||||
void showRegisterModel({required BuildContext context, required AuthenticationViewModel authVM}) {
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
isDismissible: false,
|
||||
useSafeArea: true,
|
||||
backgroundColor: Colors.transparent,
|
||||
builder: (bottomSheetContext) => Padding(
|
||||
padding: EdgeInsets.only(bottom: MediaQuery.of(bottomSheetContext).viewInsets.bottom),
|
||||
child: SingleChildScrollView(
|
||||
child: GenericBottomSheet(
|
||||
countryCode: authVM.selectedCountrySignup.countryCode,
|
||||
initialPhoneNumber: "",
|
||||
textController: authVM.phoneNumberController,
|
||||
isEnableCountryDropdown: true,
|
||||
onCountryChange: authVM.onCountryChange,
|
||||
onChange: authVM.onPhoneNumberChange,
|
||||
buttons: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 10),
|
||||
child: CustomButton(
|
||||
text: LocaleKeys.sendOTPSMS.tr(),
|
||||
onPressed: () {
|
||||
Navigator.of(context).push(MaterialPageRoute(
|
||||
builder: (BuildContext context) => OTPVerificationPage(
|
||||
phoneNumber: '12234567',
|
||||
)));
|
||||
|
||||
// if (mobileNo.isEmpty) {
|
||||
// context.showBottomSheet(
|
||||
// child: ExceptionBottomSheet(
|
||||
// message: TranslationBase.of(context).pleaseEnterMobile,
|
||||
// showCancel: false,
|
||||
// onOkPressed: () {
|
||||
// Navigator.of(context).pop();
|
||||
// },
|
||||
// ),
|
||||
// );
|
||||
// } else if (!Utils.validateMobileNumber(mobileNo)) {
|
||||
// context.showBottomSheet(
|
||||
// child: ExceptionBottomSheet(
|
||||
// message: TranslationBase.of(context).pleaseEnterValidMobile,
|
||||
// showCancel: false,
|
||||
// onOkPressed: () {
|
||||
// Navigator.of(context).pop();
|
||||
// },
|
||||
// ),
|
||||
// );
|
||||
// } else {
|
||||
// registerUser(1);
|
||||
// }
|
||||
Navigator.of(context).push(MaterialPageRoute(builder: (BuildContext context) => OTPVerificationPage(phoneNumber: '12234567')));
|
||||
},
|
||||
backgroundColor: AppColors.primaryRedColor,
|
||||
borderColor: AppColors.primaryRedBorderColor,
|
||||
textColor: AppColors.whiteColor,
|
||||
icon: AppAssets.message,
|
||||
),
|
||||
),
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Padding(
|
||||
padding: EdgeInsets.symmetric(horizontal: 8.h),
|
||||
child: LocaleKeys.oR.tr().toText16(color: AppColors.textColor),
|
||||
),
|
||||
],
|
||||
),
|
||||
Padding(
|
||||
padding: EdgeInsets.only(bottom: 10.h, top: 10.h),
|
||||
child: CustomButton(
|
||||
text: LocaleKeys.sendOTPWHATSAPP.tr(),
|
||||
onPressed: () {
|
||||
// if (mobileNo.isEmpty) {
|
||||
// context.showBottomSheet(
|
||||
// child: ExceptionBottomSheet(
|
||||
// message: TranslationBase.of(context).pleaseEnterMobile,
|
||||
// showCancel: false,
|
||||
// onOkPressed: () {
|
||||
// Navigator.of(context).pop();
|
||||
// },
|
||||
// ),
|
||||
// );
|
||||
// } else if (!Utils.validateMobileNumber(mobileNo)) {
|
||||
// context.showBottomSheet(
|
||||
// child: ExceptionBottomSheet(
|
||||
// message: TranslationBase.of(context).pleaseEnterValidMobile,
|
||||
// showCancel: false,
|
||||
// onOkPressed: () {
|
||||
// Navigator.of(context).pop();
|
||||
// },
|
||||
// ),
|
||||
// );
|
||||
// } else {
|
||||
// registerUser(4);
|
||||
// }
|
||||
// int? val = Utils.onOtpBtnPressed(OTPType.whatsapp, mobileNo, context);
|
||||
// registerUser(val);
|
||||
},
|
||||
backgroundColor: AppColors.whiteColor,
|
||||
borderColor: AppColors.borderOnlyColor,
|
||||
textColor: AppColors.textColor,
|
||||
icon: AppAssets.whatsapp,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,353 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get_it/get_it.dart';
|
||||
import 'package:hmg_patient_app_new/core/app_assets.dart';
|
||||
import 'package:hmg_patient_app_new/core/app_state.dart';
|
||||
import 'package:hmg_patient_app_new/core/common_models/nationality_country_model.dart';
|
||||
import 'package:hmg_patient_app_new/core/dependencies.dart';
|
||||
import 'package:hmg_patient_app_new/core/enums.dart';
|
||||
import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/context_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart';
|
||||
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
|
||||
import 'package:hmg_patient_app_new/theme/colors.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/appbar/app_bar_widget.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/bottomsheet/generic_bottom_sheet.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/dropdown/dropdown_widget.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/input_widget.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
class RegisterNewStep2 extends StatefulWidget {
|
||||
var nHICData;
|
||||
var payload;
|
||||
|
||||
RegisterNewStep2(this.nHICData, this.payload, {Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
_RegisterNew createState() => _RegisterNew();
|
||||
}
|
||||
|
||||
class _RegisterNew extends State<RegisterNewStep2> {
|
||||
bool isFromDubai = true;
|
||||
AuthenticationViewModel? authVM;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
authVM = context.read<AuthenticationViewModel>();
|
||||
authVM!.loadCountriesData(context: context);
|
||||
// isFromDubai = widget.payload.zipCode!.contains("971") || widget.payload.zipCode!.contains("+971");
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
super.dispose();
|
||||
authVM!.clearDefaults();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
AppState appState = getIt.get<AppState>();
|
||||
return Scaffold(
|
||||
appBar: CustomAppBar(
|
||||
onBackPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
authVM!.clearDefaults();
|
||||
},
|
||||
onLanguageChanged: (lang) {},
|
||||
hideLogoAndLang: true,
|
||||
),
|
||||
body: SingleChildScrollView(
|
||||
reverse: false,
|
||||
padding: EdgeInsets.only(left: 24.h, right: 24.h, top: 24.h),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
Directionality(
|
||||
textDirection: Directionality.of(context),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(24)),
|
||||
padding: EdgeInsets.only(left: 16.h, right: 16.h),
|
||||
child: Column(
|
||||
children: [
|
||||
TextInputWidget(
|
||||
labelText: isFromDubai ? LocaleKeys.fullName.tr() : LocaleKeys.name.tr(),
|
||||
hintText: isFromDubai ? "name" ?? "" : (widget.nHICData!.firstNameEn!.toUpperCase() + " " + widget.nHICData!.lastNameEn!.toUpperCase()),
|
||||
controller: null,
|
||||
isEnable: true,
|
||||
prefix: null,
|
||||
isAllowRadius: false,
|
||||
isBorderAllowed: false,
|
||||
keyboardType: TextInputType.text,
|
||||
isAllowLeadingIcon: true,
|
||||
isReadOnly: isFromDubai ? false : true,
|
||||
leadingIcon: AppAssets.user_circle)
|
||||
.paddingSymmetrical(0.h, 16.h),
|
||||
Divider(height: 1, color: AppColors.greyColor),
|
||||
TextInputWidget(
|
||||
labelText: LocaleKeys.nationalIdNumber.tr(),
|
||||
hintText: isFromDubai ? "widget.payload.nationalID!" : (widget.nHICData!.idNumber ?? ""),
|
||||
controller: null,
|
||||
isEnable: true,
|
||||
prefix: null,
|
||||
isAllowRadius: false,
|
||||
isBorderAllowed: false,
|
||||
isAllowLeadingIcon: true,
|
||||
isReadOnly: true,
|
||||
leadingIcon: AppAssets.student_card)
|
||||
.paddingSymmetrical(0.h, 16.h),
|
||||
Divider(height: 1, color: AppColors.greyColor),
|
||||
isFromDubai
|
||||
? Selector<AuthenticationViewModel, GenderTypeEnum?>(
|
||||
selector: (_, authViewModel) => authViewModel.genderType,
|
||||
shouldRebuild: (previous, next) => previous != next,
|
||||
builder: (context, genderType, child) {
|
||||
final authVM = context.read<AuthenticationViewModel>();
|
||||
return DropdownWidget(
|
||||
labelText: LocaleKeys.gender.tr(),
|
||||
hintText: LocaleKeys.malE.tr(),
|
||||
isEnable: true,
|
||||
dropdownItems: GenderTypeEnum.values.map((e) => appState!.isArabic() ? e.typeAr : e.type).toList(),
|
||||
selectedValue: genderType != null ? (appState!.isArabic() ? genderType!.typeAr : genderType!.type) : "",
|
||||
onChange: authVM.onGenderChange,
|
||||
isBorderAllowed: false,
|
||||
hasSelectionCustomIcon: true,
|
||||
isAllowRadius: false,
|
||||
padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
|
||||
selectionCustomIcon: AppAssets.arrow_down,
|
||||
leadingIcon: AppAssets.user_full,
|
||||
).withVerticalPadding(8);
|
||||
})
|
||||
: TextInputWidget(
|
||||
labelText: LocaleKeys.gender.tr(),
|
||||
hintText: (widget.nHICData!.gender ?? ""),
|
||||
controller: null,
|
||||
isEnable: true,
|
||||
prefix: null,
|
||||
isAllowRadius: false,
|
||||
isBorderAllowed: false,
|
||||
isAllowLeadingIcon: true,
|
||||
isReadOnly: isFromDubai ? false : true,
|
||||
leadingIcon: AppAssets.user_full,
|
||||
onChange: (value) {})
|
||||
.paddingSymmetrical(0.h, 16.h),
|
||||
Divider(height: 1, color: AppColors.greyColor),
|
||||
isFromDubai
|
||||
? Selector<AuthenticationViewModel, MaritalStatusTypeEnum?>(
|
||||
selector: (_, authViewModel) => authViewModel.maritalStatus,
|
||||
shouldRebuild: (previous, next) => previous != next,
|
||||
builder: (context, maritalStatus, child) {
|
||||
final authVM = context.read<AuthenticationViewModel>(); // For onChange
|
||||
return DropdownWidget(
|
||||
labelText: LocaleKeys.maritalStatus.tr(),
|
||||
hintText: LocaleKeys.married.tr(),
|
||||
isEnable: true,
|
||||
dropdownItems: MaritalStatusTypeEnum.values.map((e) => appState!.isArabic() ? e.typeAr : e.type).toList(),
|
||||
selectedValue: maritalStatus != null ? (appState!.isArabic() ? maritalStatus.typeAr : maritalStatus.type) : "",
|
||||
onChange: authVM.onMaritalStatusChange,
|
||||
isBorderAllowed: false,
|
||||
hasSelectionCustomIcon: true,
|
||||
isAllowRadius: false,
|
||||
padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
|
||||
selectionCustomIcon: AppAssets.arrow_down,
|
||||
leadingIcon: AppAssets.smart_phone,
|
||||
).withVerticalPadding(8);
|
||||
},
|
||||
)
|
||||
: TextInputWidget(
|
||||
labelText: LocaleKeys.maritalStatus.tr(),
|
||||
hintText: appState!.isArabic()
|
||||
? (MaritalStatusTypeExtension.fromValue(widget.nHICData!.maritalStatusCode)!.typeAr)
|
||||
: (MaritalStatusTypeExtension.fromValue(widget.nHICData!.maritalStatusCode)!.type),
|
||||
isEnable: true,
|
||||
prefix: null,
|
||||
isAllowRadius: false,
|
||||
isBorderAllowed: false,
|
||||
isAllowLeadingIcon: true,
|
||||
isReadOnly: true,
|
||||
leadingIcon: AppAssets.smart_phone,
|
||||
onChange: (value) {})
|
||||
.paddingSymmetrical(0.h, 16.h),
|
||||
Divider(height: 1, color: AppColors.greyColor),
|
||||
isFromDubai
|
||||
? Selector<AuthenticationViewModel, ({List<NationalityCountries>? countriesList, NationalityCountries? selectedCountry, bool isArabic})>(
|
||||
selector: (context, authViewModel) {
|
||||
final appState = getIt.get<AppState>();
|
||||
return (countriesList: authViewModel.countriesList, selectedCountry: authViewModel.pickedCountryByUAEUser, isArabic: appState.isArabic());
|
||||
},
|
||||
shouldRebuild: (previous, next) => previous.countriesList != next.countriesList || previous.selectedCountry != next.selectedCountry || previous.isArabic != next.isArabic,
|
||||
builder: (context, data, child) {
|
||||
final authVM = context.read<AuthenticationViewModel>();
|
||||
return DropdownWidget(
|
||||
labelText: LocaleKeys.country.tr(),
|
||||
hintText: LocaleKeys.uae.tr(),
|
||||
isEnable: true,
|
||||
dropdownItems: (data.countriesList ?? []).map((e) => data.isArabic ? e.nameN ?? "" : e.name ?? "").toList(),
|
||||
selectedValue: data.selectedCountry != null
|
||||
? data.isArabic
|
||||
? data.selectedCountry!.nameN ?? ""
|
||||
: data.selectedCountry!.name ?? ""
|
||||
: "",
|
||||
onChange: authVM.onUAEUserCountrySelection,
|
||||
isBorderAllowed: false,
|
||||
hasSelectionCustomIcon: true,
|
||||
isAllowRadius: false,
|
||||
padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
|
||||
selectionCustomIcon: AppAssets.arrow_down,
|
||||
leadingIcon: AppAssets.globe,
|
||||
).withVerticalPadding(8);
|
||||
},
|
||||
)
|
||||
: TextInputWidget(
|
||||
labelText: LocaleKeys.nationality.tr(),
|
||||
hintText: appState.isArabic()
|
||||
? (authVM!.countriesList!.firstWhere((e) => e.id == (widget.nHICData!.nationalityCode ?? ""), orElse: () => NationalityCountries()).nameN ?? "")
|
||||
: (authVM!.countriesList!.firstWhere((e) => e.id == (widget.nHICData!.nationalityCode ?? ""), orElse: () => NationalityCountries()).name ?? ""),
|
||||
isEnable: true,
|
||||
prefix: null,
|
||||
isAllowRadius: false,
|
||||
isBorderAllowed: false,
|
||||
isAllowLeadingIcon: true,
|
||||
isReadOnly: true,
|
||||
leadingIcon: AppAssets.globe,
|
||||
onChange: (value) {})
|
||||
.paddingSymmetrical(0.h, 16.h),
|
||||
Divider(
|
||||
height: 1,
|
||||
color: AppColors.greyColor,
|
||||
),
|
||||
TextInputWidget(
|
||||
labelText: LocaleKeys.mobileNumber.tr(),
|
||||
hintText: ("widget.payload.mobileNo" ?? ""),
|
||||
controller: authVM!.phoneNumberController,
|
||||
isEnable: true,
|
||||
prefix: null,
|
||||
isAllowRadius: false,
|
||||
isBorderAllowed: false,
|
||||
isAllowLeadingIcon: true,
|
||||
isReadOnly: true,
|
||||
leadingIcon: AppAssets.call,
|
||||
onChange: (value) {})
|
||||
.paddingSymmetrical(0.h, 16.h),
|
||||
Divider(
|
||||
height: 1,
|
||||
color: AppColors.greyColor,
|
||||
),
|
||||
TextInputWidget(
|
||||
labelText: LocaleKeys.dob.tr(),
|
||||
hintText: isFromDubai ? "widget.payload.dob!" : (widget.nHICData!.dateOfBirth ?? ""),
|
||||
controller: authVM!.dobController,
|
||||
isEnable: true,
|
||||
prefix: null,
|
||||
isBorderAllowed: false,
|
||||
isAllowLeadingIcon: true,
|
||||
isReadOnly: true,
|
||||
leadingIcon: AppAssets.birthday_cake,
|
||||
selectionType: SelectionTypeEnum.calendar,
|
||||
).paddingSymmetrical(0.h, 16.h),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(height: 50.h),
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: CustomButton(
|
||||
text: LocaleKeys.cancel.tr(),
|
||||
icon: AppAssets.cancel,
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
authVM!.clearDefaults();
|
||||
},
|
||||
backgroundColor: AppColors.secondaryLightRedColor,
|
||||
borderColor: AppColors.secondaryLightRedColor,
|
||||
textColor: AppColors.primaryRedColor,
|
||||
iconColor: AppColors.primaryRedColor,
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: 16,
|
||||
),
|
||||
Expanded(
|
||||
child: CustomButton(
|
||||
backgroundColor: AppColors.lightGreenColor,
|
||||
borderColor: AppColors.lightGreenColor,
|
||||
textColor: AppColors.textGreenColor,
|
||||
text: LocaleKeys.confirm.tr(),
|
||||
icon: AppAssets.confirm,
|
||||
iconColor: AppColors.textGreenColor,
|
||||
onPressed: () {
|
||||
// if (isFromDubai) {
|
||||
// if (name == null) {
|
||||
// AppToast.showErrorToast(message: LocaleKeys.enterFullName);
|
||||
// return;
|
||||
// }
|
||||
// if (!name!.contains(" ")) if (selectedGenderType == null) {
|
||||
// AppToast.showErrorToast(message: TranslationBase.of(context).enterFullName);
|
||||
// return;
|
||||
// }
|
||||
// if (selectedMaritalStatusType == null) {
|
||||
// AppToast.showErrorToast(message: TranslationBase.of(context).chooseMaritalStatus);
|
||||
// return;
|
||||
// }
|
||||
// if (selectedCountry == null) {
|
||||
// AppToast.showErrorToast(message: TranslationBase.of(context).chooseCountry);
|
||||
// return;
|
||||
// }
|
||||
// }
|
||||
|
||||
showModel(context: context);
|
||||
},
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
void showModel({required BuildContext context}) {
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
isDismissible: false,
|
||||
backgroundColor: Colors.transparent,
|
||||
builder: (bottomSheetContext) => Padding(
|
||||
padding: EdgeInsets.only(bottom: MediaQuery.of(bottomSheetContext).viewInsets.bottom),
|
||||
child: SingleChildScrollView(
|
||||
child: GenericBottomSheet(
|
||||
textController: TextEditingController(),
|
||||
isForEmail: true,
|
||||
buttons: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 10),
|
||||
child: CustomButton(
|
||||
text: LocaleKeys.submit,
|
||||
onPressed: () {
|
||||
// if (emailAddress.text.isEmpty) {
|
||||
// Utils.showErrorToast(TranslationBase.of(context).enterEmailAddress);
|
||||
// return;
|
||||
// } else {
|
||||
// Navigator.of(context).pop();
|
||||
// registerNow();
|
||||
// }
|
||||
},
|
||||
backgroundColor: AppColors.bgGreenColor,
|
||||
borderColor: AppColors.bgGreenColor,
|
||||
textColor: AppColors.whiteColor),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,289 @@
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:hmg_patient_app_new/core/app_assets.dart';
|
||||
import 'package:hmg_patient_app_new/core/enums.dart';
|
||||
import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
|
||||
import 'package:hmg_patient_app_new/core/utils/utils.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
|
||||
import 'package:hmg_patient_app_new/presentation/authentication/login.dart';
|
||||
import 'package:hmg_patient_app_new/theme/colors.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/appbar/app_bar_widget.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/bottomsheet/generic_bottom_sheet.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
|
||||
|
||||
class SavedLogin extends StatefulWidget {
|
||||
// final SelectDeviceIMEIRES savedLoginData;
|
||||
|
||||
// const SavedLogin(this.savedLoginData, {Key? key}) : super(key: key);
|
||||
const SavedLogin();
|
||||
|
||||
@override
|
||||
_SavedLogin createState() => _SavedLogin();
|
||||
}
|
||||
|
||||
class _SavedLogin extends State<SavedLogin> {
|
||||
LoginTypeEnum loginType = LoginTypeEnum.sms;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: CustomAppBar(
|
||||
onBackPressed: () {},
|
||||
onLanguageChanged: (lang) {},
|
||||
),
|
||||
body: SafeArea(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.symmetric(horizontal: 24.h),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
const Spacer(flex: 2),
|
||||
// Welcome back text
|
||||
LocaleKeys.welcomeBack.tr().toText16(color: AppColors.inputLabelTextColor),
|
||||
SizedBox(height: 16.h),
|
||||
("widget.savedLoginData.name!.toLowerCase().capitalizeFirstofEach").toText26(isBold: true, height: 26 / 36, color: AppColors.textColor),
|
||||
SizedBox(height: 24.h),
|
||||
Container(
|
||||
padding: EdgeInsets.all(16.h),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.whiteColor,
|
||||
border: Border.all(color: AppColors.whiteColor),
|
||||
borderRadius: BorderRadius.circular(24.h),
|
||||
boxShadow: [
|
||||
BoxShadow(color: Color(0x0D000000), blurRadius: 16, offset: Offset(0, 0), spreadRadius: 5),
|
||||
],
|
||||
),
|
||||
child: Column(
|
||||
children: [
|
||||
// Last login info
|
||||
('LocaleKeys.lastloginBy.tr()' + ' {getType(widget.savedLoginData.logInType!, context)}').toText14(isBold: true, color: AppColors.greyTextColor),
|
||||
('widget.savedLoginData.createdOn != null ? DateUtil.getFormattedDate(DateUtil.convertStringToDate(widget.savedLoginData.createdOn!), "d MMMM, y at HH:mm") : --')
|
||||
.toText16(isBold: true, color: AppColors.textColor),
|
||||
|
||||
Container(margin: EdgeInsets.all(16.h), child: Utils.buildSvgWithAssets(icon: getTypeIcons(loginType.toInt), iconColor: loginType.toInt == 4 ? null : AppColors.primaryRedColor)),
|
||||
// Face ID login button
|
||||
Container(
|
||||
height: 45,
|
||||
child: CustomButton(
|
||||
text: "${LocaleKeys.loginBy.tr()} ${loginType.displayName}",
|
||||
onPressed: () {
|
||||
if (loginType == LoginTypeEnum.fingerprint || loginType == LoginTypeEnum.face) {
|
||||
// loginWithFingerPrintFace(loginType.toInt, widget.savedLoginData.iMEI!);
|
||||
} else {
|
||||
int? val = loginType.toInt;
|
||||
//checkUserAuthentication(val);
|
||||
}
|
||||
},
|
||||
backgroundColor: Color(0xffED1C2B),
|
||||
borderColor: Color(0xffFEE9EA),
|
||||
textColor: Colors.white,
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500,
|
||||
borderRadius: 12,
|
||||
padding: EdgeInsets.fromLTRB(0, 10, 0, 10),
|
||||
icon: AppAssets.apple_finder,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
Padding(
|
||||
padding: EdgeInsets.symmetric(horizontal: 16.0),
|
||||
child: Text(
|
||||
LocaleKeys.oR.tr(),
|
||||
style: context.dynamicTextStyle(fontSize: 16, fontWeight: FontWeight.w500),
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
// OTP login button
|
||||
loginType != null && loginType.toInt != 1
|
||||
? Column(
|
||||
children: [
|
||||
loginType.toInt != 1
|
||||
? CustomButton(
|
||||
text: LocaleKeys.loginByOTP.tr(),
|
||||
onPressed: () {
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
isDismissible: false,
|
||||
useSafeArea: true,
|
||||
backgroundColor: Colors.transparent,
|
||||
enableDrag: false,
|
||||
// Prevent dragging to avoid focus conflicts
|
||||
builder: (bottomSheetContext) => StatefulBuilder(builder: (BuildContext context, StateSetter setModalState) {
|
||||
return Padding(
|
||||
padding: EdgeInsets.only(bottom: MediaQuery.of(bottomSheetContext).viewInsets.bottom),
|
||||
child: SingleChildScrollView(
|
||||
child: GenericBottomSheet(
|
||||
countryCode: "966",
|
||||
initialPhoneNumber: "",
|
||||
textController: TextEditingController(),
|
||||
isFromSavedLogin: true,
|
||||
isEnableCountryDropdown: true,
|
||||
onCountryChange: (value) {},
|
||||
onChange: (String? value) {},
|
||||
buttons: [
|
||||
Padding(
|
||||
padding: EdgeInsets.only(bottom: 10.h),
|
||||
child: CustomButton(
|
||||
text: LocaleKeys.sendOTPSMS.tr(),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
loginType = LoginTypeEnum.sms;
|
||||
int? val = loginType.toInt;
|
||||
// checkUserAuthentication(val);
|
||||
},
|
||||
backgroundColor: AppColors.primaryRedColor,
|
||||
borderColor: AppColors.primaryRedBorderColor,
|
||||
textColor: AppColors.whiteColor,
|
||||
icon: AppAssets.message,
|
||||
),
|
||||
),
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Padding(padding: EdgeInsets.symmetric(horizontal: 8.h), child: (LocaleKeys.oR.tr()).toText16(color: AppColors.textColor)),
|
||||
],
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 10, top: 10),
|
||||
child: CustomButton(
|
||||
text: LocaleKeys.sendOTPWHATSAPP.tr(),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
loginType = LoginTypeEnum.whatsapp;
|
||||
int? val = loginType.toInt;
|
||||
// checkUserAuthentication(val);
|
||||
},
|
||||
backgroundColor: AppColors.transparent,
|
||||
borderColor: AppColors.textColor,
|
||||
textColor: AppColors.textColor,
|
||||
icon: AppAssets.whatsapp,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}),
|
||||
);
|
||||
},
|
||||
backgroundColor: AppColors.whiteColor,
|
||||
borderColor: AppColors.borderOnlyColor,
|
||||
textColor: AppColors.textColor,
|
||||
borderWidth: 2,
|
||||
padding: EdgeInsets.fromLTRB(0, 14, 0, 14),
|
||||
icon: AppAssets.password_validation,
|
||||
)
|
||||
: Container(),
|
||||
SizedBox(
|
||||
height: 20,
|
||||
),
|
||||
],
|
||||
)
|
||||
: CustomButton(
|
||||
text: "${LocaleKeys.loginBy.tr()} ${LoginTypeEnum.whatsapp.displayName}",
|
||||
onPressed: () {
|
||||
if (loginType == LoginTypeEnum.fingerprint || loginType == LoginTypeEnum.face) {
|
||||
// loginWithFingerPrintFace(loginType.toInt, "iMEI");
|
||||
} else {
|
||||
loginType = LoginTypeEnum.whatsapp;
|
||||
int? val = loginType.toInt;
|
||||
// checkUserAuthentication(val);
|
||||
}
|
||||
},
|
||||
backgroundColor: AppColors.whiteColor,
|
||||
borderColor: Color(0xFF2E3039),
|
||||
textColor: Color(0xFF2E3039),
|
||||
borderWidth: 2,
|
||||
padding: EdgeInsets.fromLTRB(0, 14, 0, 14),
|
||||
icon: AppAssets.whatsapp,
|
||||
),
|
||||
const Spacer(flex: 2),
|
||||
// OR divider
|
||||
|
||||
const SizedBox(height: 24),
|
||||
// Guest and Switch account
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Expanded(
|
||||
child: Container(
|
||||
height: 56,
|
||||
child: CustomButton(
|
||||
text: LocaleKeys.guest.tr(),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pushReplacement(
|
||||
MaterialPageRoute(builder: (BuildContext context) => LoginScreen()),
|
||||
);
|
||||
},
|
||||
backgroundColor: Color(0xffFEE9EA),
|
||||
borderColor: Color(0xffFEE9EA),
|
||||
textColor: Color(0xffED1C2B),
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
borderRadius: 12,
|
||||
padding: EdgeInsets.fromLTRB(0, 10, 0, 10),
|
||||
// icon: "assets/images/svg/apple-finder.svg",
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: MediaQuery.of(context).size.width * 0.05,
|
||||
),
|
||||
Expanded(
|
||||
child: Container(
|
||||
height: 56,
|
||||
child: CustomButton(
|
||||
text: LocaleKeys.switchAccount.tr(),
|
||||
onPressed: () {
|
||||
Navigator.of(context).pushReplacement(
|
||||
MaterialPageRoute(builder: (BuildContext context) => LoginScreen()),
|
||||
);
|
||||
},
|
||||
backgroundColor: Color(0xffFEE9EA),
|
||||
borderColor: Color(0xffFEE9EA),
|
||||
textColor: Color(0xffED1C2B),
|
||||
fontSize: 15,
|
||||
fontWeight: FontWeight.w500,
|
||||
borderRadius: 12,
|
||||
padding: EdgeInsets.fromLTRB(0, 10, 0, 10),
|
||||
// icon: "assets/images/svg/apple-finder.svg",
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
String getTypeIcons(int type) {
|
||||
final types = {
|
||||
1: AppAssets.sms,
|
||||
2: AppAssets.fingerprint,
|
||||
3: AppAssets.fingerprint,
|
||||
4: AppAssets.whatsapp,
|
||||
};
|
||||
|
||||
if (types.containsKey(type)) {
|
||||
return types[type]!;
|
||||
} else {
|
||||
throw Exception('Invalid login type: $type');
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,111 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hmg_patient_app_new/core/app_assets.dart';
|
||||
import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
|
||||
import 'package:hmg_patient_app_new/core/utils/utils.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
|
||||
import 'package:hmg_patient_app_new/theme/colors.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
|
||||
|
||||
class ExceptionBottomSheet extends StatelessWidget {
|
||||
String message;
|
||||
bool showOKButton;
|
||||
bool showCancel;
|
||||
Function() onOkPressed;
|
||||
Function()? onCancelPressed;
|
||||
|
||||
ExceptionBottomSheet({Key? key, required this.message, this.showOKButton = true, this.showCancel = false, required this.onOkPressed, this.onCancelPressed}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return SafeArea(
|
||||
bottom: Platform.isIOS ? false : true, // Adjust for iOS to avoid bottom padding
|
||||
child: GestureDetector(
|
||||
onTap: () {
|
||||
FocusScope.of(context).unfocus(); // Dismiss the keyboard when tapping outside
|
||||
},
|
||||
child: Builder(builder: (context) {
|
||||
return Directionality(
|
||||
textDirection: Directionality.of(context),
|
||||
child: Container(
|
||||
padding: EdgeInsets.all(24.h),
|
||||
decoration: BoxDecoration(
|
||||
color: Color(0xFFF8F8FA),
|
||||
borderRadius: const BorderRadius.vertical(top: Radius.circular(16)),
|
||||
),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
LocaleKeys.notice.tr().toText28(),
|
||||
InkWell(
|
||||
onTap: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
child: Utils.buildSvgWithAssets(icon: AppAssets.cross_circle),
|
||||
)
|
||||
],
|
||||
),
|
||||
SizedBox(height: 10.h),
|
||||
(message ?? "").toText16(isBold: false, color: AppColors.textColor),
|
||||
SizedBox(height: 10.h),
|
||||
SizedBox(height: 24.h),
|
||||
if (showOKButton && showCancel)
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: CustomButton(
|
||||
text: LocaleKeys.cancel.tr(),
|
||||
onPressed: onCancelPressed != null
|
||||
? onCancelPressed!
|
||||
: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
backgroundColor: AppColors.secondaryLightRedColor,
|
||||
borderColor: AppColors.secondaryLightRedColor,
|
||||
textColor: AppColors.primaryRedColor,
|
||||
icon: AppAssets.cancel,
|
||||
iconColor: AppColors.primaryRedColor,
|
||||
),
|
||||
),
|
||||
SizedBox(width: 5.h),
|
||||
Expanded(
|
||||
child: CustomButton(
|
||||
text: showCancel ? LocaleKeys.confirm.tr() : LocaleKeys.ok.tr(),
|
||||
onPressed: onOkPressed,
|
||||
backgroundColor: AppColors.bgGreenColor,
|
||||
borderColor: AppColors.bgGreenColor,
|
||||
textColor: Colors.white,
|
||||
icon: AppAssets.confirm,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
if (showOKButton && !showCancel)
|
||||
Padding(
|
||||
padding: EdgeInsets.only(bottom: 10.h),
|
||||
child: CustomButton(
|
||||
text: LocaleKeys.ok.tr(),
|
||||
onPressed: onOkPressed,
|
||||
backgroundColor: AppColors.primaryRedColor,
|
||||
borderColor: AppColors.primaryRedBorderColor,
|
||||
textColor: Colors.white,
|
||||
icon: AppAssets.confirm,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,148 @@
|
||||
import 'dart:io';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hmg_patient_app_new/core/app_assets.dart';
|
||||
import 'package:hmg_patient_app_new/core/enums.dart';
|
||||
import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
|
||||
import 'package:hmg_patient_app_new/core/utils/utils.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
|
||||
import 'package:hmg_patient_app_new/theme/colors.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/input_widget.dart';
|
||||
|
||||
class GenericBottomSheet extends StatefulWidget {
|
||||
String? countryCode;
|
||||
String? initialPhoneNumber;
|
||||
final List<Widget> buttons;
|
||||
TextEditingController? textController;
|
||||
final bool isForEmail;
|
||||
Function(CountryEnum)? onCountryChange;
|
||||
final bool isEnableCountryDropdown;
|
||||
final bool isFromSavedLogin;
|
||||
Function(String?)? onChange;
|
||||
|
||||
// FocusNode myFocusNode;
|
||||
|
||||
GenericBottomSheet({
|
||||
this.countryCode = "",
|
||||
this.initialPhoneNumber = "",
|
||||
required this.buttons,
|
||||
this.textController,
|
||||
this.isForEmail = false,
|
||||
this.onCountryChange,
|
||||
this.isEnableCountryDropdown = false,
|
||||
this.isFromSavedLogin = false,
|
||||
this.onChange,
|
||||
// required this.myFocusNode
|
||||
});
|
||||
|
||||
@override
|
||||
_GenericBottomSheetState createState() => _GenericBottomSheetState();
|
||||
}
|
||||
|
||||
class _GenericBottomSheetState extends State<GenericBottomSheet> {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
|
||||
if (!widget.isForEmail && widget.textController != null) {
|
||||
widget.textController!.text = widget.initialPhoneNumber!;
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return SafeArea(
|
||||
top: false,
|
||||
bottom: Platform.isIOS ? false : true,
|
||||
child: GestureDetector(
|
||||
onTap: () {
|
||||
FocusScope.of(context).unfocus();
|
||||
},
|
||||
child: Directionality(
|
||||
textDirection: Directionality.of(context),
|
||||
child: Container(
|
||||
padding: EdgeInsets.all(24.h),
|
||||
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.bgScaffoldColor, borderRadius: 16),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
// Title
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Flexible(
|
||||
child: widget.isFromSavedLogin
|
||||
? LocaleKeys.receiveOtpToast.tr().toText24()
|
||||
: widget.isForEmail
|
||||
? LocaleKeys.enterEmail.tr().toText24()
|
||||
: LocaleKeys.enterPhoneNumber.tr().toText24()),
|
||||
InkWell(
|
||||
onTap: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
child: Padding(
|
||||
padding: EdgeInsets.only(top: 10.h),
|
||||
child: Utils.buildSvgWithAssets(icon: AppAssets.cross_circle),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
SizedBox(height: 8.h),
|
||||
// Subtitle
|
||||
widget.isFromSavedLogin
|
||||
? LocaleKeys.pleaseChooseOption.tr().toText16()
|
||||
: widget.isForEmail
|
||||
? LocaleKeys.enterEmailDesc.tr().toText16()
|
||||
: LocaleKeys.enterPhoneDesc.tr().toText16(),
|
||||
|
||||
if (widget.isFromSavedLogin)
|
||||
...[]
|
||||
else ...[
|
||||
widget.textController != null
|
||||
? TextInputWidget(
|
||||
labelText: widget.isForEmail ? LocaleKeys.email : LocaleKeys.phoneNumber,
|
||||
hintText: widget.isForEmail ? "demo@gmail.com" : "5xxxxxxxx",
|
||||
controller: widget.textController!,
|
||||
padding: EdgeInsets.all(8.h),
|
||||
keyboardType: widget.isForEmail ? TextInputType.emailAddress : TextInputType.number,
|
||||
onChange: (value) {
|
||||
if (widget.onChange != null) {
|
||||
widget.onChange!(value);
|
||||
}
|
||||
},
|
||||
onCountryChange: (value) {
|
||||
if (widget.onCountryChange != null) {
|
||||
widget.onCountryChange!(value);
|
||||
}
|
||||
},
|
||||
isEnable: true,
|
||||
isReadOnly: widget.isFromSavedLogin,
|
||||
prefix: widget.isForEmail ? null : widget.countryCode,
|
||||
isBorderAllowed: false,
|
||||
isAllowLeadingIcon: true,
|
||||
isCountryDropDown: widget.isEnableCountryDropdown,
|
||||
leadingIcon: widget.isForEmail ? AppAssets.email : AppAssets.smart_phone,
|
||||
)
|
||||
: SizedBox(),
|
||||
],
|
||||
|
||||
SizedBox(height: 24.h),
|
||||
...widget.buttons,
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,210 @@
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hmg_patient_app_new/core/app_assets.dart';
|
||||
import 'package:hmg_patient_app_new/core/enums.dart';
|
||||
import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
|
||||
import 'package:hmg_patient_app_new/core/utils/utils.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
|
||||
|
||||
class CustomCountryDropdown extends StatefulWidget {
|
||||
final List<CountryEnum> countryList;
|
||||
final Function(CountryEnum)? onCountryChange;
|
||||
final Function(String)? onPhoneNumberChanged;
|
||||
final bool isRtl;
|
||||
final bool isFromBottomSheet;
|
||||
final bool isEnableTextField;
|
||||
Widget? textField;
|
||||
|
||||
CustomCountryDropdown({
|
||||
Key? key,
|
||||
required this.countryList,
|
||||
this.onCountryChange,
|
||||
this.onPhoneNumberChanged,
|
||||
required this.isRtl,
|
||||
this.isFromBottomSheet = false,
|
||||
this.isEnableTextField = false,
|
||||
this.textField,
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
_CustomCountryDropdownState createState() => _CustomCountryDropdownState();
|
||||
}
|
||||
|
||||
class _CustomCountryDropdownState extends State<CustomCountryDropdown> {
|
||||
CountryEnum? selectedCountry;
|
||||
late OverlayEntry _overlayEntry;
|
||||
bool _isDropdownOpen = false;
|
||||
FocusNode textFocusNode = new FocusNode();
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
selectedCountry = CountryEnum.saudiArabia;
|
||||
|
||||
if (widget.isEnableTextField && widget.isFromBottomSheet) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (mounted && textFocusNode.canRequestFocus) {
|
||||
FocusScope.of(context).requestFocus(textFocusNode);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
textFocusNode.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
height: 40.h,
|
||||
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(borderRadius: 10.h),
|
||||
child: Row(
|
||||
children: [
|
||||
GestureDetector(
|
||||
onTap: () {
|
||||
if (_isDropdownOpen) {
|
||||
_closeDropdown();
|
||||
} else {
|
||||
_openDropdown();
|
||||
}
|
||||
},
|
||||
child: Utils.buildSvgWithAssets(icon: selectedCountry != null ? selectedCountry!.iconPath : AppAssets.ksa, width: 40.h, height: 40.h)),
|
||||
SizedBox(width: 8.h),
|
||||
Utils.buildSvgWithAssets(icon: _isDropdownOpen ? AppAssets.dropdow_icon : AppAssets.dropdow_icon),
|
||||
SizedBox(width: 4.h),
|
||||
if (widget.isFromBottomSheet)
|
||||
GestureDetector(
|
||||
onTap: () {
|
||||
if (widget.isEnableTextField && textFocusNode.canRequestFocus) {
|
||||
FocusScope.of(context).requestFocus(textFocusNode);
|
||||
}
|
||||
},
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Text(
|
||||
LocaleKeys.phoneNumber.tr(),
|
||||
style: TextStyle(fontSize: 12.fSize, height: 21 / 12, fontWeight: FontWeight.w500, letterSpacing: -1),
|
||||
),
|
||||
],
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
Text(
|
||||
selectedCountry!.countryCode,
|
||||
style: TextStyle(fontSize: 12.fSize, height: 21 / 18, fontWeight: FontWeight.w600, letterSpacing: -0.2),
|
||||
),
|
||||
SizedBox(width: 4.h),
|
||||
if (widget.isEnableTextField)
|
||||
SizedBox(
|
||||
height: 20,
|
||||
width: 200,
|
||||
child: TextField(
|
||||
focusNode: textFocusNode,
|
||||
decoration: InputDecoration(hintText: "", isDense: true, border: InputBorder.none),
|
||||
keyboardType: TextInputType.phone,
|
||||
onChanged: widget.onPhoneNumberChanged),
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
if (!widget.isFromBottomSheet)
|
||||
Text(
|
||||
selectedCountry != null ? selectedCountry!.displayName : "Select Country",
|
||||
style: TextStyle(fontSize: 14.fSize, height: 21 / 14, fontWeight: FontWeight.w500, letterSpacing: -0.2),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
void _openDropdown() {
|
||||
if (textFocusNode.hasFocus) {
|
||||
textFocusNode.unfocus();
|
||||
}
|
||||
|
||||
RenderBox renderBox = context.findRenderObject() as RenderBox;
|
||||
Offset offset = renderBox.localToGlobal(Offset.zero);
|
||||
|
||||
_overlayEntry = OverlayEntry(
|
||||
builder: (context) => Stack(
|
||||
children: [
|
||||
// Dismiss dropdown when tapping outside
|
||||
Positioned.fill(
|
||||
child: GestureDetector(
|
||||
onTap: _closeDropdown,
|
||||
behavior: HitTestBehavior.translucent,
|
||||
child: Container(),
|
||||
),
|
||||
),
|
||||
Positioned(
|
||||
top: offset.dy + renderBox.size.height,
|
||||
left: widget.isRtl ? offset.dx + 6.h : offset.dx - 6.h,
|
||||
width: renderBox.size.width,
|
||||
child: Material(
|
||||
child: Container(
|
||||
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: Colors.white, borderRadius: 12),
|
||||
child: Column(
|
||||
children: widget.countryList
|
||||
.map(
|
||||
(country) => GestureDetector(
|
||||
onTap: () {
|
||||
setState(() {
|
||||
selectedCountry = country;
|
||||
});
|
||||
widget.onCountryChange?.call(country);
|
||||
_closeDropdown();
|
||||
},
|
||||
child: Container(
|
||||
padding: EdgeInsets.symmetric(vertical: 8.h, horizontal: 8.h),
|
||||
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(borderRadius: 16.h),
|
||||
child: Row(
|
||||
children: [
|
||||
Utils.buildSvgWithAssets(icon: country.iconPath, width: 38.h, height: 38.h),
|
||||
if (!widget.isFromBottomSheet) SizedBox(width: 12.h),
|
||||
if (!widget.isFromBottomSheet) Text(country.displayName, style: TextStyle(fontSize: 14.fSize, height: 21 / 14, fontWeight: FontWeight.w500, letterSpacing: -0.2)),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
.toList(),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
Overlay.of(context)?.insert(_overlayEntry);
|
||||
setState(() {
|
||||
_isDropdownOpen = true;
|
||||
});
|
||||
}
|
||||
|
||||
void _closeDropdown() {
|
||||
_overlayEntry.remove();
|
||||
setState(() {
|
||||
_isDropdownOpen = false;
|
||||
});
|
||||
|
||||
if (widget.isEnableTextField && widget.isFromBottomSheet) {
|
||||
Future.delayed(Duration(milliseconds: 100), () {
|
||||
if (mounted && textFocusNode.canRequestFocus) {
|
||||
FocusScope.of(context).requestFocus(textFocusNode);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,154 @@
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart' show Icons, PopupMenuItem, showMenu, Colors;
|
||||
import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
|
||||
import 'package:hmg_patient_app_new/core/utils/utils.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/theme/colors.dart';
|
||||
|
||||
class DropdownWidget extends StatelessWidget {
|
||||
final String labelText;
|
||||
final String hintText;
|
||||
final List<String> dropdownItems;
|
||||
final String? selectedValue;
|
||||
final Function(String?)? onChange;
|
||||
final bool isEnable;
|
||||
final bool isBorderAllowed;
|
||||
final bool isAllowRadius;
|
||||
final EdgeInsetsGeometry? padding;
|
||||
final bool hasSelectionCustomIcon;
|
||||
final String? selectionCustomIcon;
|
||||
final String? leadingIcon;
|
||||
|
||||
const DropdownWidget({
|
||||
Key? key,
|
||||
required this.labelText,
|
||||
required this.hintText,
|
||||
required this.dropdownItems,
|
||||
this.selectedValue,
|
||||
this.onChange,
|
||||
this.isEnable = true,
|
||||
this.isBorderAllowed = true,
|
||||
this.isAllowRadius = true,
|
||||
this.padding,
|
||||
this.hasSelectionCustomIcon = false,
|
||||
this.selectionCustomIcon,
|
||||
this.leadingIcon,
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
Widget content = Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [_buildLabelText(), _buildDropdown(context)],
|
||||
);
|
||||
|
||||
return Container(
|
||||
padding: padding,
|
||||
alignment: Alignment.center, // This might need adjustment based on layout
|
||||
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
|
||||
color: Colors.white,
|
||||
borderRadius: isAllowRadius ? 15.h : null,
|
||||
side: isBorderAllowed ? BorderSide(color: const Color(0xffefefef), width: 1) : null,
|
||||
),
|
||||
child: Row(
|
||||
// Wrap with a Row
|
||||
crossAxisAlignment: CrossAxisAlignment.center, // Align items vertically in the center
|
||||
children: [
|
||||
if (leadingIcon != null) ...[
|
||||
_buildLeadingIcon(),
|
||||
SizedBox(width: 3.h),
|
||||
],
|
||||
Expanded(child: content),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildLeadingIcon() {
|
||||
return Container(
|
||||
height: 40.h,
|
||||
width: 40.h,
|
||||
margin: EdgeInsets.only(right: 10.h),
|
||||
padding: EdgeInsets.all(8.h),
|
||||
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(borderRadius: 10.h, color: AppColors.greyColor),
|
||||
child: Utils.buildSvgWithAssets(icon: leadingIcon!));
|
||||
}
|
||||
|
||||
Widget _buildLabelText() {
|
||||
return Text(
|
||||
labelText,
|
||||
style: TextStyle(
|
||||
fontSize: 12.fSize,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Color(0xff898A8D),
|
||||
letterSpacing: -0.2,
|
||||
height: 18 / 12,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildDropdown(BuildContext context) {
|
||||
return GestureDetector(
|
||||
onTap: isEnable
|
||||
? () async {
|
||||
final renderBox = context.findRenderObject() as RenderBox;
|
||||
final offset = renderBox.localToGlobal(Offset.zero);
|
||||
final selected = await showMenu<String>(
|
||||
context: context,
|
||||
position: RelativeRect.fromLTRB(
|
||||
offset.dx,
|
||||
offset.dy + renderBox.size.height,
|
||||
offset.dx + renderBox.size.width,
|
||||
0,
|
||||
),
|
||||
items: dropdownItems
|
||||
.map(
|
||||
(e) => PopupMenuItem<String>(
|
||||
value: e,
|
||||
child: Text(
|
||||
e,
|
||||
style: TextStyle(
|
||||
fontSize: 14.fSize,
|
||||
height: 21 / 14,
|
||||
fontWeight: FontWeight.w500,
|
||||
letterSpacing: -0.2,
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
.toList(),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
);
|
||||
|
||||
if (selected != null && onChange != null) {
|
||||
onChange!(selected);
|
||||
}
|
||||
}
|
||||
: null,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
(selectedValue == null || selectedValue!.isEmpty) ? hintText : selectedValue!,
|
||||
textAlign: TextAlign.left,
|
||||
textDirection: TextDirection.ltr,
|
||||
style: TextStyle(
|
||||
fontSize: 14.fSize,
|
||||
height: 21 / 14,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: (selectedValue != null && selectedValue!.isNotEmpty) ? const Color(0xff2E3039) : const Color(0xffB0B0B0),
|
||||
letterSpacing: -0.2,
|
||||
),
|
||||
),
|
||||
),
|
||||
if (hasSelectionCustomIcon && selectionCustomIcon != null) Utils.buildSvgWithAssets(icon: selectionCustomIcon!) else const Icon(Icons.keyboard_arrow_down_outlined),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -1,132 +0,0 @@
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart' show Icons, PopupMenuItem, showMenu, Colors;
|
||||
import 'package:hmg_patient_app_new/core/utils/utils.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
|
||||
|
||||
class DropdownWidget extends StatelessWidget {
|
||||
final String labelText;
|
||||
final String hintText;
|
||||
final List<String> dropdownItems;
|
||||
final String? selectedValue;
|
||||
final Function(String?)? onChange;
|
||||
final bool isEnable;
|
||||
final bool isBorderAllowed;
|
||||
final bool isAllowRadius;
|
||||
final EdgeInsetsGeometry? padding;
|
||||
final bool hasSelectionCustomIcon;
|
||||
final String? selectionCustomIcon;
|
||||
|
||||
const DropdownWidget({
|
||||
Key? key,
|
||||
required this.labelText,
|
||||
required this.hintText,
|
||||
required this.dropdownItems,
|
||||
this.selectedValue,
|
||||
this.onChange,
|
||||
this.isEnable = true,
|
||||
this.isBorderAllowed = true,
|
||||
this.isAllowRadius = true,
|
||||
this.padding,
|
||||
this.hasSelectionCustomIcon = false,
|
||||
this.selectionCustomIcon,
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
padding: padding,
|
||||
alignment: Alignment.center,
|
||||
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
|
||||
color: Colors.white,
|
||||
borderRadius: isAllowRadius ? 15 : null,
|
||||
side: isBorderAllowed
|
||||
? BorderSide(color: const Color(0xffefefef), width: 1)
|
||||
: null,
|
||||
),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
_buildLabelText(),
|
||||
_buildDropdown(context),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildLabelText() {
|
||||
return Text(
|
||||
labelText,
|
||||
style: const TextStyle(
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Color(0xff898A8D),
|
||||
letterSpacing: -0.2,
|
||||
height: 18 / 12,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildDropdown(BuildContext context) {
|
||||
return GestureDetector(
|
||||
onTap: isEnable
|
||||
? () async {
|
||||
final renderBox = context.findRenderObject() as RenderBox;
|
||||
final offset = renderBox.localToGlobal(Offset.zero);
|
||||
final selected = await showMenu<String>(
|
||||
context: context,
|
||||
position: RelativeRect.fromLTRB(
|
||||
offset.dx,
|
||||
offset.dy + renderBox.size.height,
|
||||
offset.dx + renderBox.size.width,
|
||||
0,
|
||||
),
|
||||
items: dropdownItems
|
||||
.map(
|
||||
(e) => PopupMenuItem<String>(
|
||||
value: e,
|
||||
child: Text(e),
|
||||
),
|
||||
)
|
||||
.toList(),
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
);
|
||||
|
||||
if (selected != null && onChange != null) {
|
||||
onChange!(selected);
|
||||
}
|
||||
}
|
||||
: null,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
(selectedValue == null || selectedValue!.isEmpty)
|
||||
? hintText
|
||||
: selectedValue!,
|
||||
textAlign: TextAlign.left,
|
||||
textDirection: TextDirection.ltr,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
height: 21 / 14,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: (selectedValue != null && selectedValue!.isNotEmpty)
|
||||
? const Color(0xff2E3039)
|
||||
: const Color(0xffB0B0B0),
|
||||
letterSpacing: -0.2,
|
||||
),
|
||||
),
|
||||
),
|
||||
if (hasSelectionCustomIcon && selectionCustomIcon != null)
|
||||
Utils.buildSvgWithAssets(icon: selectionCustomIcon!)
|
||||
else
|
||||
const Icon(Icons.keyboard_arrow_down_outlined),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,230 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
|
||||
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
|
||||
import 'package:hmg_patient_app_new/presentation/authentication/register_step2.dart';
|
||||
import 'package:hmg_patient_app_new/theme/colors.dart';
|
||||
import 'package:hmg_patient_app_new/widgets/appbar/app_bar_widget.dart';
|
||||
|
||||
class OTPVerificationPage extends StatefulWidget {
|
||||
final String phoneNumber;
|
||||
|
||||
const OTPVerificationPage({Key? key, required this.phoneNumber}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<OTPVerificationPage> createState() => _OTPVerificationPageState();
|
||||
}
|
||||
|
||||
class _OTPVerificationPageState extends State<OTPVerificationPage> {
|
||||
final int _otpLength = 4;
|
||||
late final List<TextEditingController> _controllers;
|
||||
late final List<FocusNode> _focusNodes;
|
||||
|
||||
Timer? _resendTimer;
|
||||
int _resendTime = 60;
|
||||
bool _isOtpComplete = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_controllers = List.generate(_otpLength, (_) => TextEditingController());
|
||||
_focusNodes = List.generate(_otpLength, (_) => FocusNode());
|
||||
_startResendTimer();
|
||||
|
||||
// Focus the first field once the screen is built
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (_focusNodes.isNotEmpty) {
|
||||
FocusScope.of(context).requestFocus(_focusNodes[0]);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
for (final c in _controllers) c.dispose();
|
||||
for (final f in _focusNodes) f.dispose();
|
||||
_resendTimer?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _startResendTimer() {
|
||||
_resendTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
|
||||
if (_resendTime > 0) {
|
||||
setState(() => _resendTime--);
|
||||
} else {
|
||||
timer.cancel();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
void _onOtpChanged(int index, String value) {
|
||||
if (value.length == 1 && index < _otpLength - 1) {
|
||||
_focusNodes[index + 1].requestFocus();
|
||||
} else if (value.isEmpty && index > 0) {
|
||||
_focusNodes[index - 1].requestFocus();
|
||||
}
|
||||
_checkOtpCompletion();
|
||||
}
|
||||
|
||||
void _checkOtpCompletion() {
|
||||
final isComplete = _controllers.every((c) => c.text.isNotEmpty);
|
||||
|
||||
if (isComplete != _isOtpComplete) {
|
||||
setState(() => _isOtpComplete = isComplete);
|
||||
|
||||
if (isComplete) {
|
||||
_verifyOtp();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void _resendOtp() {
|
||||
if (_resendTime == 0) {
|
||||
setState(() => _resendTime = 60);
|
||||
_startResendTimer();
|
||||
autoFillOtp("1234");
|
||||
|
||||
// call resend API here
|
||||
}
|
||||
}
|
||||
|
||||
String _getMaskedPhoneNumber() {
|
||||
final phone = widget.phoneNumber;
|
||||
return phone.length > 4 ? '05xxxxxx${phone.substring(phone.length - 2)}' : phone;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: CustomAppBar(
|
||||
hideLogoAndLang: true,
|
||||
onBackPressed: () {
|
||||
Navigator.of(context).pop();
|
||||
},
|
||||
onLanguageChanged: (lang) {},
|
||||
),
|
||||
body: SingleChildScrollView(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.symmetric(horizontal: 24.h),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
SizedBox(height: 40.h),
|
||||
Text(
|
||||
'OTP Verification',
|
||||
style: TextStyle(fontSize: 24.fSize, fontWeight: FontWeight.bold),
|
||||
),
|
||||
SizedBox(height: 16.h),
|
||||
Text(
|
||||
'We have sent you the OTP code on ${_getMaskedPhoneNumber()} via SMS for registration verification',
|
||||
style: TextStyle(fontSize: 16.fSize, color: Colors.grey),
|
||||
),
|
||||
SizedBox(height: 40.h),
|
||||
|
||||
// OTP Input Fields
|
||||
SizedBox(
|
||||
height: 100,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
||||
children: List.generate(_otpLength, (index) {
|
||||
return ValueListenableBuilder<TextEditingValue>(
|
||||
valueListenable: _controllers[index],
|
||||
builder: (context, value, _) {
|
||||
final hasText = value.text.isNotEmpty;
|
||||
|
||||
return AnimatedContainer(
|
||||
duration: const Duration(milliseconds: 200),
|
||||
curve: Curves.easeInOut,
|
||||
width: 70.h,
|
||||
margin: EdgeInsets.symmetric(horizontal: 4.h),
|
||||
decoration: RoundedRectangleBorder()
|
||||
.toSmoothCornerDecoration(color: _isOtpComplete ? AppColors.successColor : (hasText ? AppColors.blackBgColor : AppColors.whiteColor), borderRadius: 16),
|
||||
child: Center(
|
||||
child: TextField(
|
||||
controller: _controllers[index],
|
||||
focusNode: _focusNodes[index],
|
||||
textAlign: TextAlign.center,
|
||||
keyboardType: TextInputType.number,
|
||||
maxLength: 1,
|
||||
style: TextStyle(
|
||||
fontSize: 40.fSize,
|
||||
fontWeight: FontWeight.bold,
|
||||
color: AppColors.whiteColor,
|
||||
),
|
||||
decoration: InputDecoration(
|
||||
counterText: '',
|
||||
filled: true,
|
||||
fillColor: Colors.transparent,
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(18),
|
||||
borderSide: BorderSide.none,
|
||||
),
|
||||
),
|
||||
onChanged: (v) => _onOtpChanged(index, v),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
}),
|
||||
),
|
||||
),
|
||||
|
||||
const SizedBox(height: 32),
|
||||
|
||||
// Resend OTP
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
const Text("Didn't receive it? "),
|
||||
if (_resendTime > 0)
|
||||
Text(
|
||||
'resend in (${_resendTime.toString().padLeft(2, '0')}:00). ',
|
||||
style: const TextStyle(color: Colors.grey),
|
||||
)
|
||||
else
|
||||
GestureDetector(
|
||||
onTap: _resendOtp,
|
||||
child: const Text(
|
||||
'Resend',
|
||||
style: TextStyle(
|
||||
color: AppColors.primaryRedColor,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
void _verifyOtp() {
|
||||
final otp = _controllers.map((c) => c.text).join();
|
||||
debugPrint('Verifying OTP: $otp');
|
||||
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Verifying OTP: $otp')),
|
||||
);
|
||||
|
||||
Navigator.of(context).push(MaterialPageRoute(builder: (BuildContext context) => RegisterNewStep2(null, {"nationalID": "12345678654321"})));
|
||||
}
|
||||
|
||||
/// Auto fill OTP into text fields
|
||||
void autoFillOtp(String otp) {
|
||||
if (otp.length != _otpLength) return;
|
||||
|
||||
for (int i = 0; i < _otpLength; i++) {
|
||||
_controllers[i].text = otp[i];
|
||||
}
|
||||
|
||||
// Move focus to the last field
|
||||
_focusNodes[_otpLength - 1].requestFocus();
|
||||
|
||||
// Trigger completion check and color update
|
||||
_checkOtpCompletion();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue