[refactor]: 기존 Group 검색 컴포넌트 이름 및 divider 수정 (#47)

Author: rbqks529

…/myroom/screen/GroupEmptyResultScreen.kt …oup/myroom/component/GroupEmptyResult.ktapp/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupEmptyResultScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupEmptyResultScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.group.myroom.screen
+package com.texthip.thip.ui.group.myroom.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -12,7 +12,7 @@ import androidx.compose.ui.unit.dp
 import com.texthip.thip.ui.theme.ThipTheme
 
 @Composable
-fun GroupEmptyResultScreen(
+fun GroupEmptyResult(
     mainText: String,
     subText: String
 ) {

…creen/GroupFilteredSearchResultScreen.kt …m/component/GroupFilteredSearchResult.ktapp/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupFilteredSearchResultScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupFilteredSearchResultScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt

@@ -1,15 +1,9 @@
-package com.texthip.thip.ui.group.myroom.screen
+package com.texthip.thip.ui.group.myroom.component
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-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.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -23,7 +17,7 @@ import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
 import com.texthip.thip.ui.theme.ThipTheme
 
 @Composable
-fun GroupFilteredSearchResultScreen(
+fun GroupFilteredSearchResult(
     genres: List<String>,
     selectedGenreIndex: Int,
     onGenreSelect: (Int) -> Unit,
@@ -32,6 +26,7 @@ fun GroupFilteredSearchResultScreen(
 ) {
     val colors = ThipTheme.colors
     val typography = ThipTheme.typography
+
     GenreChipRow(
         modifier = Modifier.width(20.dp),
         genres = genres,
@@ -57,16 +52,17 @@ fun GroupFilteredSearchResultScreen(
             .height(1.dp)
             .background(colors.DarkGrey02)
     )
+
     if (roomList.isEmpty()) {
-        GroupEmptyResultScreen(
+        GroupEmptyResult(
             mainText = stringResource(R.string.group_no_search_result1),
             subText = stringResource(R.string.group_no_search_result2)
         )
     } else {
         LazyColumn(
             verticalArrangement = Arrangement.spacedBy(16.dp)
         ) {
-            items(roomList) { room ->
+            itemsIndexed(roomList) { index, room ->
                 CardItemRoomSmall(
                     title = room.title,
                     participants = room.participants,
@@ -76,13 +72,16 @@ fun GroupFilteredSearchResultScreen(
                     isWide = true,
                     isSecret = room.isSecret
                 )
-                Spacer(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(1.dp)
-                        .background(colors.DarkGrey02)
-                )
+                if (index < roomList.size - 1) {
+                    Spacer(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(1.dp)
+                            .background(colors.DarkGrey02)
+                    )
+                }
             }
         }
     }
 }
+

…om/screen/GroupLiveSearchResultScreen.kt …yroom/component/GroupLiveSearchResult.ktapp/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupLiveSearchResultScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupLiveSearchResultScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt

@@ -1,12 +1,12 @@
-package com.texthip.thip.ui.group.myroom.screen
+package com.texthip.thip.ui.group.myroom.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -15,13 +15,13 @@ import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
 import com.texthip.thip.ui.theme.ThipTheme.colors
 
 @Composable
-fun GroupLiveSearchResultScreen(
+fun GroupLiveSearchResult(
     roomList: List<GroupCardItemRoomData>
 ) {
     LazyColumn(
         verticalArrangement = Arrangement.spacedBy(16.dp)
     ) {
-        items(roomList) { room ->
+        itemsIndexed(roomList) { index, room ->
             CardItemRoomSmall(
                 title = room.title,
                 participants = room.participants,
@@ -31,12 +31,14 @@ fun GroupLiveSearchResultScreen(
                 isWide = true,
                 isSecret = room.isSecret
             )
-            Spacer(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(1.dp)
-                    .background(colors.DarkGrey02)
-            )
+            if (index < roomList.size - 1) {
+                Spacer(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(1.dp)
+                        .background(colors.DarkGrey02)
+                )
+            }
         }
     }
 }

…myroom/screen/GroupRecentSearchScreen.kt …up/myroom/component/GroupRecentSearch.ktapp/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupRecentSearchScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupRecentSearchScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.group.myroom.screen
+package com.texthip.thip.ui.group.myroom.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.material3.Text
@@ -14,7 +14,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 
 @Composable
-fun GroupRecentSearchScreen(
+fun GroupRecentSearch(
     recentSearches: List<String>,
     onSearchClick: (String) -> Unit,
     onRemove: (String) -> Unit

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

@@ -28,6 +28,10 @@ import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.FilterButton
 import com.texthip.thip.ui.common.forms.SearchBookTextField
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
+import com.texthip.thip.ui.group.myroom.component.GroupEmptyResult
+import com.texthip.thip.ui.group.myroom.component.GroupFilteredSearchResult
+import com.texthip.thip.ui.group.myroom.component.GroupLiveSearchResult
+import com.texthip.thip.ui.group.myroom.component.GroupRecentSearch
 import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
 import com.texthip.thip.ui.theme.ThipTheme
 
@@ -132,14 +136,14 @@ fun GroupSearchScreen(
 
                 when {
                     searchText.isBlank() && !isSearched && recentSearches.isEmpty() -> {
-                        GroupRecentSearchScreen(
+                        GroupRecentSearch(
                             recentSearches = emptyList(),
                             onSearchClick = {},
                             onRemove = {}
                         )
                     }
                     searchText.isBlank() && !isSearched && recentSearches.isNotEmpty() -> {
-                        GroupRecentSearchScreen(
+                        GroupRecentSearch(
                             recentSearches = recentSearches,
                             onSearchClick = { keyword ->
                                 searchText = keyword
@@ -152,18 +156,18 @@ fun GroupSearchScreen(
                     }
                     searchText.isNotBlank() && !isSearched -> {
                         if (liveFilteredRoomList.isEmpty()) {
-                            GroupEmptyResultScreen(
+                            GroupEmptyResult(
                                 mainText = stringResource(R.string.group_no_search_result1),
                                 subText = stringResource(R.string.group_no_search_result2)
                             )
                         } else {
-                            GroupLiveSearchResultScreen(
+                            GroupLiveSearchResult(
                                 roomList = liveFilteredRoomList
                             )
                         }
                     }
                     isSearched -> {
-                        GroupFilteredSearchResultScreen(
+                        GroupFilteredSearchResult(
                             genres = genres,
                             selectedGenreIndex = selectedGenreIndex,
                             onGenreSelect = { selectedGenreIndex = it },

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

@@ -1,14 +1,12 @@
 package com.texthip.thip.ui.group.screen
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
@@ -34,7 +32,6 @@ import com.texthip.thip.ui.group.myroom.mock.GroupViewModel
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 
-
 @Composable
 fun GroupScreen(
     navController: NavHostController? = null,