PopularScreen-> DetailScreen 전환 구현

app/build.gradle.kts

@@ -60,10 +60,12 @@ dependencies {
     implementation(projects.coreModel)
     implementation(projects.coreData)
     implementation(projects.featurePopular)
+    implementation(projects.featureDetail)
 
     implementation(libs.androidx.ktx)
     implementation(libs.androidx.runtime.ktx)
     implementation(libs.androidx.activity)
+    implementation(libs.androidx.navigation)
 
     // compose
     implementation(libs.compose.ui)

app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
-        android:name=".MovieApp"
+        android:name=".MovieApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"

app/src/main/java/com/jik/movie/MainActivity.kt

@@ -3,18 +3,9 @@ package com.jik.movie
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import com.jik.core.designsystem.component.MovieTopAppBar
-import com.jik.core.designsystem.theme.MovieTheme
-import com.jik.feature.popular.PopularScreen
+import com.jik.movie.splash.createSplashScreen
+import com.jik.movie.ui.MovieApp
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.*
 import kotlin.time.Duration.Companion.seconds
 
 @AndroidEntryPoint
@@ -24,24 +15,7 @@ class MainActivity : ComponentActivity() {
 
         super.onCreate(savedInstanceState)
         setContent {
-            MovieTheme(
-                dynamicColor = false
-            ) {
-                MovieScreen()
-            }
+            MovieApp()
         }
     }
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun MovieScreen() {
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
-
-    Scaffold(
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
-        topBar = { MovieTopAppBar(titleRes = R.string.app_name, scrollBehavior = scrollBehavior) }
-    ) {
-        PopularScreen(Modifier.padding(it))
-    }
-}
+}

app/src/main/java/com/jik/movie/MovieApp.kt → app/src/main/java/com/jik/movie/MovieApplication.kt

@@ -5,4 +5,4 @@ import dagger.hilt.android.HiltAndroidApp
 
 
 @HiltAndroidApp
-class MovieApp : Application()
+class MovieApplication : Application()

app/src/main/java/com/jik/movie/navigation/MovieNavHost.kt

@@ -0,0 +1,25 @@
+package com.jik.movie.navigation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import com.jik.feature.detail.navigation.DetailNavigation.installDetailScreen
+import com.jik.feature.popular.navigation.PopularNavigation
+import com.jik.feature.popular.navigation.PopularNavigation.installPopularScreen
+
+@Composable
+fun MovieNavHost(
+    navController: NavHostController,
+    modifier: Modifier = Modifier,
+    startDestination: String = PopularNavigation.route
+) {
+    NavHost(
+        navController = navController,
+        startDestination = startDestination,
+        modifier = modifier
+    ) {
+        installPopularScreen(navController)
+        installDetailScreen()
+    }
+}

app/src/main/java/com/jik/movie/navigation/TopLevelDestination.kt

@@ -0,0 +1,9 @@
+package com.jik.movie.navigation
+
+import com.jik.feature.popular.navigation.PopularNavigation
+
+enum class TopLevelDestination(
+    val route: String
+) {
+    POPULAR(PopularNavigation.route)
+}

app/src/main/java/com/jik/movie/SplashScreen.kt → app/src/main/java/com/jik/movie/splash/SplashScreen.kt

@@ -1,4 +1,4 @@
-package com.jik.movie
+package com.jik.movie.splash
 
 import android.app.Activity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen

app/src/main/java/com/jik/movie/ui/MovieApp.kt

@@ -0,0 +1,37 @@
+package com.jik.movie.ui
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import com.jik.core.designsystem.component.MovieTopAppBar
+import com.jik.core.designsystem.theme.MovieTheme
+import com.jik.core.ui.R
+import com.jik.movie.navigation.MovieNavHost
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MovieApp() {
+    MovieTheme(
+        dynamicColor = false
+    ) {
+        val appState = rememberMovieAppState()
+        val scrollBehavior = appState.topAppBarScrollBehavior
+
+        Scaffold(
+            modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+            topBar = {
+                if (appState.isTopLevelDestination) {
+                    MovieTopAppBar(
+                        titleRes = R.string.app_name,
+                        scrollBehavior = scrollBehavior
+                    )
+                }
+            }
+        ) {
+            MovieNavHost(navController = appState.navController, modifier = Modifier.padding(it))
+        }
+    }
+}

app/src/main/java/com/jik/movie/ui/MovieAppState.kt

@@ -0,0 +1,38 @@
+package com.jik.movie.ui
+
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.remember
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.compose.rememberNavController
+import com.jik.movie.navigation.TopLevelDestination
+
+@Composable
+fun rememberMovieAppState(
+    navController: NavHostController = rememberNavController(),
+): MovieAppState = remember(navController) {
+    MovieAppState(
+        navController = navController,
+    )
+}
+
+
+@Stable
+class MovieAppState(
+    val navController: NavHostController,
+) {
+
+    private val topLevelDestinationRoutes = TopLevelDestination.values().map { it.route }
+
+
+    @OptIn(ExperimentalMaterial3Api::class)
+    val topAppBarScrollBehavior
+        @Composable get() = TopAppBarDefaults.enterAlwaysScrollBehavior()
+
+    val isTopLevelDestination: Boolean
+        @Composable get() = navController
+            .currentBackStackEntryAsState().value?.destination?.route in topLevelDestinationRoutes
+}

app/src/main/res/values/strings.xml → core-ui/src/main/res/values/string.xml

@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string name="app_name">Movie</string>
 </resources>

feature-detail/.gitignore

@@ -0,0 +1 @@
+/build

feature-detail/build.gradle.kts

@@ -0,0 +1,83 @@
+@Suppress("DSL_SCOPE_VIOLATION")
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.kapt)
+    id("dagger.hilt.android.plugin")
+}
+
+android {
+    namespace = "com.jik.feature.detail"
+    compileSdk = 33
+
+    defaultConfig {
+        minSdk = 24
+        targetSdk = 33
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.3"
+    }
+}
+
+dependencies {
+
+    // modules
+    implementation(projects.coreDesignsystem)
+    implementation(projects.coreUi)
+    implementation(projects.coreModel)
+    implementation(projects.coreData)
+
+    implementation(libs.androidx.ktx)
+    implementation(libs.androidx.runtime.ktx)
+    implementation(libs.androidx.activity)
+    implementation(libs.androidx.navigation)
+
+    // compose
+    implementation(libs.compose.ui)
+    implementation(libs.compose.preview)
+    implementation(libs.compose.material3)
+
+    // lifecycle
+    implementation(libs.lifecycle.viewmodel)
+    implementation(libs.lifecycle.runtime)
+
+    // hilt
+    implementation(libs.hilt.android)
+    implementation(libs.hilt.navigation)
+    kapt(libs.hilt.compiler)
+
+    // test
+    testImplementation(libs.junit)
+
+    // android test
+    androidTestImplementation(libs.ext.junit)
+    androidTestImplementation(libs.espresso)
+    androidTestImplementation(libs.compose.test.junit)
+
+    // debug
+    debugImplementation(libs.compose.tooling)
+    debugImplementation(libs.compose.test.manifest)
+}

feature-detail/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

feature-detail/src/androidTest/java/com/jik/feature/detail/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.jik.feature.detail
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.jik.feature.detail.test", appContext.packageName)
+    }
+}

feature-detail/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

feature-detail/src/main/java/com/jik/feature/detail/DetailScreen.kt

@@ -0,0 +1,26 @@
+package com.jik.feature.detail
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.hilt.navigation.compose.hiltViewModel
+
+
+@Composable
+fun DetailScreen(
+    movieId: Long,
+    modifier: Modifier = Modifier,
+    viewModel: DetailViewModel = hiltViewModel()
+) {
+
+
+    Box(modifier = modifier) {
+        Text(
+            text = "Detail Screen${movieId}",
+            style = MaterialTheme.typography.titleLarge,
+            color = MaterialTheme.colorScheme.primary
+        )
+    }
+}