highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-04-01 08:28:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make forceRefresh non-null

Browse Source
This commit is contained in:
maxmoney21m 2023-03-13 13:07:01 +08:00
parent bb7dcbdb78
commit e4cec20d1a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt
View File

@ -45,7 +45,7 @@ sealed class Route(
hasNewItems = { accountViewModel, cache, context -> homeHasNewItems(accountViewModel, cache, context) },
buildScreen = { accountViewModel, _, navController ->
{ backStackEntry ->
HomeScreen(accountViewModel, navController, backStackEntry.arguments?.getBoolean("forceRefresh", false))
HomeScreen(accountViewModel, navController, backStackEntry.arguments?.getBoolean("forceRefresh", false) ?: false)
}
}
)
@ -56,7 +56,7 @@ sealed class Route(
arguments = listOf(navArgument("forceRefresh") { type = NavType.BoolType; defaultValue = false }),
buildScreen = { acc, _, navController ->
{ backStackEntry ->
SearchScreen(acc, navController, backStackEntry.arguments?.getBoolean("forceRefresh", false))
SearchScreen(acc, navController, backStackEntry.arguments?.getBoolean("forceRefresh", false) ?: false)
}
}
)

6
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt
View File

@ -42,11 +42,11 @@ fun FeedView(
navController: NavController,
routeForLastRead: String?,
scrollStateKey: String? = null,
forceRefresh: Boolean? = false
forceRefresh: Boolean = false
) {
val feedState by viewModel.feedContent.collectAsState()
var refreshing by remember { mutableStateOf(forceRefresh!!) }
var refreshing by remember { mutableStateOf(forceRefresh) }
val refresh = { refreshing = true; viewModel.refresh(); refreshing = false }
val pullRefreshState = rememberPullRefreshState(refreshing, onRefresh = refresh)
@ -77,7 +77,7 @@ fun FeedView(
accountViewModel,
navController,
scrollStateKey,
forceRefresh!!
forceRefresh
)
}

2
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt
View File

@ -39,7 +39,7 @@ import kotlinx.coroutines.launch
@OptIn(ExperimentalPagerApi::class)
@Composable
fun HomeScreen(accountViewModel: AccountViewModel, navController: NavController, forceRefresh: Boolean? = false) {
fun HomeScreen(accountViewModel: AccountViewModel, navController: NavController, forceRefresh: Boolean = false) {
val accountState by accountViewModel.accountLiveData.observeAsState()
val account = accountState?.account ?: return

2
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt
View File

@ -79,7 +79,7 @@ import kotlinx.coroutines.withContext
import kotlinx.coroutines.channels.Channel as CoroutineChannel
@Composable
fun SearchScreen(accountViewModel: AccountViewModel, navController: NavController, forceRefresh: Boolean? = false) {
fun SearchScreen(accountViewModel: AccountViewModel, navController: NavController, forceRefresh: Boolean = false) {
val accountState by accountViewModel.accountLiveData.observeAsState()
val account = accountState?.account ?: return