[BUD-21] refactor : login 로직 수정 (#9)

app/build.gradle

@@ -1,16 +1,16 @@
 plugins {
-    id 'com.android.application'
+    id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
 }
-apply plugin: 'kotlin-kapt'
-apply plugin: 'dagger.hilt.android.plugin'
 
 android {
     namespace 'com.nocapstone.buddyvet'
     compileSdk 33
 
     defaultConfig {
-        applicationId "com.nocapstone.buddyvet"
+        //applicationId "com.nocapstone.buddyvet"
         minSdk 23
         targetSdk 33
         versionCode 1
@@ -43,6 +43,7 @@ dependencies {
     api project(path: ':common-ui')
     api project(path: ':common')
 
+    // Hilt
     implementation "com.google.dagger:hilt-android:$rootProject.hiltVersion"
     kapt "com.google.dagger:hilt-android-compiler:$rootProject.hiltVersion"
 
@@ -53,4 +54,8 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}
+
+kapt {
+    correctErrorTypes true
 }

app/src/main/AndroidManifest.xml

@@ -18,31 +18,13 @@
         <activity
             android:name=".MainActivity"
             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
 
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
 
-        <activity
-            android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="oauth"
-                    android:scheme="kakao${NATIVE_APP_KEY}" />
-            </intent-filter>
-        </activity>
     </application>
 
 </manifest>

app/src/main/java/com/nocapstone/buddyvet/BuddyVetApplication.kt

@@ -3,6 +3,7 @@ package com.nocapstone.buddyvet
 import android.app.Application
 import com.kakao.sdk.common.KakaoSdk
 import com.nocapstone.common.util.NATIVE_APP_KEY
+
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
@@ -13,4 +14,5 @@ class BuddyVetApplication  : Application(){
         //KaKao Develop이랑 연동
         KakaoSdk.init(this, NATIVE_APP_KEY)
     }
+
 }

app/src/main/java/com/nocapstone/buddyvet/MainActivity.kt

@@ -15,7 +15,9 @@ import androidx.navigation.ui.setupWithNavController
 import com.kakao.sdk.common.util.Utility
 import com.nocapstone.buddyvet.databinding.ActivityMainBinding
 import com.nocapstone.common_ui.MainActivityUtil
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class MainActivity : AppCompatActivity(), MainActivityUtil {
 
     private lateinit var binding: ActivityMainBinding

app/src/main/java/com/nocapstone/buddyvet/MainModule.kt

@@ -6,11 +6,15 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
+
 @InstallIn(SingletonComponent::class)
 @Module
 class MainModule {
 
     @Singleton
     @Provides
-    fun provideMainActivityClass(): Class<*> = MainActivity::class.java
+    fun provideMainActivityClass(): Class<*> {
+        return MainActivity::class.java
+    }
+
 }

build.gradle

@@ -10,6 +10,7 @@ buildscript {
 
 
     ext {
+
         nav_version = '2.5.3'
         fragment_version = '1.5.5'
         activity_version = '1.6.1'
@@ -28,9 +29,12 @@ buildscript {
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
     }
 
+
 }
 
+
 plugins {
+    id 'com.google.dagger.hilt.android' version '2.44' apply false
     id 'com.android.application' version '7.3.0' apply false
     id 'com.android.library' version '7.3.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.10' apply false

common-ui/build.gradle

@@ -1,9 +1,9 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
 }
-apply plugin: 'kotlin-kapt'
-apply plugin: 'dagger.hilt.android.plugin'
 
 
 android {
@@ -43,6 +43,7 @@ dependencies {
 
     api "androidx.navigation:navigation-fragment-ktx:$rootProject.nav_version"
     api "androidx.navigation:navigation-ui-ktx:$rootProject.nav_version"
+
     implementation "androidx.activity:activity-ktx:$rootProject.activity_version"
 
     implementation "com.google.dagger:hilt-android:$rootProject.hiltVersion"
@@ -54,4 +55,8 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}
+
+kapt {
+    correctErrorTypes true
 }

common/build.gradle

@@ -1,9 +1,10 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
 }
-apply plugin: 'kotlin-kapt'
-apply plugin: 'dagger.hilt.android.plugin'
+
 
 android {
     namespace 'com.nocapstone.common'
@@ -52,4 +53,8 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}
+
+kapt {
+    correctErrorTypes true
 }

common/src/main/java/com/nocapstone/common/di/NetworkModule.kt

@@ -17,6 +17,4 @@ class NetworkModule {
         return retrofit.create(AuthService::class.java)
     }
 
-
-
 }

foundation/build.gradle

@@ -1,9 +1,9 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
 }
-apply plugin: 'kotlin-kapt'
-apply plugin: 'dagger.hilt.android.plugin'
 
 
 android {
@@ -43,4 +43,8 @@ dependencies {
     // Hilt
     implementation "com.google.dagger:hilt-android:$rootProject.hiltVersion"
     kapt "com.google.dagger:hilt-android-compiler:$rootProject.hiltVersion"
+}
+
+kapt {
+    correctErrorTypes true
 }

home/build.gradle

@@ -2,9 +2,10 @@ plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
     id 'androidx.navigation.safeargs.kotlin'
+    id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
+
 }
-apply plugin: 'kotlin-kapt'
-apply plugin: 'dagger.hilt.android.plugin'
 
 android {
     namespace 'com.nocapstone.home'
@@ -52,4 +53,8 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}
+
+kapt {
+    correctErrorTypes true
 }

onboarding/build.gradle

@@ -1,9 +1,9 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
 }
-apply plugin: 'kotlin-kapt'
-apply plugin: 'dagger.hilt.android.plugin'
 
 android {
     namespace 'com.nocapstone.onboarding'
@@ -12,9 +12,7 @@ android {
     defaultConfig {
         minSdk 23
         targetSdk 33
-
         manifestPlaceholders["NATIVE_APP_KEY"] = "d48bcd0a6e882bce9b756ab78c9acd6e"
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
@@ -34,7 +32,6 @@ android {
     }
     buildFeatures {
         dataBinding true
-        viewBinding true
     }
 }
 
@@ -55,9 +52,12 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.0'
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}
+
+
+kapt {
+    correctErrorTypes true
 }

onboarding/src/main/AndroidManifest.xml

@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity
             android:name=".SplashActivity"
             android:exported="true"
             android:label="@string/title_activity_splash"
-            android:theme="@style/Theme.Buddyvet.NoActionBar" >
-
+            android:theme="@style/Theme.Buddyvet.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
         </activity>
-
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true">

onboarding/src/main/java/com/nocapstone/onboarding/LoginFragment.kt

@@ -6,17 +6,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.activity.OnBackPressedCallback
-import androidx.fragment.app.viewModels
 import com.nocapstone.onboarding.databinding.FragmentLoginBinding
+import dagger.hilt.android.AndroidEntryPoint
 
-
+@AndroidEntryPoint
 class LoginFragment : Fragment() {
 
     private var _binding: FragmentLoginBinding? = null
     private val binding get() = _binding!!
 
-    private val viewModel: SplashViewModel by viewModels()
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -40,7 +38,7 @@ class LoginFragment : Fragment() {
         )
 
         binding.kakaoLoginBtn.setOnClickListener {
-            requireActivity().checkJwt()
+            (requireActivity() as SplashActivity).checkJWT()
         }
     }
 }

onboarding/src/main/java/com/nocapstone/onboarding/OnBoardingViewPagerFragment.kt

@@ -16,9 +16,10 @@ import com.google.android.material.snackbar.Snackbar
 import com.nocapstone.common_ui.DialogForPermission
 import com.nocapstone.common_ui.MainActivityUtil
 import com.nocapstone.onboarding.databinding.FragmentOnBoardingViewPagerBinding
+import dagger.hilt.android.AndroidEntryPoint
 import kotlin.math.log
 
-
+@AndroidEntryPoint
 class OnBoardingViewPagerFragment : Fragment() {