diff --git a/android/build.gradle b/android/build.gradle index 35ca46f1..639ef620 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ def variant = project.hasProperty("yandexMapkit.variant") ? project.property("yandexMapkit.variant") : "lite" -def initClass = "com.unact.yandexmapkit." + variant + ".Init" + variant.capitalize() + ".class" +def init = "new com.unact.yandexmapkit." + variant + ".Init" + variant.capitalize() + "()" group 'com.unact.yandexmapkit' version '1.0-SNAPSHOT' @@ -50,7 +50,7 @@ android { defaultConfig { minSdkVersion 21 - buildConfigField "Class", "YANDEX_MAPKIT_INIT_CLASS", initClass + buildConfigField "com.unact.yandexmapkit.Init", "YANDEX_MAPKIT_INIT", init } } diff --git a/android/src/main/java/com/unact/yandexmapkit/YandexMapkitPlugin.java b/android/src/main/java/com/unact/yandexmapkit/YandexMapkitPlugin.java index 9435c173..65864b88 100644 --- a/android/src/main/java/com/unact/yandexmapkit/YandexMapkitPlugin.java +++ b/android/src/main/java/com/unact/yandexmapkit/YandexMapkitPlugin.java @@ -7,39 +7,34 @@ import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding; public class YandexMapkitPlugin implements FlutterPlugin, ActivityAware { - private final Init variantInit; - - public YandexMapkitPlugin() throws IllegalAccessException, InstantiationException { - this.variantInit = (Init) BuildConfig.YANDEX_MAPKIT_INIT_CLASS.newInstance(); - } @Override public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) { - variantInit.onAttachedToEngine(binding); + BuildConfig.YANDEX_MAPKIT_INIT.onAttachedToEngine(binding); } @Override public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) { - variantInit.onDetachedFromEngine(binding); + BuildConfig.YANDEX_MAPKIT_INIT.onDetachedFromEngine(binding); } @Override public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) { - variantInit.onAttachedToActivity(binding); + BuildConfig.YANDEX_MAPKIT_INIT.onAttachedToActivity(binding); } @Override public void onDetachedFromActivityForConfigChanges() { - variantInit.onDetachedFromActivityForConfigChanges(); + BuildConfig.YANDEX_MAPKIT_INIT.onDetachedFromActivityForConfigChanges(); } @Override public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding binding) { - variantInit.onReattachedToActivityForConfigChanges(binding); + BuildConfig.YANDEX_MAPKIT_INIT.onReattachedToActivityForConfigChanges(binding); } @Override public void onDetachedFromActivity() { - variantInit.onDetachedFromActivity(); + BuildConfig.YANDEX_MAPKIT_INIT.onDetachedFromActivity(); } }