Fix JSON parsing, cleanup TTS text, add fellow farmers, change apply button

Author: JACK-AI7

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

@@ -334,7 +334,8 @@ fun ChatBubble(msg: ChatMessage, tts: android.speech.tts.TextToSpeech?) {
                                 .clip(RoundedCornerShape(8.dp))
                                 .background(NuKropAccent.copy(alpha = 0.15f))
                                 .clickable {
-                                    tts?.speak(msg.text, android.speech.tts.TextToSpeech.QUEUE_FLUSH, null, null)
+                                    val cleanText = msg.text.replace(Regex("[*#~_]"), "").replace("-", " ")
+                                    tts?.speak(cleanText, android.speech.tts.TextToSpeech.QUEUE_FLUSH, null, null)
                                 }
                                 .padding(horizontal = 8.dp, vertical = 4.dp)
                         ) {

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

@@ -64,8 +64,9 @@ data class SoilScanData(
 )
 
 fun parseCropJson(raw: String): CropScanData? = runCatching {
-    val start = raw.indexOf('{'); val end = raw.lastIndexOf('}'); if (start == -1 || end == -1) throw Exception("No JSON found")
-    val j = org.json.JSONObject(raw.substring(start, end + 1))
+    val cleanRaw = raw.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 found")
+    val j = org.json.JSONObject(cleanRaw.substring(start, end + 1))
     val prods = j.optJSONArray("products")?.let { arr ->
         (0 until arr.length()).mapNotNull { i ->
             val obj = arr.optJSONObject(i) ?: return@mapNotNull null
@@ -85,8 +86,9 @@ fun parseCropJson(raw: String): CropScanData? = runCatching {
 }.getOrNull()
 
 fun parseSoilJson(raw: String): SoilScanData? = runCatching {
-    val start = raw.indexOf('{'); val end = raw.lastIndexOf('}'); if (start == -1 || end == -1) throw Exception("No JSON found")
-    val j = org.json.JSONObject(raw.substring(start, end + 1))
+    val cleanRaw = raw.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 found")
+    val j = org.json.JSONObject(cleanRaw.substring(start, end + 1))
     val defs = j.optJSONArray("likelyDeficiencies")?.let { arr -> (0 until arr.length()).map { i -> arr.optString(i) } } ?: emptyList()
     val crops = j.optJSONArray("suitableCrops")?.let { arr -> (0 until arr.length()).map { i -> arr.optString(i) } } ?: emptyList()
     val ferts = j.optJSONArray("fertilizers")?.let { arr ->

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

@@ -71,6 +71,7 @@ object GeminiVisionService {
                         val body = """
                         {
                           "model": "$model",
+                          "response_format": {"type": "json_object"},
                           "messages": [
                             {
                               "role": "user",

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

@@ -219,6 +219,35 @@ fun HomeScreen(
                 }
             }
 
+            Spacer(Modifier.height(32.dp))
+
+            // Fellow Farmers Near You
+            Row(Modifier.padding(horizontal = 16.dp), verticalAlignment = Alignment.CenterVertically) {
+                Icon(Icons.Filled.Group, contentDescription = null, tint = NuKropAccent, modifier = Modifier.size(16.dp))
+                Spacer(Modifier.width(8.dp))
+                Text("Fellow Farmers Near You", color = NuKropText, fontSize = 16.sp, fontWeight = FontWeight.Bold)
+            }
+            Spacer(Modifier.height(12.dp))
+            Box(Modifier.padding(horizontal = 16.dp).fillMaxWidth().clip(RoundedCornerShape(16.dp)).background(NuKropCard).border(1.dp, NuKropBadgeGreen.copy(alpha=0.3f), RoundedCornerShape(16.dp)).padding(16.dp)) {
+                Column {
+                    Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
+                        Row(verticalAlignment = Alignment.CenterVertically) {
+                            Box(modifier = Modifier.size(36.dp).clip(androidx.compose.foundation.shape.CircleShape).background(NuKropAccent.copy(alpha=0.2f)), contentAlignment = Alignment.Center) {
+                                Text("R", color = NuKropAccent, fontWeight = FontWeight.Bold)
+                            }
+                            Spacer(Modifier.width(12.dp))
+                            Column {
+                                Text("Ramesh Singh", color = NuKropText, fontSize = 14.sp, fontWeight = FontWeight.Bold)
+                                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)) {
+                            Text("Connect", color = NuKropAccent, fontSize = 11.sp, fontWeight = FontWeight.Bold)
+                        }
+                    }
+                }
+            }
+
             Spacer(Modifier.height(40.dp))
         }
     }

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

@@ -165,7 +165,7 @@ fun SchemeCard(title: String, amount: String, desc: String, accent: Color) {
             ) {
                 Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) {
                     Icon(Icons.Default.Edit, null, tint = accent, modifier = Modifier.size(16.dp))
-                    Text("Auto-Fill Application", color = accent, fontSize = 12.sp, fontWeight = FontWeight.Bold)
+                    Text("Apply Now", color = accent, fontSize = 12.sp, fontWeight = FontWeight.Bold)
                 }
             }
         }