feat: search vm + android view impl

android/src/main/java/me/nathanfallet/extopy/features/timelines/TimelineView.kt

@@ -1,10 +1,11 @@
 package me.nathanfallet.extopy.features.timelines
 
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
@@ -23,6 +24,7 @@ import me.nathanfallet.extopy.R
 import me.nathanfallet.extopy.models.users.User
 import me.nathanfallet.extopy.ui.components.posts.PostCard
 import me.nathanfallet.extopy.ui.components.users.UserCard
+import me.nathanfallet.extopy.viewmodels.timelines.SearchViewModel
 import me.nathanfallet.extopy.viewmodels.timelines.TimelineViewModel
 import org.koin.androidx.compose.koinViewModel
 import org.koin.core.parameter.parametersOf
@@ -39,6 +41,7 @@ fun TimelineView(
     val viewModel = koinViewModel<TimelineViewModel>(
         parameters = { parametersOf(id) }
     )
+    val searchViewModel = koinViewModel<SearchViewModel>()
 
     LaunchedEffect(id) {
         viewModel.fetchTimeline()
@@ -47,69 +50,24 @@ fun TimelineView(
     val timeline by viewModel.timeline.collectAsState()
     val users by viewModel.users.collectAsState()
     val posts by viewModel.posts.collectAsState()
-    val search by viewModel.search.collectAsState()
+
+    val search by searchViewModel.search.collectAsState()
+    val searchUsers by searchViewModel.users.collectAsState()
+    val searchPosts by searchViewModel.posts.collectAsState()
 
     LazyColumn(
         modifier
     ) {
         item {
             TopAppBar(
-                title = {
-                    search?.let { search ->
-                        TextField(
-                            value = search,
-                            onValueChange = viewModel::updateSearch,
-                            placeholder = {
-                                Text(
-                                    text = stringResource(id = R.string.timeline_search_field),
-                                    color = Color.LightGray
-                                )
-                            },
-                            keyboardOptions = KeyboardOptions(
-                                imeAction = ImeAction.Search
-                            ),
-                            keyboardActions = KeyboardActions(
-                                onSearch = {
-                                    viewModel.viewModelScope.coroutineScope.launch {
-                                        viewModel.doSearch()
-                                    }
-                                }
-                            )
-                        )
-                    } ?: run {
-                        Text(stringResource(R.string.timeline_title))
-                    }
-                },
+                title = { Text(stringResource(R.string.timeline_title)) },
                 actions = {
-                    if (search != null) {
-                        IconButton(
-                            onClick = { viewModel.updateSearch(null) }
-                        ) {
-                            Icon(
-                                painter = painterResource(id = R.drawable.ic_baseline_close_24),
-                                contentDescription = stringResource(id = R.string.timeline_search_cancel)
-                            )
-                        }
-                    } else {
-                        IconButton(
-                            onClick = { navigate("timelines/compose") }
-                        ) {
-                            Icon(
-                                painter = painterResource(id = R.drawable.ic_baseline_create_24),
-                                contentDescription = stringResource(id = R.string.timeline_compose_title)
-                            )
-                        }
-                    }
                     IconButton(
-                        onClick = {
-                            viewModel.viewModelScope.coroutineScope.launch {
-                                viewModel.doSearch()
-                            }
-                        }
+                        onClick = { navigate("timelines/compose") }
                     ) {
                         Icon(
-                            painter = painterResource(id = R.drawable.ic_baseline_search_24),
-                            contentDescription = stringResource(id = R.string.timeline_search_title)
+                            painter = painterResource(id = R.drawable.ic_baseline_create_24),
+                            contentDescription = stringResource(id = R.string.timeline_compose_title)
                         )
                     }
                 }
@@ -118,7 +76,25 @@ fun TimelineView(
         item {
             Spacer(modifier = Modifier.height(12.dp))
         }
-        items(users ?: listOf()) {
+        item {
+            TextField(
+                value = search,
+                onValueChange = searchViewModel::updateSearch,
+                placeholder = {
+                    Text(
+                        text = stringResource(id = R.string.timeline_search_field),
+                        color = Color.LightGray
+                    )
+                },
+                keyboardOptions = KeyboardOptions(
+                    imeAction = ImeAction.Search
+                ),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp)
+            )
+        }
+        items(searchUsers?.takeIf { it.isNotEmpty() } ?: users ?: listOf()) {
             UserCard(
                 user = it,
                 viewedBy = viewedBy,
@@ -148,7 +124,7 @@ fun TimelineView(
                 }
             )
         }
-        items(posts ?: listOf()) {
+        items(searchPosts?.takeIf { it.isNotEmpty() } ?: posts ?: listOf()) {
             PostCard(
                 post = it,
                 navigate = navigate,

shared/src/commonMain/kotlin/me/nathanfallet/extopy/di/SharedModule.kt

@@ -18,6 +18,7 @@ import me.nathanfallet.extopy.viewmodels.auth.AuthViewModel
 import me.nathanfallet.extopy.viewmodels.notifications.NotificationsViewModel
 import me.nathanfallet.extopy.viewmodels.posts.PostViewModel
 import me.nathanfallet.extopy.viewmodels.root.RootViewModel
+import me.nathanfallet.extopy.viewmodels.timelines.SearchViewModel
 import me.nathanfallet.extopy.viewmodels.timelines.TimelineComposeViewModel
 import me.nathanfallet.extopy.viewmodels.timelines.TimelineViewModel
 import me.nathanfallet.extopy.viewmodels.users.ProfileViewModel
@@ -50,13 +51,15 @@ val useCaseModule = module {
     single<IFetchTimelinePostsUseCase> { FetchTimelinePostsUseCase(get()) }
 
     // Users
+    single<IFetchUsersUseCase> { FetchUsersUseCase(get()) }
     single<IFetchUserUseCase> { FetchUserUseCase(get(), get()) }
     single<IUpdateFollowInUserUseCase> { UpdateFollowInUserUseCase(get(), get()) }
     single<IFetchUserPostsUseCase> { FetchUserPostsUseCase(get(), get()) }
 
     // Posts
     single<ICreatePostUseCase> { CreatePostUseCase(get(), get()) }
     single<IUpdateLikeInPostUseCase> { UpdateLikeInPostUseCase(get(), get()) }
+    single<IFetchPostsUseCase> { FetchPostsUseCase(get()) }
     single<IFetchPostUseCase> { FetchPostUseCase(get(), get()) }
     single<IFetchPostRepliesUseCase> { FetchPostRepliesUseCase(get(), get()) }
 }
@@ -66,6 +69,7 @@ val viewModelModule = module {
     factory { AuthViewModel(get(), get(), get(), get(), get()) }
     factory { TimelineViewModel(it[0], get(), get(), get(), get()) }
     factory { TimelineComposeViewModel(it[0], it[1], it[2], get()) }
+    factory { SearchViewModel(get(), get()) }
     factory { PostViewModel(it[0], get(), get(), get()) }
     factory { ProfileViewModel(it[0], get(), get(), get(), get()) }
     factory { NotificationsViewModel() }

shared/src/commonMain/kotlin/me/nathanfallet/extopy/usecases/posts/FetchPostsUseCase.kt

@@ -0,0 +1,13 @@
+package me.nathanfallet.extopy.usecases.posts
+
+import me.nathanfallet.extopy.client.IExtopyClient
+import me.nathanfallet.extopy.models.posts.Post
+import me.nathanfallet.usecases.pagination.Pagination
+
+class FetchPostsUseCase(
+    private val client: IExtopyClient,
+) : IFetchPostsUseCase {
+
+    override suspend fun invoke(input: Pagination): List<Post> = client.posts.list(input)
+
+}

shared/src/commonMain/kotlin/me/nathanfallet/extopy/usecases/posts/IFetchPostsUseCase.kt

@@ -0,0 +1,7 @@
+package me.nathanfallet.extopy.usecases.posts
+
+import me.nathanfallet.extopy.models.posts.Post
+import me.nathanfallet.usecases.base.ISuspendUseCase
+import me.nathanfallet.usecases.pagination.Pagination
+
+interface IFetchPostsUseCase : ISuspendUseCase<Pagination, List<Post>>

shared/src/commonMain/kotlin/me/nathanfallet/extopy/usecases/users/FetchUsersUseCase.kt

@@ -0,0 +1,13 @@
+package me.nathanfallet.extopy.usecases.users
+
+import me.nathanfallet.extopy.client.IExtopyClient
+import me.nathanfallet.extopy.models.users.User
+import me.nathanfallet.usecases.pagination.Pagination
+
+class FetchUsersUseCase(
+    private val client: IExtopyClient,
+) : IFetchUsersUseCase {
+
+    override suspend fun invoke(input: Pagination): List<User> = client.users.list(input)
+
+}

shared/src/commonMain/kotlin/me/nathanfallet/extopy/usecases/users/IFetchUsersUseCase.kt

@@ -0,0 +1,7 @@
+package me.nathanfallet.extopy.usecases.users
+
+import me.nathanfallet.extopy.models.users.User
+import me.nathanfallet.usecases.base.ISuspendUseCase
+import me.nathanfallet.usecases.pagination.Pagination
+
+interface IFetchUsersUseCase : ISuspendUseCase<Pagination, List<User>>

shared/src/commonMain/kotlin/me/nathanfallet/extopy/viewmodels/timelines/SearchViewModel.kt

@@ -2,25 +2,105 @@ package me.nathanfallet.extopy.viewmodels.timelines
 
 import com.rickclephas.kmm.viewmodel.KMMViewModel
 import com.rickclephas.kmm.viewmodel.MutableStateFlow
+import com.rickclephas.kmm.viewmodel.coroutineScope
+import com.rickclephas.kmp.nativecoroutines.NativeCoroutines
 import com.rickclephas.kmp.nativecoroutines.NativeCoroutinesState
+import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.launch
+import me.nathanfallet.extopy.models.application.SearchOptions
+import me.nathanfallet.extopy.models.posts.Post
+import me.nathanfallet.extopy.models.users.User
+import me.nathanfallet.extopy.usecases.posts.IFetchPostsUseCase
+import me.nathanfallet.extopy.usecases.users.IFetchUsersUseCase
+import me.nathanfallet.usecases.pagination.Pagination
 
+@OptIn(FlowPreview::class)
 class SearchViewModel(
-
+    private val fetchUsersUseCase: IFetchUsersUseCase,
+    private val fetchPostsUseCase: IFetchPostsUseCase,
 ) : KMMViewModel() {
 
     // Properties
 
     private val _search = MutableStateFlow(viewModelScope, "")
 
+    private val _users = MutableStateFlow<List<User>?>(viewModelScope, null)
+    private val _posts = MutableStateFlow<List<Post>?>(viewModelScope, null)
+
+    private val _hasMoreUsers = MutableStateFlow(viewModelScope, true)
+    private val _hasMorePosts = MutableStateFlow(viewModelScope, true)
+
     @NativeCoroutinesState
     val search = _search.asStateFlow()
 
-    // Methods
+    @NativeCoroutinesState
+    val users = _users.asStateFlow()
+
+    @NativeCoroutinesState
+    val posts = _posts.asStateFlow()
+
+    @NativeCoroutinesState
+    val hasMoreUsers = _hasMoreUsers.asStateFlow()
+
+    @NativeCoroutinesState
+    val hasMorePosts = _hasMorePosts.asStateFlow()
+
+    // Setters
 
     fun updateSearch(value: String) {
         _search.value = value
     }
 
+    // Methods
+
+    init {
+        viewModelScope.coroutineScope.launch {
+            _search.debounce(500L).collect {
+                fetchUsers(true)
+                fetchPosts(true)
+            }
+        }
+    }
+
+    @NativeCoroutines
+    suspend fun fetchUsers(reset: Boolean = false) {
+        val search = search.value.trim().takeIf { it.isNotBlank() } ?: return
+        _users.value = if (reset) fetchUsersUseCase(Pagination(25, 0, SearchOptions(search))).also {
+            _hasMoreUsers.value = it.isNotEmpty()
+        } else (_users.value ?: emptyList()) + fetchUsersUseCase(
+            Pagination(25, users.value?.size?.toLong() ?: 0, SearchOptions(search))
+        ).also {
+            _hasMoreUsers.value = it.isNotEmpty()
+        }
+    }
+
+    fun loadMoreUsers() {
+        if (!hasMoreUsers.value) return
+        viewModelScope.coroutineScope.launch {
+            fetchUsers()
+        }
+    }
+
+    @NativeCoroutines
+    suspend fun fetchPosts(reset: Boolean = false) {
+        val search = search.value.trim().takeIf { it.isNotBlank() } ?: return
+        _posts.value = if (reset) fetchPostsUseCase(Pagination(25, 0, SearchOptions(search))).also {
+            _hasMorePosts.value = it.isNotEmpty()
+        } else (_posts.value ?: emptyList()) + fetchPostsUseCase(
+            Pagination(25, _posts.value?.size?.toLong() ?: 0, SearchOptions(search))
+        ).also {
+            _hasMorePosts.value = it.isNotEmpty()
+        }
+    }
+
+    fun loadMorePosts() {
+        if (!hasMorePosts.value) return
+        viewModelScope.coroutineScope.launch {
+            fetchPosts()
+        }
+    }
+
 
 }

shared/src/commonMain/kotlin/me/nathanfallet/extopy/viewmodels/timelines/TimelineViewModel.kt

@@ -29,7 +29,6 @@ class TimelineViewModel(
     private val _timeline = MutableStateFlow<Timeline?>(viewModelScope, null)
     private val _users = MutableStateFlow<List<User>?>(viewModelScope, null)
     private val _posts = MutableStateFlow<List<Post>?>(viewModelScope, null)
-    private val _search = MutableStateFlow<String?>(viewModelScope, null)
 
     @NativeCoroutinesState
     val timeline = _timeline.asStateFlow()
@@ -40,9 +39,6 @@ class TimelineViewModel(
     @NativeCoroutinesState
     val posts = _posts.asStateFlow()
 
-    @NativeCoroutinesState
-    val search = _search.asStateFlow()
-
     private var hasMore = true
 
     // Methods
@@ -64,10 +60,6 @@ class TimelineViewModel(
         }
     }
 
-    fun updateSearch(search: String?) {
-        _search.value = search
-    }
-
     @NativeCoroutines
     suspend fun onLikeClicked(post: Post) {
         updateLikeInPostUseCase(post)?.let {
@@ -86,11 +78,6 @@ class TimelineViewModel(
         }
     }
 
-    @NativeCoroutines
-    suspend fun doSearch() {
-
-    }
-
     fun loadMoreIfNeeded(postId: String) {
         if (!hasMore || posts.value?.lastOrNull()?.id != postId) return
         viewModelScope.coroutineScope.launch {

shared/src/iosMain/kotlin/me/nathanfallet/extopy/di/Koin.kt

@@ -3,6 +3,7 @@ package me.nathanfallet.extopy.di
 import me.nathanfallet.extopy.viewmodels.auth.AuthViewModel
 import me.nathanfallet.extopy.viewmodels.posts.PostViewModel
 import me.nathanfallet.extopy.viewmodels.root.RootViewModel
+import me.nathanfallet.extopy.viewmodels.timelines.SearchViewModel
 import me.nathanfallet.extopy.viewmodels.timelines.TimelineComposeViewModel
 import me.nathanfallet.extopy.viewmodels.timelines.TimelineViewModel
 import me.nathanfallet.extopy.viewmodels.users.ProfileViewModel
@@ -28,6 +29,8 @@ fun Koin.timelineComposeViewModel(body: String, repliedToId: String?, repostOfId
         parametersOf(body, repliedToId, repostOfId)
     }
 
+val Koin.searchViewModel: SearchViewModel get() = get()
+
 fun Koin.postViewModel(id: String): PostViewModel = get {
     parametersOf(id)
 }