Merge pull request #68 from ttoklip/develop

데모데이 버전

Author: hangunhee39

app/src/main/java/com/umc/ttoklip/presentation/login/LoginActivity.kt

@@ -33,7 +33,6 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(R.layout.activity_login
     override fun initView() {
         loginActivity=this
 
-        viewModel.initIsLogin()
         binding.loginNaverBtn.setOnClickListener {
             val oauthLoginCallback = object : OAuthLoginCallback {
                 override fun onError(errorCode: Int, message: String) {
@@ -115,7 +114,11 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>(R.layout.activity_login
     }
 
     override fun onBackPressed() {
-        //super.onBackPressed()
+        super.onBackPressed()
+    }
+
+    fun cancelLogin(){
+        viewModel.initIsLogin()
     }
 
     override fun initObserver() {

app/src/main/java/com/umc/ttoklip/presentation/signup/SignupActivity.kt

@@ -11,13 +11,18 @@ import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class SignupActivity:BaseActivity<ActivitySignupBinding>(R.layout.activity_signup) {
+    private lateinit var navHostFragment:NavHostFragment
+
     override fun initView() {
         signupActivity=this
 
-        val navHostFragment = supportFragmentManager.findFragmentById(R.id.signup_frm)as NavHostFragment
+        navHostFragment = supportFragmentManager.findFragmentById(R.id.signup_frm)as NavHostFragment
         var navController=navHostFragment.findNavController()
+
         binding.signupBackIb.setOnClickListener {
-            if(!navController.popBackStack()){
+            if(navHostFragment.childFragmentManager.backStackEntryCount==0){
+                val loginactivity=LoginActivity.loginActivity!!
+                loginactivity.cancelLogin()
                 finish()
             }else{
                 navController.popBackStack()
@@ -30,6 +35,16 @@ class SignupActivity:BaseActivity<ActivitySignupBinding>(R.layout.activity_signu
         }
     }
 
+    override fun onBackPressed() {
+        if(navHostFragment.childFragmentManager.backStackEntryCount==0){
+            val loginactivity=LoginActivity.loginActivity!!
+            loginactivity.cancelLogin()
+            finish()
+        }else{
+            super.onBackPressed()
+        }
+    }
+
     fun termBack(){
         val navHostFragment = supportFragmentManager.findFragmentById(R.id.signup_frm)as NavHostFragment
         var navController=navHostFragment.findNavController()

app/src/main/java/com/umc/ttoklip/presentation/signup/fragments/DirectLocationViewModel.kt

@@ -71,7 +71,7 @@ class Signup5Fragment: BaseFragment<FragmentSignup5Binding>(R.layout.fragment_si
             startActivity(intent)
         }
         binding.signup5LocationDirectEt.setOnClickListener {
-            startActivity(Intent(activity, DirectLocationActivity::class.java))
+//            startActivity(Intent(activity, DirectLocationActivity::class.java))
         }
         binding.signup5NextBtn.setOnClickListener {
             startActivity(Intent(activity, MainActivity::class.java))

app/src/main/java/com/umc/ttoklip/presentation/signup/fragments/Signup5Fragment.kt

@@ -12,31 +12,9 @@ import retrofit2.Response
 
 class DirectLocationActivity :
     BaseActivity<ActivityDirectLocationBinding>(R.layout.activity_direct_location) {
-//    private val kakaoApi = DirectLocationRepositoryImpl
 
     override fun initView() {
-        callKakaoSearch("서울시 관악구 조원로12길 28")
-    }
 
-    fun callKakaoSearch(address: String) {
-//        val kakao = MutableLiveData<KakaoResponse.ResultSearchKeyword>()
-//        kakaoApi.getSearchKeyword(kakaoInfo.API_KEY, query = address)
-//            .enqueue(object : retrofit2.Callback<KakaoResponse.ResultSearchKeyword> {
-//                override fun onResponse(
-//                    call: Call<KakaoResponse.ResultSearchKeyword>,
-//                    response: Response<KakaoResponse.ResultSearchKeyword>
-//                ) {
-//                    kakao.value = response.body()
-//                    Log.i("KAKAO SEARCH", "${kakao.value!!.documents[0].address_name}")
-//                }
-//
-//                override fun onFailure(
-//                    call: Call<KakaoResponse.ResultSearchKeyword>,
-//                    t: Throwable
-//                ) {
-//                    t.printStackTrace()
-//                }
-//            })
     }
 
     override fun initObserver() {

app/src/main/java/com/umc/ttoklip/presentation/signup/location/DirectLocationActivity.kt

@@ -0,0 +1,4 @@
+package com.umc.ttoklip.presentation.signup.location
+
+class DirectLocationViewModel {
+}