#19 - main 브랜치 머지 및 package 구성 변경

app/build.gradle.kts

@@ -4,6 +4,9 @@ plugins {
     alias(libs.plugins.kotlinAndroid)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kapt)
+    alias(libs.plugins.google.services)
+    alias(libs.plugins.firebase.crashlytics)
+    alias(libs.plugins.dagger.hilt)
 }
 
 android {
@@ -77,9 +80,19 @@ dependencies {
     implementation(libs.lifecycle.runtime.ktx)
     implementation(libs.lifecycle.viewmodel.savedstate)
     kapt(libs.lifecycle.compiler)
-    implementation(libs.koin.core)
-    implementation(libs.koin.android)
     implementation(libs.glide)
     implementation(libs.glide.compiler)
     implementation(libs.lottie)
+
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.crashlytics)
+    implementation(libs.firebase.analytics)
+    implementation(libs.firebase.auth)
+    implementation(libs.play.service.auth)
+    implementation(libs.dagger.hilt)
+    kapt(libs.dagger.hilt.compiler)
+}
+
+kapt {
+    correctErrorTypes = true
 }

app/google-services.json

@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "191948284640",
+    "project_id": "owori-399116",
+    "storage_bucket": "owori-399116.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:191948284640:android:be4f5d3774729ec3e3e685",
+        "android_client_info": {
+          "package_name": "com.owori.android"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "191948284640-jr0a7nhm5q4nfuoqd6ntst5mlsbbmj1f.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA3fvxnGuuRPgrSI9HbX0jKFBoL6QqMrCQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "191948284640-06rle69o44vgdi1g77gtmijh0dqpvjjh.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
-        android:name=".OworiApplication"
+        android:name=".core.OworiApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -14,7 +14,7 @@
         android:theme="@style/Theme.Owori"
         tools:targetApi="31">
         <activity
-            android:name=".auth.ui.view.AuthActivity"
+            android:name=".presenter.auth.AuthActivity"
             android:exported="true"
             android:screenOrientation="portrait"
             android:label="@string/app_name"

app/src/main/java/com/owori/android/common/ui/view/BaseActivity.kt → app/src/main/java/com/owori/android/core/BaseActivity.kt

@@ -1,12 +1,11 @@
-package com.owori.android.common.ui.view
+package com.owori.android.core
 
 import android.os.Bundle
 import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.navigation.Navigation
-import com.owori.android.common.ui.viewmodel.BaseViewModel
 
 abstract class BaseActivity<B : ViewDataBinding, V : BaseViewModel>(@LayoutRes private val layoutId: Int) :
     AppCompatActivity() {

app/src/main/java/com/owori/android/common/ui/view/BaseFragment.kt → app/src/main/java/com/owori/android/core/BaseFragment.kt

@@ -1,4 +1,4 @@
-package com.owori.android.common.ui.view
+package com.owori.android.core
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -9,7 +9,6 @@ import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
 import androidx.navigation.Navigation
-import com.owori.android.common.ui.viewmodel.BaseViewModel
 
 abstract class BaseFragment<B : ViewDataBinding, V : BaseViewModel>(@LayoutRes private val layoutId: Int) :
     Fragment() {

app/src/main/java/com/owori/android/common/ui/viewmodel/BaseViewModel.kt → app/src/main/java/com/owori/android/core/BaseViewModel.kt

@@ -1,12 +1,11 @@
-package com.owori.android.common.ui.viewmodel
+package com.owori.android.core
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.navigation.Navigation
-import com.owori.android.common.SingleLiveEvent
-import org.koin.core.component.KoinComponent
+import com.owori.android.presenter.util.SingleLiveEvent
 
-open class BaseViewModel : ViewModel(), KoinComponent {
+open class BaseViewModel : ViewModel() {
     protected val _navigation = SingleLiveEvent<Navigation>()
     val navigation: LiveData<Navigation> = _navigation
 

app/src/main/java/com/owori/android/common/FragmentExt.kt → app/src/main/java/com/owori/android/core/FragmentExtension.kt

@@ -1,4 +1,4 @@
-package com.owori.android.common
+package com.owori.android.core
 
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController

app/src/main/java/com/owori/android/core/OworiApplication.kt

@@ -0,0 +1,11 @@
+package com.owori.android.core
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class OworiApplication: Application() {
+    override fun onCreate() {
+        super.onCreate()
+    }
+}

app/src/main/java/com/owori/android/auth/ui/view/AuthActivity.kt → app/src/main/java/com/owori/android/presenter/auth/AuthActivity.kt

@@ -1,16 +1,16 @@
-package com.owori.android.auth.ui.view
+package com.owori.android.presenter.auth
 
+import androidx.activity.viewModels
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.findNavController
-import com.owori.android.common.ui.view.BaseActivity
+import com.owori.android.core.BaseActivity
 import com.owori.android.R
 import com.owori.android.databinding.ActivityAuthBinding
-import com.owori.android.auth.ui.viewmodel.AuthViewModel
-import org.koin.android.ext.android.inject
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class AuthActivity : BaseActivity<ActivityAuthBinding, AuthViewModel>(R.layout.activity_auth) {
-    override val viewModel: AuthViewModel by inject()
-
+    override val viewModel : AuthViewModel by viewModels()
     override fun initView() {
         initNavGraph()
     }

app/src/main/java/com/owori/android/presenter/auth/AuthViewModel.kt

@@ -0,0 +1,8 @@
+package com.owori.android.presenter.auth
+
+import com.owori.android.core.BaseViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class AuthViewModel @Inject constructor() : BaseViewModel() {}

app/src/main/java/com/owori/android/auth/ui/view/LoginFragment.kt → app/src/main/java/com/owori/android/presenter/login/LoginFragment.kt

@@ -1,15 +1,17 @@
-package com.owori.android.auth.ui.view
+package com.owori.android.presenter.login
 
 import androidx.activity.addCallback
-import com.owori.android.auth.ui.viewmodel.LoginViewModel
-import com.owori.android.common.ui.view.BaseFragment
+import androidx.fragment.app.viewModels
+import com.owori.android.core.BaseFragment
 import com.owori.android.R
 import com.owori.android.databinding.FragmentLoginBinding
-import com.owori.android.common.navigateTo
-import org.koin.android.ext.android.inject
+import com.owori.android.core.navigateTo
+import dagger.hilt.android.AndroidEntryPoint
 
+
+@AndroidEntryPoint
 class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(R.layout.fragment_login) {
-    override val viewModel: LoginViewModel by inject()
+    override val viewModel: LoginViewModel by viewModels()
     override fun setBindingVariables() {
         with(binding) {
             vm = viewModel