diff --git a/.firebase/hosting.YnVpbGRcd2Vi.cache b/.firebase/hosting.YnVpbGRcd2Vi.cache index 3213fbf..091cc87 100644 --- a/.firebase/hosting.YnVpbGRcd2Vi.cache +++ b/.firebase/hosting.YnVpbGRcd2Vi.cache @@ -1,19 +1,19 @@ +favicon.png,1617721288643,972aab2dbd50a37478756fe495c39b76cf9e8a63e843c4e6c58d2414d47777e0 +google7a6f1302e20d5bf2.html,1617721288643,4c199d6aaa0596f427eae73f6730b332f46b8e8e301b1cce4e7a602f4b3f60da +manifest.json,1617721288656,10b2066c8fb0adb72d6aeefae1c3dadbf806815ce3910f7481e16a1be7f3db6f +assets/fonts/MaterialIcons-Regular.otf,1616100791559,0f68fedebd1cdda23d988dc25ac5e50b517322b79e04ed19e743bef2a4364d25 assets/packages/fluttertoast/assets/toastify.css,1613623213000,6afc6f35b72ca06962c0b9197750a2af6334c905331f080d8047b437ffa170b1 assets/packages/fluttertoast/assets/toastify.js,1613623213000,76b60b9795e3b1093a16956ede93215d4315c157c3fbc99de1483999c081eb89 assets/packages/font_awesome_flutter/lib/fonts/fa-brands-400.ttf,1608144285000,d11e6d527948ea38b3cb9b47e8cb3e89a009b061852012316476cf515cb3bcd9 assets/packages/font_awesome_flutter/lib/fonts/fa-regular-400.ttf,1608144285000,b0a2227b91cd14e8b560e6fda34676163b006e636581d5f94d991ab6d732b7b8 assets/packages/font_awesome_flutter/lib/fonts/fa-solid-900.ttf,1608144285000,7c82648fc63061e96fb61fda53e2431c15f589572d49c6e852e05b8497f3080c -favicon.png,1617721288643,972aab2dbd50a37478756fe495c39b76cf9e8a63e843c4e6c58d2414d47777e0 -google7a6f1302e20d5bf2.html,1617721288643,4c199d6aaa0596f427eae73f6730b332f46b8e8e301b1cce4e7a602f4b3f60da -index.html,1617721996326,f479f20e6fdb19dd7f80339b52ba02ad068b97f465e323f0f934e5654d5e08ff -flutter_service_worker.js,1617721996914,483a799ab3cb033f02dade7c4bb36e44fe44abac0801e157c4efc5812180f234 -manifest.json,1617721288656,10b2066c8fb0adb72d6aeefae1c3dadbf806815ce3910f7481e16a1be7f3db6f -version.json,1617721996101,0c67b0150d3970f5762648a6d2be9bc12359c7145451c086ebb3d7ec7561d328 -assets/AssetManifest.json,1617721996309,75e173826b9c18ada0928e7edd76449b7d3c8e8c44dcbc8fe1a0c9c61963a022 -assets/FontManifest.json,1617721996309,bf69dcabf1052b958c27e4eb5f1cce7fe4fa54b0246ee128fa94b33563fa0763 icons/Icon-192.png,1617721288644,429ac4b270a7cd25a78b2dbdfe849fa7613c83e38c0729c08339528219cd596f icons/Icon-512.png,1617721288646,d25eadf2975242e5736d71d235abed5bc2be58179d66a7e95d5944e470fc03cb static/logo-mpt.png,1617721288658,cfbfc8bd91ba3a9196e04812ddd34cd1ac373647875be7039e731611ec444413 -assets/NOTICES,1617721996310,c0161da6804e11c795e5b9d52c34fe6c022559cd1c06e96c6bcf1c80698f69fa -assets/fonts/MaterialIcons-Regular.otf,1616100791559,0f68fedebd1cdda23d988dc25ac5e50b517322b79e04ed19e743bef2a4364d25 -main.dart.js,1617721995489,e3e86c5d07b2a3427e15e3f740cb8bb19c65b8d6840aad19fb5835933a327dfd +index.html,1618297859455,0830d4cba470ebff887f6c4659c58f66e3a3d2ed151de241608f4d4f9fa4eb3f +version.json,1618297859078,1dde90418ef40aeb3ad038be9c3bdfcfcc6f5994dd4fff10311ce64c9ed231da +flutter_service_worker.js,1618297860071,98c1d823723e8c7202c55fab2b9c4c46a02d3b67888c13df816b4346f395079c +assets/AssetManifest.json,1618297859391,75e173826b9c18ada0928e7edd76449b7d3c8e8c44dcbc8fe1a0c9c61963a022 +assets/FontManifest.json,1618297859391,bf69dcabf1052b958c27e4eb5f1cce7fe4fa54b0246ee128fa94b33563fa0763 +assets/NOTICES,1618297859393,c0161da6804e11c795e5b9d52c34fe6c022559cd1c06e96c6bcf1c80698f69fa +main.dart.js,1618297858144,5b23789efd3e50e3b0572f1f807c9776851395b73e90e23a77b93c9daccf8ef6 diff --git a/ios/Flutter/Generated.xcconfig b/ios/Flutter/Generated.xcconfig index 504d7cc..52339b3 100644 --- a/ios/Flutter/Generated.xcconfig +++ b/ios/Flutter/Generated.xcconfig @@ -5,8 +5,8 @@ COCOAPODS_PARALLEL_CODE_SIGN=true FLUTTER_TARGET=lib\main.dart FLUTTER_BUILD_DIR=build SYMROOT=${SOURCE_ROOT}/../build\ios -FLUTTER_BUILD_NAME=1.1.7 -FLUTTER_BUILD_NUMBER=7 +FLUTTER_BUILD_NAME=1.1.8 +FLUTTER_BUILD_NUMBER=9 EXCLUDED_ARCHS[sdk=iphonesimulator*]=arm64 i386 DART_OBFUSCATION=false TRACK_WIDGET_CREATION=false diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh index cb77ea5..aed28cd 100644 --- a/ios/Flutter/flutter_export_environment.sh +++ b/ios/Flutter/flutter_export_environment.sh @@ -6,8 +6,8 @@ export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "FLUTTER_TARGET=lib\main.dart" export "FLUTTER_BUILD_DIR=build" export "SYMROOT=${SOURCE_ROOT}/../build\ios" -export "FLUTTER_BUILD_NAME=1.1.7" -export "FLUTTER_BUILD_NUMBER=7" +export "FLUTTER_BUILD_NAME=1.1.8" +export "FLUTTER_BUILD_NUMBER=9" export "DART_OBFUSCATION=false" export "TRACK_WIDGET_CREATION=false" export "TREE_SHAKE_ICONS=false" diff --git a/lib/CONSTANTS.dart b/lib/CONSTANTS.dart index 5755671..898a1c4 100644 --- a/lib/CONSTANTS.dart +++ b/lib/CONSTANTS.dart @@ -6,7 +6,6 @@ const kPayloadDebug = 'payloadDebug'; const kStoredGlobalIndex = "storedGlobalIndex"; const kStoredFirstRun = "storedFirstRunApp"; const kStoredTimeIs12 = "storedTimeFormat"; -const kStoredLocationLocality = "storedLocationLocality"; const kStoredShowOtherPrayerTime = "storedshowothertime"; const kStoredApiPrayerCall = "storedApiPrayCall"; const kFontSize = "storedFontSize"; diff --git a/lib/utils/copyAndShare.dart b/lib/utils/copyAndShare.dart index dc2d3b5..1a99487 100644 --- a/lib/utils/copyAndShare.dart +++ b/lib/utils/copyAndShare.dart @@ -9,7 +9,7 @@ import 'location/locationDatabase.dart'; class CopyAndShare { static String getMessage({int type = 1}) { var hijriToday = - HijriCalendar.fromDate(DateTime.now().subtract(Duration(days: 1))) + HijriCalendar.fromDate(DateTime.now().subtract(Duration.zero)) .toFormat('dd MMMM yyyy'); var dayFormat = DateFormat('EEEE').format(DateTime.now()).toUpperCase(); var dateFormat = DateFormat('dd MMMM yyyy').format(DateTime.now()); diff --git a/lib/views/ZoneChooser.dart b/lib/views/ZoneChooser.dart index c0453b4..309fc23 100644 --- a/lib/views/ZoneChooser.dart +++ b/lib/views/ZoneChooser.dart @@ -36,8 +36,8 @@ class _LocationChooserState extends State { return ScaffoldMessenger.of(context).showSnackBar( SnackBar( behavior: SnackBarBehavior.floating, - content: Text( - 'Please update your location (if necessary) by tapping JHR 01 button above'), + content: + Text('Use the blue button on the top to update your location'), duration: Duration(seconds: 7), action: SnackBarAction( label: 'Got it!', diff --git a/lib/views/appBody.dart b/lib/views/appBody.dart index 8b2419f..a4326c1 100644 --- a/lib/views/appBody.dart +++ b/lib/views/appBody.dart @@ -8,8 +8,7 @@ import 'GetPrayerTime.dart'; import 'ZoneChooser.dart'; class AppBody extends StatelessWidget { - final _hijriToday = - HijriCalendar.fromDate(DateTime.now().add(Duration(days: -1))); + final _hijriToday = HijriCalendar.fromDate(DateTime.now().add(Duration.zero)); final _dayFormat = DateFormat('EEEE').format(DateTime.now()); final dateFormat = DateFormat('dd MMM yyyy').format(DateTime.now()); diff --git a/lib/views/feedbackPage.dart b/lib/views/feedbackPage.dart index 1c8c4c2..9449b00 100644 --- a/lib/views/feedbackPage.dart +++ b/lib/views/feedbackPage.dart @@ -58,7 +58,6 @@ class _FeedbackPageState extends State { TextEditingController messageController = TextEditingController(); var prayApiCalled = GetStorage().read(kStoredApiPrayerCall) ?? 'no calls'; - var locApiCalled = GetStorage().read(kStoredLocationLocality) ?? 'no calls'; @override void initState() { @@ -85,15 +84,12 @@ class _FeedbackPageState extends State { print('Pressed send'); if (_logIsChecked) { feedbackToEmail.debugLogSetter(''' - ----------------------APP-------------------------- - -- ---------------------DEVICE--------------------- isWeb? $kIsWeb Screen size ${MediaQuery.of(context).size.toString().substring(4)} DiP PixRatio ${MediaQuery.of(context).devicePixelRatio} Last prayer api called: $prayApiCalled , - Location get: $locApiCalled , '''); } diff --git a/pubspec.yaml b/pubspec.yaml index c46c863..9d15675 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: App waktu solat seluruh Malaysia publish_to: "none" -version: 1.1.7-web+7 +version: 1.1.8-web+9 environment: sdk: ">=2.7.0 <3.0.0" diff --git a/web/index.html b/web/index.html index 04529b9..2741e99 100644 --- a/web/index.html +++ b/web/index.html @@ -45,7 +45,7 @@ - +