V2 embedding (sharmadhiraj#7)

sharmadhiraj · web-flow · commit cae8113a731d · 2022-02-23T16:33:10.000+05:45
* Migrate to v2 embedding.

* Implement thread to get installed apps. Fixes screen freeze issue.

* Add QUERY_ALL_PACKAGES permission [Android 11+]

* Prepare for 1.3.0 plugin release.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.0
+* Android V2 embedding migration
+* Fix UI freeze issue during getting instgalled apps
+
 ## 1.2.0
 * Null Safety migration
 
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,14 +2,14 @@ group 'com.sharmadhiraj.installed_apps'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.5.10'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,3 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.sharmadhiraj.installed_apps">
+    package="com.sharmadhiraj.installed_apps">
+
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
 </manifest>
diff --git a/android/src/main/kotlin/com/sharmadhiraj/installed_apps/InstalledAppsPlugin.kt b/android/src/main/kotlin/com/sharmadhiraj/installed_apps/InstalledAppsPlugin.kt
@@ -1,5 +1,6 @@
 package com.sharmadhiraj.installed_apps
 
+import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.pm.PackageManager
@@ -9,32 +10,71 @@ import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import android.widget.Toast.LENGTH_SHORT
 import com.sharmadhiraj.installed_apps.Util.Companion.convertAppToMap
-import com.sharmadhiraj.installed_apps.Util.Companion.getContext
 import com.sharmadhiraj.installed_apps.Util.Companion.getPackageManager
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.embedding.engine.plugins.activity.ActivityAware
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
+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 java.util.Locale.ENGLISH
 
-class InstalledAppsPlugin(private val registrar: Registrar) : MethodCallHandler {
+
+class InstalledAppsPlugin() : MethodCallHandler, FlutterPlugin, ActivityAware {
 
     companion object {
+
+        var context: Context? = null
+
         @JvmStatic
         fun registerWith(registrar: Registrar) {
-            val channel = MethodChannel(registrar.messenger(), "installed_apps")
-            channel.setMethodCallHandler(InstalledAppsPlugin(registrar))
+            context = registrar.context()
+            register(registrar.messenger())
         }
+
+        @JvmStatic
+        fun register(messenger: BinaryMessenger?) {
+            val channel = MethodChannel(messenger, "installed_apps")
+            channel.setMethodCallHandler(InstalledAppsPlugin())
+        }
+    }
+
+    override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+        InstalledAppsPlugin.register(binding.getBinaryMessenger())
+    }
+
+    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+    }
+
+    override fun onAttachedToActivity(activityPluginBinding: ActivityPluginBinding) {
+        context = activityPluginBinding.getActivity()
     }
 
-    override fun onMethodCall(call: MethodCall, result: Result) {
+    override fun onDetachedFromActivityForConfigChanges() {}
+
+    override fun onReattachedToActivityForConfigChanges(activityPluginBinding: ActivityPluginBinding) {
+        context = activityPluginBinding.getActivity()
+    }
+
+    override fun onDetachedFromActivity() {}
+
+    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
+        if (context == null) {
+            result.error("", "Something went wrong!", null)
+            return
+        }
         when (call.method) {
             "getInstalledApps" -> {
                 val includeSystemApps = call.argument("exclude_system_apps") ?: true
                 val withIcon = call.argument("with_icon") ?: false
                 val packageNamePrefix: String = call.argument("package_name_prefix") ?: ""
-                result.success(getInstalledApps(includeSystemApps, withIcon, packageNamePrefix))
+                Thread {
+                    val apps: List<Map<String, Any?>> =
+                        getInstalledApps(includeSystemApps, withIcon, packageNamePrefix)
+                    result.success(apps)
+                }.start()
             }
             "startApp" -> {
                 val packageName: String? = call.argument("package_name")
@@ -47,44 +87,54 @@ class InstalledAppsPlugin(private val registrar: Registrar) : MethodCallHandler
             "toast" -> {
                 val message = call.argument("message") ?: ""
                 val short = call.argument("short_length") ?: true
-                toast(message, short);
+                toast(message, short)
             }
             "getAppInfo" -> {
                 val packageName: String = call.argument("package_name") ?: ""
-                result.success(getAppInfo(getPackageManager(registrar), packageName))
+                result.success(getAppInfo(getPackageManager(context!!), packageName))
             }
             "isSystemApp" -> {
                 val packageName: String = call.argument("package_name") ?: ""
-                result.success(isSystemApp(getPackageManager(registrar), packageName))
+                result.success(isSystemApp(getPackageManager(context!!), packageName))
             }
             else -> result.notImplemented()
         }
     }
 
-    private fun getInstalledApps(excludeSystemApps: Boolean, withIcon: Boolean, packageNamePrefix: String): List<Map<String, Any?>> {
-        val packageManager = getPackageManager(registrar)
+    private fun getInstalledApps(
+        excludeSystemApps: Boolean,
+        withIcon: Boolean,
+        packageNamePrefix: String
+    ): List<Map<String, Any?>> {
+        val packageManager = getPackageManager(context!!)
         var installedApps = packageManager.getInstalledApplications(0)
         if (excludeSystemApps)
-            installedApps = installedApps.filter { app -> !isSystemApp(packageManager, app.packageName) }
+            installedApps =
+                installedApps.filter { app -> !isSystemApp(packageManager, app.packageName) }
         if (packageNamePrefix.isNotEmpty())
-            installedApps = installedApps.filter { app -> app.packageName.startsWith(packageNamePrefix.toLowerCase(ENGLISH)) }
+            installedApps = installedApps.filter { app ->
+                app.packageName.startsWith(
+                    packageNamePrefix.lowercase(ENGLISH)
+                )
+            }
         return installedApps.map { app -> convertAppToMap(packageManager, app, withIcon) }
     }
 
     private fun startApp(packageName: String?): Boolean {
         if (packageName.isNullOrBlank()) return false
         return try {
-            val launchIntent = getPackageManager(registrar).getLaunchIntentForPackage(packageName)
-            registrar.context().startActivity(launchIntent)
-            true;
+            val launchIntent = getPackageManager(context!!).getLaunchIntentForPackage(packageName)
+            context!!.startActivity(launchIntent)
+            true
         } catch (e: Exception) {
             print(e)
             false
         }
     }
 
     private fun toast(text: String, short: Boolean) {
-        Toast.makeText(getContext(registrar), text, if (short) LENGTH_SHORT else LENGTH_LONG).show()
+        Toast.makeText(context!!, text, if (short) LENGTH_SHORT else LENGTH_LONG)
+            .show()
     }
 
     private fun isSystemApp(packageManager: PackageManager, packageName: String): Boolean {
@@ -97,14 +147,17 @@ class InstalledAppsPlugin(private val registrar: Registrar) : MethodCallHandler
         intent.action = ACTION_APPLICATION_DETAILS_SETTINGS
         val uri = Uri.fromParts("package", packageName, null)
         intent.data = uri
-        getContext(registrar).startActivity(intent)
+        context!!.startActivity(intent)
     }
 
-    private fun getAppInfo(packageManager: PackageManager, packageName: String): Map<String, Any?>? {
+    private fun getAppInfo(
+        packageManager: PackageManager,
+        packageName: String
+    ): Map<String, Any?>? {
         var installedApps = packageManager.getInstalledApplications(0)
         installedApps = installedApps.filter { app -> app.packageName == packageName }
         return if (installedApps.isEmpty()) null
-        else convertAppToMap(packageManager, installedApps[0], true);
+        else convertAppToMap(packageManager, installedApps[0], true)
     }
 
 }
diff --git a/android/src/main/kotlin/com/sharmadhiraj/installed_apps/Util.kt b/android/src/main/kotlin/com/sharmadhiraj/installed_apps/Util.kt
@@ -11,18 +11,22 @@ import android.graphics.drawable.Drawable
 import android.os.Build.VERSION.SDK_INT
 import android.os.Build.VERSION_CODES.N_MR1
 import android.os.Build.VERSION_CODES.P
-import io.flutter.plugin.common.PluginRegistry
 import java.io.ByteArrayOutputStream
 
 class Util {
 
     companion object {
 
-        fun convertAppToMap(packageManager: PackageManager, app: ApplicationInfo, withIcon: Boolean): HashMap<String, Any?> {
+        fun convertAppToMap(
+            packageManager: PackageManager,
+            app: ApplicationInfo,
+            withIcon: Boolean
+        ): HashMap<String, Any?> {
             val map = HashMap<String, Any?>()
             map["name"] = packageManager.getApplicationLabel(app)
             map["package_name"] = app.packageName
-            map["icon"] = if (withIcon) drawableToByteArray(app.loadIcon(packageManager)) else ByteArray(0)
+            map["icon"] =
+                if (withIcon) drawableToByteArray(app.loadIcon(packageManager)) else ByteArray(0)
             val packageInfo = packageManager.getPackageInfo(app.packageName, 0)
             map["version_name"] = packageInfo.versionName
             map["version_code"] = getVersionCode(packageInfo)
@@ -38,19 +42,19 @@ class Util {
 
         private fun drawableToBitmap(drawable: Drawable): Bitmap {
             if (SDK_INT <= N_MR1) return (drawable as BitmapDrawable).bitmap
-            val bitmap = Bitmap.createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888)
+            val bitmap = Bitmap.createBitmap(
+                drawable.intrinsicWidth,
+                drawable.intrinsicHeight,
+                Bitmap.Config.ARGB_8888
+            )
             val canvas = Canvas(bitmap)
             drawable.setBounds(0, 0, canvas.width, canvas.height)
             drawable.draw(canvas)
             return bitmap
         }
 
-        fun getContext(registrar: PluginRegistry.Registrar): Context {
-            return registrar.context()
-        }
-
-        fun getPackageManager(registrar: PluginRegistry.Registrar): PackageManager {
-            return getContext(registrar).packageManager
+        fun getPackageManager(context: Context): PackageManager {
+            return context.packageManager
         }
 
         @Suppress("DEPRECATION")
diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies
diff --git a/example/.gitignore b/example/.gitignore
@@ -68,3 +68,4 @@
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+.flutter-plugins-dependencies
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -37,10 +37,9 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.sharmadhiraj.installed_apps_example"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:exported="true"
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
@@ -1,11 +1,10 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/dhirajsharma/Downloads/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/dhirajsharma/Drive/Personal/Projects/Flutter/installed_apps/example"
+export "FLUTTER_ROOT=/Users/dhirajsharma/Drive/SDKs/flutter"
+export "FLUTTER_APPLICATION_PATH=/Users/dhirajsharma/Drive/Desk/Personal/Projects/Flutter/installed_apps/example"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
-export "SYMROOT=${SOURCE_ROOT}/../build/ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
 export "DART_OBFUSCATION=false"
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -99,7 +99,7 @@ class HomeScreen extends StatelessWidget {
         return AlertDialog(
           content: Text(text),
           actions: <Widget>[
-            FlatButton(
+            TextButton(
               child: Text("Close"),
               onPressed: () => Navigator.of(context).pop(),
             ),
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,14 +21,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -80,14 +80,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
@@ -141,7 +148,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
@@ -155,7 +162,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"
   flutter: ">=1.12.0"
diff --git a/lib/installed_apps.dart b/lib/installed_apps.dart
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@ group 'com.sharmadhiraj.installed_apps'`
`2`	`2`	`version '1.0-SNAPSHOT'`
`3`	`3`
`4`	`4`	`buildscript {`
`5`		`- ext.kotlin_version = '1.5.10'`
	`5`	`+ ext.kotlin_version = '1.6.10'`
`6`	`6`	`repositories {`
`7`	`7`	`google()`
`8`	`8`	`mavenCentral()`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- classpath 'com.android.tools.build:gradle:4.2.1'`
	`12`	`+ classpath 'com.android.tools.build:gradle:4.2.2'`
`13`	`13`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`14`	`14`	`}`
`15`	`15`	`}`