Merge pull request #547 from juliuscanute/cleanup

Cleanup

Author: juliansteenbakker

android/src/main/kotlin/net/touchcapture/qr/flutterqr/CustomFramingRectBarcodeView.kt

@@ -9,8 +9,8 @@ import com.journeyapps.barcodescanner.Size
 class CustomFramingRectBarcodeView : BarcodeView {
     private var bottomOffset = BOTTOM_OFFSET_NOT_SET_VALUE
 
-    constructor(context: Context?) : super(context) {}
-    constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) {}
+    constructor(context: Context?) : super(context)
+    constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
     constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(
         context,
         attrs,

android/src/main/kotlin/net/touchcapture/qr/flutterqr/FlutterQrPlugin.kt

@@ -4,42 +4,44 @@ import androidx.annotation.NonNull
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.activity.ActivityAware
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
-import net.touchcapture.qr.flutterqr.Shared.activity
 
 class FlutterQrPlugin : FlutterPlugin, ActivityAware {
 
     /** Plugin registration embedding v2 */
     override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-        if (activity != null) {
-            activity = activity
-        }
         flutterPluginBinding.platformViewRegistry
             .registerViewFactory(
-                "net.touchcapture.qr.flutterqr/qrview", QRViewFactory(flutterPluginBinding.binaryMessenger))
+                VIEW_TYPE_ID,
+                QRViewFactory(flutterPluginBinding.binaryMessenger)
+            )
     }
 
     override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+        QrShared.activity = null
+        QrShared.binding = null
     }
 
     override fun onAttachedToActivity(activityPluginBinding: ActivityPluginBinding) {
-        activity = activityPluginBinding.activity
-        Shared.binding = activityPluginBinding
+        QrShared.activity = activityPluginBinding.activity
+        QrShared.binding = activityPluginBinding
     }
 
     override fun onDetachedFromActivityForConfigChanges() {
-        activity = null
-        Shared.binding = null
+        QrShared.activity = null
+        QrShared.binding = null
     }
 
     override fun onReattachedToActivityForConfigChanges(activityPluginBinding: ActivityPluginBinding) {
-        activity = activityPluginBinding.activity
-        Shared.binding = activityPluginBinding
+        QrShared.activity = activityPluginBinding.activity
+        QrShared.binding = activityPluginBinding
     }
 
     override fun onDetachedFromActivity() {
-        activity = null
-        Shared.binding = null
+        QrShared.activity = null
+        QrShared.binding = null
     }
-    
 
+    companion object {
+        private const val VIEW_TYPE_ID = "net.touchcapture.qr.flutterqr/qrview"
+    }
 }