Upgrade embedding

android/build.gradle

@@ -1,16 +1,14 @@
-group 'com.eyro_toast'
-version '1.0-SNAPSHOT'
+group 'com.eyrotoast'
+version '1.0'
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
@@ -22,7 +20,6 @@ rootProject.allprojects {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 30
@@ -32,19 +29,9 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
     defaultConfig {
         minSdkVersion 16
     }
-}
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    namespace 'com.eyrotoast'
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

android/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.eyrotoast">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

android/src/main/java/com/eyrotoast/EyroToastData.java

@@ -23,6 +23,7 @@ class EyroToastData {
 
   static EyroToastData fromObject(Object arg) {
     if (arg instanceof Map) {
+      //noinspection rawtypes
       Map map = (Map) arg;
       String text = "";
       if (map.get("text") instanceof String) {
@@ -31,6 +32,7 @@ static EyroToastData fromObject(Object arg) {
 
       int duration = 0;
       if (map.get("duration") instanceof Integer) {
+        //noinspection ConstantConditions
         duration = (int) map.get("duration");
       }
       return new EyroToastData(

android/src/main/java/com/eyrotoast/EyroToastPlugin.java

@@ -1,37 +1,54 @@
-// Copyright (c) 2019, the Eyro Toast project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// MIT license that can be found in the LICENSE file.
 package com.eyrotoast;
 
 import android.content.Context;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 
+import java.lang.ref.WeakReference;
+
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
+import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
+import io.flutter.plugin.common.PluginRegistry;
 
 /** EyroToastPlugin */
-public class EyroToastPlugin implements MethodCallHandler {
-  private final Context applicationContext;
+public class EyroToastPlugin implements FlutterPlugin, MethodCallHandler {
+  /// The MethodChannel that will the communication between Flutter and native Android
+  ///
+  /// This local reference serves to register the plugin with the Flutter Engine and unregister it
+  /// when the Flutter Engine is detached from the Activity
+  private MethodChannel channel;
+  private WeakReference<Context> refApplicationContext;
+  private FlutterPluginBinding flutterPluginBinding;
+
+  public static void registerWith(PluginRegistry.Registrar registrar) {
+    final EyroToastPlugin instance = new EyroToastPlugin();
+    instance.setupChannels(registrar.messenger(), registrar.context());
+  }
+
+  private void setupChannels(BinaryMessenger messenger, Context applicationContext) {
+    channel = new MethodChannel(messenger, "eyro_toast");
+    channel.setMethodCallHandler(this);
 
-  public EyroToastPlugin(Context applicationContext) {
-    this.applicationContext = applicationContext;
+    refApplicationContext = new WeakReference<>(applicationContext);
   }
 
-  /** Plugin registration. */
-  public static void registerWith(Registrar registrar) {
-    final MethodChannel channel = new MethodChannel(registrar.messenger(), "eyro_toast");
-    channel.setMethodCallHandler(new EyroToastPlugin(registrar.context().getApplicationContext()));
+  @Override
+  public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
+    this.flutterPluginBinding = flutterPluginBinding;
+
+    setupChannels(flutterPluginBinding.getBinaryMessenger(), flutterPluginBinding.getApplicationContext());
   }
 
   @Override
-  public void onMethodCall(MethodCall call, @NonNull Result result) {
+  public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
     if (call.method.equals("showToast")) {
       EyroToastData data = EyroToastData.fromObject(call.arguments);
+      Context applicationContext = refApplicationContext.get();
       if (data != null) {
         Toast.makeText(applicationContext, data.getText(), data.getDuration()).show();
         result.success(true);
@@ -43,4 +60,11 @@ public void onMethodCall(MethodCall call, @NonNull Result result) {
 
     result.notImplemented();
   }
+
+  @Override
+  public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
+    this.flutterPluginBinding = null;
+
+    channel.setMethodCallHandler(null);
+  }
 }

example/android/build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -12,7 +12,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }