Skip to content

Commit af16118

Browse files
wjshim2003wjshim2003
authored
다크모드 3차 QA (#155)
* 3차 QA SettingFragment * grayicon 색 추가 * grayicon, tooltip2 색 추가 * 3차 QA ReorderRestaurantFragment * 3차 QA 리뷰 관련 마진 수정 * 3차 QA 이미지 뷰어 수정 * GNB 텍스트 크기 조정 * 최종QA_현장 * 최종QA 반영 * 탭 글씨 안보임 해결 * 식당 순서 바꾸기 배경색 수정 * 내가쓴글 배경색 * 말풍선 그림자 수정 * 문의 전송 버튼 색 수정 * 로딩 실패 화면 수정 * 메인화면 여백 수정
1 parent ed92834 commit af16118

47 files changed

Lines changed: 310 additions & 610 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/src/main/java/com/wafflestudio/siksha2/components/CalendarSelectView.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ class CalendarSelectView : LinearLayout {
215215
) {
216216
setBackgroundResource(R.drawable.frame_day_today)
217217
setTextColor(ContextCompat.getColor(context, R.color.gray_700))
218-
typeface = ResourcesCompat.getFont(context, R.font.nanum_square_regular)
218+
typeface = ResourcesCompat.getFont(context, R.font.nanum_square_bold)
219219
} else {
220220
setBackgroundColor(ContextCompat.getColor(context, R.color.transparent))
221221
setTextColor(ContextCompat.getColor(context, R.color.gray_700))

‎app/src/main/java/com/wafflestudio/siksha2/components/compose/TopBar.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import androidx.compose.ui.Modifier
1212
import androidx.compose.ui.text.font.FontWeight
1313
import androidx.compose.ui.tooling.preview.Preview
1414
import androidx.compose.ui.unit.dp
15+
import androidx.compose.ui.unit.sp
1516
import com.wafflestudio.siksha2.ui.NavigateUpIcon
1617
import com.wafflestudio.siksha2.ui.SikshaTheme
1718
import com.wafflestudio.siksha2.ui.SikshaTypography
@@ -33,6 +34,7 @@ fun TopBar(
3334
modifier = Modifier.align(Alignment.Center),
3435
color = SikshaTheme.colors.TextGNB,
3536
fontWeight = FontWeight.ExtraBold,
37+
fontSize = 16.sp,
3638
style = SikshaTypography.subtitle1
3739
)
3840
Box(

‎app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/CommentReportScreen.kt‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import androidx.compose.foundation.background
2-
import androidx.compose.foundation.border
32
import androidx.compose.foundation.clickable
43
import androidx.compose.foundation.layout.*
54
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -15,7 +14,6 @@ import androidx.compose.runtime.remember
1514
import androidx.compose.runtime.setValue
1615
import androidx.compose.ui.Alignment
1716
import androidx.compose.ui.Modifier
18-
import androidx.compose.ui.graphics.Color
1917
import androidx.compose.ui.platform.LocalContext
2018
import androidx.compose.ui.text.TextStyle
2119
import androidx.compose.ui.text.font.FontWeight
@@ -79,7 +77,7 @@ fun CommentReportScreen(
7977
Column(
8078
modifier = Modifier
8179
.fillMaxSize()
82-
.background(SikshaTheme.colors.White)
80+
.background(SikshaTheme.colors.BackgroundPrimary)
8381
) {
8482
TopBar(
8583
title = "신고하기",
@@ -104,7 +102,7 @@ fun CommentReportScreen(
104102
text = "어떤 이유로 신고하시나요?",
105103
style = TextStyle(
106104
fontSize = 20.sp,
107-
color = Color.Black
105+
color = SikshaTheme.colors.Black
108106
),
109107
modifier = Modifier.padding(start = 4.dp)
110108
)
@@ -125,7 +123,8 @@ fun CommentReportScreen(
125123
text = user.nickname,
126124
fontSize = 12.sp,
127125
fontWeight = FontWeight.Bold,
128-
maxLines = 1
126+
maxLines = 1,
127+
color = SikshaTheme.colors.Black
129128
)
130129
}
131130

@@ -137,8 +136,7 @@ fun CommentReportScreen(
137136
.padding(horizontal = 28.dp)
138137
.height(280.dp)
139138
.align(Alignment.CenterHorizontally)
140-
.background(Color(0xFFF5F5F5), shape = RoundedCornerShape(8.dp))
141-
.border(1.dp, Color.LightGray, shape = RoundedCornerShape(8.dp))
139+
.background(SikshaTheme.colors.Gray50, shape = RoundedCornerShape(8.dp))
142140
) {
143141
BasicTextField(
144142
value = reportContent,
@@ -147,7 +145,10 @@ fun CommentReportScreen(
147145
reportContent = it
148146
}
149147
},
150-
textStyle = TextStyle(fontSize = 16.sp),
148+
textStyle = TextStyle(
149+
fontSize = 16.sp,
150+
color = SikshaTheme.colors.Black
151+
),
151152
modifier = Modifier
152153
.fillMaxWidth()
153154
.weight(1f)
@@ -156,7 +157,7 @@ fun CommentReportScreen(
156157

157158
Text(
158159
text = "${reportContent.length}자/200자",
159-
style = TextStyle(color = Color.Gray, fontSize = 12.sp),
160+
style = TextStyle(color = SikshaTheme.colors.Gray700, fontSize = 12.sp),
160161
modifier = Modifier
161162
.align(Alignment.End)
162163
.padding(8.dp)
@@ -169,7 +170,10 @@ fun CommentReportScreen(
169170
onClick = {
170171
onClickReport(reportContent)
171172
},
172-
colors = ButtonDefaults.buttonColors(backgroundColor = Color(0xFFFF9522)),
173+
colors = ButtonDefaults.buttonColors(
174+
backgroundColor = SikshaTheme.colors.Orange500,
175+
disabledBackgroundColor = SikshaTheme.colors.Gray600
176+
),
173177
enabled = isContentNotEmpty,
174178
modifier = Modifier
175179
.fillMaxWidth()
@@ -179,7 +183,7 @@ fun CommentReportScreen(
179183
) {
180184
Text(
181185
text = "전송하기",
182-
color = Color.White,
186+
color = SikshaTheme.colors.TextButton,
183187
style = TextStyle(
184188
fontSize = 17.sp
185189
)

‎app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostCreateScreen.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,11 @@ fun ContentEditText(
472472
value = value,
473473
onValueChange = onValueChange,
474474
modifier = modifier,
475-
textStyle = SikshaTypography.body1.copy(color = SikshaTheme.colors.Black, fontSize = 14.sp),
475+
textStyle = SikshaTypography.body1.copy(
476+
color = SikshaTheme.colors.Black,
477+
fontSize = 14.sp,
478+
lineHeight = 21.sp
479+
),
476480
cursorBrush = SolidColor(SikshaTheme.colors.Orange500),
477481
decorationBox = {
478482
Box(

‎app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostDetailScreen.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,13 @@ fun PostDetailScreenFailed(
162162
}
163163
)
164164
Box(
165-
modifier = Modifier.fillMaxSize(),
165+
modifier = Modifier.fillMaxSize()
166+
.background(colors.BackgroundPrimary),
166167
contentAlignment = Alignment.Center
167168
) {
168169
Text(
169170
text = errorMessage,
170-
color = colors.Gray400,
171+
color = colors.Gray600,
171172
fontSize = 12.sp,
172173
style = MaterialTheme.typography.body2
173174
)

‎app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostListScreen.kt‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import androidx.compose.foundation.lazy.LazyColumn
1212
import androidx.compose.foundation.lazy.LazyListState
1313
import androidx.compose.foundation.lazy.LazyRow
1414
import androidx.compose.foundation.lazy.itemsIndexed
15-
import androidx.compose.material.Button
15+
import androidx.compose.foundation.shape.RoundedCornerShape
1616
import androidx.compose.material.CircularProgressIndicator
1717
import androidx.compose.material.ExperimentalMaterialApi
1818
import androidx.compose.material.Text
@@ -25,8 +25,10 @@ import androidx.compose.runtime.getValue
2525
import androidx.compose.ui.Alignment
2626
import androidx.compose.ui.Modifier
2727
import androidx.compose.ui.res.stringResource
28+
import androidx.compose.ui.text.font.FontWeight
2829
import androidx.compose.ui.tooling.preview.Preview
2930
import androidx.compose.ui.unit.dp
31+
import androidx.compose.ui.unit.sp
3032
import androidx.hilt.navigation.compose.hiltViewModel
3133
import androidx.paging.LoadState
3234
import androidx.paging.PagingData
@@ -240,17 +242,18 @@ fun PostsErrorPlaceHolder(
240242
color = SikshaTheme.colors.Gray600,
241243
style = SikshaTypography.subtitle1
242244
)
243-
Button(
244-
modifier = Modifier.background(SikshaTheme.colors.Orange500),
245-
onClick = {
245+
Text(
246+
modifier = Modifier.background(
247+
SikshaTheme.colors.Orange500,
248+
RoundedCornerShape(8.dp)
249+
).clickable {
246250
onClickRetry()
247-
}
248-
) {
249-
Text(
250-
text = stringResource(R.string.community_retry_button),
251-
color = SikshaTheme.colors.TextButton
252-
)
253-
}
251+
}.padding(vertical = 10.dp, horizontal = 20.dp),
252+
text = stringResource(R.string.community_retry_button),
253+
color = SikshaTheme.colors.TextButton,
254+
fontSize = 16.sp,
255+
fontWeight = FontWeight.Bold
256+
)
254257
}
255258
}
256259
}

‎app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostReportScreen.kt‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import androidx.compose.foundation.background
2-
import androidx.compose.foundation.border
32
import androidx.compose.foundation.clickable
43
import androidx.compose.foundation.layout.*
54
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -15,7 +14,6 @@ import androidx.compose.runtime.remember
1514
import androidx.compose.runtime.setValue
1615
import androidx.compose.ui.Alignment
1716
import androidx.compose.ui.Modifier
18-
import androidx.compose.ui.graphics.Color
1917
import androidx.compose.ui.platform.LocalContext
2018
import androidx.compose.ui.text.TextStyle
2119
import androidx.compose.ui.text.font.FontWeight
@@ -79,7 +77,7 @@ fun PostReportScreen(
7977
Column(
8078
modifier = Modifier
8179
.fillMaxSize()
82-
.background(SikshaTheme.colors.White)
80+
.background(SikshaTheme.colors.BackgroundPrimary)
8381
) {
8482
TopBar(
8583
title = "신고하기",
@@ -104,7 +102,7 @@ fun PostReportScreen(
104102
text = "어떤 이유로 신고하시나요?",
105103
style = TextStyle(
106104
fontSize = 20.sp,
107-
color = Color.Black
105+
color = SikshaTheme.colors.Black
108106
),
109107
modifier = Modifier.padding(start = 4.dp)
110108
)
@@ -125,7 +123,8 @@ fun PostReportScreen(
125123
text = user.nickname,
126124
fontSize = 12.sp,
127125
fontWeight = FontWeight.Bold,
128-
maxLines = 1
126+
maxLines = 1,
127+
color = SikshaTheme.colors.Black
129128
)
130129
}
131130

@@ -137,8 +136,7 @@ fun PostReportScreen(
137136
.padding(horizontal = 28.dp)
138137
.height(280.dp)
139138
.align(Alignment.CenterHorizontally)
140-
.background(Color(0xFFF5F5F5), shape = RoundedCornerShape(8.dp))
141-
.border(1.dp, Color.LightGray, shape = RoundedCornerShape(8.dp))
139+
.background(SikshaTheme.colors.Gray50, shape = RoundedCornerShape(8.dp))
142140
) {
143141
BasicTextField(
144142
value = reportContent,
@@ -147,7 +145,10 @@ fun PostReportScreen(
147145
reportContent = it
148146
}
149147
},
150-
textStyle = TextStyle(fontSize = 16.sp),
148+
textStyle = TextStyle(
149+
fontSize = 16.sp,
150+
color = SikshaTheme.colors.Black
151+
),
151152
modifier = Modifier
152153
.fillMaxWidth()
153154
.weight(1f)
@@ -156,7 +157,7 @@ fun PostReportScreen(
156157

157158
Text(
158159
text = "${reportContent.length}자/200자",
159-
style = TextStyle(color = Color.Gray, fontSize = 12.sp),
160+
style = TextStyle(color = SikshaTheme.colors.Gray700, fontSize = 12.sp),
160161
modifier = Modifier
161162
.align(Alignment.End)
162163
.padding(8.dp)
@@ -169,7 +170,10 @@ fun PostReportScreen(
169170
onClick = {
170171
onClickReport(reportContent)
171172
},
172-
colors = ButtonDefaults.buttonColors(backgroundColor = Color(0xFFFF9522)),
173+
colors = ButtonDefaults.buttonColors(
174+
backgroundColor = SikshaTheme.colors.Orange500,
175+
disabledBackgroundColor = SikshaTheme.colors.Gray600
176+
),
173177
enabled = isContentNotEmpty,
174178
modifier = Modifier
175179
.fillMaxWidth()
@@ -179,7 +183,7 @@ fun PostReportScreen(
179183
) {
180184
Text(
181185
text = "전송하기",
182-
color = Color.White,
186+
color = SikshaTheme.colors.TextButton,
183187
style = TextStyle(
184188
fontSize = 17.sp
185189
)

‎app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/UserPostListScreen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ fun UserPostListScreen(
6464

6565
Column(
6666
modifier = modifier
67-
.background(SikshaTheme.colors.White)
67+
.background(SikshaTheme.colors.BackgroundPrimary)
6868
) {
6969
TopBar(
7070
title = "내가 쓴 글",

‎app/src/main/java/com/wafflestudio/siksha2/compose/ui/dailyrestaurant/MenuGroupList.kt‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ import androidx.compose.foundation.layout.padding
1919
import androidx.compose.foundation.layout.size
2020
import androidx.compose.foundation.lazy.LazyColumn
2121
import androidx.compose.foundation.lazy.items
22+
import androidx.compose.foundation.lazy.rememberLazyListState
2223
import androidx.compose.foundation.shape.RoundedCornerShape
2324
import androidx.compose.material.Divider
2425
import androidx.compose.material.Text
2526
import androidx.compose.runtime.Composable
2627
import androidx.compose.runtime.LaunchedEffect
2728
import androidx.compose.runtime.collectAsState
29+
import androidx.compose.runtime.derivedStateOf
2830
import androidx.compose.runtime.getValue
2931
import androidx.compose.runtime.livedata.observeAsState
3032
import androidx.compose.runtime.mutableFloatStateOf
@@ -103,14 +105,25 @@ fun MenuGroupList(
103105
val toolbarHeight = 60.dp
104106
val toolbarHeightPx = with(LocalDensity.current) { toolbarHeight.toPx() }
105107
val toolbarOffsetHeightPx = remember { mutableFloatStateOf(0f) }
108+
val listState = rememberLazyListState()
109+
val isScrollable by remember {
110+
derivedStateOf {
111+
val layoutInfo = listState.layoutInfo
112+
layoutInfo.totalItemsCount > 0 &&
113+
(
114+
layoutInfo.visibleItemsInfo.firstOrNull()?.index != 0 ||
115+
layoutInfo.visibleItemsInfo.lastOrNull()?.index != layoutInfo.totalItemsCount - 1
116+
)
117+
}
118+
}
106119

107120
val nestedScrollConnection = remember {
108121
object : NestedScrollConnection {
109122
override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
110123
val delta = available.y
111124
val newOffset = (toolbarOffsetHeightPx.floatValue + delta)
112125
.coerceIn(-toolbarHeightPx, 0f)
113-
toolbarOffsetHeightPx.floatValue = newOffset
126+
toolbarOffsetHeightPx.floatValue = if (isScrollable) newOffset else 0f
114127
return Offset.Zero
115128
}
116129
}
@@ -129,9 +142,10 @@ fun MenuGroupList(
129142
) {
130143
if (menuGroupList.isNotEmpty()) {
131144
LazyColumn(
145+
state = listState,
132146
contentPadding = PaddingValues(top = toolbarHeight),
133147
modifier = Modifier.fillMaxSize()
134-
.padding(start = 8.dp, end = 8.dp, bottom = 17.dp),
148+
.padding(start = 8.dp, end = 8.dp),
135149
verticalArrangement = Arrangement.spacedBy(18.dp)
136150
) {
137151
items(menuGroupList) { menuGroup ->
@@ -161,6 +175,9 @@ fun MenuGroupList(
161175
)
162176
}
163177
}
178+
item {
179+
Spacer(Modifier.height(17.dp))
180+
}
164181
}
165182
} else {
166183
Text(

0 commit comments

Comments
 (0)