Improve qr scanner

app/src/main/java/io/nekohasekai/sfa/ui/profile/QRScanActivity.kt

@@ -10,6 +10,7 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.camera.core.Camera
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.Preview
@@ -69,6 +70,9 @@ class QRScanActivity : AbstractActivity<ActivityQrScanBinding>() {
         }
     }
     private val vendorAnalyzer = Vendor.createQRCodeAnalyzer(onSuccess, onFailure)
+    private lateinit var cameraProvider: ProcessCameraProvider
+    private lateinit var cameraPreview: Preview
+    private lateinit var camera: Camera
 
     private fun startCamera() {
         val cameraProviderFuture = try {
@@ -78,14 +82,14 @@ class QRScanActivity : AbstractActivity<ActivityQrScanBinding>() {
             return
         }
         cameraProviderFuture.addListener({
-            val cameraProvider = try {
+            cameraProvider = try {
                 cameraProviderFuture.get()
             } catch (e: Exception) {
                 fatalError(e)
                 return@addListener
             }
 
-            val preview = Preview.Builder().build()
+            cameraPreview = Preview.Builder().build()
                 .also { it.setSurfaceProvider(binding.previewView.surfaceProvider) }
             imageAnalysis = ImageAnalysis.Builder().build()
             imageAnalyzer = vendorAnalyzer ?: ZxingQRCodeAnalyzer(onSuccess, onFailure)
@@ -93,8 +97,8 @@ class QRScanActivity : AbstractActivity<ActivityQrScanBinding>() {
             cameraProvider.unbindAll()
 
             try {
-                cameraProvider.bindToLifecycle(
-                    this, CameraSelector.DEFAULT_BACK_CAMERA, preview, imageAnalysis
+                camera = cameraProvider.bindToLifecycle(
+                    this, CameraSelector.DEFAULT_BACK_CAMERA, cameraPreview, imageAnalysis
                 )
             } catch (e: Exception) {
                 fatalError(e)
@@ -134,20 +138,46 @@ class QRScanActivity : AbstractActivity<ActivityQrScanBinding>() {
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        if (vendorAnalyzer == null) {
-            return false
-        }
         menuInflater.inflate(R.menu.qr_scan_menu, menu)
+        if (vendorAnalyzer == null) {
+            menu.findItem(R.id.action_use_vendor_analyzer).isEnabled = false
+        } else {
+            menu.findItem(R.id.action_use_vendor_analyzer).isChecked = true
+        }
         return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.action_disable_vendor_analyzer -> {
+            R.id.action_use_front_camera -> {
+                item.isChecked = !item.isChecked
+                cameraProvider.unbindAll()
+                try {
+                    camera = cameraProvider.bindToLifecycle(
+                        this,
+                        if (!item.isChecked) CameraSelector.DEFAULT_BACK_CAMERA else CameraSelector.DEFAULT_FRONT_CAMERA,
+                        cameraPreview,
+                        imageAnalysis
+                    )
+                } catch (e: Exception) {
+                    fatalError(e)
+                }
+            }
+
+            R.id.action_enable_torch -> {
+                item.isChecked = !item.isChecked
+                camera.cameraControl.enableTorch(item.isChecked)
+            }
+
+            R.id.action_use_vendor_analyzer -> {
+                item.isChecked = !item.isChecked
                 imageAnalysis.clearAnalyzer()
-                imageAnalyzer = ZxingQRCodeAnalyzer(onSuccess, onFailure)
+                imageAnalyzer = if (item.isChecked) {
+                    vendorAnalyzer!!
+                } else {
+                    ZxingQRCodeAnalyzer(onSuccess, onFailure)
+                }
                 imageAnalysis.setAnalyzer(analysisExecutor, imageAnalyzer)
-                item.isVisible = false
             }
 
             else -> return super.onOptionsItemSelected(item)

app/src/main/java/io/nekohasekai/sfa/ui/profileoverride/PerAppProxyActivity.kt

@@ -83,25 +83,27 @@ class PerAppProxyActivity : AbstractActivity<ActivityPerAppProxyBinding>() {
         setTitle(R.string.title_per_app_proxy)
 
         lifecycleScope.launch {
-            proxyMode = if (Settings.perAppProxyMode == Settings.PER_APP_PROXY_INCLUDE) {
-                Settings.PER_APP_PROXY_INCLUDE
-            } else {
-                Settings.PER_APP_PROXY_EXCLUDE
-            }
-            withContext(Dispatchers.Main) {
-                if (proxyMode == Settings.PER_APP_PROXY_INCLUDE) {
-                    binding.perAppProxyMode.setText(R.string.per_app_proxy_mode_include_description)
+            withContext(Dispatchers.IO) {
+                proxyMode = if (Settings.perAppProxyMode == Settings.PER_APP_PROXY_INCLUDE) {
+                    Settings.PER_APP_PROXY_INCLUDE
                 } else {
-                    binding.perAppProxyMode.setText(R.string.per_app_proxy_mode_exclude_description)
+                    Settings.PER_APP_PROXY_EXCLUDE
+                }
+                withContext(Dispatchers.Main) {
+                    if (proxyMode == Settings.PER_APP_PROXY_INCLUDE) {
+                        binding.perAppProxyMode.setText(R.string.per_app_proxy_mode_include_description)
+                    } else {
+                        binding.perAppProxyMode.setText(R.string.per_app_proxy_mode_exclude_description)
+                    }
+                }
+                reloadApplicationList()
+                filterApplicationList()
+                withContext(Dispatchers.Main) {
+                    adapter = ApplicationAdapter(displayPackages)
+                    binding.appList.adapter = adapter
+                    delay(500L)
+                    binding.progress.isVisible = false
                 }
-            }
-            reloadApplicationList()
-            filterApplicationList()
-            withContext(Dispatchers.Main) {
-                adapter = ApplicationAdapter(displayPackages)
-                binding.appList.adapter = adapter
-                delay(500L)
-                binding.progress.isVisible = false
             }
         }
     }

app/src/main/res/layout/sheet_add_profile.xml

@@ -34,6 +34,7 @@
             <TextView
                 android:layout_width="0dp"
                 android:layout_weight="1"
+                android:textSize="16sp"
                 android:text="@string/profile_add_scan_qr_code"
                 android:gravity="center_vertical"
                 android:layout_height="match_parent">
@@ -58,6 +59,7 @@
             <TextView
                 android:layout_width="0dp"
                 android:layout_weight="1"
+                android:textSize="16sp"
                 android:text="@string/profile_add_create_manually"
                 android:gravity="center_vertical"
                 android:layout_height="match_parent">

app/src/main/res/menu/qr_scan_menu.xml

@@ -2,7 +2,19 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:id="@+id/action_disable_vendor_analyzer"
-        android:title="@string/disable_vendor_analyzer" />
+        android:checkable="true"
+        android:id="@+id/action_use_front_camera"
+        android:title="@string/profile_add_scan_use_front_camera" />
+
+    <item
+        android:checkable="true"
+        android:id="@+id/action_enable_torch"
+        android:title="@string/profile_add_scan_enable_torch" />
+
+    <item
+        android:checkable="true"
+        android:id="@+id/action_use_vendor_analyzer"
+        android:title="@string/profile_add_scan_use_vendor_analyzer" />
+
 
 </menu>

app/src/main/res/values/strings.xml

@@ -42,7 +42,10 @@
     <string name="profile_source_import">Import</string>
 
     <string name="profile_add_scan_qr_code">Scan QR code</string>
-    <string name="profile_add_import_from_clipboard">Import remote profile from clipboard</string>
+    <string name="profile_add_scan_use_front_camera">Front camera</string>
+    <string name="profile_add_scan_use_vendor_analyzer">MLKit analyzer</string>
+    <string name="profile_add_scan_enable_torch">Torch</string>
+
     <string name="profile_add_create_manually">Create Manually</string>
 
     <string name="menu_undo">Undo</string>
@@ -189,6 +192,5 @@
     <string name="open_settings">Open Settings</string>
 
     <string name="settings_title_core">Core</string>
-    <string name="disable_vendor_analyzer">Disable Google MLKit</string>
 
 </resources>

app/src/other/java/io/nekohasekai/sfa/vendor/Vendor.kt

@@ -2,7 +2,6 @@ package io.nekohasekai.sfa.vendor
 
 import android.app.Activity
 import androidx.camera.core.ImageAnalysis
-import java.lang.Exception
 
 object Vendor : VendorInterface {