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-257] 접근 권한, 지인 피하기, 회원가입 완료 UI 구현 #29

Merged
merged 16 commits into from
Jan 11, 2025
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
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
tools:targetApi="31">
<activity
android:name="com.puzzle.presentation.MainActivity"
android:configChanges="orientation|screenSize"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.Piece">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fun PieceCheck(
}

@Composable
fun PieceCheckList(
fun PieceCheckRow(
checked: Boolean,
label: String,
onCheckedChange: () -> Unit,
Expand All @@ -59,7 +59,8 @@ fun PieceCheckList(
modifier = modifier
.height(52.dp)
.clip(RoundedCornerShape(8.dp))
.background(containerColor),
.background(containerColor)
.clickable { onCheckedChange() },
) {
PieceCheck(
checked = checked,
Expand Down Expand Up @@ -109,23 +110,23 @@ fun PreviewPieceCheck() {

@Preview
@Composable
fun PreviewPieceCheckList() {
fun PreviewPieceCheckRow() {
PieceTheme {
Column(
verticalArrangement = Arrangement.spacedBy(10.dp),
modifier = Modifier
.background(PieceTheme.colors.black)
.padding(20.dp),
) {
PieceCheckList(
PieceCheckRow(
checked = true,
label = "약관 전체 동의",
onCheckedChange = {},
containerColor = PieceTheme.colors.light3,
modifier = Modifier.fillMaxWidth(),
)

PieceCheckList(
PieceCheckRow(
checked = false,
arrowEnabled = true,
label = "약관 전체 동의",
Expand Down
32 changes: 32 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_permission_alarm.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:pathData="M24,0L24,0A24,24 0,0 1,48 24L48,24A24,24 0,0 1,24 48L24,48A24,24 0,0 1,0 24L0,24A24,24 0,0 1,24 0z"
android:fillColor="#F4F6FA"/>
<path
android:pathData="M13.333,32.2H34.667"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#1B1A2A"
android:strokeLineCap="round"/>
<path
android:pathData="M16.533,22.601C16.533,18.477 19.876,15.134 24,15.134V15.134C28.124,15.134 31.467,18.477 31.467,22.601V32.201H16.533V22.601Z"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#1B1A2A"
android:strokeLineCap="round"/>
<path
android:pathData="M24,15.133V13"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#1B1A2A"
android:strokeLineCap="round"/>
<path
android:pathData="M27.733,31.667C27.733,32.799 27.34,33.884 26.64,34.684C25.94,35.484 24.99,35.934 24,35.934C23.01,35.934 22.06,35.484 21.36,34.684C20.66,33.884 20.267,32.799 20.267,31.667"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#1B1A2A"/>
</vector>
15 changes: 15 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_permission_call.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="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:pathData="M24,0L24,0A24,24 0,0 1,48 24L48,24A24,24 0,0 1,24 48L24,48A24,24 0,0 1,0 24L0,24A24,24 0,0 1,24 0z"
android:fillColor="#F4F6FA"/>
<path
android:pathData="M33.779,29.117C33.493,31.666 32.158,32.612 31.09,32.958C30.564,33.128 29.968,33.196 29.32,33.165C28.197,33.112 26.917,32.764 25.57,32.131C23.629,31.219 21.682,29.78 20.227,28.181C18.773,26.583 17.522,24.509 16.796,22.492C16.003,20.283 15.894,18.304 16.491,16.919C16.936,15.887 18.004,14.649 20.567,14.601C20.696,14.598 20.815,14.67 20.876,14.784L23.207,19.219C23.279,19.356 23.249,19.526 23.135,19.63L20.895,21.668C21.339,22.962 22.172,24.335 23.205,25.469C24.237,26.604 25.527,27.563 26.772,28.127L29.013,26.089C29.128,25.984 29.299,25.971 29.429,26.056L33.626,28.793C33.734,28.864 33.793,28.989 33.779,29.117L33.779,29.117Z"
android:strokeLineJoin="round"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#1B1A2A"/>
</vector>
20 changes: 20 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_permission_camera.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:pathData="M24,0L24,0A24,24 0,0 1,48 24L48,24A24,24 0,0 1,24 48L24,48A24,24 0,0 1,0 24L0,24A24,24 0,0 1,24 0z"
android:fillColor="#F4F6FA"/>
<path
android:pathData="M17.713,19.391C17.965,19.391 18.202,19.272 18.353,19.071L20.616,16.053C20.616,16.053 20.616,16.053 20.616,16.053C20.623,16.044 20.635,16.038 20.647,16.038H27.351C27.363,16.038 27.375,16.044 27.382,16.053C27.382,16.053 27.382,16.053 27.382,16.053L29.645,19.071C29.796,19.272 30.033,19.391 30.285,19.391H33.218C33.673,19.391 34.109,19.571 34.43,19.893C34.752,20.214 34.932,20.65 34.932,21.105V31.162C34.932,31.617 34.752,32.053 34.43,32.374C34.109,32.696 33.673,32.876 33.218,32.876H14.78C14.325,32.876 13.889,32.696 13.568,32.374L13.005,32.937L13.568,32.374C13.246,32.053 13.066,31.617 13.066,31.162V21.105C13.066,20.65 13.246,20.214 13.568,19.893L13.002,19.327L13.568,19.893C13.889,19.571 14.325,19.391 14.78,19.391H17.713Z"
android:strokeLineJoin="round"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#1B1A2A"/>
<path
android:pathData="M24.001,29.025C26.053,29.025 27.716,27.361 27.716,25.309C27.716,23.257 26.053,21.594 24.001,21.594C21.949,21.594 20.285,23.257 20.285,25.309C20.285,27.361 21.949,29.025 24.001,29.025Z"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#1B1A2A"/>
</vector>
6 changes: 5 additions & 1 deletion core/designsystem/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--Term-->
<string name="all_term_agree">약관 전체 동의</string>
<string name="next">다음</string>
<string name="agree">동의하기</string>
<string name="all_term_agree">약관 전체 동의</string>
<string name="try_next">다음에 할래요</string>
<string name="avoid_acquaintances">아는 사람 차단하기</string>
<string name="generate_profile">프로필 생성하기</string>
<string name="avoid_acquaintances_description">연락처에 등록된 번호로 가입한 사용자는\n매칭 대상에서 제외되어, 개인정보가 보호됩니다.</string>

<!--Matching-->
<string name="matching_title">Matching</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sealed class AuthGraphDest : Route {
data object VerificationRoute : AuthGraphDest()

@Serializable
data object RegistrationRoute : AuthGraphDest()
data object SignUpRoute : AuthGraphDest()
}

@Serializable
Expand Down
1 change: 1 addition & 0 deletions core/network/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import java.util.Properties
plugins {
id("piece.android.library")
id("piece.android.hilt")
alias(libs.plugins.kotlin.serialization)
}

android {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import com.puzzle.network.model.UNKNOWN_STRING
import kotlinx.serialization.Serializable
import java.time.LocalDateTime

@Suppress("PLUGIN_IS_NOT_ENABLED")
@Serializable
data class LoadTermsResponse(
val responses: List<TermResponse>?,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ fun LoginScreen(
.clickable {
navigate(
NavigationEvent.NavigateTo(
route = AuthGraphDest.RegistrationRoute,
route = AuthGraphDest.SignUpRoute,
popUpTo = AuthGraph,
)
)
Expand Down

This file was deleted.

Loading
Loading