diff --git a/app/build.gradle.kts b/app/build.gradle.kts index fa2d935..98b8109 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -8,6 +8,10 @@ plugins { android { namespace = "com.giwon.aide" + buildFeatures { + buildConfig = true + } + buildTypes { release { optimization { @@ -22,6 +26,7 @@ dependencies { implementation(project(":feature:calendar")) implementation(project(":feature:settings")) implementation(project(":core:notification")) + implementation(project(":core:designsystem")) implementation(libs.androidx.activity.compose) implementation(libs.androidx.compose.material3) @@ -29,4 +34,9 @@ dependencies { implementation(libs.androidx.compose.ui.graphics) implementation(libs.androidx.core.ktx) implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.navigation3.runtime) + implementation(libs.androidx.navigation3.ui) + implementation(libs.androidx.lifecycle.viewmodel.navigation3) + implementation(libs.timber) + debugImplementation(libs.leakcanary.android) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c8c6a82..9bfd892 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,7 @@ - Greeting( - name = "Android", - modifier = Modifier.padding(innerPadding) - ) - } - } - } - } -} - -@Composable -fun Greeting(name: String, modifier: Modifier = Modifier) { - Text( - text = "Hello $name!", - modifier = modifier - ) -} - -@Preview(showBackground = true) -@Composable -fun GreetingPreview() { - AideAndroidTheme { - Greeting("Android") - } -} diff --git a/app/src/main/kotlin/com/giwon/aide/navigation/AideNavDisplay.kt b/app/src/main/kotlin/com/giwon/aide/navigation/AideNavDisplay.kt new file mode 100644 index 0000000..f1e70a8 --- /dev/null +++ b/app/src/main/kotlin/com/giwon/aide/navigation/AideNavDisplay.kt @@ -0,0 +1,67 @@ +package com.giwon.aide.navigation + +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Icon +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator +import androidx.navigation3.runtime.entryProvider +import androidx.navigation3.runtime.rememberNavBackStack +import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator +import androidx.navigation3.ui.NavDisplay +import com.giwon.aide.feature.calendar.navigation.calendarEntry +import com.giwon.aide.feature.home.navigation.HomeKey +import com.giwon.aide.feature.home.navigation.homeEntry +import com.giwon.aide.feature.settings.navigation.settingsEntry +import kotlin.collections.listOf + +@Composable +fun AideApp() { + val backStack = rememberNavBackStack(HomeKey) + val currentTab = + TopLevelDestination.entries.last { destination -> destination.key in backStack } + + Scaffold( + bottomBar = { + NavigationBar { + TopLevelDestination.entries.forEach { destination -> + NavigationBarItem( + selected = destination == currentTab, + onClick = { + backStack.clear() + backStack.add(HomeKey) + if (destination.key != HomeKey) backStack.add(destination.key) + }, + icon = { + Icon( + painterResource(destination.icon), + contentDescription = null + ) + }, + label = { Text(destination.label) }, + ) + } + } + } + ) { innerPadding -> + NavDisplay( + backStack = backStack, + modifier = Modifier.padding(innerPadding), + onBack = { backStack.removeLastOrNull() }, + entryDecorators = listOf( + rememberSaveableStateHolderNavEntryDecorator(), + rememberViewModelStoreNavEntryDecorator(), + ), + entryProvider = entryProvider { + homeEntry() + calendarEntry() + settingsEntry() + } + ) + } +} diff --git a/app/src/main/kotlin/com/giwon/aide/navigation/TopLevelDestination.kt b/app/src/main/kotlin/com/giwon/aide/navigation/TopLevelDestination.kt new file mode 100644 index 0000000..4d85a64 --- /dev/null +++ b/app/src/main/kotlin/com/giwon/aide/navigation/TopLevelDestination.kt @@ -0,0 +1,18 @@ +package com.giwon.aide.navigation + +import androidx.annotation.DrawableRes +import androidx.navigation3.runtime.NavKey +import com.giwon.aide.core.designsystem.R.drawable +import com.giwon.aide.feature.calendar.navigation.CalendarKey +import com.giwon.aide.feature.home.navigation.HomeKey +import com.giwon.aide.feature.settings.navigation.SettingsKey + +enum class TopLevelDestination( + val key: NavKey, + val label: String, + @DrawableRes val icon: Int, +) { + HOME(HomeKey, "홈", drawable.ic_home), + CALENDAR(CalendarKey, "캘린더", drawable.ic_calendar), + SETTINGS(SettingsKey, "설정", drawable.ic_settings) +} diff --git a/app/src/main/kotlin/com/giwon/aide/ui/MainActivity.kt b/app/src/main/kotlin/com/giwon/aide/ui/MainActivity.kt new file mode 100644 index 0000000..0fbec5e --- /dev/null +++ b/app/src/main/kotlin/com/giwon/aide/ui/MainActivity.kt @@ -0,0 +1,32 @@ +package com.giwon.aide.ui + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.runtime.Composable +import androidx.compose.ui.tooling.preview.Preview +import com.giwon.aide.core.designsystem.theme.AideAndroidTheme +import com.giwon.aide.navigation.AideApp +import dagger.hilt.android.AndroidEntryPoint + +@AndroidEntryPoint +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + AideAndroidTheme { + AideApp() + } + } + } +} + +@Preview(showBackground = true) +@Composable +fun GreetingPreview() { + AideAndroidTheme { + AideApp() + } +} diff --git a/build-logic/convention/src/main/kotlin/com/giwon/aide/convention/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/com/giwon/aide/convention/AndroidFeatureConventionPlugin.kt index 298b8a7..52b61ae 100644 --- a/build-logic/convention/src/main/kotlin/com/giwon/aide/convention/AndroidFeatureConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/com/giwon/aide/convention/AndroidFeatureConventionPlugin.kt @@ -11,11 +11,14 @@ class AndroidFeatureConventionPlugin : Plugin { pluginManager.apply("aide.android.compose") pluginManager.apply("aide.android.hilt") pluginManager.apply("aide.android.junit") + pluginManager.apply("org.jetbrains.kotlin.plugin.serialization") dependencies { add("implementation", project(":core:model")) add("implementation", project(":core:data")) add("implementation", project(":core:designsystem")) + add("implementation", libs.findLibrary("androidx-navigation3-runtime").get()) + add("implementation", libs.findLibrary("kotlinx-serialization-core").get()) } } } diff --git a/build.gradle.kts b/build.gradle.kts index 1183b48..536e0d4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,4 +7,5 @@ plugins { alias(libs.plugins.hilt) apply false alias(libs.plugins.room) apply false alias(libs.plugins.android.junit5) apply false + alias(libs.plugins.kotlin.serialization) apply false } diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts index e14380f..8143e38 100644 --- a/core/designsystem/build.gradle.kts +++ b/core/designsystem/build.gradle.kts @@ -3,6 +3,10 @@ plugins { alias(libs.plugins.aide.android.compose) } +dependencies { + api(libs.androidx.compose.material3) +} + android { namespace = "com.giwon.aide.core.designsystem" } diff --git a/app/src/main/kotlin/com/giwon/aide/ui/theme/Color.kt b/core/designsystem/src/main/kotlin/com/giwon/aide/core/designsystem/theme/Color.kt similarity index 73% rename from app/src/main/kotlin/com/giwon/aide/ui/theme/Color.kt rename to core/designsystem/src/main/kotlin/com/giwon/aide/core/designsystem/theme/Color.kt index 2c861bc..71efaaa 100644 --- a/app/src/main/kotlin/com/giwon/aide/ui/theme/Color.kt +++ b/core/designsystem/src/main/kotlin/com/giwon/aide/core/designsystem/theme/Color.kt @@ -1,4 +1,4 @@ -package com.giwon.aide.ui.theme +package com.giwon.aide.core.designsystem.theme import androidx.compose.ui.graphics.Color @@ -8,4 +8,4 @@ val Pink80 = Color(0xFFEFB8C8) val Purple40 = Color(0xFF6650a4) val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) \ No newline at end of file +val Pink40 = Color(0xFF7D5260) diff --git a/app/src/main/kotlin/com/giwon/aide/ui/theme/Theme.kt b/core/designsystem/src/main/kotlin/com/giwon/aide/core/designsystem/theme/Theme.kt similarity index 97% rename from app/src/main/kotlin/com/giwon/aide/ui/theme/Theme.kt rename to core/designsystem/src/main/kotlin/com/giwon/aide/core/designsystem/theme/Theme.kt index 2fc16a8..9becc48 100644 --- a/app/src/main/kotlin/com/giwon/aide/ui/theme/Theme.kt +++ b/core/designsystem/src/main/kotlin/com/giwon/aide/core/designsystem/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.giwon.aide.ui.theme +package com.giwon.aide.core.designsystem.theme import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme diff --git a/app/src/main/kotlin/com/giwon/aide/ui/theme/Type.kt b/core/designsystem/src/main/kotlin/com/giwon/aide/core/designsystem/theme/Type.kt similarity index 95% rename from app/src/main/kotlin/com/giwon/aide/ui/theme/Type.kt rename to core/designsystem/src/main/kotlin/com/giwon/aide/core/designsystem/theme/Type.kt index bc9eca8..4cfed2b 100644 --- a/app/src/main/kotlin/com/giwon/aide/ui/theme/Type.kt +++ b/core/designsystem/src/main/kotlin/com/giwon/aide/core/designsystem/theme/Type.kt @@ -1,4 +1,4 @@ -package com.giwon.aide.ui.theme +package com.giwon.aide.core.designsystem.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle @@ -31,4 +31,4 @@ val Typography = Typography( letterSpacing = 0.5.sp ) */ -) \ No newline at end of file +) diff --git a/core/designsystem/src/main/res/drawable/ic_calendar.xml b/core/designsystem/src/main/res/drawable/ic_calendar.xml new file mode 100644 index 0000000..c0e81ce --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_calendar.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/core/designsystem/src/main/res/drawable/ic_home.xml b/core/designsystem/src/main/res/drawable/ic_home.xml new file mode 100644 index 0000000..35b3c7e --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_home.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/core/designsystem/src/main/res/drawable/ic_settings.xml b/core/designsystem/src/main/res/drawable/ic_settings.xml new file mode 100644 index 0000000..1cc61f3 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/feature/calendar/src/main/kotlin/com/giwon/aide/feature/calendar/CalendarRoute.kt b/feature/calendar/src/main/kotlin/com/giwon/aide/feature/calendar/CalendarRoute.kt new file mode 100644 index 0000000..9933d79 --- /dev/null +++ b/feature/calendar/src/main/kotlin/com/giwon/aide/feature/calendar/CalendarRoute.kt @@ -0,0 +1,21 @@ +package com.giwon.aide.feature.calendar + +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 CalendarRoute() { + CalendarScreen() +} + +@Composable +internal fun CalendarScreen(modifier: Modifier = Modifier) { + Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text("캘린더") + } +} + diff --git a/feature/calendar/src/main/kotlin/com/giwon/aide/feature/calendar/navigation/CalendarNavigation.kt b/feature/calendar/src/main/kotlin/com/giwon/aide/feature/calendar/navigation/CalendarNavigation.kt new file mode 100644 index 0000000..01e78fc --- /dev/null +++ b/feature/calendar/src/main/kotlin/com/giwon/aide/feature/calendar/navigation/CalendarNavigation.kt @@ -0,0 +1,16 @@ +package com.giwon.aide.feature.calendar.navigation + +import androidx.navigation3.runtime.EntryProviderScope +import androidx.navigation3.runtime.NavKey +import com.giwon.aide.feature.calendar.CalendarRoute +import kotlinx.serialization.Serializable + + +@Serializable +data object CalendarKey: NavKey + +fun EntryProviderScope.calendarEntry() { + entry { + CalendarRoute() + } +} diff --git a/feature/home/src/main/kotlin/com/giwon/aide/feature/home/HomeRoute.kt b/feature/home/src/main/kotlin/com/giwon/aide/feature/home/HomeRoute.kt new file mode 100644 index 0000000..980d51e --- /dev/null +++ b/feature/home/src/main/kotlin/com/giwon/aide/feature/home/HomeRoute.kt @@ -0,0 +1,20 @@ +package com.giwon.aide.feature.home + +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 HomeRoute() { + HomeScreen() +} + +@Composable +internal fun HomeScreen(modifier: Modifier = Modifier) { + Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text("홈") + } +} diff --git a/feature/home/src/main/kotlin/com/giwon/aide/feature/home/navigation/HomeNavigation.kt b/feature/home/src/main/kotlin/com/giwon/aide/feature/home/navigation/HomeNavigation.kt new file mode 100644 index 0000000..c5f2f98 --- /dev/null +++ b/feature/home/src/main/kotlin/com/giwon/aide/feature/home/navigation/HomeNavigation.kt @@ -0,0 +1,15 @@ +package com.giwon.aide.feature.home.navigation + +import androidx.navigation3.runtime.EntryProviderScope +import androidx.navigation3.runtime.NavKey +import com.giwon.aide.feature.home.HomeRoute +import kotlinx.serialization.Serializable + +@Serializable +data object HomeKey: NavKey + +fun EntryProviderScope.homeEntry() { + entry { + HomeRoute() + } +} diff --git a/feature/settings/src/main/kotlin/com/giwon/aide/feature/settings/SettingsRoute.kt b/feature/settings/src/main/kotlin/com/giwon/aide/feature/settings/SettingsRoute.kt new file mode 100644 index 0000000..ebc9352 --- /dev/null +++ b/feature/settings/src/main/kotlin/com/giwon/aide/feature/settings/SettingsRoute.kt @@ -0,0 +1,20 @@ +package com.giwon.aide.feature.settings + +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 SettingsRoute() { + SettingsScreen() +} + +@Composable +internal fun SettingsScreen(modifier: Modifier = Modifier) { + Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text("설정") + } +} diff --git a/feature/settings/src/main/kotlin/com/giwon/aide/feature/settings/navigation/SettingsNavigation.kt b/feature/settings/src/main/kotlin/com/giwon/aide/feature/settings/navigation/SettingsNavigation.kt new file mode 100644 index 0000000..5bde0a9 --- /dev/null +++ b/feature/settings/src/main/kotlin/com/giwon/aide/feature/settings/navigation/SettingsNavigation.kt @@ -0,0 +1,15 @@ +package com.giwon.aide.feature.settings.navigation + +import androidx.navigation3.runtime.EntryProviderScope +import androidx.navigation3.runtime.NavKey +import com.giwon.aide.feature.settings.SettingsRoute +import kotlinx.serialization.Serializable + +@Serializable +data object SettingsKey: NavKey + +fun EntryProviderScope.settingsEntry() { + entry { + SettingsRoute() + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3c78e14..e9b5274 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,15 +10,19 @@ androidJunit5 = "2.0.1" mockk = "1.14.11" turbine = "1.2.1" assertj = "3.27.7" -coreKtx = "1.10.1" -lifecycleRuntimeKtx = "2.6.1" -activityCompose = "1.8.0" +coreKtx = "1.18.0" +lifecycle = "2.10.0" +activityCompose = "1.12.4" +navigation3 = "1.1.7" +kotlinxSerialization = "1.10.0" +timber = "5.0.1" +leakcanary = "2.14" composeBom = "2026.02.01" konsist = "0.18.1" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } -androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" } @@ -48,6 +52,12 @@ turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" } kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" } konsist = { group = "com.lemonappdev", name = "konsist", version.ref = "konsist" } +androidx-navigation3-runtime = { group = "androidx.navigation3", name = "navigation3-runtime", version.ref = "navigation3" } +androidx-navigation3-ui = { group = "androidx.navigation3", name = "navigation3-ui", version.ref = "navigation3" } +androidx-lifecycle-viewmodel-navigation3 = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-navigation3", version.ref = "lifecycle" } +kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinxSerialization" } +timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" } +leakcanary-android = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "leakcanary" } [plugins] @@ -58,6 +68,7 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } room = { id = "androidx.room", version.ref = "room" } android-junit5 = { id = "de.mannodermaus.android-junit5", version.ref = "androidJunit5" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } aide-android-application = { id = "aide.android.application" } aide-android-room = { id = "aide.android.room" }