diff --git a/presentation/src/main/java/com/going/presentation/auth/SignInActivity.kt b/presentation/src/main/java/com/going/presentation/auth/SignInActivity.kt index 2979be28..a11e9a6f 100644 --- a/presentation/src/main/java/com/going/presentation/auth/SignInActivity.kt +++ b/presentation/src/main/java/com/going/presentation/auth/SignInActivity.kt @@ -1,11 +1,13 @@ package com.going.presentation.auth +import android.content.Intent +import android.net.Uri import android.os.Bundle import androidx.activity.viewModels import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope import com.going.presentation.R -import com.going.presentation.databinding.ActivityLoginBinding +import com.going.presentation.databinding.ActivitySigninBinding import com.going.ui.base.BaseActivity import com.going.ui.extension.UiState import com.going.ui.extension.setOnSingleClickListener @@ -14,13 +16,14 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @AndroidEntryPoint -class SignInActivity : BaseActivity(R.layout.activity_login) { +class SignInActivity : BaseActivity(R.layout.activity_signin) { private val viewModel by viewModels() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) initKakaoLoginBtnClickListener() + initTermsBtnClickListener() observeInfo() } @@ -30,6 +33,14 @@ class SignInActivity : BaseActivity(R.layout.activity_logi } } + private fun initTermsBtnClickListener() { + binding.btnTerms.setOnSingleClickListener { + Intent(Intent.ACTION_VIEW, Uri.parse(TERMS_URL)).apply { + startActivity(this) + } + } + } + private fun observeInfo() { observeIsAppLoginAvailable() observePostChangeTokenState() @@ -62,4 +73,8 @@ class SignInActivity : BaseActivity(R.layout.activity_logi } }.launchIn(lifecycleScope) } + + companion object{ + const val TERMS_URL = "http://www.naver.com" + } } diff --git a/presentation/src/main/java/com/going/presentation/splash/SplashActivity.kt b/presentation/src/main/java/com/going/presentation/splash/SplashActivity.kt index a9cb9efa..a6758d43 100644 --- a/presentation/src/main/java/com/going/presentation/splash/SplashActivity.kt +++ b/presentation/src/main/java/com/going/presentation/splash/SplashActivity.kt @@ -56,6 +56,7 @@ class SplashActivity : BaseActivity(R.layout.activity_spl private fun navigateToSignInScreen() { Intent(this, SignInActivity::class.java).apply { + addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) startActivity(this) } finish() diff --git a/presentation/src/main/res/drawable/ic_warning_mini.xml b/presentation/src/main/res/drawable/ic_warning_mini.xml new file mode 100644 index 00000000..5bde44b0 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_warning_mini.xml @@ -0,0 +1,25 @@ + + + + + + + + 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 d94ea5d9..c882acc7 100644 Binary files a/presentation/src/main/res/drawable/img_sign_in_kakao_button.png and b/presentation/src/main/res/drawable/img_sign_in_kakao_button.png differ diff --git a/presentation/src/main/res/drawable/text_logo_doorip_red500.xml b/presentation/src/main/res/drawable/text_logo_doorip_red500.xml new file mode 100644 index 00000000..b11d6acb --- /dev/null +++ b/presentation/src/main/res/drawable/text_logo_doorip_red500.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/presentation/src/main/res/drawable/text_logo_doorip.xml b/presentation/src/main/res/drawable/text_logo_doorip_white000.xml similarity index 100% rename from presentation/src/main/res/drawable/text_logo_doorip.xml rename to presentation/src/main/res/drawable/text_logo_doorip_white000.xml diff --git a/presentation/src/main/res/layout/activity_login.xml b/presentation/src/main/res/layout/activity_login.xml deleted file mode 100644 index 44eb7e06..00000000 --- a/presentation/src/main/res/layout/activity_login.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/presentation/src/main/res/layout/activity_signin.xml b/presentation/src/main/res/layout/activity_signin.xml new file mode 100644 index 00000000..03913430 --- /dev/null +++ b/presentation/src/main/res/layout/activity_signin.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/layout/activity_splash.xml b/presentation/src/main/res/layout/activity_splash.xml index cf96d028..a65ec332 100644 --- a/presentation/src/main/res/layout/activity_splash.xml +++ b/presentation/src/main/res/layout/activity_splash.xml @@ -12,7 +12,7 @@ android:background="@color/red_500"> 이름에는 공백만 입력할 수 없어요 여행을 시작해보세요 - 개인정보처리방침 + 개인정보처리방침 - %1$d/%2$d제 + %1$d/%2$d 안내 확인