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

refactor: extract entryProvider from MainNavigation (#197)

Browse Source 
Extract the overly long `entryProvider` lambda out of `MainNavigation` into a separate `appEntryProvider` function to improve code readability and maintainability.
This commit is contained in:
M57 authored and GitHub committed 2026-06-21 00:31:59 +03:00
1 parent f7a334ecfd
commit 081996d376
1 file changed
+137 -132
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/m57/hermescontrol/Navigation.kt
+137 -132
View File
@@ -179,6 +179,141 @@ private val DRAWER_ENTRIES =
private val DRAWER_GESTURE_SCREENS: Set<NavKey> = ALL_NAV_ITEMS.mapTo(mutableSetOf()) { it.key } private val DRAWER_GESTURE_SCREENS: Set<NavKey> = ALL_NAV_ITEMS.mapTo(mutableSetOf()) { it.key }
private fun appEntryProvider(
sessionId: String?,
openDrawer: () -> Unit,
) = entryProvider {
entry<ConnectScreen> {
ConnectScreenContent(
onConnected = {
NavigationController.resetTo(ChatScreen)
},
modifier = Modifier.safeDrawingPadding(),
)
}
entry<ChatScreen> {
ChatScreenContent(
onOpenDrawer = openDrawer,
sessionId = sessionId,
)
}
entry<HistoryScreen> {
HistoryScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<SettingsScreen> {
SettingsScreenContent(
onBack = { NavigationController.goBack() },
)
}
entry<SkillsScreen> {
SkillsScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<CronJobsScreen> {
CronJobsScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<ProfilesScreen> {
ProfilesScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<ToolsetsScreen> {
ToolsetsScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<AchievementsScreen> {
AchievementsScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<PairingScreen> {
PairingScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<ConfigScreen> {
ConfigScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<McpServersScreen> {
McpServersScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<WebhooksScreen> {
WebhooksScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<ModelScreen> {
ModelScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<GatewayScreen> {
GatewayScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<LogsScreen> {
LogsScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<PluginsScreen> {
PluginsScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<ChannelsScreen> {
ChannelsScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<KeysScreen> {
KeysScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<SystemScreen> {
SystemScreenContent(
onOpenDrawer = openDrawer,
)
}
entry<KanbanScreen> {
KanbanScreenContent(
onOpenDrawer = openDrawer,
)
}
}
@Composable @Composable
fun MainNavigation(sessionId: String? = null) { fun MainNavigation(sessionId: String? = null) {
val hasToken = !AuthManager.getToken().isNullOrBlank() val hasToken = !AuthManager.getToken().isNullOrBlank()
@@ -206,7 +341,7 @@ fun MainNavigation(sessionId: String? = null) {
val showBottomBar = currentScreen != ConnectScreen val showBottomBar = currentScreen != ConnectScreen
val gesturesEnabled = currentScreen in DRAWER_GESTURE_SCREENS val gesturesEnabled = currentScreen in DRAWER_GESTURE_SCREENS
val openDrawer = { scope.launch { drawerState.open() } } val openDrawer: () -> Unit = { scope.launch { drawerState.open() } }
ModalNavigationDrawer( ModalNavigationDrawer(
drawerState = drawerState, drawerState = drawerState,
@@ -326,137 +461,7 @@ fun MainNavigation(sessionId: String? = null) {
backStack = backStack, backStack = backStack,
onBack = { NavigationController.goBack() }, onBack = { NavigationController.goBack() },
entryProvider = entryProvider =
entryProvider { appEntryProvider(sessionId, openDrawer),
entry<ConnectScreen> {
ConnectScreenContent(
onConnected = {
NavigationController.resetTo(ChatScreen)
},
modifier = Modifier.safeDrawingPadding(),
)
}
entry<ChatScreen> {
ChatScreenContent(
onOpenDrawer = { openDrawer() },
sessionId = sessionId,
)
}
entry<HistoryScreen> {
HistoryScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<SettingsScreen> {
SettingsScreenContent(
onBack = { NavigationController.goBack() },
)
}
entry<SkillsScreen> {
SkillsScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<CronJobsScreen> {
CronJobsScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<ProfilesScreen> {
ProfilesScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<ToolsetsScreen> {
ToolsetsScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<AchievementsScreen> {
AchievementsScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<PairingScreen> {
PairingScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<ConfigScreen> {
ConfigScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<McpServersScreen> {
McpServersScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<WebhooksScreen> {
WebhooksScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<ModelScreen> {
ModelScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<GatewayScreen> {
GatewayScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<LogsScreen> {
LogsScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<PluginsScreen> {
PluginsScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<ChannelsScreen> {
ChannelsScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<KeysScreen> {
KeysScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<SystemScreen> {
SystemScreenContent(
onOpenDrawer = { openDrawer() },
)
}
entry<KanbanScreen> {
KanbanScreenContent(
onOpenDrawer = { openDrawer() },
)
}
},
modifier = modifier =
Modifier Modifier
.padding(paddingValues) .padding(paddingValues)