From 103a427bf876f298e331efad8bfeedece9b782ed Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 8 Dec 2020 10:34:00 +0100 Subject: [PATCH 1/3] renamed Android package and method channel --- .../android_intent_plus/android/src/main/AndroidManifest.xml | 2 +- .../plus}/androidintent/AndroidIntentPlugin.java | 2 +- .../fluttercommunity/plus}/androidintent/IntentSender.java | 2 +- .../plus}/androidintent/MethodCallHandlerImpl.java | 4 ++-- .../plugins/androidintentexample/EmbeddingV1Activity.java | 4 ++-- packages/android_intent_plus/example/pubspec.yaml | 3 +++ packages/android_intent_plus/lib/android_intent.dart | 2 +- packages/android_intent_plus/pubspec.yaml | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) rename packages/android_intent_plus/android/src/main/java/{io/flutter/plugins => dev/fluttercommunity/plus}/androidintent/AndroidIntentPlugin.java (98%) rename packages/android_intent_plus/android/src/main/java/{io/flutter/plugins => dev/fluttercommunity/plus}/androidintent/IntentSender.java (99%) rename packages/android_intent_plus/android/src/main/java/{io/flutter/plugins => dev/fluttercommunity/plus}/androidintent/MethodCallHandlerImpl.java (97%) diff --git a/packages/android_intent_plus/android/src/main/AndroidManifest.xml b/packages/android_intent_plus/android/src/main/AndroidManifest.xml index df6242dcc6..978d04ae70 100644 --- a/packages/android_intent_plus/android/src/main/AndroidManifest.xml +++ b/packages/android_intent_plus/android/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ + package="dev.fluttercommunity.plus.androidintent"> diff --git a/packages/android_intent_plus/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/AndroidIntentPlugin.java similarity index 98% rename from packages/android_intent_plus/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java rename to packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/AndroidIntentPlugin.java index 2f35dfcf03..53dc2b9e68 100644 --- a/packages/android_intent_plus/android/src/main/java/io/flutter/plugins/androidintent/AndroidIntentPlugin.java +++ b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/AndroidIntentPlugin.java @@ -1,4 +1,4 @@ -package io.flutter.plugins.androidintent; +package dev.fluttercommunity.plus.androidintent; import androidx.annotation.NonNull; import io.flutter.embedding.engine.plugins.FlutterPlugin; diff --git a/packages/android_intent_plus/android/src/main/java/io/flutter/plugins/androidintent/IntentSender.java b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/IntentSender.java similarity index 99% rename from packages/android_intent_plus/android/src/main/java/io/flutter/plugins/androidintent/IntentSender.java rename to packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/IntentSender.java index b1a590d79c..1b335c6007 100644 --- a/packages/android_intent_plus/android/src/main/java/io/flutter/plugins/androidintent/IntentSender.java +++ b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/IntentSender.java @@ -1,4 +1,4 @@ -package io.flutter.plugins.androidintent; +package dev.fluttercommunity.plus.androidintent; import android.app.Activity; import android.content.ComponentName; diff --git a/packages/android_intent_plus/android/src/main/java/io/flutter/plugins/androidintent/MethodCallHandlerImpl.java b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/MethodCallHandlerImpl.java similarity index 97% rename from packages/android_intent_plus/android/src/main/java/io/flutter/plugins/androidintent/MethodCallHandlerImpl.java rename to packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/MethodCallHandlerImpl.java index a47f7a162b..c8343b4814 100644 --- a/packages/android_intent_plus/android/src/main/java/io/flutter/plugins/androidintent/MethodCallHandlerImpl.java +++ b/packages/android_intent_plus/android/src/main/java/dev/fluttercommunity/plus/androidintent/MethodCallHandlerImpl.java @@ -1,4 +1,4 @@ -package io.flutter.plugins.androidintent; +package dev.fluttercommunity.plus.androidintent; import android.content.ComponentName; import android.content.Intent; @@ -46,7 +46,7 @@ void startListening(BinaryMessenger messenger) { stopListening(); } - methodChannel = new MethodChannel(messenger, "plugins.flutter.io/android_intent"); + methodChannel = new MethodChannel(messenger, "dev.fluttercommunity.plus/android_intent"); methodChannel.setMethodCallHandler(this); } diff --git a/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java b/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java index 1bbe89a4a4..4b6912050d 100644 --- a/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java +++ b/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java @@ -6,13 +6,13 @@ import android.os.Bundle; import io.flutter.app.FlutterActivity; -import io.flutter.plugins.androidintent.AndroidIntentPlugin; +import dev.fluttercommunity.plus.androidintent.AndroidIntentPlugin; public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); AndroidIntentPlugin.registerWith( - registrarFor("io.flutter.plugins.androidintent.AndroidIntentPlugin")); + registrarFor("dev.fluttercommunity.plus.androidintent.AndroidIntentPlugin")); } } diff --git a/packages/android_intent_plus/example/pubspec.yaml b/packages/android_intent_plus/example/pubspec.yaml index 4a6a7e9bed..3a3d58b1c9 100644 --- a/packages/android_intent_plus/example/pubspec.yaml +++ b/packages/android_intent_plus/example/pubspec.yaml @@ -1,6 +1,9 @@ name: android_intent_example description: Demonstrates how to use the android_intent plugin. +environment: + sdk: '>=2.10.0 <3.0.0' + dependencies: flutter: sdk: flutter diff --git a/packages/android_intent_plus/lib/android_intent.dart b/packages/android_intent_plus/lib/android_intent.dart index 953e4d337b..93f6a3a98c 100644 --- a/packages/android_intent_plus/lib/android_intent.dart +++ b/packages/android_intent_plus/lib/android_intent.dart @@ -8,7 +8,7 @@ import 'package:flutter/services.dart'; import 'package:meta/meta.dart'; import 'package:platform/platform.dart'; -const String _kChannelName = 'plugins.flutter.io/android_intent'; +const String _kChannelName = 'dev.fluttercommunity.plus/android_intent'; /// Flutter plugin for launching arbitrary Android Intents. /// diff --git a/packages/android_intent_plus/pubspec.yaml b/packages/android_intent_plus/pubspec.yaml index c9bddf4a69..7d91f45cbf 100644 --- a/packages/android_intent_plus/pubspec.yaml +++ b/packages/android_intent_plus/pubspec.yaml @@ -8,7 +8,7 @@ flutter: plugin: platforms: android: - package: io.flutter.plugins.androidintent + package: dev.fluttercommunity.plus.androidintent pluginClass: AndroidIntentPlugin dependencies: From 579500462d2c0ee00ca242f5a24290f5f98e7985 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 8 Dec 2020 10:36:21 +0100 Subject: [PATCH 2/3] version bump --- packages/android_intent_plus/CHANGELOG.md | 4 ++++ packages/android_intent_plus/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/android_intent_plus/CHANGELOG.md b/packages/android_intent_plus/CHANGELOG.md index 7f22908f24..c88a662927 100644 --- a/packages/android_intent_plus/CHANGELOG.md +++ b/packages/android_intent_plus/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.1 + +- Renamed Method Channel and changed Java package to avoid collision with android_intent + ## 0.4.0 - Transfer to plus-plugins monorepo diff --git a/packages/android_intent_plus/pubspec.yaml b/packages/android_intent_plus/pubspec.yaml index 7d91f45cbf..e17b9622be 100644 --- a/packages/android_intent_plus/pubspec.yaml +++ b/packages/android_intent_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: android_intent_plus description: Flutter plugin for launching Android Intents. Not supported on iOS. -version: 0.4.0 +version: 0.4.1 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ From 9a7f77dbf5348c52107a78d4af7279fa40946c40 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 8 Dec 2020 10:40:53 +0100 Subject: [PATCH 3/3] java format --- .../plugins/androidintentexample/EmbeddingV1Activity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java b/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java index 4b6912050d..c510fc8f16 100644 --- a/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java +++ b/packages/android_intent_plus/example/android/app/src/main/java/io/flutter/plugins/androidintentexample/EmbeddingV1Activity.java @@ -5,8 +5,8 @@ package io.flutter.plugins.androidintentexample; import android.os.Bundle; -import io.flutter.app.FlutterActivity; import dev.fluttercommunity.plus.androidintent.AndroidIntentPlugin; +import io.flutter.app.FlutterActivity; public class EmbeddingV1Activity extends FlutterActivity { @Override