...

Scarabei · Jul 28, 2017 · 06be985 · 06be985
1 parent 1ee62e6
commit 06be985
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 49 deletions.
diff --git a/scarabei-flutter-red/src/com/jfixby/scarabei/red/flutter/RedFlutterPlugins.java b/scarabei-flutter-red/src/com/jfixby/scarabei/red/flutter/RedFlutterPlugins.java
@@ -6,27 +6,25 @@
 import com.jfixby.scarabei.api.flutter.plugins.FlutterPluginsComponent;
 import com.jfixby.scarabei.api.log.L;
 
-import io.flutter.app.FlutterActivity;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 public class RedFlutterPlugins implements FlutterPluginsComponent {
 
-	private final FlutterActivity activity;
+	private final PluginRegistry registry;
 
-	public RedFlutterPlugins (final FlutterActivity activity) {
-		this.activity = activity;
+	public RedFlutterPlugins (final PluginRegistry registry) {
+		this.registry = registry;
 
 	}
 
 	void registerPlugin (final MethodChannel.MethodCallHandler plugin, final String channelName) {
-		final PluginRegistry registry = this.activity;
 		final String className = plugin.getClass().getCanonicalName();
-		final Registrar registrar = registry.registrarFor(className);
+		final Registrar registrar = this.registry.registrarFor(className);
 		final MethodChannel channel = new MethodChannel(registrar.messenger(), channelName);
 		channel.setMethodCallHandler(plugin);
-		L.d("FlutterPlugin registed[" + channelName + "]", plugin);
+		L.d("FlutterPlugin registered[" + channelName + "]", plugin);
 	}
 
 	@Override

diff --git a/scarabei-flutter-test/src/com/jfixby/scarabei/red/flutter/test/ExampleActivity.java b/scarabei-flutter-test/src/com/jfixby/scarabei/red/flutter/test/ExampleActivity.java
@@ -20,8 +20,6 @@ public class ExampleActivity extends FlutterActivity {
 	protected void onCreate (final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-// GeneratedPluginRegistrant.registerWith(this);
-
 		this.deployer.tryToDeploy(this);
 
 		final FlutterPluginsComponent flutterPlugins = new RedFlutterPlugins(this);

diff --git a/scarabei_flutter/example/android/app/build.gradle b/scarabei_flutter/example/android/app/build.gradle
@@ -47,10 +47,7 @@ android {
     }
 
     configurations {
-//        all*.exclude "com.github.Scarabei.Flutter:flutter-api"
-//        all*.exclude group: 'com.android.support', module: 'support-v4'
         all*.exclude group: "com.github.Scarabei.Flutter", module: "flutter-api"
-        //compile "com.github.Scarabei.Flutter:flutter-api:$flutterAPIversion"
 
 
     }
@@ -62,7 +59,8 @@ flutter {
 
 ext {
     scarabeiVersion = "2.1.1"
-    scarabeiFlutterVersion = "A.0.2"
+    scarabeiFlutterVersion = "B.0.0"
+
 }
 
 dependencies {
@@ -75,8 +73,8 @@ dependencies {
 
 
     compile "com.github.Scarabei.Scarabei:scarabei-red-android:$scarabeiVersion"
-    //compile "com.github.Scarabei.ScarabeiFlutter:scarabei-flutter-red:$scarabeiFlutterVersion"
-    compile "com.github.Scarabei.ScarabeiFlutter:scarabei-flutter-red:A.0.2"
+    compile "com.github.Scarabei.ScarabeiFlutter:scarabei-flutter-red:$scarabeiFlutterVersion"
+    compile "com.github.Scarabei.ScarabeiFlutter:scarabei-flutter-test:$scarabeiFlutterVersion"
 
 
 }
diff --git a/...id/app/src/main/java/com/jfixby/scarabei/flutter/scarabeiflutterexample/MainActivity.java b/...id/app/src/main/java/com/jfixby/scarabei/flutter/scarabeiflutterexample/MainActivity.java
@@ -1,39 +1,10 @@
 package com.jfixby.scarabei.flutter.scarabeiflutterexample;
 
-import android.os.Bundle;
-import com.jfixby.scarabei.red.android.ScarabeiAndroidDeployer;
-import com.jfixby.scarabei.red.flutter.ScarabeiFlutterAndroid;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.PluginRegistry;
+import com.jfixby.scarabei.red.flutter.test.ExampleActivity;
 
-public class MainActivity extends FlutterActivity {
 
-    final ScarabeiAndroidDeployer deployer = new ScarabeiAndroidDeployer();
+public class MainActivity extends ExampleActivity {
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
 
 
-//        GeneratedPluginRegistrant.registerWith(this);
-
-        deployer.tryToDeploy(this);
-
-        ScarabeiFlutterAndroid plugin = new ScarabeiFlutterAndroid();
-        registerPlugin(plugin);
-    }
-
-    private void registerPlugin(MethodChannel.MethodCallHandler plugin) {
-        String channelName = plugin.getClass().getCanonicalName();
-        registerPlugin(plugin, channelName);
-    }
-
-    private void registerPlugin(MethodChannel.MethodCallHandler plugin, String channelName) {
-        PluginRegistry registry = this;
-        String className = plugin.getClass().getCanonicalName();
-        Registrar registrar = registry.registrarFor(className);
-        final MethodChannel channel = new MethodChannel(registrar.messenger(), channelName);
-        channel.setMethodCallHandler(plugin);
-    }
 }
diff --git a/...droid/app/src/main/java/com/jfixby/scarabei/flutter/scarabeiflutterexample/MobileApp.java b/...droid/app/src/main/java/com/jfixby/scarabei/flutter/scarabeiflutterexample/MobileApp.java
@@ -2,9 +2,7 @@
 
 import android.support.multidex.MultiDex;
 
-/**
- * Created by JCode on 7/28/2017.
- */
+
 public class MobileApp extends io.flutter.app.FlutterApplication {
 
     protected void attachBaseContext(android.content.Context base) {