Merge branch 'release-1.19' into fix/time-indication-after-midnight

mawaqit · Jan 17, 2025 · 04283b6 · 04283b6
2 parents c16e96b + 24857a4
commit 04283b6
Show file tree

Hide file tree

Showing 12 changed files with 540 additions and 162 deletions.
diff --git a/lib/l10n/intl_ar.arb b/lib/l10n/intl_ar.arb
@@ -129,7 +129,7 @@
   "rabiAlawwal": "ربيع الأول",
   "rabiAlthani": "ربيع الثاني",
   "jumadaAlula": "جمادى الأولى",
-  "jumadaAlakhirah": "جمادة الآخرة",
+  "jumadaAlakhirah": "جمادى الآخرة",
   "rajab": "رجب",
   "shaban": "شعبان",
   "ramadan": "رمضان",
@@ -397,6 +397,6 @@
   },
   "ishaAndFajrOnly": "فقط صلاتي الفجر و العشاء",
   "minutesBeforeFajrPrayer": "دقائق قبل وقت صلاة الفجر",
-  "minutesAfterIshaPrayer": "دقائق بعد وقت صلاة العشاء"
-
-}
+  "minutesAfterIshaPrayer": "دقائق بعد وقت صلاة العشاء",
+  "initializingAutoReading": "جاري التهيئة..."
+}
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -424,5 +424,6 @@
   "selectReciter": "Select a Reciter",
   "selectMoshaf": "Select a Mushaf",
   "randomSurahSelection": "Random Surah Selection",
-  "selectSurah": "Select a Surah"
+  "selectSurah": "Select a Surah",
+  "initializingAutoReading": "Initializing in progress..."
 }
diff --git a/lib/src/helpers/AppDate.dart b/lib/src/helpers/AppDate.dart
@@ -28,10 +28,10 @@ class AppDateTime {
   static final DateTime _initialRealTime = DateTime.now();
   static final DateTime _initialDebugTime = DateTime(
     _initialRealTime.year,
-    _initialRealTime.month,
-    _initialRealTime.day,
-    13,
-    48,
+    11,
+    1,
+    00,
+    -20,
     00,
   );
 

diff --git a/lib/src/pages/home/widgets/salah_items/SalahItem.dart b/lib/src/pages/home/widgets/salah_items/SalahItem.dart
@@ -185,9 +185,7 @@ class SalahItemWidget extends StatelessOrientationWidget {
 
     final mosqueProvider = context.watch<MosqueManager>();
     final mosqueConfig = mosqueProvider.mosqueConfig;
-    // print(isIqamaEnabled);
     final isArabic = context.read<AppLanguage>().isArabic();
-
     final is12period = mosqueConfig?.timeDisplayFormat == "12";
 
     return Container(
@@ -217,39 +215,101 @@ class SalahItemWidget extends StatelessOrientationWidget {
                 ),
               ),
             SizedBox(height: 0.5.vh),
-            if (time.trim().isEmpty)
-              Icon(Icons.dnd_forwardslash, size: 6.vwr)
-            else
-              TimeWidget.fromString(
-                show24hFormat: !is12period,
-                time: time,
-                style: TextStyle(
-                  fontSize: isIqamaMoreImportant ? smallFont : bigFont,
-                  fontWeight: FontWeight.w700,
-                  shadows: kHomeTextShadow,
-                  color: Colors.white,
-                  // fontFamily: StringManager.getFontFamily(context),
-                ),
-              ),
-            if (iqama != null && showIqama)
-              SizedBox(
-                height: isArabic ? 1.5.vr : 1.3.vwr,
-                child: Divider(
-                  thickness: 1,
-                  color: withDivider ? Colors.white : Colors.transparent,
-                ),
-              ),
-            if (iqama != null && showIqama)
-              TimeWidget.fromString(
-                show24hFormat: !is12period,
-                time: iqama!,
-                style: TextStyle(
-                  fontSize: isIqamaMoreImportant ? bigFont : smallFont,
-                  fontWeight: FontWeight.bold,
-                  shadows: kHomeTextShadow,
-                  letterSpacing: 1,
-                  color: Colors.white,
-                ),
+            if (iqama2 != null) // Three times layout
+              Column(
+                children: [
+                  if (time.trim().isEmpty)
+                    Icon(Icons.dnd_forwardslash, size: 6.vwr)
+                  else
+                    TimeWidget.fromString(
+                      show24hFormat: !is12period,
+                      time: time,
+                      style: TextStyle(
+                        fontSize: bigFont,
+                        fontWeight: FontWeight.w700,
+                        shadows: kHomeTextShadow,
+                        color: Colors.white,
+                        height: 1,
+                      ),
+                    ),
+                  Container(
+                    margin: EdgeInsets.symmetric(vertical: 1.vr),
+                    width: 20.vwr,
+                    height: 1,
+                    color: Colors.white,
+                  ),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      TimeWidget.fromString(
+                        show24hFormat: !is12period,
+                        time: iqama!,
+                        style: TextStyle(
+                          fontSize: smallFont,
+                          fontWeight: FontWeight.w700,
+                          shadows: kHomeTextShadow,
+                          color: Colors.white,
+                          height: 1,
+                        ),
+                      ),
+                      Container(
+                        height: bigFont,
+                        width: 1,
+                        margin: EdgeInsets.symmetric(horizontal: 1.vwr),
+                        color: Colors.white,
+                      ),
+                      TimeWidget.fromString(
+                        show24hFormat: !is12period,
+                        time: iqama2!,
+                        style: TextStyle(
+                          fontSize: smallFont,
+                          fontWeight: FontWeight.w700,
+                          shadows: kHomeTextShadow,
+                          color: Colors.white,
+                          height: 1,
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              )
+            else // Original two times layout
+              Column(
+                children: [
+                  if (time.trim().isEmpty)
+                    Icon(Icons.dnd_forwardslash, size: 6.vwr)
+                  else
+                    TimeWidget.fromString(
+                      show24hFormat: !is12period,
+                      time: time,
+                      style: TextStyle(
+                        fontSize: isIqamaMoreImportant ? smallFont : bigFont,
+                        fontWeight: FontWeight.w700,
+                        shadows: kHomeTextShadow,
+                        color: Colors.white,
+                      ),
+                    ),
+                  if (iqama != null && showIqama)
+                    SizedBox(
+                      height: isArabic ? 1.5.vr : 1.3.vwr,
+                      child: Divider(
+                        thickness: 1,
+                        color: withDivider ? Colors.white : Colors.transparent,
+                      ),
+                    ),
+                  if (iqama != null && showIqama)
+                    TimeWidget.fromString(
+                      show24hFormat: !is12period,
+                      time: iqama!,
+                      style: TextStyle(
+                        fontSize: isIqamaMoreImportant ? bigFont : smallFont,
+                        fontWeight: FontWeight.bold,
+                        shadows: kHomeTextShadow,
+                        letterSpacing: 1,
+                        color: Colors.white,
+                      ),
+                    ),
+                ],
               ),
           ],
         ),

diff --git a/lib/src/pages/quran/page/quran_reading_screen.dart b/lib/src/pages/quran/page/quran_reading_screen.dart
diff --git a/lib/src/pages/quran/page/reciter_selection_screen.dart b/lib/src/pages/quran/page/reciter_selection_screen.dart
@@ -9,7 +9,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:mawaqit/const/resource.dart';
 import 'package:mawaqit/src/helpers/RelativeSizes.dart';
-import 'package:mawaqit/src/pages/quran/page/quran_reading_screen.dart';
 import 'package:mawaqit/src/pages/quran/page/schedule_screen.dart';
 import 'package:mawaqit/src/pages/quran/widget/recite_type_grid_view.dart';
 import 'package:mawaqit/src/services/theme_manager.dart';