Use MyQuran Hijri calendar API for displayed date

This commit is contained in:
dwindown
2026-03-30 21:42:42 +07:00
parent ad33b01231
commit 33810bb4bd
5 changed files with 113 additions and 5 deletions

View File

@@ -31,7 +31,8 @@ class JumatScreen extends ConsumerWidget {
final timeStr = DateFormat('HH:mm').format(clock);
final secStr = DateFormat(':ss').format(clock);
final dateGregorian = DateFormat('EEEE, d MMMM yyyy', 'en').format(clock);
final dateHijri = HijriDateFormatter.format(clock);
final dateHijri =
ref.watch(hijriDateProvider).valueOrNull ?? HijriDateFormatter.format(clock);
final durToKhutbah = screenData.timeUntilNext ?? const Duration(minutes: 0);
final minToKhutbah = durToKhutbah.inMinutes;

View File

@@ -39,6 +39,8 @@ class MainScreen extends ConsumerWidget {
final timeStr = DateFormat('HH:mm').format(clock);
final secStr = DateFormat(':ss').format(clock);
final dateGregorian = DateFormat('EEEE, d MMMM yyyy', 'id').format(clock);
final dateHijri =
ref.watch(hijriDateProvider).valueOrNull ?? HijriDateFormatter.format(clock);
return Container(
color: SacredColors.background,
@@ -98,7 +100,7 @@ class MainScreen extends ConsumerWidget {
child: Column(
children: [
// ── HEADER ──
_buildHeader(context, s, fs, settings, dateGregorian),
_buildHeader(context, s, fs, settings, dateGregorian, dateHijri),
// ── CENTER: Clock + Countdown ──
Expanded(
@@ -211,9 +213,14 @@ class MainScreen extends ConsumerWidget {
);
}
Widget _buildHeader(BuildContext context, double s, double fs, AppSettings settings, String dateGregorian) {
final dateHijri = HijriDateFormatter.format(DateTime.now());
Widget _buildHeader(
BuildContext context,
double s,
double fs,
AppSettings settings,
String dateGregorian,
String dateHijri,
) {
return Padding(
padding: EdgeInsets.only(top: 24 * s, bottom: 8 * s),
child: Row(