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.

Sign up for GitHub

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

Jump to bottom

[ Feature ] : YAPP 유저 식별을 위한 암호페이지 구현 #301

Merged
merged 14 commits into from
Jul 23, 2023
Merged

[ Feature ] : YAPP 유저 식별을 위한 암호페이지 구현 #301

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
498f271
feat: Remote Config에서 Password 가져오는 dataSource 구현
EvergreenTree97 Jul 21, 2023
dbfa0ba
feat: Password를 검증하여 성공 실패를 나누는 유스케이스 작성
EvergreenTree97 Jul 21, 2023
6655224
refactor: Keyboard Visiblity 상태를 compose State로 제공하도록 변경
EvergreenTree97 Jul 21, 2023
c28cfab
refactor: 이름 작성 화면도 rememberKeyboardVisibillity를 사용하도록 변경
EvergreenTree97 Jul 21, 2023
9d7b104
feat: strings, drawable 리소스 추가
EvergreenTree97 Jul 21, 2023
86fe963
feat: 암호 화면 및 로직 구현
EvergreenTree97 Jul 21, 2023
c92798a
feat: 로그인 후 Navigate하고, 회원가입 플로우로 들어가도록 구현
EvergreenTree97 Jul 21, 2023
659cc8e
fix : keyboardoptions, keboardactions 매개변수에 제공 @TaeseongYun
EvergreenTree97 Jul 22, 2023
48830c8
fix: duplicate keyboard hide effect
EvergreenTree97 Jul 22, 2023
c80cc6c
fix: Back Button 클릭 시 로그인 화면으로 돌아가도록 변경
EvergreenTree97 Jul 22, 2023
8e92b6f
fix: wrong space
EvergreenTree97 Jul 23, 2023
95dd41b
fix: wrong space
EvergreenTree97 Jul 23, 2023
61eb2f2
refactor : @hoyahozz 리뷰 반영
EvergreenTree97 Jul 23, 2023
0483a7f
Merge branch 'feature/signup-password' of https://github.com/YAPP-adm…
EvergreenTree97 Jul 23, 2023
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
40 changes: 40 additions & 0 deletions common/src/main/java/com/yapp/common/util/Keyboard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package com.yapp.common.util

import android.graphics.Rect
import android.view.View
import android.view.ViewTreeObserver
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
import androidx.compose.runtime.produceState
import androidx.compose.ui.platform.LocalView

private const val KeyBoardVisibleThreshold = 0.15f

/**
* 키보드의 Show/Hide 상태를 가져온다.
* @return 키보드의 visible 상태
*/
@Composable
fun rememberKeyboardVisible(
Copy link
Member

Choose a reason for hiding this comment

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

👍👍👍👍👍

initialKeyboardState: Boolean = false,
): State<Boolean> {
val view = LocalView.current
return produceState(initialValue = initialKeyboardState) {
val onGlobalListener = ViewTreeObserver.OnGlobalLayoutListener {
value = view.isKeyboardOpen()
}
view.viewTreeObserver.addOnGlobalLayoutListener(onGlobalListener)
awaitDispose {
view.viewTreeObserver.removeOnGlobalLayoutListener(onGlobalListener)
}
}
}

private fun View.isKeyboardOpen(): Boolean {
val rect = Rect().also {
getWindowVisibleDisplayFrame(it)
}
val screenHeight = rootView.height
val keypadHeight = screenHeight - rect.bottom
return keypadHeight > screenHeight * KeyBoardVisibleThreshold
}
39 changes: 0 additions & 39 deletions common/src/main/java/com/yapp/common/util/KeyboardVisibilityUtils.kt
View file
Open in desktop

This file was deleted.

