From 414ca2d49f078d84f6c3c403a33c5aa5f466a104 Mon Sep 17 00:00:00 2001 From: Pedro Massango Date: Wed, 17 Jul 2019 02:10:35 +0100 Subject: [PATCH 1/5] Added support to launch Location Settings Configuration Activity --- .../android_alarm_manager.iml | 11 +++--- packages/android_intent/README.md | 1 + .../androidintent/AndroidIntentPlugin.java | 2 + packages/android_intent/example/lib/main.dart | 11 ++++++ packages/camera/camera.iml | 6 ++- packages/connectivity/connectivity.iml | 17 +++++++-- packages/device_info/device_info.iml | 11 ++++-- packages/firebase_admob/firebase_admob.iml | 11 ++++-- packages/firebase_core/firebase_core.iml | 8 ++-- .../firebase_dynamic_links.iml | 3 +- .../firebase_messaging/firebase_messaging.iml | 38 +++---------------- .../firebase_performance.iml | 3 +- .../firebase_remote_config.iml | 5 +-- packages/in_app_purchase/in_app_purchase.iml | 11 ++++-- packages/local_auth/local_auth.iml | 11 ++++-- packages/package_info/package_info.iml | 11 ++++-- packages/quick_actions/quick_actions.iml | 11 ++++-- packages/video_player/video_player.iml | 8 ++-- 18 files changed, 98 insertions(+), 81 deletions(-) diff --git a/packages/android_alarm_manager/android_alarm_manager.iml b/packages/android_alarm_manager/android_alarm_manager.iml index 4fe26707b4fb..55d90fcdd7f8 100644 --- a/packages/android_alarm_manager/android_alarm_manager.iml +++ b/packages/android_alarm_manager/android_alarm_manager.iml @@ -1,19 +1,18 @@ - + - - + - + + - - + \ No newline at end of file diff --git a/packages/android_intent/README.md b/packages/android_intent/README.md index 37278707e4b1..273383628ca0 100644 --- a/packages/android_intent/README.md +++ b/packages/android_intent/README.md @@ -26,6 +26,7 @@ If a standard android action is required, the recommendation is to add support for it in the plugin and use an action constant to refer to it. For instance: `'action_view'` translates to `android.os.Intent.ACTION_VIEW` +`'action_location_source_settings'` translates to `android.settings.LOCATION_SOURCE_SETTINGS` Feel free to add support for additional Android intents. diff --git a/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java b/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java index 87689362d973..9c924d6fa524 100644 --- a/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java +++ b/packages/android_intent/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java @@ -44,6 +44,8 @@ private String convertAction(String action) { return Intent.ACTION_VOICE_COMMAND; case "settings": return Settings.ACTION_SETTINGS; + case "action_location_source_settings": + return Settings.ACTION_LOCATION_SOURCE_SETTINGS; default: return action; } diff --git a/packages/android_intent/example/lib/main.dart b/packages/android_intent/example/lib/main.dart index 07d2e99438ff..92747c4b8686 100644 --- a/packages/android_intent/example/lib/main.dart +++ b/packages/android_intent/example/lib/main.dart @@ -125,6 +125,12 @@ class ExplicitIntentsWidget extends StatelessWidget { intent.launch(); } + void _openLocationSettingsConfiguration(){ + final AndroidIntent intent = const AndroidIntent( + action: 'action_location_source_settings',); + intent.launch(); + } + @override Widget build(BuildContext context) { return Scaffold( @@ -160,6 +166,11 @@ class ExplicitIntentsWidget extends StatelessWidget { 'Tap here to test explicit intent fallback to implicit.'), onPressed: _testExplicitIntentFallback, ), + RaisedButton( + child: const Text( + 'Tap here to open Location Settings Configuration',), + onPressed: _openLocationSettingsConfiguration, + ) ], ), ), diff --git a/packages/camera/camera.iml b/packages/camera/camera.iml index 0c1c01a2c7b8..55d90fcdd7f8 100644 --- a/packages/camera/camera.iml +++ b/packages/camera/camera.iml @@ -1,14 +1,16 @@ - + - + + + diff --git a/packages/connectivity/connectivity.iml b/packages/connectivity/connectivity.iml index 9d5dae19540c..af18dc58768d 100644 --- a/packages/connectivity/connectivity.iml +++ b/packages/connectivity/connectivity.iml @@ -1,15 +1,24 @@ - + + + + + + - + + - + + + + - + \ No newline at end of file diff --git a/packages/device_info/device_info.iml b/packages/device_info/device_info.iml index 9d5dae19540c..55d90fcdd7f8 100644 --- a/packages/device_info/device_info.iml +++ b/packages/device_info/device_info.iml @@ -1,15 +1,18 @@ - + - + - + + + + - + \ No newline at end of file diff --git a/packages/firebase_admob/firebase_admob.iml b/packages/firebase_admob/firebase_admob.iml index 9d5dae19540c..55d90fcdd7f8 100644 --- a/packages/firebase_admob/firebase_admob.iml +++ b/packages/firebase_admob/firebase_admob.iml @@ -1,15 +1,18 @@ - + - + - + + + + - + \ No newline at end of file diff --git a/packages/firebase_core/firebase_core.iml b/packages/firebase_core/firebase_core.iml index a6a44fee50b4..55d90fcdd7f8 100644 --- a/packages/firebase_core/firebase_core.iml +++ b/packages/firebase_core/firebase_core.iml @@ -1,18 +1,18 @@ - + - - + + + - \ No newline at end of file diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links.iml b/packages/firebase_dynamic_links/firebase_dynamic_links.iml index 73e7ebd0d508..55d90fcdd7f8 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links.iml +++ b/packages/firebase_dynamic_links/firebase_dynamic_links.iml @@ -3,15 +3,14 @@ - - + diff --git a/packages/firebase_messaging/firebase_messaging.iml b/packages/firebase_messaging/firebase_messaging.iml index dff626c24d4a..55d90fcdd7f8 100644 --- a/packages/firebase_messaging/firebase_messaging.iml +++ b/packages/firebase_messaging/firebase_messaging.iml @@ -1,44 +1,18 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + \ No newline at end of file diff --git a/packages/firebase_performance/firebase_performance.iml b/packages/firebase_performance/firebase_performance.iml index 73e7ebd0d508..55d90fcdd7f8 100644 --- a/packages/firebase_performance/firebase_performance.iml +++ b/packages/firebase_performance/firebase_performance.iml @@ -3,15 +3,14 @@ - - + diff --git a/packages/firebase_remote_config/firebase_remote_config.iml b/packages/firebase_remote_config/firebase_remote_config.iml index 0fbaf2c3a822..55d90fcdd7f8 100644 --- a/packages/firebase_remote_config/firebase_remote_config.iml +++ b/packages/firebase_remote_config/firebase_remote_config.iml @@ -1,17 +1,16 @@ - + - - + diff --git a/packages/in_app_purchase/in_app_purchase.iml b/packages/in_app_purchase/in_app_purchase.iml index 429df7daf76a..af18dc58768d 100644 --- a/packages/in_app_purchase/in_app_purchase.iml +++ b/packages/in_app_purchase/in_app_purchase.iml @@ -1,18 +1,23 @@ + + + + + - + - + + - diff --git a/packages/local_auth/local_auth.iml b/packages/local_auth/local_auth.iml index 9d5dae19540c..55d90fcdd7f8 100644 --- a/packages/local_auth/local_auth.iml +++ b/packages/local_auth/local_auth.iml @@ -1,15 +1,18 @@ - + - + - + + + + - + \ No newline at end of file diff --git a/packages/package_info/package_info.iml b/packages/package_info/package_info.iml index 9d5dae19540c..55d90fcdd7f8 100644 --- a/packages/package_info/package_info.iml +++ b/packages/package_info/package_info.iml @@ -1,15 +1,18 @@ - + - + - + + + + - + \ No newline at end of file diff --git a/packages/quick_actions/quick_actions.iml b/packages/quick_actions/quick_actions.iml index 9d5dae19540c..55d90fcdd7f8 100644 --- a/packages/quick_actions/quick_actions.iml +++ b/packages/quick_actions/quick_actions.iml @@ -1,15 +1,18 @@ - + - + - + + + + - + \ No newline at end of file diff --git a/packages/video_player/video_player.iml b/packages/video_player/video_player.iml index 033806516ca3..55d90fcdd7f8 100644 --- a/packages/video_player/video_player.iml +++ b/packages/video_player/video_player.iml @@ -1,16 +1,18 @@ - + - + + + - + \ No newline at end of file From 3269b3c6310baa2742877de0b429fa7b7859cf38 Mon Sep 17 00:00:00 2001 From: Pedro Massango Date: Wed, 17 Jul 2019 02:13:36 +0100 Subject: [PATCH 2/5] Update README.md --- packages/android_intent/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/android_intent/README.md b/packages/android_intent/README.md index 273383628ca0..5a9243e6914b 100644 --- a/packages/android_intent/README.md +++ b/packages/android_intent/README.md @@ -26,6 +26,7 @@ If a standard android action is required, the recommendation is to add support for it in the plugin and use an action constant to refer to it. For instance: `'action_view'` translates to `android.os.Intent.ACTION_VIEW` + `'action_location_source_settings'` translates to `android.settings.LOCATION_SOURCE_SETTINGS` Feel free to add support for additional Android intents. From 5fdce123dac7f03379e563f4e5d994672f10b4a0 Mon Sep 17 00:00:00 2001 From: Pedro Massango Date: Wed, 17 Jul 2019 20:11:41 +0100 Subject: [PATCH 3/5] formatted code --- packages/android_intent/android_intent.iml | 11 +++++++---- packages/android_intent/example/lib/main.dart | 8 +++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/android_intent/android_intent.iml b/packages/android_intent/android_intent.iml index 9d5dae19540c..55d90fcdd7f8 100644 --- a/packages/android_intent/android_intent.iml +++ b/packages/android_intent/android_intent.iml @@ -1,15 +1,18 @@ - + - + - + + + + - + \ No newline at end of file diff --git a/packages/android_intent/example/lib/main.dart b/packages/android_intent/example/lib/main.dart index 92747c4b8686..c94ffe50aef5 100644 --- a/packages/android_intent/example/lib/main.dart +++ b/packages/android_intent/example/lib/main.dart @@ -125,9 +125,10 @@ class ExplicitIntentsWidget extends StatelessWidget { intent.launch(); } - void _openLocationSettingsConfiguration(){ + void _openLocationSettingsConfiguration() { final AndroidIntent intent = const AndroidIntent( - action: 'action_location_source_settings',); + action: 'action_location_source_settings', + ); intent.launch(); } @@ -168,7 +169,8 @@ class ExplicitIntentsWidget extends StatelessWidget { ), RaisedButton( child: const Text( - 'Tap here to open Location Settings Configuration',), + 'Tap here to open Location Settings Configuration', + ), onPressed: _openLocationSettingsConfiguration, ) ], From 7ba73b6e4d0ada7ac49df3936ba45f6d8ac8513e Mon Sep 17 00:00:00 2001 From: Pedro Massango Date: Sat, 20 Jul 2019 08:25:30 +0100 Subject: [PATCH 4/5] removed all .iml files --- .../android_alarm_manager.iml | 18 -------------- packages/android_intent/android_intent.iml | 18 -------------- packages/camera/camera.iml | 18 -------------- packages/connectivity/connectivity.iml | 24 ------------------- packages/device_info/device_info.iml | 18 -------------- packages/firebase_admob/firebase_admob.iml | 18 -------------- packages/firebase_core/firebase_core.iml | 18 -------------- .../firebase_dynamic_links.iml | 18 -------------- .../firebase_messaging/firebase_messaging.iml | 18 -------------- .../firebase_performance.iml | 18 -------------- .../firebase_remote_config.iml | 18 -------------- packages/in_app_purchase/in_app_purchase.iml | 24 ------------------- packages/local_auth/local_auth.iml | 18 -------------- packages/package_info/package_info.iml | 18 -------------- packages/quick_actions/quick_actions.iml | 18 -------------- packages/video_player/video_player.iml | 18 -------------- 16 files changed, 300 deletions(-) delete mode 100644 packages/android_alarm_manager/android_alarm_manager.iml delete mode 100644 packages/android_intent/android_intent.iml delete mode 100644 packages/camera/camera.iml delete mode 100644 packages/connectivity/connectivity.iml delete mode 100644 packages/device_info/device_info.iml delete mode 100644 packages/firebase_admob/firebase_admob.iml delete mode 100644 packages/firebase_core/firebase_core.iml delete mode 100644 packages/firebase_dynamic_links/firebase_dynamic_links.iml delete mode 100644 packages/firebase_messaging/firebase_messaging.iml delete mode 100644 packages/firebase_performance/firebase_performance.iml delete mode 100644 packages/firebase_remote_config/firebase_remote_config.iml delete mode 100644 packages/in_app_purchase/in_app_purchase.iml delete mode 100644 packages/local_auth/local_auth.iml delete mode 100644 packages/package_info/package_info.iml delete mode 100644 packages/quick_actions/quick_actions.iml delete mode 100644 packages/video_player/video_player.iml diff --git a/packages/android_alarm_manager/android_alarm_manager.iml b/packages/android_alarm_manager/android_alarm_manager.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/android_alarm_manager/android_alarm_manager.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/android_intent/android_intent.iml b/packages/android_intent/android_intent.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/android_intent/android_intent.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/camera/camera.iml b/packages/camera/camera.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/camera/camera.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/connectivity/connectivity.iml b/packages/connectivity/connectivity.iml deleted file mode 100644 index af18dc58768d..000000000000 --- a/packages/connectivity/connectivity.iml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/device_info/device_info.iml b/packages/device_info/device_info.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/device_info/device_info.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/firebase_admob/firebase_admob.iml b/packages/firebase_admob/firebase_admob.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/firebase_admob/firebase_admob.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/firebase_core/firebase_core.iml b/packages/firebase_core/firebase_core.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/firebase_core/firebase_core.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links.iml b/packages/firebase_dynamic_links/firebase_dynamic_links.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/firebase_dynamic_links/firebase_dynamic_links.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/firebase_messaging/firebase_messaging.iml b/packages/firebase_messaging/firebase_messaging.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/firebase_messaging/firebase_messaging.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/firebase_performance/firebase_performance.iml b/packages/firebase_performance/firebase_performance.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/firebase_performance/firebase_performance.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/firebase_remote_config/firebase_remote_config.iml b/packages/firebase_remote_config/firebase_remote_config.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/firebase_remote_config/firebase_remote_config.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/in_app_purchase/in_app_purchase.iml b/packages/in_app_purchase/in_app_purchase.iml deleted file mode 100644 index af18dc58768d..000000000000 --- a/packages/in_app_purchase/in_app_purchase.iml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/local_auth/local_auth.iml b/packages/local_auth/local_auth.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/local_auth/local_auth.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/package_info/package_info.iml b/packages/package_info/package_info.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/package_info/package_info.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/quick_actions/quick_actions.iml b/packages/quick_actions/quick_actions.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/quick_actions/quick_actions.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/video_player/video_player.iml b/packages/video_player/video_player.iml deleted file mode 100644 index 55d90fcdd7f8..000000000000 --- a/packages/video_player/video_player.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file From 321ed436d62d681fd0adbd3700c89c30b0c78c74 Mon Sep 17 00:00:00 2001 From: Maurice Parrish Date: Mon, 22 Jul 2019 15:16:59 -0700 Subject: [PATCH 5/5] Version bump --- packages/android_intent/CHANGELOG.md | 4 ++++ packages/android_intent/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md index 3622c65a0130..ea1b8f85c626 100644 --- a/packages/android_intent/CHANGELOG.md +++ b/packages/android_intent/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.2 + +* Added "action_location_source_settings" action to start Location Settings Activity. + ## 0.3.1+1 * Fix Gradle version. diff --git a/packages/android_intent/pubspec.yaml b/packages/android_intent/pubspec.yaml index a1d00c4ca970..cf205a693daf 100644 --- a/packages/android_intent/pubspec.yaml +++ b/packages/android_intent/pubspec.yaml @@ -2,7 +2,7 @@ name: android_intent description: Flutter plugin for launching Android Intents. Not supported on iOS. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent -version: 0.3.1+1 +version: 0.3.2 flutter: plugin: