Merge pull request #288 from bilalahmadsheikh/copilot/create-first-issue

rainxchzed · web-flow · commit 658b3c4f8a70 · 2026-03-07T05:35:14.000+05:00
diff --git a/core/presentation/src/commonMain/composeResources/values/strings.xml b/core/presentation/src/commonMain/composeResources/values/strings.xml
@@ -83,6 +83,10 @@
     <string name="sort_most_forks">Most Forks</string>
     <string name="sort_best_match">Best Match</string>
 
+    <string name="sort_order_descending">Descending</string>
+    <string name="sort_order_ascending">Ascending</string>
+    <string name="sort_label">Sort</string>
+
     <!-- Programming languages -->
     <string name="language_all">All Languages</string>
     <string name="language_kotlin">Kotlin</string>
diff --git a/feature/search/data/src/commonMain/kotlin/zed/rainxch/search/data/repository/SearchRepositoryImpl.kt b/feature/search/data/src/commonMain/kotlin/zed/rainxch/search/data/repository/SearchRepositoryImpl.kt
@@ -30,6 +30,7 @@ import zed.rainxch.core.domain.model.RateLimitException
 import zed.rainxch.domain.model.ProgrammingLanguage
 import zed.rainxch.domain.model.SearchPlatform
 import zed.rainxch.domain.model.SortBy
+import zed.rainxch.domain.model.SortOrder
 import zed.rainxch.domain.repository.SearchRepository
 import zed.rainxch.search.data.dto.GithubReleaseNetworkModel
 import zed.rainxch.search.data.utils.LruCache
@@ -53,20 +54,22 @@ class SearchRepositoryImpl(
         platform: SearchPlatform,
         language: ProgrammingLanguage,
         sortBy: SortBy,
+        sortOrder: SortOrder,
         page: Int
     ): String {
         val queryHash = query.trim().lowercase().hashCode().toUInt().toString(16)
-        return "search:$queryHash:${platform.name}:${language.name}:${sortBy.name}:page$page"
+        return "search:$queryHash:${platform.name}:${language.name}:${sortBy.name}:${sortOrder.name}:page$page"
     }
 
     override fun searchRepositories(
         query: String,
         searchPlatform: SearchPlatform,
         language: ProgrammingLanguage,
         sortBy: SortBy,
+        sortOrder: SortOrder,
         page: Int
     ): Flow<PaginatedDiscoveryRepositories> = channelFlow {
-        val cacheKey = searchCacheKey(query, searchPlatform, language, sortBy, page)
+        val cacheKey = searchCacheKey(query, searchPlatform, language, sortBy, sortOrder, page)
 
         val cached = cacheManager.get<PaginatedDiscoveryRepositories>(cacheKey)
         if (cached != null) {
@@ -75,7 +78,8 @@ class SearchRepositoryImpl(
         }
 
         val searchQuery = buildSearchQuery(query, language)
-        val (sort, order) = sortBy.toGithubParams()
+        val sort = sortBy.toGithubSortParam()
+        val order = sortOrder.toGithubParam()
 
         try {
             var currentPage = page
diff --git a/feature/search/domain/src/commonMain/kotlin/zed/rainxch/domain/model/SortBy.kt b/feature/search/domain/src/commonMain/kotlin/zed/rainxch/domain/model/SortBy.kt
@@ -5,9 +5,9 @@ enum class SortBy {
     MostForks,
     BestMatch;
 
-    fun toGithubParams(): Pair<String?, String> = when (this) {
-        MostStars -> "stars" to "desc"
-        MostForks -> "forks" to "desc"
-        BestMatch -> null to "desc"
+    fun toGithubSortParam(): String? = when (this) {
+        MostStars -> "stars"
+        MostForks -> "forks"
+        BestMatch -> null
     }
 }
diff --git a/feature/search/domain/src/commonMain/kotlin/zed/rainxch/domain/model/SortOrder.kt b/feature/search/domain/src/commonMain/kotlin/zed/rainxch/domain/model/SortOrder.kt
@@ -0,0 +1,11 @@
+package zed.rainxch.domain.model
+
+enum class SortOrder {
+    Descending,
+    Ascending;
+
+    fun toGithubParam(): String = when (this) {
+        Descending -> "desc"
+        Ascending -> "asc"
+    }
+}
diff --git a/feature/search/domain/src/commonMain/kotlin/zed/rainxch/domain/repository/SearchRepository.kt b/feature/search/domain/src/commonMain/kotlin/zed/rainxch/domain/repository/SearchRepository.kt
@@ -5,13 +5,15 @@ import zed.rainxch.core.domain.model.PaginatedDiscoveryRepositories
 import zed.rainxch.domain.model.ProgrammingLanguage
 import zed.rainxch.domain.model.SearchPlatform
 import zed.rainxch.domain.model.SortBy
+import zed.rainxch.domain.model.SortOrder
 
 interface SearchRepository {
     fun searchRepositories(
         query: String,
         searchPlatform: SearchPlatform,
         language: ProgrammingLanguage,
         sortBy: SortBy,
+        sortOrder: SortOrder,
         page: Int
     ): Flow<PaginatedDiscoveryRepositories>
 }
diff --git a/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchAction.kt b/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchAction.kt
@@ -4,12 +4,14 @@ import zed.rainxch.core.domain.model.GithubRepoSummary
 import zed.rainxch.domain.model.ProgrammingLanguage
 import zed.rainxch.domain.model.SearchPlatform
 import zed.rainxch.domain.model.SortBy
+import zed.rainxch.domain.model.SortOrder
 
 sealed interface SearchAction {
     data class OnSearchChange(val query: String) : SearchAction
     data class OnPlatformTypeSelected(val searchPlatform: SearchPlatform) : SearchAction
     data class OnLanguageSelected(val language: ProgrammingLanguage) : SearchAction
     data class OnSortBySelected(val sortBy: SortBy) : SearchAction
+    data class OnSortOrderSelected(val sortOrder: SortOrder) : SearchAction
     data class OnRepositoryClick(val repository: GithubRepoSummary) : SearchAction
     data class OnRepositoryDeveloperClick(val username: String) : SearchAction
     data class OnShareClick(val repo: GithubRepoSummary) : SearchAction
@@ -20,6 +22,7 @@ sealed interface SearchAction {
     data object OnClearClick : SearchAction
     data object Retry : SearchAction
     data object OnToggleLanguageSheetVisibility : SearchAction
+    data object OnToggleSortByDialogVisibility : SearchAction
     data object OnFabClick : SearchAction
     data object DismissClipboardBanner : SearchAction
 }
diff --git a/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchRoot.kt b/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchRoot.kt
@@ -33,6 +33,7 @@ import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.OpenInNew
+import androidx.compose.material.icons.automirrored.filled.Sort
 import androidx.compose.material.icons.filled.Clear
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Link
@@ -100,7 +101,10 @@ import zed.rainxch.githubstore.core.presentation.res.open_in_app
 import zed.rainxch.githubstore.core.presentation.res.results_found
 import zed.rainxch.githubstore.core.presentation.res.retry
 import zed.rainxch.githubstore.core.presentation.res.search_repositories_hint
+import zed.rainxch.githubstore.core.presentation.res.sort_label
+import zed.rainxch.domain.model.SortBy
 import zed.rainxch.search.presentation.components.LanguageFilterBottomSheet
+import zed.rainxch.search.presentation.components.SortByBottomSheet
 import zed.rainxch.search.presentation.utils.ParsedGithubLink
 import zed.rainxch.search.presentation.utils.label
 
@@ -166,6 +170,23 @@ fun SearchRoot(
             }
         )
     }
+
+    if (state.isSortByDialogVisible) {
+        SortByBottomSheet(
+            sortByOptions = SortBy.entries,
+            selectedSortBy = state.selectedSortBy,
+            selectedSortOrder = state.selectedSortOrder,
+            onSortBySelected = { sortBy ->
+                viewModel.onAction(SearchAction.OnSortBySelected(sortBy))
+            },
+            onSortOrderSelected = { sortOrder ->
+                viewModel.onAction(SearchAction.OnSortOrderSelected(sortOrder))
+            },
+            onDismissRequest = {
+                viewModel.onAction(SearchAction.OnToggleSortByDialogVisibility)
+            }
+        )
+    }
 }
 
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
@@ -399,6 +420,48 @@ fun SearchScreen(
                 }
             }
 
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(6.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(
+                    text = stringResource(Res.string.sort_label),
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    fontWeight = FontWeight.Medium
+                )
+
+                FilterChip(
+                    selected = state.selectedSortBy != SortBy.BestMatch,
+                    onClick = {
+                        onAction(SearchAction.OnToggleSortByDialogVisibility)
+                    },
+                    label = {
+                        Row(
+                            verticalAlignment = Alignment.CenterVertically,
+                            horizontalArrangement = Arrangement.spacedBy(4.dp)
+                        ) {
+                            Icon(
+                                imageVector = Icons.AutoMirrored.Filled.Sort,
+                                contentDescription = null,
+                                modifier = Modifier.size(18.dp)
+                            )
+                            Text(
+                                text = stringResource(state.selectedSortBy.label()),
+                                style = MaterialTheme.typography.bodyMedium,
+                                fontWeight = FontWeight.Medium
+                            )
+                            Icon(
+                                imageVector = Icons.Outlined.KeyboardArrowDown,
+                                contentDescription = null,
+                                modifier = Modifier.size(18.dp)
+                            )
+                        }
+                    }
+                )
+            }
+
             Spacer(Modifier.height(6.dp))
 
             if (state.totalCount != null) {
diff --git a/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchState.kt b/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchState.kt
@@ -4,20 +4,23 @@ import zed.rainxch.core.presentation.model.DiscoveryRepository
 import zed.rainxch.domain.model.ProgrammingLanguage
 import zed.rainxch.domain.model.SearchPlatform
 import zed.rainxch.domain.model.SortBy
+import zed.rainxch.domain.model.SortOrder
 import zed.rainxch.search.presentation.utils.ParsedGithubLink
 
 data class SearchState(
     val query: String = "",
     val repositories: List<DiscoveryRepository> = emptyList(),
     val selectedSearchPlatform: SearchPlatform = SearchPlatform.All,
     val selectedSortBy: SortBy = SortBy.BestMatch,
+    val selectedSortOrder: SortOrder = SortOrder.Descending,
     val selectedLanguage: ProgrammingLanguage = ProgrammingLanguage.All,
     val isLoading: Boolean = false,
     val isLoadingMore: Boolean = false,
     val errorMessage: String? = null,
     val hasMorePages: Boolean = true,
     val totalCount: Int? = null,
     val isLanguageSheetVisible: Boolean = false,
+    val isSortByDialogVisible: Boolean = false,
     val detectedLinks: List<ParsedGithubLink> = emptyList(),
     val clipboardLinks: List<ParsedGithubLink> = emptyList(),
     val isClipboardBannerVisible: Boolean = false,
diff --git a/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchViewModel.kt b/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/SearchViewModel.kt
@@ -235,6 +235,7 @@ class SearchViewModel(
                         searchPlatform = _state.value.selectedSearchPlatform,
                         language = _state.value.selectedLanguage,
                         sortBy = _state.value.selectedSortBy,
+                        sortOrder = _state.value.selectedSortOrder,
                         page = currentPage
                     )
                     .collect { paginatedRepos ->
@@ -447,6 +448,23 @@ class SearchViewModel(
                 }
             }
 
+            is SearchAction.OnSortOrderSelected -> {
+                if (_state.value.selectedSortOrder != action.sortOrder) {
+                    _state.update {
+                        it.copy(selectedSortOrder = action.sortOrder)
+                    }
+                    currentPage = 1
+                    searchDebounceJob?.cancel()
+                    performSearch(isInitial = true)
+                }
+            }
+
+            SearchAction.OnToggleSortByDialogVisibility -> {
+                _state.update {
+                    it.copy(isSortByDialogVisible = !it.isSortByDialogVisible)
+                }
+            }
+
             SearchAction.LoadMore -> {
                 if (!_state.value.isLoadingMore && !_state.value.isLoading && _state.value.hasMorePages) {
                     performSearch(isInitial = false)
diff --git a/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/components/SortByBottomSheet.kt b/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/components/SortByBottomSheet.kt
@@ -4,21 +4,33 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.FilterChip
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.unit.dp
 import org.jetbrains.compose.resources.stringResource
 import zed.rainxch.domain.model.SortBy
+import zed.rainxch.domain.model.SortOrder
+import zed.rainxch.githubstore.core.presentation.res.Res
+import zed.rainxch.githubstore.core.presentation.res.close
+import zed.rainxch.githubstore.core.presentation.res.sort_by
 import zed.rainxch.search.presentation.utils.label
 
 @Composable
 fun SortByBottomSheet(
     sortByOptions: List<SortBy>,
     selectedSortBy: SortBy,
+    selectedSortOrder: SortOrder,
     onSortBySelected: (SortBy) -> Unit,
+    onSortOrderSelected: (SortOrder) -> Unit,
     onDismissRequest: () -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -27,12 +39,12 @@ fun SortByBottomSheet(
         confirmButton = {},
         dismissButton = {
             TextButton(onClick = onDismissRequest) {
-                Text(text = "Close")
+                Text(text = stringResource(Res.string.close))
             }
         },
         title = {
             Text(
-                text = "Sort by",
+                text = stringResource(Res.string.sort_by),
                 style = MaterialTheme.typography.titleMedium
             )
         },
@@ -46,7 +58,6 @@ fun SortByBottomSheet(
                     TextButton(
                         onClick = {
                             onSortBySelected(option)
-                            onDismissRequest()
                         },
                         modifier = Modifier.fillMaxWidth()
                     ) {
@@ -57,6 +68,29 @@ fun SortByBottomSheet(
                         )
                     }
                 }
+
+                HorizontalDivider()
+
+                Spacer(Modifier.height(4.dp))
+
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    SortOrder.entries.forEach { order ->
+                        FilterChip(
+                            selected = order == selectedSortOrder,
+                            onClick = { onSortOrderSelected(order) },
+                            label = {
+                                Text(
+                                    text = stringResource(order.label()),
+                                    style = MaterialTheme.typography.bodyMedium
+                                )
+                            }
+                        )
+                    }
+                }
             }
         }
     )
diff --git a/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/utils/SortOrderMapper.kt b/feature/search/presentation/src/commonMain/kotlin/zed/rainxch/search/presentation/utils/SortOrderMapper.kt
@@ -0,0 +1,12 @@
+package zed.rainxch.search.presentation.utils
+
+import org.jetbrains.compose.resources.StringResource
+import zed.rainxch.domain.model.SortOrder
+import zed.rainxch.domain.model.SortOrder.Ascending
+import zed.rainxch.domain.model.SortOrder.Descending
+import zed.rainxch.githubstore.core.presentation.res.Res
+
+fun SortOrder.label(): StringResource = when (this) {
+    Descending -> Res.string.sort_order_descending
+    Ascending -> Res.string.sort_order_ascending
+}

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ enum class SortBy {`
`5`	`5`	`MostForks,`
`6`	`6`	`BestMatch;`
`7`	`7`
`8`		`- fun toGithubParams(): Pair<String?, String> = when (this) {`
`9`		`- MostStars -> "stars" to "desc"`
`10`		`- MostForks -> "forks" to "desc"`
`11`		`- BestMatch -> null to "desc"`
	`8`	`+ fun toGithubSortParam(): String? = when (this) {`
	`9`	`+ MostStars -> "stars"`
	`10`	`+ MostForks -> "forks"`
	`11`	`+ BestMatch -> null`
`12`	`12`	`}`
`13`	`13`	`}`