From 8cfc613c23a33cd049716a5ab2d86af20f90993f Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Sat, 7 Mar 2020 09:49:10 +0000 Subject: [PATCH 01/13] Bumps Flutter & Dart dependencies to stable --- .../io/flutter/plugins/androidintent/AndroidIntentPlugin.java | 2 +- packages/android_intent/pubspec.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 10c807979162..2f35dfcf0372 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 @@ -42,7 +42,7 @@ public static void registerWith(Registrar registrar) { public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) { sender.setApplicationContext(binding.getApplicationContext()); sender.setActivity(null); - impl.startListening(binding.getFlutterEngine().getDartExecutor()); + impl.startListening(binding.getBinaryMessenger()); } @Override diff --git a/packages/android_intent/pubspec.yaml b/packages/android_intent/pubspec.yaml index 2faf45e915f6..4aae8584d7ad 100644 --- a/packages/android_intent/pubspec.yaml +++ b/packages/android_intent/pubspec.yaml @@ -23,5 +23,5 @@ dev_dependencies: pedantic: ^1.8.0 environment: - sdk: ">=2.0.0-dev.28.0 <3.0.0" - flutter: ">=1.10.0 <2.0.0" + sdk: ">=2.3.0 <3.0.0" + flutter: ">=1.12.13+hotfix.5 <2.0.0" \ No newline at end of file From 29329f45bb5d46d4ace33a14ce1ab78d99faf788 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Sat, 7 Mar 2020 09:49:44 +0000 Subject: [PATCH 02/13] Uses spread operator to concisely build arguments --- .../android_intent/lib/android_intent.dart | 42 +++++++------------ 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/packages/android_intent/lib/android_intent.dart b/packages/android_intent/lib/android_intent.dart index 26e270a3a79b..0d26ef69f2c7 100644 --- a/packages/android_intent/lib/android_intent.dart +++ b/packages/android_intent/lib/android_intent.dart @@ -134,31 +134,21 @@ class AndroidIntent { if (!_platform.isAndroid) { return; } - final Map args = {}; - if (action != null) { - args['action'] = action; - } - if (flags != null) { - args['flags'] = convertFlags(flags); - } - if (category != null) { - args['category'] = category; - } - if (data != null) { - args['data'] = data; - } - if (arguments != null) { - args['arguments'] = arguments; - } - if (package != null) { - args['package'] = package; - if (componentName != null) { - args['componentName'] = componentName; - } - } - if (type != null) { - args['type'] = type; - } - await _channel.invokeMethod('launch', args); + + await _channel.invokeMethod('launch', _buildArguments()); } + + /// Constructs the map of arguments which is passed to the plugin. + Map _buildArguments() => { + if (action != null) 'action': action, + if (flags != null) 'flags': convertFlags(flags), + if (category != null) 'category': category, + if (data != null) 'data': data, + if (arguments != null) 'arguments': arguments, + if (package != null) ...{ + 'package': package, + if (componentName != null) 'componentName': componentName, + }, + if (type != null) 'type': type, + }; } From c5e27e4efd5665fbe47aa616ff5940b54833a24e Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Sat, 7 Mar 2020 09:50:34 +0000 Subject: [PATCH 03/13] Bump version, add changelog --- packages/android_intent/CHANGELOG.md | 7 +++++++ packages/android_intent/pubspec.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md index 47f1917e3e8a..ec0fb9c3c5e1 100644 --- a/packages/android_intent/CHANGELOG.md +++ b/packages/android_intent/CHANGELOG.md @@ -1,3 +1,10 @@ +## 0.3.7 + +* Bump the minimum Flutter version to 1.12.13+hotfix.5. +* Bump the minimum Dart version to 2.3.0. +* Uses Darts spread operator to build plugin arguments internally. +* Remove deprecated API usage warning in AndroidIntentPlugin.java. + ## 0.3.6 * Marks the `action` parameter as optional diff --git a/packages/android_intent/pubspec.yaml b/packages/android_intent/pubspec.yaml index 4aae8584d7ad..f89518cb1743 100644 --- a/packages/android_intent/pubspec.yaml +++ b/packages/android_intent/pubspec.yaml @@ -1,7 +1,7 @@ name: android_intent description: Flutter plugin for launching Android Intents. Not supported on iOS. homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent -version: 0.3.6 +version: 0.3.7 flutter: plugin: From 22eeaae761926ba14f125e20c038849520b6cf4a Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Sat, 7 Mar 2020 10:03:06 +0000 Subject: [PATCH 04/13] Adjust _buildArguments return style --- .../android_intent/lib/android_intent.dart | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/android_intent/lib/android_intent.dart b/packages/android_intent/lib/android_intent.dart index 0d26ef69f2c7..ff95299a93fd 100644 --- a/packages/android_intent/lib/android_intent.dart +++ b/packages/android_intent/lib/android_intent.dart @@ -139,16 +139,18 @@ class AndroidIntent { } /// Constructs the map of arguments which is passed to the plugin. - Map _buildArguments() => { - if (action != null) 'action': action, - if (flags != null) 'flags': convertFlags(flags), - if (category != null) 'category': category, - if (data != null) 'data': data, - if (arguments != null) 'arguments': arguments, - if (package != null) ...{ - 'package': package, - if (componentName != null) 'componentName': componentName, - }, - if (type != null) 'type': type, - }; + Map _buildArguments() { + return { + if (action != null) 'action': action, + if (flags != null) 'flags': convertFlags(flags), + if (category != null) 'category': category, + if (data != null) 'data': data, + if (arguments != null) 'arguments': arguments, + if (package != null) ...{ + 'package': package, + if (componentName != null) 'componentName': componentName, + }, + if (type != null) 'type': type, + }; + } } From 0c92dcf6a5ce44123c154ba5d5abba9f69897f74 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Sat, 7 Mar 2020 22:44:45 +0000 Subject: [PATCH 05/13] Bumps to 0.4.0 (semver) --- packages/android_intent/CHANGELOG.md | 2 +- packages/android_intent/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md index ec0fb9c3c5e1..cda5e53cea1f 100644 --- a/packages/android_intent/CHANGELOG.md +++ b/packages/android_intent/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.3.7 +## 0.4.0 * Bump the minimum Flutter version to 1.12.13+hotfix.5. * Bump the minimum Dart version to 2.3.0. diff --git a/packages/android_intent/pubspec.yaml b/packages/android_intent/pubspec.yaml index f89518cb1743..99a01a3f27eb 100644 --- a/packages/android_intent/pubspec.yaml +++ b/packages/android_intent/pubspec.yaml @@ -1,7 +1,7 @@ name: android_intent description: Flutter plugin for launching Android Intents. Not supported on iOS. homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent -version: 0.3.7 +version: 0.4.0 flutter: plugin: From ee5ced094b7e0ea7464c3326776187e36efcd05d Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Sat, 7 Mar 2020 22:45:11 +0000 Subject: [PATCH 06/13] Remove flutter version constraints in example/pubspec.yaml --- packages/android_intent/example/pubspec.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/android_intent/example/pubspec.yaml b/packages/android_intent/example/pubspec.yaml index 4418e9fb82c6..22ff833f8198 100644 --- a/packages/android_intent/example/pubspec.yaml +++ b/packages/android_intent/example/pubspec.yaml @@ -16,6 +16,3 @@ dev_dependencies: # The following section is specific to Flutter. flutter: uses-material-design: true - -environment: - flutter: ">=1.9.1+hotfix.2 <2.0.0" \ No newline at end of file From 254fc9f59ba6e6bea6d90ae566db0be3258afc94 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Sat, 7 Mar 2020 22:45:52 +0000 Subject: [PATCH 07/13] Removes `afterEvaluate` block --- packages/android_intent/android/build.gradle | 26 -------------------- 1 file changed, 26 deletions(-) diff --git a/packages/android_intent/android/build.gradle b/packages/android_intent/android/build.gradle index 008b49ff7719..d261dac7df1c 100644 --- a/packages/android_intent/android/build.gradle +++ b/packages/android_intent/android/build.gradle @@ -43,29 +43,3 @@ dependencies { testImplementation 'androidx.test:core:1.0.0' testImplementation 'org.robolectric:robolectric:4.3' } - -// TODO(mklim): Remove this hack once androidx.lifecycle is included on stable. https://github.com/flutter/flutter/issues/42348 -afterEvaluate { - def containsEmbeddingDependencies = false - for (def configuration : configurations.all) { - for (def dependency : configuration.dependencies) { - if (dependency.group == 'io.flutter' && - dependency.name.startsWith('flutter_embedding') && - dependency.isTransitive()) - { - containsEmbeddingDependencies = true - break - } - } - } - if (!containsEmbeddingDependencies) { - android { - dependencies { - def lifecycle_version = "1.1.1" - compileOnly "android.arch.lifecycle:runtime:$lifecycle_version" - compileOnly "android.arch.lifecycle:common:$lifecycle_version" - compileOnly "android.arch.lifecycle:common-java8:$lifecycle_version" - } - } - } -} From 83971c70972b5a78fac2347203b80fb0104662da Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Sat, 7 Mar 2020 23:05:47 +0000 Subject: [PATCH 08/13] Various V2 embedding migration tasks. --- .../android/app/src/main/AndroidManifest.xml | 24 ++++++++++--------- .../EmbeddingV1Activity.java | 4 ++-- .../androidintentexample/MainActivity.java | 12 ---------- 3 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/MainActivity.java diff --git a/packages/android_intent/example/android/app/src/main/AndroidManifest.xml b/packages/android_intent/example/android/app/src/main/AndroidManifest.xml index 7d6fcd44834f..8691601204ea 100644 --- a/packages/android_intent/example/android/app/src/main/AndroidManifest.xml +++ b/packages/android_intent/example/android/app/src/main/AndroidManifest.xml @@ -11,25 +11,27 @@ android:label="android_intent_example" android:name="io.flutter.app.FlutterApplication"> - + + + + - - + + + diff --git a/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java b/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java index 95dc41a02ef7..09170c635195 100644 --- a/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java +++ b/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java @@ -6,12 +6,12 @@ import android.os.Bundle; import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; +import io.flutter.plugins.androidintent.AndroidIntentPlugin; public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); + AndroidIntentPlugin.registerWith(registrarFor("io.flutter.plugins.androidintent.AndroidIntentPlugin")); } } diff --git a/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/MainActivity.java b/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/MainActivity.java deleted file mode 100644 index 56e0bab207d4..000000000000 --- a/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/MainActivity.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.flutter.plugins.androidintentexample; - -import io.flutter.embedding.android.FlutterActivity; -import io.flutter.embedding.engine.FlutterEngine; -import io.flutter.plugins.androidintent.AndroidIntentPlugin; - -public class MainActivity extends FlutterActivity { - @Override - public void configureFlutterEngine(FlutterEngine flutterEngine) { - flutterEngine.getPlugins().add(new AndroidIntentPlugin()); - } -} From 661a12325f669d1bcc5e214f316f22908e23bea0 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Sat, 7 Mar 2020 23:06:27 +0000 Subject: [PATCH 09/13] Extend changelog once again --- packages/android_intent/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md index cda5e53cea1f..124d351d4d41 100644 --- a/packages/android_intent/CHANGELOG.md +++ b/packages/android_intent/CHANGELOG.md @@ -4,6 +4,7 @@ * Bump the minimum Dart version to 2.3.0. * Uses Darts spread operator to build plugin arguments internally. * Remove deprecated API usage warning in AndroidIntentPlugin.java. +* Migrates the Android example to V2 embedding. ## 0.3.6 From 147ffef82c28cf79157cf2c86739fc95cc942e45 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Sun, 8 Mar 2020 00:26:00 +0000 Subject: [PATCH 10/13] Formatting --- .../plugins/androidintentexample/EmbeddingV1Activity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java b/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java index 09170c635195..6c0e7f9194e2 100644 --- a/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java +++ b/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java @@ -12,6 +12,7 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - AndroidIntentPlugin.registerWith(registrarFor("io.flutter.plugins.androidintent.AndroidIntentPlugin")); + AndroidIntentPlugin.registerWith(registrarFor( + "io.flutter.plugins.androidintent.AndroidIntentPlugin")); } } From bddcdfb494f14e67d370408b2cb9e6b853defd89 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Sun, 8 Mar 2020 00:28:36 +0000 Subject: [PATCH 11/13] Less indents in AndroidManifest.xml --- .../example/android/app/src/main/AndroidManifest.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/android_intent/example/android/app/src/main/AndroidManifest.xml b/packages/android_intent/example/android/app/src/main/AndroidManifest.xml index 8691601204ea..761c35fd64d8 100644 --- a/packages/android_intent/example/android/app/src/main/AndroidManifest.xml +++ b/packages/android_intent/example/android/app/src/main/AndroidManifest.xml @@ -24,11 +24,11 @@ android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"> + android:name="io.flutter.app.android.SplashScreenUntilFirstFrame" + android:value="true" /> - - + + From 8db5132868e2274715684e4e1208d609b5960055 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Sun, 8 Mar 2020 07:53:22 +0000 Subject: [PATCH 12/13] Formatting once again.. --- .../plugins/androidintentexample/EmbeddingV1Activity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java b/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java index 6c0e7f9194e2..1bbe89a4a4cb 100644 --- a/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java +++ b/packages/android_intent/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java @@ -12,7 +12,7 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - AndroidIntentPlugin.registerWith(registrarFor( - "io.flutter.plugins.androidintent.AndroidIntentPlugin")); + AndroidIntentPlugin.registerWith( + registrarFor("io.flutter.plugins.androidintent.AndroidIntentPlugin")); } } From 2a32e14db0880d82a2eca27cf0720e16fb76b98e Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Sun, 8 Mar 2020 21:06:18 +0000 Subject: [PATCH 13/13] Adjusts version to become a patch release only --- packages/android_intent/CHANGELOG.md | 2 +- packages/android_intent/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md index 124d351d4d41..6160ba54b003 100644 --- a/packages/android_intent/CHANGELOG.md +++ b/packages/android_intent/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.4.0 +## 0.3.6+1 * Bump the minimum Flutter version to 1.12.13+hotfix.5. * Bump the minimum Dart version to 2.3.0. diff --git a/packages/android_intent/pubspec.yaml b/packages/android_intent/pubspec.yaml index 99a01a3f27eb..82f6e187ace5 100644 --- a/packages/android_intent/pubspec.yaml +++ b/packages/android_intent/pubspec.yaml @@ -1,7 +1,7 @@ name: android_intent description: Flutter plugin for launching Android Intents. Not supported on iOS. homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent -version: 0.4.0 +version: 0.3.6+1 flutter: plugin: