Skip to content

Commit 9ea9d1f

Browse files
committed
[NDGL-125] chore: NDGLChipTab을 LazyRow로 변경 및 contentPadding 적용
1 parent f042d3f commit 9ea9d1f

File tree

5 files changed

+20
-13
lines changed

5 files changed

+20
-13
lines changed

core/ui/src/main/java/com/yapp/ndgl/core/ui/designsystem/NDGLChipTab.kt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ import androidx.annotation.DrawableRes
44
import androidx.compose.foundation.background
55
import androidx.compose.foundation.border
66
import androidx.compose.foundation.clickable
7-
import androidx.compose.foundation.horizontalScroll
87
import androidx.compose.foundation.layout.Arrangement
8+
import androidx.compose.foundation.layout.PaddingValues
99
import androidx.compose.foundation.layout.Row
1010
import androidx.compose.foundation.layout.padding
1111
import androidx.compose.foundation.layout.size
1212
import androidx.compose.foundation.layout.widthIn
13-
import androidx.compose.foundation.rememberScrollState
13+
import androidx.compose.foundation.lazy.LazyRow
14+
import androidx.compose.foundation.lazy.itemsIndexed
1415
import androidx.compose.foundation.shape.CircleShape
1516
import androidx.compose.material3.Icon
1617
import androidx.compose.material3.Text
@@ -45,14 +46,17 @@ fun NDGLChipTab(
4546
selectedIndex: Int,
4647
onTabSelected: (Int) -> Unit,
4748
modifier: Modifier = Modifier,
49+
contentPadding: PaddingValues = PaddingValues(0.dp),
4850
) {
49-
val scrollState = rememberScrollState()
50-
51-
Row(
52-
modifier = modifier.horizontalScroll(scrollState),
51+
LazyRow(
52+
modifier = modifier,
5353
horizontalArrangement = Arrangement.spacedBy(8.dp),
54+
contentPadding = contentPadding,
5455
) {
55-
tabs.forEachIndexed { index, tab ->
56+
itemsIndexed(
57+
items = tabs,
58+
key = { _, tab -> tab.tag },
59+
) { index, tab ->
5660
NDGLChipTabItem(
5761
isSelected = index == selectedIndex,
5862
name = tab.name,

feature/home/src/main/java/com/yapp/ndgl/feature/home/main/PopularTravelSection.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ private fun HorizontalCardSection(
104104
}.toPersistentList(),
105105
selectedIndex = selectedTabIndex,
106106
onTabSelected = onTabSelected,
107-
modifier = Modifier.padding(start = 24.dp),
107+
modifier = Modifier,
108+
contentPadding = PaddingValues(horizontal = 24.dp),
108109
)
109110

110111
if (columns.isNotEmpty()) {

feature/home/src/main/java/com/yapp/ndgl/feature/home/popular/PopularTravelListScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ private fun PopularTravelListContent(
196196
}.toPersistentList(),
197197
selectedIndex = state.selectedTabIndex,
198198
onTabSelected = onTabSelected,
199-
modifier = Modifier.padding(start = 24.dp, top = 20.dp),
199+
modifier = Modifier.padding(top = 20.dp),
200+
contentPadding = PaddingValues(horizontal = 24.dp),
200201
)
201202

202203
LazyColumn(

feature/travel/src/main/java/com/yapp/ndgl/feature/travel/followtravel/FollowTravelScreen.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.yapp.ndgl.feature.travel.followtravel
33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.layout.Box
55
import androidx.compose.foundation.layout.Column
6+
import androidx.compose.foundation.layout.PaddingValues
67
import androidx.compose.foundation.layout.Spacer
78
import androidx.compose.foundation.layout.fillMaxSize
89
import androidx.compose.foundation.layout.fillMaxWidth
@@ -145,13 +146,13 @@ private fun FollowTravelScreen(
145146
} else {
146147
Modifier.padding(top = 22.dp)
147148
},
148-
)
149-
.padding(horizontal = 24.dp),
149+
),
150150
) {
151151
NDGLChipTab(
152152
tabs = tabs,
153153
selectedIndex = state.selectedDay - 1,
154154
onTabSelected = { index -> selectDay(index + 1) },
155+
contentPadding = PaddingValues(horizontal = 24.dp),
155156
)
156157
Spacer(Modifier.height(16.dp))
157158
}

feature/travel/src/main/java/com/yapp/ndgl/feature/travel/traveldetail/TravelDetailScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,13 +358,13 @@ private fun TravelDetailScreen(
358358
} else {
359359
Modifier.padding(top = 22.dp)
360360
},
361-
)
362-
.padding(horizontal = 24.dp),
361+
),
363362
) {
364363
NDGLChipTab(
365364
tabs = tabs,
366365
selectedIndex = state.selectedDay - 1,
367366
onTabSelected = { index -> selectDay(index + 1) },
367+
contentPadding = PaddingValues(horizontal = 24.dp),
368368
)
369369
Spacer(Modifier.height(16.dp))
370370
}

0 commit comments

Comments
 (0)