Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace FlutterActivity with general Activity #211

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Replace FlutterActivity with general Activity #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
603ea69
Replace FlutterActivity with general Activity
jortzorgdoc Jun 29, 2021
b9f597f
Remove Jcentral
JortdeBokx Jul 9, 2024
50806aa
Update build.gradle
JortdeBokx Jul 9, 2024
5aead39
Update build.gradle
JortdeBokx Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version '1.0-SNAPSHOT'
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand All @@ -15,13 +15,16 @@ buildscript {
rootProject.allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

apply plugin: 'com.android.library'

android {
if (project.android.hasProperty("namespace")) {
namespace 'com.amolg.flutterbarcodescanner'
}
compileSdkVersion 30

defaultConfig {
Expand All @@ -39,4 +42,4 @@ dependencies {
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.3.0'
implementation 'com.google.android.gms:play-services-vision:20.1.3'
}
}
10 changes: 4 additions & 6 deletions android/src/main/java/com/amolg/flutterbarcodescanner/FlutterBarcodeScannerPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

import java.util.Map;

import io.flutter.embedding.android.FlutterActivity;

import io.flutter.embedding.engine.plugins.FlutterPlugin;
import io.flutter.embedding.engine.plugins.activity.ActivityAware;
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
Expand All @@ -39,7 +37,7 @@
public class FlutterBarcodeScannerPlugin implements MethodCallHandler, ActivityResultListener, StreamHandler, FlutterPlugin, ActivityAware {
private static final String CHANNEL = "flutter_barcode_scanner";

private static FlutterActivity activity;
private static Activity activity;
private static Result pendingResult;
private Map<String, Object> arguments;

Expand Down Expand Up @@ -68,7 +66,7 @@ public class FlutterBarcodeScannerPlugin implements MethodCallHandler, ActivityR
public FlutterBarcodeScannerPlugin() {
}

private FlutterBarcodeScannerPlugin(FlutterActivity activity, final PluginRegistry.Registrar registrar) {
private FlutterBarcodeScannerPlugin(Activity activity, final PluginRegistry.Registrar registrar) {
FlutterBarcodeScannerPlugin.activity = activity;
}

Expand All @@ -84,7 +82,7 @@ public static void registerWith(final PluginRegistry.Registrar registrar) {
if (registrar.context() != null) {
applicationContext = (Application) (registrar.context().getApplicationContext());
}
FlutterBarcodeScannerPlugin instance = new FlutterBarcodeScannerPlugin((FlutterActivity) registrar.activity(), registrar);
FlutterBarcodeScannerPlugin instance = new FlutterBarcodeScannerPlugin(registrar.activity(), registrar);
instance.createPluginSetup(registrar.messenger(), applicationContext, activity, registrar, null);
}

Expand Down Expand Up @@ -245,7 +243,7 @@ private void createPluginSetup(
final ActivityPluginBinding activityBinding) {


this.activity = (FlutterActivity) activity;
this.activity = activity;
eventChannel =
new EventChannel(messenger, "flutter_barcode_scanner_receiver");
eventChannel.setStreamHandler(this);
Expand Down