Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
db66729
feat: 오디오 플레이어(`PrezelPlayer`) 및 리소스 트랙 컴포넌트 구현
HamBeomJoon May 6, 2026
acc5f3c
feat: 오디오 플레이어(`PrezelPlayer`) 및 리소스 트랙 컴포넌트 구현
HamBeomJoon May 6, 2026
bad4f18
Merge remote-tracking branch 'origin/feat/#125-ds-player' into feat/#…
HamBeomJoon May 7, 2026
d092f7c
feat: `PrezelPlayer` 컴포넌트 고도화 및 데이터 모델 개선
HamBeomJoon May 7, 2026
c4713e0
Merge remote-tracking branch 'origin/develop' into feat/#125-ds-player
HamBeomJoon May 7, 2026
41248eb
refactor: 디자인 시스템 플레이어 컴포넌트 최적화 및 안정성 개선
HamBeomJoon May 7, 2026
a4e030d
feat: PrezelPlayer 상태 관리 시스템 구축 및 미디어 컨트롤러 리팩터링
HamBeomJoon May 7, 2026
5bb38a5
refactor: `core:domain` 모듈 내 인증 관련 인터페이스 및 UseCase 삭제
HamBeomJoon May 7, 2026
5b07dd3
refactor: `PrezelPlayer` 컴포넌트 데이터 모델 통합 및 리팩터링
HamBeomJoon May 7, 2026
0a32b33
Merge remote-tracking branch 'origin/develop' into feat/#125-ds-player
HamBeomJoon May 10, 2026
215e9cf
refactor: `PrezelPlayerState` 구조 개선 및 상태 관리 로직 간소화
HamBeomJoon May 10, 2026
8d1a704
Merge remote-tracking branch 'origin/develop' into feat/#125-ds-player
HamBeomJoon May 10, 2026
b968f12
feat: PrezelPlayerState 상태 보존을 위한 Saver 구현 및 rememberSaveable 적용
HamBeomJoon May 10, 2026
1e8a5b3
refactor: PrezelPlayer 재생 제어 및 상태 관리 로직 개선
HamBeomJoon May 11, 2026
4722cfb
refactor: PrezelPlayer 재생 완료 로직 개선 및 상태 관리 최적화
HamBeomJoon May 11, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,289 @@
package com.team.prezel.core.designsystem.component.player

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.dp
import com.team.prezel.core.designsystem.R
import com.team.prezel.core.designsystem.component.actions.button.PrezelIconButton
import com.team.prezel.core.designsystem.component.actions.button.config.ButtonHierarchy
import com.team.prezel.core.designsystem.component.actions.button.config.ButtonSize
import com.team.prezel.core.designsystem.component.actions.button.config.ButtonType
import com.team.prezel.core.designsystem.component.actions.button.config.PrezelButtonDefaults
import com.team.prezel.core.designsystem.icon.PrezelIcons
import com.team.prezel.core.designsystem.preview.BasicPreview
import com.team.prezel.core.designsystem.preview.PreviewSection
import com.team.prezel.core.designsystem.theme.PrezelTheme
import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.persistentListOf
import kotlinx.coroutines.delay

@Composable
fun PrezelPlayer(
state: PrezelPlayerState,
trackContentDescription: String,
modifier: Modifier = Modifier,
) {
PrezelPlayerContent(
playing = state.playing,
durationMillis = state.durationMillis,
currentMillis = state.currentMillis,
items = state.items,
trackContentDescription = trackContentDescription,
onPlayPauseClick = state::togglePlaying,
onPreviousClick = state::moveToPreviousItem,
onNextClick = state::moveToNextItem,
onSeek = state::seekToProgress,
modifier = modifier,
idle = state.idle,
showHandle = state.showHandle,
onDragStarted = state::startDrag,
onDragStopped = state::stopDrag,
previousEnabled = state.previousEnabled,
nextEnabled = state.nextEnabled,
)
}

