Merge pull request #2180 from vitorpamplona/claude/move-relay-to-settings-aMMmi

Move Event Sync and Import Follows to Settings screen
This commit is contained in:
Vitor Pamplona
2026-04-08 12:30:25 -04:00
committed by GitHub
2 changed files with 16 additions and 17 deletions
@@ -62,7 +62,6 @@ import androidx.compose.material.icons.outlined.Photo
import androidx.compose.material.icons.outlined.PlayCircle import androidx.compose.material.icons.outlined.PlayCircle
import androidx.compose.material.icons.outlined.Settings import androidx.compose.material.icons.outlined.Settings
import androidx.compose.material.icons.outlined.SmartDisplay import androidx.compose.material.icons.outlined.SmartDisplay
import androidx.compose.material.icons.outlined.Sync
import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
@@ -627,22 +626,6 @@ fun ListContent(
) )
} }
NavigationRow(
title = R.string.event_sync_title,
icon = Icons.Outlined.Sync,
tint = MaterialTheme.colorScheme.onBackground,
nav = nav,
route = Route.EventSync,
)
NavigationRow(
title = R.string.route_import_follows,
icon = Icons.Outlined.GroupAdd,
tint = MaterialTheme.colorScheme.onBackground,
nav = nav,
route = Route.ImportFollowsSelectUser,
)
IconRowRelays( IconRowRelays(
accountViewModel = accountViewModel, accountViewModel = accountViewModel,
onClick = { onClick = {
@@ -34,11 +34,13 @@ import androidx.compose.material.icons.outlined.Bolt
import androidx.compose.material.icons.outlined.CloudUpload import androidx.compose.material.icons.outlined.CloudUpload
import androidx.compose.material.icons.outlined.DeleteForever import androidx.compose.material.icons.outlined.DeleteForever
import androidx.compose.material.icons.outlined.FavoriteBorder import androidx.compose.material.icons.outlined.FavoriteBorder
import androidx.compose.material.icons.outlined.GroupAdd
import androidx.compose.material.icons.outlined.History import androidx.compose.material.icons.outlined.History
import androidx.compose.material.icons.outlined.Key import androidx.compose.material.icons.outlined.Key
import androidx.compose.material.icons.outlined.Search import androidx.compose.material.icons.outlined.Search
import androidx.compose.material.icons.outlined.Security import androidx.compose.material.icons.outlined.Security
import androidx.compose.material.icons.outlined.Settings import androidx.compose.material.icons.outlined.Settings
import androidx.compose.material.icons.outlined.Sync
import androidx.compose.material.icons.outlined.ThumbUp import androidx.compose.material.icons.outlined.ThumbUp
import androidx.compose.material.icons.outlined.Translate import androidx.compose.material.icons.outlined.Translate
import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.HorizontalDivider
@@ -99,6 +101,20 @@ fun AllSettingsScreen(
onClick = { nav.nav(Route.EditRelays) }, onClick = { nav.nav(Route.EditRelays) },
) )
HorizontalDivider() HorizontalDivider()
SettingsNavigationRow(
title = R.string.event_sync_title,
icon = Icons.Outlined.Sync,
tint = tint,
onClick = { nav.nav(Route.EventSync) },
)
HorizontalDivider()
SettingsNavigationRow(
title = R.string.route_import_follows,
icon = Icons.Outlined.GroupAdd,
tint = tint,
onClick = { nav.nav(Route.ImportFollowsSelectUser) },
)
HorizontalDivider()
SettingsNavigationRow( SettingsNavigationRow(
title = R.string.media_servers, title = R.string.media_servers,
icon = Icons.Outlined.CloudUpload, icon = Icons.Outlined.CloudUpload,