Skip to content

Commit 6988ee7

Browse files
committed
[ui]: 책 검색 화면 ui 수정 완료 (#53)
1 parent 7d9d8ae commit 6988ee7

4 files changed

Lines changed: 28 additions & 12 deletions

File tree

app/src/main/java/com/texthip/thip/ui/booksearch/component/BookRecentSearch.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fun BookRecentSearch(
4040
Text(
4141
text = stringResource(R.string.group_recent_search),
4242
color = colors.White,
43-
style = typography.menu_r400_s14_h24
43+
style = typography.smalltitle_sb600_s18_h24
4444
)
4545
Spacer(modifier = Modifier.height(16.dp))
4646

@@ -65,17 +65,18 @@ fun BookRecentSearch(
6565
}
6666
}
6767
}
68-
Spacer(modifier = Modifier.height(32.dp))
6968

7069
Row(
71-
modifier = Modifier.fillMaxWidth(),
70+
modifier = Modifier
71+
.padding(top = 32.dp)
72+
.fillMaxWidth(),
7273
verticalAlignment = Alignment.CenterVertically,
7374
horizontalArrangement = Arrangement.SpaceBetween
7475
) {
7576
Text(
7677
text = stringResource(R.string.book_popular_search),
7778
color = colors.White,
78-
style = typography.menu_r400_s14_h24
79+
style = typography.smalltitle_sb600_s18_h24
7980
)
8081
Text(
8182
text = stringResource(R.string.book_search_date, popularBookDate),
@@ -87,7 +88,7 @@ fun BookRecentSearch(
8788

8889
Box(modifier = Modifier
8990
.fillMaxWidth()
90-
.weight(1f, fill = true)
91+
.weight(1f)
9192
) {
9293
if (popularBooks.isEmpty()) {
9394
Column(
@@ -178,7 +179,7 @@ fun PreviewBookRecentSearch_EmptyPopular() {
178179
BookRecentSearch(
179180
recentSearches = emptyList(),
180181
popularBooks = emptyList(),
181-
popularBookDate = "01.12.",
182+
popularBookDate = "01.12",
182183
onSearchClick = {},
183184
onRemove = {},
184185
onBookClick = {}

app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookDetailScreen.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ fun BookDetailScreen(
139139
)
140140
}
141141

142-
Spacer(modifier = Modifier.height(8.dp))
143-
144142
// 상세 정보 영역
145143
Column(
146144
modifier = Modifier
@@ -162,21 +160,21 @@ fun BookDetailScreen(
162160
book.publisher
163161
),
164162
color = colors.Grey,
165-
style = typography.copy_r400_s12_h20
163+
style = typography.menu_sb600_s12_h20
166164
)
167-
Spacer(modifier = Modifier.height(32.dp))
168165

169166
Column(
170167
modifier = Modifier
168+
.padding(top = 33.dp)
171169
.fillMaxWidth()
172170
.clickable { isIntroductionPopupVisible = true }
173171
) {
174172
Text(
175173
text = stringResource(R.string.search_book_comment),
176174
color = colors.White,
177-
style = typography.menu_r400_s14_h24,
175+
style = typography.menu_sb600_s14_h24,
178176
)
179-
Spacer(modifier = Modifier.height(4.dp))
177+
Spacer(modifier = Modifier.height(5.dp))
180178

181179
Text(
182180
text = book.description,

app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookRecruitingScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ fun BookRecruitingScreen(
5555
.background(colors.Black)
5656
.fillMaxSize()
5757
.padding(horizontal = 20.dp)
58+
.padding(top = 16.dp)
5859
) {
5960
Row(
6061
modifier = Modifier.fillMaxWidth(),
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="25dp"
3+
android:height="25dp"
4+
android:viewportWidth="25"
5+
android:viewportHeight="25">
6+
<path
7+
android:pathData="M22.456,12.5C22.456,6.977 17.979,2.5 12.456,2.5C6.933,2.5 2.456,6.977 2.456,12.5C2.456,18.023 6.933,22.5 12.456,22.5C17.979,22.5 22.456,18.023 22.456,12.5Z"
8+
android:fillColor="#888888"/>
9+
<path
10+
android:pathData="M15.455,15.5L9.456,9.5M9.457,15.5L15.456,9.5"
11+
android:strokeLineJoin="round"
12+
android:strokeWidth="1.5"
13+
android:fillColor="#00000000"
14+
android:strokeColor="#FEFEFE"
15+
android:strokeLineCap="round"/>
16+
</vector>

0 commit comments

Comments
 (0)