패키지 구조 변경 및 코드 리팩토링

.github/workflows/android-ci.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: gradle
 

app/build.gradle.kts

@@ -8,12 +8,12 @@ plugins {
 
 android {
     namespace = "com.jik.movie"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "com.jik.movie"
         minSdk = 24
-        targetSdk = 33
+        targetSdk = 34
         versionCode = 1
         versionName = "0.3.0"
 
@@ -30,22 +30,23 @@ android {
                     "proguard-rules.pro"
                 )
             )
+            signingConfig = signingConfigs.getByName("debug")
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
     buildFeatures {
         compose = true
     }
     composeOptions {
         kotlinCompilerExtensionVersion = "1.4.3"
     }
-    packagingOptions {
+    packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
@@ -55,13 +56,13 @@ android {
 dependencies {
 
     // modules
-    implementation(projects.coreDesignsystem)
-    implementation(projects.coreUi)
-    implementation(projects.coreModel)
-    implementation(projects.coreData)
-    implementation(projects.featureHome)
-    implementation(projects.featurePopular)
-    implementation(projects.featureDetail)
+    implementation(projects.core.designsystem)
+    implementation(projects.core.ui)
+    implementation(projects.core.model)
+    implementation(projects.core.data)
+    implementation(projects.feature.home)
+    implementation(projects.feature.popular)
+    implementation(projects.feature.detail)
 
     implementation(libs.androidx.ktx)
     implementation(libs.androidx.runtime.ktx)

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

@@ -4,6 +4,7 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
@@ -13,7 +14,6 @@ import com.jik.core.designsystem.component.MovieNavigationBar
 import com.jik.core.designsystem.component.MovieNavigationBarItem
 import com.jik.core.designsystem.component.NavigationBarCornerSize
 import com.jik.core.designsystem.theme.MovieTheme
-import com.jik.core.ui.util.modifier.conditional
 import com.jik.movie.navigation.MovieNavHost
 import com.jik.movie.navigation.TopLevelDestination
 
@@ -34,18 +34,13 @@ fun MovieApp() {
             },
             contentWindowInsets = WindowInsets(0.dp)
         ) {
-            val topPadding = it.calculateTopPadding()
             val bottomPadding = it.calculateBottomPadding()
 
             MovieNavHost(
                 navController = appState.navController,
-                modifier = Modifier.conditional(destination != null) {
-                    padding(
-                        top = topPadding,
-                        bottom = if (destination != null && bottomPadding > 0.dp) bottomPadding - NavigationBarCornerSize
-                        else bottomPadding
-                    )
-                }
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(bottom = if (bottomPadding > 0.dp) bottomPadding - NavigationBarCornerSize else bottomPadding)
             )
         }
     }

core-data/build.gradle.kts → core/data/build.gradle.kts

@@ -7,11 +7,10 @@ plugins {
 
 android {
     namespace = "com.jik.core.data"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24
-        targetSdk = 33
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -27,18 +26,18 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 }
 
 dependencies {
     // modules
-    implementation(projects.coreModel)
-    implementation(projects.coreNetwork)
+    implementation(projects.core.model)
+    implementation(projects.core.network)
 
     implementation(libs.androidx.ktx)
 

core-designsystem/build.gradle.kts → core/designsystem/build.gradle.kts

@@ -6,11 +6,10 @@ plugins {
 
 android {
     namespace = "com.jik.core.designsystem"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24
-        targetSdk = 33
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -32,18 +31,18 @@ android {
         kotlinCompilerExtensionVersion = "1.4.3"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 }
 
 dependencies {
 
     // modules
-    implementation(projects.coreUi)
+    implementation(projects.core.ui)
 
     implementation(libs.androidx.ktx)
     implementation(libs.androidx.navigation)

core-designsystem/src/main/java/com/jik/core/designsystem/component/Card.kt → core/designsystem/src/main/java/com/jik/core/designsystem/component/Card.kt

@@ -66,7 +66,7 @@ fun GradientPosterCard(
     placeholder: Painter? = null,
     alignment: Alignment = Alignment.Center,
     contentScale: ContentScale = ContentScale.Fit,
-    gradientArea: GradientArea = GradientArea.TOP_BOTTOM
+    gradientArea: GradientArea = GradientArea.VERTICAL
 ) {
     Surface(modifier = modifier) {
         ElevatedCard(
@@ -104,22 +104,22 @@ fun GradientPosterCard(
         )
 
         val colorStops = when (gradientArea) {
-            GradientArea.TOP_BOTTOM -> colorStopsOfTopBottom
+            GradientArea.VERTICAL -> colorStopsOfTopBottom
             GradientArea.TOP -> colorStopsOfTop
             GradientArea.BOTTOM -> colorStopsOfBottom
         }
 
         Box(
             modifier = Modifier
                 .fillMaxSize()
-                .background(Brush.verticalGradient(colorStops = colorStops))
+                .background(brush = Brush.verticalGradient(colorStops = colorStops))
         )
     }
 }
 
 
 enum class GradientArea {
-    TOP_BOTTOM,
+    VERTICAL,
     TOP,
     BOTTOM,
 }

core-designsystem/src/main/java/com/jik/core/designsystem/component/Navigation.kt → core/designsystem/src/main/java/com/jik/core/designsystem/component/Navigation.kt

@@ -3,11 +3,22 @@ package com.jik.core.designsystem.component
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsPressedAsState
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.*
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.NavigationBarDefaults
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -48,7 +59,6 @@ fun MovieNavigationBar(
             modifier = Modifier
                 .fillMaxWidth()
                 .windowInsetsPadding(NavigationBarDefaults.windowInsets)
-                .height(52.dp)
                 .selectableGroup(),
             horizontalArrangement = Arrangement.spacedBy(8.dp),
             content = content
@@ -68,10 +78,10 @@ fun RowScope.MovieNavigationBarItem(
 ) {
     val interactionSource = remember { MutableInteractionSource() }
     val isPressed by interactionSource.collectIsPressedAsState()
-    val scale = animateFloatAsState(targetValue = if (isPressed) 0.8f else 1f)
+    val scale = animateFloatAsState(targetValue = if (isPressed) 0.8f else 1f, label = "")
 
     Box(
-        modifier
+        modifier = modifier
             .selectable(
                 selected = selected,
                 onClick = onClick,
@@ -81,7 +91,8 @@ fun RowScope.MovieNavigationBarItem(
                 indication = null,
             )
             .weight(1f)
-            .scale(scale.value),
+            .scale(scale.value)
+            .padding(vertical = 4.dp),
         contentAlignment = Alignment.Center
     ) {
         if (labelTextId == null) {
@@ -122,7 +133,6 @@ private fun MovieNavigationBarItemLabelAndIcon(
     labelTextId: Int,
 ) {
     Column(
-        modifier = Modifier.fillMaxSize(),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {