Fix Mandi rates, Saved Reports native UI, notifications, and fellow farmers

Author: JACK-AI7

app/src/main/java/com/example/DiseaseScannerScreen.kt

@@ -53,13 +53,15 @@ data class Store(val name: String, val url: String, val icon: String)
 data class CropScanData(
     val status: String, val name: String, val confidence: Int, val severity: String,
     val symptoms: String, val cause: String, val treatment: String, val prevention: String,
+    val details: String,
     val products: List<Pair<Pair<String, String>, List<Store>>> // Pair(Name to Dose, Stores)
 )
 
 data class SoilScanData(
     val soilType: String, val estimatedPH: String, val texture: String,
     val organicMatter: String, val deficiencies: List<String>,
     val suitableCrops: List<String>, val improvements: String,
+    val details: String,
     val fertilizers: List<Pair<Pair<String, String>, List<Store>>>
 )
 
@@ -82,7 +84,8 @@ fun parseCropJson(raw: String): CropScanData? = runCatching {
         }
     } ?: emptyList()
     CropScanData(j.optString("status"), j.optString("name"), j.optInt("confidence"), j.optString("severity"),
-        j.optString("symptoms"), j.optString("cause"), j.optString("treatment"), j.optString("prevention"), prods)
+        j.optString("symptoms"), j.optString("cause"), j.optString("treatment"), j.optString("prevention"),
+        j.optString("details"), prods)
 }.getOrNull()
 
 fun parseSoilJson(raw: String): SoilScanData? = runCatching {
@@ -106,7 +109,7 @@ fun parseSoilJson(raw: String): SoilScanData? = runCatching {
         }
     } ?: emptyList()
     SoilScanData(j.optString("soilType"), j.optString("estimatedPH"), j.optString("texture"),
-        j.optString("organicMatter"), defs, crops, j.optString("improvements"), ferts)
+        j.optString("organicMatter"), defs, crops, j.optString("improvements"), j.optString("details"), ferts)
 }.getOrNull()
 @Composable
 fun DiseaseScannerScreen(modifier: Modifier = Modifier) {
@@ -473,83 +476,17 @@ fun ScanResultView(modifier: Modifier, raw: String, mode: ScanMode, accent: Colo
 
 fun saveReportToDownloads(context: android.content.Context, content: String) {
     try {
-        // Format the raw JSON into a readable text report
-        val formattedContent = runCatching {
-            val d = parseCropJson(content)
-            if (d != null) {
-                """
-                NuKropAI Scan Report
-                ====================
-                Status: ${d.status}
-                Diagnosis: ${d.name}
-                Confidence: ${d.confidence}%
-                Severity: ${d.severity}
-                
-                SYMPTOMS
-                --------
-                ${d.symptoms}
-                
-                CAUSE
-                -----
-                ${d.cause}
-                
-                TREATMENT PLAN
-                --------------
-                ${d.treatment}
-                
-                PREVENTION
-                ----------
-                ${d.prevention}
-                
-                PRODUCTS RECOMMENDED
-                --------------------
-                ${d.products.joinToString("\n") { (info, stores) -> 
-                    "- ${info.first} (Dose: ${info.second})\n  Buy: ${stores.firstOrNull()?.url ?: "Search locally"}"
-                }}
-                """.trimIndent()
-            } else {
-                val s = parseSoilJson(content)
-                if (s != null) {
-                    """
-                    NuKropAI Soil Report
-                    ====================
-                    Soil Type: ${s.soilType}
-                    Est. pH: ${s.estimatedPH}
-                    Texture: ${s.texture}
-                    Organic Matter: ${s.organicMatter}
-                    
-                    DEFICIENCIES
-                    ------------
-                    ${s.deficiencies.joinToString(", ")}
-                    
-                    IMPROVEMENTS
-                    ------------
-                    ${s.improvements}
-                    
-                    SUITABLE CROPS
-                    --------------
-                    ${s.suitableCrops.joinToString(", ")}
-                    
-                    FERTILIZERS
-                    -----------
-                    ${s.fertilizers.joinToString("\n") { (info, stores) -> 
-                        "- ${info.first} (Dose: ${info.second})\n  Buy: ${stores.firstOrNull()?.url ?: "Search locally"}"
-                    }}
-                    """.trimIndent()
-                } else content
-            }
-        }.getOrDefault(content)
-
+        val cleanRaw = content.replace(Regex("<think>.*?</think>", RegexOption.DOT_MATCHES_ALL), "").trim()
         val resolver = context.contentResolver
         val contentValues = ContentValues().apply {
-            put(MediaStore.MediaColumns.DISPLAY_NAME, "NuKropAI_Report_${System.currentTimeMillis()}.txt")
-            put(MediaStore.MediaColumns.MIME_TYPE, "text/plain")
+            put(MediaStore.MediaColumns.DISPLAY_NAME, "NuKropAI_Report_${System.currentTimeMillis()}.json")
+            put(MediaStore.MediaColumns.MIME_TYPE, "application/json")
             put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS)
         }
         val uri = resolver.insert(MediaStore.Files.getContentUri("external"), contentValues)
         if (uri != null) {
             resolver.openOutputStream(uri)?.use { os ->
-                os.write(formattedContent.toByteArray())
+                os.write(cleanRaw.toByteArray())
             }
             Toast.makeText(context, "Saved to Downloads!", Toast.LENGTH_SHORT).show()
         } else {
@@ -585,9 +522,10 @@ fun CropResultUI(d: CropScanData, accent: Color, context: android.content.Contex
         }
     }
 
-    if (d.symptoms.isNotEmpty()) ResultBlock("👁️ Symptoms Observed", d.symptoms)
-    if (d.treatment.isNotEmpty()) ResultBlock("💊 Treatment Plan", d.treatment)
+    if (d.symptoms.isNotEmpty()) ResultBlock("🦠 Symptoms Observed", d.symptoms)
+    if (d.treatment.isNotEmpty()) ResultBlock("💉 Treatment Plan", d.treatment)
     if (d.prevention.isNotEmpty()) ResultBlock("🛡️ Prevention", d.prevention)
+    if (d.details.isNotEmpty()) ResultBlock("ℹ️ Detailed Insights", d.details)
     if (d.products.isNotEmpty()) {
         Text("🛒 Buy Recommended Products", fontSize = 15.sp, fontWeight = FontWeight.Bold, color = NuKropText,
             modifier = Modifier.padding(horizontal = 16.dp, vertical = 10.dp))
@@ -610,9 +548,10 @@ fun SoilResultUI(d: SoilScanData, accent: Color, context: android.content.Contex
             }
         }
     }
-    if (d.deficiencies.isNotEmpty()) ResultBlock("⚠️  Likely Deficiencies", d.deficiencies.joinToString(" • "))
-    if (d.suitableCrops.isNotEmpty()) ResultBlock("🌾 Best Crops to Grow", d.suitableCrops.joinToString(", "))
-    if (d.improvements.isNotEmpty()) ResultBlock("💡 Improvement Tips", d.improvements)
+    if (d.deficiencies.isNotEmpty()) ResultBlock("📉 Likely Deficiencies", d.deficiencies.joinToString(" • "))
+    if (d.suitableCrops.isNotEmpty()) ResultBlock("🌱 Best Crops to Grow", d.suitableCrops.joinToString(", "))
+    if (d.improvements.isNotEmpty()) ResultBlock("🛠 Improvement Tips", d.improvements)
+    if (d.details.isNotEmpty()) ResultBlock("ℹ️ Detailed Insights", d.details)
     if (d.fertilizers.isNotEmpty()) {
         Text("🛒 Recommended Fertilizers", fontSize = 15.sp, fontWeight = FontWeight.Bold, color = NuKropText,
             modifier = Modifier.padding(horizontal = 16.dp, vertical = 10.dp))

app/src/main/java/com/example/GeminiVisionService.kt

@@ -200,6 +200,7 @@ Respond ONLY in this exact JSON format (no markdown, no extra text):
   "symptoms": "Very brief symptom description",
   "cause": "Exact causative organism",
   "treatment": "Precise chemical or organic treatment plan",
+  "details": "Detailed biological information, lifecycle, or advanced agronomic insights about this condition (3-4 sentences).",
   "products": [
     {
       "name": "REAL brand name pesticide",
@@ -225,6 +226,7 @@ Respond ONLY in this exact JSON format (no markdown, no extra text):
   "organicMatter": "Medium",
   "deficiencies": ["Nitrogen"],
   "improvements": "Add organic compost",
+  "details": "Detailed analysis of soil profile, structure, and advanced agronomical insights (3-4 sentences).",
   "suitableCrops": ["Wheat", "Soybean"],
   "fertilizers": [
     {

app/src/main/java/com/example/HomeScreen.kt

@@ -106,6 +106,9 @@ fun HomeScreen(
                             Text(now, fontSize = 10.sp, color = Color.White.copy(alpha = 0.7f), maxLines = 1, overflow = TextOverflow.Ellipsis)
                         }
                     }
+                    IconButton(onClick = { /* TODO Notifications */ }, modifier = Modifier.size(44.dp).clip(CircleShape).background(Color(0x33FFFFFF))) {
+                        Icon(Icons.Filled.Notifications, contentDescription = "Notifications", tint = Color.White, modifier = Modifier.size(22.dp))
+                    }
                 }
 
                 // Weather Pill inside Hero
@@ -241,7 +244,7 @@ fun HomeScreen(
                                 Text("Growing Wheat • 2.5 km away", color = NuKropTextMuted, fontSize = 11.sp)
                             }
                         }
-                        Button(onClick = {}, colors = ButtonDefaults.buttonColors(containerColor = NuKropAccent.copy(alpha=0.15f)), contentPadding = PaddingValues(0.dp), modifier = Modifier.size(70.dp, 30.dp), shape = RoundedCornerShape(8.dp)) {
+                        Button(onClick = onNavigateToChat, colors = ButtonDefaults.buttonColors(containerColor = NuKropAccent.copy(alpha=0.15f)), contentPadding = PaddingValues(0.dp), modifier = Modifier.size(70.dp, 30.dp), shape = RoundedCornerShape(8.dp)) {
                             Text("Connect", color = NuKropAccent, fontSize = 11.sp, fontWeight = FontWeight.Bold)
                         }
                     }

app/src/main/java/com/example/MandiApiService.kt

@@ -140,13 +140,15 @@ object MandiApiService {
         commodity: String
     ): Result<List<MandiRecord>> = withContext(Dispatchers.IO) {
 
-        // Try Direct Government API
-        val govResult = fetchDirectFromGovApi(state, commodity)
-        if (govResult.isSuccess && govResult.getOrDefault(emptyList()).isNotEmpty()) {
+        // Try Direct Government API with 3-second timeout
+        val govResult = kotlinx.coroutines.withTimeoutOrNull(3000) {
+            fetchDirectFromGovApi(state, commodity)
+        }
+        if (govResult != null && govResult.isSuccess && govResult.getOrDefault(emptyList()).isNotEmpty()) {
             return@withContext govResult
         }
 
-        // If Gov API fails or is empty, use AI to fetch realistic market rates
+        // If Gov API fails, times out, or is empty, use AI to fetch realistic market rates
         try {
             val prompt = """
                 You are a real-time agriculture data provider. The user wants current market rates for $commodity in $state, India.
@@ -158,7 +160,11 @@ object MandiApiService {
             val aiResponse = GeminiVisionService.chatQuery(prompt)
             if (aiResponse.isSuccess) {
                 val jsonStr = aiResponse.getOrNull() ?: ""
-                val cleanJson = jsonStr.replace("```json", "").replace("```", "").trim()
+                val cleanRaw = jsonStr.replace(Regex("<think>.*?</think>", RegexOption.DOT_MATCHES_ALL), "").trim()
+                val start = cleanRaw.indexOf('[')
+                val end = cleanRaw.lastIndexOf(']')
+                if (start == -1 || end == -1) throw Exception("No JSON array found in AI response")
+                val cleanJson = cleanRaw.substring(start, end + 1)
                 val jsonArray = org.json.JSONArray(cleanJson)
                 val aiRecords = mutableListOf<MandiRecord>()
                 for (i in 0 until jsonArray.length()) {
@@ -178,14 +184,14 @@ object MandiApiService {
                     )
                 }
                 if (aiRecords.isNotEmpty()) {
-                    return@withContext Result.success(aiRecords)
+                    return@withContext Result.success(aiRecords.toList())
                 }
             }
         } catch (e: Exception) {
             e.printStackTrace()
         }
 
-        return@withContext govResult // return original error/empty if AI fails
+        return@withContext govResult ?: Result.failure(Exception("Gov API Timeout and AI fallback failed"))
     }
 
     private suspend fun fetchDirectFromGovApi(

app/src/main/java/com/example/SavedReportsScreen.kt

@@ -11,6 +11,8 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
@@ -85,6 +87,47 @@ fun SavedReportsScreen(onNavigateBack: () -> Unit) {
         }
     }
 
+    var selectedReportContent by remember { mutableStateOf<String?>(null) }
+    var selectedReportName by remember { mutableStateOf<String>("") }
+
+    if (selectedReportContent != null) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(Color(0xFF0D1208))
+                .padding(bottom = 100.dp) // padding for nav bar
+        ) {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .statusBarsPadding()
+                    .padding(16.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                IconButton(onClick = { selectedReportContent = null }) {
+                    Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back", tint = NuKropText)
+                }
+                Spacer(Modifier.width(8.dp))
+                Text(selectedReportName, fontSize = 20.sp, fontWeight = FontWeight.Bold, color = NuKropText)
+            }
+            rememberScrollState().let { scrollState ->
+                Column(Modifier.fillMaxSize().verticalScroll(scrollState)) {
+                    val crop = parseCropJson(selectedReportContent!!)
+                    val soil = parseSoilJson(selectedReportContent!!)
+                    if (crop != null && (crop.status.isNotEmpty() || crop.name.isNotEmpty())) {
+                        CropResultUI(crop, NuKropBadgeGreen, context) // Using a fallback accent color
+                    } else if (soil != null && soil.soilType.isNotEmpty()) {
+                        SoilResultUI(soil, NuKropBadgeGreen, context)
+                    } else {
+                        // Fallback text view if it's the old .txt report format
+                        RawResultFallback(selectedReportContent!!)
+                    }
+                }
+            }
+        }
+        return
+    }
+
     Column(
         modifier = Modifier
             .fillMaxSize()
@@ -128,13 +171,13 @@ fun SavedReportsScreen(onNavigateBack: () -> Unit) {
                 items(reports) { report ->
                     ReportCard(report) {
                         try {
-                            val intent = Intent(Intent.ACTION_VIEW).apply {
-                                setDataAndType(report.uri, "text/plain")
-                                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                            context.contentResolver.openInputStream(report.uri)?.use { stream ->
+                                val text = stream.bufferedReader().use { it.readText() }
+                                selectedReportContent = text
+                                selectedReportName = report.name
                             }
-                            context.startActivity(Intent.createChooser(intent, "Open Report"))
                         } catch (e: Exception) {
-                            // Handle if no viewer available
+                            // ignore or toast
                         }
                     }
                 }