Skip to content

Commit 715a781

Browse files
committed
[BOOK-106] chore: 누락된 theme 추가 적용
1 parent f3c6d0d commit 715a781

File tree

4 files changed

+12
-6
lines changed
  • core/designsystem/src/main/kotlin/com/ninecraft/booket/core/designsystem/component
  • feature

4 files changed

+12
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fun ReedTextField(
5959
BasicTextField(
6060
state = queryState,
6161
modifier = Modifier.fillMaxWidth(),
62-
textStyle = ReedTheme.typography.body2Regular.copy(color = textColor),
62+
textStyle = ReedTheme.typography.body2Medium.copy(color = textColor),
6363
keyboardOptions = KeyboardOptions(
6464
keyboardType = KeyboardType.Text,
6565
imeAction = ImeAction.Search,
@@ -109,7 +109,7 @@ fun ReedTextField(
109109
private fun ReedTextFieldPreview() {
110110
ReedTheme {
111111
ReedTextField(
112-
queryState = TextFieldState(),
112+
queryState = TextFieldState("검색"),
113113
queryHintRes = R.string.search_book_hint,
114114
onSearch = {},
115115
modifier = Modifier

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryScreen.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@ internal fun LibraryContent(
101101
)
102102

103103
if (state.isLoading) {
104-
CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
104+
CircularProgressIndicator(
105+
modifier = Modifier.align(Alignment.Center),
106+
color = ReedTheme.colors.contentBrand,
107+
)
105108
}
106109
}
107110
}

feature/login/src/main/kotlin/com/ninecraft/booket/feature/login/LoginScreen.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import com.ninecraft.booket.core.designsystem.component.button.ReedButton
2222
import com.ninecraft.booket.core.designsystem.component.button.ReedButtonColorStyle
2323
import com.ninecraft.booket.core.designsystem.component.button.largeButtonStyle
2424
import com.ninecraft.booket.core.designsystem.theme.ReedTheme
25-
import com.ninecraft.booket.screens.LoginScreen
2625
import com.ninecraft.booket.core.designsystem.theme.White
26+
import com.ninecraft.booket.screens.LoginScreen
2727
import com.slack.circuit.codegen.annotations.CircuitInject
2828
import dagger.hilt.android.components.ActivityRetainedComponent
2929

@@ -75,7 +75,10 @@ internal fun Login(
7575
)
7676

7777
if (state.isLoading) {
78-
CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
78+
CircularProgressIndicator(
79+
modifier = Modifier.align(Alignment.Center),
80+
color = ReedTheme.colors.contentBrand,
81+
)
7982
}
8083
}
8184
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ internal fun SearchContent(
8686
modifier = Modifier.fillMaxSize(),
8787
contentAlignment = Alignment.Center,
8888
) {
89-
CircularProgressIndicator()
89+
CircularProgressIndicator(color = ReedTheme.colors.contentBrand)
9090
}
9191
}
9292

0 commit comments

Comments
 (0)