diff --git a/README.md b/README.md index fd91ac2..f709129 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,13 @@ Screenshot 1Screenshot 2Screenshot 3 -[Get it on Google Play](https://play.google.com/store/apps/details?id=io.github.aldrinzigmundv.mariam)[Get it on amazon appstore](https://www.amazon.com/dp/B0CNXLCZWP/) + height="63">](https://play.google.com/store/apps/details?id=io.github.aldrinzigmundv.mariam) + +[Get it on Google Play](https://www.amazon.com/dp/B0CNXLCZWP/) Or download the latest APK from the [Releases Section](https://github.com/aldrinzigmundv/mariam/releases/latest) diff --git a/android/app/build.gradle b/android/app/build.gradle index e555185..3ee185b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -52,9 +52,9 @@ android { // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 24 - targetSdkVersion 33 - versionCode 5 - versionName "2.0.6" + targetSdkVersion 34 + versionCode 6 + versionName "2.0.7" } signingConfigs { @@ -79,4 +79,6 @@ flutter { source '../..' } -dependencies {} +dependencies { + implementation "androidx.activity:activity:1.6.0-alpha05" +} diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 9793d69..328ad33 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -2,7 +2,8 @@ + android:icon="@mipmap/launcher_icon" + android:enableOnBackInvokedCallback="true"> ()!; diff --git a/lib/pages/loadingpage.dart b/lib/pages/loadingpage.dart index ec5c24c..e01bf5d 100644 --- a/lib/pages/loadingpage.dart +++ b/lib/pages/loadingpage.dart @@ -12,7 +12,9 @@ class LoadingPage extends StatefulWidget { class _LoadingPageState extends State { _startup() async { Future.delayed(const Duration(seconds: 1), () async { - goToMainPage(context: context); + if (mounted) { + goToMainPage(context: context); + } }); } diff --git a/lib/pages/mainpage.dart b/lib/pages/mainpage.dart index 94e0f69..33d999d 100644 --- a/lib/pages/mainpage.dart +++ b/lib/pages/mainpage.dart @@ -172,8 +172,8 @@ class _MainPageState extends State { onPressed: () => _letUsPray(), style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(const Color(0xFF2B4593)), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(const Color(0xFF2B4593)), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(3), ), diff --git a/lib/pages/prayerpage.dart b/lib/pages/prayerpage.dart index 0cb3082..cda4324 100644 --- a/lib/pages/prayerpage.dart +++ b/lib/pages/prayerpage.dart @@ -120,8 +120,8 @@ class _PrayerPageState extends State { onPressed: () => _navigateBack(), style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(const Color(0xFF2B4593)), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(const Color(0xFF2B4593)), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(3), ), @@ -135,8 +135,8 @@ class _PrayerPageState extends State { onPressed: () => _goToMainPage(context), style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(const Color(0xFF2B4593)), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(const Color(0xFF2B4593)), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(3), ), @@ -150,8 +150,8 @@ class _PrayerPageState extends State { onPressed: () => _navigateNext(), style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(const Color(0xFF2B4593)), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(const Color(0xFF2B4593)), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(3), ), @@ -163,4 +163,4 @@ class _PrayerPageState extends State { ], ); } -} +} \ No newline at end of file diff --git a/lib/pages/thankyoupage.dart b/lib/pages/thankyoupage.dart index c8e8859..455ab37 100644 --- a/lib/pages/thankyoupage.dart +++ b/lib/pages/thankyoupage.dart @@ -67,8 +67,8 @@ class ThankYouPage extends StatelessWidget { onPressed: () => _goToHomePressed(context), style: ButtonStyle( backgroundColor: - MaterialStateProperty.all(const Color(0xFF2B4593)), - shape: MaterialStateProperty.all( + WidgetStateProperty.all(const Color(0xFF2B4593)), + shape: WidgetStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(3), ), diff --git a/pubspec.lock b/pubspec.lock index a8dd9f7..b106866 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: archive - sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d" + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d url: "https://pub.dev" source: hosted - version: "3.4.10" + version: "3.6.1" args: dependency: transitive description: name: args - sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.5.0" async: dependency: transitive description: @@ -73,30 +73,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.18.0" - convert: - dependency: transitive - description: - name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" - url: "https://pub.dev" - source: hosted - version: "3.1.1" crypto: dependency: transitive description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "1.0.6" + version: "1.0.8" fake_async: dependency: transitive description: @@ -122,10 +114,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "4.0.0" flutter_localizations: dependency: "direct main" description: flutter @@ -140,74 +132,90 @@ packages: dependency: transitive description: name: image - sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271" + sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" url: "https://pub.dev" source: hosted - version: "4.1.3" + version: "4.2.0" intl: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" - js: + version: "0.19.0" + json_annotation: dependency: transitive description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "0.6.7" - json_annotation: + version: "4.9.0" + leak_tracker: dependency: transitive description: - name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + name: leak_tracker + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "10.0.5" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + url: "https://pub.dev" + source: hosted + version: "3.0.5" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "4.0.0" matcher: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.15.0" path: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" petitparser: dependency: transitive description: @@ -216,14 +224,6 @@ packages: url: "https://pub.dev" source: hosted version: "6.0.2" - pointycastle: - dependency: transitive - description: - name: pointycastle - sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" - url: "https://pub.dev" - source: hosted - version: "3.7.3" sky_engine: dependency: transitive description: flutter @@ -273,10 +273,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.2" typed_data: dependency: transitive description: @@ -293,22 +293,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - web: + vm_service: dependency: transitive description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + name: vm_service + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "14.2.5" widget_zoom: dependency: "direct main" description: name: widget_zoom - sha256: "2bc683a465a5ba46db6e47c885b298e21b0588400e6507832bd04adc8848bf82" + sha256: f74cb1b9969a74668db0048d3db9ddc7ec5b334d32a1f54475db56f873114550 url: "https://pub.dev" source: hosted - version: "0.0.3" + version: "0.0.4" xml: dependency: transitive description: @@ -326,5 +326,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0 <4.0.0" - flutter: ">=1.17.0" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.yaml b/pubspec.yaml index 1775063..943d13c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 + flutter_lints: ^4.0.0 flutter_launcher_icons: android: "launcher_icon" diff --git a/screenshots/screenshot1.png b/screenshots/screenshot1.png old mode 100755 new mode 100644 index 1351d86..38d4d03 Binary files a/screenshots/screenshot1.png and b/screenshots/screenshot1.png differ diff --git a/screenshots/screenshot2b.png b/screenshots/screenshot2b.png old mode 100755 new mode 100644 index d4ce5f1..254061a Binary files a/screenshots/screenshot2b.png and b/screenshots/screenshot2b.png differ diff --git a/screenshots/screenshot3b.png b/screenshots/screenshot3b.png old mode 100755 new mode 100644 index 56afda3..527645b Binary files a/screenshots/screenshot3b.png and b/screenshots/screenshot3b.png differ diff --git a/screenshots/screenshot4b.png b/screenshots/screenshot4b.png old mode 100755 new mode 100644 index cef42f4..5eb014d Binary files a/screenshots/screenshot4b.png and b/screenshots/screenshot4b.png differ diff --git a/screenshots/screenshot5b.png b/screenshots/screenshot5b.png deleted file mode 100755 index 02185d5..0000000 Binary files a/screenshots/screenshot5b.png and /dev/null differ diff --git a/screenshots/screenshot6b.png b/screenshots/screenshot6b.png deleted file mode 100755 index 181dd83..0000000 Binary files a/screenshots/screenshot6b.png and /dev/null differ