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
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,17 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import `in`.koreatech.koin.core.designsystem.component.dialog.ChoiceDialog
import `in`.koreatech.koin.core.designsystem.component.topbar.KoinTopAppBar
import `in`.koreatech.koin.core.designsystem.theme.KoinTheme
import `in`.koreatech.koin.feature.lostandfound.R
import `in`.koreatech.koin.feature.lostandfound.enums.LostAndFoundFilterType.AuthorFilterType.MY
import `in`.koreatech.koin.feature.lostandfound.enums.LostOrFoundType
import `in`.koreatech.koin.feature.lostandfound.ui.list.component.ItemSearchTextField
import `in`.koreatech.koin.feature.lostandfound.ui.list.component.ListColumn
import `in`.koreatech.koin.feature.lostandfound.ui.list.component.LoginDialog
import `in`.koreatech.koin.feature.lostandfound.ui.list.component.LostAndFoundChip
import `in`.koreatech.koin.feature.lostandfound.ui.list.component.LostAndFoundFAB
import `in`.koreatech.koin.feature.lostandfound.ui.list.component.LostAndFoundFABBottomSheet
Expand Down Expand Up @@ -58,7 +56,7 @@ fun LostAndFoundList(
selectedFoundType = uiState.foundFilterType,
onApply = { first, second, third, fourth ->
if (!uiState.isLoggedIn && first == MY) {
viewModel.setShowLoginDialog(true)
viewModel.setShowFilterLoginDialog(true)
} else {
viewModel.setSearchFilter(
authorFilterType = first,
Expand Down Expand Up @@ -86,21 +84,31 @@ fun LostAndFoundList(
)
}

if (uiState.showLoginDialog) {
ChoiceDialog(
if (uiState.showFilterLoginDialog) {
LoginDialog(
title = stringResource(id = R.string.lost_and_found_my_filter_can_use_logged_in),
description = stringResource(id = R.string.lost_and_found_my_filter_can_use_logged_in_description),
positiveButtonText = stringResource(id = R.string.lost_and_found_my_filter_can_use_logged_in_positive),
negativeButtonText = stringResource(id = R.string.lost_and_found_my_filter_can_use_logged_in_negative),
onPositive = {
navigateToLogin()
viewModel.setShowLoginDialog(false)
viewModel.setShowFilterLoginDialog(false)
},
onNegative = {
viewModel.setShowLoginDialog(false)
viewModel.setShowFilterLoginDialog(false)
}
)
}

if (uiState.showWriteLoginDialog) {
LoginDialog(
title = stringResource(id = R.string.request_login_dialog_title),
description = stringResource(id = R.string.request_login_dialog_description),
onPositive = {
navigateToLogin()
viewModel.setShowWriteLoginDialog(false)
},
titleStyle = KoinTheme.typography.medium18.copy(color = KoinTheme.colors.neutral600, textAlign = TextAlign.Center),
descriptionStyle = KoinTheme.typography.regular14.copy(color = Color(0xFF8E8E8E))
onNegative = {
viewModel.setShowWriteLoginDialog(false)
}
)
}

Expand All @@ -115,7 +123,11 @@ fun LostAndFoundList(
floatingActionButton = {
LostAndFoundFAB(
onClick = {
viewModel.setShowWriteBottomSheet(true)
if (uiState.isLoggedIn) {
viewModel.setShowWriteBottomSheet(true)
} else {
viewModel.setShowWriteLoginDialog(true)
}
}
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import kotlinx.parcelize.Parcelize
data class LostAndFoundListState(
val isLoading: Boolean = false,
val isLoggedIn: Boolean = false,
val showLoginDialog: Boolean = false,
val showFilterLoginDialog: Boolean = false,
val showWriteLoginDialog: Boolean = false,
Comment on lines +15 to +16
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

나중에 Dialog State를 sealed class로 만들어도 좋을 것 같네요

val isFirstPageLoading: Boolean = false,
val showFilterBottomSheet: Boolean = false,
val showWriteBottomSheet: Boolean = false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,18 @@ class LostAndFoundListViewModel @Inject constructor(
}
}

fun setShowLoginDialog(show: Boolean) = intent {
fun setShowFilterLoginDialog(show: Boolean) = intent {
reduce {
state.copy(
showLoginDialog = show
showFilterLoginDialog = show
)
}
}

fun setShowWriteLoginDialog(show: Boolean) = intent {
reduce {
state.copy(
showWriteLoginDialog = show
)
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package `in`.koreatech.koin.feature.lostandfound.ui.list.component

import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import `in`.koreatech.koin.core.designsystem.component.dialog.ChoiceDialog
import `in`.koreatech.koin.core.designsystem.theme.KoinTheme
import `in`.koreatech.koin.feature.lostandfound.R

@Composable
fun LoginDialog(
title: String,
description: String,
modifier: Modifier = Modifier,
onPositive: () -> Unit = {},
onNegative: () -> Unit = {}
) {
ChoiceDialog(
modifier = modifier,
title = title,
description = description,
positiveButtonText = stringResource(id = R.string.lost_and_found_my_filter_can_use_logged_in_positive),
negativeButtonText = stringResource(id = R.string.lost_and_found_my_filter_can_use_logged_in_negative),
onPositive = onPositive,
onNegative = onNegative,
titleStyle = KoinTheme.typography.medium18.copy(color = KoinTheme.colors.neutral600, textAlign = TextAlign.Center),
descriptionStyle = KoinTheme.typography.regular14.copy(color = Color(0xFF8E8E8E))
)
}