Merge remote-tracking branch 'origin/update-to-3.32-sdk' into update-to-3.32-sdk

updare-to-3.32.sultan
Aamir Muhammad 6 months ago
commit e6ed6329ea

@ -76,7 +76,7 @@ class _GenericBottomSheetState extends State<GenericBottomSheet> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
AppText(widget.isForEmail ? TranslationBase.of(context).enterEmailAddress : TranslationBase.of(context).enterPhoneNumber, AppText(widget.isForEmail ? TranslationBase.of(context).enterEmail : TranslationBase.of(context).enterPhoneNumber,
fontSize: 28, letterSpacing: -2, color: Color(0xFF2E3039), fontWeight: FontWeight.w600), fontSize: 28, letterSpacing: -2, color: Color(0xFF2E3039), fontWeight: FontWeight.w600),
InkWell( InkWell(
onTap: () { onTap: () {

@ -251,7 +251,7 @@ class _RegisterNew extends State<RegisterNew> {
selectedDOB = DateTime.parse(value!); selectedDOB = DateTime.parse(value!);
if (isHijri == 1) { if (isHijri == 1) {
var hijriDate = HijriGregConverter.gregorianToHijri(DateTime.parse(value)); var hijriDate = HijriGregConverter.gregorianToHijri(DateTime.parse(value));
selectedDOB = DateTime(hijriDate.year, hijriDate.month, hijriDate.day, DateTime.now().hour, DateTime.now().minute, DateTime.now().second); selectedDOB = DateTime(hijriDate.year, hijriDate.month, hijriDate.day);
} else { } else {
selectedDOB = DateTime.parse(value); selectedDOB = DateTime.parse(value);
} }

@ -146,7 +146,8 @@ class Utils {
static String formatHijriDateToDisplay(String hijriDateString) { static String formatHijriDateToDisplay(String hijriDateString) {
try { try {
// Assuming hijriDateString is in the format yyyy-MM-dd // Assuming hijriDateString is in the format yyyy-MM-dd
final parts = hijriDateString.split('-'); final datePart = hijriDateString.split("T").first;
final parts = datePart.split('-');
if (parts.length != 3) return ""; if (parts.length != 3) return "";
final day = parts[2].padLeft(2, '0'); final day = parts[2].padLeft(2, '0');

Loading…
Cancel
Save