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-207] 매칭 상세 보기 Value Talk Ui 구현 #15

Merged
merged 10 commits into from
Dec 30, 2024
4 changes: 4 additions & 0 deletions app/src/main/java/com/puzzle/piece/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels
import androidx.compose.runtime.LaunchedEffect
import androidx.core.view.WindowCompat
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.repeatOnLifecycle
import androidx.navigation.NavController
Expand All @@ -26,6 +27,9 @@ class MainActivity : ComponentActivity() {
super.onCreate(savedInstanceState)
enableEdgeToEdge()

// TODO(재확인 필요)
WindowCompat.setDecorFitsSystemWindows(window, true)

sksowk156 marked this conversation as resolved.
Show resolved Hide resolved
setContent {
viewModel.apply {
val appState = rememberAppState()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ data class PieceTypography(
val bodySSB: TextStyle = TextStyle(
fontFamily = PretendardSemiBold,
fontSize = 14.sp,
lineHeight = 18.sp,
lineHeight = 20.sp,
),
val bodySM: TextStyle = TextStyle(
fontFamily = PretendardMedium,
fontSize = 14.sp,
lineHeight = 18.sp,
lineHeight = 20.sp,
),
Comment on lines 74 to 83
Copy link
Member

Choose a reason for hiding this comment

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

👍

val captionM: TextStyle = TextStyle(
fontFamily = PretendardMedium,
Expand Down
26 changes: 26 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_left_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="M25.999,17.467L17.466,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>
22 changes: 22 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_profile_image_temp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<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.409,0a25.409,25.409 0,1 1,50.818 0a25.409,25.409 0,1 1,-50.818 0"
android:strokeWidth="1.18182"
android:fillColor="#ffffff"
android:strokeColor="#6F00FB"/>
<group>
<clip-path
android:pathData="M22.46,14.333C22.46,13.67 22.997,13.133 23.66,13.133H28.323C28.986,13.133 29.523,13.67 29.523,14.333C29.523,14.995 28.986,15.533 28.323,15.533H23.66C22.997,15.533 22.46,14.995 22.46,14.333ZM20.196,14.314C20.216,14.976 19.695,15.53 19.033,15.55C17.891,15.584 17.415,15.675 17.076,15.849L17.063,15.855C16.549,16.112 16.121,16.542 15.831,17.096C15.657,17.434 15.567,17.911 15.533,19.05C15.513,19.712 14.96,20.233 14.297,20.213C13.635,20.193 13.114,19.639 13.134,18.977C13.168,17.84 13.251,16.865 13.698,15.995L13.702,15.988C14.205,15.025 14.983,14.214 15.984,13.712C16.853,13.267 17.826,13.185 18.96,13.151C19.623,13.131 20.176,13.651 20.196,14.314ZM31.787,14.314C31.807,13.651 32.36,13.131 33.023,13.151C34.157,13.185 35.13,13.267 35.999,13.712C37,14.214 37.778,15.025 38.281,15.988L38.285,15.995C38.732,16.865 38.814,17.84 38.849,18.977C38.869,19.639 38.348,20.193 37.686,20.213C37.023,20.233 36.47,19.712 36.45,19.05C36.416,17.911 36.325,17.434 36.152,17.096C35.862,16.542 35.434,16.112 34.919,15.855L34.907,15.849C34.568,15.675 34.092,15.584 32.95,15.55C32.287,15.53 31.767,14.976 31.787,14.314ZM14.333,22.459C14.996,22.459 15.533,22.997 15.533,23.659V28.322C15.533,28.985 14.996,29.522 14.333,29.522C13.671,29.522 13.133,28.985 13.133,28.322V23.659C13.133,22.997 13.671,22.459 14.333,22.459ZM37.649,22.459C38.312,22.459 38.849,22.997 38.849,23.659V28.322C38.849,28.985 38.312,29.522 37.649,29.522C36.987,29.522 36.449,28.985 36.449,28.322V23.659C36.449,22.997 36.987,22.459 37.649,22.459ZM37.703,31.786C38.366,31.806 38.886,32.36 38.866,33.022C38.832,34.159 38.75,35.134 38.302,36.004L38.298,36.011C37.795,36.974 37.017,37.785 36.016,38.287C35.147,38.732 34.174,38.814 33.04,38.848C32.377,38.868 31.824,38.348 31.804,37.685C31.784,37.023 32.305,36.469 32.967,36.449C34.11,36.415 34.585,36.324 34.924,36.15L34.937,36.144C35.451,35.886 35.879,35.457 36.169,34.903C36.343,34.564 36.433,34.088 36.467,32.949C36.487,32.287 37.041,31.766 37.703,31.786ZM14.297,31.803C14.96,31.783 15.513,32.304 15.533,32.966C15.568,34.109 15.658,34.585 15.832,34.924L15.839,34.936C16.096,35.45 16.525,35.879 17.079,36.169C17.418,36.342 17.894,36.432 19.033,36.467C19.695,36.487 20.216,37.04 20.196,37.702C20.176,38.365 19.623,38.886 18.96,38.866C17.823,38.831 16.848,38.749 15.978,38.301L15.971,38.298C15.009,37.795 14.197,37.016 13.695,36.015C13.25,35.147 13.168,34.174 13.134,33.039C13.114,32.377 13.635,31.823 14.297,31.803ZM22.46,37.649C22.46,36.986 22.997,36.449 23.66,36.449H28.323C28.986,36.449 29.523,36.986 29.523,37.649C29.523,38.312 28.986,38.849 28.323,38.849H23.66C22.997,38.849 22.46,38.312 22.46,37.649Z"/>
<path
android:pathData="M10,10h32v32h-32z"
android:fillColor="#6F00FB"/>
</group>
</group>
</vector>
24 changes: 24 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_puzzle1.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="60dp"
android:height="60dp"
android:viewportWidth="60"
android:viewportHeight="60">
<path android:pathData="M10.994,24.308C10.993,24.311 10.989,24.312 10.987,24.31C10.18,23.639 9.221,23.25 8.192,23.25C5.325,23.25 3,26.272 3,30C3,33.728 5.325,36.75 8.192,36.75C9.221,36.75 10.18,36.361 10.987,35.69C10.989,35.688 10.993,35.689 10.994,35.692C10.995,35.695 10.999,35.695 11.002,35.693C11.032,35.662 11.063,35.63 11.093,35.599C11.303,35.415 11.501,35.212 11.688,34.992C12.03,34.668 12.376,34.428 12.785,34.423C13.167,34.418 13.385,34.813 13.385,35.195V47C13.385,47.552 13.832,48 14.385,48H22.882C23.729,48 24.248,46.951 23.998,46.141C23.849,45.659 23.769,45.151 23.769,44.625C23.769,41.519 26.559,39 30,39C33.441,39 36.231,41.519 36.231,44.625C36.231,45.151 36.151,45.659 36.002,46.141C35.752,46.951 36.271,48 37.118,48H45.615C46.168,48 46.615,47.552 46.615,47V35.195C46.615,34.813 46.833,34.418 47.215,34.423C47.624,34.428 47.97,34.668 48.313,34.992C48.499,35.212 48.697,35.415 48.907,35.599C48.937,35.63 48.968,35.662 48.999,35.693C49.001,35.695 49.005,35.695 49.006,35.692C49.007,35.689 49.011,35.688 49.013,35.69C49.82,36.361 50.779,36.75 51.808,36.75C54.675,36.75 57,33.728 57,30C57,26.272 54.675,23.25 51.808,23.25C50.779,23.25 49.82,23.639 49.013,24.31C49.011,24.312 49.007,24.311 49.006,24.308C49.005,24.306 49.001,24.305 48.999,24.307C48.968,24.338 48.937,24.37 48.907,24.401C48.697,24.585 48.499,24.788 48.313,25.008C47.97,25.332 47.624,25.572 47.215,25.577C46.833,25.582 46.615,25.187 46.615,24.805V13C46.615,12.448 46.168,12 45.615,12H37.118C36.27,12 35.751,13.05 36.002,13.859C36.151,14.342 36.231,14.85 36.231,15.375C36.231,18.482 33.441,21 30,21C26.559,21 23.769,18.482 23.769,15.375C23.769,14.85 23.849,14.342 23.998,13.859C24.249,13.05 23.73,12 22.882,12H14.385C13.832,12 13.385,12.448 13.385,13V24.805C13.385,25.187 13.167,25.582 12.785,25.577C12.376,25.572 12.03,25.332 11.688,25.008C11.501,24.788 11.303,24.585 11.093,24.401C11.063,24.37 11.032,24.338 11.002,24.307C10.999,24.305 10.995,24.306 10.994,24.308Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="3"
android:startY="47.1"
android:endX="57"
android:endY="12.9"
android:type="linear">
<item
android:offset="0"
android:color="#FFC4B9FF" />
<item
android:offset="1"
android:color="#FF7B42FF" />
</gradient>
</aapt:attr>
</path>
</vector>
24 changes: 24 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_puzzle2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="60dp"
android:height="60dp"
android:viewportWidth="60"
android:viewportHeight="60">
<path android:pathData="M52,33.368C52,33.368 52,31.225 52,31.225C52,30.909 52,30.507 52,30C52,29.281 52,28.766 52,28.401C52,28.401 52,26.799 52,26.799C52,26.179 52,26.153 52,25.428L52,13C52,12.448 51.552,12 51,12L42.503,12C41.655,12 41.136,13.05 41.387,13.859C41.536,14.341 41.615,14.849 41.615,15.375C41.615,18.481 38.826,21 35.385,21C31.943,21 29.154,18.481 29.154,15.375C29.154,14.849 29.233,14.341 29.383,13.859C29.633,13.05 29.114,12 28.267,12L19.769,12C19.217,12 18.769,12.448 18.769,13L18.769,24.805C18.769,25.187 18.551,25.582 18.17,25.577C17.76,25.572 17.415,25.332 17.072,25.008C16.886,24.788 16.687,24.585 16.478,24.401C16.448,24.37 16.417,24.338 16.386,24.307C16.384,24.305 16.38,24.305 16.378,24.308C16.377,24.311 16.374,24.312 16.371,24.31C15.564,23.639 14.606,23.25 13.577,23.25C10.709,23.25 8.385,26.272 8.385,30C8.385,33.728 10.709,36.75 13.577,36.75C14.606,36.75 15.564,36.361 16.371,35.69C16.374,35.688 16.377,35.689 16.378,35.692C16.38,35.694 16.384,35.695 16.386,35.693C16.417,35.662 16.448,35.63 16.478,35.599C16.687,35.415 16.886,35.212 17.072,34.992C17.415,34.668 17.76,34.428 18.17,34.423C18.551,34.418 18.769,34.813 18.769,35.195L18.769,47C18.769,47.552 19.217,48 19.769,48L28.267,48C29.114,48 29.633,46.95 29.383,46.141C29.234,45.658 29.154,45.15 29.154,44.625C29.154,41.518 31.943,39 35.385,39C38.826,39 41.615,41.518 41.615,44.625C41.615,45.15 41.536,45.658 41.386,46.141C41.136,46.95 41.655,48 42.502,48L51,48C51.552,48 52,47.558 52,47.006C52,43.979 52,35.046 52,34.572C52,34 52,33.368 52,33.368Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="62.387"
android:startY="12.4"
android:endX="8.387"
android:endY="46.6"
android:type="linear">
<item
android:offset="0"
android:color="#FFC4B9FF" />
<item
android:offset="1"
android:color="#FF7B42FF" />
</gradient>
</aapt:attr>
</path>
</vector>
24 changes: 24 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_puzzle3.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="60dp"
android:height="60dp"
android:viewportWidth="60"
android:viewportHeight="60">
<path android:pathData="M33.368,52C33.368,52 31.225,52 31.225,52C30.908,52 30.506,52 30,52C29.281,52 28.765,52 28.401,52C28.401,52 26.799,52 26.799,52C26.179,52 26.153,52 25.428,52H13C12.448,52 12,51.552 12,51L12,40.37C12,37.467 12,36.454 12,36.454C12,36.454 12,34.692 12,30.399L12,19.769C12,19.217 12.448,18.769 13,18.769H24.805C25.186,18.769 25.582,18.551 25.577,18.17C25.571,17.76 25.332,17.415 25.008,17.072C24.788,16.886 24.584,16.687 24.401,16.478C24.369,16.447 24.338,16.417 24.307,16.386C24.305,16.384 24.305,16.38 24.308,16.378C24.311,16.377 24.312,16.374 24.31,16.371C23.639,15.564 23.25,14.606 23.25,13.577C23.25,10.709 26.272,8.384 30,8.384C33.728,8.384 36.75,10.709 36.75,13.577C36.75,14.606 36.361,15.564 35.69,16.371C35.688,16.374 35.689,16.377 35.691,16.378C35.694,16.38 35.695,16.384 35.693,16.386C35.661,16.417 35.63,16.447 35.599,16.478C35.415,16.687 35.212,16.886 34.992,17.072C34.668,17.415 34.428,17.76 34.423,18.17C34.418,18.551 34.813,18.769 35.195,18.769L47,18.769C47.552,18.769 48,19.217 48,19.769L48,28.267C48,29.114 46.95,29.633 46.14,29.383C45.658,29.233 45.15,29.154 44.624,29.154C41.518,29.154 38.999,31.943 38.999,35.384C38.999,38.826 41.518,41.615 44.624,41.615C45.15,41.615 45.658,41.535 46.14,41.386C46.95,41.136 48,41.655 48,42.502V51C48,51.552 47.558,52 47.006,52C43.978,52 35.046,52 34.572,52C34,52 33.368,52 33.368,52Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="12.4"
android:startY="62.387"
android:endX="46.6"
android:endY="8.387"
android:type="linear">
<item
android:offset="0"
android:color="#FFC4B9FF" />
<item
android:offset="1"
android:color="#FF7B42FF" />
</gradient>
</aapt:attr>
</path>
</vector>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.puzzle.domain.model.pick

data class ValuePickCard(
data class ValuePick(
val category: String = "",
val question: String = "",
val option1: String = "",
sksowk156 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.puzzle.domain.model.value

data class ValueTalkCard(
data class ValueTalk(
val label: String = "",
val title: String = "",
val content: String = "",
Expand Down
Loading
Loading