pawelorzech/Swoosh
1
0
Fork 0
mirror of https://github.com/pawelorzech/Swoosh.git synced 2026-03-31 11:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: remove theme toggle from feed top bar (available in Settings)

Browse source
This commit is contained in:
Paweł Orzech 2026-03-19 11:37:46 +01:00
parent 53c7cdd6a6
commit 85fa89d985
No known key found for this signature in database
2 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/com/swoosh/microblog/ui/feed/FeedScreen.kt
View file

@ -71,8 +71,6 @@ import com.swoosh.microblog.data.model.PostFilter
import com.swoosh.microblog.data.model.PostStats import com.swoosh.microblog.data.model.PostStats
import com.swoosh.microblog.data.model.QueueStatus import com.swoosh.microblog.data.model.QueueStatus
import com.swoosh.microblog.data.model.SortOrder import com.swoosh.microblog.data.model.SortOrder
import com.swoosh.microblog.ui.theme.ThemeMode
import com.swoosh.microblog.ui.theme.ThemeViewModel
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class) @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
@Composable @Composable
@ -82,11 +80,9 @@ fun FeedScreen(
onCompose: () -> Unit, onCompose: () -> Unit,
onEditPost: (FeedPost) -> Unit, onEditPost: (FeedPost) -> Unit,
onAddAccount: () -> Unit = {}, onAddAccount: () -> Unit = {},
viewModel: FeedViewModel = viewModel(), viewModel: FeedViewModel = viewModel()
themeViewModel: ThemeViewModel? = null
) { ) {
val state by viewModel.uiState.collectAsStateWithLifecycle() val state by viewModel.uiState.collectAsStateWithLifecycle()
val themeMode = themeViewModel?.themeMode?.collectAsStateWithLifecycle()
val activeFilter by viewModel.activeFilter.collectAsStateWithLifecycle() val activeFilter by viewModel.activeFilter.collectAsStateWithLifecycle()
val sortOrder by viewModel.sortOrder.collectAsStateWithLifecycle() val sortOrder by viewModel.sortOrder.collectAsStateWithLifecycle()
val searchQuery by viewModel.searchQuery.collectAsStateWithLifecycle() val searchQuery by viewModel.searchQuery.collectAsStateWithLifecycle()
@ -220,17 +216,6 @@ fun FeedScreen(
IconButton(onClick = { viewModel.activateSearch() }) { IconButton(onClick = { viewModel.activateSearch() }) {
Icon(Icons.Default.Search, contentDescription = "Search") Icon(Icons.Default.Search, contentDescription = "Search")
} }
if (themeViewModel != null) {
val currentMode = themeMode?.value ?: ThemeMode.SYSTEM
val (icon, description) = when (currentMode) {
ThemeMode.SYSTEM -> Icons.Default.BrightnessAuto to "Theme: System"
ThemeMode.LIGHT -> Icons.Default.LightMode to "Theme: Light"
ThemeMode.DARK -> Icons.Default.DarkMode to "Theme: Dark"
}
IconButton(onClick = { themeViewModel.cycleThemeMode() }) {
Icon(icon, contentDescription = description)
}
}
SortButton( SortButton(
currentSort = sortOrder, currentSort = sortOrder,
onSortSelected = { viewModel.setSortOrder(it) } onSortSelected = { viewModel.setSortOrder(it) }

1
app/src/main/java/com/swoosh/microblog/ui/navigation/NavGraph.kt
View file

@ -56,7 +56,6 @@ fun SwooshNavGraph(
composable(Routes.FEED) { composable(Routes.FEED) {
FeedScreen( FeedScreen(
viewModel = feedViewModel, viewModel = feedViewModel,
themeViewModel = themeViewModel,
onSettingsClick = { navController.navigate(Routes.SETTINGS) }, onSettingsClick = { navController.navigate(Routes.SETTINGS) },
onPostClick = { post -> onPostClick = { post ->
selectedPost = post selectedPost = post