diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 0eab08b..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1253878..8b07682 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + + - - - - + android:exported="false"> + diff --git a/onboarding/src/main/AndroidManifest.xml b/onboarding/src/main/AndroidManifest.xml index bb98968..06a6e6d 100644 --- a/onboarding/src/main/AndroidManifest.xml +++ b/onboarding/src/main/AndroidManifest.xml @@ -3,12 +3,16 @@ - + + + + + + + + diff --git a/onboarding/src/main/java/com/najudoryeong/mineme/onboarding/LoginFragment.kt b/onboarding/src/main/java/com/najudoryeong/mineme/onboarding/LoginFragment.kt index 71a9e95..96dc472 100644 --- a/onboarding/src/main/java/com/najudoryeong/mineme/onboarding/LoginFragment.kt +++ b/onboarding/src/main/java/com/najudoryeong/mineme/onboarding/LoginFragment.kt @@ -13,8 +13,10 @@ import com.najudoryeong.mineme.common_ui.MainActivityUtil import com.najudoryeong.mineme.onboarding.R import com.najudoryeong.mineme.onboarding.databinding.FragmentLoginBinding import com.najudoryeong.mineme.onboarding.databinding.FragmentOnBoardingViewPagerBinding +import dagger.hilt.android.AndroidEntryPoint +@AndroidEntryPoint class LoginFragment : Fragment() { private var _binding: FragmentLoginBinding? = null diff --git a/onboarding/src/main/java/com/najudoryeong/mineme/onboarding/LoginUtil.kt b/onboarding/src/main/java/com/najudoryeong/mineme/onboarding/LoginUtil.kt index 535f221..5292be4 100644 --- a/onboarding/src/main/java/com/najudoryeong/mineme/onboarding/LoginUtil.kt +++ b/onboarding/src/main/java/com/najudoryeong/mineme/onboarding/LoginUtil.kt @@ -3,6 +3,7 @@ package com.najudoryeong.mineme.onboarding import android.app.Activity import android.content.Context import android.content.Intent +import android.util.Log import com.kakao.sdk.auth.model.OAuthToken import com.kakao.sdk.common.model.ClientError import com.kakao.sdk.common.model.ClientErrorCause @@ -29,7 +30,7 @@ class LoginUtil { // 카카오톡으로 로그인 할 수 없어 카카오계정으로 로그인할 경우 사용됨 val callback: (OAuthToken?, Throwable?) -> Unit = { token, error -> if (error != null) { - // 카카오 계정으로 로그인 실패 + Log.d("errorLogin",error.toString()) } else { onLoginSuccess(token?.accessToken) // 카카오 계정으로 로그인 성공 @@ -37,6 +38,7 @@ class LoginUtil { } // 카카오톡이 설치되어 있으면 카카오톡 로그인, 아니면 카카오계정으로 로그인 + Log.d("errorLogin",UserApiClient.instance.isKakaoTalkLoginAvailable(context).toString()) if (UserApiClient.instance.isKakaoTalkLoginAvailable(context)) { UserApiClient.instance.loginWithKakaoTalk(context) { token, error -> if (error != null) { @@ -61,6 +63,7 @@ class LoginUtil { } else { //카카오톡 설치 x => 카카오 계정으로 로그인 UserApiClient.instance.loginWithKakaoAccount(context, callback = callback) + }