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
67 changes: 67 additions & 0 deletions core/ui/src/main/java/com/yapp/ndgl/core/ui/CommonErrorView.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package com.yapp.ndgl.core.ui

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
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.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.yapp.ndgl.core.ui.theme.NDGLTheme

@Composable
fun CommonErrorView(
modifier: Modifier = Modifier,
title: String? = null,
description: String? = null,
) {
Column(
modifier = modifier
.fillMaxWidth()
.padding(horizontal = 24.dp, vertical = 165.dp),
verticalArrangement = Arrangement.spacedBy(16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
) {
Image(
painter = painterResource(R.drawable.img_empty_browser),
contentDescription = null,
modifier = Modifier.size(100.dp),
)
Column(
modifier = Modifier.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(4.dp),
horizontalAlignment = Alignment.CenterHorizontally,
) {
Text(
text = title ?: stringResource(R.string.common_error_title),
color = NDGLTheme.colors.black500,
textAlign = TextAlign.Center,
style = NDGLTheme.typography.subtitleMdSemiBold,
)
Text(
text = description ?: stringResource(R.string.common_error_description),
color = NDGLTheme.colors.black400,
textAlign = TextAlign.Center,
style = NDGLTheme.typography.bodyLgRegular,
)
}
}
}

@Preview(showBackground = true)
@Composable
private fun CommonErrorViewPreview() {
NDGLTheme {
CommonErrorView(
modifier = Modifier,
)
}
}
3 changes: 3 additions & 0 deletions core/ui/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
<string name="common_dot_separator">•</string>
<string name="common_retry">다시 시도</string>
<string name="common_all">전체</string>
<string name="common_err_unknown">알 수 없는 오류입니다</string>
<string name="common_error_title">정보를 불러올 수 없어요</string>
<string name="common_error_description">인터넷 연결 확인 후 다시 시도해 주세요</string>

<!-- User Guide Modal -->
<string name="user_guide_modal_title">서비스 이용 전\n반드시 확인해주세요.</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@ import javax.inject.Singleton
class TravelTemplateRepository @Inject constructor(
private val travelTemplateApi: TravelTemplateApi,
) {
suspend fun getAllPopularTravelTemplates(): PopularTravelTemplates {
return travelTemplateApi.getPopularTravelTemplates().getData()
suspend fun getAllPopularTravelTemplates(page: Int = 0): PopularTravelTemplates {
return travelTemplateApi.getPopularTravelTemplates(page = page).getData()
}

suspend fun getPopularTravelTemplates(travelProgramId: Long): PopularTravelTemplates {
suspend fun getPopularTravelTemplates(travelProgramId: Long, page: Int = 0): PopularTravelTemplates {
return travelTemplateApi.getPopularTravelTemplates(
travelProgramId = travelProgramId,
page = page,
).getData()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.yapp.ndgl.feature.home.popular

import androidx.compose.runtime.Immutable
import androidx.compose.runtime.Stable
import com.yapp.ndgl.core.base.UiIntent
import com.yapp.ndgl.core.base.UiSideEffect
import com.yapp.ndgl.core.base.UiState
Expand All @@ -9,32 +10,50 @@ import com.yapp.ndgl.feature.home.model.TravelProgramTab
import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.ImmutableMap
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.persistentMapOf

@Immutable
data class PopularTravelListState(
val travelProgramTabs: ImmutableList<TravelProgramTab> = persistentListOf(),
val selectedTabIndex: Int = 0,
val allPopularTravels: ImmutableList<TravelContent> = persistentListOf(),
val popularTravelsByProgram: ImmutableMap<Long, ImmutableList<TravelContent>> = persistentMapOf(),
) : UiState {
val selectedProgramTravels: ImmutableList<TravelContent> by lazy {
val selectTab = travelProgramTabs.getOrElse(selectedTabIndex) { TravelProgramTab.All }

when (selectTab) {
TravelProgramTab.All -> allPopularTravels
is TravelProgramTab.Custom -> popularTravelsByProgram.getOrDefault(
selectTab.programId,
persistentListOf(),
)

@Stable
sealed class PopularTravelListState : UiState {
data object Loading : PopularTravelListState()

@Immutable
data class Success(
val travelProgramTabs: ImmutableList<TravelProgramTab>,
val allPopularTravels: ImmutableList<PopularTravelListItem>,
val popularTravelsByProgram: ImmutableMap<Long, ImmutableList<PopularTravelListItem>>,
val selectedTabIndex: Int = 0,
) : PopularTravelListState() {
val selectedProgramTravels: ImmutableList<PopularTravelListItem> by lazy {
val selectTab = travelProgramTabs.getOrElse(selectedTabIndex) { TravelProgramTab.All }

when (selectTab) {
TravelProgramTab.All -> allPopularTravels
is TravelProgramTab.Custom -> popularTravelsByProgram.getOrDefault(
selectTab.programId,
persistentListOf(),
)
}
}

sealed interface PopularTravelListItem {
data class Travel(
val travelContent: TravelContent,
) : PopularTravelListItem

data class Loading(
val nextPage: Int,
) : PopularTravelListItem
}
}

data object Error : PopularTravelListState()
}

sealed interface PopularTravelListIntent : UiIntent {
data object ClickSearchTravelTemplate : PopularTravelListIntent
data class SelectPopularTravelTab(val index: Int) : PopularTravelListIntent
data class ClickTravel(val travelId: Long, val days: Int) : PopularTravelListIntent
data class LoadMore(val nextPage: Int) : PopularTravelListIntent
data object ClickRetry : PopularTravelListIntent
}

sealed interface PopularTravelListSideEffect : UiSideEffect {
Expand All @@ -43,4 +62,10 @@ sealed interface PopularTravelListSideEffect : UiSideEffect {
val travelId: Long,
val days: Int,
) : PopularTravelListSideEffect

data class ShowSnackBar(val type: Type) : PopularTravelListSideEffect {
enum class Type {
ERR_UNKNOWN,
}
}
}
Loading