Use Google code scanner

V2rayNG/app/build.gradle

@@ -109,11 +109,11 @@ dependencies {
     implementation 'io.reactivex:rxjava:1.3.8'
     implementation 'io.reactivex:rxandroid:1.2.1'
     implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar'
-    implementation 'me.dm7.barcodescanner:core:1.9.8'
-    implementation 'me.dm7.barcodescanner:zxing:1.9.8'
     implementation 'com.github.jorgecastilloprz:fabprogresscircle:1.01@aar'
     implementation 'me.drakeet.support:toastcompat:1.1.0'
     implementation 'com.blacksquircle.ui:editorkit:2.1.1'
     implementation 'com.blacksquircle.ui:language-base:2.1.1'
     implementation 'com.blacksquircle.ui:language-json:2.1.1'
+    implementation 'io.github.g00fy2.quickie:quickie-bundled:1.6.0'
+    implementation 'com.google.zxing:core:3.5.1'
 }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/AppConfig.kt

@@ -39,6 +39,7 @@ object AppConfig {
     const val PREF_PER_APP_PROXY_SET = "pref_per_app_proxy_set"
     const val PREF_BYPASS_APPS = "pref_bypass_apps"
     const val PREF_CONFIRM_REMOVE = "pref_confirm_remove"
+    const val PREF_START_SCAN_IMMEDIATE = "pref_start_scan_immediate"
 
     const val HTTP_PROTOCOL: String = "http://"
     const val HTTPS_PROTOCOL: String = "https://"

V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt

@@ -3,58 +3,62 @@ package com.v2ray.ang.ui
 import android.Manifest
 import android.app.Activity
 import android.os.Bundle
-import com.google.zxing.Result
-import me.dm7.barcodescanner.zxing.ZXingScannerView
 import android.content.Intent
 import android.graphics.BitmapFactory
 import android.os.Build
 import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.result.contract.ActivityResultContracts
-import com.google.zxing.BarcodeFormat
 import com.tbruyelle.rxpermissions.RxPermissions
+import com.tencent.mmkv.MMKV
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.QRCodeDecoder
+import io.github.g00fy2.quickie.QRResult
+import io.github.g00fy2.quickie.ScanCustomCode
+import io.github.g00fy2.quickie.config.ScannerConfig
 
-class ScannerActivity : BaseActivity(), ZXingScannerView.ResultHandler {
+class ScannerActivity : BaseActivity(){
 
-    private var mScannerView: ZXingScannerView? = null
+    private val scanQrCode = registerForActivityResult(ScanCustomCode(), ::handleResult)
+    private val settingsStorage by lazy { MMKV.mmkvWithID(MmkvManager.ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        mScannerView = ZXingScannerView(this)   // Programmatically initialize the scanner view
 
-        mScannerView?.setAutoFocus(true)
-        val formats = ArrayList<BarcodeFormat>()
-        formats.add(BarcodeFormat.QR_CODE)
-        mScannerView?.setFormats(formats)
-
-        setContentView(mScannerView)                // Set the scanner view as the content view
+        if (settingsStorage?.decodeBool(AppConfig.PREF_START_SCAN_IMMEDIATE) == true) {
+            launchScan()
+        }
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
 
     public override fun onResume() {
         super.onResume()
-        mScannerView!!.setResultHandler(this) // Register ourselves as a handler for scan results.
-        mScannerView!!.startCamera()          // Start camera on resume
     }
 
     public override fun onPause() {
         super.onPause()
-        mScannerView!!.stopCamera()           // Stop camera on pause
     }
 
-    override fun handleResult(rawResult: Result) {
-        // Do something with the result here
-//        Log.v(FragmentActivity.TAG, rawResult.text) // Prints scan results
-//        Log.v(FragmentActivity.TAG, rawResult.barcodeFormat.toString()) // Prints the scan format (qrcode, pdf417 etc.)
+    private fun launchScan(){
+        scanQrCode.launch(
+            ScannerConfig.build {
+                setHapticSuccessFeedback(true) // enable (default) or disable haptic feedback when a barcode was detected
+                setShowTorchToggle(true) // show or hide (default) torch/flashlight toggle button
+                setShowCloseButton(true) // show or hide (default) close button
+            }
+        )
+    }
 
-        finished(rawResult.text)
-
-        // If you would like to resume scanning, call this method below:
-//        mScannerView!!.resumeCameraPreview(this)
+    private fun handleResult(result: QRResult) {
+        if (result is QRResult.QRSuccess ) {
+            finished(result.content.rawValue)
+        } else {
+            finish()
+        }
     }
 
     private fun finished(text: String) {
@@ -70,6 +74,10 @@ class ScannerActivity : BaseActivity(), ZXingScannerView.ResultHandler {
     }
 
     override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
+        R.id.scan_code -> {
+            launchScan()
+            true
+        }
         R.id.select_photo -> {
             val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 Manifest.permission.READ_MEDIA_IMAGES

V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/SettingsViewModel.kt

@@ -50,7 +50,8 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
             AppConfig.PREF_PREFER_IPV6,
             AppConfig.PREF_PER_APP_PROXY,
             AppConfig.PREF_BYPASS_APPS,
-            AppConfig.PREF_CONFIRM_REMOVE, -> {
+            AppConfig.PREF_CONFIRM_REMOVE,
+            AppConfig.PREF_START_SCAN_IMMEDIATE, -> {
                 settingsStorage?.encode(key, sharedPreferences.getBoolean(key, false))
             }
             AppConfig.PREF_SNIFFING_ENABLED -> {

V2rayNG/app/src/main/res/menu/menu_scanner.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/scan_code"
+        android:icon="@drawable/ic_scan_black_24dp"
+        android:title=""
+        app:showAsAction="always" />
     <item
         android:id="@+id/select_photo"
         android:icon="@drawable/ic_image_photo"

V2rayNG/app/src/main/res/values-fa/strings.xml

@@ -147,6 +147,9 @@
     <string name="title_pref_confirm_remove">تایید حذف پرونده پیکربندی</string>
     <string name="summary_pref_confirm_remove">آیا برای حذف پرونده پیکربندی نیاز به تایید دوم توسط کاربر است</string>
 
+    <string name="title_pref_start_scan_immediate">Start scanning immediately</string>
+    <string name="summary_pref_start_scan_immediate">Open the camera to scan immediately at startup, otherwise you can choose to scan the code or select a photo in the toolbar</string>
+
     <string name="title_pref_feedback">بازخورد</string>
     <string name="summary_pref_feedback">بهبودهای بازخورد یا اشکالات در گیت‌هاب</string>
     <string name="summary_pref_tg_group">عضویت در گروه تلگرام</string>
@@ -159,6 +162,7 @@
     <string name="title_mode">حالت</string>
     <string name="title_mode_help">برای راهنمایی بیشتر روی این متن، کلیک کنید</string>
     <string name="title_language">زبان</string>
+    <string name="title_ui_settings">UI settings</string>
 
     <string name="title_logcat">گزارشات</string>
     <string name="logcat_copy">کپی</string>

V2rayNG/app/src/main/res/values-ru/strings.xml

@@ -152,6 +152,9 @@
     <string name="title_pref_confirm_remove">Подтверждение удаления профиля</string>
     <string name="summary_pref_confirm_remove">Требовать двойное подтверждение удаления профиля</string>
 
+    <string name="title_pref_start_scan_immediate">Start scanning immediately</string>
+    <string name="summary_pref_start_scan_immediate">Open the camera to scan immediately at startup, otherwise you can choose to scan the code or select a photo in the toolbar</string>
+
     <string name="title_pref_feedback">Обратная связь</string>
     <string name="summary_pref_feedback">Предложить улучшение или сообщить об ошибке на GitHub</string>
     <string name="summary_pref_tg_group">Присоединиться к группе в Telegram</string>
@@ -164,6 +167,7 @@
     <string name="title_mode">Режим</string>
     <string name="title_mode_help">Нажмите для получения дополнительной информации</string>
     <string name="title_language">Язык</string>
+    <string name="title_ui_settings">UI settings</string>
 
     <string name="title_logcat">Системный журнал</string>
     <string name="logcat_copy">Копировать</string>

V2rayNG/app/src/main/res/values-vi/strings.xml

@@ -146,6 +146,9 @@
     <string name="title_pref_confirm_remove">Hiển thị thông báo xác nhận xoá cấu hình</string>
     <string name="summary_pref_confirm_remove">Hiển thị thông báo xác nhận xoá cấu hình khi bạn xoá một cấu hình.</string>
 
+    <string name="title_pref_start_scan_immediate">Start scanning immediately</string>
+    <string name="summary_pref_start_scan_immediate">Open the camera to scan immediately at startup, otherwise you can choose to scan the code or select a photo in the toolbar</string>
+
     <string name="title_pref_feedback">Phản hồi lỗi</string>
     <string name="summary_pref_feedback">Phản hồi cải tiến hoặc lỗi lên GitHub</string>
     <string name="summary_pref_tg_group">Tham gia nhóm Telegram</string>
@@ -158,6 +161,7 @@
     <string name="title_mode">Chế độ kết nối</string>
     <string name="title_mode_help">Nhấn vào đây nếu bạn cần trợ giúp!</string>
     <string name="title_language">Ngôn ngữ</string>
+    <string name="title_ui_settings">UI settings</string>
 
     <string name="title_logcat">Nhật ký hoạt động</string>
     <string name="logcat_copy">Sao chép nhật ký</string>

V2rayNG/app/src/main/res/values-zh-rCN/strings.xml

@@ -146,6 +146,9 @@
     <string name="title_pref_confirm_remove">删除配置文件确认</string>
     <string name="summary_pref_confirm_remove">删除配置文件是否需要用户二次确认</string>
 
+    <string name="title_pref_start_scan_immediate">立即启动扫码</string>
+    <string name="summary_pref_start_scan_immediate">启动时立即打开相机扫描，否则可在工具栏选择扫码或选照片</string>
+
     <string name="title_pref_feedback">反馈</string>
     <string name="summary_pref_feedback">反馈改进或漏洞至 GitHub</string>
     <string name="summary_pref_tg_group">加入Telegram Group</string>
@@ -158,6 +161,7 @@
     <string name="title_mode">模式</string>
     <string name="title_mode_help">点此查看更多帮助</string>
     <string name="title_language">语言</string>
+    <string name="title_ui_settings">用户界面设置</string>
 
     <string name="title_logcat">Logcat</string>
     <string name="logcat_copy">复制</string>

V2rayNG/app/src/main/res/values-zh-rTW/strings.xml

@@ -146,6 +146,9 @@
     <string name="title_pref_confirm_remove">刪除配置文件確認</string>
     <string name="summary_pref_confirm_remove">刪除配置文件是否需要用戶二次確認</string>
 
+    <string name="title_pref_start_scan_immediate">立即啟動掃碼</string>
+    <string name="summary_pref_start_scan_immediate">啟動時立即打開相機掃描，否則可在工具欄選擇掃碼或選照片</string>
+
     <string name="title_pref_feedback">意見回饋</string>
     <string name="summary_pref_feedback">前往 GitHub 回報錯誤</string>
     <string name="summary_pref_tg_group">加入 Telegram 群組</string>
@@ -158,6 +161,7 @@
     <string name="title_mode">模式</string>
     <string name="title_mode_help">輕觸以檢視說明</string>
     <string name="title_language">語言</string>
+    <string name="title_ui_settings">用戶界面設置</string>
 
     <string name="title_logcat">Logcat</string>
     <string name="logcat_copy">複製</string>

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

@@ -154,6 +154,9 @@
     <string name="title_pref_confirm_remove">Delete configuration file confirmation</string>
     <string name="summary_pref_confirm_remove">Whether to delete the configuration file requires a second confirmation by the user</string>
 
+    <string name="title_pref_start_scan_immediate">Start scanning immediately</string>
+    <string name="summary_pref_start_scan_immediate">Open the camera to scan immediately at startup, otherwise you can choose to scan the code or select a photo in the toolbar</string>
+
     <string name="title_pref_feedback">Feedback</string>
     <string name="summary_pref_feedback">Feedback enhancements or bugs to GitHub</string>
     <string name="summary_pref_tg_group">Join Telegram Group</string>
@@ -166,6 +169,7 @@
     <string name="title_mode">Mode</string>
     <string name="title_mode_help">Click me for more help</string>
     <string name="title_language">Language</string>
+    <string name="title_ui_settings">UI settings</string>
 
     <string name="title_logcat">Logcat</string>
     <string name="logcat_copy">Copy</string>

V2rayNG/app/src/main/res/xml/pref_settings.xml

@@ -124,6 +124,20 @@
                 android:summary="%s"
                 android:title="@string/title_mode" />
 
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/title_ui_settings">
+
+        <CheckBoxPreference
+            android:key="pref_confirm_remove"
+            android:summary="@string/summary_pref_confirm_remove"
+            android:title="@string/title_pref_confirm_remove" />
+
+        <CheckBoxPreference
+            android:key="pref_start_scan_immediate"
+            android:summary="@string/summary_pref_start_scan_immediate"
+            android:title="@string/title_pref_start_scan_immediate" />
+
         <ListPreference
             android:defaultValue="auto"
             android:entries="@array/language_select"
@@ -132,10 +146,5 @@
             android:summary="%s"
             android:title="@string/title_language" />
 
-        <CheckBoxPreference
-            android:key="pref_confirm_remove"
-            android:summary="@string/summary_pref_confirm_remove"
-            android:title="@string/title_pref_confirm_remove" />
-
     </PreferenceCategory>
 </PreferenceScreen>