Skip to content

Commit bb3e164

Browse files
committed
[NDGL-63] fix: WheelPicker 숫자에 따라 간격이 움직이는 오류 해결
1 parent f61f4c1 commit bb3e164

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
1212
import androidx.compose.foundation.layout.height
1313
import androidx.compose.foundation.layout.padding
1414
import androidx.compose.foundation.layout.size
15+
import androidx.compose.foundation.layout.width
1516
import androidx.compose.foundation.layout.wrapContentHeight
1617
import androidx.compose.foundation.lazy.LazyColumn
1718
import androidx.compose.foundation.lazy.rememberLazyListState
@@ -141,6 +142,7 @@ private fun <T> WheelPicker(
141142
items: List<T>,
142143
onItemSelected: (T) -> Unit,
143144
initialIndex: Int = 0,
145+
itemWidth: Dp = 40.dp,
144146
itemHeight: Dp = 40.dp,
145147
visibleItemCount: Int = 5,
146148
padEnabled: Boolean = false,
@@ -163,7 +165,7 @@ private fun <T> WheelPicker(
163165
available: Offset,
164166
source: NestedScrollSource,
165167
): Offset {
166-
return available
168+
return Offset.Zero
167169
}
168170
}
169171
}
@@ -174,6 +176,7 @@ private fun <T> WheelPicker(
174176

175177
Box(
176178
modifier = modifier
179+
.width(itemWidth)
177180
.height(itemHeight * visibleItemCount)
178181
.nestedScroll(nestedScrollConnection),
179182
contentAlignment = Alignment.Center,

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
1212
import androidx.compose.foundation.layout.height
1313
import androidx.compose.foundation.layout.padding
1414
import androidx.compose.foundation.layout.size
15+
import androidx.compose.foundation.layout.width
1516
import androidx.compose.foundation.layout.wrapContentHeight
1617
import androidx.compose.foundation.lazy.LazyColumn
1718
import androidx.compose.foundation.lazy.rememberLazyListState
@@ -94,7 +95,7 @@ internal fun TimelineContent(
9495
}
9596
Spacer(Modifier.height(32.dp))
9697

97-
if (isSettingStartTime) {
98+
if (!isSettingStartTime) {
9899
val hourItems = remember { (0..23).toList() }
99100
val minuteItems = remember { (0..55 step 5).toList() }
100101

@@ -236,6 +237,7 @@ private fun <T> WheelPicker(
236237
items: List<T>,
237238
onItemSelected: (T) -> Unit,
238239
initialIndex: Int = 0,
240+
itemWidth: Dp = 40.dp,
239241
itemHeight: Dp = 40.dp,
240242
visibleItemCount: Int = 5,
241243
padEnabled: Boolean = false,
@@ -258,7 +260,7 @@ private fun <T> WheelPicker(
258260
available: Offset,
259261
source: NestedScrollSource,
260262
): Offset {
261-
return available
263+
return Offset.Zero
262264
}
263265
}
264266
}
@@ -269,6 +271,7 @@ private fun <T> WheelPicker(
269271

270272
Box(
271273
modifier = modifier
274+
.width(itemWidth)
272275
.height(itemHeight * visibleItemCount)
273276
.nestedScroll(nestedScrollConnection),
274277
contentAlignment = Alignment.Center,

0 commit comments

Comments
 (0)