@Composable
private fun PrezelPlayerContent(
playing: Boolean,
durationMillis: Long,
currentMillis: Long,
items: ImmutableList<PrezelPlayerItem>,
trackContentDescription: String,
onPlayPauseClick: () -> Unit,
onPreviousClick: () -> Unit,
onNextClick: () -> Unit,
onSeek: (Float) -> Unit,
modifier: Modifier = Modifier,
idle: Boolean = false,
showHandle: Boolean = false,
onDragStarted: () -> Unit = {},
onDragStopped: () -> Unit = {},
previousEnabled: Boolean = true,
nextEnabled: Boolean = true,
) {
Column(
modifier = modifier
.fillMaxWidth()
.padding(vertical = PrezelTheme.spacing.V20),
) {
PrezelPlayerTrackSection(
durationMillis = durationMillis,
currentMillis = currentMillis,
items = items,
trackContentDescription = trackContentDescription,
idle = idle,
showHandle = showHandle,
onSeek = onSeek,
onDragStarted = onDragStarted,
onDragStopped = onDragStopped,
)

Spacer(modifier = Modifier.height(PrezelTheme.spacing.V16))

PrezelPlayerControls(
playing = playing,
onPlayPauseClick = onPlayPauseClick,
onPreviousClick = onPreviousClick,
onNextClick = onNextClick,
previousEnabled = previousEnabled,
nextEnabled = nextEnabled,
)
}
}

@Composable
private fun PrezelPlayerTrackSection(
durationMillis: Long,
currentMillis: Long,
items: ImmutableList<PrezelPlayerItem>,
trackContentDescription: String,
idle: Boolean,
showHandle: Boolean,
onSeek: (Float) -> Unit,
onDragStarted: () -> Unit,
onDragStopped: () -> Unit,
) {
PrezelPlayerResourceTrack(
durationMillis = durationMillis,
currentMillis = currentMillis,
items = items,
contentDescription = trackContentDescription,
idle = idle,
showHandle = showHandle,
onSeek = onSeek,
onDragStarted = onDragStarted,
onDragStopped = onDragStopped,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = PrezelTheme.spacing.V20),
)
}

@Composable
private fun PrezelPlayerControls(
playing: Boolean,
onPlayPauseClick: () -> Unit,
onPreviousClick: () -> Unit,
onNextClick: () -> Unit,
previousEnabled: Boolean,
nextEnabled: Boolean,
) {
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(
space = PrezelTheme.spacing.V24,
alignment = Alignment.CenterHorizontally,
),
verticalAlignment = Alignment.CenterVertically,
) {
PrezelPlayerSeekButton(
iconResId = PrezelIcons.SkipBackward,
contentDescription = stringResource(R.string.core_designsystem_player_previous_desc),
enabled = previousEnabled,
onClick = onPreviousClick,
)
PrezelPlayerPlayPauseButton(
playing = playing,
onClick = onPlayPauseClick,
modifier = Modifier.weight(1f),
)
PrezelPlayerSeekButton(
iconResId = PrezelIcons.SkipForward,
contentDescription = stringResource(R.string.core_designsystem_player_next_desc),
enabled = nextEnabled,
onClick = onNextClick,
)
}
}

@Composable
private fun PrezelPlayerSeekButton(
iconResId: Int,
contentDescription: String,
enabled: Boolean,
onClick: () -> Unit,
) {
PrezelIconButton(
iconResId = iconResId,
type = ButtonType.GHOST,
hierarchy = ButtonHierarchy.SECONDARY,
enabled = enabled,
onClick = onClick,
modifier = Modifier
.widthIn(min = 80.dp)
.semantics { this.contentDescription = contentDescription },
)
}

@Composable
private fun PrezelPlayerPlayPauseButton(
playing: Boolean,
onClick: () -> Unit,
modifier: Modifier = Modifier,
) {
val playContentDescription = stringResource(R.string.core_designsystem_player_play_desc)
val pauseContentDescription = stringResource(R.string.core_designsystem_player_pause_desc)

PrezelIconButton(
iconResId = if (playing) PrezelIcons.Pause else PrezelIcons.Play,
onClick = onClick,
modifier = modifier.semantics {
contentDescription = if (playing) {
pauseContentDescription
} else {
playContentDescription
}
},
buttonDefault = PrezelButtonDefaults.getDefault(
isIconOnly = true,
type = ButtonType.FILLED,
size = ButtonSize.REGULAR,
hierarchy = ButtonHierarchy.PRIMARY,
isRounded = true,
contentColor = if (playing) PrezelTheme.colors.iconRegular else PrezelTheme.colors.solidWhite,
backgroundColor = if (playing) PrezelTheme.colors.bgLarge else PrezelTheme.colors.interactiveRegular,
),
)
}

