yilsem/aiturk-mobil
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

fix: always show bottom bar, resolve chat input double padding, and format codebase

Browse Source
This commit is contained in:
Hy4ri committed 2026-06-19 18:14:41 +03:00
1 parent 91ad09b5f2
commit 9e3a7ab339
24 files changed
+143 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/m57/hermescontrol/Navigation.kt
+11 -5
View File
@@ -128,7 +128,9 @@ private fun resolveBottomNavItems(names: List<String>): List<BottomNavItem> =
// ── Drawer sections for secondary screens ──────────────────────────────
private enum class DrawerSection(val title: String) {
private enum class DrawerSection(
val title: String,
) {
CONVERSE("Converse"),
AUTOMATE("Automate"),
CONFIGURE("Configure"),
@@ -191,7 +193,7 @@ fun MainNavigation() {
NavigationController.updatePrimaryScreens(bottomNavKeys)
}
val isPrimaryScreen = currentScreen in bottomNavKeys
val showBottomBar = currentScreen != ConnectScreen
val gesturesEnabled = currentScreen in DRAWER_GESTURE_SCREENS
val openDrawer = { scope.launch { drawerState.open() } }
@@ -207,10 +209,14 @@ fun MainNavigation() {
val connectionStatus by HermesWsClient.connectionStatus.collectAsState()
val statusColor =
when (connectionStatus) {
ConnectionStatus.CONNECTED -> Color(0xFF4CAF50) // green
ConnectionStatus.CONNECTED -> Color(0xFF4CAF50)
// green
ConnectionStatus.CONNECTING,
ConnectionStatus.RECONNECTING,
-> Color(0xFFFFC107) // yellow
-> Color(0xFFFFC107)
// yellow
ConnectionStatus.DISCONNECTED -> Color(0xFFF44336) // red
}
Row(
@@ -287,7 +293,7 @@ fun MainNavigation() {
Scaffold(
contentWindowInsets = WindowInsets.navigationBars,
bottomBar = {
if (isPrimaryScreen) {
if (showBottomBar) {
NavigationBar {
bottomNavItems.forEach { item ->
NavigationBarItem(
app/src/main/java/com/m57/hermescontrol/notification/ChatNotificationService.kt
+2
View File
@@ -76,9 +76,11 @@ class ChatNotificationService : Service() {
.ifBlank { "New message" }
showReplyNotification(preview)
}
is WsEvent.ClarifyRequest -> {
showReplyNotification("Hermes needs a clarification")
}
else -> {}
}
}
app/src/main/java/com/m57/hermescontrol/ui/achievements/AchievementsScreen.kt
+3
View File
@@ -54,6 +54,7 @@ fun AchievementsScreen(
state.isLoading && state.achievements.isEmpty() -> {
LoadingState(modifier = Modifier.padding(paddingValues))
}
state.errorMessage != null && state.achievements.isEmpty() -> {
ErrorState(
message = state.errorMessage ?: "",
@@ -61,6 +62,7 @@ fun AchievementsScreen(
modifier = Modifier.padding(paddingValues),
)
}
state.achievements.isEmpty() -> {
EmptyState(
title = "No achievements yet",
@@ -69,6 +71,7 @@ fun AchievementsScreen(
modifier = Modifier.padding(paddingValues),
)
}
else -> {
LazyColumn(
modifier = Modifier.fillMaxSize().padding(paddingValues),
app/src/main/java/com/m57/hermescontrol/ui/channels/ChannelsScreen.kt
+3
View File
@@ -68,6 +68,7 @@ fun ChannelsScreen(
state.isLoading && state.platforms.isEmpty() -> {
LoadingState(modifier = Modifier.padding(paddingValues))
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "",
@@ -75,6 +76,7 @@ fun ChannelsScreen(
modifier = Modifier.padding(paddingValues),
)
}
state.platforms.isEmpty() -> {
EmptyState(
title = "No channels configured",
@@ -82,6 +84,7 @@ fun ChannelsScreen(
modifier = Modifier.padding(paddingValues),
)
}
else -> {
LazyColumn(
modifier = Modifier.fillMaxSize().padding(paddingValues),
app/src/main/java/com/m57/hermescontrol/ui/chat/ChatBubble.kt
+5 -4
View File
@@ -201,8 +201,7 @@ private fun AssistantBubble(
bottomStart = 16.dp,
bottomEnd = 16.dp,
),
)
.pointerInput(message.content) {
).pointerInput(message.content) {
detectTapGestures(
onLongPress = {
clipboardManager.setText(AnnotatedString(message.content))
@@ -459,8 +458,10 @@ private fun RichText(
text = annotated,
style = MaterialTheme.typography.bodyMedium.copy(color = textColor),
onClick = { offset: Int ->
annotated.getStringAnnotations("URL", offset, offset)
.firstOrNull()?.let { uriHandler.openUri(it.item) }
annotated
.getStringAnnotations("URL", offset, offset)
.firstOrNull()
?.let { uriHandler.openUri(it.item) }
},
)
}
app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
+3 -2
View File
@@ -116,10 +116,12 @@ fun ChatScreen(
NotificationHelper.setAppForeground(context, true)
NotificationHelper.stop(context)
}
androidx.lifecycle.Lifecycle.Event.ON_STOP -> {
NotificationHelper.setAppForeground(context, false)
NotificationHelper.start(context)
}
else -> {}
}
}
@@ -320,12 +322,11 @@ fun ChatScreen(
)
}
},
) { paddingValues ->
) { _ ->
Column(
modifier =
Modifier
.fillMaxSize()
.padding(paddingValues)
.background(backgroundGradient)
.imePadding(),
) {
app/src/main/java/com/m57/hermescontrol/ui/chat/ChatViewModel.kt
+3 -1
View File
@@ -51,7 +51,9 @@ data class ClarifyUi(
val options: List<String>,
)
class ChatViewModel(application: Application) : AndroidViewModel(application) {
class ChatViewModel(
application: Application,
) : AndroidViewModel(application) {
private val _uiState = MutableStateFlow(ChatUiState())
val uiState: StateFlow<ChatUiState> = _uiState.asStateFlow()
app/src/main/java/com/m57/hermescontrol/ui/common/HermesScaffold.kt
+1
View File
@@ -64,6 +64,7 @@ fun HermesScaffold(
)
}
}
onOpenDrawer != null -> {
IconButton(onClick = onOpenDrawer) {
Icon(
app/src/main/java/com/m57/hermescontrol/ui/common/SharedComponents.kt
+18 -5
View File
@@ -75,13 +75,26 @@ fun StatusBadge(
val statusColors = LocalHermesStatusColors.current
val (bgColor, fgColor) =
when (status) {
StatusBadgeType.SUCCESS -> statusColors.successContainer to statusColors.success
StatusBadgeType.WARNING -> statusColors.warningContainer to statusColors.warning
StatusBadgeType.ERROR -> statusColors.errorContainer to statusColors.error
StatusBadgeType.INFO -> statusColors.infoContainer to statusColors.info
StatusBadgeType.NEUTRAL ->
StatusBadgeType.SUCCESS -> {
statusColors.successContainer to statusColors.success
}
StatusBadgeType.WARNING -> {
statusColors.warningContainer to statusColors.warning
}
StatusBadgeType.ERROR -> {
statusColors.errorContainer to statusColors.error
}
StatusBadgeType.INFO -> {
statusColors.infoContainer to statusColors.info
}
StatusBadgeType.NEUTRAL -> {
MaterialTheme.colorScheme.surfaceContainerHigh to
MaterialTheme.colorScheme.onSurfaceVariant
}
}
Surface(
modifier = modifier,
app/src/main/java/com/m57/hermescontrol/ui/config/ConfigScreen.kt
+4 -1
View File
@@ -66,6 +66,7 @@ fun ConfigScreen(
state.isLoading && state.yamlText == null -> {
LoadingState(modifier = Modifier.padding(paddingValues))
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "",
@@ -73,7 +74,8 @@ fun ConfigScreen(
modifier = Modifier.padding(paddingValues),
)
}
else ->
else -> {
Box(Modifier.fillMaxSize()) {
if (state.isLoading && state.yamlText == null) {
CircularProgressIndicator()
@@ -143,6 +145,7 @@ fun ConfigScreen(
}
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/cron/CronJobsScreen.kt
+12 -4
View File
@@ -65,19 +65,26 @@ fun CronJobsScreen(
onRefresh = { viewModel.loadCronJobs() },
) {
when {
state.isLoading && state.jobs.isEmpty() -> LoadingState()
state.errorMessage != null ->
state.isLoading && state.jobs.isEmpty() -> {
LoadingState()
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "Unknown error",
onRetry = { viewModel.loadCronJobs() },
)
state.jobs.isEmpty() ->
}
state.jobs.isEmpty() -> {
EmptyState(
title = "No cron jobs",
subtitle = "Scheduled tasks from Hermes will appear here.",
icon = Icons.Filled.Schedule,
)
else ->
}
else -> {
LazyColumn(
modifier = Modifier.fillMaxWidth(),
contentPadding = listContentPadding,
@@ -160,6 +167,7 @@ fun CronJobsScreen(
}
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/gateway/GatewayScreen.kt
+4 -1
View File
@@ -71,6 +71,7 @@ fun GatewayScreen(
state.isLoading && state.status == null -> {
LoadingState(modifier = Modifier.padding(paddingValues))
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "",
@@ -78,7 +79,8 @@ fun GatewayScreen(
modifier = Modifier.padding(paddingValues),
)
}
else ->
else -> {
Box(Modifier.fillMaxSize()) {
if (state.isLoading && state.status == null) {
CircularProgressIndicator()
@@ -285,6 +287,7 @@ fun GatewayScreen(
}
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/kanban/KanbanScreen.kt
+4 -1
View File
@@ -80,6 +80,7 @@ fun KanbanScreen(
state.isLoading && state.boards.isEmpty() -> {
LoadingState(modifier = Modifier.padding(paddingValues))
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "",
@@ -87,7 +88,8 @@ fun KanbanScreen(
modifier = Modifier.padding(paddingValues),
)
}
else ->
else -> {
Box(Modifier.fillMaxSize()) {
if (state.isLoading) {
CircularProgressIndicator()
@@ -189,6 +191,7 @@ fun KanbanScreen(
)
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/keys/KeysScreen.kt
+4 -1
View File
@@ -75,6 +75,7 @@ fun KeysScreen(
state.isLoading && state.envVars.isEmpty() -> {
LoadingState(modifier = Modifier.padding(paddingValues))
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "",
@@ -82,7 +83,8 @@ fun KeysScreen(
modifier = Modifier.padding(paddingValues),
)
}
else ->
else -> {
Box(Modifier.fillMaxSize()) {
if (state.isLoading) {
CircularProgressIndicator()
@@ -205,6 +207,7 @@ fun KeysScreen(
}
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/logs/LogsScreen.kt
+12 -4
View File
@@ -65,13 +65,18 @@ fun LogsScreen(
onRefresh = { viewModel.loadLogs() },
) {
when {
state.isLoading && state.logs.isEmpty() -> LoadingState()
state.errorMessage != null ->
state.isLoading && state.logs.isEmpty() -> {
LoadingState()
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "Unknown error",
onRetry = { viewModel.loadLogs() },
)
state.logs.isEmpty() ->
}
state.logs.isEmpty() -> {
// B5 (Jun 18 2026, kanban t_2322818d): proper empty-state using
// the shared EmptyState component instead of a bare Text.
EmptyState(
@@ -79,7 +84,9 @@ fun LogsScreen(
subtitle = "Log output from Hermes will appear here.",
icon = Icons.Filled.HistoryEdu,
)
else ->
}
else -> {
LazyColumn(
state = listState,
modifier =
@@ -105,6 +112,7 @@ fun LogsScreen(
)
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/mcp/McpServersScreen.kt
+4 -1
View File
@@ -68,6 +68,7 @@ fun McpServersScreen(
state.isLoading && state.servers.isEmpty() -> {
LoadingState(modifier = Modifier.padding(paddingValues))
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "",
@@ -75,7 +76,8 @@ fun McpServersScreen(
modifier = Modifier.padding(paddingValues),
)
}
else ->
else -> {
Box(Modifier.fillMaxSize()) {
if (state.isLoading && state.servers.isEmpty()) {
CircularProgressIndicator()
@@ -181,6 +183,7 @@ fun McpServersScreen(
}
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/model/ModelScreen.kt
+6 -2
View File
@@ -75,6 +75,7 @@ fun ModelScreen(
state.isLoading && state.providers.isEmpty() -> {
LoadingState(modifier = Modifier.padding(paddingValues))
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "",
@@ -82,7 +83,8 @@ fun ModelScreen(
modifier = Modifier.padding(paddingValues),
)
}
else ->
else -> {
Box(Modifier.fillMaxSize()) {
if (state.isLoading && state.providers.isEmpty()) {
CircularProgressIndicator()
@@ -201,7 +203,8 @@ fun ModelScreen(
containerColor =
if (isActive) {
MaterialTheme.colorScheme
.primaryContainer.copy(
.primaryContainer
.copy(
alpha = 0.3f,
)
} else {
@@ -264,6 +267,7 @@ fun ModelScreen(
}
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/pairing/PairingScreen.kt
+4 -1
View File
@@ -67,6 +67,7 @@ fun PairingScreen(
state.isLoading && state.pairing == null -> {
LoadingState(modifier = Modifier.padding(paddingValues))
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "",
@@ -74,7 +75,8 @@ fun PairingScreen(
modifier = Modifier.padding(paddingValues),
)
}
else ->
else -> {
Box(Modifier.fillMaxSize()) {
if (state.isLoading && state.pairing == null) {
CircularProgressIndicator()
@@ -253,6 +255,7 @@ fun PairingScreen(
}
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/plugins/PluginsScreen.kt
+4 -1
View File
@@ -66,6 +66,7 @@ fun PluginsScreen(
state.isLoading && state.plugins.isEmpty() -> {
LoadingState(modifier = Modifier.padding(paddingValues))
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "",
@@ -73,7 +74,8 @@ fun PluginsScreen(
modifier = Modifier.padding(paddingValues),
)
}
else ->
else -> {
Box(Modifier.fillMaxSize()) {
if (state.isLoading) {
CircularProgressIndicator()
@@ -150,6 +152,7 @@ fun PluginsScreen(
}
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/profiles/ProfilesScreen.kt
+4 -1
View File
@@ -79,6 +79,7 @@ fun ProfilesScreen(
state.isLoading && state.profiles.isEmpty() -> {
LoadingState(modifier = Modifier.padding(paddingValues))
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "",
@@ -86,7 +87,8 @@ fun ProfilesScreen(
modifier = Modifier.padding(paddingValues),
)
}
else ->
else -> {
Box(Modifier.fillMaxSize()) {
if (state.isLoading && state.profiles.isEmpty()) {
CircularProgressIndicator()
@@ -222,6 +224,7 @@ fun ProfilesScreen(
}
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/skills/SkillsScreen.kt
+12 -4
View File
@@ -78,19 +78,26 @@ fun SkillsScreen(
onRefresh = { viewModel.loadSkills() },
) {
when {
state.isLoading && state.skills.isEmpty() -> LoadingState()
state.errorMessage != null ->
state.isLoading && state.skills.isEmpty() -> {
LoadingState()
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "Unknown error",
onRetry = { viewModel.loadSkills() },
)
state.skills.isEmpty() ->
}
state.skills.isEmpty() -> {
EmptyState(
title = "No skills found",
subtitle = "Skills loaded from Hermes will appear here.",
icon = Icons.Filled.Extension,
)
else ->
}
else -> {
LazyColumn(
modifier = Modifier.fillMaxWidth(),
contentPadding = listContentPadding,
@@ -162,6 +169,7 @@ fun SkillsScreen(
}
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/system/SystemScreen.kt
+12 -4
View File
@@ -71,18 +71,25 @@ fun SystemScreen(
onRefresh = { viewModel.loadSystemData() },
) {
when {
state.isLoading && state.stats == null && state.doctorReport == null -> LoadingState()
state.errorMessage != null ->
state.isLoading && state.stats == null && state.doctorReport == null -> {
LoadingState()
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "Unknown error",
onRetry = { viewModel.loadSystemData() },
)
state.stats == null && state.doctorReport == null ->
}
state.stats == null && state.doctorReport == null -> {
EmptyState(
title = "No system data",
subtitle = "Tap refresh to load system diagnostics.",
)
else ->
}
else -> {
LazyColumn(
modifier = Modifier.fillMaxWidth(),
contentPadding =
@@ -200,6 +207,7 @@ fun SystemScreen(
}
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/toolsets/ToolsetsScreen.kt
+4 -1
View File
@@ -71,6 +71,7 @@ fun ToolsetsScreen(
state.isLoading && state.toolsets.isEmpty() -> {
LoadingState(modifier = Modifier.padding(paddingValues))
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "",
@@ -78,7 +79,8 @@ fun ToolsetsScreen(
modifier = Modifier.padding(paddingValues),
)
}
else ->
else -> {
Box(Modifier.fillMaxSize()) {
if (state.isLoading && state.toolsets.isEmpty()) {
CircularProgressIndicator()
@@ -171,6 +173,7 @@ fun ToolsetsScreen(
}
}
}
}
}
}
}
app/src/main/java/com/m57/hermescontrol/ui/webhooks/WebhooksScreen.kt
+4 -1
View File
@@ -69,6 +69,7 @@ fun WebhooksScreen(
state.isLoading && state.baseUrl == null -> {
LoadingState(modifier = Modifier.padding(paddingValues))
}
state.errorMessage != null -> {
ErrorState(
message = state.errorMessage ?: "",
@@ -76,7 +77,8 @@ fun WebhooksScreen(
modifier = Modifier.padding(paddingValues),
)
}
else ->
else -> {
Box(Modifier.fillMaxSize()) {
if (state.isLoading && state.baseUrl == null) {
CircularProgressIndicator()
@@ -234,6 +236,7 @@ fun WebhooksScreen(
}
}
}
}
}
}
}