Merge pull request #50 from sameerasw/scanner

Scanner

Author: sameerasw

app/build.gradle.kts

@@ -15,8 +15,8 @@ android {
         applicationId = "com.sameerasw.airsync"
         minSdk = 30
         targetSdk = 36
-        versionCode = 11
-        versionName = "2.1.4"
+        versionCode = 12
+        versionName = "2.1.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -89,6 +89,16 @@ dependencies {
     implementation(libs.ui.graphics)
     implementation(libs.androidx.foundation)
 
+    // CameraX for QR scanning
+    implementation("androidx.camera:camera-core:1.4.0")
+    implementation("androidx.camera:camera-camera2:1.4.0")
+    implementation("androidx.camera:camera-lifecycle:1.4.0")
+    implementation("androidx.camera:camera-view:1.4.0")
+    implementation("androidx.camera:camera-mlkit-vision:1.4.0")
+
+    // ML Kit barcode scanner (QR code only)
+    implementation("com.google.mlkit:barcode-scanning:17.3.0")
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

app/src/main/AndroidManifest.xml

@@ -22,6 +22,9 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
+    <!-- Camera permission for QR code scanner -->
+    <uses-permission android:name="android.permission.CAMERA" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -93,6 +96,20 @@
             </intent-filter>
         </service>
 
+        <!-- QR Code Scanner Activity -->
+        <activity
+            android:name=".presentation.ui.activities.QRScannerActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.AirSync"
+            android:screenOrientation="portrait">
+            <!-- Allow external apps to launch the scanner -->
+            <intent-filter>
+                <action android:name="com.sameerasw.airsync.SCAN_QR" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <!-- Mac Media Player Service - creates native Android media player UI -->
         <service
             android:name=".service.MacMediaPlayerService"

app/src/main/java/com/sameerasw/airsync/MainActivity.kt

@@ -3,6 +3,7 @@ package com.sameerasw.airsync
 import android.Manifest
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -27,10 +28,9 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.core.net.toUri
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import com.sameerasw.airsync.data.local.DataStoreManager
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.Flow
+import android.content.Intent
+import com.sameerasw.airsync.presentation.ui.activities.QRScannerActivity
+import com.sameerasw.airsync.utils.WebSocketUtil
 
 class MainActivity : ComponentActivity() {
 
@@ -40,9 +40,35 @@ class MainActivity : ComponentActivity() {
     ) { isGranted ->
     }
 
+    private val qrScannerLauncher = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) { result ->
+        if (result.resultCode == RESULT_OK) {
+            val qrCode = result.data?.getStringExtra("QR_CODE")
+            if (qrCode != null) {
+                // Parse and connect with the QR code data
+                handleQRCodeResult(qrCode)
+            }
+        } else {
+            // User cancelled or invalid QR, do nothing - app remains open
+        }
+    }
+
     @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        // Check if this is a QS tile long-press intent and device is not connected
+        if (intent?.action == "android.service.quicksettings.action.QS_TILE_PREFERENCES") {
+            if (!WebSocketUtil.isConnected()) {
+                // Not connected, open QR scanner instead
+                val qrScannerIntent = Intent(this, QRScannerActivity::class.java)
+                qrScannerLauncher.launch(qrScannerIntent)
+                return
+            }
+        }
+
+        // ...existing code...
         // Enable full edge-to-edge drawing for both status and navigation bars
         enableEdgeToEdge(
             statusBarStyle = SystemBarStyle.auto(
@@ -181,4 +207,69 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
+
+    private fun handleQRCodeResult(qrCode: String) {
+        try {
+            val uri = android.net.Uri.parse(qrCode)
+
+            // Validate QR code format: must be airsync scheme with host and port
+            if (uri.scheme != "airsync") {
+                Log.w("MainActivity", "Invalid QR code scheme: ${uri.scheme}")
+                android.widget.Toast.makeText(
+                    this,
+                    "Invalid QR code format",
+                    android.widget.Toast.LENGTH_SHORT
+                ).show()
+                finish()
+                return
+            }
+
+            val host = uri.host
+            val port = uri.port
+
+            if (host.isNullOrEmpty() || port == -1) {
+                Log.w("MainActivity", "Invalid QR code: missing host or port")
+                android.widget.Toast.makeText(
+                    this,
+                    "Invalid QR code format",
+                    android.widget.Toast.LENGTH_SHORT
+                ).show()
+                finish()
+                return
+            }
+
+            // Valid QR code, proceed with connection
+            val mainIntent = Intent(this, MainActivity::class.java).apply {
+                data = uri
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+            }
+            startActivity(mainIntent)
+            finish()
+        } catch (e: Exception) {
+            Log.e("MainActivity", "Error handling QR code result: ${e.message}", e)
+            android.widget.Toast.makeText(
+                this,
+                "Invalid QR code format",
+                android.widget.Toast.LENGTH_SHORT
+            ).show()
+            finish()
+        }
+    }
+
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+
+        // Check if this is a QS tile long-press intent
+        if (intent?.action == "android.service.quicksettings.action.QS_TILE_PREFERENCES") {
+            // Check if device is connected
+            if (!WebSocketUtil.isConnected()) {
+                // Not connected, open QR scanner
+                val qrScannerIntent = Intent(this, QRScannerActivity::class.java).apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+                }
+                startActivity(qrScannerIntent)
+                finish()
+            }
+        }
+    }
 }