[FEAT/#22] 의존성 수정

NOW-SOPT-ANDROID · Jun 3, 2024 · 81a2c91 · 81a2c91
1 parent c471624
commit 81a2c91
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -60,7 +60,6 @@ dependencies {
     implementation(project(":feature"))
     implementation(project(":domain"))
     implementation(project(":data"))
-    implementation(project(":core-ui"))
 
     implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'

diff --git a/app/src/main/java/com/sopt/now/compose/MainActivity.kt b/app/src/main/java/com/sopt/now/compose/MainActivity.kt
@@ -3,30 +3,15 @@ package com.sopt.now.compose
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.ui.Modifier
-import com.sopt.navigation.MainNavigator
-import com.sopt.navigation.MainScreen
-import com.sopt.navigation.rememberMainNavigator
-import com.sopt.ui.ui.theme.NOWSOPTAndroidTheme
+import com.sopt.navigation.MainApp
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            val navController: MainNavigator = rememberMainNavigator()
-            NOWSOPTAndroidTheme {
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background
-                ) {
-                    MainScreen(navController)
-                }
-            }
+            MainApp()
         }
     }
 }
diff --git a/build.gradle b/build.gradle
@@ -7,6 +7,7 @@ plugins {
     id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
     id 'org.jetbrains.kotlin.jvm' version '1.9.0' apply false
     id 'com.google.dagger.hilt.android' version '2.48.1' apply false
+    id "com.vanniktech.dependency.graph.generator" version "0.7.0"
 }
 
 ext {

diff --git a/navigation/src/main/java/com/sopt/navigation/MainScreen.kt b/navigation/src/main/java/com/sopt/navigation/MainScreen.kt
@@ -2,8 +2,11 @@ package com.sopt.navigation
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -13,7 +16,20 @@ import com.sopt.feature.auth.signup.navigation.signUpGraph
 import com.sopt.feature.main.home.navigation.homeGraph
 import com.sopt.feature.main.mypage.navigation.myPageGraph
 import com.sopt.feature.main.search.navigation.searchGraph
+import com.sopt.ui.ui.theme.NOWSOPTAndroidTheme
 
+@Composable
+fun MainApp(){
+    val navController: MainNavigator = rememberMainNavigator()
+    NOWSOPTAndroidTheme {
+        Surface(
+            modifier = Modifier.fillMaxSize(),
+            color = MaterialTheme.colorScheme.background
+        ) {
+            MainScreen(navController)
+        }
+    }
+}
 @Composable
 fun MainScreen(
     navController: MainNavigator = rememberMainNavigator()