From 65e71b011031ccf815ce552cd4e273478099aa93 Mon Sep 17 00:00:00 2001 From: tgyuu-An Date: Sun, 24 Mar 2024 22:46:01 +0900 Subject: [PATCH 01/28] =?UTF-8?q?[CHORE]=20#161=20:=20=EC=8A=A4=ED=94=8C?= =?UTF-8?q?=EB=9E=98=EC=89=AC=20=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EC=86=8C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetDropDown.xml | 15 ++- .../wap/wapp/feature/splash/SplahScreen.kt | 109 ++---------------- .../wapp/feature/splash/SplashViewModel.kt | 34 ++---- .../src/main/res/drawable/ic_splash_logo.png | Bin 16514 -> 0 bytes 4 files changed, 30 insertions(+), 128 deletions(-) delete mode 100644 feature/splash/src/main/res/drawable/ic_splash_logo.png diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 2f0367c4..22160448 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -3,7 +3,20 @@ - + + + + + + + + + + + + + + diff --git a/feature/splash/src/main/java/com/wap/wapp/feature/splash/SplahScreen.kt b/feature/splash/src/main/java/com/wap/wapp/feature/splash/SplahScreen.kt index cecf83ca..61dcd664 100644 --- a/feature/splash/src/main/java/com/wap/wapp/feature/splash/SplahScreen.kt +++ b/feature/splash/src/main/java/com/wap/wapp/feature/splash/SplahScreen.kt @@ -1,39 +1,23 @@ package com.wap.wapp.feature.splash import android.app.Activity -import androidx.compose.animation.AnimatedContent -import androidx.compose.animation.core.animateDpAsState -import androidx.compose.animation.core.tween -import androidx.compose.animation.scaleIn -import androidx.compose.animation.scaleOut -import androidx.compose.animation.togetherWith import androidx.compose.foundation.Image import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel -import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.wap.designsystem.WappTheme import com.wap.wapp.core.commmon.extensions.showToast import com.wap.wapp.core.commmon.extensions.toSupportingText -import com.wap.wapp.core.designresource.R import com.wap.wapp.feature.splash.R.string @Composable @@ -43,8 +27,6 @@ internal fun SplashRoute( navigateToNotice: () -> Unit, ) { val context = LocalContext.current as Activity - val isIconLogoVisible by viewModel.isIconLogoVisible.collectAsStateWithLifecycle() - val isIconLogoGoUp by viewModel.isIconLogoGoUp.collectAsStateWithLifecycle() LaunchedEffect(true) { viewModel.splashUiEvent.collect { event -> @@ -58,100 +40,23 @@ internal fun SplashRoute( } } } - SplashScreen( - isIconLogoVisible = isIconLogoVisible, - isIconLogoGoUp = isIconLogoGoUp, - ) + + SplashScreen() } @Composable -internal fun SplashScreen( - isIconLogoVisible: Boolean, - isIconLogoGoUp: Boolean, -) { - val ANIMATION_MILLS = 400 - - Column( +internal fun SplashScreen() { + Box( modifier = Modifier .fillMaxSize() .background(WappTheme.colors.backgroundBlack), - ) { - AnimatedContent( - targetState = isIconLogoVisible, - transitionSpec = { - scaleIn(tween(ANIMATION_MILLS, ANIMATION_MILLS)) togetherWith - scaleOut(tween(ANIMATION_MILLS)) - }, - ) { isIconLogoVisible -> - if (!isIconLogoVisible) { - SplashTypoLogo() - } else { - SplashIconLogo(isIconLogoGoUp) - } - } - } -} - -@Composable -private fun SplashTypoLogo() { - Column( - verticalArrangement = Arrangement.Center, - modifier = Modifier - .fillMaxSize(), ) { Image( - painter = painterResource(id = com.wap.wapp.feature.splash.R.drawable.ic_wapp_logo), + painter = painterResource(id = R.drawable.ic_wapp_logo), modifier = Modifier - .align(Alignment.CenterHorizontally) + .align(Alignment.Center) .size(width = 230.dp, height = 230.dp), contentDescription = stringResource(id = string.wapp_icon_description), ) } } - -@Composable -private fun SplashIconLogo(isIconLogoGoUp: Boolean) { - val animatedPadding by animateDpAsState( - targetValue = if (isIconLogoGoUp) 200.dp else 0.dp, - animationSpec = tween(1000), - ) - - Column(modifier = Modifier.fillMaxSize()) { - Column( - verticalArrangement = Arrangement.Center, - modifier = Modifier - .fillMaxSize() - .weight(1f) - .padding(bottom = animatedPadding), - ) { - Image( - painter = painterResource(id = R.drawable.img_white_cat), - modifier = Modifier - .align(Alignment.CenterHorizontally) - .size(width = 230.dp, height = 230.dp), - contentDescription = stringResource(id = string.wapp_icon_description), - ) - - Row( - modifier = Modifier.align(Alignment.CenterHorizontally), - ) { - Column { - Spacer(modifier = Modifier.height(40.dp)) - - Text( - text = stringResource(id = string.application_name), - style = WappTheme.typography.titleBold, - fontSize = 48.sp, - color = WappTheme.colors.white, - ) - } - Text( - text = stringResource(id = string.application_name), - fontSize = 48.sp, - style = WappTheme.typography.titleBold, - color = WappTheme.colors.yellow34, - ) - } - } - } -} diff --git a/feature/splash/src/main/java/com/wap/wapp/feature/splash/SplashViewModel.kt b/feature/splash/src/main/java/com/wap/wapp/feature/splash/SplashViewModel.kt index 2a14d9c2..d5c4d0f0 100644 --- a/feature/splash/src/main/java/com/wap/wapp/feature/splash/SplashViewModel.kt +++ b/feature/splash/src/main/java/com/wap/wapp/feature/splash/SplashViewModel.kt @@ -4,11 +4,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.wap.wapp.core.domain.usecase.auth.IsUserSignInUseCase import dagger.hilt.android.lifecycle.HiltViewModel -import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch import javax.inject.Inject @@ -19,35 +16,22 @@ class SplashViewModel @Inject constructor( private val _splashUiEvent = MutableSharedFlow() val splashUiEvent = _splashUiEvent.asSharedFlow() - private var _isIconLogoVisible = MutableStateFlow(false) - var isIconLogoVisible = _isIconLogoVisible.asStateFlow() - - private var _isIconLogoGoUp = MutableStateFlow(false) - var isIconLogoGoUp = _isIconLogoGoUp.asStateFlow() - init { viewModelScope.launch { - delay(1500) - _isIconLogoVisible.value = true - delay(1000) isUserSignIn() } } - private suspend fun isUserSignIn() { - isUserSignInUseCase() - .onSuccess { isSignIn -> - if (isSignIn) { - _splashUiEvent.emit(SplashEvent.SignInUser) - } else { - _isIconLogoGoUp.value = true - delay(1000) - _splashUiEvent.emit(SplashEvent.NonSignInUser) - } - }.onFailure { throwable -> - _splashUiEvent.emit(SplashEvent.Failure(throwable)) + private suspend fun isUserSignIn() = isUserSignInUseCase() + .onSuccess { isSignIn -> + if (isSignIn) { + _splashUiEvent.emit(SplashEvent.SignInUser) + } else { + _splashUiEvent.emit(SplashEvent.NonSignInUser) } - } + }.onFailure { throwable -> + _splashUiEvent.emit(SplashEvent.Failure(throwable)) + } sealed class SplashEvent { data object SignInUser : SplashEvent() diff --git a/feature/splash/src/main/res/drawable/ic_splash_logo.png b/feature/splash/src/main/res/drawable/ic_splash_logo.png deleted file mode 100644 index a02b63cd9b0c9e56c1a08190920d3bbc590d8bae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16514 zcmd6PztLfW@gXq*)v<_x922ATT=-i2m+#@px~=0E9j!2pb{WoM*tSG-;0WplShRtMD@^Bf}zw*(Eir~<1JJJih@#~g!^ELiGm_WsiFYY z_dz|%#|fady}c>)wi8uZZJaYmRs&?xqG{wb($beP-JnBbW#x#%OM(ft%K*`oy8o~d z?wp+FM1!Rv%5mVLH|S)cA`UaU$EpMKVH7#$4qrQjCZB!1SYN1kzx}nGzkGgs=DX}- z=k?ah``6oodrTq>=>MySorg@HeQ8<>r0$e?AqyJjGpv@zM1aF#FL4O+FcsHv62_Z2 zy(o%u5`n|0Gg10WF3a_`^O`|BzC;*|?>H6V8@PIG#^_gCM4Q}qmE!Ilf*bQTJ*T5O zQQSrZ2=MmHWn2PNKe>c-+V^MMS6bo9w@nhxlOPgip8E>e%P0?5MvEc7?Kw*h+?y#N|vfbHH(= z6Xf}?!oKNUV?l}BE4VS0+;wI@L>AYCY{0^*w2Hc90f=NFTQ;$}QeU?69~P-?0`%@s z%O4mW^cc{Q?60J>RaALun$uliL+5WY^W$IuY$7dvqxS`mzb^ZqxMV`0$jX~8q(rvW zmjMKWsTyMlhN&Ox)MqHDhJ!o}H2>2HF)g}U#z_KD6VWN~RAnrY`d=@DMd5M^6T?g2 z9{;+R&n@6-%|_1dT5@j>QbTZl|3QFteN^$-+c$t3*{u2|9Em^6JOd2~LyT_VrMKCps+76RiK`_1|j4auU0 z4hA+(7|2g7bm%>#(^37Z?9_xj?tQ4sAHC$3p}Hg7xzIRsY$(xL#YP1X2cH6Ey<{4z zNGA&mUX}yz&txi&-_DB5V-{8vq!<^F-(`teM8C2vRQtU&rlfc|J4M9*=P?tjI zMKF9Z5&iyK*YERcu6Fm3oWRP#h_LV>&5M6dAaRO{4}^{h%a`DG3E0U(L z`1w{zFTJ=RVa>b02Pt>u7-RUhMV1{QO3mY^g&G53fp&vkjJ!S(6RTif-!~^Bm?fwt z8(*v_lfyOViV3L??j>_#IriIzSt9?ij81kPXyOwp5}6fpA_L;y*5>(8en zi#7ERWaFRtuxH~>P!M1RO?|``KS29Y0H~7&Hdt!#@%3PfFvh2#|K6%Ez3*+VH z_jyeJmg+8$jscxw0rpL!^!a2c4)r&#&?)v104+k_1oR?uxD*bE!gm3$;H|{u`4fNS zeXXV#B}kf-{AC@8aKSge0U}L4XVXZfV+sG_HV6B66;cr4z@qacKM_|HD8F@)Lj&(i zqeJpKg<}GTfA^Ng7--=CGNhiYh<1m`WukLmss2Fsi+p6A34p+|#3cyoDKh&ZjXOJ6 z_TnA$##-{~a=^+j|L>P#pKhGCfv^`kK+^9m{5%zNM;kU7SVLG+q5@sF_sH?>!+FG( zMyWkdnV@iBTk zj{FptZ5!>zDWuqB1l*EDYyb?hu!>$~HQTC=>x*QL>n%~Se{>-j*{F~{4_em5HeNSPVH_%N8qixcUeUT&2V z#Y;NmDF%^PxL``=Y;nvMJ)SB=WBgQLb4!BVH)pv#C^dPqA{X*Yc#Ru;RrWvYqZp78 zX8S#%^$2QUZtHHm1NC=Ix^)#ot z9*@>%mOtCvB=pY_yB`^S-SQkhUg>*}+1?m<)Zk}f7MDbC^Qxv6Hb4tQH@d{Lu#4yVaG z5?P;z65Y{-MzJc=ct{bpQB;VNH^_p&Y#D=$n_dX(Nl*-0pIVQ^WFH7LG4>4K z>*BPcOR_QGA&7_q?DiEB@nF=X*&FbIYG3k-X|ci~jrM+dx{C|kjM#il(tE87EglAy zGs06THXw z68>(?+b>ebw^cgqk{9#+L8ukCK34?GMOw%GKSyz}q)zB860V1Icw`Cw_CMA7w*Vld zskn^dHKRNE@+|Qf{x${WHIP`&`@<0rB#33Xyk9v5%AyF7D5gl z=InHuMw4C@1QSiOT&#d~97>*0etmsP=b%JN z07<*v&5KD_0J*Sn)snB6Q--I0t$S-voN(74@8$$r^3QZ_`M(pOiw3;nK(7y}3w`7j zHi8PTvNFskBbfQ0%T7f}=VeG9m{GMfLaBr+tx zVqOpmFS7pDljxn#9VhpSvGt?FeNMZWIP_GkMZ>mPnr-teQi9zYSYwd-FH4KiB78$5 zA*?^bD|7mW5+|wa>k(OQ=Rcg)!Pz|#I3Z18GFv3V`p(Pz3YDljHYm3G_4m%gw4X`0 zM`|8#WR3KCq|*dm)(`K+`RCDVqOr?ag32DL&sBVExYbKn(H7|DZr6=S3+zJN$R8PZ z+xZ7JzHcnqchOhFZ2708{|sQ|5bDmkR_~|{tqKdX$x-Xg{bSS+d@4C9sh3nBWGkhU zhjD#+4U_Hs+HTyfUNJVg%g~g}+>B2+FXBy$4tqHu?MS*M60pFJ-))X?$Oe3}vK|kd zmzi`95iI*ijFL0>lOvwZXd9_4;qVi%WqK2TLQ|5F-tfEK(fNx2-0f(~-Z^(ZE0Re0 z#qq%p(-Kbo6{+g-W(-F5{6H^t*Jjs>gEH=1d2(q_<^C;9Ke2p8RN(9k{)czvxV;Vh zJO(EIbe!90U8Z_}*vjxs{Jiu5o?YrCQ4GDwQe}fBJGImEr;@SB+oszeQ6}r~T5+E1 zy(d;&>e*xR&`Ic}Hxx{Ox=02#%v;)y2-c_t?@zrbP`1<6@d-A9#o;};O1BPUU z6z(kTDk)!C=Wzrh| zrrV*^ws!a#y9s+6x00yo*d=>j3B8#ms8`t2(uego`~$7@1IWEUgH_fx_F(MIk++j2 zXo*H7sivv6jO#DVb45CQypLm`U3Pjt0A#hthiCA0W}L^|TKLovq{BmU)RCdKj^JR3 zU+nepgjq9EQLUmL%=6~2WLNEV(_6E~(`8|&UQ|W6;>gUPo z*B?%S{zuZ1zHD9*A&7+Lgr1*iM#1xg@|o$*gXP=vOn1cMpffYj-)Vs4Y9iaE4vUyn zsl;dvM_JDAmqf`nxqLcd!wg^h zve6JR7Yk z{Oh%MRTRk)6_FbvBi#iQw)1`|!N^~4X1P~YLdTMk!!eVGJznN;hYmg|oVZdjOBMKC*IV6KZf>pQw24$Xw= zIO#CU(t20P1bh;Y8)tt5m)At=!2Z@iaS9CG0_a>yQ}l z(Qke)Dq>g!FnY7P9w*FqSM|L%)%;_c?H2W2v3U7C8>HX3BqY=QCS{RH8yT8ZPSL#) z(RXQ}H`QWzd_g*gTPEHW-R$=b;wEl%MKd+m)NJZ+KhrcQ%>0w;yAUukw-D25S^T1m z-L(`Wrl#=Qov!RFhSwxE(CZO)!@j=1U2F+X_W$~4Z>t|3tRWvZj6S$TY2a2I8qo}t zUnIQju`+E7X)Wj`oKe?Lin!^FQS|1FTx;Tc&#hOfQ1ByD)K&i|sYuV-$_4Ge1Si_0nBwwXwV7y&T@3;N8^?F|zZ}Qm%#udM661D$>@>~RlPOG zh#R}o(s(%UYIuJmm{14}QV}QouyoOCGp|bP4l|fB=N0zBn3F)H829;YEK))JoB%S)&S0=ZKwHp$ z|10e`oSd)?Uh>iW$@etX@!S4L-L-bDs^Lh|@q7uo3wHm+xK8E2^>AKWs+?=Q znsVK9wW53*=1$=b5N2hOTKMqi66<#7NJCp{H#DLX$orE%H26vM!dLPg&B zNWzp2u?43need)9Z3A)4@R6dpGddvS&$n{>wH21KiaE*?nwZC>P(sSt4a7HXC%L*{ zYNL0in04a&IqD~~C=eNv!p;p2b})H%svIS5ltT}GpKlz-aE-ZSS$od2I&s*n96Omx zyK3Pp0G&ubqE+=h!nP(dN9XZPXKwh40tuF59&L(1AQs--5F<5%^qa*5L;lU8o9-S- zz4@TzcUT`F$wPB~y)8jNuanXTLUy3YlcdP)O(`%t%diTu6?XBDHla7d0kWSytZGvA zO^^OX#{;R!bCL47uo60zjR;Ls5ne2iW?NEt-+@NnI`eQ@W0<@L4;g z?ylF^Uvy)CHI~e+uf`zCV9O*MY3B4%+LnD7eEx&2_9#27&F93?xT?(d(d`n?!>oPuXbL1?&Bo&B;}+kd=`@hG`!Ck zv_1(i@lVPbpNo6+mSmtw+GQQaRU0A-9Va!Zx{v&L?J_`^$E+XFhq0R z4@VTgkqdRx{p{BFs14?P4TslYidt1Y^h2(a%71A%aU}cD)g^_GW@Mt=Wv2dQ3`Lmy zjQ{gpF+qkZel1ve!J08=$6s!}sp&Umh|?2FLCR=gxO!=R1ye{aw^XoNhc z@u&jvu4*Wemz`vuNvzc+m8{|=&Z4ukkCa)%hXsX0B4g*dL%gAIt+3OlRFv=f10#5d z%kP;pf$Cw&$BKmeZv|Gn^YeKFE1oEYLT+$8m zAu>$xM6%>zp?tO#2mWN@Qm@tuiiYTb{5x{mP5u&959ENW>x(k;hX)NH2|i#*Q+4wy zGGX=g&n^qp995Tkm&2Fk86O6B5oDgK2JC>S5fqxvP%b`h5zo`J1a{s)B8J% zHaJdg*(cYHTXPLR*m{M=5 zzmcD#?PVo%$h}i114i)$`>O6=M0wM`@+gY0LgKmdb-&k%R1?xSJ{y`e>wn&WHzm}DWpTjv-0~Ou zE&j;8aH4%i*Swd7vcI4&JN0Mx;A|Qb53ad|5MV>u>3qH{P9`_&q#-$~(ofiW1Bwa- zrx6@MG^;R*`}7@mb}8ioXkZTiBoYdzTl2#eb#Q0<%SbXqwq;5uLoU{d&ahBPxlk6R zflGhwB8R;(UUhIu>()&KFs%6Q5AE2Pj|(9p8NIbWjJB8%mdJ9a{UwyMcm@O8iI#jlPdOUJ z{HxnM&z@bsIJDyXeU7B4T)MUc!kUdJoVNFuFPVEFfqTTZMy)P+BULS7I;&VSIusC( zf0ffCmXPM5fEqrv&=v3z(x-!sghmeiaq46zLjVTmDVdbWwhN(P3=C13^k)fvMGl_N zG}6d2m~ookN01MGR)UuN6FV`j?GJa5?Hc$cJ3j>`?9L*p6S^ACSu%q$%n2gb3uRXz zOquGHq73o+rTpp@+oLKeZKs66Jj*8FHY~8XX*dh;N}(JlF#%!_2DV2$j)C#g`cH2P z%|6*xwa1dss&beoU*HpA(0!H(39ZWzVbm)R8m?B6`#iW1N|Hi;u>o-0cLAX5^RwFa znIna1{91ak8iMR9Bnw0R3dRneEB;Ct&RJ{)>{qrw)F2El7r?=QVr$-g6_vMN8e&9} zgbzVs)`HSfcubIRFq}Xs`n^LWs@`dOms2s2-MQvNQ>=XY5g+fLJ>BlzPN;S+9BoXAw6hcI}+vR_;Y(!Vncvcpl(29Lzoz zIVnf3?S&XH`*qp@slnXqVcbTKv{f%4U zCd=KZqkWmeCkz{>xxYY-~H|H-@RO%Q$un zw5^rl>l78exV3v=`6#EV`5)g+IkM#fO zSJx=6=CD#4@Fnj_J!^BD7vJSHnyA7ScDNwn!Ah z{Cl*f7YZr>0@3`uASp45>X-{oE8Jf5Tdo;y^PQ!hb*`O3kfaPv#P9N49a)7ahF^N^fY`@+doZF1Z6co%%rfAR7x4%`lY6+RB zz_r1VrWpR!D1x|L5N?MJh^TL2dCVZhwT-SS-7vOsac~Y27(y>+s>&=M>FZ8je4X+W z!ol}qnqc67m@2Q7rJ|N@lflm;9SKaA@>TnuOI5n*VUgj}!+J*kIBDYFCbn*{5|W^0 z$tK@dE;5?x?`hu1z`1eaH9;@&MLz+GJB1i)C8YvS4(L%1 zzRfDnwkCy_U*l)6I-o(<^4)S(YcYc95*EP{VgX%E{9l^Ow}^2!X#o~K>~*KVpK3C` zYKpVxAd`||xwyf&CE@*0|dK zYF^;JdPwf+UYK`;U^zQt;C-}vRe+5J?Uf8()gMaf@{D!AuPe8RDFccL%EQ3${x8zq z_tSJYAB;2}Jm0^$XJzNVxTjShY^zbt==XlUOX=FDWWgs{;Sh`|ay9R@&->=NMz$hH@FHSC2 zW9Tw3;PeS~6ai~HM3C+SiO77}Mo-o)4Z3xvfrCsU!S5jsqk|u5_C9fD2XLAJdBsd$ zB}@7yMDZ7Q(9ckGkHPV%v{~96V)Dpj|E>L>TcDln@xVgJMHyV)L=urg5ZB zbswRNt-dKGc*gx9L9>*79BR=O{Nrs^E_zv4H6I>C_N1=mM%d*8r;PqR9jczu2NQ3El<=Ouk76Q~D&8b-PImPF2VIi7!1qxG#2u|9aT>_+y)!QL}^K`1}P zN&a=&o2DXd=Ql9X=;Fy!Sh4y_asA{%JdK z%kuLX$cXqH$n_qb+i`{AdpH6}&>}uL%!tRH=fKkg_`Fz)p>B)g!m3wH$^A#ck#6Zz z5MjHQ?2%WeZM9YTIs#Y$_C`ibGIk(e-u=v5uw*7ednRSgaUF(xUkE6X3)2;~f?Se`@Ig>NtZ^Xbod zK}%V75zp?0T*K7w#B#SfZ&HMghj04lVzlLUMSq({n(B7={;rg-vd_WB^f6N{|F`I9 z>|ay;{J7DW5zjOnp^am<3a*wVcPSWauG8~)3n0h^Is9c^X>B=< zvv2MJeX2bOp>>mQG=+FED4<)^{tA_xeYm8|df-~i7kI_k-WD>(tj)!@GJbZPvU z#I!YEMpD6xeCYKjw`Gr@2&2Vcdt|B(Z%_)(zRO#Y~mK ziwJ85c3BMR}>{c?cr*$(Sb4>bH!AfN519@dP2gPl4 z1Bq*MYcvi2IQ_1y0bC04+Hcw4s|eZ!qpGICa0m!`cC1>uG`3*v{N1tWwLIapMPj#? zxfagfUp`J?)2wHAfEHWiyORgS`i!M+J)@~ws3Q+O-B z)kMe!cgd+Qd^S)8WjpQ1%YC@~IK_KOv$=@)x`!d-`zTVCh;cQ1EqQN-cGvEtIOcZ^ zlZZfX0M_5M9>c5!Q9Cp~+@f<>4qgNE$39;Sa0xO`8@KlH%?_Pr+iJDbek(c8eXzV# z5UtBr(qsPk7i}vt*w%(kNfF&x+jak_C#A3Fl$U0?i_s5(3p?6u5Y=VyjVknkE>ADW zE#UdSummSqMoc689DP%sgX@WI@U_m9IW0al<>8Bew5`)*td_>@w+u9nR{L5+g2zoH z8kRX*g&o=9!!^rEgjDa$FW^7)3yVK4ofBaJ6>}rqoUAO><`Ux3h^scJW+ zDra8)+nB5F??j?>GNn;Q{HmHOk; zo~L{vL}1^gA}hFs71WxyM~6k>i`&1KPY!?~=eyGu4)xN1hW#OA{4b>m9}T64F|d>TvOb;8Dcsp!H}JZc;3rR(Qkp`)FbnnbU6ys=5}r^Ck1UJ^4@QZp@4=@;B*A zpKSxvWuA|MB$*1FSK=}Yt(i^bpK0-ZVZR-HJ6SKQY^8I}*YC4zW30Z+lQeC-`D>?b z;$?9MHJ@m98#~wN$VDHbU3p7_aV=s}kLrPtxX8vozCCScIt(8-Jom$;J?H$y@eNZw zW`d(K3+q>Sz%_unJw#+Bx@Bm~qy~J%tu5YdQvc(Y2&(?wWA~iE>2Idd+!>}slI%@q z;{A)WYgx;KQ)QY`26s%*4Z>xUE;r@0N6Ry~G@y7=B!ixvmwEdepMNW* z%iqzO@hGMA-O~8gP}W?9*nD%kka5~mS|6F*yP=EBHpVb|Mo9QPNwA~nzN-@l?-fvkL>M z5tqF)ikX)E*3pZ1bB4rsH*Devl$IrMf;wHtup{ZTpz+6L9n(h_dXa)blFh8QP5}}o<&Wxq!#B&+0k)X~|1--5{2`x_f)J>7?yS?Jn68UGs7NTFTH|J9gX&^&YApqzW_ z%Sr9eZ+rPHxx5y@!|Onha#cvG<3yV`#sDGf=vnpXyYI?uS$HApdQ)ea>(9oc=1*K~ z!+CY>7RBu|EG_%=;EWxNe-;(7^gPoxdAUlQ*?5?(Tx|iu3If8SI;g2LhuQc#VfWXand6YDixiwcf8s~4Gah;Sap{-IHTUqKsZSj8v zg4gRu1+4iDHQ&FxFG}1M!jDnis=3`ydsl8E;cIiz`p;A=_n&rNjx~BIZ5v=`hS76#C+-L< zE4tRT=l0l@-jRogqOGDl6f7_K;)i1dYEJyI?4$5fWVQIqb^s(~ZEF3aUpG1m3SHh0 zDU1GS@r@?wzCyPF_Rf#2sVYTnMzwdixm2m(GQ_@!w@xX)%RFxK#(H z=Jp=mG;Hbih&|VBrB1$(xo*XEVIFl07RfEyugu0b(~`wq{@hI@s25uwFaO3g^*1MI zle|JayWDh=WCTw)wPRtBMv@Oa#KQFp%B~q03hCb$a3Xo8Tb8$9TX|;Q0odC9(5sS=GYE97I+Gk zw5jSA7X-$oj$U~?83T2tRS!_TPCdQ*W#{hlOPye1%9XYm|8l3IzIgKdBc@V~*$|EW z&tr)OAex!7Y1W`Go2BUk_hwJw7qZoRDRxg$ht1N{^pnERX^*cxDTa1%JNQQ68vJx( zg|KU;LTSji02USWMNH|*WEpwQ*1f$JL@JoV*bon1EkGYgyF9BZXy+Xl!4 zjF^U+PiSsQ7g=(YnNETzYob#Tp+^tuf1iU&i$wr-mEQD^1;Zl z+|QT^$Uz`W@l~%N_}bJM*QO+D=}WA03`~zQva9?&pWQ5^(thL>-90~oZBgSTy@IG#@PGMS#CHq; zar~e=Qm7!BTrTS4@{3@U!g{T-B?GdkBsQ=#{x#M1khF6fOk9m}m-ikL^m1Sb?vt;m zLROJZeoT0ZvNO@3jj`JrizWJQZ}^`|5wilqpiJ>pTx&sWeH`LdTF-^ddj~`hVLNm( zti8Z{cU+>kw8YEe)gVISxTk&bbW(% zR=jZ*uLv(NH7W#XJcLYQEB2@Bw;(b{Pycj!*N0C82JYxE?*c4_9xVILC_%-@nUGv$ zUzMNoD-QU1x_(@=A`bAq)z)sp$xkz#sNN=fd(;p4eIjwmpac6mv7FvhMhvwymO%3m z4;-?(@n}_gYlQ!EEvFyCh8Q8PE1YT_9TyIiH3>Id#46LZN^f7|)h5{pGR;#G;mnCi<-7IFUKJU>+r^xo{B91YB&fi(eX9%(Xj&^f@FDQ0!odIDIL+f9TgtVrL zi`w3bC-7^0w7LQG7oZ%n;3JRzNSXo@Hh2nH^fac7KVj(9==U@yF|GLTJJZ(gh($^s zMN4C&w3n8~9MGOe5Qs9=;~db#KfX7@>NIS?nWw55#z*UwMUUS`c}br76`8US-fam^ zp>K^~;0vJJNeEMesQS4Yn4W10z;owiRQLbbz>U%1p5bcqVTxavc=o^dzd;T_wk1S{ zUsGDLp6{RYOKZyy4uqVSZ}-TLTE(GwrWE^pt1VhTacn0FM56SA?`3RlVcjC@QYg|008(QXok#{-&e|@yykO5v{dkH6ML7fZGXbW8!NI$dA&#mF+l(kp< z#Cp?Ww_>;IblC`QqktYYR_Ny(KfLPp0XYUl|4~TG2?j% z6pht+Y}RuQ-`V{KfF?I)00Hz9c|YO;7;#EWVz3Ih*BD7;f7<6Ly6eA2Pd_ zF9c-Lk8Ot1*jsVgzbXQKJt=O7{>^I#(deSE6%9SQ^(KxNMbR)S5xEg+J9>|x+p^#N zga?&;YKxKyHo?;s-2({8_jz4V(|`#TY5g^06Q!%GI@ng9umG=OUV6LK9>ucq*?+aQ z#68J<Pv2k@)L&KvcgSnY52a#<7lu)^!LLFup;q(BOLM1-h1% zVDL_PdrqZ%s2e7L&fjt9L>ogXy+1W+?qE^MYq~(0MJzxVI0J7y&U>uN`Ws{uCyNED z%Z3qtAwpR+QK41K;9#VenaU?|k?n5Z{%adw(hfh2Mc z;a~bjhy=0~T430)2Z7>g@<)TX=Y;e|3_r~OES7XhS~N3IGExjJ8P)g@?{G24^#F=N zH@sewZxSG;eU+$XHxYLR*v>O)k#k&ExJVgNO~^;R`oS#|X>UQ@$_cKWJ@w zEo!A)9#?Oz#sJZ~G>99Iu%h>uBCqRR_?w@+n8d1Sd+I(LGG)2QZ9JeAO4@lHDGK4K zH3TUxT!V#dr`q=4zcs|d8hr+&mr-8}(nV?fsw-Zv711L2B!f>=d6!5t5u9EBW9quD{~L!SyP>t0)`Ji zWC!%kKO}YjyL*~hO}J))Gl_+J8Z9`vgR)b;YB$-fQ0@iZJpO+3cHSzbxqf{6A1Cf2 z{=gmCY}32*ZkZf|;&JkY-y;v_Bt|PZaAI2je^{xC7*WYs(p|T!SIZ+JDlUr_zjvY= z<-I|OQG>G{-rlG&YF z=D}$rF%!Z(&=Et zB{5al|8=(}RR(EAiTPGo6Z1?n??~V+#=HiaZ~Y?uHtv2R^^$e}l9#Z!6#jq%^G0bK zBi&-}F?g5)$>IPP_raYwNYLdhXM4H-t77|unXrv-_B*PD*9;Y4>VmB>UP=Kn66Dt! zxsrBJH~ZTB&VSATYPUq-z(2?1t@?$Szbumm?I%rMv6@sOIEsBt^pREW4lj-Bk?PtE z?FcvX2u?`cUo9eye94`+fihlDHIG0_T*M|W{O0fkKgu@!%Kt9X65G&WtUW(9gVnnc zhSJK&m#x2?Q9ygLu+$g|21V8J1PRkJPknEiI;!m34Yv%;lpXo~`4aIcX}+3nN!DMe zOMx6tuq0Q$xWj_TvWztH(xhCYMRu?5`hxq1nx6ZoE^=I?`YRG$o>6$J{h~Hw+!Eb; zG;pvMdaK0sH~B%%qW}lIKFuA34m5*OXBJ~X<=KMKSzJ#@w!Z!rjR{jw z#j1DFl8t&7KID|%4Drq42#an*ew_2a#Yy6&L?5^wefmJPu|2HiXlv*C=MVd1<^x3U@>cQ2uN~w98! z2sVT&3$cqmG=_ky-+h|AI&G&c_RqY`;a)4#ybhsbE4`3Frt+FVS0fDB22|cT9pYY_nKnP z{Bv*2+}^ORV4Z|l8Z#6Fab5IDTA&Ri@Q_ZF);M1}w3!(5<<=*X`YR ze&3!H%EbD`oMzghZa0U+d`FYeXWceTF$C6kDPE7Yk*-D(gD%=zPb2rySW$%Q3OM#v zG3Av{Q80!LOHk^}N!JQA={)dP>A1Cj4J-6lE9ugtXY`=X9{oLQ;hHfNNd!y`c%U_3 z6+Axi7`|}-&vlzY7dPt1j%o@A&yRuMO4r`{qm!L1l~dGE07v-yib*prmon6Xpw@}2 zo{Q&MoAqDbMtjU3Oql=p8R1%Zq@($Zp8Z#S1PR-0JEysERHp9-9<&*(<&$0Nh=flZ zK4w|%PxyRa%FWInL3KW_Qw7B%QdmB2P!*1H>^$-0M)FgBz1RGTQ(`cZh;%#ohxqgz z&hvthAL*uzRs8n)UsmQkmPY50&;7X-?ul;*FvS?Ks%bgO=O_J`j$1dOn9t2sqN%%`8V}NsUdK?U2Nv-dHR2W!;~wg zZcSo*q2w&6yoc68$jBti*=e|0-pg3%foGLPLrc-nr}6Fb+pL&UVjKr-24wsgmX^}? zyP(G+CA|hE;rCL~pV?Xk_F${mPrtC1bN|*g)LHV=?h8$?MoGPuRdR|9TnZKU80qOM z;b@<)6O#JRx!uw>tU27C2r&kGO_p@kjV_=}Tu<*mix}^1uF?+3dpP334@HQ=)u%8Q z{(NwkvK|Q%YB+2N7`zwu>$Dh1eq52d>d-m=nd#p->_T7b^zxmtaMF6%^zTdR9m~eX zFzrh!`qj<{TKOi#0{49*;Uo6ipJmpG3}(SOypge<&?mcCLoa9E#7)?&{FXaAfwXqc z5mq?b)(f#t*1f5RXy>PdHq>82Jls=~pFbVoGGhlq8rn}L6)VI@_lLh}6X$m|E%*F=0xQWS ztgwv^NEqz>mU5J1bo~*J7}O6IC_D=2v&oJAk{p;~o4XxW(W`7JWF)r;T%H!ts|fRM zE_W?u);C?#X0enLeo{XjoZdWqrfhm Date: Sun, 24 Mar 2024 22:49:03 +0900 Subject: [PATCH 02/28] =?UTF-8?q?[FEATURE]=20#161=20:=20SignIn=20->=20Noti?= =?UTF-8?q?ce=20=EB=84=A4=EB=B9=84=EA=B2=8C=EC=9D=B4=EC=85=98=20=EC=8B=9C?= =?UTF-8?q?=20=EB=B0=B1=EC=8A=A4=ED=83=9D=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt b/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt index e2da0bd7..7820c475 100644 --- a/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt +++ b/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt @@ -73,7 +73,11 @@ fun WappNavHost( ) signInScreen( signInUseCase = signInUseCase, - navigateToNotice = navController::navigateToNotice, + navigateToNotice = { + navController.navigateToNotice( + navOptions { popUpTo(signInNavigationRoute) { inclusive = true } }, + ) + }, navigateToSignUp = navController::navigateToSignUp, ) signUpScreen( From 82ec57008a6bb7323b04796deeb7ae2b1a109fcc Mon Sep 17 00:00:00 2001 From: tgyuu-An Date: Sun, 24 Mar 2024 22:56:26 +0900 Subject: [PATCH 03/28] =?UTF-8?q?[CHORE]=20#161=20:=20isUserSignIn()=20sus?= =?UTF-8?q?pend=20=EC=8B=9C=EA=B7=B8=EB=8B=88=EC=B2=98=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0=20=EB=B0=8F=20viewModelScope=20init=20->=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wapp/feature/splash/SplashViewModel.kt | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/feature/splash/src/main/java/com/wap/wapp/feature/splash/SplashViewModel.kt b/feature/splash/src/main/java/com/wap/wapp/feature/splash/SplashViewModel.kt index d5c4d0f0..1ccba97d 100644 --- a/feature/splash/src/main/java/com/wap/wapp/feature/splash/SplashViewModel.kt +++ b/feature/splash/src/main/java/com/wap/wapp/feature/splash/SplashViewModel.kt @@ -17,21 +17,21 @@ class SplashViewModel @Inject constructor( val splashUiEvent = _splashUiEvent.asSharedFlow() init { - viewModelScope.launch { - isUserSignIn() - } + isUserSignIn() } - private suspend fun isUserSignIn() = isUserSignInUseCase() - .onSuccess { isSignIn -> - if (isSignIn) { - _splashUiEvent.emit(SplashEvent.SignInUser) - } else { - _splashUiEvent.emit(SplashEvent.NonSignInUser) + private fun isUserSignIn() = viewModelScope.launch { + isUserSignInUseCase() + .onSuccess { isSignIn -> + if (isSignIn) { + _splashUiEvent.emit(SplashEvent.SignInUser) + } else { + _splashUiEvent.emit(SplashEvent.NonSignInUser) + } + }.onFailure { throwable -> + _splashUiEvent.emit(SplashEvent.Failure(throwable)) } - }.onFailure { throwable -> - _splashUiEvent.emit(SplashEvent.Failure(throwable)) - } + } sealed class SplashEvent { data object SignInUser : SplashEvent() From 645fa12a7c72b494685f4d226c9655074650d5f1 Mon Sep 17 00:00:00 2001 From: JinHo Jeong Date: Mon, 25 Mar 2024 09:29:16 +0900 Subject: [PATCH 04/28] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0e41e681..027c13e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects From 62e16cb0f169fe1830d8a80617ef75d5349b455a Mon Sep 17 00:00:00 2001 From: JinHo Jeong Date: Mon, 25 Mar 2024 09:45:26 +0900 Subject: [PATCH 05/28] Update opened-pr-notification.yml --- .github/workflows/opened-pr-notification.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/opened-pr-notification.yml b/.github/workflows/opened-pr-notification.yml index 1cded89d..cc33fc78 100644 --- a/.github/workflows/opened-pr-notification.yml +++ b/.github/workflows/opened-pr-notification.yml @@ -3,7 +3,6 @@ on: pull_request: branches: - develop - - main types: - opened - reopened From 261f8a33358bc09ccf0c8986da4278f803ace3b8 Mon Sep 17 00:00:00 2001 From: JinHo Jeong Date: Mon, 25 Mar 2024 09:45:42 +0900 Subject: [PATCH 06/28] Update closed-pr-notification.yml --- .github/workflows/closed-pr-notification.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/closed-pr-notification.yml b/.github/workflows/closed-pr-notification.yml index cfcdac28..4a9ad7ea 100644 --- a/.github/workflows/closed-pr-notification.yml +++ b/.github/workflows/closed-pr-notification.yml @@ -2,8 +2,7 @@ name: Closed PR Notification on: pull_request: branches: - - dev - - main + - develop types: - closed From bd18b3ab5b9622be26557f30b73876441c89cb8d Mon Sep 17 00:00:00 2001 From: JinHo Jeong Date: Mon, 25 Mar 2024 09:50:13 +0900 Subject: [PATCH 07/28] Update released-app-distribution.yml --- .github/workflows/released-app-distribution.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/released-app-distribution.yml b/.github/workflows/released-app-distribution.yml index 71aad31e..67536546 100644 --- a/.github/workflows/released-app-distribution.yml +++ b/.github/workflows/released-app-distribution.yml @@ -1,8 +1,8 @@ name: Released-App-Distribution + on: - push: - branches: - - 'release' + push: + branches: [ release ] jobs: build: From 96ff294e97b6580d9bbc21f8cacde3b0de39809c Mon Sep 17 00:00:00 2001 From: JinHo Jeong Date: Mon, 25 Mar 2024 19:03:50 +0900 Subject: [PATCH 08/28] Update closed-pr-notification.yml --- .github/workflows/closed-pr-notification.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/closed-pr-notification.yml b/.github/workflows/closed-pr-notification.yml index 4a9ad7ea..6638781f 100644 --- a/.github/workflows/closed-pr-notification.yml +++ b/.github/workflows/closed-pr-notification.yml @@ -3,6 +3,8 @@ on: pull_request: branches: - develop + - release + - main types: - closed From f19eb0a122f7a5ca9e3bc3b763966eabdcf4bbd8 Mon Sep 17 00:00:00 2001 From: JinHo Jeong Date: Mon, 25 Mar 2024 19:04:15 +0900 Subject: [PATCH 09/28] Update opened-pr-notification.yml --- .github/workflows/opened-pr-notification.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/opened-pr-notification.yml b/.github/workflows/opened-pr-notification.yml index cc33fc78..f44f34e9 100644 --- a/.github/workflows/opened-pr-notification.yml +++ b/.github/workflows/opened-pr-notification.yml @@ -3,6 +3,8 @@ on: pull_request: branches: - develop + - release + - main types: - opened - reopened From a927f4da3be0167fb05bab5955c2ced3d4e8fec8 Mon Sep 17 00:00:00 2001 From: JinHo Jeong Date: Mon, 25 Mar 2024 19:05:01 +0900 Subject: [PATCH 10/28] Update released-app-distribution.yml --- .github/workflows/released-app-distribution.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/released-app-distribution.yml b/.github/workflows/released-app-distribution.yml index 67536546..f0228203 100644 --- a/.github/workflows/released-app-distribution.yml +++ b/.github/workflows/released-app-distribution.yml @@ -2,7 +2,8 @@ name: Released-App-Distribution on: push: - branches: [ release ] + branches: + - release jobs: build: From 37ef4492545672210a9b2b7691319ec7204c42f5 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Thu, 28 Mar 2024 01:19:14 +0900 Subject: [PATCH 11/28] =?UTF-8?q?[CHORE]=20:=20Analytics=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 4 +++- core/analytics/.gitignore | 1 + core/analytics/build.gradle.kts | 29 +++++++++++++++++++++++++++++ core/analytics/consumer-rules.pro | 0 core/analytics/proguard-rules.pro | 21 +++++++++++++++++++++ settings.gradle.kts | 3 ++- 6 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 core/analytics/.gitignore create mode 100644 core/analytics/build.gradle.kts create mode 100644 core/analytics/consumer-rules.pro create mode 100644 core/analytics/proguard-rules.pro diff --git a/.idea/gradle.xml b/.idea/gradle.xml index fc333ade..3384f7d0 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -17,8 +17,9 @@