Merge pull request #23 from YAPP-Github/refactor/#22-single-activity

LoginActivity 제거 및 MainActivity로 진입점 통일

Author: chanho0908

app/src/main/AndroidManifest.xml

@@ -7,6 +7,17 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Twix">
+
+        <activity
+            android:name=".main.MainActivity"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 </manifest>

app/src/main/java/com/yapp/twix/TwixApplication.kt

@@ -1,16 +1,14 @@
 package com.yapp.twix
 
 import android.app.Application
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.startKoin
+import com.yapp.twix.di.initKoin
 
 class TwixApplication : Application() {
     override fun onCreate() {
         super.onCreate()
 
-        startKoin {
-            androidContext(this@TwixApplication)
-            modules()
-        }
+        initKoin(
+            context = this
+        )
     }
 }

app/src/main/java/com/yapp/twix/di/FeatureModules.kt

@@ -0,0 +1,8 @@
+package com.yapp.twix.di
+
+import com.twix.login.di.loginModule
+import org.koin.core.module.Module
+
+val featureModules: List<Module> = listOf(
+    loginModule
+)

app/src/main/java/com/yapp/twix/di/InitKoin.kt

@@ -0,0 +1,22 @@
+package com.yapp.twix.di
+
+import android.content.Context
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.context.startKoin
+import org.koin.core.module.Module
+
+fun initKoin(
+    context: Context? = null,
+    extraModules: List<Module> = emptyList()
+) {
+    startKoin {
+        context?.let { androidContext(it) }
+
+        modules(
+            buildList {
+                addAll(extraModules)
+                addAll(featureModules)
+            }
+        )
+    }
+}

app/src/main/java/com/yapp/twix/main/MainActivity.kt

@@ -0,0 +1,27 @@
+package com.yapp.twix.main
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.safeContentPadding
+import androidx.compose.ui.Modifier
+import com.twix.navigation.AppNavHost
+
+class MainActivity: ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent {
+            // TODO: 디자인 시스템이 결정되면 테마 구현 및 적용
+            Box(
+                modifier = Modifier
+                    .safeContentPadding()
+                    .fillMaxSize()
+            ) {
+                AppNavHost()
+            }
+        }
+    }
+}

build-logic/convention/src/main/kotlin/com/twix/convention/AndroidApplicationConventionPlugin.kt

@@ -6,14 +6,21 @@ import com.twix.convention.extension.configureAndroid
 import com.twix.convention.extension.implementation
 import com.twix.convention.extension.library
 import com.twix.convention.extension.libs
+import com.twix.convention.extension.version
+import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 
 class AndroidApplicationConventionPlugin : BuildLogicConventionPlugin({
     applyPlugins("com.android.application", "org.jetbrains.kotlin.android")
+    apply<AndroidComposeConventionPlugin>()
 
     extensions.configure<ApplicationExtension> {
         configureAndroid(this)
+
+        defaultConfig {
+            targetSdk = libs.version("targetSdk").requiredVersion.toInt()
+        }
     }
 
     dependencies {

feature/login/src/main/AndroidManifest.xml

@@ -0,0 +1,23 @@
+package com.twix.login
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+
+@Composable
+fun LoginScreen() {
+    LoginContent()
+}
+
+@Composable
+private fun LoginContent() {
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center
+    ) {
+        Text("임시 화면입니다.")
+    }
+}

feature/login/src/main/java/com/twix/login/LoginActivity.kt

@@ -0,0 +1,11 @@
+package com.twix.login.di
+
+import com.twix.login.navigation.LoginNavGraph
+import com.twix.navigation.NavRoutes
+import com.twix.navigation.base.NavGraphContributor
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
+
+val loginModule = module {
+    single<NavGraphContributor>(named(NavRoutes.LoginGraph.route)) { LoginNavGraph }
+}