diff --git a/lib/models/prayers_widget_model.dart b/lib/models/prayers_widget_model.dart index c643745..447a819 100644 --- a/lib/models/prayers_widget_model.dart +++ b/lib/models/prayers_widget_model.dart @@ -19,7 +19,7 @@ class PrayersWidgetModel { PrayersWidgetModel.fromJson(Map json) { fajr = dateTimeConversion(json['dateFor'], json['fajr']); sunrise = json['sunrise']; - dhuhr = dateTimeConversion(json['dateFor'], getDhuhrData(json), isForDhuhr: true); + dhuhr = dateTimeConversion(json['dateFor'], json['dhuhr']); asr = dateTimeConversion(json['dateFor'], json['asr']); sunset = json['sunset']; maghrib = dateTimeConversion(json['dateFor'], json['maghrib']); @@ -31,15 +31,8 @@ class PrayersWidgetModel { dateFor = json['dateFor']; } - static String getDhuhrData(dynamic json) { - return (json['dhuhr'] as String).contains('PM') ? json['dhuhr'] : json['dhuhr'] + ' PM'; - } - - static dateTimeConversion(String date, String time, {bool isForDhuhr = false}) { - if (isForDhuhr) { - return DateFormat('DD MMM yyyy hh:mm a').parse("$date $time").millisecondsSinceEpoch; - } - return DateFormat('DD MMM yyyy hh:mm').parse("$date $time").millisecondsSinceEpoch; + static dateTimeConversion(String date, String time) { + return DateFormat('dd MMM yyyy HH:mm').parse("$date $time").millisecondsSinceEpoch; } @override diff --git a/pubspec.lock b/pubspec.lock index 4a126a7..4f03401 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" connectivity_plus: dependency: "direct main" description: @@ -260,18 +260,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -548,7 +548,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: @@ -577,10 +577,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" stream_channel: dependency: transitive description: @@ -593,10 +593,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" term_glyph: dependency: transitive description: @@ -609,10 +609,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.3" tuple: dependency: transitive description: @@ -673,10 +673,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.0" wakelock_plus: dependency: "direct main" description: