[BOOK-106] chore: 전체적인 컬러 적용, 변수 네이밍 통일

Author: easyhooon

core/common/src/main/kotlin/com/ninecraft/booket/core/common/extensions/Modifier.kt

@@ -1,6 +1,5 @@
 package com.ninecraft.booket.core.common.extensions
 
-import android.annotation.SuppressLint
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.material3.ripple
@@ -13,7 +12,6 @@ import com.ninecraft.booket.core.common.utils.MultipleEventsCutter
 import com.ninecraft.booket.core.common.utils.get
 
 // https://stackoverflow.com/questions/66703448/how-to-disable-ripple-effect-when-clicking-in-jetpack-compose
-@SuppressLint("ModifierFactoryUnreferencedReceiver")
 inline fun Modifier.noRippleClickable(crossinline onClick: () -> Unit): Modifier = composed {
     clickable(
         indication = null,
@@ -23,7 +21,6 @@ inline fun Modifier.noRippleClickable(crossinline onClick: () -> Unit): Modifier
     }
 }
 
-@Suppress("ModifierFactoryUnreferencedReceiver")
 fun Modifier.clickableSingle(
     enabled: Boolean = true,
     onClickLabel: String? = null,

core/common/src/main/kotlin/com/ninecraft/booket/core/common/extensions/String.kt

@@ -11,4 +11,4 @@ fun String.decodeHtmlEntities(): String {
         .replace("/", "/")
         .replace("'", "'")
         .replace(" ", " ")
-}
+}

core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component/ReedTextField.kt

@@ -44,8 +44,8 @@ val reedTextSelectionColors = TextSelectionColors(
 
 @Composable
 fun ReedTextField(
-    searchTextState: TextFieldState,
-    @StringRes searchTextHintRes: Int,
+    queryState: TextFieldState,
+    @StringRes queryHintRes: Int,
     onSearch: (String) -> Unit,
     modifier: Modifier = Modifier,
     backgroundColor: Color = ReedTheme.colors.baseSecondary,
@@ -57,15 +57,15 @@ fun ReedTextField(
 
     CompositionLocalProvider(LocalTextSelectionColors provides reedTextSelectionColors) {
         BasicTextField(
-            state = searchTextState,
+            state = queryState,
             modifier = Modifier.fillMaxWidth(),
             textStyle = ReedTheme.typography.body2Regular.copy(color = textColor),
             keyboardOptions = KeyboardOptions(
                 keyboardType = KeyboardType.Text,
                 imeAction = ImeAction.Search,
             ),
             onKeyboardAction = {
-                onSearch(searchTextState.text.toString())
+                onSearch(queryState.text.toString())
                 keyboardController?.hide()
             },
             lineLimits = TextFieldLineLimits.SingleLine,
@@ -82,9 +82,9 @@ fun ReedTextField(
                 ) {
                     Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing4))
                     Box {
-                        if (searchTextState.text.isEmpty()) {
+                        if (queryState.text.isEmpty()) {
                             Text(
-                                text = stringResource(id = searchTextHintRes),
+                                text = stringResource(id = queryHintRes),
                                 color = ReedTheme.colors.contentTertiary,
                                 style = ReedTheme.typography.body2Regular,
                             )
@@ -109,8 +109,8 @@ fun ReedTextField(
 private fun ReedTextFieldPreview() {
     ReedTheme {
         ReedTextField(
-            searchTextState = TextFieldState(),
-            searchTextHintRes = R.string.search_book_hint,
+            queryState = TextFieldState(),
+            queryHintRes = R.string.search_book_hint,
             onSearch = {},
             modifier = Modifier
                 .height(46.dp)

feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/MainActivity.kt

@@ -13,7 +13,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.ninecraft.booket.core.designsystem.component.ReedScaffold
 import com.ninecraft.booket.core.designsystem.theme.White
 import com.ninecraft.booket.feature.main.component.MainBottomBar
-import com.ninecraft.booket.screens.HomeScreen
+import com.ninecraft.booket.screens.LoginScreen
 import com.slack.circuit.backstack.rememberSaveableBackStack
 import com.slack.circuit.foundation.Circuit
 import com.slack.circuit.foundation.CircuitCompositionLocals
@@ -36,7 +36,7 @@ class MainActivity : ComponentActivity() {
 
         setContent {
             val systemUiController = rememberSystemUiController()
-            val backStack = rememberSaveableBackStack(root = HomeScreen)
+            val backStack = rememberSaveableBackStack(root = LoginScreen)
             val navigator = rememberCircuitNavigator(backStack)
             val isDarkTheme = isSystemInDarkTheme()
 

feature/main/src/main/kotlin/com/ninecraft/booket/feature/main/component/MainBottomBar.kt

@@ -19,7 +19,6 @@ import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -33,7 +32,9 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import com.ninecraft.booket.core.designsystem.ComponentPreview
+import com.ninecraft.booket.core.designsystem.theme.Black
 import com.ninecraft.booket.core.designsystem.theme.ReedTheme
+import com.ninecraft.booket.core.designsystem.theme.White
 import com.ninecraft.booket.screens.HomeScreen
 import com.ninecraft.booket.screens.LibraryScreen
 import com.ninecraft.booket.screens.SearchScreen
@@ -79,9 +80,9 @@ internal fun MainBottomBar(
         exit = fadeOut() + slideOut { IntOffset(0, it.height) },
         modifier = modifier,
     ) {
-        Box(modifier = Modifier.background(MaterialTheme.colorScheme.surface)) {
+        Box(modifier = Modifier.background(White)) {
             Column {
-                HorizontalDivider(color = MaterialTheme.colorScheme.outline)
+                HorizontalDivider(color = Black)
                 Row(
                     modifier = Modifier
                         .navigationBarsPadding()

feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/SearchPresenter.kt

@@ -28,57 +28,56 @@ class SearchPresenter @AssistedInject constructor(
     @Assisted private val navigator: Navigator,
     private val bookRepository: BookRepository,
 ) : Presenter<SearchUiState> {
+    companion object {
+        private const val PAGE_SIZE = 20
+    }
 
     @Composable
     override fun present(): SearchUiState {
         val scope = rememberCoroutineScope()
         var uiState by rememberRetained { mutableStateOf<UiState>(UiState.Idle) }
         var footerState by rememberRetained { mutableStateOf<FooterState>(FooterState.Idle) }
-        val searchText = rememberTextFieldState()
+        val queryState = rememberTextFieldState()
         var searchResult by rememberRetained { mutableStateOf(BookSearchModel()) }
         var books by rememberRetained { mutableStateOf(persistentListOf<BookSummaryModel>()) }
-        var currentPage by rememberRetained { mutableStateOf(0) }
+        var currentStartIndex by rememberRetained { mutableStateOf(0) }
         var isLastPage by rememberRetained { mutableStateOf(false) }
 
-        fun searchBooks(query: String, currentOffset: Int = 0) {
+        fun searchBooks(query: String, startIndex: Int = 0) {
             scope.launch {
-                try {
-                    if (currentOffset == 0) {
-                        uiState = UiState.Loading
-                    } else {
-                        footerState = FooterState.Loading
-                    }
+                if (startIndex == 0) {
+                    uiState = UiState.Loading
+                } else {
+                    footerState = FooterState.Loading
+                }
 
-                    bookRepository.searchBook(query = query, start = currentOffset)
-                        .onSuccess { result ->
-                            searchResult = result
-                            books = if (currentOffset == 0) {
-                                result.books.toPersistentList()
-                            } else {
-                                (books + result.books).toPersistentList()
-                            }
+                bookRepository.searchBook(query = query, start = startIndex)
+                    .onSuccess { result ->
+                        searchResult = result
+                        books = if (startIndex == 0) {
+                            result.books.toPersistentList()
+                        } else {
+                            (books + result.books).toPersistentList()
+                        }
 
-                            currentPage = currentOffset
-                            isLastPage = result.books.size < 20
-                            uiState = UiState.Idle
+                        currentStartIndex = startIndex
+                        isLastPage = result.books.size < PAGE_SIZE
+
+                        if (startIndex == 0) {
+                            uiState = UiState.Success
+                        } else {
                             footerState = if (isLastPage) FooterState.End else FooterState.Idle
                         }
-                        .onFailure { exception ->
-                            Logger.d(exception)
-                            if (currentOffset == 0) {
-                                uiState = UiState.Error(exception.message ?: "알 수 없는 오류가 발생했습니다.")
-                            } else {
-                                footerState = FooterState.Error(exception.message ?: "알 수 없는 오류가 발생했습니다.")
-                            }
+                    }
+                    .onFailure { exception ->
+                        Logger.d(exception)
+                        val errorMessage = exception.message ?: "알 수 없는 오류가 발생했습니다."
+                        if (startIndex == 0) {
+                            uiState = UiState.Error(errorMessage)
+                        } else {
+                            footerState = FooterState.Error(errorMessage)
                         }
-                } catch (e: Exception) {
-                    Logger.d(e)
-                    if (currentOffset == 0) {
-                        uiState = UiState.Error(e.message ?: "알 수 없는 오류가 발생했습니다.")
-                    } else {
-                        footerState = FooterState.Error(e.message ?: "알 수 없는 오류가 발생했습니다.")
                     }
-                }
             }
         }
 
@@ -89,18 +88,18 @@ class SearchPresenter @AssistedInject constructor(
                 }
 
                 is SearchUiEvent.OnSearch -> {
-                    searchBooks(query = event.text, currentOffset = 0)
+                    searchBooks(query = event.text, startIndex = 0)
                 }
 
                 is SearchUiEvent.OnLoadMore -> {
-                    if (footerState !is FooterState.Loading && !isLastPage && searchText.text.toString().isNotEmpty()) {
-                        searchBooks(query = searchText.text.toString(), currentOffset = currentPage + 1)
+                    if (footerState !is FooterState.Loading && !isLastPage && queryState.text.toString().isNotEmpty()) {
+                        searchBooks(query = queryState.text.toString(), startIndex = currentStartIndex + 1)
                     }
                 }
 
                 is SearchUiEvent.OnRetryClick -> {
-                    if (searchText.text.toString().isNotEmpty()) {
-                        searchBooks(query = searchText.text.toString(), currentOffset = 0)
+                    if (queryState.text.toString().isNotEmpty()) {
+                        searchBooks(query = queryState.text.toString(), startIndex = 0)
                     }
                 }
 
@@ -111,10 +110,10 @@ class SearchPresenter @AssistedInject constructor(
         return SearchUiState(
             uiState = uiState,
             footerState = footerState,
-            searchText = searchText,
+            queryState = queryState,
             searchResult = searchResult,
             books = books,
-            offset = currentPage,
+            startIndex = currentStartIndex,
             isLastPage = isLastPage,
             eventSink = ::handleEvent,
         )

feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/SearchScreen.kt

@@ -67,11 +67,11 @@ internal fun SearchContent(
             .background(White),
     ) {
         ReedTextField(
-            searchTextState = state.searchText,
+            queryState = state.queryState,
+            queryHintRes = designR.string.search_book_hint,
             onSearch = { text ->
                 state.eventSink(SearchUiEvent.OnSearch(text))
             },
-            searchTextHintRes = designR.string.search_book_hint,
             modifier = modifier
                 .padding(
                     vertical = ReedTheme.spacing.spacing3,
@@ -110,8 +110,21 @@ internal fun SearchContent(
             }
 
             is UiState.Idle -> {
-                if (state.isEmpty) {
-                    // TODO 최근 검색어 노출
+                // TODO: 최근 검색어 노출
+            }
+
+            is UiState.Success -> {
+                if (state.isEmptyResult) {
+                    Box(
+                        modifier = Modifier.fillMaxSize(),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Text(
+                            text = stringResource(R.string.empty_results),
+                            color = ReedTheme.colors.contentSecondary,
+                            style = ReedTheme.typography.body1Medium,
+                        )
+                    }
                 } else {
                     Row(
                         modifier = Modifier
@@ -130,8 +143,7 @@ internal fun SearchContent(
                             text = "${state.searchResult.totalResults}",
                             color = ReedTheme.colors.contentBrand,
                             style = ReedTheme.typography.label1Medium,
-
-                            )
+                        )
                         Text(
                             text = stringResource(R.string.search_result_suffix),
                             color = ReedTheme.colors.contentPrimary,

feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/SearchUiState.kt

@@ -11,6 +11,7 @@ import kotlinx.collections.immutable.persistentListOf
 sealed interface UiState {
     data object Idle : UiState
     data object Loading : UiState
+    data object Success : UiState
     data class Error(val message: String) : UiState
 }
 
@@ -24,14 +25,14 @@ sealed interface FooterState {
 data class SearchUiState(
     val uiState: UiState = UiState.Idle,
     val footerState: FooterState = FooterState.Idle,
-    val searchText: TextFieldState = TextFieldState(""),
+    val queryState: TextFieldState = TextFieldState(""),
     val searchResult: BookSearchModel = BookSearchModel(),
     val books: ImmutableList<BookSummaryModel> = persistentListOf(),
-    val offset: Int = 0,
+    val startIndex: Int = 0,
     val isLastPage: Boolean = false,
     val eventSink: (SearchUiEvent) -> Unit,
 ) : CircuitUiState {
-    val isEmpty: Boolean get() = searchResult.books.isEmpty()
+    val isEmptyResult: Boolean get() = uiState is UiState.Success && searchResult.totalResults == 0
 }
 
 sealed interface SearchUiEvent : CircuitUiEvent {

feature/search/src/main/kotlin/com/ninecraft/booket/feature/search/component/LoadStateFooter.kt

@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -35,7 +34,7 @@ internal fun LoadStateFooter(
             is FooterState.Loading -> {
                 CircularProgressIndicator(
                     modifier = Modifier.size(24.dp),
-                    color = MaterialTheme.colorScheme.primary,
+                    color = ReedTheme.colors.contentBrand,
                 )
             }
 
@@ -46,8 +45,8 @@ internal fun LoadStateFooter(
                 ) {
                     Text(
                         text = footerState.message,
+                        color = ReedTheme.colors.contentError,
                         style = ReedTheme.typography.body2Regular,
-                        color = MaterialTheme.colorScheme.error,
                     )
                     Button(onClick = onRetryClick) {
                         Text(text = stringResource(R.string.retry))
@@ -58,8 +57,8 @@ internal fun LoadStateFooter(
             is FooterState.End -> {
                 Text(
                     text = stringResource(R.string.no_more_results),
+                    color = ReedTheme.colors.contentSecondary,
                     style = ReedTheme.typography.body2Regular,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
             }
 
@@ -68,4 +67,4 @@ internal fun LoadStateFooter(
             }
         }
     }
-}
+}

feature/search/src/main/res/values/strings.xml

@@ -6,4 +6,5 @@
     <string name="retry">다시 시도</string>
     <string name="no_more_results">더 이상 결과가 없습니다</string>
     <string name="error_message">오류가 발생했습니다</string>
+    <string name="empty_results">검색어와 일치하는 도서가 없습니다</string>
 </resources>