Skip to content

Commit

Permalink
feat: 찜한 정책 화면 구성
Browse files Browse the repository at this point in the history
  • Loading branch information
@rhkrwngud445
rhkrwngud445 committed Jul 16, 2024
1 parent 61811eb commit ff1ff14
Show file tree
Hide file tree
Showing 4 changed files with 259 additions and 10 deletions.
5 changes: 4 additions & 1 deletion app/src/main/java/com/withpeace/withpeace/navigation/NavHost.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,10 @@ fun WithpeaceNavHost(
},
)
policyBookmarksNavGraph(
onShowSnackBar = { onShowSnackBar(SnackbarState(it)) }
onShowSnackBar = { onShowSnackBar(SnackbarState(it)) },
onClickBackButton = {
navController.popBackStack()
}
)
}
postDetailGraph(
Expand Down
223 changes: 215 additions & 8 deletions ...ks/src/main/java/com/withpeace/withpeace/feature/policybookmarks/PolicyBookmarksScreen.kt
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,236 @@
package com.withpeace.withpeace.feature.policybookmarks

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Card
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.constraintlayout.compose.ConstraintLayout
import androidx.constraintlayout.compose.Dimension
import com.withpeace.withpeace.core.designsystem.theme.WithpeaceTheme
import com.withpeace.withpeace.core.designsystem.ui.WithPeaceBackButtonTopAppBar
import com.withpeace.withpeace.core.designsystem.util.dropShadow
import com.withpeace.withpeace.core.ui.bookmark.BookmarkButton
import com.withpeace.withpeace.core.ui.policy.ClassificationUiModel
import com.withpeace.withpeace.core.ui.policy.RegionUiModel
import com.withpeace.withpeace.feature.policybookmarks.uistate.YouthPolicyUiModel

@Composable
fun PolicyBookmarksRoute(
onShowSnackBar: (message: String) -> Unit,
onClickBackButton: () -> Unit,
) {
PolicyBookmarksScreen()
PolicyBookmarksScreen(onClickBackButton = onClickBackButton)
}

@Composable
fun PolicyBookmarksScreen() {
WithPeaceBackButtonTopAppBar(
onClickBackButton = { },
title = { Text(text = "내가 찜한 정책") },
actions = { BookmarkButton() },
)
fun PolicyBookmarksScreen(
modifier: Modifier = Modifier,
onClickBackButton: () -> Unit,
) {
Column(modifier = modifier.fillMaxSize()) {
WithPeaceBackButtonTopAppBar(
onClickBackButton = {
onClickBackButton()
},
title = {
Text(
text = "내가 찜한 정책",
style = WithpeaceTheme.typography.title1,
color = WithpeaceTheme.colors.SnackbarBlack,
)
},
)

Column(
modifier = modifier
.fillMaxSize()
.background(Color(0xFFF8F9FB))
.padding(horizontal = 24.dp)
) {
Spacer(modifier = modifier.height(8.dp))
LazyColumn(contentPadding = PaddingValues(bottom = 8.dp)) {
items(20) {
Spacer(modifier = modifier.height(8.dp))
YouthPolicyCard(
youthPolicy = YouthPolicyUiModel(
id = "conubia",
title = "reprehendunt",
content = "sem",
region = RegionUiModel.대구,
ageInfo = "consetetur",
classification = ClassificationUiModel.JOB,
),
onPolicyClick = {},
)
}
}
}
}
}

@Composable
private fun YouthPolicyCard(
modifier: Modifier = Modifier,
youthPolicy: YouthPolicyUiModel,
onPolicyClick: (String) -> Unit,
) {
Card(
modifier = modifier
.fillMaxWidth()
.background(
color = WithpeaceTheme.colors.SystemWhite,
shape = RoundedCornerShape(size = 10.dp),
)
.dropShadow(
color = Color(0x1A000000),
blurRadius = 4.dp,
spreadRadius = 2.dp,
borderRadius = 10.dp,
)
.clickable {
onPolicyClick(youthPolicy.id)
},
) {
ConstraintLayout(
modifier = modifier
.fillMaxWidth()
.background(WithpeaceTheme.colors.SystemWhite)
.padding(16.dp),
) {
val (
title, content,
region, ageRange, thumbnail, heart,
) = createRefs()

Text(
text = youthPolicy.title,
modifier.constrainAs(
title,
constrainBlock = {
top.linkTo(parent.top)
start.linkTo(parent.start)
end.linkTo(thumbnail.start, margin = 8.dp)
width = Dimension.fillToConstraints
},
),
color = WithpeaceTheme.colors.SystemBlack,
style = WithpeaceTheme.typography.homePolicyTitle,
overflow = TextOverflow.Ellipsis,
maxLines = 1,
)
Text(
text = youthPolicy.content,
modifier = modifier
.constrainAs(
content,
constrainBlock = {
top.linkTo(title.bottom, margin = 8.dp)
start.linkTo(parent.start)
end.linkTo(thumbnail.start, margin = 8.dp)
width = Dimension.fillToConstraints
},
),
color = WithpeaceTheme.colors.SystemBlack,
style = WithpeaceTheme.typography.homePolicyContent,
overflow = TextOverflow.Ellipsis,
maxLines = 2,
)
BookmarkButton(
modifier = modifier.constrainAs(
heart,
) {
top.linkTo(content.bottom, margin = 8.dp)
start.linkTo(parent.start)
bottom.linkTo(parent.bottom)
},
)

Text(
text = youthPolicy.region.name,
color = WithpeaceTheme.colors.MainPurple,
modifier = modifier
.constrainAs(
region,
constrainBlock = {
top.linkTo(heart.top)
start.linkTo(heart.end, margin = 8.dp)
bottom.linkTo(heart.bottom)
},
)
.background(
color = WithpeaceTheme.colors.SubPurple,
shape = RoundedCornerShape(size = 5.dp),
)
.padding(horizontal = 8.dp, vertical = 4.dp),
style = WithpeaceTheme.typography.homePolicyTag,
)

Text(
text = youthPolicy.ageInfo,
color = WithpeaceTheme.colors.SystemGray1,
modifier = modifier
.constrainAs(
ageRange,
constrainBlock = {
top.linkTo(region.top)
start.linkTo(region.end, margin = 8.dp)
bottom.linkTo(region.bottom)
},
)
.background(
color = WithpeaceTheme.colors.SystemGray3,
shape = RoundedCornerShape(size = 5.dp),
)
.padding(horizontal = 8.dp, vertical = 4.dp),
style = WithpeaceTheme.typography.homePolicyTag,
)


Image(
modifier = modifier
.size(57.dp)
.clip(RoundedCornerShape(10.dp))
.constrainAs(
ref = thumbnail,
constrainBlock = {
start.linkTo(title.end)
end.linkTo(parent.end)
top.linkTo(parent.top)
},
),
painter = painterResource(id = youthPolicy.classification.drawableResId),
contentDescription = stringResource(id = youthPolicy.classification.stringResId),
)
}
}
}

@Composable
@Preview(showBackground = true)
fun PolicyBookmarksPreview() {
PolicyBookmarksScreen()
PolicyBookmarksScreen(
onClickBackButton = {

},
)
}
3 changes: 2 additions & 1 deletion ...a/com/withpeace/withpeace/feature/policybookmarks/navigation/PolicyBookmarksNavigation.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavController
import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavOptions
Expand All @@ -13,10 +12,12 @@ fun NavController.navigatePolicyBookmarks(navOptions: NavOptions? = null) {

fun NavGraphBuilder.policyBookmarksNavGraph(
onShowSnackBar: (message: String) -> Unit,
onClickBackButton: () -> Unit,
) {
composable(route = POLICY_BOOKMARKS_ROUTE) {
PolicyBookmarksRoute(
onShowSnackBar = onShowSnackBar,
onClickBackButton = onClickBackButton,
)
}
}
38 changes: 38 additions & 0 deletions ...c/main/java/com/withpeace/withpeace/feature/policybookmarks/uistate/YouthPolicyUiModel.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.withpeace.withpeace.feature.policybookmarks.uistate

import com.withpeace.withpeace.core.domain.model.policy.YouthPolicy
import com.withpeace.withpeace.core.ui.policy.ClassificationUiModel
import com.withpeace.withpeace.core.ui.policy.RegionUiModel
import com.withpeace.withpeace.core.ui.policy.toDomain
import com.withpeace.withpeace.core.ui.policy.toUiModel

data class YouthPolicyUiModel(
val id: String,
val title: String,
val content: String,
val region: RegionUiModel,
val ageInfo: String,
val classification: ClassificationUiModel,
)

fun YouthPolicy.toUiModel(): YouthPolicyUiModel {
return YouthPolicyUiModel(
id = id,
title = title,
content = introduce,
region = region.toUiModel(),
ageInfo = ageInfo,
classification = policyClassification.toUiModel(),
)
}

fun YouthPolicyUiModel.toDomain(): YouthPolicy {
return YouthPolicy(
id = id,
title = title,
introduce = content,
region = region.toDomain(),
policyClassification = classification.toDomain(),
ageInfo = ageInfo,
)
}

0 comments on commit ff1ff14

Please sign in to comment.