@BasicPreview
@Composable
private fun PrezelPlayerPlaybackPreview() {
PrezelTheme {
val durationMillis = 690_000L
val playerState = rememberPrezelPlayerState(
durationMillis = durationMillis,
initialItems = previewPlayerItems,
)

LaunchedEffect(playerState.playing) {
while (playerState.playing) {
delay(1_000L)
playerState.updateCurrentMillis(
currentMillis = (playerState.currentMillis + 1_000L).coerceAtMost(playerState.durationMillis),
)
}
}

PreviewSection(title = "Player Playback") {
PlayerPreviewItem(name = if (playerState.playing) "playing" else "paused") {
PrezelPlayer(
state = playerState,
trackContentDescription = stringResource(R.string.core_designsystem_player_speech_track_desc),
modifier = Modifier.width(360.dp),
)
}
}
}
}

@Composable
private fun PlayerPreviewItem(
name: String,
content: @Composable () -> Unit,
) {
Column(
verticalArrangement = Arrangement.spacedBy(PrezelTheme.spacing.V8),
) {
Text(
text = name,
style = PrezelTheme.typography.body3Medium,
color = PrezelTheme.colors.textMedium,
)
content()
}
}

private val previewPlayerItems = persistentListOf(
PrezelPlayerItem.Segment(timeMillis = 0L),
PrezelPlayerItem.Segment(timeMillis = 90_000L),
PrezelPlayerItem.Marker(
timeMillis = 151_000L,
markerType = PrezelPlayerMarkerType.WARNING,
),
PrezelPlayerItem.Segment(timeMillis = 234_000L),
PrezelPlayerItem.Marker(
timeMillis = 317_000L,
markerType = PrezelPlayerMarkerType.GOOD,
),
PrezelPlayerItem.Marker(
timeMillis = 443_000L,
markerType = PrezelPlayerMarkerType.WARNING,
),
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.team.prezel.core.designsystem.component.player

import androidx.compose.runtime.Immutable

enum class PrezelPlayerMarkerType {
GOOD,
WARNING,
NEUTRAL,
}

@Immutable
sealed interface PrezelPlayerItem {
val timeMillis: Long

@Immutable
data class Segment(
override val timeMillis: Long,
) : PrezelPlayerItem

@Immutable
data class Marker(
override val timeMillis: Long,
val markerType: PrezelPlayerMarkerType,
) : PrezelPlayerItem
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package com.team.prezel.core.designsystem.component.player

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.size
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import com.team.prezel.core.designsystem.preview.BasicPreview
import com.team.prezel.core.designsystem.preview.PreviewSection
import com.team.prezel.core.designsystem.theme.PrezelTheme

@Composable
internal fun PrezelPlayerResourceMarker(
type: PrezelPlayerMarkerType,
modifier: Modifier = Modifier,
) {
Box(
modifier = modifier
.size(8.dp)
.clip(PrezelTheme.shapes.V1000)
.background(type.color),
)
}

private val PrezelPlayerMarkerType.color: Color
@Composable
get() = when (this) {
PrezelPlayerMarkerType.GOOD -> PrezelTheme.colors.feedbackGoodRegular
PrezelPlayerMarkerType.WARNING -> PrezelTheme.colors.feedbackWarningRegular
PrezelPlayerMarkerType.NEUTRAL -> PrezelTheme.colors.iconRegular
}

@BasicPreview
@Composable
private fun PrezelPlayerResourceMarkerPreview() {
PrezelTheme {
PreviewSection(title = "Player Resource Marker") {
Row(horizontalArrangement = Arrangement.spacedBy(PrezelTheme.spacing.V16)) {
PrezelPlayerResourceMarker(type = PrezelPlayerMarkerType.GOOD)
PrezelPlayerResourceMarker(type = PrezelPlayerMarkerType.WARNING)
PrezelPlayerResourceMarker(type = PrezelPlayerMarkerType.NEUTRAL)
}
}
}
}
Loading