From 6bae3651f39ec3b427d4d2e587722c619736e1b0 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sat, 13 Jan 2024 02:07:06 +0900 Subject: [PATCH 01/14] =?UTF-8?q?[FEAT/#94]=20=EC=9D=B4=EB=AF=B8=EC=A7=80?= =?UTF-8?q?=20X3=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/img_sign_in_kakao_button.png | Bin 3307 -> 3576 bytes .../src/main/res/layout/activity_signin.xml | 1 + 2 files changed, 1 insertion(+) diff --git a/presentation/src/main/res/drawable/img_sign_in_kakao_button.png b/presentation/src/main/res/drawable/img_sign_in_kakao_button.png index c882acc7311d61cc8eab3b316e0b90c64de18dfc..46846ce838a4d8efbeda53e785288d0b9739976e 100644 GIT binary patch literal 3576 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 KRbhGl#(w~q#(C2K literal 3307 zcmV

5Q;P)Px>rAb6VRCodHT?u#;MHc>Nau7nu!4+Zv0YOk%Sr8)OKIB$GMZPbru((1NvjPjB zq9z<3h#FXR7g-lkIagr?ky93hRW3nL7iCo>g0LbIjwIwhXX|yRdU`VVY=-nOufA`l zs;lZ%SN;9^_3P?auS^i3>MSf28zq=bNHrO)QxY7rOuWAXxUP#ls{2^$*dNk;@64}< z#w)}vx+f@c-!aXUII&v-vVIKpsbS+@O2KG{d>WFUiAu~iBq{APo?>M^q29Im%OLH2Hu`i$2O#>thdG{Fr7l&OiBwIP` zsR1(W1cQ`XGJfOjtKZAHi(-_MzPzlV&BeV8H7S9uW=dMG^+tBlk!qxD4qRbaXf4f!_o;>y@P4ZWZZx~dG87nj@)EU8~nO!GGW z4iyzv{UpD@t~(x`zPQBNhDQWGR*U+sJq9Zn`i`{CaYI<0g|jzfIbE#?&iX(XM?FNE=_E9G8`u zaQ2rFt!z+AQ_P)y1--giwR)}44+&Nsya3haHuQonD62A9UR-vwP~#aeH-ORWj`9x8 z?}l!W;$p865K7-}ei(WU8xwef0E>1{P~tjXBj7P(&B+8h4N!lS=D-NJLcrytQ0QMs z?COfVZawvgh`Jz(um$zco{VHBWEX89&q1JHvg0x%=C0ckiR?>eL`PNO z>6!UT7Z)v!5)5O(_oqV9<(4vhn-!*Y{jLX_V9WB0*tjD?W3uxXLh!fMQJ7LaYebdl zCOon&TcfKVq0Tl9=~n{!$c6k*GFRes*75uNn(v2T8x%S&2eJyc|_J%KcMO*maM#Z zc@(BTs7^!5JbgT3LKB;|^<|VUC^RFgf!coCUI{q4-wG^AH$4;9qz$BFj~Hv#d?0gn zAPvjAzE)P65E7zF7(HcCu~}m>eLkn%Bj6EZxo?JRFaov+c>GpqOU6fxfNKQ!Glgq> zxYP#(l$m#;6Xt%CMf8$*v$0wg_|PDe1UCYTjco#wMQkxy&SIBPTL%U=Bs}`sM1Vfl zv+`b>h;myB0wlSZv6vbBf&jl2`UO^Qlo^Y8z%K|eWBCPEZqy^j`uba7XbRA(yBZ(+ zj)7wYTqEFCc_(J7sIYG&RMUsbU~E(Td_Dw)MJDW7e*tZ;x87}J9Wmo++f`tv52{uRvome;@90y4{>i0S`ECQG zzZi|-14==*Uy~k-6Y;fSi$&Mnr9GA_rXpf@2W7R7;c8@5MTKcd>EK=4xczJoAY9XqxBh!syRa>m@vO-Z+Wy1Px_3_|UZ~`OG zf3;$ljJ5hN!1!s-yF%rG7Czg09>0Gg4u`f_EjGzQltT8!5asbC$FyQ(@@Tpw<8b1_J!R zC1VZh18iOa+&$5Llpm}CI^SZSZ}glSdM9A}%8O``VAYYR&r_a^LtIRiQ$6R^`8oLF zSTlzv#CHuY2K}D>b2R3Nh3w8k`!*_5$@2gH9I8pWF(Zp*_B9c^RNiTXMPj_|dIAsJ z2h5!TVOD!hj9VK-JHcqAyw?o$C?w^bY}vQ}E23sGnl`FJ?<7?x)B8NrSM1lL6eSLP zcC>C;spxmp=EkCHCo8jE4Zmpm{`oWQma&#B2Yx&D+G8jQsx$Lr(tl`y1qa^{aLZV} zHOo}Nj(|rq@4*fdkKcO)n6bRaj43=ofEmjJkhqHX2ry%Lj~P?AL4Yhs&9tJzO+7AV z1iV8)ET}M>5-~_{SgQCrUpMYuvs^n!5m0R1X(0uz(jg2i7m$E5tP!&|1A`P39yTMu z2pALrMXL(O1E!`pM_W@&7GEu1H)vnETZ{lBzz8S^C>pyESoyrLo;iXMU<8bg08KBL zSy&nUGI9SH0Y-ojAX&wqbC?$x0Y)HT5MY57Fqeuu$_Ow5EU=gd7y(8gU=VP*pwQD% zoIEXd7Wk`Je7Ms+#oa@IS!obX58T(~8jJuVzzFCO_`fu)PsQd3GtOSZOa1^Y*z}LKSR?pV$rr$B{DN|B?!jzbrK|3FKp+1=e?2wKMEv z$5~+24w8;r`9*Bi*}hE$E(?w4a;`~!a@M3QDmLNz#A=#6qBG;<=@1N? z?VN@L;~$@j!7ESYVa!OY>$&KL7K|KJto+73(iqPPH+ST($59}`MncJ1AV;NbTiN>J z=_TB?(9cT=WLO4JeR9E@REf)_e3Bx)PnxPM^l8@pLqS!OBnlbW4tR|6Al&* zR{QlR6CUi$ing|CX9OBXS@7l})jy|fLmyWO4~L|ApE+djOG;nQ({#Sj)=1d45ZaRr ze_xz~xr?I37P<+DiMAj|2=QAwRNxcgOjhC~>vC*71bh})A;JgizD>ZI4Zsr%Abe#})~9$#-x8aA^1UiOL{oY4sAfnRRfLRbSCk*+xeBByk-|8zKd6PbN zJPZqGTVDY~#2e#n!jrWpVc+3!go(Z4dvw*;x8Rva^Ms}*JYgr5p(mVb zwdQMWjF^u);9wHnEEw#%cp#|@kRm4Ad+~hLRlU;x5jXsP;kJHKN}*Gygf!`%nUSY> z5~t3s-q1j}wlBBSsAR`!(tZ5&IGj453bI`B+L$VQ1lJ5SPZr;#(niCfI=|{zZs(r$ z`B$Uyy_nC`E>2J5Dt&NMw$Q57Cu`eYV$A8budl9X zxy%>{)QZ5`y-&EiohrWkiC4To%>(-OFvj4x7oH(dQ((EHswuGC)i+}KjHhE!UT*(| zQ1+GfAbDx7RkM@%9M>%ZwIZkMu)qqKOT`^! z1Q-DpSj+>A03#4E2#}v-_PHG}my0{f2m~(ziUU6}{F%WE0gs#!U<3jPftkv8UEYKu pfG!z#l@SOs1cZ>002ovPDHLkV1oS~Dl`B9 diff --git a/presentation/src/main/res/layout/activity_signin.xml b/presentation/src/main/res/layout/activity_signin.xml index 03913430..5075e3d5 100644 --- a/presentation/src/main/res/layout/activity_signin.xml +++ b/presentation/src/main/res/layout/activity_signin.xml @@ -39,6 +39,7 @@ android:layout_marginHorizontal="30dp" android:layout_marginBottom="12dp" android:src="@drawable/img_sign_in_kakao_button" + android:adjustViewBounds="true" app:layout_constraintBottom_toTopOf="@id/btn_terms" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> From 29b4092818f49fdd63c200f4bb75def974885d44 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sat, 13 Jan 2024 02:09:17 +0900 Subject: [PATCH 02/14] =?UTF-8?q?[FEAT/#94]=20=EA=B0=9C=ED=96=89=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=ED=95=A8=EC=88=98=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../going/presentation/onboarding/signin/SignInActivity.kt | 1 + .../going/presentation/onboarding/signin/SignInViewModel.kt | 1 + .../onboarding/signup/OnboardingProfileSettingActivity.kt | 3 ++- .../onboarding/signup/OnboardingProfileSettingViewModel.kt | 3 ++- .../going/presentation/onboarding/splash/SplashActivity.kt | 1 + .../going/presentation/onboarding/splash/SplashViewModel.kt | 2 +- .../presentation/tendency/result/TendencyResultActivity.kt | 5 +++-- .../presentation/tendency/result/TendencyResultViewModel.kt | 2 ++ 8 files changed, 13 insertions(+), 5 deletions(-) diff --git a/presentation/src/main/java/com/going/presentation/onboarding/signin/SignInActivity.kt b/presentation/src/main/java/com/going/presentation/onboarding/signin/SignInActivity.kt index 01573c97..a99b0167 100644 --- a/presentation/src/main/java/com/going/presentation/onboarding/signin/SignInActivity.kt +++ b/presentation/src/main/java/com/going/presentation/onboarding/signin/SignInActivity.kt @@ -21,6 +21,7 @@ import kotlinx.coroutines.flow.onEach @AndroidEntryPoint class SignInActivity : BaseActivity(R.layout.activity_signin) { + private val viewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { diff --git a/presentation/src/main/java/com/going/presentation/onboarding/signin/SignInViewModel.kt b/presentation/src/main/java/com/going/presentation/onboarding/signin/SignInViewModel.kt index 3a0ca7f9..6d1d68f6 100644 --- a/presentation/src/main/java/com/going/presentation/onboarding/signin/SignInViewModel.kt +++ b/presentation/src/main/java/com/going/presentation/onboarding/signin/SignInViewModel.kt @@ -23,6 +23,7 @@ class SignInViewModel @Inject constructor( private val authRepository: AuthRepository, private val tokenRepository: TokenRepository, ) : ViewModel() { + private val _postChangeTokenState = MutableStateFlow(AuthState.EMPTY) val postChangeTokenState: StateFlow = _postChangeTokenState diff --git a/presentation/src/main/java/com/going/presentation/onboarding/signup/OnboardingProfileSettingActivity.kt b/presentation/src/main/java/com/going/presentation/onboarding/signup/OnboardingProfileSettingActivity.kt index 6794c983..8041e46a 100644 --- a/presentation/src/main/java/com/going/presentation/onboarding/signup/OnboardingProfileSettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/onboarding/signup/OnboardingProfileSettingActivity.kt @@ -8,10 +8,10 @@ import androidx.activity.viewModels import androidx.core.content.res.ResourcesCompat import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope +import com.going.domain.entity.AuthState import com.going.domain.entity.NameState import com.going.presentation.R import com.going.presentation.databinding.ActivityOnboardingProfileSettingBinding -import com.going.domain.entity.AuthState import com.going.presentation.onboarding.splash.SplashActivity import com.going.presentation.tendency.ttest.TendencyTestActivity import com.going.ui.base.BaseActivity @@ -24,6 +24,7 @@ import kotlinx.coroutines.flow.onEach @AndroidEntryPoint class OnboardingProfileSettingActivity : BaseActivity(R.layout.activity_onboarding_profile_setting) { + private val viewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { diff --git a/presentation/src/main/java/com/going/presentation/onboarding/signup/OnboardingProfileSettingViewModel.kt b/presentation/src/main/java/com/going/presentation/onboarding/signup/OnboardingProfileSettingViewModel.kt index 5adbd13e..dcc4e9d0 100644 --- a/presentation/src/main/java/com/going/presentation/onboarding/signup/OnboardingProfileSettingViewModel.kt +++ b/presentation/src/main/java/com/going/presentation/onboarding/signup/OnboardingProfileSettingViewModel.kt @@ -3,10 +3,10 @@ package com.going.presentation.onboarding.signup import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import com.going.domain.entity.AuthState import com.going.domain.entity.NameState import com.going.domain.entity.request.SignUpRequestModel import com.going.domain.repository.AuthRepository -import com.going.domain.entity.AuthState import com.kakao.sdk.auth.AuthApiClient import com.kakao.sdk.auth.TokenManagerProvider import com.kakao.sdk.user.UserApiClient @@ -21,6 +21,7 @@ import javax.inject.Inject class OnboardingProfileSettingViewModel @Inject constructor( private val authRepository: AuthRepository, ) : ViewModel() { + val name = MutableStateFlow("") val nowNameLength = MutableLiveData(0) val info = MutableStateFlow("") diff --git a/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashActivity.kt b/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashActivity.kt index 1575d0c1..708180cd 100644 --- a/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashActivity.kt +++ b/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashActivity.kt @@ -21,6 +21,7 @@ import kotlinx.coroutines.flow.onEach @AndroidEntryPoint class SplashActivity : BaseActivity(R.layout.activity_splash) { + private val viewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashViewModel.kt b/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashViewModel.kt index 87737209..b97d0ea7 100644 --- a/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashViewModel.kt +++ b/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashViewModel.kt @@ -5,7 +5,6 @@ import androidx.lifecycle.viewModelScope import com.going.domain.entity.AuthState import com.going.domain.repository.AuthRepository import com.going.domain.repository.TokenRepository -import com.going.presentation.onboarding.signin.SignInViewModel import com.going.presentation.util.toErrorCode import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow @@ -18,6 +17,7 @@ class SplashViewModel @Inject constructor( private val authRepository: AuthRepository, private val tokenRepository: TokenRepository, ) : ViewModel() { + private val _userState = MutableStateFlow(AuthState.LOADING) val userState: StateFlow = _userState fun getHasAccessToken(): Boolean = tokenRepository.getAccessToken().isNotBlank() diff --git a/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt b/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt index 58896c10..43fc5c6e 100644 --- a/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt +++ b/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt @@ -23,18 +23,19 @@ import kotlinx.coroutines.flow.onEach @AndroidEntryPoint class TendencyResultActivity : BaseActivity(R.layout.activity_tendency_result) { + private val viewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - getuserInfo() + getUserInfo() observeUserInfoState() initRestartBtnClickLitener() initSaveImgBtnClickListener() initFinishBtnClickListener() } - private fun getuserInfo() { + private fun getUserInfo() { viewModel.getUserInfoState() } diff --git a/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultViewModel.kt b/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultViewModel.kt index 34f301bd..5972f45e 100644 --- a/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultViewModel.kt +++ b/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultViewModel.kt @@ -17,6 +17,7 @@ import javax.inject.Inject class TendencyResultViewModel @Inject constructor( private val profileRepository: ProfileRepository, ) : ViewModel() { + private val _userInfoState = MutableStateFlow>(UiState.Empty) val userInfoState: StateFlow> = _userInfoState @@ -273,4 +274,5 @@ class TendencyResultViewModel @Inject constructor( ), ), ) + } From d2e95d3c66c8b7c5c4b118d99c553be976c5d5d1 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sat, 13 Jan 2024 02:41:34 +0900 Subject: [PATCH 03/14] =?UTF-8?q?[CHORE/#94]=20=EC=A3=BC=EC=84=9D=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bc972e59..6a33aaae 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,7 +25,6 @@ - From 005079a7fdb267e2d05f657387ca01b5bad0bd12 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sat, 13 Jan 2024 16:00:22 +0900 Subject: [PATCH 04/14] =?UTF-8?q?[CHORE/#94]=20=EC=8A=A4=ED=94=8C=EB=A0=88?= =?UTF-8?q?=EC=8B=9C=20=EA=B2=80=EC=82=AC=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../going/presentation/onboarding/splash/SplashActivity.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashActivity.kt b/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashActivity.kt index 708180cd..4a801fd5 100644 --- a/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashActivity.kt +++ b/presentation/src/main/java/com/going/presentation/onboarding/splash/SplashActivity.kt @@ -40,7 +40,11 @@ class SplashActivity : BaseActivity(R.layout.activity_spl private fun initSplash() { Handler(Looper.getMainLooper()).postDelayed({ - viewModel.getUserState() + if (viewModel.getHasAccessToken()) { + viewModel.getUserState() + } else { + navigateToSignInScreen() + } }, 3000) } From 4c9ee7ad5844b022c8833bb81577cc619d6aec73 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sun, 14 Jan 2024 12:03:55 +0900 Subject: [PATCH 05/14] =?UTF-8?q?[FIX]=20=EC=95=A0=EB=8B=88=EB=A9=94?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=8B=A4=ED=96=89=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/git_toolbox_prj.xml | 15 +++++++++++++++ .../tendency/ttest/TendencyTestActivity.kt | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 .idea/git_toolbox_prj.xml diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml new file mode 100644 index 00000000..02b915b8 --- /dev/null +++ b/.idea/git_toolbox_prj.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/tendency/ttest/TendencyTestActivity.kt b/presentation/src/main/java/com/going/presentation/tendency/ttest/TendencyTestActivity.kt index 3533abd3..88c03907 100644 --- a/presentation/src/main/java/com/going/presentation/tendency/ttest/TendencyTestActivity.kt +++ b/presentation/src/main/java/com/going/presentation/tendency/ttest/TendencyTestActivity.kt @@ -84,8 +84,9 @@ class TendencyTestActivity : override fun onAnimationStart(animation: Animator) { viewModel.clearAllChecked() setProgressAnimate(binding.pbTendencyTest, viewModel.step.value) - fadeOutList.map { - it.start() + + for (i in 1 until fadeOutList.size) { + fadeOutList[i].start() } } From 9f400a253607a79530959eb9e489d09923ac45e1 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sun, 14 Jan 2024 15:38:22 +0900 Subject: [PATCH 06/14] =?UTF-8?q?[FIX/#94]=20=EA=B2=80=EC=82=AC=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EC=9D=B4=EB=A6=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/tendency/result/TendencyResultActivity.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt b/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt index 43fc5c6e..8cdbe049 100644 --- a/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt +++ b/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt @@ -43,16 +43,16 @@ class TendencyResultActivity : viewModel.userInfoState.flowWithLifecycle(lifecycle).onEach { state -> when (state) { is UiState.Loading -> return@onEach - is UiState.Success -> bindTendencyInfo(state.data.result) + is UiState.Success -> bindTendencyInfo(state.data.name, state.data.result) is UiState.Failure -> toast(state.msg) is UiState.Empty -> return@onEach } }.launchIn(lifecycleScope) } - private fun bindTendencyInfo(number: Int) { + private fun bindTendencyInfo(name: String, number: Int) { with(binding) { - tvTendencyTestResultTitle.text = getString(R.string.tendency_test_result_title, "찐두릅") + tvTendencyTestResultTitle.text = getString(R.string.tendency_test_result_title, name) viewModel.mockTendencyResult[number].apply { imgTendencyTestResult.setImageResource(resultImage) From c917fc0d959971ec937e2262be50f92828780d2d Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sun, 14 Jan 2024 18:47:57 +0900 Subject: [PATCH 07/14] =?UTF-8?q?[CHORE/#94]=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=20=EB=B3=80=EC=88=98=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/tendency/result/TendencyResultActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt b/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt index 7145eb3a..a04c41d7 100644 --- a/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt +++ b/presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt @@ -155,11 +155,11 @@ class TendencyResultActivity : PERMISSION_REQUEST_CODE, ) } else { - saveImageToGallery(resources) + saveImageToGallery() } } - private fun saveImageToGallery(resources: Resources) { + private fun saveImageToGallery() { val imageBitmap: Bitmap = BitmapFactory.decodeResource( resources, R.drawable.img_tendency_result_ari, From 35df16b0e181477e176d8b2203364d670fd0f671 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sun, 14 Jan 2024 18:49:45 +0900 Subject: [PATCH 08/14] =?UTF-8?q?[CHORE/#94]=20=EA=B0=9C=EC=9D=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B2=98=EB=A6=AC=EB=B0=A9=EC=B9=A8=20url=20?= =?UTF-8?q?=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/going/presentation/onboarding/signin/SignInActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/going/presentation/onboarding/signin/SignInActivity.kt b/presentation/src/main/java/com/going/presentation/onboarding/signin/SignInActivity.kt index a99b0167..2cab77e4 100644 --- a/presentation/src/main/java/com/going/presentation/onboarding/signin/SignInActivity.kt +++ b/presentation/src/main/java/com/going/presentation/onboarding/signin/SignInActivity.kt @@ -96,6 +96,6 @@ class SignInActivity : BaseActivity(R.layout.activity_sig } companion object { - const val TERMS_URL = "http://www.naver.com" + const val TERMS_URL = "https://goinggoing.notion.site/75f5d981a5b842a6be74a9dc17ca67de?pvs=74" } } From 83eb0a456f31aaf2beabb69856556169d11071c9 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sun, 14 Jan 2024 19:04:37 +0900 Subject: [PATCH 09/14] =?UTF-8?q?[CHORE/#94]=20setting=20string=EA=B0=92?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- presentation/src/main/res/values/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 4f6e8737..663bd990 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -134,7 +134,8 @@ 프로필 문의하기 서비스 버전 - 약관 및 정책 + 서비스 이용 약관 + 개인정보 처리 방침 About doorip 로그아웃 정말 탈퇴하시겠어요? From 14deb302d90f9c23da139aee02871189fc815ab2 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sun, 14 Jan 2024 19:12:12 +0900 Subject: [PATCH 10/14] =?UTF-8?q?[FEAT/#94]=20AboutDoorip=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/activity_setting.xml | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/res/layout/activity_setting.xml b/presentation/src/main/res/layout/activity_setting.xml index 92edda12..ce23284b 100644 --- a/presentation/src/main/res/layout/activity_setting.xml +++ b/presentation/src/main/res/layout/activity_setting.xml @@ -190,6 +190,41 @@ + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/btn_setting_terms"> Date: Sun, 14 Jan 2024 19:13:32 +0900 Subject: [PATCH 11/14] =?UTF-8?q?[FEAT/#94]=20FAQ=20=EB=A7=81=ED=81=AC=20?= =?UTF-8?q?=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/setting/SettingActivity.kt | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index dd44fa03..522b8b5b 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -1,5 +1,7 @@ package com.going.presentation.setting +import android.content.Intent +import android.net.Uri import android.os.Bundle import com.going.presentation.R import com.going.presentation.databinding.ActivitySettingBinding @@ -18,11 +20,12 @@ class SettingActivity : BaseActivity(R.layout.activity_s initProfileClickListener() initInquireClickListener() - initPolicyClickListener() + setVersionCode() +// initPolicyClickListener() +// initTermsClickListener() initAboutDooripClickListener() initLogoutClickListener() initQuitClickListener() - setVersionCode() } private fun initProfileClickListener() { @@ -32,16 +35,25 @@ class SettingActivity : BaseActivity(R.layout.activity_s private fun initInquireClickListener() { binding.btnSettingInquire.setOnSingleClickListener { + binding.btnSettingAboutDoorip.setOnSingleClickListener { + Intent(Intent.ACTION_VIEW, Uri.parse(FAQ)).apply { + startActivity(this) + } + } } } - private fun initPolicyClickListener() { - binding.btnSettingPolicy.setOnSingleClickListener { - } + private fun setVersionCode() { + binding.tvSettingShowServiceVersion.text = VERSION_CODE } private fun initAboutDooripClickListener() { binding.btnSettingAboutDoorip.setOnSingleClickListener { + binding.btnSettingAboutDoorip.setOnSingleClickListener { + Intent(Intent.ACTION_VIEW, Uri.parse(ABOUT_DOORIP)).apply { + startActivity(this) + } + } } } @@ -67,10 +79,6 @@ class SettingActivity : BaseActivity(R.layout.activity_s quitDialog?.show(supportFragmentManager, quitDialog?.tag) } - private fun setVersionCode() { - binding.tvSettingShowServiceVersion.text = VERSION_CODE - } - override fun onDestroy() { super.onDestroy() if (logoutDialog?.isAdded == true) logoutDialog?.dismiss() @@ -79,5 +87,9 @@ class SettingActivity : BaseActivity(R.layout.activity_s companion object { private const val VERSION_CODE = "v1.0" + private const val ABOUT_DOORIP = + "https://goinggoing.notion.site/758273e결2bebb477aac0adb0195359f21" + private const val FAQ = + "https://goinggoing.notion.site/FAQ-920f6ad93fea46a983061f412e15cad1?pvs=74" } } From 30a4fe24a9056f934c2185457292faaaf38d1d91 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sun, 14 Jan 2024 19:14:50 +0900 Subject: [PATCH 12/14] =?UTF-8?q?[FEAT/#94]=20=EC=84=9C=EB=B9=84=EC=8A=A4?= =?UTF-8?q?=EC=9D=B4=EC=9A=A9=EC=95=BD=EA=B4=80=20=EB=A7=81=ED=81=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../going/presentation/setting/SettingActivity.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index 522b8b5b..89c7127d 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -21,7 +21,7 @@ class SettingActivity : BaseActivity(R.layout.activity_s initProfileClickListener() initInquireClickListener() setVersionCode() -// initPolicyClickListener() + initPolicyClickListener() // initTermsClickListener() initAboutDooripClickListener() initLogoutClickListener() @@ -47,6 +47,14 @@ class SettingActivity : BaseActivity(R.layout.activity_s binding.tvSettingShowServiceVersion.text = VERSION_CODE } + private fun initPolicyClickListener() { + binding.btnSettingPolicy.setOnSingleClickListener { + Intent(Intent.ACTION_VIEW, Uri.parse(PRIVACY_POLICY_URL)).apply { + startActivity(this) + } + } + } + private fun initAboutDooripClickListener() { binding.btnSettingAboutDoorip.setOnSingleClickListener { binding.btnSettingAboutDoorip.setOnSingleClickListener { @@ -91,5 +99,7 @@ class SettingActivity : BaseActivity(R.layout.activity_s "https://goinggoing.notion.site/758273e결2bebb477aac0adb0195359f21" private const val FAQ = "https://goinggoing.notion.site/FAQ-920f6ad93fea46a983061f412e15cad1?pvs=74" + private const val PRIVACY_POLICY_URL = + "https://goinggoing.notion.site/c4d5513bba2c4c20aaf9e21522289304?pvs=74" } } From f1703e468f9632f958dd63df25940ca35c79c335 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sun, 14 Jan 2024 19:15:42 +0900 Subject: [PATCH 13/14] =?UTF-8?q?[FEAT/#94]=20=EA=B0=9C=EC=9D=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B2=98=EB=A6=AC=20=EB=B0=A9=EC=B9=A8=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../going/presentation/setting/SettingActivity.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index 89c7127d..077a2a22 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -22,7 +22,7 @@ class SettingActivity : BaseActivity(R.layout.activity_s initInquireClickListener() setVersionCode() initPolicyClickListener() -// initTermsClickListener() + initTermsClickListener() initAboutDooripClickListener() initLogoutClickListener() initQuitClickListener() @@ -55,6 +55,14 @@ class SettingActivity : BaseActivity(R.layout.activity_s } } + private fun initTermsClickListener() { + binding.btnSettingTerms.setOnSingleClickListener { + Intent(Intent.ACTION_VIEW, Uri.parse(TERMS_URL)).apply { + startActivity(this) + } + } + } + private fun initAboutDooripClickListener() { binding.btnSettingAboutDoorip.setOnSingleClickListener { binding.btnSettingAboutDoorip.setOnSingleClickListener { @@ -101,5 +109,7 @@ class SettingActivity : BaseActivity(R.layout.activity_s "https://goinggoing.notion.site/FAQ-920f6ad93fea46a983061f412e15cad1?pvs=74" private const val PRIVACY_POLICY_URL = "https://goinggoing.notion.site/c4d5513bba2c4c20aaf9e21522289304?pvs=74" + private const val TERMS_URL = + "https://goinggoing.notion.site/75f5d981a5b842a6be74a9dc17ca67de?pvs=74" } } From bb7c6e9d21cdb2158f9cfe0d4bd9d2d1cfc699f4 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sun, 14 Jan 2024 19:23:00 +0900 Subject: [PATCH 14/14] =?UTF-8?q?[FEAT/#94]=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=AA=A8=EB=93=A0=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EC=97=B0=EA=B2=B0=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/setting/SettingActivity.kt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt index 077a2a22..20dd8844 100644 --- a/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt @@ -35,10 +35,8 @@ class SettingActivity : BaseActivity(R.layout.activity_s private fun initInquireClickListener() { binding.btnSettingInquire.setOnSingleClickListener { - binding.btnSettingAboutDoorip.setOnSingleClickListener { - Intent(Intent.ACTION_VIEW, Uri.parse(FAQ)).apply { - startActivity(this) - } + Intent(Intent.ACTION_VIEW, Uri.parse(FAQ)).apply { + startActivity(this) } } } @@ -65,10 +63,8 @@ class SettingActivity : BaseActivity(R.layout.activity_s private fun initAboutDooripClickListener() { binding.btnSettingAboutDoorip.setOnSingleClickListener { - binding.btnSettingAboutDoorip.setOnSingleClickListener { - Intent(Intent.ACTION_VIEW, Uri.parse(ABOUT_DOORIP)).apply { - startActivity(this) - } + Intent(Intent.ACTION_VIEW, Uri.parse(ABOUT_DOORIP_URL)).apply { + startActivity(this) } } } @@ -103,13 +99,13 @@ class SettingActivity : BaseActivity(R.layout.activity_s companion object { private const val VERSION_CODE = "v1.0" - private const val ABOUT_DOORIP = - "https://goinggoing.notion.site/758273e결2bebb477aac0adb0195359f21" private const val FAQ = "https://goinggoing.notion.site/FAQ-920f6ad93fea46a983061f412e15cad1?pvs=74" private const val PRIVACY_POLICY_URL = "https://goinggoing.notion.site/c4d5513bba2c4c20aaf9e21522289304?pvs=74" private const val TERMS_URL = "https://goinggoing.notion.site/75f5d981a5b842a6be74a9dc17ca67de?pvs=74" + private const val ABOUT_DOORIP_URL = + "https://goinggoing.notion.site/758273e2bebb477aac0adb0195359f21" } }