77 changes: 77 additions & 0 deletions common/src/main/res/drawable/illust_password_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="72dp"
android:height="72dp"
android:viewportWidth="72"
android:viewportHeight="72">
<group>
<clip-path android:pathData="M36,0L36,0A36,36 0,0 1,72 36L72,36A36,36 0,0 1,36 72L36,72A36,36 0,0 1,0 36L0,36A36,36 0,0 1,36 0z" />
<path
android:fillColor="#FCE0C6"
android:pathData="M36,0L36,0A36,36 0,0 1,72 36L72,36A36,36 0,0 1,36 72L36,72A36,36 0,0 1,0 36L0,36A36,36 0,0 1,36 0z" />
<path
android:fillColor="#000000"
android:pathData="M52.806,23.257C52.333,24.893 51.648,26.299 50.782,27.209C49.916,28.119 48.867,28.533 47.668,28.184C46.379,27.809 45.714,26.896 45.49,25.669C45.265,24.442 45.481,22.899 45.954,21.263C46.427,19.628 47.087,18.214 47.941,17.301C48.795,16.387 49.843,15.974 51.092,16.337C52.291,16.685 52.956,17.598 53.203,18.831C53.45,20.065 53.279,21.621 52.806,23.257Z" />
<path
android:fillColor="#000000"
android:pathData="M19.368,23.086C19.84,24.722 20.525,26.128 21.392,27.038C22.258,27.948 23.306,28.362 24.505,28.013C25.794,27.638 26.459,26.726 26.684,25.498C26.908,24.271 26.692,22.728 26.22,21.092C25.747,19.457 25.087,18.043 24.233,17.13C23.378,16.216 22.33,15.803 21.082,16.166C19.883,16.514 19.218,17.427 18.971,18.66C18.724,19.894 18.895,21.45 19.368,23.086Z" />
<path
android:fillColor="#FA703C"
android:pathData="M36.086,52.271C31.341,52.271 27.045,52.68 23.935,54.361C20.826,56.043 18.902,58.997 18.902,64.089C18.902,68.437 20.605,71.391 23.605,73.258C26.605,75.126 30.902,75.906 36.086,75.906C41.271,75.906 45.567,75.126 48.567,73.258C51.567,71.391 53.27,68.437 53.27,64.089C53.27,58.997 51.347,56.043 48.237,54.361C45.128,52.68 40.832,52.271 36.086,52.271Z" />
<path
android:fillColor="#FA703C"
android:pathData="M36.087,22.61C29.908,22.61 23.234,23.744 18.105,26.606C12.976,29.467 9.392,34.057 9.392,40.968C9.392,47.722 12.551,52.312 17.467,55.213C22.384,58.113 29.058,59.326 36.087,59.326C44.141,59.326 50.815,57.835 55.475,54.795C60.135,51.755 62.782,47.166 62.782,40.967C62.782,33.808 59.505,29.218 54.529,26.419C49.554,23.619 42.88,22.61 36.087,22.61Z" />
<path
android:fillColor="#ffffff"
android:pathData="M27.961,39.814C27.961,40.401 27.723,40.932 27.338,41.317C26.954,41.701 26.423,41.939 25.836,41.939C25.249,41.939 24.718,41.701 24.333,41.317C23.948,40.932 23.711,40.401 23.711,39.814C23.711,39.228 23.948,38.696 24.333,38.312C24.718,37.927 25.249,37.689 25.836,37.689C26.423,37.689 26.954,37.927 27.338,38.312C27.723,38.696 27.961,39.228 27.961,39.814Z" />
<path
android:fillColor="#ffffff"
android:pathData="M48.463,39.814C48.463,40.401 48.225,40.932 47.84,41.317C47.456,41.701 46.925,41.939 46.338,41.939C45.751,41.939 45.22,41.701 44.835,41.317C44.451,40.932 44.213,40.401 44.213,39.814C44.213,39.228 44.451,38.696 44.835,38.312C45.22,37.927 45.751,37.689 46.338,37.689C46.925,37.689 47.456,37.927 47.84,38.312C48.225,38.696 48.463,39.228 48.463,39.814Z" />
<path
android:fillColor="#FFCB31"
android:pathData="M34.4,38.341C35.418,37.649 36.756,37.649 37.774,38.341L39.621,39.597C40.494,40.191 40.563,41.453 39.759,42.138L37.709,43.885C36.774,44.681 35.4,44.681 34.466,43.885L32.416,42.138C31.612,41.453 31.68,40.191 32.554,39.597L34.4,38.341Z" />
<path
android:fillColor="#FA703C"
android:pathData="M6.788,51.148C6.586,50.208 6.486,49.206 6.528,48.24C6.57,47.274 6.754,46.345 7.122,45.552C7.37,45.018 7.766,44.374 8.32,43.805C8.873,43.237 9.584,42.744 10.461,42.512C10.958,42.38 11.492,42.403 12.005,42.549C12.518,42.695 13.011,42.966 13.425,43.331C13.988,43.828 14.437,44.723 14.851,45.723C15.265,46.723 15.644,47.83 16.065,48.749C16.688,50.112 17.624,51.25 18.486,52.133C19.349,53.015 20.137,53.64 20.465,53.976C21.224,54.755 21.816,55.425 22.234,56.047C22.652,56.668 22.896,57.241 22.96,57.823C23.026,58.424 23.024,58.919 22.926,59.391C22.828,59.863 22.634,60.312 22.313,60.82C21.978,61.352 21.453,61.762 20.88,62.029C20.307,62.295 19.684,62.418 19.154,62.375C16.652,62.169 13.812,60.534 11.471,58.364C9.131,56.195 7.29,53.492 6.788,51.148Z" />
<path
android:fillColor="#FA703C"
android:pathData="M65.212,51.148C65.414,50.208 65.515,49.206 65.472,48.24C65.431,47.274 65.246,46.345 64.878,45.552C64.63,45.018 64.234,44.374 63.681,43.805C63.127,43.237 62.416,42.744 61.54,42.512C61.042,42.38 60.508,42.403 59.995,42.549C59.482,42.695 58.99,42.966 58.576,43.331C58.013,43.828 57.563,44.723 57.149,45.723C56.735,46.723 56.356,47.83 55.936,48.749C55.313,50.112 54.376,51.25 53.514,52.133C52.652,53.015 51.863,53.64 51.536,53.976C50.776,54.755 50.184,55.425 49.766,56.047C49.348,56.668 49.104,57.241 49.04,57.823C48.975,58.424 48.976,58.919 49.074,59.391C49.172,59.863 49.367,60.312 49.687,60.82C50.022,61.352 50.547,61.762 51.12,62.029C51.694,62.295 52.316,62.418 52.846,62.375C55.348,62.169 58.188,60.534 60.529,58.364C62.87,56.195 64.71,53.492 65.212,51.148Z" />
<path
android:fillColor="#00000000"
android:pathData="M10.461,42.512C10.959,42.38 11.492,42.402 12.005,42.549C12.519,42.695 13.011,42.966 13.425,43.331C13.988,43.828 14.438,44.722 14.852,45.723C15.266,46.723 15.644,47.83 16.065,48.749C16.688,50.111 17.624,51.25 18.487,52.133C19.349,53.015 20.137,53.64 20.465,53.976C21.224,54.755 21.816,55.425 22.235,56.047"
android:strokeWidth="1.5"
android:strokeColor="#F7441C"
android:strokeLineCap="round" />
<path
android:fillColor="#00000000"
android:pathData="M61.54,42.512C61.042,42.38 60.508,42.402 59.995,42.549C59.482,42.695 58.99,42.966 58.576,43.331C58.013,43.828 57.563,44.722 57.149,45.723C56.735,46.723 56.356,47.83 55.936,48.749C55.313,50.111 54.376,51.25 53.514,52.133C52.652,53.015 51.863,53.64 51.536,53.976C50.776,54.755 50.185,55.425 49.766,56.047"
android:strokeWidth="1.5"
android:strokeColor="#F7441C"
android:strokeLineCap="round" />
<path
android:fillColor="#00000000"
android:pathData="M56.332,41.59C55.543,42.505 53.927,44.79 53.775,46.608"
android:strokeWidth="1.5"
android:strokeColor="#F7441C"
android:strokeLineCap="round" />
<path
android:fillColor="#00000000"
android:pathData="M16.595,41.59C17.383,42.505 18.999,44.79 19.151,46.608"
android:strokeWidth="1.5"
android:strokeColor="#F7441C"
android:strokeLineCap="round" />
<path
android:fillAlpha="0.3"
android:fillColor="#FEEFE9"
android:pathData="M38.381,63.402L38.381,63.402C37.68,63.78 36.884,63.969 36.089,63.969C35.294,63.97 34.498,63.781 33.795,63.402L33.795,63.402C33.527,63.257 33.272,63.087 33.035,62.894C32.828,62.726 32.634,62.54 32.456,62.34C32.278,62.541 32.084,62.726 31.876,62.894C31.639,63.087 31.384,63.258 31.116,63.402L31.115,63.402C30.765,63.591 30.392,63.736 30.006,63.833C29.621,63.93 29.223,63.98 28.823,63.98C28.386,63.98 27.953,63.921 27.536,63.805C27.118,63.69 26.716,63.519 26.342,63.294L26.342,63.294C25.978,63.077 25.644,62.812 25.349,62.51C25.054,62.207 24.796,61.866 24.585,61.495L24.585,61.495C24.522,61.385 24.509,61.259 24.539,61.146C24.569,61.032 24.642,60.929 24.751,60.864L24.751,60.864L24.751,60.864C24.86,60.8 24.985,60.787 25.098,60.818C25.211,60.849 25.313,60.923 25.376,61.033L25.376,61.033C25.548,61.335 25.757,61.613 25.998,61.86C26.239,62.106 26.511,62.321 26.806,62.499L38.381,63.402ZM38.381,63.402C38.649,63.257 38.904,63.087 39.141,62.894C39.348,62.726 39.542,62.541 39.72,62.34C39.898,62.541 40.091,62.726 40.299,62.894C40.536,63.087 40.791,63.257 41.059,63.402C41.41,63.591 41.784,63.736 42.169,63.833C42.555,63.93 42.953,63.98 43.353,63.98C43.79,63.98 44.223,63.92 44.641,63.805C45.058,63.689 45.46,63.518 45.834,63.293L45.835,63.293C46.198,63.076 46.532,62.811 46.827,62.508C47.122,62.206 47.379,61.865 47.59,61.494M38.381,63.402L47.59,61.494M30.687,62.586L30.687,62.586C30.963,62.438 31.222,62.255 31.457,62.044C31.692,61.833 31.903,61.595 32.084,61.334L32.084,61.334C32.126,61.273 32.182,61.223 32.246,61.19C32.31,61.156 32.382,61.137 32.457,61.137C32.532,61.137 32.604,61.156 32.668,61.19L32.621,61.278L32.668,61.19C32.732,61.223 32.788,61.273 32.831,61.334M30.687,62.586L47.424,60.863C47.315,60.799 47.19,60.786 47.077,60.817L47.103,60.913L47.077,60.817C46.964,60.847 46.862,60.921 46.799,61.032C46.628,61.334 46.418,61.612 46.178,61.859C45.937,62.105 45.666,62.32 45.37,62.498C44.788,62.846 44.115,63.029 43.438,63.044C42.762,63.059 42.083,62.906 41.488,62.585C41.212,62.437 40.953,62.254 40.719,62.043C40.485,61.833 40.274,61.595 40.095,61.334L40.095,61.334C40.052,61.273 39.996,61.223 39.932,61.189C39.868,61.155 39.795,61.137 39.721,61.137C39.646,61.137 39.574,61.155 39.509,61.189C39.445,61.223 39.389,61.272 39.346,61.334C39.167,61.595 38.956,61.833 38.722,62.044C38.487,62.255 38.228,62.437 37.952,62.586C37.384,62.892 36.737,63.046 36.089,63.046C35.441,63.046 34.793,62.893 34.225,62.586C33.949,62.437 33.69,62.255 33.455,62.044C33.221,61.833 33.011,61.595 32.831,61.334M30.687,62.586C30.092,62.908 29.413,63.06 28.736,63.045C28.06,63.029 27.388,62.847 26.806,62.499L30.687,62.586ZM32.831,61.334L32.749,61.391L32.831,61.334C32.831,61.334 32.831,61.334 32.831,61.334ZM47.59,61.494C47.59,61.494 47.59,61.494 47.59,61.494L47.503,61.444L47.59,61.494Z"
android:strokeWidth="0.2"
android:strokeAlpha="0.3"
android:strokeColor="#FEEFE9" />
<path
android:fillAlpha="0.3"
android:fillColor="#FEEFE9"
android:pathData="M38.431,70.543L38.431,70.543C38.045,70.446 37.671,70.301 37.32,70.112L37.32,70.112C37.052,69.967 36.798,69.797 36.561,69.604C36.354,69.436 36.16,69.251 35.982,69.05C35.804,69.251 35.61,69.436 35.403,69.604C35.166,69.797 34.911,69.968 34.643,70.112C33.941,70.49 33.146,70.679 32.35,70.679C31.555,70.679 30.759,70.491 30.057,70.112C29.717,69.929 29.399,69.704 29.111,69.445C28.823,69.187 28.565,68.894 28.344,68.574L28.344,68.574C28.272,68.469 28.249,68.345 28.269,68.229C28.289,68.113 28.353,68.004 28.456,67.931L28.456,67.931C28.559,67.858 28.682,67.833 28.798,67.854C28.913,67.874 29.021,67.94 29.093,68.044L29.093,68.044C29.272,68.305 29.483,68.543 29.717,68.754C29.951,68.964 30.21,69.147 30.486,69.296L30.486,69.296C31.055,69.603 31.702,69.756 32.351,69.756C32.999,69.756 33.646,69.602 34.214,69.296C34.49,69.147 34.748,68.964 34.983,68.754C35.218,68.544 35.428,68.305 35.608,68.045C35.696,67.916 35.842,67.856 35.982,67.856C36.121,67.856 36.268,67.916 36.356,68.045M38.431,70.543L34.261,69.384C34.544,69.231 34.809,69.044 35.05,68.828C35.29,68.613 35.506,68.368 35.69,68.101C35.757,68.005 35.869,67.956 35.982,67.956C36.094,67.956 36.207,68.005 36.273,68.101C36.458,68.368 36.673,68.613 36.914,68.829C37.154,69.045 37.419,69.232 37.702,69.384M38.431,70.543C38.817,70.64 39.215,70.69 39.615,70.69C40.052,70.69 40.485,70.631 40.902,70.516C41.32,70.4 41.722,70.229 42.096,70.004L42.096,70.004C42.459,69.786 42.793,69.522 43.088,69.219C43.383,68.917 43.64,68.576 43.851,68.205M38.431,70.543L37.702,69.384M36.356,68.045C36.356,68.045 36.356,68.045 36.356,68.045L36.273,68.101L36.356,68.045C36.356,68.045 36.356,68.045 36.356,68.045ZM36.356,68.045C36.536,68.305 36.746,68.544 36.98,68.754C37.215,68.965 37.474,69.147 37.75,69.296M37.75,69.296C37.75,69.296 37.75,69.296 37.75,69.296L37.702,69.384M37.75,69.296L37.702,69.384M37.75,69.296C38.344,69.617 39.023,69.77 39.7,69.755C40.377,69.74 41.049,69.557 41.631,69.209C41.927,69.031 42.198,68.816 42.439,68.57C42.679,68.323 42.889,68.045 43.06,67.743C43.123,67.632 43.225,67.558 43.338,67.527C43.451,67.496 43.576,67.51 43.685,67.574C43.794,67.638 43.867,67.741 43.897,67.855C43.926,67.969 43.914,68.094 43.851,68.205M43.851,68.205C43.851,68.205 43.851,68.205 43.851,68.205L43.764,68.155M43.851,68.205C43.851,68.205 43.851,68.205 43.851,68.205L43.764,68.155M43.764,68.155C43.558,68.519 43.306,68.853 43.016,69.15C42.727,69.447 42.401,69.705 42.045,69.919M43.764,68.155C43.814,68.069 43.824,67.97 43.8,67.88C43.777,67.791 43.719,67.71 43.634,67.66C43.549,67.61 43.452,67.6 43.364,67.624C43.276,67.648 43.196,67.706 43.147,67.793L42.045,69.919M42.045,69.919C41.678,70.138 41.284,70.306 40.876,70.419C40.467,70.532 40.043,70.59 39.615,70.59C39.223,70.59 38.833,70.541 38.455,70.446L42.045,69.919ZM29.01,68.101C28.954,68.019 28.87,67.968 28.78,67.952C28.69,67.936 28.595,67.955 28.514,68.012C28.433,68.07 28.383,68.155 28.368,68.246C28.352,68.337 28.37,68.435 28.427,68.517C28.643,68.83 28.896,69.117 29.178,69.371C29.46,69.624 29.772,69.845 30.105,70.024C30.791,70.394 31.571,70.579 32.35,70.579C33.13,70.579 33.909,70.394 34.596,70.024L29.01,68.101ZM29.01,68.101C29.194,68.368 29.41,68.612 29.65,68.828M29.01,68.101L29.65,68.828M29.65,68.828C29.89,69.044 30.155,69.231 30.439,69.384L29.65,68.828Z"
android:strokeWidth="0.2"
android:strokeAlpha="0.3"
android:strokeColor="#FEEFE9" />
</group>
</vector>
Loading