Skip to content

Commit 7c6ec2e

Browse files
committed
Merge branch 'release/v2.3.0' into develop
2 parents 370cfeb + b2ae411 commit 7c6ec2e

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

app/src/main/java/com/runnect/runnect/presentation/draw/DrawViewModel.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import com.runnect.runnect.presentation.state.UiState
1313
import com.runnect.runnect.util.extension.collectResult
1414
import com.runnect.runnect.util.multipart.ContentUriRequestBody
1515
import dagger.hilt.android.lifecycle.HiltViewModel
16-
import kotlinx.coroutines.flow.onStart
1716
import timber.log.Timber
1817
import javax.inject.Inject
1918
import kotlin.math.acos
@@ -85,6 +84,7 @@ class DrawViewModel @Inject constructor(
8584
}
8685

8786
fun uploadCourse() {
87+
_drawState.value = UiState.Loading
8888
launchWithHandler {
8989
courseRepository.uploadCourse(
9090
image = _image.value!!.toFormData(),
@@ -95,9 +95,7 @@ class DrawViewModel @Inject constructor(
9595
departureAddress = departureAddress,
9696
departureName = departureName
9797
).toRequestBody()
98-
).onStart {
99-
_drawState.value = UiState.Loading
100-
}.collectResult(
98+
).collectResult(
10199
onSuccess = {
102100
uploadCourseId = it
103101
_drawState.value = UiState.Success

app/src/main/java/com/runnect/runnect/presentation/run/TimerService.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ class TimerService : Service() {
4545
if (player == null) {
4646
player = MediaPlayer.create(this@TimerService, R.raw.start_run)
4747
player?.setOnCompletionListener { mediaPlayer ->
48-
mediaPlayer.release() // 재생이 끝나면 MediaPlayer 객체를 해제합니다.
48+
mediaPlayer.release()
49+
player = null
4950
}
5051
}
5152
player?.start()

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ minSdk = "28"
55
targetSdk = "35"
66

77
# App
8-
versionCode = "30"
9-
versionName = "2.2.1"
8+
versionCode = "33"
9+
versionName = "2.3.0"
1010

1111
# Gradle plugins
1212
agp = "8.13.2"

0 commit comments

Comments
 (0)