Skip to content

Commit 9a0183e

Browse files
author
eshc123
committed
feat: 디자인 수정 반영
1 parent 37a0211 commit 9a0183e

File tree

4 files changed

+22
-27
lines changed

4 files changed

+22
-27
lines changed

feature/history/src/main/java/com/goalpanzi/mission_mate/feature/history/component/HistoryList.kt

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ fun HistoryList(
103103
missionId = history.missionId,
104104
imageUrls = history.imageUrls,
105105
characters = history.missionMembers.distinctCharacters,
106-
extraNumbers = history.missionMembers.extraNumbers,
106+
membersCount = history.missionMembers.size,
107107
title = history.description,
108108
startDate = history.missionFormattedStartDate,
109109
endDate = history.missionFormattedEndDate,
@@ -133,7 +133,7 @@ fun HistoryListItem(
133133
missionId: Long,
134134
imageUrls: List<String>,
135135
characters: List<CharacterType>,
136-
extraNumbers: Int,
136+
membersCount: Int,
137137
title: String,
138138
startDate: String,
139139
endDate: String,
@@ -191,7 +191,7 @@ fun HistoryListItem(
191191

192192
HistoryListItemInfo(
193193
characters = characters,
194-
extraNumbers = extraNumbers,
194+
membersCount = membersCount,
195195
title = title,
196196
startDate = startDate,
197197
endDate = endDate,
@@ -237,7 +237,7 @@ fun HistoryListItemImageEmpty(
237237
@Composable
238238
fun HistoryListItemInfo(
239239
characters: List<CharacterType>,
240-
extraNumbers: Int,
240+
membersCount: Int,
241241
title: String,
242242
startDate: String,
243243
endDate: String,
@@ -256,7 +256,7 @@ fun HistoryListItemInfo(
256256
HistoryListItemInfoDetail(
257257
modifier = Modifier.weight(1f),
258258
characters = characters,
259-
extraNumbers = extraNumbers,
259+
membersCount = membersCount,
260260
title = title,
261261
boardProgressed = boardProgressed,
262262
boardTotal = boardTotal,
@@ -278,7 +278,7 @@ fun HistoryListItemInfo(
278278
@Composable
279279
fun HistoryListItemInfoDetail(
280280
characters: List<CharacterType>,
281-
extraNumbers: Int,
281+
membersCount: Int,
282282
title: String,
283283
boardProgressed: Int,
284284
boardTotal: Int,
@@ -292,7 +292,7 @@ fun HistoryListItemInfoDetail(
292292
HistoryListItemInfoDetailMembers(
293293
modifier = Modifier.padding(bottom = 2.dp),
294294
characters = characters,
295-
extraNumbers = extraNumbers
295+
membersCount = membersCount
296296
)
297297
HistoryListItemInfoDetailTitle(
298298
title = title
@@ -308,7 +308,7 @@ fun HistoryListItemInfoDetail(
308308
@Composable
309309
fun HistoryListItemInfoDetailMembers(
310310
characters: List<CharacterType>,
311-
extraNumbers: Int,
311+
membersCount : Int,
312312
modifier: Modifier = Modifier
313313
) {
314314
Row(
@@ -319,16 +319,14 @@ fun HistoryListItemInfoDetailMembers(
319319
HistoryListItemInfoDetailMembersCharacterList(
320320
characters = characters
321321
)
322-
if(extraNumbers > 0) {
323-
Text(
324-
text = stringResource(
325-
id = R.string.history_list_item_member_count,
326-
extraNumbers
327-
),
328-
style = MissionMateTypography.body_xl_bold,
329-
color = ColorGray1_FF404249
330-
)
331-
}
322+
Text(
323+
text = stringResource(
324+
id = R.string.history_list_item_member_count,
325+
membersCount
326+
),
327+
style = MissionMateTypography.body_xl_bold,
328+
color = ColorGray1_FF404249
329+
)
332330
}
333331
}
334332

@@ -529,7 +527,7 @@ private fun HistoryListItemPreview() {
529527
CharacterType.DOG,
530528
CharacterType.BIRD
531529
),
532-
extraNumbers = 3,
530+
membersCount = 3,
533531
title = "매일 저녁 1시간 먹기",
534532
startDate = "2024.08.15",
535533
endDate = "2024.09.14",

feature/history/src/main/java/com/goalpanzi/mission_mate/feature/history/model/History.kt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ data class History(
4545

4646
class MissionHistoryMembers(
4747
private val members: List<CharacterType>
48-
) {
49-
val extraNumbers = if(members.size > VISIBLE_MEMBERS_NUMBER){
50-
members.size - VISIBLE_MEMBERS_NUMBER
51-
} else {
52-
0
53-
}
54-
48+
): List<CharacterType> by members {
5549
val distinctCharacters: List<CharacterType> by lazy {
5650
members.distinct().take(VISIBLE_MEMBERS_NUMBER)
5751
}

feature/history/src/main/java/com/goalpanzi/mission_mate/feature/history/screen/HistoryScreen.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.goalpanzi.mission_mate.feature.history.screen
22

33
import androidx.annotation.StringRes
4+
import androidx.compose.foundation.background
45
import androidx.compose.foundation.layout.Arrangement
56
import androidx.compose.foundation.layout.Box
67
import androidx.compose.foundation.layout.Column
@@ -36,6 +37,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
3637
import com.goalpanzi.mission_mate.core.designsystem.component.StableImage
3738
import com.goalpanzi.mission_mate.core.designsystem.theme.ColorGray1_FF404249
3839
import com.goalpanzi.mission_mate.core.designsystem.theme.ColorGray3_FF727484
40+
import com.goalpanzi.mission_mate.core.designsystem.theme.ColorWhite_FFFFFFFF
3941
import com.goalpanzi.mission_mate.core.designsystem.theme.MissionMateTypography
4042
import com.goalpanzi.mission_mate.core.designsystem.theme.MissionmateTheme
4143
import com.goalpanzi.mission_mate.feature.history.HistoryUiState
@@ -95,6 +97,7 @@ fun HistoryScreen(
9597
Column(
9698
modifier = modifier
9799
.fillMaxSize()
100+
.background(ColorWhite_FFFFFFFF)
98101
.statusBarsPadding()
99102
.navigationBarsPadding()
100103
) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<string name="history_list_item_board_count">%d/%d칸</string>
88
<string name="history_list_item_rank">최종%d등이에요</string>
99
<string name="history_list_item_period">%s~%s</string>
10-
<string name="history_list_item_member_count">+%d</string>
10+
<string name="history_list_item_member_count">%d명</string>
1111

1212
</resources>

0 commit comments

Comments
 (0)