Skip to content

refactor(ui): move features out of Settings, leaving it configuration #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SiteRelEnby merged 1 commit into from
Jul 28, 2026
Merged

refactor(ui): move features out of Settings, leaving it configuration #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions sheaf/app/src/main/java/systems/lupine/sheaf/ui/SheafApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ object Routes {
const val FILES = "settings/files"
const val EXPORT_DATA = "settings/export"
const val DEBUG = "settings/debug"
const val SUPPORT = "settings/support"
const val SUPPORT = "support"
// Categorized settings detail screens.
const val SETTINGS_ACCOUNT = "settings/account"
const val SETTINGS_ADMIN_ACTIVITY = "settings/account/admin-activity"
Expand All @@ -118,8 +118,8 @@ object Routes {
const val SETTINGS_SERVER = "settings/server"
const val SETTINGS_SYSTEM = "settings/sys"
const val ARCHIVED_MEMBERS = "settings/archived-members"
const val RELATIONSHIPS = "settings/relationships"
const val RELATIONSHIP_GRAPH = "settings/relationships/graph"
const val RELATIONSHIPS = "relationships"
const val RELATIONSHIP_GRAPH = "relationships/graph"
const val SETTINGS_DATA = "settings/data"
const val SETTINGS_SAFETY = "settings/safety-cat"
const val SETTINGS_DANGER = "settings/danger"
Expand All @@ -131,9 +131,9 @@ object Routes {
const val NOTIFICATIONS_OWNED = "settings/notifications/owned"
const val NOTIFICATIONS_CREATE = "settings/notifications/owned/new"
const val NOTIFICATIONS_CHANNEL_DETAIL = "settings/notifications/owned/{channelId}"
const val NOTIFICATIONS_REMINDERS = "settings/notifications/reminders"
const val NOTIFICATIONS_REMINDER_NEW = "settings/notifications/reminders/new"
const val NOTIFICATIONS_REMINDER_EDIT = "settings/notifications/reminders/{id}"
const val NOTIFICATIONS_REMINDERS = "reminders"
const val NOTIFICATIONS_REMINDER_NEW = "reminders/new"
const val NOTIFICATIONS_REMINDER_EDIT = "reminders/{id}"
const val POLLS = "polls"
const val POLL_DETAIL = "polls/{pollId}"
const val POLL_NEW = "polls/new"
Expand Down Expand Up @@ -480,7 +480,6 @@ fun SheafApp(
onNavigateToReceiving = { navController.navigate(Routes.NOTIFICATIONS_RECEIVING) },
onNavigateToYourDevices = { navController.navigate(Routes.NOTIFICATIONS_DEVICES) },
onNavigateToChannelsYouOwn = { navController.navigate(Routes.NOTIFICATIONS_OWNED) },
onNavigateToReminders = { navController.navigate(Routes.NOTIFICATIONS_REMINDERS) },
)
}
composable(Routes.NOTIFICATIONS_RECEIVING) {
Expand Down Expand Up @@ -525,7 +524,7 @@ fun SheafApp(
onNavigateUp = { navController.navigateUp() },
onCreateNew = { navController.navigate(Routes.NOTIFICATIONS_REMINDER_NEW) },
onEdit = { id ->
navController.navigate("settings/notifications/reminders/$id")
navController.navigate("reminders/$id")
},
)
}
Expand Down Expand Up @@ -582,7 +581,6 @@ fun SheafApp(
onNavigateToCustomFields = { navController.navigate(Routes.CUSTOM_FIELDS) },
onNavigateToTags = { navController.navigate(Routes.SETTINGS_TAGS) },
onNavigateToArchivedMembers = { navController.navigate(Routes.ARCHIVED_MEMBERS) },
onNavigateToRelationships = { navController.navigate(Routes.RELATIONSHIPS) },
)
}
composable(Routes.RELATIONSHIPS) {
Expand Down
16 changes: 0 additions & 16 deletions sheaf/app/src/main/java/systems/lupine/sheaf/ui/settings/SettingsCategoryScreens.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,6 @@ fun NotificationSettingsScreen(
onNavigateToReceiving: () -> Unit,
onNavigateToYourDevices: () -> Unit,
onNavigateToChannelsYouOwn: () -> Unit,
onNavigateToReminders: () -> Unit,
viewModel: SettingsViewModel = hiltViewModel(),
) {
val frontNotificationEnabled by viewModel.frontNotificationEnabled.collectAsState()
Expand Down Expand Up @@ -565,13 +564,6 @@ fun NotificationSettingsScreen(
onClick = onNavigateToChannelsYouOwn,
)
HorizontalDivider(modifier = Modifier.padding(start = 56.dp))
SettingItem(
icon = Icons.Outlined.Alarm,
title = "Reminders",
subtitle = "Schedule pings or send pings on front changes",
onClick = onNavigateToReminders,
)
HorizontalDivider(modifier = Modifier.padding(start = 56.dp))
SettingItem(
icon = Icons.Outlined.DevicesOther,
title = "Your devices",
Expand Down Expand Up @@ -740,7 +732,6 @@ fun SystemCategoryScreen(
onNavigateToCustomFields: () -> Unit,
onNavigateToTags: () -> Unit,
onNavigateToArchivedMembers: () -> Unit,
onNavigateToRelationships: () -> Unit,
) {
CategoryScaffold(title = "System", onNavigateUp = onNavigateUp) {
SettingItem(
Expand All @@ -757,13 +748,6 @@ fun SystemCategoryScreen(
onClick = onNavigateToCustomFields,
)
HorizontalDivider(modifier = Modifier.padding(start = 56.dp))
SettingItem(
icon = Icons.Outlined.Hub,
title = "Relationships",
subtitle = "Define relationship types between members and groups",
onClick = onNavigateToRelationships,
)
HorizontalDivider(modifier = Modifier.padding(start = 56.dp))
SettingItem(
icon = Icons.Outlined.Archive,
title = "Archived members",
Expand Down
Loading