Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PC-190] 매칭 상세 Basic Info Page 디자인 구현 #14

Merged
merged 18 commits into from
Dec 28, 2024
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 @@ -3,6 +3,7 @@ package com.puzzle.designsystem.component
import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
Expand Down Expand Up @@ -71,6 +72,56 @@ fun PieceSubTopBar(
}
}

@Composable
fun PieceSubBackTopBar(
title: String,
onBackClick: () -> Unit,
modifier: Modifier = Modifier,
) {
Box(modifier = modifier.fillMaxWidth()) {
Image(
painter = painterResource(R.drawable.ic_arrow_left),
contentDescription = "뒤로 가기 버튼",
modifier = Modifier
.size(32.dp)
.clickable { onBackClick() }
.align(Alignment.CenterStart),
)

Text(
text = title,
style = PieceTheme.typography.headingSM,
color = PieceTheme.colors.black,
modifier = Modifier.align(Alignment.Center),
)
}
}

@Composable
fun PieceSubCloseTopBar(
title: String,
onCloseClick: () -> Unit,
modifier: Modifier = Modifier,
) {
Box(modifier = modifier.fillMaxWidth()) {
Text(
text = title,
style = PieceTheme.typography.headingSM,
color = PieceTheme.colors.black,
modifier = Modifier.align(Alignment.Center),
)

Image(
painter = painterResource(R.drawable.ic_close),
contentDescription = "오른쪽 버튼",
modifier = Modifier
.size(32.dp)
.clickable { onCloseClick() }
.align(Alignment.CenterEnd),
)
}
}

@Preview
@Composable
fun PreviewPieceMainTopBar() {
Expand Down Expand Up @@ -125,4 +176,32 @@ fun PreviewPieceSubTopBar() {
.padding(vertical = 20.dp),
)
}
}

@Preview
@Composable
fun PreviewPieceSubBackTopBar() {
PieceTheme {
PieceSubBackTopBar(
title = "Page Name",
onBackClick = { },
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 20.dp),
)
}
}

@Preview
@Composable
fun PreviewPieceSubCloseTopBar() {
PieceTheme {
PieceSubCloseTopBar(
title = "Page Name",
onCloseClick = { },
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 20.dp),
)
}
}
28 changes: 28 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_left_disable.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="52dp"
android:viewportWidth="52"
android:viewportHeight="52">
<group>
<clip-path
android:pathData="M0,0h52v52h-52z"/>
<path
android:pathData="M26,26m-25.4,0a25.4,25.4 0,1 1,50.8 0a25.4,25.4 0,1 1,-50.8 0"
android:strokeWidth="1.2"
android:fillColor="#CBD1D9"
android:strokeColor="#CBD1D9"/>
<path
android:pathData="M25.999,17.467L17.465,26L25.999,34.533"
android:strokeLineJoin="round"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#ffffff"
android:strokeLineCap="round"/>
<path
android:pathData="M17.467,26L34.533,26"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#ffffff"
android:strokeLineCap="round"/>
</group>
</vector>
15 changes: 15 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_more.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:pathData="M16,9.6m-1.6,0a1.6,1.6 0,1 1,3.2 0a1.6,1.6 0,1 1,-3.2 0"
android:fillColor="#1B1A2A"/>
<path
android:pathData="M15.999,16m-1.6,0a1.6,1.6 0,1 1,3.2 0a1.6,1.6 0,1 1,-3.2 0"
android:fillColor="#1B1A2A"/>
<path
android:pathData="M15.999,22.4m-1.6,0a1.6,1.6 0,1 1,3.2 0a1.6,1.6 0,1 1,-3.2 0"
android:fillColor="#1B1A2A"/>
</vector>
26 changes: 26 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_right_able.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="52dp"
android:viewportWidth="52"
android:viewportHeight="52">
<group>
<clip-path
android:pathData="M0,0h52v52h-52z"/>
<path
android:pathData="M26,26m-26,0a26,26 0,1 1,52 0a26,26 0,1 1,-52 0"
android:fillColor="#6F00FB"/>
<path
android:pathData="M26,17.467L34.533,26L26,34.533"
android:strokeLineJoin="round"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#ffffff"
android:strokeLineCap="round"/>
<path
android:pathData="M34.532,26L17.465,26"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#ffffff"
android:strokeLineCap="round"/>
</group>
</vector>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions core/domain/src/main/java/com/puzzle/domain/MyClass.kt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.puzzle.domain.model.pick

data class ValuePickCard(
val category: String = "",
val question: String = "",
val option1: String = "",
val option2: String = "",
val isSimilarToMe: Boolean = true,
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.puzzle.domain.model.value

data class ValueTalkCard(
val label: String = "",
val title: String = "",
val content: String = "",
)
Loading
Loading