Skip to content

Commit 821e203

Browse files
committed
Fix UI alignments, navigation emojis, market infinite loading, and update APK
1 parent 8f2ed4d commit 821e203

7 files changed

Lines changed: 22 additions & 9 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import android.os.Build
3030
import androidx.activity.result.contract.ActivityResultContracts
3131

3232
sealed class Tab(val route: String, val icon: String, val labelKey: String) {
33-
object Home : Tab("home", "🏠", "nav_home")
34-
object Scan : Tab("scan", "🔬", "nav_scan")
35-
object Chat : Tab("chat", "💬", "nav_chat")
36-
object Market : Tab("market", "📊", "nav_market")
37-
object Profile: Tab("profile", "👤", "nav_profile")
33+
object Home : Tab("home", "🏠", "nav_home")
34+
object Scan : Tab("scan", "🔬", "nav_scan")
35+
object Chat : Tab("chat", "💬", "nav_chat")
36+
object Market : Tab("market", "📊", "nav_market")
37+
object Profile: Tab("profile", "👤", "nav_profile")
3838
object Autopilot: Tab("autopilot", "🚜", "nav_autopilot")
3939
object Finance: Tab("finance", "💰", "nav_finance")
4040
object SavedReports: Tab("saved_reports", "📂", "nav_reports")

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ fun MarketScreen(modifier: Modifier = Modifier) {
9999
) {
100100
// Header
101101
Column(Modifier.fillMaxWidth().statusBarsPadding().padding(16.dp)) {
102-
Row(verticalAlignment = Alignment.CenterVertically) {
103-
Text(AppStrings.get("market_rates", lang), fontSize = 24.sp, fontWeight = FontWeight.ExtraBold, color = NuKropText)
104-
Spacer(Modifier.width(12.dp))
102+
Text(AppStrings.get("market_rates", lang), fontSize = 24.sp, fontWeight = FontWeight.ExtraBold, color = NuKropText)
103+
Spacer(Modifier.height(8.dp))
104+
Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
105105
// Live Cached Badge
106106
Row(
107107
verticalAlignment = Alignment.CenterVertically,
@@ -274,7 +274,13 @@ fun MarketScreen(modifier: Modifier = Modifier) {
274274
} else if (error != null) {
275275
Text(error, color = NuKropWarning, modifier = Modifier.align(Alignment.Center))
276276
} else {
277-
Text("No data available from Gov API.", color = NuKropTextMuted, modifier = Modifier.align(Alignment.Center))
277+
// Not loading, but records are empty
278+
Column(horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.align(Alignment.Center)) {
279+
Icon(Icons.Filled.Warning, contentDescription = null, tint = NuKropTextDim, modifier = Modifier.size(48.dp))
280+
Spacer(Modifier.height(16.dp))
281+
Text("No market rates found.", color = NuKropTextMuted, fontWeight = FontWeight.SemiBold, fontSize = 16.sp)
282+
Text("Try a different crop or state.", color = NuKropTextDim, fontSize = 13.sp)
283+
}
278284
}
279285
}
280286
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ fun ProfileScreen(modifier: Modifier = Modifier, onSignOut: (() -> Unit)? = null
162162
}
163163
)
164164

165+
Spacer(modifier = Modifier.height(12.dp))
166+
165167
Box {
166168
SettingsItem(
167169
icon = Icons.Default.Language,
@@ -192,13 +194,16 @@ fun ProfileScreen(modifier: Modifier = Modifier, onSignOut: (() -> Unit)? = null
192194
}
193195
}
194196
}
197+
198+
Spacer(modifier = Modifier.height(12.dp))
195199

196200
SettingsItem(
197201
icon = Icons.Default.Shield,
198202
title = "Privacy & Data",
199203
subtitle = "Manage your data",
200204
onClick = { showPrivacyDialog = true }
201205
)
206+
Spacer(modifier = Modifier.height(12.dp))
202207
SettingsItem(
203208
icon = Icons.Default.Help,
204209
title = "Help & Support",
@@ -211,6 +216,7 @@ fun ProfileScreen(modifier: Modifier = Modifier, onSignOut: (() -> Unit)? = null
211216
try { context.startActivity(intent) } catch (e: Exception) { }
212217
}
213218
)
219+
Spacer(modifier = Modifier.height(12.dp))
214220
SettingsItem(
215221
icon = Icons.Default.Info,
216222
title = "About NuKropAI",

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ org.gradle.workers.max=4
2626
kotlin.compiler.execution.strategy=in-process
2727

2828
android.build.ignoreJdkImage=true
29+
org.gradle.java.home=C:/Program Files/Android/Android Studio/jbr

old_home.kt

54.7 KB
Binary file not shown.

old_main.kt

15.5 KB
Binary file not shown.

web/public/NuKropAI_v1.0.apk

622 KB
Binary file not shown.

0 commit comments

Comments
 (0)