[chore]: GroupSearchScreen 주석 및 필터 수정 (#47)

Author: rbqks529

.idea/misc.xml

@@ -46,12 +46,21 @@ fun GroupSearchScreen(
     var searchText by rememberSaveable { mutableStateOf("") }
     var isSearched by rememberSaveable { mutableStateOf(false) }
     var selectedGenreIndex by rememberSaveable { mutableIntStateOf(-1) }
-    var selectedSortOption by rememberSaveable { mutableStateOf("마감임박순") }
+    var selectedSortOptionIndex by rememberSaveable { mutableIntStateOf(0) }
     val focusRequester = remember { FocusRequester() }
     val focusManager = LocalFocusManager.current
 
-    val genres = listOf("문학", "과학·IT", "사회과학", "인문학", "예술")
-    val sortOptions = listOf("마감임박순", "최신순", "참여많은순")
+    val genres = listOf(
+        stringResource(R.string.literature),
+        stringResource(R.string.science_it),
+        stringResource(R.string.social_science),
+        stringResource(R.string.humanities),
+        stringResource(R.string.art)
+    )
+    val sortOptions = listOf(
+        stringResource(R.string.group_filter_deadline),
+        stringResource(R.string.group_filter_popular)
+    )
 
     val liveFilteredRoomList by remember(searchText) {
         derivedStateOf {
@@ -62,18 +71,22 @@ fun GroupSearchScreen(
         }
     }
 
-    val filteredRoomList by remember(searchText, selectedGenreIndex, selectedSortOption, isSearched) {
+    val filteredRoomList by remember(
+        searchText,
+        selectedGenreIndex,
+        selectedSortOptionIndex,
+        isSearched
+    ) {
         derivedStateOf {
             if (!isSearched) emptyList()
             else {
                 val filtered = roomList.filter { room ->
                     (searchText.isBlank() || room.title.contains(searchText, ignoreCase = true)) &&
                             (selectedGenreIndex == -1 || room.genreIndex == selectedGenreIndex)
                 }
-                when (selectedSortOption) {
-                    "마감임박순" -> filtered.sortedBy { it.endDate }
-                    "최신순" -> filtered // TODO: 생성일 기준 정렬 필요
-                    "참여많은순" -> filtered.sortedByDescending { it.participants }
+                when (selectedSortOptionIndex) {
+                    0 -> filtered.sortedBy { it.endDate }             // 마감임박순
+                    1 -> filtered.sortedByDescending { it.participants } // 인기순
                     else -> filtered
                 }
             }
@@ -131,6 +144,7 @@ fun GroupSearchScreen(
                             onRemove = {}
                         )
                     }
+
                     searchText.isBlank() && !isSearched && recentSearches.isNotEmpty() -> {
                         GroupRecentSearch(
                             recentSearches = recentSearches,
@@ -143,6 +157,7 @@ fun GroupSearchScreen(
                             }
                         )
                     }
+
                     searchText.isNotBlank() && !isSearched -> {
                         if (liveFilteredRoomList.isEmpty()) {
                             GroupEmptyResult(
@@ -155,6 +170,7 @@ fun GroupSearchScreen(
                             )
                         }
                     }
+
                     isSearched -> {
                         GroupFilteredSearchResult(
                             genres = genres,
@@ -173,9 +189,11 @@ fun GroupSearchScreen(
                 modifier = Modifier
                     .align(Alignment.TopEnd)
                     .padding(top = 176.dp, end = 20.dp),
-                selectedOption = selectedSortOption,
+                selectedOption = sortOptions[selectedSortOptionIndex],
                 options = sortOptions,
-                onOptionSelected = { selectedSortOption = it }
+                onOptionSelected = { selected ->
+                    selectedSortOptionIndex = sortOptions.indexOf(selected)
+                }
             )
         }
     }
@@ -190,8 +208,26 @@ fun PreviewGroupSearchScreen() {
             roomList = listOf(
                 GroupCardItemRoomData("aaa", 22, 30, true, 3, R.drawable.bookcover_sample, 0),
                 GroupCardItemRoomData("abc", 15, 20, true, 7, R.drawable.bookcover_sample, 1, true),
-                GroupCardItemRoomData("abcd", 10, 15, true, 5, R.drawable.bookcover_sample, 2, true),
-                GroupCardItemRoomData("abcde", 8, 12, false, 2, R.drawable.bookcover_sample, 3, true),
+                GroupCardItemRoomData(
+                    "abcd",
+                    10,
+                    15,
+                    true,
+                    5,
+                    R.drawable.bookcover_sample,
+                    2,
+                    true
+                ),
+                GroupCardItemRoomData(
+                    "abcde",
+                    8,
+                    12,
+                    false,
+                    2,
+                    R.drawable.bookcover_sample,
+                    3,
+                    true
+                ),
                 GroupCardItemRoomData("abcdef", 18, 25, true, 4, R.drawable.bookcover_sample, 4),
                 GroupCardItemRoomData("abcdefg", 12, 20, true, 1, R.drawable.bookcover_sample, 0),
                 GroupCardItemRoomData("abcdefgh", 10, 14, true, 6, R.drawable.bookcover_sample, 1)

app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupSearchScreen.kt

@@ -264,5 +264,16 @@
     <string name="book_search_date">%1$s. 기준</string>
     <string name="book_no_most_search_result_comment_1">아직 순위가 집계되지 않았어요.</string>
     <string name="book_no_most_search_result_comment_2">조금만 기다려주세요!</string>
+    <string name="search_recruiting_group_count">모집중인 모임방 %1$d개</string>
+    <string name="search_write_feed_comment">피드에 글 쓰기</string>
+    <string name="search_watch_feed">피드 글 둘러보기</string>
+    <string name="search_no_feed_comment_1">이 책으로 작성된 피드가 없어요.</string>
+    <string name="search_no_feed_comment_2">첫번째 피드를 작성해보세요!</string>
+    <string name="search_filter_popular">인기순</string>
+    <string name="search_filter_latest">최신순</string>
+    <string name="search_book_comment">소개</string>
+    <string name="search_book_author">%1$s 저 · %2$s</string>
+    <string name="group_filter_popular">인기순</string>
+    <string name="group_filter_deadline">마감임박순</string>
 
 </resources>