Senior Dev Audit: Fix all compilation issues, remove duplicate worker, add missing translations, align UI

Author: JACK-AI7

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

@@ -36,7 +36,34 @@ object AppStrings {
             "analyzing" to "Analyzing image...",
             "chat_placeholder" to "Ask NuKropAI...",
             "chat_title" to "NuKropAI Assistant",
-            "weather_alerts" to "Market & Weather Alerts Active"
+            "weather_alerts" to "Market & Weather Alerts Active",
+            "nav_autopilot" to "Autopilot",
+            "nav_finance" to "Finance",
+            "good_farmer" to "Good %s, Farmer!",
+            "quick_actions" to "Quick Actions",
+            "scan_crop" to "Scan Crop",
+            "ai_disease" to "AI Disease & Pest Detect",
+            "scan_soil" to "Scan Soil",
+            "ai_soil" to "AI Soil Health Analysis",
+            "market_rates_action" to "Market Rates",
+            "live_mandi_prices" to "Live Mandi Prices",
+            "ai_advisor" to "AI Advisor",
+            "ask_question" to "Ask Any Farm Question",
+            "loan_subsidy" to "Loan & Subsidy",
+            "govt_schemes" to "Govt Schemes Matcher",
+            "field_navigator" to "Field Navigator",
+            "gps_route" to "GPS Route & Coverage",
+            "my_tracked" to "My Tracked Prices",
+            "pest_radar" to "Hyperlocal Pest Prediction AI",
+            "high_risk" to "HIGH RISK",
+            "report_outbreak" to "Report Outbreak in My Field",
+            "outbreak_logged" to "Outbreak logged. Neighboring farmers alerted!",
+            "ai_tasks" to "AI Task Schedules",
+            "farm_tips" to "Today's Farm Tips",
+            "subsidy_title" to "Government Schemes AI",
+            "ai_matcher" to "AI Scheme Matcher",
+            "find_subsidies" to "FIND MY SUBSIDIES",
+            "scanning_gov" to "Scanning Gov Databases..."
         ),
         "hi" to mapOf(
             "nav_home" to "होम",
@@ -72,7 +99,34 @@ object AppStrings {
             "analyzing" to "छवि का विश्लेषण हो रहा है...",
             "chat_placeholder" to "NuKropAI से पूछें...",
             "chat_title" to "NuKropAI सहायक",
-            "weather_alerts" to "बाजार और मौसम अलर्ट सक्रिय"
+            "weather_alerts" to "बाजार और मौसम अलर्ट सक्रिय",
+            "nav_autopilot" to "ऑटोपायलट",
+            "nav_finance" to "वित्त",
+            "good_farmer" to "शुभ %s, किसान!",
+            "quick_actions" to "त्वरित कार्य",
+            "scan_crop" to "फसल स्कैन",
+            "ai_disease" to "एआई रोग एवं कीट पहचान",
+            "scan_soil" to "मिट्टी स्कैन",
+            "ai_soil" to "एआई मिट्टी स्वास्थ्य विश्लेषण",
+            "market_rates_action" to "बाजार भाव",
+            "live_mandi_prices" to "लाइव मंडी भाव",
+            "ai_advisor" to "एआई सलाहकार",
+            "ask_question" to "कोई भी कृषि प्रश्न पूछें",
+            "loan_subsidy" to "ऋण एवं सब्सिडी",
+            "govt_schemes" to "सरकारी योजना मैचर",
+            "field_navigator" to "खेत नेविगेटर",
+            "gps_route" to "GPS मार्ग एवं कवरेज",
+            "my_tracked" to "मेरी ट्रैक की गई कीमतें",
+            "pest_radar" to "हाइपरलोकल कीट पूर्वानुमान एआई",
+            "high_risk" to "उच्च जोखिम",
+            "report_outbreak" to "मेरे खेत में प्रकोप की रिपोर्ट करें",
+            "outbreak_logged" to "प्रकोप दर्ज किया गया। पड़ोसी किसानों को सूचित किया!",
+            "ai_tasks" to "एआई कार्य अनुसूची",
+            "farm_tips" to "आज की कृषि सुझाव",
+            "subsidy_title" to "सरकारी योजनाएं एआई",
+            "ai_matcher" to "एआई योजना मैचर",
+            "find_subsidies" to "मेरी सब्सिडी खोजें",
+            "scanning_gov" to "सरकारी डेटाबेस स्कैन हो रहा है..."
         ),
         "te" to mapOf(
             "nav_home" to "హోమ్",
@@ -108,7 +162,13 @@ object AppStrings {
             "analyzing" to "చిత్రాన్ని విశ్లేషిస్తోంది...",
             "chat_placeholder" to "NuKropAI ని అడగండి...",
             "chat_title" to "NuKropAI సహాయకుడు",
-            "weather_alerts" to "మార్కెట్ & వాతావరణ హెచ్చరికలు యాక్టివ్‌గా ఉన్నాయి"
+            "weather_alerts" to "మార్కెట్ & వాతావరణ హెచ్చరికలు యాక్టివ్‌గా ఉన్నాయి",
+            "nav_autopilot" to "ఆటోపైలట్",
+            "nav_finance" to "ఫైనాన్స్",
+            "subsidy_title" to "ప్రభుత్వ పథకాలు AI",
+            "ai_matcher" to "AI స్కీమ్ మ్యాచర్",
+            "find_subsidies" to "నా సబ్సిడీలను కనుగొనండి",
+            "scanning_gov" to "ప్రభుత్వ డేటాబేస్లను స్కాన్ చేస్తోంది..."
         ),
         "ta" to mapOf(
             "nav_home" to "முகப்பு",
@@ -144,7 +204,13 @@ object AppStrings {
             "analyzing" to "படம் பகுப்பாய்வு செய்யப்படுகிறது...",
             "chat_placeholder" to "NuKropAI இடம் கேளுங்கள்...",
             "chat_title" to "NuKropAI உதவியாளர்",
-            "weather_alerts" to "சந்தை மற்றும் வானிலை எச்சரிக்கைகள் செயலில் உள்ளன"
+            "weather_alerts" to "சந்தை மற்றும் வானிலை எச்சரிக்கைகள் செயலில் உள்ளன",
+            "nav_autopilot" to "ஆட்டோபைலட்",
+            "nav_finance" to "நிதி",
+            "subsidy_title" to "அரசு திட்டங்கள் AI",
+            "ai_matcher" to "AI திட்ட மேட்சர்",
+            "find_subsidies" to "எனது மானியங்களைக் கண்டறியுங்கள்",
+            "scanning_gov" to "அரசு தரவுத்தளங்களை ஸ்கேன் செய்கிறது..."
         ),
         "mr" to mapOf(
             "nav_home" to "होम",
@@ -180,7 +246,13 @@ object AppStrings {
             "analyzing" to "प्रतिमेचे विश्लेषण करत आहे...",
             "chat_placeholder" to "NuKropAI ला विचारा...",
             "chat_title" to "NuKropAI सहाय्यक",
-            "weather_alerts" to "बाजार आणि हवामान सूचना सक्रिय"
+            "weather_alerts" to "बाजार आणि हवामान सूचना सक्रिय",
+            "nav_autopilot" to "ऑटोपायलट",
+            "nav_finance" to "वित्त",
+            "subsidy_title" to "सरकारी योजना AI",
+            "ai_matcher" to "AI योजना मॅचर",
+            "find_subsidies" to "माझे अनुदान शोधा",
+            "scanning_gov" to "सरकारी डेटाबेस स्कॅन होत आहे..."
         )
     )
 

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

@@ -7,86 +7,129 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.example.ui.theme.*
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 
 @Composable
 fun LoanScreen(onNavigateBack: () -> Unit) {
     var isAnalyzing by remember { mutableStateOf(false) }
     var showResults by remember { mutableStateOf(false) }
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    val lang = LanguageManager.currentLanguage.collectAsState().value
+
+    // Get real state from location
+    var userState by remember { mutableStateOf("Maharashtra") }
+    LaunchedEffect(Unit) {
+        val loc = LocationHelper.getCurrentLocationStateAndMandi(context)
+        if (loc != null) userState = loc.first
+    }
 
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(NuKropDark)
-            .padding(16.dp)
+            .background(Brush.verticalGradient(listOf(Color(0xFF0D1208), NuKropDark)))
     ) {
         // Header
-        Row(verticalAlignment = Alignment.CenterVertically) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(Color(0xCC141A0A))
+                .statusBarsPadding()
+                .padding(horizontal = 8.dp, vertical = 8.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
             IconButton(onClick = onNavigateBack) {
-                Icon(Icons.Default.ArrowBack, contentDescription = "Back", tint = NuKropText)
+                Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back", tint = NuKropText)
+            }
+            Spacer(Modifier.width(4.dp))
+            Column {
+                Text(AppStrings.get("subsidy_title", lang), fontSize = 20.sp, fontWeight = FontWeight.Bold, color = NuKropText)
+                Text("Real Govt Schemes for $userState", fontSize = 11.sp, color = NuKropTextMuted)
             }
-            Spacer(Modifier.width(8.dp))
-            Text("Government Schemes AI", fontSize = 20.sp, fontWeight = FontWeight.Bold, color = NuKropText)
         }
 
-        Spacer(modifier = Modifier.height(24.dp))
+        Column(
+            modifier = Modifier
+                .weight(1f)
+                .padding(16.dp)
+        ) {
+            if (!showResults) {
+                Spacer(Modifier.height(24.dp))
+                Text(AppStrings.get("ai_matcher", lang), fontSize = 24.sp, fontWeight = FontWeight.ExtraBold, color = NuKropAccent)
+                Spacer(Modifier.height(8.dp))
+                Text(
+                    "Let AI analyze your farm profile (Size, Crop, State) to instantly find eligible subsidies and loans you are missing.",
+                    color = NuKropTextMuted,
+                    lineHeight = 22.sp
+                )
 
-        if (!showResults) {
-            Text("AI Scheme Matcher", fontSize = 24.sp, fontWeight = FontWeight.ExtraBold, color = NuKropAccent)
-            Spacer(Modifier.height(8.dp))
-            Text("Let AI analyze your farm profile (Size, Crop, State) to instantly find eligible subsidies and loans you are missing.", color = NuKropTextMuted)
-            
-            Spacer(Modifier.height(32.dp))
+                Spacer(Modifier.height(32.dp))
 
-            Button(
-                onClick = {
-                    isAnalyzing = true
-                },
-                modifier = Modifier.fillMaxWidth().height(60.dp),
-                colors = ButtonDefaults.buttonColors(containerColor = NuKropAccent)
-            ) {
-                if (isAnalyzing) {
-                    CircularProgressIndicator(color = NuKropDark, modifier = Modifier.size(24.dp))
-                    Spacer(Modifier.width(12.dp))
-                    Text("Scanning Gov Databases...", color = NuKropDark, fontWeight = FontWeight.Bold)
-                } else {
-                    Icon(Icons.Default.Search, contentDescription = null, tint = NuKropDark)
-                    Spacer(modifier = Modifier.width(8.dp))
-                    Text("FIND MY SUBSIDIES", color = NuKropDark, fontWeight = FontWeight.Bold, fontSize = 16.sp)
+                Button(
+                    onClick = { isAnalyzing = true },
+                    modifier = Modifier.fillMaxWidth().height(60.dp),
+                    shape = RoundedCornerShape(16.dp),
+                    colors = ButtonDefaults.buttonColors(containerColor = NuKropAccent)
+                ) {
+                    if (isAnalyzing) {
+                        CircularProgressIndicator(color = NuKropDark, modifier = Modifier.size(24.dp), strokeWidth = 2.5.dp)
+                        Spacer(Modifier.width(12.dp))
+                        Text(AppStrings.get("scanning_gov", lang), color = NuKropDark, fontWeight = FontWeight.Bold)
+                    } else {
+                        Icon(Icons.Default.Search, contentDescription = null, tint = NuKropDark)
+                        Spacer(modifier = Modifier.width(8.dp))
+                        Text(AppStrings.get("find_subsidies", lang), color = NuKropDark, fontWeight = FontWeight.Bold, fontSize = 16.sp)
+                    }
                 }
-            }
 
-            LaunchedEffect(isAnalyzing) {
-                if (isAnalyzing) {
-                    delay(2000) // Simulate AI API Call
-                    isAnalyzing = false
-                    showResults = true
-                }
-            }
-        } else {
-            val stateName = "Maharashtra" // Normally derived from LocationManager
-            val realSubsidies = remember { SubsidiesApiService.getSubsidiesForState(stateName) }
-            
-            Column(Modifier.verticalScroll(rememberScrollState())) {
-                Box(Modifier.clip(RoundedCornerShape(8.dp)).background(NuKropBadgeGreen.copy(alpha=0.15f)).padding(8.dp)) {
-                    Text("✓ AI Found ${realSubsidies.size} Eligible Schemes for your Farm in $stateName.", color = NuKropBadgeGreen, fontSize = 12.sp, fontWeight = FontWeight.Bold)
+                LaunchedEffect(isAnalyzing) {
+                    if (isAnalyzing) {
+                        delay(2000)
+                        isAnalyzing = false
+                        showResults = true
+                    }
                 }
-                Spacer(Modifier.height(16.dp))
+            } else {
+                val realSubsidies = remember(userState) { SubsidiesApiService.getSubsidiesForState(userState) }
 
-                realSubsidies.forEach { subsidy ->
-                    SchemeCard(subsidy.name, subsidy.amount, subsidy.description, Color(0xFF64B5F6))
-                    Spacer(Modifier.height(12.dp))
+                Column(Modifier.verticalScroll(rememberScrollState())) {
+                    Box(
+                        Modifier.fillMaxWidth().clip(RoundedCornerShape(12.dp))
+                            .background(NuKropBadgeGreen.copy(alpha = 0.12f))
+                            .border(1.dp, NuKropBadgeGreen.copy(alpha = 0.3f), RoundedCornerShape(12.dp))
+                            .padding(12.dp)
+                    ) {
+                        Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                            Icon(Icons.Default.CheckCircle, null, tint = NuKropBadgeGreen, modifier = Modifier.size(20.dp))
+                            Text(
+                                "AI Found ${realSubsidies.size} Eligible Schemes for your Farm in $userState.",
+                                color = NuKropBadgeGreen, fontSize = 13.sp, fontWeight = FontWeight.Bold
+                            )
+                        }
+                    }
+                    Spacer(Modifier.height(16.dp))
+
+                    val colors = listOf(Color(0xFF64B5F6), NuKropWarning, NuKropAccent, Color(0xFFBA68C8))
+                    realSubsidies.forEachIndexed { index, subsidy ->
+                        SchemeCard(subsidy.name, subsidy.amount, subsidy.description, colors[index % colors.size])
+                        Spacer(Modifier.height(12.dp))
+                    }
+                    Spacer(Modifier.height(40.dp))
                 }
             }
         }
@@ -100,25 +143,30 @@ fun SchemeCard(title: String, amount: String, desc: String, accent: Color) {
             .fillMaxWidth()
             .clip(RoundedCornerShape(16.dp))
             .background(NuKropCard)
-            .border(1.dp, accent.copy(alpha=0.3f), RoundedCornerShape(16.dp))
+            .border(1.dp, accent.copy(alpha = 0.3f), RoundedCornerShape(16.dp))
             .padding(16.dp)
     ) {
         Column {
             Row(Modifier.fillMaxWidth(), Arrangement.SpaceBetween, Alignment.Top) {
-                Text(title, fontSize = 16.sp, fontWeight = FontWeight.Bold, color = NuKropText)
-                Box(Modifier.clip(RoundedCornerShape(4.dp)).background(accent.copy(alpha=0.2f)).padding(horizontal=6.dp, vertical=2.dp)) {
-                    Text(amount, color = accent, fontSize = 10.sp, fontWeight = FontWeight.Bold)
+                Text(title, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = NuKropText, modifier = Modifier.weight(1f))
+                Spacer(Modifier.width(8.dp))
+                Box(Modifier.clip(RoundedCornerShape(8.dp)).background(accent.copy(alpha = 0.15f)).padding(horizontal = 8.dp, vertical = 4.dp)) {
+                    Text(amount, color = accent, fontSize = 11.sp, fontWeight = FontWeight.Bold)
                 }
             }
-            Spacer(Modifier.height(8.dp))
-            Text(desc, fontSize = 12.sp, color = NuKropTextMuted, lineHeight = 18.sp)
-            Spacer(Modifier.height(12.dp))
+            Spacer(Modifier.height(10.dp))
+            Text(desc, fontSize = 12.sp, color = NuKropTextMuted, lineHeight = 19.sp)
+            Spacer(Modifier.height(14.dp))
             Button(
                 onClick = {},
-                modifier = Modifier.fillMaxWidth().height(40.dp),
-                colors = ButtonDefaults.buttonColors(containerColor = NuKropSurface)
+                modifier = Modifier.fillMaxWidth().height(42.dp),
+                shape = RoundedCornerShape(12.dp),
+                colors = ButtonDefaults.buttonColors(containerColor = accent.copy(alpha = 0.15f))
             ) {
-                Text("Auto-Fill Application", color = NuKropText, fontSize = 12.sp)
+                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)
+                }
             }
         }
     }