From bf9e1742636ce1b007ebdde0545465cfc7f07cc6 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Fri, 7 Jun 2024 13:19:41 -0700 Subject: [PATCH 01/13] remove v1 embedding references --- README.md | 1 - .../AwesomeNotificationsPlugin.java | 16 ---------------- .../FlutterBitmapUtils.java | 6 ++++-- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 963aa62f..4b6b9b38 100644 --- a/README.md +++ b/README.md @@ -1561,7 +1561,6 @@ Here's an example of how to add these properties to your `AndroidManifest.xml` f content) { private final StringUtils stringUtils = StringUtils.getInstance(); - // https://flutter.dev/docs/development/packages-and-plugins/plugin-api-migration - // FOR OLDER FLUTTER VERSIONS (1.11 releases and bellow) - public static void registerWith(Registrar registrar) { - - AwesomeNotificationsPlugin awesomeNotificationsPlugin - = new AwesomeNotificationsPlugin(); - - awesomeNotificationsPlugin.AttachAwesomeNotificationsPlugin( - registrar.context(), - new MethodChannel( - registrar.messenger(), - Definitions.CHANNEL_FLUTTER_PLUGIN - )); - } - // FOR NEWER FLUTTER VERSIONS (1.12 releases and above) @Override public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) { diff --git a/android/src/main/java/me/carda/awesome_notifications/FlutterBitmapUtils.java b/android/src/main/java/me/carda/awesome_notifications/FlutterBitmapUtils.java index 88c0051c..97a075dc 100644 --- a/android/src/main/java/me/carda/awesome_notifications/FlutterBitmapUtils.java +++ b/android/src/main/java/me/carda/awesome_notifications/FlutterBitmapUtils.java @@ -9,7 +9,7 @@ import java.io.InputStream; -import io.flutter.view.FlutterMain; +import io.flutter.FlutterInjector; import me.carda.awesome_notifications.core.utils.BitmapUtils; public class FlutterBitmapUtils extends BitmapUtils { @@ -43,7 +43,9 @@ public Bitmap getBitmapFromAsset(Context context, String bitmapPath) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { inputStream = context.getAssets().open("flutter_assets/" + bitmapPath); } else { - String assetLookupKey = FlutterMain.getLookupKeyForAsset(bitmapPath); + String assetLookupKey = FlutterInjector.instance() + .flutterLoader() + .getLookupKeyForAsset(bitmapPath); AssetManager assetManager = context.getAssets(); AssetFileDescriptor assetFileDescriptor = assetManager.openFd(assetLookupKey); inputStream = assetFileDescriptor.createInputStream(); From 13359a71c9bffa6c454dba4060fb6bb9e8408728 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Fri, 7 Jun 2024 13:23:37 -0700 Subject: [PATCH 02/13] changelog+pubspec --- CHANGELOG.md | 5 ++++- pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bf8c16a..8fb2d32d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## [0.9.3+1] - 2024-07-06 +### Removes references to Flutter v1 android embedding classes. + ## [0.9.3+1] - 2024-15-03 ### Transition Support from Github to Discord Community - **GitHub Issues Closure**: Effective immediately, GitHub issues will no longer be open for new support requests. Existing issues will remain accessible as an archive and resource. @@ -431,4 +434,4 @@ * Adjusting the plugin content to pub.dev patterns ## [0.0.1] -* Initial release. \ No newline at end of file +* Initial release. diff --git a/pubspec.yaml b/pubspec.yaml index cff6954c..d459b16b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: awesome_notifications description: A complete solution to create Local and Push Notifications, customizing buttons, images, sounds, emoticons and applying many different layouts for Flutter apps. -version: 0.9.3+1 +version: 0.9.3+2 repository: https://github.com/rafaelsetragni/awesome_notifications homepage: https://discord.awesome-notifications.carda.me/ From 8c69523cc3b532ae546fd2d71528d78421e6c344 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Fri, 7 Jun 2024 13:31:12 -0700 Subject: [PATCH 03/13] fix changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fb2d32d..02a745cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## [0.9.3+1] - 2024-07-06 +## [0.9.3+2] - 2024-07-06 ### Removes references to Flutter v1 android embedding classes. ## [0.9.3+1] - 2024-15-03 From d148944edb000c4687c2df40382c0957d117c999 Mon Sep 17 00:00:00 2001 From: Rafael Setragni Date: Tue, 15 Oct 2024 09:11:32 -0300 Subject: [PATCH 04/13] Upgrade dependencies and update Android projects to Flutter 3.24 standard In this commit, we've updated the main plugin and the example application dependencies to their latest versions to leverage recent improvements and ensure compatibility with current standards. Additionally, the Android native projects have been converted to the new Flutter 3.24 Java Gradle standard. This transition aligns our development practices with the latest Flutter recommendations and enhances build performance and reliability, avoiding deprecated methods. --- .dart_tool/extension_discovery/README.md | 31 ++ .dart_tool/extension_discovery/vs_code.json | 1 + .dart_tool/package_config.json | 119 +++--- .dart_tool/package_config_subset | 160 +++++---- .dart_tool/version | 2 +- .idea/caches/deviceStreaming.xml | 329 +++++++++++++++++ .idea/misc.xml | 2 +- .idea/runConfigurations.xml | 13 + .idea/workspace.xml | 340 +++++------------- android/build.gradle | 29 +- android/consumer-rules.pro | 28 ++ android/src/main/AndroidManifest.xml | 5 +- example/.metadata | 30 ++ example/android/.gitignore | 2 +- example/android/app/build.gradle | 71 ++-- example/android/app/proguard-rules.pro | 29 ++ .../android/app/src/debug/AndroidManifest.xml | 3 +- .../android/app/src/main/AndroidManifest.xml | 20 +- .../MainActivity.java | 6 - .../kotlin/me/carda/example/MainActivity.kt | 5 + .../app/src/profile/AndroidManifest.xml | 3 +- example/android/build.gradle | 17 +- example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/settings.gradle | 39 +- example/pubspec.lock | 254 ++++++------- example/pubspec.yaml | 22 +- pubspec.lock | 121 ++++--- pubspec.yaml | 6 +- 29 files changed, 997 insertions(+), 694 deletions(-) create mode 100644 .dart_tool/extension_discovery/README.md create mode 100644 .dart_tool/extension_discovery/vs_code.json create mode 100644 .idea/caches/deviceStreaming.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 android/consumer-rules.pro create mode 100644 example/.metadata create mode 100644 example/android/app/proguard-rules.pro delete mode 100644 example/android/app/src/main/java/me/carda/awesome_notifications_example/MainActivity.java create mode 100644 example/android/app/src/main/kotlin/me/carda/example/MainActivity.kt diff --git a/.dart_tool/extension_discovery/README.md b/.dart_tool/extension_discovery/README.md new file mode 100644 index 00000000..9dc6757b --- /dev/null +++ b/.dart_tool/extension_discovery/README.md @@ -0,0 +1,31 @@ +Extension Discovery Cache +========================= + +This folder is used by `package:extension_discovery` to cache lists of +packages that contains extensions for other packages. + +DO NOT USE THIS FOLDER +---------------------- + + * Do not read (or rely) the contents of this folder. + * Do write to this folder. + +If you're interested in the lists of extensions stored in this folder use the +API offered by package `extension_discovery` to get this information. + +If this package doesn't work for your use-case, then don't try to read the +contents of this folder. It may change, and will not remain stable. + +Use package `extension_discovery` +--------------------------------- + +If you want to access information from this folder. + +Feel free to delete this folder +------------------------------- + +Files in this folder act as a cache, and the cache is discarded if the files +are older than the modification time of `.dart_tool/package_config.json`. + +Hence, it should never be necessary to clear this cache manually, if you find a +need to do please file a bug. diff --git a/.dart_tool/extension_discovery/vs_code.json b/.dart_tool/extension_discovery/vs_code.json new file mode 100644 index 00000000..07b03ad1 --- /dev/null +++ b/.dart_tool/extension_discovery/vs_code.json @@ -0,0 +1 @@ +{"version":2,"entries":[{"package":"awesome_notifications","rootUri":"../","packageUri":"lib/"}]} \ No newline at end of file diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 7764936e..ba34ab31 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -3,21 +3,27 @@ "packages": [ { "name": "_fe_analyzer_shared", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-61.0.0", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-72.0.0", "packageUri": "lib/", - "languageVersion": "2.17" + "languageVersion": "3.3" + }, + { + "name": "_macros", + "rootUri": "file:///Users/rafaelsetragni/Development/flutter/bin/cache/dart-sdk/pkg/_macros", + "packageUri": "lib/", + "languageVersion": "3.4" }, { "name": "analyzer", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/analyzer-5.13.0", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/analyzer-6.7.0", "packageUri": "lib/", - "languageVersion": "2.19" + "languageVersion": "3.3" }, { "name": "args", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/args-2.4.0", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/args-2.5.0", "packageUri": "lib/", - "languageVersion": "2.18" + "languageVersion": "3.0" }, { "name": "async", @@ -33,9 +39,9 @@ }, { "name": "build", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/build-2.3.1", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/build-2.4.1", "packageUri": "lib/", - "languageVersion": "2.17" + "languageVersion": "2.19" }, { "name": "built_collection", @@ -45,9 +51,9 @@ }, { "name": "built_value", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/built_value-8.4.4", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/built_value-8.9.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "3.0" }, { "name": "characters", @@ -63,9 +69,9 @@ }, { "name": "code_builder", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/code_builder-4.6.0", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/code_builder-4.10.0", "packageUri": "lib/", - "languageVersion": "2.19" + "languageVersion": "3.0" }, { "name": "collection", @@ -81,15 +87,15 @@ }, { "name": "crypto", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/crypto-3.0.2", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/crypto-3.0.5", "packageUri": "lib/", - "languageVersion": "2.14" + "languageVersion": "3.4" }, { "name": "dart_style", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/dart_style-2.3.0", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/dart_style-2.3.7", "packageUri": "lib/", - "languageVersion": "2.19" + "languageVersion": "3.0" }, { "name": "fake_async", @@ -99,9 +105,9 @@ }, { "name": "file", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/file-6.1.4", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/file-7.0.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "3.0" }, { "name": "fixnum", @@ -113,19 +119,19 @@ "name": "flutter", "rootUri": "file:///Users/rafaelsetragni/Development/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "3.2" + "languageVersion": "3.3" }, { "name": "flutter_lints", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/flutter_lints-3.0.1", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/flutter_lints-5.0.0", "packageUri": "lib/", - "languageVersion": "3.0" + "languageVersion": "3.5" }, { "name": "flutter_test", "rootUri": "file:///Users/rafaelsetragni/Development/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "3.2" + "languageVersion": "3.3" }, { "name": "flutter_web_plugins", @@ -135,9 +141,9 @@ }, { "name": "glob", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/glob-2.1.1", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/glob-2.1.2", "packageUri": "lib/", - "languageVersion": "2.15" + "languageVersion": "2.19" }, { "name": "intl", @@ -147,33 +153,39 @@ }, { "name": "leak_tracker", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker-10.0.0", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker-10.0.5", "packageUri": "lib/", - "languageVersion": "3.1" + "languageVersion": "3.2" }, { "name": "leak_tracker_flutter_testing", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-2.0.1", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.5", "packageUri": "lib/", - "languageVersion": "3.1" + "languageVersion": "3.2" }, { "name": "leak_tracker_testing", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_testing-2.0.1", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.1", "packageUri": "lib/", - "languageVersion": "3.1" + "languageVersion": "3.2" }, { "name": "lints", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/lints-3.0.0", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/lints-5.0.0", "packageUri": "lib/", - "languageVersion": "3.0" + "languageVersion": "3.5" }, { "name": "logging", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/logging-1.1.1", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/logging-1.2.0", "packageUri": "lib/", - "languageVersion": "2.18" + "languageVersion": "2.19" + }, + { + "name": "macros", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/macros-0.1.2-main.4", + "packageUri": "lib/", + "languageVersion": "3.4" }, { "name": "matcher", @@ -183,13 +195,13 @@ }, { "name": "material_color_utilities", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/material_color_utilities-0.8.0", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "meta", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/meta-1.11.0", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/meta-1.15.0", "packageUri": "lib/", "languageVersion": "2.12" }, @@ -201,7 +213,7 @@ }, { "name": "mocktail", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mocktail-1.0.3", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mocktail-1.0.4", "packageUri": "lib/", "languageVersion": "2.12" }, @@ -225,7 +237,7 @@ }, { "name": "pub_semver", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/pub_semver-2.1.3", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/pub_semver-2.1.4", "packageUri": "lib/", "languageVersion": "2.17" }, @@ -237,9 +249,9 @@ }, { "name": "source_gen", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/source_gen-1.2.7", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/source_gen-1.5.0", "packageUri": "lib/", - "languageVersion": "2.18" + "languageVersion": "3.0" }, { "name": "source_span", @@ -273,15 +285,15 @@ }, { "name": "test_api", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/test_api-0.6.1", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/test_api-0.7.2", "packageUri": "lib/", - "languageVersion": "3.0" + "languageVersion": "3.2" }, { "name": "typed_data", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/typed_data-1.3.1", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/typed_data-1.3.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "vector_math", @@ -291,21 +303,21 @@ }, { "name": "vm_service", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/vm_service-13.0.0", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/vm_service-14.2.5", "packageUri": "lib/", - "languageVersion": "3.0" + "languageVersion": "3.3" }, { "name": "watcher", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/watcher-1.0.2", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/watcher-1.1.0", "packageUri": "lib/", - "languageVersion": "2.14" + "languageVersion": "3.0" }, { "name": "yaml", - "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/yaml-3.1.1", + "rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/yaml-3.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.19" }, { "name": "awesome_notifications", @@ -314,7 +326,10 @@ "languageVersion": "2.19" } ], - "generated": "2024-03-17T12:33:44.911585Z", + "generated": "2024-10-14T18:20:57.126317Z", "generator": "pub", - "generatorVersion": "3.3.1" + "generatorVersion": "3.5.3", + "flutterRoot": "file:///Users/rafaelsetragni/Development/flutter", + "flutterVersion": "3.24.3", + "pubCache": "file:///Users/rafaelsetragni/.pub-cache" } diff --git a/.dart_tool/package_config_subset b/.dart_tool/package_config_subset index 95a83782..292959a6 100644 --- a/.dart_tool/package_config_subset +++ b/.dart_tool/package_config_subset @@ -1,15 +1,15 @@ _fe_analyzer_shared -2.17 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-61.0.0/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-61.0.0/lib/ +3.3 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-72.0.0/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-72.0.0/lib/ analyzer -2.19 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/analyzer-5.13.0/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/analyzer-5.13.0/lib/ +3.3 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/analyzer-6.7.0/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/analyzer-6.7.0/lib/ args -2.18 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/args-2.4.0/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/args-2.4.0/lib/ +3.0 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/args-2.5.0/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/args-2.5.0/lib/ async 2.18 file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/async-2.11.0/ @@ -19,17 +19,17 @@ boolean_selector file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1/ file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1/lib/ build -2.17 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/build-2.3.1/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/build-2.3.1/lib/ +2.19 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/build-2.4.1/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/build-2.4.1/lib/ built_collection 2.12 file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/built_collection-5.1.1/ file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/built_collection-5.1.1/lib/ built_value -2.12 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/built_value-8.4.4/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/built_value-8.4.4/lib/ +3.0 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/built_value-8.9.2/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/built_value-8.9.2/lib/ characters 2.12 file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/characters-1.3.0/ @@ -39,9 +39,9 @@ clock file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/clock-1.1.1/ file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/clock-1.1.1/lib/ code_builder -2.19 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/code_builder-4.6.0/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/code_builder-4.6.0/lib/ +3.0 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/code_builder-4.10.0/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/code_builder-4.10.0/lib/ collection 2.18 file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/collection-1.18.0/ @@ -51,77 +51,81 @@ convert file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/convert-3.1.1/ file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/convert-3.1.1/lib/ crypto -2.14 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/crypto-3.0.2/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/crypto-3.0.2/lib/ +3.4 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/crypto-3.0.5/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/crypto-3.0.5/lib/ dart_style -2.19 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/dart_style-2.3.0/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/dart_style-2.3.0/lib/ +3.0 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/dart_style-2.3.7/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/dart_style-2.3.7/lib/ fake_async 2.12 file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/fake_async-1.3.1/ file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/fake_async-1.3.1/lib/ file -2.12 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/file-6.1.4/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/file-6.1.4/lib/ +3.0 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/file-7.0.0/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/file-7.0.0/lib/ fixnum 2.19 file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/fixnum-1.1.0/ file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/fixnum-1.1.0/lib/ flutter_lints -3.0 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/flutter_lints-3.0.1/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/flutter_lints-3.0.1/lib/ +3.5 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/flutter_lints-5.0.0/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/flutter_lints-5.0.0/lib/ glob -2.15 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/glob-2.1.1/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/glob-2.1.1/lib/ +2.19 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/glob-2.1.2/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/glob-2.1.2/lib/ intl 3.0 file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/intl-0.19.0/ file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/intl-0.19.0/lib/ leak_tracker -3.1 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker-10.0.0/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker-10.0.0/lib/ +3.2 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker-10.0.5/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker-10.0.5/lib/ leak_tracker_flutter_testing -3.1 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-2.0.1/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-2.0.1/lib/ +3.2 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.5/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-3.0.5/lib/ leak_tracker_testing -3.1 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_testing-2.0.1/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_testing-2.0.1/lib/ +3.2 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.1/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_testing-3.0.1/lib/ lints -3.0 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/lints-3.0.0/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/lints-3.0.0/lib/ +3.5 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/lints-5.0.0/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/lints-5.0.0/lib/ logging -2.18 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/logging-1.1.1/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/logging-1.1.1/lib/ +2.19 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/logging-1.2.0/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/logging-1.2.0/lib/ +macros +3.4 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/macros-0.1.2-main.4/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/macros-0.1.2-main.4/lib/ matcher 3.0 file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/matcher-0.12.16+1/ file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/matcher-0.12.16+1/lib/ material_color_utilities 2.17 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/material_color_utilities-0.8.0/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/material_color_utilities-0.8.0/lib/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/material_color_utilities-0.11.1/lib/ meta 2.12 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/meta-1.11.0/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/meta-1.11.0/lib/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/meta-1.15.0/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/meta-1.15.0/lib/ mockito 3.1 file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mockito-5.4.4/ file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mockito-5.4.4/lib/ mocktail 2.12 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mocktail-1.0.3/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mocktail-1.0.3/lib/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mocktail-1.0.4/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mocktail-1.0.4/lib/ package_config 2.12 file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/package_config-2.1.0/ @@ -136,12 +140,12 @@ file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/plugin_platform_interface file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8/lib/ pub_semver 2.17 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/pub_semver-2.1.3/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/pub_semver-2.1.3/lib/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/pub_semver-2.1.4/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/pub_semver-2.1.4/lib/ source_gen -2.18 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/source_gen-1.2.7/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/source_gen-1.2.7/lib/ +3.0 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/source_gen-1.5.0/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/source_gen-1.5.0/lib/ source_span 2.18 file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/source_span-1.10.0/ @@ -163,39 +167,43 @@ term_glyph file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/ file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/lib/ test_api -3.0 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/test_api-0.6.1/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/test_api-0.6.1/lib/ +3.2 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/test_api-0.7.2/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/test_api-0.7.2/lib/ typed_data -2.12 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/typed_data-1.3.1/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/typed_data-1.3.1/lib/ +2.17 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/typed_data-1.3.2/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/typed_data-1.3.2/lib/ vector_math 2.14 file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/vector_math-2.1.4/ file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/vector_math-2.1.4/lib/ vm_service -3.0 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/vm_service-13.0.0/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/vm_service-13.0.0/lib/ +3.3 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/vm_service-14.2.5/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/vm_service-14.2.5/lib/ watcher -2.14 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/watcher-1.0.2/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/watcher-1.0.2/lib/ +3.0 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/watcher-1.1.0/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/watcher-1.1.0/lib/ yaml -2.12 -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/yaml-3.1.1/ -file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/yaml-3.1.1/lib/ +2.19 +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/yaml-3.1.2/ +file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/yaml-3.1.2/lib/ +_macros +3.4 +file:///Users/rafaelsetragni/Development/flutter/bin/cache/dart-sdk/pkg/_macros/ +file:///Users/rafaelsetragni/Development/flutter/bin/cache/dart-sdk/pkg/_macros/lib/ sky_engine 3.2 file:///Users/rafaelsetragni/Development/flutter/bin/cache/pkg/sky_engine/ file:///Users/rafaelsetragni/Development/flutter/bin/cache/pkg/sky_engine/lib/ flutter -3.2 +3.3 file:///Users/rafaelsetragni/Development/flutter/packages/flutter/ file:///Users/rafaelsetragni/Development/flutter/packages/flutter/lib/ flutter_test -3.2 +3.3 file:///Users/rafaelsetragni/Development/flutter/packages/flutter_test/ file:///Users/rafaelsetragni/Development/flutter/packages/flutter_test/lib/ flutter_web_plugins diff --git a/.dart_tool/version b/.dart_tool/version index e1c807ff..ffba2c8d 100644 --- a/.dart_tool/version +++ b/.dart_tool/version @@ -1 +1 @@ -3.19.3 \ No newline at end of file +3.24.3 \ No newline at end of file diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml new file mode 100644 index 00000000..821dc38d --- /dev/null +++ b/.idea/caches/deviceStreaming.xml @@ -0,0 +1,329 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 374f537c..a24cfdff 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,5 @@ - + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..931b96c3 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 65ee44bc..e4dcb2f3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,21 +1,61 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index d3995978..ea023991 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ group 'me.carda.awesome_notifications' -version '0.9.3' +version '0.10.0' buildscript { repositories { @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.0' + classpath 'com.android.tools.build:gradle:8.1.1' } } @@ -35,29 +35,30 @@ android { } defaultConfig { - minSdkVersion 21 + minSdkVersion 23 targetSdk 34 testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' + consumerProguardFiles "consumer-rules.pro" } } dependencies { // implementation project(':awn_core') - implementation 'me.carda:AndroidAwnCore:[0.9.3, 0.10.0)' + implementation 'me.carda:AndroidAwnCore:0.10.0' implementation 'com.google.guava:guava:32.1.3-android' // Required for instrumented tests testImplementation 'junit:junit:4.13.2' testImplementation 'androidx.arch.core:core-testing:2.2.0' - testImplementation 'org.mockito:mockito-core:5.1.1' - testImplementation 'org.mockito:mockito-inline:5.0.0' - - androidTestImplementation 'androidx.annotation:annotation:1.7.1' - androidTestImplementation 'org.mockito:mockito-core:5.1.1' - androidTestImplementation 'org.mockito:mockito-inline:5.0.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test:runner:1.5.2' - androidTestImplementation 'androidx.test:core:1.5.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' + testImplementation 'org.mockito:mockito-core:5.3.1' + testImplementation 'org.mockito:mockito-inline:5.2.0' + + androidTestImplementation 'androidx.annotation:annotation:1.8.2' + androidTestImplementation 'org.mockito:mockito-core:5.3.1' + androidTestImplementation 'org.mockito:mockito-inline:5.2.0' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test:runner:1.6.2' + androidTestImplementation 'androidx.test:core:1.6.1' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' } diff --git a/android/consumer-rules.pro b/android/consumer-rules.pro new file mode 100644 index 00000000..1e851741 --- /dev/null +++ b/android/consumer-rules.pro @@ -0,0 +1,28 @@ +# Keep necessary SQLite and SQLCipher classes +-keep class org.sqlite.** { *; } +-keep class org.sqlite.database.** { *; } +-keep,includedescriptorclasses class net.sqlcipher.** { *; } +-keep,includedescriptorclasses interface net.sqlcipher.** { *; } + +# Keep all public (models) classes in awesome packages +-keep public class me.carda.** { *; } + +# Gson uses generic type information stored in a class file when working with fields. Proguard +# removes such information by default, so configure it to keep all of it. +-keepattributes Signature + +# Gson specific classes +-dontwarn sun.misc.** +-keep class com.google.gson.stream.** { *; } + +# Application classes that will be serialized/deserialized over Gson +-keep class com.google.gson.examples.android.model.** { ; } + +# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher. +-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken +-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken + +# Prevent R8 from nullifying Data object members annotated with SerializedName +-keepclassmembers,allowobfuscation class * { + @com.google.gson.annotations.SerializedName ; +} \ No newline at end of file diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index be626852..7c5dd3cd 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,10 +1,7 @@ - - + - - diff --git a/example/.metadata b/example/.metadata new file mode 100644 index 00000000..c689480b --- /dev/null +++ b/example/.metadata @@ -0,0 +1,30 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "2663184aa79047d0a33a14a3b607954f8fdd8730" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 + base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 + - platform: android + create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 + base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/example/android/.gitignore b/example/android/.gitignore index 6f568019..55afd919 100644 --- a/example/android/.gitignore +++ b/example/android/.gitignore @@ -7,7 +7,7 @@ gradle-wrapper.jar GeneratedPluginRegistrant.java # Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +# See https://flutter.dev/to/reference-keystore key.properties **/*.keystore **/*.jks diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 4075bada..c7f0a839 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,60 +1,59 @@ -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' +plugins { + id "com.android.application" + id "kotlin-android" + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id "dev.flutter.flutter-gradle-plugin" } -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace 'me.carda.awesome_notifications_example' - compileSdkVersion 34 //flutter.compileSdkVersion - ndkVersion flutter.ndkVersion + compileSdk = 34 //flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 } defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "me.carda.awesome_notifications_example" // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion 21 //flutter.minSdkVersion - targetSdkVersion 34 //flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = 23 //flutter.minSdkVersion + targetSdk = 34 //flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName } buildTypes { release { // TODO: Add your own signing config for the release build. // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug + signingConfig = signingConfigs.debug + + debuggable false + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + + } + profile { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.debug + + debuggable false + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } } } flutter { - source '../..' + source = "../.." } diff --git a/example/android/app/proguard-rules.pro b/example/android/app/proguard-rules.pro new file mode 100644 index 00000000..e9fcc71c --- /dev/null +++ b/example/android/app/proguard-rules.pro @@ -0,0 +1,29 @@ +# https://github.com/flutter/flutter/issues/78625#issuecomment-804164524 +#-keep class io.flutter.app.** { *; } +-keep class io.flutter.plugin.** { *; } +-keep class io.flutter.util.** { *; } +-keep class io.flutter.view.** { *; } +#-keep class io.flutter.** { *; } +-keep class io.flutter.plugins.** { *; } + +# Keep necessary SQLite and SQLCipher classes +-keep class org.sqlite.** { *; } +-keep class org.sqlite.database.** { *; } +-keep,includedescriptorclasses class net.sqlcipher.** { *; } +-keep,includedescriptorclasses interface net.sqlcipher.** { *; } + +# Keep all public and protected classes in awesome packages +-keep class me.carda.** { *; } + +-keep class com.google.gson.reflect.TypeToken +-keep class * extends com.google.gson.reflect.TypeToken +-keep public class * implements java.lang.reflect.Type + +# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher. +-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken +-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken + +# Keep all public and protected classes in awesome packages +-dontwarn com.google.** +-dontwarn javax.annotation.Nullable +-dontwarn javax.annotation.concurrent.GuardedBy \ No newline at end of file diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml index 07964867..399f6981 100644 --- a/example/android/app/src/debug/AndroidManifest.xml +++ b/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + - - - @@ -53,4 +50,15 @@ android:name="flutterEmbedding" android:value="2" /> + + + + + + + diff --git a/example/android/app/src/main/java/me/carda/awesome_notifications_example/MainActivity.java b/example/android/app/src/main/java/me/carda/awesome_notifications_example/MainActivity.java deleted file mode 100644 index ba285051..00000000 --- a/example/android/app/src/main/java/me/carda/awesome_notifications_example/MainActivity.java +++ /dev/null @@ -1,6 +0,0 @@ -package me.carda.awesome_notifications_example; - -import io.flutter.embedding.android.FlutterActivity; - -public class MainActivity extends FlutterActivity { -} diff --git a/example/android/app/src/main/kotlin/me/carda/example/MainActivity.kt b/example/android/app/src/main/kotlin/me/carda/example/MainActivity.kt new file mode 100644 index 00000000..769edae5 --- /dev/null +++ b/example/android/app/src/main/kotlin/me/carda/example/MainActivity.kt @@ -0,0 +1,5 @@ +package me.carda.example + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml index 07964867..399f6981 100644 --- a/example/android/app/src/profile/AndroidManifest.xml +++ b/example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - +