diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt index 905e4a4f8..be5806a63 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt @@ -125,7 +125,7 @@ class CardFeedViewModel(val dataSource: NostrDataSource): ViewModel() { handlerWaiting.set(true) val scope = CoroutineScope(Job() + Dispatchers.Default) scope.launch { - delay(100) + delay(5000) refresh() handlerWaiting.set(false) } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt index 5a1a34132..bd38caf22 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt @@ -78,7 +78,6 @@ abstract class FeedViewModel(val dataSource: NostrDataSource): ViewModel() } fun refresh() { - println("AAA Refresh") val scope = CoroutineScope(Job() + Dispatchers.Default) scope.launch { refreshSuspended() @@ -123,7 +122,7 @@ abstract class FeedViewModel(val dataSource: NostrDataSource): ViewModel() handlerWaiting.set(true) val scope = CoroutineScope(Job() + Dispatchers.Default) scope.launch { - delay(1000) + delay(5000) refresh() handlerWaiting.set(false) } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt index 9fa8a1087..8611bf244 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt @@ -87,7 +87,7 @@ open class UserFeedViewModel(val dataSource: NostrDataSource): ViewModel() handlerWaiting.set(true) val scope = CoroutineScope(Job() + Dispatchers.Default) scope.launch { - delay(1000) + delay(5000) refresh() handlerWaiting.set(false) } diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt index e3a459d94..217b5f3af 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt @@ -131,6 +131,7 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, accoun onPost = { account.sendChannelMeesage(newPost.value.text, channel.idHex, null, null) newPost.value = TextFieldValue("") + feedViewModel.refresh() // Don't wait a full second before updating }, newPost.value.text.isNotBlank(), modifier = Modifier.padding(end = 10.dp) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt index 95929008e..6b27529a8 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt @@ -75,7 +75,8 @@ fun TabKnown(accountViewModel: AccountViewModel, navController: NavController) { val feedViewModel: NostrChatroomListKnownFeedViewModel = viewModel() LaunchedEffect(Unit) { - feedViewModel.refresh() + feedViewModel.hardRefresh() // refresh filters + feedViewModel.refresh() // refresh view } Column(Modifier.fillMaxHeight()) { @@ -92,7 +93,8 @@ fun TabNew(accountViewModel: AccountViewModel, navController: NavController) { val feedViewModel: NostrChatroomListNewFeedViewModel = viewModel() LaunchedEffect(Unit) { - feedViewModel.refresh() + feedViewModel.hardRefresh() // refresh filters + feedViewModel.refresh() // refresh view } Column(Modifier.fillMaxHeight()) { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt index ed6b0c6ea..2f74e69c1 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt @@ -110,6 +110,7 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr onPost = { account.sendPrivateMeesage(newPost.value.text, userId) newPost.value = TextFieldValue("") + feedViewModel.refresh() // Don't wait a full second before updating }, newPost.value.text.isNotBlank(), modifier = Modifier.padding(end = 10.dp) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt index 98127d5e2..c55840006 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt @@ -34,6 +34,7 @@ fun HomeScreen(accountViewModel: AccountViewModel, navController: NavController) LaunchedEffect(Unit) { feedViewModel.refresh() + feedViewModelReplies.refresh() } Column(Modifier.fillMaxHeight()) {