Skip to content

Commit

Permalink
[FEAT/#64] ViewModel로 Dialog 구현
Browse files Browse the repository at this point in the history
  • Loading branch information
arinming committed Jul 13, 2024
1 parent 44a52ca commit 6ef7532
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 31 deletions.
23 changes: 12 additions & 11 deletions feature/src/main/java/com/terning/feature/intern/InternRoute.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@ import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavHostController
import com.terning.core.designsystem.component.dialog.TerningBasicDialog
import com.terning.core.designsystem.component.topappbar.BackButtonTopAppBar
Expand Down Expand Up @@ -56,9 +55,10 @@ fun InternRoute(
fun InternScreen(
modifier: Modifier = Modifier,
navController: NavHostController,
viewModel: InternViewModel = hiltViewModel(),
) {
var isScrapDialogVisible by remember { mutableStateOf(false) }
var isScrapped by remember { mutableStateOf(false) }
val state by viewModel.state.collectAsStateWithLifecycle()

val internInfoList = listOf(
stringResource(id = R.string.intern_info_d_day) to "2024년 7월 23일",
stringResource(id = R.string.intern_info_working) to "2개월",
Expand Down Expand Up @@ -101,8 +101,8 @@ fun InternScreen(
bottomBar = {
InternBottomBar(
modifier = modifier,
isScrap = isScrapped,
onScrapClick = { isScrapDialogVisible = true }
isScrap = state.isScrapped,
onScrapClick = { viewModel.updateScrapDialogVisible(true) }
)
}

Expand Down Expand Up @@ -338,15 +338,16 @@ fun InternScreen(
}
}
}
if (isScrapDialogVisible) {
if (state.isScrapDialogVisible) {
TerningBasicDialog(
onDismissRequest = {
isScrapDialogVisible = false
viewModel.updateScrapDialogVisible(false)
},
content = {
ScrapDialogContent(
onDismissRequest = { isScrapDialogVisible = false },
isScrapped = isScrapped,
onDismissRequest = {
viewModel.updateScrapDialogVisible(false)
},
internInfoList = internInfoList
)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.terning.feature.intern

import androidx.compose.ui.graphics.Color
import androidx.lifecycle.ViewModel
import com.terning.feature.intern.model.InternScrapState
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import javax.inject.Inject

@HiltViewModel
class InternViewModel @Inject constructor() : ViewModel() {
private val _state: MutableStateFlow<InternScrapState> =
MutableStateFlow(InternScrapState())

val state: StateFlow<InternScrapState> get() = _state

fun updateScrap(newScrap: Boolean) {
_state.value = _state.value.copy(isScrap = newScrap)
}

fun updateSelectColor(newColor: Color) {
_state.value = _state.value.copy(selectedColor = newColor)
}

fun updateScrapDialogVisible(visible: Boolean) {
_state.value = _state.value.copy(isScrapDialogVisible = visible)
}

fun updateScrapped(scrapped: Boolean) {
_state.value = _state.value.copy(isScrapped = scrapped)
}

fun updateColorChange(change: Boolean) {
_state.value = _state.value.copy(isColorChange = change)
}

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.terning.feature.intern.component

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
Expand All @@ -9,14 +10,13 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.terning.core.designsystem.component.button.RoundButton
import com.terning.core.designsystem.theme.Grey150
import com.terning.core.designsystem.theme.Grey350
Expand All @@ -27,14 +27,16 @@ import com.terning.core.designsystem.theme.White
import com.terning.core.extension.customShadow
import com.terning.core.extension.noRippleClickable
import com.terning.feature.R
import com.terning.feature.intern.InternViewModel

@Composable
fun InternBottomBar(
modifier: Modifier,
isScrap: Boolean,
onScrapClick: () -> Unit,
viewModel: InternViewModel = hiltViewModel(),
) {
var viewCount by remember { mutableIntStateOf(512) }
val state by viewModel.state.collectAsStateWithLifecycle()

Row(
modifier = modifier
Expand All @@ -55,6 +57,7 @@ fun InternBottomBar(
) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Center
) {
Column(
modifier = modifier.padding(end = 14.dp),
Expand All @@ -74,12 +77,13 @@ fun InternBottomBar(
.noRippleClickable {
onScrapClick()
},
tint = if (isScrap) TerningMain else Grey350
tint = if (state.isScrapped) TerningMain
else Grey350
)
Text(
text = stringResource(
id = R.string.intern_view_count_detail,
viewCount
state.viewCount
),
style = TerningTheme.typography.detail3,
color = Grey400
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
Expand All @@ -18,17 +17,18 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.terning.core.R
import com.terning.core.designsystem.component.button.RoundButton
import com.terning.core.designsystem.component.item.ColorPalette
Expand All @@ -43,16 +43,17 @@ import com.terning.core.designsystem.theme.TerningMain
import com.terning.core.designsystem.theme.TerningTheme
import com.terning.core.designsystem.theme.White
import com.terning.core.extension.noRippleClickable
import com.terning.feature.intern.InternViewModel


@Composable
fun ScrapDialogContent(
onDismissRequest: () -> Unit,
isScrapped: Boolean,
isScrapped: MutableState<Boolean> = mutableStateOf(false),
internInfoList: List<Pair<String, String>>,
viewModel: InternViewModel = hiltViewModel(),
) {
var isColorChange by remember { mutableStateOf(false) }
var selectedColor by remember { mutableStateOf(CalRed) }
val state by viewModel.state.collectAsStateWithLifecycle()

Box(
modifier = Modifier
Expand Down Expand Up @@ -144,18 +145,18 @@ fun ScrapDialogContent(
Row(
modifier = Modifier
.background(
color = if (selectedColor != CalRed) CalBlue2 else CalGreen2,
color = if (state.selectedColor != CalRed) CalBlue2 else CalGreen2,
shape = RoundedCornerShape(14.dp)
)
.noRippleClickable {
isColorChange = !isColorChange
viewModel.updateColorChange(!state.isColorChange)
},
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Start
) {
Icon(
painter = painterResource(
id = if (isColorChange) R.drawable.ic_up_22
id = if (state.isColorChange) R.drawable.ic_up_22
else R.drawable.ic_down_22
),
contentDescription = stringResource(
Expand Down Expand Up @@ -183,7 +184,7 @@ fun ScrapDialogContent(
bottom = 8.dp
)
)
if (isColorChange) {
if (state.isColorChange) {
Box(
modifier = Modifier
.fillMaxWidth()
Expand All @@ -195,7 +196,10 @@ fun ScrapDialogContent(
) {
ColorPalette(
initialColor = CalRed,
onColorSelected = { selectedColor = it })
onColorSelected = {
viewModel.updateSelectColor(it)
},
)
}
} else {
Text(
Expand All @@ -222,14 +226,17 @@ fun ScrapDialogContent(
style = TerningTheme.typography.button3,
paddingVertical = 12.dp,
cornerRadius = 8.dp,
text = if (isScrapped) {
if (isColorChange)
text = if (isScrapped.value) {
if (state.isColorChange)
R.string.dialog_content_color_button
else R.string.dialog_scrap_button
} else {
R.string.dialog_scrap_button
},
onButtonClick = { /*TODO*/ },
onButtonClick = {
viewModel.updateScrapped(!state.isScrapped)
viewModel.updateScrapDialogVisible(false)
},
modifier = Modifier.padding(bottom = 8.dp)
)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.terning.feature.intern.model

import androidx.compose.ui.graphics.Color
import com.terning.core.designsystem.theme.CalRed

data class InternScrapState(
val isScrap: Boolean = false,
val isColorChange: Boolean = false,
val selectedColor: Color = CalRed,
val isScrapDialogVisible: Boolean = false,
val isScrapped: Boolean = false,
val viewCount: Int = 0,
)

0 comments on commit 6ef7532

Please sign in to comment.