updare-to-3.32.sultan
haroon amjad 6 months ago
parent ec0e51c96c
commit 3f5ba0cfcd

@ -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: () {

@ -249,7 +249,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);
} }

@ -136,21 +136,18 @@ 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');
final year = parts[0]; final year = parts[0];
// Map month number to short month name (Hijri months) // Map month number to short month name (Hijri months)
const hijriMonthNames = [ const hijriMonthNames = ['Muharram', 'Safar', 'Rabi I', 'Rabi II', 'Jumada I', 'Jumada II', 'Rajab', 'Sha\'ban', 'Ramadan', 'Shawwal', 'Dhu al-Qi\'dah', 'Dhu al-Hijjah'];
'Muharram', 'Safar', 'Rabi I', 'Rabi II', 'Jumada I', 'Jumada II',
'Rajab', 'Sha\'ban', 'Ramadan', 'Shawwal', 'Dhu al-Qi\'dah', 'Dhu al-Hijjah'
];
final monthIndex = int.tryParse(parts[1]) ?? 1; final monthIndex = int.tryParse(parts[1]) ?? 1;
final month = hijriMonthNames[monthIndex - 1]; final month = hijriMonthNames[monthIndex - 1];
@ -161,8 +158,6 @@ class Utils {
} }
} }
static String formatDateToUsage(String isoDateString) { static String formatDateToUsage(String isoDateString) {
try { try {
final dateTime = DateTime.parse(isoDateString); final dateTime = DateTime.parse(isoDateString);

Loading…
Cancel
Save