Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ val properties = Properties().apply {
load(project.rootProject.file("local.properties").inputStream())
}


android {
namespace = "com.kiero"
compileSdk = libs.versions.compileSdk.get().toInt()
Expand Down Expand Up @@ -46,7 +45,6 @@ android {
// manifestPlaceholders["NATIVE_APP_KEY"] = properties["kakao.native.app.key"].toString().replace("\"", "")

}

buildTypes {
release {
isMinifyEnabled = false
Expand Down Expand Up @@ -83,6 +81,15 @@ android {
resValue("string", "app_name", "Kiero_Kid")
}
}

signingConfigs {
getByName("debug") {
keyAlias = "androiddebugkey"
keyPassword = "android"
storeFile = File("${project.rootDir.absolutePath}/keystore/debug.keystore")
storePassword = "android"
}
}
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import com.kiero.presentation.parent.schedule.mission.auto.component.ScrollableA
import com.kiero.presentation.parent.schedule.mission.auto.state.AutoMissionSideEffect
import com.kiero.presentation.parent.schedule.mission.auto.state.AutoMissionState
import com.kiero.presentation.parent.schedule.mission.auto.viewmodel.AutoMissionViewModel
import timber.log.Timber

@Composable
fun ParentAutoAddRoute(
Expand All @@ -51,7 +52,6 @@ fun ParentAutoAddRoute(
viewModel.sideEffect.collectSideEffect { effect ->
when (effect) {
is AutoMissionSideEffect.ShowToast -> {
// ParentAutoResultRoute에서 처리
snackbarHostState.showSnackbar(effect.message)
}

Expand All @@ -62,6 +62,12 @@ fun ParentAutoAddRoute(
is AutoMissionSideEffect.ScrollToPage -> {
// 처리 안 함
}

is AutoMissionSideEffect.ShowToastAndNavigate -> {
Timber.e("parent auto add")
snackbarHostState.showSnackbar(effect.message)
navigateUp()
}
}
}

Expand All @@ -77,7 +83,8 @@ fun ParentAutoAddRoute(
ParentAutoResultRoute(
paddingValues = paddingValues,
state = state,
viewModel = viewModel
viewModel = viewModel,
navigateUp = navigateUp
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@ import com.kiero.presentation.parent.schedule.mission.auto.state.AutoMissionStat
import com.kiero.presentation.parent.schedule.mission.auto.viewmodel.AutoMissionViewModel
import com.kiero.presentation.parent.schedule.mission.component.datepicker.component.CalendarBottomSheet
import kotlinx.coroutines.launch
import timber.log.Timber
import java.time.LocalDate


@Composable
fun ParentAutoResultRoute(
paddingValues: PaddingValues,
state: AutoMissionState,
navigateUp: () -> Unit,
viewModel: AutoMissionViewModel = hiltViewModel(),
) {
val snackbarHostState = remember { SnackbarHostState() }
Expand All @@ -58,10 +60,16 @@ fun ParentAutoResultRoute(
viewModel.sideEffect.collect { effect ->
when (effect) {
is AutoMissionSideEffect.ShowToast -> {
scope.launch {
snackbarHostState.currentSnackbarData?.dismiss()
snackbarHostState.showSnackbar(effect.message)
}
snackbarHostState.currentSnackbarData?.dismiss()
snackbarHostState.showSnackbar(effect.message)
}
is AutoMissionSideEffect.ShowToastAndNavigate -> {
Timber.e("parent Auto result")

snackbarHostState.currentSnackbarData?.dismiss()
snackbarHostState.showSnackbar(effect.message)

navigateUp()
}
else -> {}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.kiero.presentation.parent.schedule.mission.auto.state

sealed interface AutoMissionSideEffect {
data class ShowToast(val message: String) : AutoMissionSideEffect
data class ShowToastAndNavigate(val message: String) : AutoMissionSideEffect
data object NavigateBack : AutoMissionSideEffect
data class ScrollToPage(val index: Int) : AutoMissionSideEffect
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ class AutoMissionViewModel @Inject constructor(
private val _state = MutableStateFlow(AutoMissionState())
val state: StateFlow<AutoMissionState> = _state.asStateFlow()

private val _sideEffect = MutableSharedFlow<AutoMissionSideEffect>(
extraBufferCapacity = 1
)

private val _sideEffect = MutableSharedFlow<AutoMissionSideEffect>()
val sideEffect: SharedFlow<AutoMissionSideEffect> = _sideEffect.asSharedFlow()

val awardTextFieldState = TextFieldState(initialText = "20")
Expand Down Expand Up @@ -234,11 +231,15 @@ class AutoMissionViewModel @Inject constructor(

autoMissionRepository.saveBatchMissions(childId, domainMissions)
.onSuccess {
Timber.e("message saveBatchMissions")
_state.update {
it.copy(
hasViewedLastPage = false
)
}
_sideEffect.emit(
AutoMissionSideEffect.ShowToast("미션이 등록되었습니다.")
AutoMissionSideEffect.ShowToastAndNavigate("미션이 등록되었습니다."),
)
delay(200)
_sideEffect.emit(AutoMissionSideEffect.NavigateBack)
}
.onFailure { e ->
val message = when {
Expand Down