Merge pull request #51 from david0154/feat/vision-search-multilang-fixes-8062784426717246400

feat: Add image processing, web search, and improve multilingual support

Author: david0154

app/src/main/kotlin/com/davidstudioz/david/MainActivity.kt

@@ -35,6 +35,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.lifecycleScope
+import com.davidstudioz.david.ai.ImageProcessor
 import com.davidstudioz.david.chat.ChatManager
 import com.davidstudioz.david.chat.ScriptureDownloadManager
 import com.davidstudioz.david.device.DeviceAccessManager
@@ -89,6 +90,7 @@ class MainActivity : ComponentActivity() {
 
     // NEW: Scripture download manager
     private var scriptureDownloadManager: ScriptureDownloadManager? = null
+    private var imageProcessor: ImageProcessor? = null
 
     // UI State
     private var isListening by mutableStateOf(false)
@@ -106,6 +108,17 @@ class MainActivity : ComponentActivity() {
     // NEW: Chat & Download UI state
     private var showChatScreen by mutableStateOf(false)
     private var showDownloadDialog by mutableStateOf(false)
+    private val imagePickerLauncher =
+        registerForActivityResult(ActivityResultContracts.GetContent()) { uri: Uri? ->
+            uri?.let {
+                lifecycleScope.launch {
+                    val result = imageProcessor?.processImage(it)
+                    if (result != null) {
+                        chatManager?.sendMessage(result)
+                    }
+                }
+            }
+        }
 
     private val permissionLauncher = registerForActivityResult(
         ActivityResultContracts.RequestMultiplePermissions()
@@ -201,6 +214,7 @@ class MainActivity : ComponentActivity() {
 
     private fun initCoreComponents() {
         Log.d(TAG, "Initializing core components...")
+        imageProcessor = ImageProcessor(this)
         resourceManager = DeviceResourceManager(this)
         resourceStatus = resourceManager?.getResourceStatus()
 
@@ -487,7 +501,8 @@ class MainActivity : ComponentActivity() {
             onClearChat = {
                 chatManager?.clearHistory()
                 chatHistory = emptyList()
-            }
+            },
+            onImageUpload = { imagePickerLauncher.launch("image/*") }
         )
     }
 

app/src/main/kotlin/com/davidstudioz/david/ai/ImageProcessor.kt

@@ -0,0 +1,46 @@
+package com.davidstudioz.david.ai
+
+import android.content.Context
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.util.Log
+import com.google.mlkit.vision.common.InputImage
+import com.google.mlkit.vision.label.ImageLabeling
+import com.google.mlkit.vision.label.defaults.ImageLabelerOptions
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class ImageProcessor(private val context: Context) {
+
+    private val labeler = ImageLabeling.getClient(ImageLabelerOptions.DEFAULT_OPTIONS)
+
+    suspend fun processImage(uri: Uri): String = withContext(Dispatchers.IO) {
+        try {
+            val inputStream = context.contentResolver.openInputStream(uri)
+            val bitmap = BitmapFactory.decodeStream(inputStream)
+            val image = InputImage.fromBitmap(bitmap, 0)
+
+            val result = labeler.process(image).continueWith { task ->
+                if (task.isSuccessful) {
+                    val labels = task.result
+                    if (labels.isNotEmpty()) {
+                        labels.joinToString(", ") { it.text }
+                    } else {
+                        "I'm not sure what this is."
+                    }
+                } else {
+                    "I couldn't analyze the image."
+                }
+            }
+
+            result.result
+        } catch (e: Exception) {
+            Log.e(TAG, "Error processing image", e)
+            "I couldn't process the image."
+        }
+    }
+
+    companion object {
+        private const val TAG = "ImageProcessor"
+    }
+}

app/src/main/kotlin/com/davidstudioz/david/chat/ChatManager.kt

@@ -9,8 +9,9 @@ import com.davidstudioz.david.voice.VoiceCommandProcessor
 import com.davidstudioz.david.web.WebSearchEngine
 import com.davidstudioz.david.features.WeatherService
 import com.davidstudioz.david.features.NewsService
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
@@ -32,8 +33,9 @@ data class ChatMessage(
  * ✅ No generic "I understand you're asking" for non-English
  * ✅ All features work in all languages
  */
-class ChatManager(private val context: Context) {
-
+class ChatManager(private val context:Context) {
+    private val job = SupervisorJob()
+    private val coroutineScope = CoroutineScope(Dispatchers.IO + job)
     private val messages = mutableListOf<ChatMessage>()
     private val modelsDir = File(context.filesDir, "david_models")
 
@@ -56,7 +58,7 @@ class ChatManager(private val context: Context) {
     }
 
     private fun loadBestAvailableModel() {
-        GlobalScope.launch(Dispatchers.IO) {
+        coroutineScope.launch {
             try {
                 if (!modelsDir.exists()) {
                     modelsDir.mkdirs()
@@ -110,8 +112,15 @@ class ChatManager(private val context: Context) {
                     isCommand(correctedMessage) -> executeCommand(correctedMessage)
                     isWeatherQuery(correctedMessage) -> getWeatherInfo(correctedMessage)
                     isMotivationQuery(correctedMessage) -> getMotivation(correctedMessage, detectedLang)
-                    webSearch.needsWebSearch(correctedMessage) -> searchWeb(correctedMessage)
-                    isModelReady() -> generateWithModel(correctedMessage)
+                    isSearchQuery(correctedMessage) -> searchWeb(correctedMessage)
+                    isModelReady() -> {
+                        val modelResponse = generateWithModel(correctedMessage)
+                        if (modelResponse.isNotBlank() && modelResponse.length > 5) {
+                            modelResponse
+                        } else {
+                            searchWeb(correctedMessage)
+                        }
+                    }
                     else -> generateSmartFallback(correctedMessage, detectedLang)
                 }
 
@@ -133,6 +142,13 @@ class ChatManager(private val context: Context) {
             )
         }
     }
+    private fun isSearchQuery(message: String): Boolean {
+        val lower = message.lowercase()
+        return lower.startsWith("search for") || lower.startsWith("google") ||
+                lower.startsWith("what is") || lower.startsWith("who is") ||
+                lower.startsWith("where is") || lower.startsWith("when is") ||
+                lower.startsWith("how to")
+    }
 
     private suspend fun generateWithModel(input: String): String = withContext(Dispatchers.IO) {
         return@withContext try {
@@ -437,6 +453,7 @@ class ChatManager(private val context: Context) {
 
     fun release() {
         universalLoader.release()
+        job.cancel()
     }
 
     companion object {

app/src/main/kotlin/com/davidstudioz/david/chat/LanguageDetector.kt

@@ -9,50 +9,60 @@ import android.util.Log
  * ✅ Keyword-based fallback
  */
 class LanguageDetector {
-    
+    private val languageKeywords = mapOf(
+        "hi" to listOf("क्या", "है", "और", "में", "से", "नमस्ते"),
+        "bn" to listOf("কি", "এবং", "থেকে", "নমস্কার"),
+        "ta" to listOf("என்ன", "மற்றும்", "இருந்து", "வணக்கம்"),
+        "te" to listOf("ఏమిటి", "మరియు", "నుండి", "నమస్కారం"),
+        "mr" to listOf("काय", "आणि", "पासून", "नमस्कार"),
+        "gu" to listOf("શું", "અને", "માંથી", "નમસ્તે"),
+        "kn" to listOf("ಏನು", "ಮತ್ತು", "ಇಂದ", "ನಮಸ್ಕಾರ"),
+        "ml" to listOf("എന്ത്", "കൂടാതെ", "നിന്ന്", "നമസ്കാരം"),
+        "pa" to listOf("ਕੀ", "ਅਤੇ", "ਤੋਂ", "ਸਤ ਸ੍ਰੀ ਅਕਾਲ"),
+        "or" to listOf("କଣ", "ଏବଂ", "ଠାରୁ", "ନମସ୍କାର"),
+        "ur" to listOf("کیا", "اور", "سے", "آداب"),
+        "as" to listOf("কি", "আৰু", "পৰা", "নমস্কাৰ"),
+        "ks" to listOf("کیاہ", " تہٕ", "پؠٹھ", "آدا̄ب"),
+        "sa" to listOf("किम्", "च", "तः", "नमस्ते")
+    )
+
     fun detectLanguage(text: String): String {
         if (text.isBlank()) return "en"
-        
+
         // Check for specific scripts
-        val language = when {
-            // Devanagari script (Hindi, Marathi, Sanskrit)
+        val scriptBasedLanguage = when {
             text.any { it in '\u0900'..'\u097F' } -> detectDevanagari(text)
-            
-            // Bengali script
             text.any { it in '\u0980'..'\u09FF' } -> "bn"
-            
-            // Tamil script
             text.any { it in '\u0B80'..'\u0BFF' } -> "ta"
-            
-            // Telugu script
             text.any { it in '\u0C00'..'\u0C7F' } -> "te"
-            
-            // Gujarati script
             text.any { it in '\u0A80'..'\u0AFF' } -> "gu"
-            
-            // Kannada script
             text.any { it in '\u0C80'..'\u0CFF' } -> "kn"
-            
-            // Malayalam script
             text.any { it in '\u0D00'..'\u0D7F' } -> "ml"
-            
-            // Punjabi script (Gurmukhi)
             text.any { it in '\u0A00'..'\u0A7F' } -> "pa"
-            
-            // Odia script
             text.any { it in '\u0B00'..'\u0B7F' } -> "or"
-            
-            // Urdu (uses Arabic script)
             text.any { it in '\u0600'..'\u06FF' } -> "ur"
-            
-            // English (default)
             else -> "en"
         }
-        
-        Log.d(TAG, "Detected language: $language for text: ${text.take(50)}")
-        return language
+
+        val keywordBasedLanguage = detectLanguageWithKeywords(text)
+        if (keywordBasedLanguage != "en") {
+            return keywordBasedLanguage
+        }
+
+        Log.d(TAG, "Detected language: $scriptBasedLanguage for text: ${text.take(50)}")
+        return scriptBasedLanguage
     }
-    
+
+    private fun detectLanguageWithKeywords(text: String): String {
+        val lowerText = text.lowercase()
+        for ((lang, keywords) in languageKeywords) {
+            if (keywords.any { it in lowerText }) {
+                return lang
+            }
+        }
+        return "en"
+    }
+
     private fun detectDevanagari(text: String): String {
         val lower = text.lowercase()
         return when {
@@ -64,7 +74,7 @@ class LanguageDetector {
             else -> "hi"
         }
     }
-    
+
     fun getLanguageName(code: String): String {
         return when (code) {
             "en" -> "English"

app/src/main/kotlin/com/davidstudioz/david/voice/VoiceManager.kt

@@ -193,35 +193,24 @@ class VoiceManager(private val context: Context) {
      * Set language
      */
     fun setLanguage(languageCode: String): Boolean {
-        return try {
-            currentLanguage = languageCode
-            val locale = when (languageCode) {
-                "hi" -> Locale("hi", "IN")
-                "ta" -> Locale("ta", "IN")
-                "te" -> Locale("te", "IN")
-                "bn" -> Locale("bn", "IN")
-                "mr" -> Locale("mr", "IN")
-                "gu" -> Locale("gu", "IN")
-                "kn" -> Locale("kn", "IN")
-                "ml" -> Locale("ml", "IN")
-                "pa" -> Locale("pa", "IN")
-                else -> Locale.US
-            }
-            
-            val result = tts?.setLanguage(locale)
-            val success = result != TextToSpeech.LANG_MISSING_DATA && result != TextToSpeech.LANG_NOT_SUPPORTED
-            
-            if (success) {
-                Log.d(TAG, "Language set to: $languageCode")
-            } else {
-                Log.e(TAG, "Language not supported: $languageCode")
+        currentLanguage = languageCode
+        val locale = Locale(languageCode)
+        var ttsSuccess = false
+        if (isTTSReady) {
+            try {
+                val result = tts?.setLanguage(locale)
+                if (result != TextToSpeech.LANG_MISSING_DATA && result != TextToSpeech.LANG_NOT_SUPPORTED) {
+                    ttsSuccess = true
+                    Log.d(TAG, "TTS language set to: $languageCode")
+                } else {
+                    Log.e(TAG, "TTS language not supported: $languageCode")
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "Error setting TTS language", e)
             }
-            
-            success
-        } catch (e: Exception) {
-            Log.e(TAG, "Error setting language", e)
-            false
         }
+
+        return ttsSuccess
     }
 
     fun isListening(): Boolean = isListening