[refactor]: 파일 및 경로 이름 수정 완료 (#53)

Author: rbqks529

app/src/main/java/com/texthip/thip/ui/navigator/MainNavHost.kt

@@ -4,7 +4,7 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
-import com.texthip.thip.ui.booksearch.screen.BookSearchScreen
+import com.texthip.thip.ui.search.screen.SearchBookScreen
 import com.texthip.thip.ui.feed.screen.FeedScreen
 import com.texthip.thip.ui.group.screen.GroupScreen
 import com.texthip.thip.ui.mypage.screen.MyPageScreen
@@ -14,7 +14,7 @@ fun MainNavHost(navController: NavHostController) {
     NavHost(navController = navController, startDestination = Routes.Feed.route) {
         composable(Routes.Feed.route) { FeedScreen(navController) }
         composable(Routes.Group.route) { GroupScreen(navController) }
-        composable(Routes.BookSearch.route) { BookSearchScreen(navController = navController) }
+        composable(Routes.BookSearch.route) { SearchBookScreen(navController = navController) }
         composable(Routes.MyPage.route) {
             MyPageScreen(
                 navController,

…search/component/BookLiveSearchResult.kt …ui/search/component/SearchActiveField.ktapp/src/main/java/com/texthip/thip/ui/booksearch/component/BookLiveSearchResult.kt renamed to app/src/main/java/com/texthip/thip/ui/search/component/SearchActiveField.kt app/src/main/java/com/texthip/thip/ui/booksearch/component/BookLiveSearchResult.kt renamed to app/src/main/java/com/texthip/thip/ui/search/component/SearchActiveField.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.booksearch.component
+package com.texthip.thip.ui.search.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -11,12 +11,12 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.texthip.thip.ui.booksearch.mock.BookData
+import com.texthip.thip.ui.search.mock.BookData
 import com.texthip.thip.ui.common.cards.CardBookList
 import com.texthip.thip.ui.theme.ThipTheme.colors
 
 @Composable
-fun BookLiveSearchResult(
+fun SearchActiveField(
     bookList: List<BookData>
 ) {
     LazyColumn(

…ch/component/BookFilteredSearchResult.kt …ch/component/SearchBookFilteredResult.ktapp/src/main/java/com/texthip/thip/ui/booksearch/component/BookFilteredSearchResult.kt renamed to app/src/main/java/com/texthip/thip/ui/search/component/SearchBookFilteredResult.kt app/src/main/java/com/texthip/thip/ui/booksearch/component/BookFilteredSearchResult.kt renamed to app/src/main/java/com/texthip/thip/ui/search/component/SearchBookFilteredResult.kt

@@ -1,7 +1,13 @@
-package com.texthip.thip.ui.booksearch.component
+package com.texthip.thip.ui.search.component
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+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.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.Text
@@ -12,14 +18,14 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.texthip.thip.R
-import com.texthip.thip.ui.booksearch.mock.BookData
+import com.texthip.thip.ui.search.mock.BookData
 import com.texthip.thip.ui.common.cards.CardBookList
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 
 @Composable
-fun BookFilteredSearchResult(
+fun SearchBookFilteredResult(
     resultCount: Int,
     bookList: List<BookData>
 ) {
@@ -43,7 +49,7 @@ fun BookFilteredSearchResult(
         )
 
         if (bookList.isEmpty()) {
-            BookEmptyResult(
+            SearchEmptyResult(
                 mainText = stringResource(R.string.book_no_search_result1),
                 subText = stringResource(R.string.book_no_search_result2),
                 onRequestBook = { /*책 요청 처리*/ }
@@ -78,7 +84,7 @@ fun BookFilteredSearchResult(
 @Composable
 fun PreviewBookFilteredSearchResult() {
     ThipTheme {
-        BookFilteredSearchResult(
+        SearchBookFilteredResult(
             resultCount = 3,
             bookList = listOf(
                 BookData(

…/booksearch/component/BookEmptyResult.kt …ui/search/component/SearchEmptyResult.ktapp/src/main/java/com/texthip/thip/ui/booksearch/component/BookEmptyResult.kt renamed to app/src/main/java/com/texthip/thip/ui/search/component/SearchEmptyResult.kt app/src/main/java/com/texthip/thip/ui/booksearch/component/BookEmptyResult.kt renamed to app/src/main/java/com/texthip/thip/ui/search/component/SearchEmptyResult.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.booksearch.component
+package com.texthip.thip.ui.search.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -19,7 +19,7 @@ import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 
 @Composable
-fun BookEmptyResult(
+fun SearchEmptyResult(
     mainText: String,
     subText: String,
     onRequestBook: () -> Unit

…booksearch/component/BookRecentSearch.kt …/ui/search/component/SearchRecentBook.ktapp/src/main/java/com/texthip/thip/ui/booksearch/component/BookRecentSearch.kt renamed to app/src/main/java/com/texthip/thip/ui/search/component/SearchRecentBook.kt app/src/main/java/com/texthip/thip/ui/booksearch/component/BookRecentSearch.kt renamed to app/src/main/java/com/texthip/thip/ui/search/component/SearchRecentBook.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.booksearch.component
+package com.texthip.thip.ui.search.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -20,15 +20,15 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.texthip.thip.R
-import com.texthip.thip.ui.booksearch.mock.BookData
+import com.texthip.thip.ui.search.mock.BookData
 import com.texthip.thip.ui.common.buttons.GenreChipButton
 import com.texthip.thip.ui.common.cards.CardBookSearch
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 
 @Composable
-fun BookRecentSearch(
+fun SearchRecentBook(
     recentSearches: List<String>,
     popularBooks: List<BookData>,
     popularBookDate: String,
@@ -142,7 +142,7 @@ fun BookRecentSearch(
 @Composable
 fun PreviewBookRecentSearch() {
     ThipTheme {
-        BookRecentSearch(
+        SearchRecentBook(
             recentSearches = listOf("소설", "심리학", "철학", "역사", "과학", "에세이"),
             popularBooks = listOf(
                 BookData(
@@ -176,7 +176,7 @@ fun PreviewBookRecentSearch() {
 @Composable
 fun PreviewBookRecentSearch_EmptyPopular() {
     ThipTheme {
-        BookRecentSearch(
+        SearchRecentBook(
             recentSearches = emptyList(),
             popularBooks = emptyList(),
             popularBookDate = "01.12",

…thip/thip/ui/booksearch/mock/BookData.kt …/texthip/thip/ui/search/mock/BookData.ktapp/src/main/java/com/texthip/thip/ui/booksearch/mock/BookData.kt renamed to app/src/main/java/com/texthip/thip/ui/search/mock/BookData.kt app/src/main/java/com/texthip/thip/ui/booksearch/mock/BookData.kt renamed to app/src/main/java/com/texthip/thip/ui/search/mock/BookData.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.booksearch.mock
+package com.texthip.thip.ui.search.mock
 
 import com.texthip.thip.R
 

…hip/ui/booksearch/mock/DetailBookData.kt …ip/thip/ui/search/mock/DetailBookData.ktapp/src/main/java/com/texthip/thip/ui/booksearch/mock/DetailBookData.kt renamed to app/src/main/java/com/texthip/thip/ui/search/mock/DetailBookData.kt app/src/main/java/com/texthip/thip/ui/booksearch/mock/DetailBookData.kt renamed to app/src/main/java/com/texthip/thip/ui/search/mock/DetailBookData.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.booksearch.mock
+package com.texthip.thip.ui.search.mock
 
 import com.texthip.thip.R
 

…ui/booksearch/screen/BookDetailScreen.kt …/search/screen/SearchBookDetailScreen.ktapp/src/main/java/com/texthip/thip/ui/booksearch/screen/BookDetailScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/search/screen/SearchBookDetailScreen.kt app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookDetailScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/search/screen/SearchBookDetailScreen.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.booksearch.screen
+package com.texthip.thip.ui.search.screen
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.Image
@@ -37,7 +37,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.texthip.thip.R
-import com.texthip.thip.ui.booksearch.mock.DetailBookData
+import com.texthip.thip.ui.search.mock.DetailBookData
 import com.texthip.thip.ui.common.buttons.ActionMediumButton
 import com.texthip.thip.ui.common.buttons.FilterButton
 import com.texthip.thip.ui.common.modal.InfoPopup
@@ -49,7 +49,7 @@ import com.texthip.thip.ui.theme.ThipTheme.typography
 import kotlinx.coroutines.delay
 
 @Composable
-fun BookDetailScreen(
+fun SearchBookDetailScreen(
     modifier: Modifier = Modifier,
     book: DetailBookData,
     feedList: List<String> = emptyList(),
@@ -325,7 +325,7 @@ fun BookDetailScreen(
 @Composable
 fun PreviewBookDetailScreen() {
     ThipTheme {
-        BookDetailScreen(
+        SearchBookDetailScreen(
             book = DetailBookData(
                 title = "채식주의자",
                 author = "한강",

…ooksearch/screen/BookRecruitingScreen.kt …i/search/screen/SearchBookGroupScreen.ktapp/src/main/java/com/texthip/thip/ui/booksearch/screen/BookRecruitingScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/search/screen/SearchBookGroupScreen.kt app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookRecruitingScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/search/screen/SearchBookGroupScreen.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.booksearch.screen
+package com.texthip.thip.ui.search.screen
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -18,7 +18,6 @@ import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -34,7 +33,7 @@ import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 
 @Composable
-fun BookRecruitingScreen(
+fun SearchBookGroupScreen(
     recruitingList: List<GroupCardItemRoomData>,
     onCardClick: (GroupCardItemRoomData) -> Unit = {},
     onCreateRoomClick: () -> Unit = {}
@@ -211,7 +210,7 @@ fun GroupRecruitingScreenPreview() {
             )
         )
 
-        BookRecruitingScreen(
+        SearchBookGroupScreen(
             recruitingList = dataList
         )
     }
@@ -221,7 +220,7 @@ fun GroupRecruitingScreenPreview() {
 @Composable
 fun GroupRecruitingScreenEmptyPreview() {
     ThipTheme {
-        BookRecruitingScreen(
+        SearchBookGroupScreen(
             recruitingList = emptyList()
         )
     }

…ui/booksearch/screen/BookSearchScreen.kt …hip/ui/search/screen/SearchBookScreen.ktapp/src/main/java/com/texthip/thip/ui/booksearch/screen/BookSearchScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/search/screen/SearchBookScreen.kt app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookSearchScreen.kt renamed to app/src/main/java/com/texthip/thip/ui/search/screen/SearchBookScreen.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.booksearch.screen
+package com.texthip.thip.ui.search.screen
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -24,17 +24,17 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.texthip.thip.R
-import com.texthip.thip.ui.booksearch.component.BookEmptyResult
-import com.texthip.thip.ui.booksearch.component.BookFilteredSearchResult
-import com.texthip.thip.ui.booksearch.component.BookLiveSearchResult
-import com.texthip.thip.ui.booksearch.component.BookRecentSearch
-import com.texthip.thip.ui.booksearch.mock.BookData
+import com.texthip.thip.ui.search.component.SearchEmptyResult
+import com.texthip.thip.ui.search.component.SearchBookFilteredResult
+import com.texthip.thip.ui.search.component.SearchActiveField
+import com.texthip.thip.ui.search.component.SearchRecentBook
+import com.texthip.thip.ui.search.mock.BookData
 import com.texthip.thip.ui.common.forms.SearchBookTextField
 import com.texthip.thip.ui.common.topappbar.LeftNameTopAppBar
 import com.texthip.thip.ui.theme.ThipTheme
 
 @Composable
-fun BookSearchScreen(
+fun SearchBookScreen(
     modifier: Modifier = Modifier,
     navController: NavHostController? = null,
     bookList: List<BookData> = emptyList(),
@@ -116,7 +116,7 @@ fun BookSearchScreen(
 
                 when {
                     searchText.isBlank() && !isSearched -> {
-                        BookRecentSearch(
+                        SearchRecentBook(
                             recentSearches = recentSearches,
                             popularBooks = popularBooks,
                             popularBookDate = "01.12", // TODO: 서버로 날짜를 받아 오게 수정
@@ -135,20 +135,20 @@ fun BookSearchScreen(
 
                     searchText.isNotBlank() && !isSearched -> {
                         if (liveFilteredBookList.isEmpty()) {
-                            BookEmptyResult(
+                            SearchEmptyResult(
                                 mainText = stringResource(R.string.book_no_search_result1),
                                 subText = stringResource(R.string.book_no_search_result2),
                                 onRequestBook = { /*책 요청 처리*/ }
                             )
                         } else {
-                            BookLiveSearchResult(
+                            SearchActiveField(
                                 bookList = liveFilteredBookList
                             )
                         }
                     }
 
                     isSearched -> {
-                        BookFilteredSearchResult(
+                        SearchBookFilteredResult(
                             resultCount = filteredBookList.size,
                             bookList = filteredBookList,
                         )
@@ -164,7 +164,7 @@ fun BookSearchScreen(
 @Composable
 fun PreviewBookSearchScreen_Default() {
     ThipTheme {
-        BookSearchScreen(
+        SearchBookScreen(
             bookList = listOf(
                 BookData("aaa", "리처드 도킨스", "을유문화사", R.drawable.bookcover_sample),
                 BookData("abc", "마틴 셀리그만", "물푸레", R.drawable.bookcover_sample),
@@ -189,7 +189,7 @@ fun PreviewBookSearchScreen_Default() {
 @Composable
 fun PreviewBookSearchScreen_EmptyPopular() {
     ThipTheme {
-        BookSearchScreen(
+        SearchBookScreen(
             bookList = listOf(
                 BookData("aaa", "리처드 도킨스", "을유문화사", R.drawable.bookcover_sample),
                 BookData("abc", "마틴 셀리그만", "물푸레", R.drawable.bookcover_sample),