Release 0.3.0 to main

.gitignore

@@ -84,3 +84,4 @@ lint/tmp/
 @gemini-skills/
 .gemini/logs/
 .gemini/cache/
+docs/superpowers/

app/build.gradle.kts

@@ -3,6 +3,7 @@ import java.util.Properties
 plugins {
     id("buyornot.android.application")
     alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.hilt)
     alias(libs.plugins.ksp)
     alias(libs.plugins.google.services)
@@ -29,8 +30,8 @@ android {
 
     defaultConfig {
         applicationId = "com.sseotdabwa.buyornot"
-        versionCode = 5
-        versionName = "0.2.0"
+        versionCode = 6
+        versionName = "0.3.0"
 
         buildConfigField("String", "KAKAO_NATIVE_APP_KEY", "\"${localProperties.getProperty("kakao.nativeAppKey", "")}\"")
         manifestPlaceholders["NATIVE_APP_KEY"] = localProperties.getProperty("kakao.nativeAppKey", "")

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
 
     <application

app/src/main/java/com/sseotdabwa/buyornot/navigation/BuyOrNotNavHost.kt

@@ -8,12 +8,15 @@ import androidx.navigation.compose.NavHost
 import com.sseotdabwa.buyornot.BuildConfig
 import com.sseotdabwa.buyornot.core.network.AuthEvent
 import com.sseotdabwa.buyornot.core.network.AuthEventBus
+import com.sseotdabwa.buyornot.core.ui.imageviewer.imageViewerScreen
+import com.sseotdabwa.buyornot.core.ui.imageviewer.navigateToImageViewer
 import com.sseotdabwa.buyornot.core.ui.snackbar.LocalSnackbarState
 import com.sseotdabwa.buyornot.core.ui.webview.navigateToPrivacyPolicy
 import com.sseotdabwa.buyornot.core.ui.webview.navigateToTerms
+import com.sseotdabwa.buyornot.core.ui.webview.navigateToWebView
 import com.sseotdabwa.buyornot.core.ui.webview.webViewScreen
-import com.sseotdabwa.buyornot.feature.auth.navigation.AUTH_ROUTE
-import com.sseotdabwa.buyornot.feature.auth.navigation.SPLASH_ROUTE
+import com.sseotdabwa.buyornot.feature.auth.navigation.AuthRoute
+import com.sseotdabwa.buyornot.feature.auth.navigation.SplashRoute
 import com.sseotdabwa.buyornot.feature.auth.navigation.authScreen
 import com.sseotdabwa.buyornot.feature.auth.navigation.navigateForceToLogin
 import com.sseotdabwa.buyornot.feature.auth.navigation.navigateToLogin
@@ -27,17 +30,10 @@ import com.sseotdabwa.buyornot.feature.mypage.navigation.navigateToMyPage
 import com.sseotdabwa.buyornot.feature.notification.navigation.navigateToNotification
 import com.sseotdabwa.buyornot.feature.notification.navigation.navigateToNotificationDetail
 import com.sseotdabwa.buyornot.feature.notification.navigation.notificationGraph
-import com.sseotdabwa.buyornot.feature.upload.navigation.UPLOAD_ROUTE
+import com.sseotdabwa.buyornot.feature.upload.navigation.UploadRoute
 import com.sseotdabwa.buyornot.feature.upload.navigation.navigateToUpload
 import com.sseotdabwa.buyornot.feature.upload.navigation.uploadScreen
 
-/**
- * BuyOrNot 앱의 메인 네비게이션 호스트
- *
- * @param navController 네비게이션 컨트롤러
- * @param authEventBus 인증 관련 글로벌 이벤트를 수신하는 버스
- * @param modifier 레이아웃 수정자
- */
 @Composable
 fun BuyOrNotNavHost(
     navController: NavHostController,
@@ -47,7 +43,6 @@ fun BuyOrNotNavHost(
 ) {
     val snackbarState = LocalSnackbarState.current
 
-    // 강제 로그아웃 이벤트 처리
     LaunchedEffect(authEventBus) {
         authEventBus.events.collect { event ->
             if (event == AuthEvent.FORCE_LOGOUT) {
@@ -61,7 +56,7 @@ fun BuyOrNotNavHost(
 
     NavHost(
         navController = navController,
-        startDestination = SPLASH_ROUTE,
+        startDestination = SplashRoute,
         modifier = modifier,
     ) {
         splashScreen(
@@ -70,7 +65,7 @@ fun BuyOrNotNavHost(
                 navController.navigateToHome(
                     navOptions =
                         androidx.navigation.navOptions {
-                            popUpTo(SPLASH_ROUTE) { inclusive = true }
+                            popUpTo<SplashRoute> { inclusive = true }
                             launchSingleTop = true
                         },
                 )
@@ -83,7 +78,7 @@ fun BuyOrNotNavHost(
                 navController.navigateToHome(
                     navOptions =
                         androidx.navigation.navOptions {
-                            popUpTo(AUTH_ROUTE) { inclusive = true }
+                            popUpTo<AuthRoute> { inclusive = true }
                             launchSingleTop = true
                         },
                 )
@@ -97,10 +92,14 @@ fun BuyOrNotNavHost(
             onNotificationClick = navController::navigateToNotification,
             onProfileClick = navController::navigateToMyPage,
             onUploadClick = navController::navigateToUpload,
+            onLinkClick = { url -> navController.navigateToWebView("", url) },
+            onImageClick = { urls, page -> navController.navigateToImageViewer(urls, page) },
         )
         notificationGraph(
             onBackClick = navController::popBackStack,
             onNotificationClick = navController::navigateToNotificationDetail,
+            onLinkClick = { url -> navController.navigateToWebView("", url) },
+            onImageClick = { urls, page -> navController.navigateToImageViewer(urls, page) },
         )
         uploadScreen(
             onNavigateBack = navController::popBackStack,
@@ -109,7 +108,7 @@ fun BuyOrNotNavHost(
                     tab = HomeTab.MY_FEED,
                     navOptions =
                         androidx.navigation.navOptions {
-                            popUpTo(UPLOAD_ROUTE) {
+                            popUpTo<UploadRoute> {
                                 inclusive = true
                             }
                             launchSingleTop = true
@@ -122,6 +121,9 @@ fun BuyOrNotNavHost(
             versionName = BuildConfig.VERSION_NAME,
             onNavigateToLogin = navController::navigateForceToLogin,
         )
+        imageViewerScreen(
+            onBackClick = navController::popBackStack,
+        )
         webViewScreen(
             onBackClick = navController::popBackStack,
         )

app/src/main/java/com/sseotdabwa/buyornot/ui/BuyOrNotApp.kt

@@ -12,7 +12,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.NavDestination
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.sseotdabwa.buyornot.core.designsystem.components.BuyOrNotSnackBarHost
@@ -21,25 +20,11 @@ import com.sseotdabwa.buyornot.core.network.AuthEventBus
 import com.sseotdabwa.buyornot.core.ui.permission.rememberNotificationPermission
 import com.sseotdabwa.buyornot.core.ui.snackbar.LocalSnackbarState
 import com.sseotdabwa.buyornot.core.ui.snackbar.rememberBuyOrNotSnackbarState
-import com.sseotdabwa.buyornot.feature.auth.navigation.AUTH_ROUTE
-import com.sseotdabwa.buyornot.feature.auth.navigation.SPLASH_ROUTE
-import com.sseotdabwa.buyornot.feature.home.navigation.HOME_ROUTE
+import com.sseotdabwa.buyornot.feature.auth.navigation.AuthRoute
+import com.sseotdabwa.buyornot.feature.auth.navigation.SplashRoute
+import com.sseotdabwa.buyornot.feature.home.navigation.HomeRoute
 import com.sseotdabwa.buyornot.navigation.BuyOrNotNavHost
 
-/**
- * BuyOrNot 앱의 메인 컴포저블
- *
- * 네비게이션과 하단 네비게이션 바를 포함한 앱의 전체 구조를 정의합니다.
- * 스플래시 및 로그인 화면에서는 하단 바가 표시되지 않습니다.
- *
- * 전체 화면이 필요하면 → bottomBarPadding() 함수의 리스트에 라우트 추가
- * 일반 화면이면 → 아무 것도 하지 않아도 자동으로 패딩 적용
- *
- * @param authEventBus 인증 관련 이벤트 버스
- * @param onBackPressed 홈 화면에서 뒤로가기 시 앱 종료를 위한 콜백
- * @param onFinish 앱 종료 콜백 (강제 업데이트 시 "종료" 버튼)
- * @param viewModel 앱 공통 ViewModel
- */
 @Composable
 fun BuyOrNotApp(
     authEventBus: AuthEventBus,
@@ -54,12 +39,10 @@ fun BuyOrNotApp(
 
     val isFirstRun by viewModel.isFirstRun.collectAsStateWithLifecycle()
 
-    // 홈 화면에서 뒤로가기 시 앱 종료
-    BackHandler(enabled = currentDestination?.route == HOME_ROUTE) {
+    BackHandler(enabled = currentDestination?.route?.startsWith(HomeRoute::class.qualifiedName ?: "") == true) {
         onBackPressed()
     }
 
-    // 앱 진입 시 최초 1회만 알림 권한 자동 요청
     val (hasNotificationPermission, requestNotificationPermission) = rememberNotificationPermission()
 
     LaunchedEffect(isFirstRun) {
@@ -71,6 +54,11 @@ fun BuyOrNotApp(
         }
     }
 
+    val isFullscreen =
+        currentDestination?.route.let { route ->
+            route == SplashRoute::class.qualifiedName || route == AuthRoute::class.qualifiedName
+        }
+
     CompositionLocalProvider(LocalSnackbarState provides snackbarState) {
         Scaffold(
             containerColor = BuyOrNotTheme.colors.gray0,
@@ -83,27 +71,17 @@ fun BuyOrNotApp(
                 modifier =
                     Modifier
                         .consumeWindowInsets(innerPadding)
-                        .bottomBarPadding(currentDestination, innerPadding),
+                        .bottomBarPadding(isFullscreen, innerPadding),
             )
         }
     }
 }
 
-/**
- * 특정 화면(스플래시, 로그인)에서는 시스템 패딩을 제거하는 확장 함수
- *
- * NavHost에 적용되어, 전체 화면이 필요한 스플래시/로그인 화면에서는
- * 시스템 바 영역까지 확장되고, 일반 화면에서는 하단 바 패딩을 적용합니다.
- *
- * @param currentDestination 현재 네비게이션 목적지
- * @param padding Scaffold의 innerPadding (하단 바 높이 포함)
- * @return 조건에 따라 패딩이 적용되거나 제거된 Modifier
- */
 private fun Modifier.bottomBarPadding(
-    currentDestination: NavDestination?,
+    isFullscreen: Boolean,
     padding: PaddingValues,
 ): Modifier =
-    if (currentDestination?.route in listOf(SPLASH_ROUTE, AUTH_ROUTE)) {
+    if (isFullscreen) {
         this
     } else {
         this.padding(padding)

build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt

@@ -15,6 +15,7 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
                 apply("com.android.library")
                 apply("org.jetbrains.kotlin.android")
                 apply("org.jetbrains.kotlin.plugin.compose")
+                apply("org.jetbrains.kotlin.plugin.serialization")
             }
 
             extensions.configure<LibraryExtension> {
@@ -30,7 +31,6 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
                 add("implementation", libs.findLibrary("androidx.lifecycle.runtime.compose").get())
                 add("implementation", libs.findLibrary("androidx.navigation.compose").get())
                 add("implementation", libs.findLibrary("hilt.navigation.compose").get())
-
             }
         }
     }

build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.ktlint) apply false

core/data/src/main/java/com/sseotdabwa/buyornot/core/data/repository/FeedRepositoryImpl.kt

@@ -1,17 +1,20 @@
 package com.sseotdabwa.buyornot.core.data.repository
 
 import com.sseotdabwa.buyornot.core.network.api.FeedApiService
+import com.sseotdabwa.buyornot.core.network.dto.request.FeedImageRequest
 import com.sseotdabwa.buyornot.core.network.dto.request.FeedRequest
 import com.sseotdabwa.buyornot.core.network.dto.request.PresignedUrlRequest
 import com.sseotdabwa.buyornot.core.network.dto.request.VoteRequest
 import com.sseotdabwa.buyornot.core.network.dto.response.AuthorDto
+import com.sseotdabwa.buyornot.core.network.dto.response.FeedImageDto
 import com.sseotdabwa.buyornot.core.network.dto.response.FeedItemDto
 import com.sseotdabwa.buyornot.core.network.dto.response.FeedListResponse
 import com.sseotdabwa.buyornot.core.network.dto.response.VoteResponse
 import com.sseotdabwa.buyornot.core.network.dto.response.getOrThrow
 import com.sseotdabwa.buyornot.domain.model.Author
 import com.sseotdabwa.buyornot.domain.model.Feed
 import com.sseotdabwa.buyornot.domain.model.FeedCategory
+import com.sseotdabwa.buyornot.domain.model.FeedImage
 import com.sseotdabwa.buyornot.domain.model.FeedStatus
 import com.sseotdabwa.buyornot.domain.model.UploadInfo
 import com.sseotdabwa.buyornot.domain.model.VoteChoice
@@ -29,9 +32,10 @@ class FeedRepositoryImpl @Inject constructor(
         cursor: Long?,
         size: Int,
         feedStatus: String?,
+        category: List<String>?,
     ): FeedList =
         feedApiService
-            .getFeedList(cursor, size, feedStatus)
+            .getFeedList(cursor, size, feedStatus, category)
             .getOrThrow()
             .toDomain()
 
@@ -87,19 +91,26 @@ class FeedRepositoryImpl @Inject constructor(
         category: FeedCategory,
         price: Int,
         content: String,
-        s3ObjectKey: String,
-        imageWidth: Int,
-        imageHeight: Int,
+        images: List<FeedImage>,
+        title: String?,
+        link: String?,
     ): Long =
         feedApiService
             .createFeed(
                 FeedRequest(
                     category = category.name,
                     price = price,
                     content = content,
-                    s3ObjectKey = s3ObjectKey,
-                    imageWidth = imageWidth,
-                    imageHeight = imageHeight,
+                    images =
+                        images.map { image ->
+                            FeedImageRequest(
+                                s3ObjectKey = image.s3ObjectKey,
+                                imageWidth = image.imageWidth,
+                                imageHeight = image.imageHeight,
+                            )
+                        },
+                    title = title,
+                    link = link,
                 ),
             ).getOrThrow()
             .feedId
@@ -149,21 +160,28 @@ private fun FeedListResponse.toDomain(): FeedList =
 private fun FeedItemDto.toDomain(): Feed =
     Feed(
         feedId = feedId,
+        title = title ?: "",
         content = content,
         price = String.format(java.util.Locale.KOREA, "%,d", price),
         category = category.toFeedCategory(),
         yesCount = yesCount,
         noCount = noCount,
         totalCount = totalCount,
         feedStatus = feedStatus.toFeedStatus(),
-        s3ObjectKey = s3ObjectKey,
-        viewUrl = viewUrl,
-        imageWidth = imageWidth,
-        imageHeight = imageHeight,
+        images = images.map { it.toDomain() },
         author = author.toDomain(),
         createdAt = createdAt,
         hasVoted = hasVoted ?: false,
         myVoteChoice = myVoteChoice?.toVoteChoice(),
+        productLink = link,
+    )
+
+private fun FeedImageDto.toDomain(): FeedImage =
+    FeedImage(
+        s3ObjectKey = s3ObjectKey,
+        imageUrl = imageUrl,
+        imageWidth = imageWidth,
+        imageHeight = imageHeight,
     )
 
 private fun String.toFeedCategory(): FeedCategory =

core/data/src/main/java/com/sseotdabwa/buyornot/core/data/repository/NotificationRepositoryImpl.kt

@@ -30,5 +30,6 @@ class NotificationRepositoryImpl @Inject constructor(
             resultPercent = resultPercent,
             resultLabel = resultLabel,
             viewUrl = viewUrl,
+            feedTitle = feedTitle.orEmpty(),
         )
 }