[Feat/#10] 티어 탭 UI

.github/pull_request_template.md

@@ -7,11 +7,33 @@
 ## PR 유형
 해당하는 항목에 체크해주세요.
 
-- [ ] Add (신규 기능 / 화면 / 컴포넌트 추가)
-- [ ] Feat (기존 기능 개선 / 동작 변경)
-- [ ] Fix (버그 수정)
-- [ ] Refactor (기능 변경 없는 코드 정리)
-- [ ] Docs / Comment (문서, 주석)
-- [ ] Test (테스트 추가 또는 리팩토링)
-- [ ] Build / Config (빌드, 의존성, 설정)
-- [ ] File (파일 / 폴더 구조 변경)
+- [ ] Add — 리소스/코드/컴포넌트 추가 (기능 변화 없음)
+- [ ] Feat — 사용자에게 보이는 새로운 기능 추가
+- [ ] Fix — 버그 수정
+- [ ] Refactor — 기능 변경 없는 코드 구조 개선
+- [ ] Docs / Comment — 문서, 주석 수정
+- [ ] Test — 테스트 추가 또는 리팩토링
+- [ ] Build / Config — 빌드, 의존성, 설정 변경
+- [ ] File — 파일 / 폴더 구조 변경
+
+<br/>
+
+## 변경 사항
+<!-- 어떤 변경을 했는지 간단히 작성해주세요 -->
+
+-
+-
+-
+
+<br/>
+
+## 📸 화면 / 영상 (선택)
+<!-- 변경된 UI나 동작을 보여주세요 --> 
+
+### Before
+<!-- 이전 화면 -->
+
+### After
+<!-- 변경된 화면 -->
+
+<br/> 

.gitignore

@@ -17,3 +17,23 @@ captures
 !*.xcworkspace/contents.xcworkspacedata
 **/xcshareddata/WorkspaceSettings.xcsettings
 node_modules/
+.xcconfig
+
+# CocoaPods
+Pods/
+**/Pods/
+pods-iosapp-frameworks/
+
+# Xcode
+DerivedData/
+*.xcworkspace/xcuserdata/
+*.xcodeproj/xcuserdata/
+*.xcuserstate
+*.car
+
+secrets/
+
+# Build
+build/
+
+

build.gradle.kts

@@ -10,4 +10,5 @@ plugins {
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.android.test) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.buildkonfig) apply false
 }

composeApp/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.composeMultiplatform)
     alias(libs.plugins.composeCompiler)
     alias(libs.plugins.composeHotReload)
+    alias(libs.plugins.kotlin.serialization)
 }
 
 kotlin {
@@ -33,6 +34,7 @@ kotlin {
             implementation(compose.preview)
             implementation(libs.androidx.activity.compose)
             implementation(libs.koin.android)
+            implementation(libs.naver.maps)
 
             implementation(libs.google.material)
             implementation(libs.androidx.core.splashscreen)
@@ -47,12 +49,16 @@ kotlin {
             implementation(libs.androidx.lifecycle.viewmodelCompose)
             implementation(libs.androidx.lifecycle.runtimeCompose)
             implementation(libs.navigation.compose)
+            implementation(libs.kotlinx.serialization.json)
 
             implementation(project(":shared:core:designSystem"))
+            implementation(project(":shared:core:config"))
             implementation(project(":shared:core:logging"))
+            implementation(project(":shared:core:serialization"))
 
             implementation(project(":shared:data:network"))
             implementation(project(":shared:data:firstLaunch"))
+            implementation(project(":shared:data:tier"))
 
             implementation(project(":shared:feature:community"))
             implementation(project(":shared:feature:draw"))
@@ -64,6 +70,7 @@ kotlin {
             implementation(project(":shared:feature:my"))
 
             implementation(project(":shared:domain:firstLaunch"))
+            implementation(project(":shared:domain:tier"))
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)

composeApp/src/androidMain/kotlin/com/kus/kustaurant/KusApplication.kt

@@ -1,15 +1,19 @@
 package com.kus.kustaurant
 
 import android.app.Application
+import com.kus.core.config.BuildKonfig
 import com.kus.data.firstLaunch.di.androidFirstLaunchModule
 import com.kus.kustaurant.di.initKoin
 import com.kus.logging.initLogger
+import com.naver.maps.map.NaverMapSdk
 import org.koin.android.ext.koin.androidContext
 
 class KusApplication : Application() {
     override fun onCreate() {
         super.onCreate()
         initLogger()
+        NaverMapSdk.getInstance(this).client =
+            NaverMapSdk.NaverCloudPlatformClient(BuildKonfig.NAVER_MAP_CLIENT_ID)
 
         initKoin(
             config = { androidContext(this@KusApplication) },

composeApp/src/commonMain/kotlin/com/kus/kustaurant/App.kt

@@ -17,6 +17,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.NavOptionsBuilder
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
+import com.kus.designsystem.theme.KusTheme
 import com.kus.feature.community.navigation.Community
 import com.kus.feature.draw.navigation.Draw
 import com.kus.feature.home.navigation.Home
@@ -25,7 +26,6 @@ import com.kus.feature.tier.navigation.Tier
 import com.kus.kustaurant.navigation.BottomTab
 import com.kus.kustaurant.navigation.KusBottomBar
 import com.kus.kustaurant.navigation.KusNavHost
-import com.kus.kustaurant.theme.KusTheme
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.ui.tooling.preview.Preview
 
@@ -78,12 +78,7 @@ fun SetNavigation() {
         },
         modifier = Modifier.systemBarsPadding(),
     ) { padding ->
-        KusNavHost(
-            navController = navController,
-            durationMillis = durationMillis,
-            onShowMessage = onShowMessage,
-            modifier = Modifier.padding(padding),
-        )
+        KusNavHost(navController, durationMillis, onShowMessage, Modifier.padding(padding))
     }
 }
 

composeApp/src/commonMain/kotlin/com/kus/kustaurant/di/initKoin.kt

@@ -1,9 +1,13 @@
 package com.kus.kustaurant.di
 
 import com.kus.data.firstLaunch.di.firstLaunchDataModule
+import com.kus.data.network.di.networkModule
 import com.kus.domain.firstLaunch.di.firstLaunchDomainModule
-import com.kus.feature.onboarding.di.onboardingModule
-import com.kus.feature.splash.di.splashModule
+import com.kus.feature.onboarding.di.onboardingFeatureModule
+import com.kus.feature.splash.di.splashFeatureModule
+import com.kus.feature.tier.di.tierFeatureModule
+import com.kus.shared.data.tier.di.tierDataModule
+import com.kus.shared.domain.tier.di.tierDomainModule
 import org.koin.core.context.startKoin
 import org.koin.core.module.Module
 import org.koin.dsl.KoinAppDeclaration
@@ -18,13 +22,17 @@ fun initKoin(
         modules(
             // domain
             firstLaunchDomainModule,
+            tierDomainModule,
 
             // data (repository 등 공통)
             firstLaunchDataModule,
+            networkModule,
+            tierDataModule,
 
             // feature
-            splashModule,
-            onboardingModule,
+            splashFeatureModule,
+            onboardingFeatureModule,
+            tierFeatureModule,
         )
 
         modules(additionalModules)

composeApp/src/commonMain/kotlin/com/kus/kustaurant/navigation/KusNavHost.kt

@@ -6,12 +6,10 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.scaleIn
 import androidx.compose.animation.scaleOut
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.currentBackStackEntryAsState
+import com.kus.core.serialization.KusJson
 import com.kus.feature.community.navigation.communityNavGraph
 import com.kus.feature.draw.navigation.drawNavGraph
 import com.kus.feature.home.navigation.Home
@@ -23,8 +21,9 @@ import com.kus.feature.onboarding.navigatioin.Onboarding
 import com.kus.feature.onboarding.navigatioin.onboardingNavGraph
 import com.kus.feature.splash.navigation.Splash
 import com.kus.feature.splash.navigation.splashNavGraph
+import com.kus.feature.tier.navigation.TierCategorySelect
 import com.kus.feature.tier.navigation.tierNavGraph
-import com.kus.logging.KusLog
+import com.kus.feature.tier.ui.TierFilterState
 
 @Composable
 fun KusNavHost(
@@ -106,7 +105,34 @@ fun KusNavHost(
         )
 
         drawNavGraph(onShowMessage = onShowMessage)
-        tierNavGraph(onShowMessage = onShowMessage)
+        tierNavGraph(
+            initialProvider = {
+                val json = navController.previousBackStackEntry
+                    ?.savedStateHandle
+                    ?.get<String>("tier_initial_json")
+
+                if (json == null) TierFilterState()
+                else KusJson.json.decodeFromString<TierFilterState>(json)
+            },
+            navigateToTierCategorySelect = { initial ->
+                val json = KusJson.json.encodeToString(initial)
+                navController.currentBackStackEntry
+                    ?.savedStateHandle
+                    ?.set("tier_initial_json", json)
+
+                navController.navigate(TierCategorySelect)
+            },
+            popBackStackWithResult = { result ->
+                val json = KusJson.json.encodeToString(result)
+                navController.previousBackStackEntry
+                    ?.savedStateHandle
+                    ?.set("tier_result_json", json)
+
+                navController.popBackStack()
+            },
+            onBackButtonClick = { navController.popBackStack()}
+        )
+
         communityNavGraph(onShowMessage = onShowMessage)
         myNavGraph(onShowMessage = onShowMessage)
     }

composeApp/src/desktopMain/kotlin/com/kus/kustaurant/navigation/BottomBarIconPainters.desktop.kt

@@ -2,17 +2,17 @@ package com.kus.kustaurant.navigation
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.painter.Painter
-import kustaurant.feature.community.generated.resources.ic_community
-import kustaurant.feature.draw.generated.resources.ic_draw
-import kustaurant.feature.home.generated.resources.ic_home
-import kustaurant.feature.my.generated.resources.ic_my
-import kustaurant.feature.tier.generated.resources.ic_tier
+import kustaurant.shared.feature.community.generated.resources.ic_community
+import kustaurant.shared.feature.draw.generated.resources.ic_draw
+import kustaurant.shared.feature.home.generated.resources.ic_home
+import kustaurant.shared.feature.my.generated.resources.ic_my
+import kustaurant.shared.feature.tier.generated.resources.ic_tier
 import org.jetbrains.compose.resources.painterResource
-import kustaurant.feature.home.generated.resources.Res as HomeRes
-import kustaurant.feature.draw.generated.resources.Res as DrawRes
-import kustaurant.feature.tier.generated.resources.Res as TierRes
-import kustaurant.feature.community.generated.resources.Res as CommunityRes
-import kustaurant.feature.my.generated.resources.Res as MyRes
+import kustaurant.shared.feature.home.generated.resources.Res as HomeRes
+import kustaurant.shared.feature.draw.generated.resources.Res as DrawRes
+import kustaurant.shared.feature.tier.generated.resources.Res as TierRes
+import kustaurant.shared.feature.community.generated.resources.Res as CommunityRes
+import kustaurant.shared.feature.my.generated.resources.Res as MyRes
 
 @Composable
 actual fun homeTabPainter(): Painter = painterResource(HomeRes.drawable.ic_home)

composeApp/src/iosMain/kotlin/com/kus/kustaurant/MainViewController.kt

@@ -1,16 +1,30 @@
 package com.kus.kustaurant
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.window.ComposeUIViewController
 import com.kus.data.firstLaunch.di.iosFirstLaunchModule
 import com.kus.kustaurant.di.initKoin
 import com.kus.logging.initLogger
 
-
 fun MainViewController() = ComposeUIViewController {
     initLogger()
 
     initKoin(
         additionalModules = listOf(iosFirstLaunchModule)
     )
-    App()
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(Color.White)
+            .windowInsetsPadding(WindowInsets.safeDrawing)
+    ) {
+        App()
+    }
 }