[Sync] v2.1.0 Main -> Develop

.github/ISSUE_TEMPLATE/issue-form.yml

@@ -1,16 +1,7 @@
 name: '이슈 생성'
-description: '이슈 생성과 동시에 Jira와 연동됩니다.'
+description: '새 이슈를 생성합니다'
 title: '이슈 제목'
 body:
-  - type: input
-    id: epicId
-    attributes:
-      label: '💎 에픽 ID'
-      description: '에픽 ID를 입력해주세요'
-      placeholder: 'KAN-1'
-    validations:
-      required: true
-
   - type: input
     id: dueDate
     attributes:

README.md

@@ -3,42 +3,53 @@
 </p>
 
 
-
+<p align="center" style="font-size:150%">
+  <a href="https://play.google.com/store/apps/details?id=com.acon.acon" target="_blank">PlayStore</a> ·
+  <a href="https://aconinc.netlify.app/" target="_blank">About us</a> ·
+  <a href="https://github.com/SOPT-all/SOPT-all-35-APPJAM-ANDROID-ACON" target="_blank">Previous Repository</a>
+</p>
 <p align="center" style="font-size:200%"><strong>No More Research</strong></p>
 <h1 align="center">Acon</h1>
 
 <p align="center"><img width="662" alt="image" src="https://github.com/user-attachments/assets/fb268135-b2ea-4258-916e-6a6abcdfbd47" /></p>
 
 
-<p align="center">
-  <img src="https://github.com/user-attachments/assets/540aea87-6a2e-432e-9ce1-e2b4d9e4a472" width="250"/>
-  &nbsp;&nbsp;&nbsp;
-  <img src="https://github.com/user-attachments/assets/f4d8cc0a-1783-4504-a0ec-c7b40d479d17" width="250"/>
-  &nbsp;&nbsp;&nbsp;
-  <img src="https://github.com/user-attachments/assets/ba3e50e8-f5f8-4eb4-85e9-3647ea5b420a" width="250"/>
-</p>
+<table align="center">
+  <tr>
+    <th>홈</th>
+    <th>리뷰 등록</th>
+    <th>북마크 및 장소상세</th>
+    <th>장소 업로드</th>
+  </tr>
+  <tr>
+    <td><img src="https://github.com/user-attachments/assets/540aea87-6a2e-432e-9ce1-e2b4d9e4a472" width="200"/></td>
+    <td><img src="https://github.com/user-attachments/assets/f4d8cc0a-1783-4504-a0ec-c7b40d479d17" width="200"/></td>
+    <td><img src="https://github.com/user-attachments/assets/ba3e50e8-f5f8-4eb4-85e9-3647ea5b420a" width="200"/></td>
+    <td><img src="https://github.com/user-attachments/assets/e4860ff1-a693-4239-8115-4345d06c428a" width="280"/></td>
+  </tr>
+</table>
 
 ---
 
 ## ⚙️ Teck Stacks
 
-| 분류 | 사용 기술 |
-|------|------------|
-| Language | Kotlin |
-| UI | Jetpack Compose, Material 3 |
+| 분류 | 사용 기술                                       |
+|------|---------------------------------------------|
+| Language | Kotlin                                      |
+| UI | Jetpack Compose, Material 3                 |
 | Architecture | MVI Orbit, Multi-module, Clean Architecture |
-| DI | Hilt |
-| Network | Retrofit, OkHttp |
-| CI/CD | GitHub Actions, Firebase App Distribution |
-| Etc | Play-services, Amplitude, Haze |
+| DI | Hilt                                        |
+| Network | Retrofit, OkHttp                            |
+| CI/CD | GitHub Actions, Firebase App Distribution   |
+| Etc | Play-services, Amplitude, Haze, Branch.io   |
 
 ---
 
 ## 🙌 Contributors
-[@Thirfir](https://github.com/ThirFir)
+[@Thirfir](https://github.com/ThirFir) (2025.1 ~ )
 <br/>
-[@1971123-seongmin](https://github.com/1971123-seongmin)
+[@1971123-seongmin](https://github.com/1971123-seongmin) (2025.1 ~ )
 <br/>
-[@tunaunnie](https://github.com/tunaunnie)
+[@tunaunnie](https://github.com/tunaunnie) (2025.1 ~ 2025.2)
 <br/>
-[@0se0](https://github.com/0se0)
+[@0se0](https://github.com/0se0) (2025.1 ~ 2025.2)

core/designsystem/src/main/java/com/acon/acon/core/designsystem/animation/SlideUpAnimation.kt

@@ -0,0 +1,86 @@
+package com.acon.acon.core.designsystem.animation
+
+import android.annotation.SuppressLint
+import androidx.compose.animation.core.Easing
+import androidx.compose.animation.core.LinearOutSlowInEasing
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.layout.offset
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.acon.acon.core.designsystem.R
+import kotlinx.coroutines.delay
+
+@SuppressLint("UseOfNonLambdaOffsetOverload")
+@Composable
+fun Modifier.slideUpAnimation(
+    order: Int = 1,
+    delay: Int = 0,
+    duration: Int = 500,
+    easing: Easing = LinearOutSlowInEasing,
+    yOffset: Dp = 100.dp,
+    titleDelay: Int = 300,
+    contentDelay: Int = 600,
+    hasCaption: Boolean = false,
+    onAnimationEnded: () -> Unit = {}
+): Modifier = composed {
+    val animationDelay = remember(order, hasCaption) {
+        when (order) {
+            1 -> delay
+            2 -> delay + titleDelay
+            3 -> if (hasCaption) delay + titleDelay * 2 else 0
+            4 -> if (hasCaption) {
+                delay + titleDelay * 2 + contentDelay
+            } else {
+                delay + titleDelay + contentDelay
+            }
+            else -> delay
+        }
+    }
+
+    var visible by remember { mutableStateOf(false) }
+
+    LaunchedEffect(Unit) {
+        delay(animationDelay.toLong())
+        visible = true
+    }
+
+    val offsetY by animateDpAsState(
+        targetValue = if (visible) 0.dp else yOffset,
+        animationSpec = tween(
+            durationMillis = duration,
+            easing = easing
+        ),
+        label = stringResource(R.string.slide_up_offset)
+    )
+
+    val alpha by animateFloatAsState(
+        targetValue = if (visible) 1f else 0f,
+        animationSpec = tween(
+            durationMillis = duration,
+            easing = easing
+        ),
+        label = stringResource(R.string.slide_up_alpha)
+    )
+
+    LaunchedEffect(offsetY) {
+        if (offsetY == 0.dp) {
+            onAnimationEnded()
+        }
+    }
+
+    Modifier
+        .offset(y = offsetY)
+        .alpha(alpha)
+}

core/designsystem/src/main/java/com/acon/acon/core/designsystem/component/dialog/v2/AconTwoActionDialog.kt

@@ -34,6 +34,7 @@ fun AconTwoActionDialog(
     onAction1: () -> Unit,
     onAction2: () -> Unit,
     onDismissRequest: () -> Unit,
+    isTextAlign: Boolean = false,
     action1Color: Color = AconTheme.color.White,
     action2Color: Color = AconTheme.color.Action,
     modifier: Modifier = Modifier,
@@ -65,6 +66,7 @@ fun AconTwoActionDialog(
                     style = AconTheme.typography.Title4,
                     fontWeight = FontWeight.SemiBold,
                     color = AconTheme.color.White,
+                    textAlign = if (isTextAlign) TextAlign.Center else TextAlign.Unspecified,
                     modifier = Modifier
                         .padding(top = 24.dp, bottom = 22.dp)
                         .padding(horizontal = 16.dp)

core/designsystem/src/main/res/values/strings.xml

@@ -12,6 +12,7 @@
     <string name="select">선택</string>
     <string name="submit">제출하기</string>
     <string name="end">끝내기</string>
+    <string name="quit">그만두기</string>
     <string name="report">제보하기</string>
     <string name="continue_writing">계속 작성</string>
     <string name="next">다음</string>
@@ -31,6 +32,10 @@
     <string name="do_next">다음에 하기</string>
     <string name="go_home">홈으로 가기</string>
 
+    <!-- label -->
+    <string name="slide_up_offset">slide_up_offset</string>
+    <string name="slide_up_alpha">slide_up_alpha</string>
+
     <!-- Etc -->
     <string name="restart">마무리 하기</string>
     <string name="update">업데이트</string>
@@ -212,7 +217,7 @@
 
     <!-- Upload Place -->
     <string name="upload_process_step_transition">upload_process_step_transition</string>
-    <string name="upload_place_exit">등록을 취소하시겠습니까?</string>
+    <string name="upload_place_exit">여기서 그만두면\n작성중인 내용이 사라져요</string>
     <string name="upload_place_topbar">장소 등록</string>
     <string name="required_field">필수 입력</string>
     <string name="optional_field">선택 입력</string>

core/model/src/main/java/com/acon/acon/core/model/type/FeatureType.kt

@@ -29,7 +29,7 @@ sealed interface RestaurantFeatureType : FeatureType {
 sealed interface CafeFeatureType : FeatureType {
 
     enum class CafeType: FeatureType {
-        GOOD_FOR_WORK,
+        WORK_FRIENDLY,
         NOT_GOOD_FOR_WORK;
     }
 }

data/src/main/kotlin/com/acon/acon/data/api/remote/noauth/SpotNoAuthApi.kt

@@ -1,8 +1,10 @@
 package com.acon.acon.data.api.remote.noauth
 
 import com.acon.acon.data.dto.request.RecentNavigationLocationRequest
+import com.acon.acon.data.dto.request.SpotListRequest
 import com.acon.acon.data.dto.response.MenuBoardListResponse
 import com.acon.acon.data.dto.response.SpotDetailResponse
+import com.acon.acon.data.dto.response.SpotListResponse
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
@@ -11,6 +13,11 @@ import retrofit2.http.Query
 
 interface SpotNoAuthApi {
 
+    @POST("/api/v1/spots")
+    suspend fun fetchSpotList(
+        @Body request: SpotListRequest
+    ): SpotListResponse
+
     @POST("/api/v1/guided-spots")
     suspend fun fetchRecentNavigationLocation(
         @Body request: RecentNavigationLocationRequest

data/src/main/kotlin/com/acon/acon/data/datasource/remote/SpotRemoteDataSource.kt

@@ -1,5 +1,6 @@
 package com.acon.acon.data.datasource.remote
 
+import com.acon.acon.core.model.type.UserType
 import com.acon.acon.data.api.remote.auth.SpotAuthApi
 import com.acon.acon.data.api.remote.noauth.SpotNoAuthApi
 import com.acon.acon.data.dto.request.AddBookmarkRequest
@@ -16,8 +17,10 @@ class SpotRemoteDataSource @Inject constructor(
     private val spotAuthApi: SpotAuthApi
 ) {
 
-    suspend fun fetchSpotList(request: SpotListRequest): SpotListResponse {
-        return spotAuthApi.fetchSpotList(request)
+    suspend fun fetchSpotList(request: SpotListRequest, userType: UserType): SpotListResponse {
+        return if (userType == UserType.GUEST)
+            spotNoAuthApi.fetchSpotList(request)
+        else spotAuthApi.fetchSpotList(request)
     }
 
     suspend fun fetchRecentNavigationLocation(request: RecentNavigationLocationRequest) {

data/src/main/kotlin/com/acon/acon/data/repository/SpotRepositoryImpl.kt

@@ -13,6 +13,7 @@ import com.acon.acon.data.dto.request.FilterListRequest
 import com.acon.acon.data.dto.request.RecentNavigationLocationRequest
 import com.acon.acon.data.dto.request.SpotListRequest
 import com.acon.acon.data.error.runCatchingWith
+import com.acon.acon.data.session.SessionHandler
 import com.acon.acon.domain.error.spot.AddBookmarkError
 import com.acon.acon.domain.error.spot.DeleteBookmarkError
 import com.acon.acon.domain.error.spot.FetchMenuBoardsError
@@ -21,12 +22,14 @@ import com.acon.acon.domain.error.spot.FetchSpotListError
 import com.acon.acon.domain.error.spot.GetSpotDetailInfoError
 import com.acon.acon.domain.repository.ProfileRepository
 import com.acon.acon.domain.repository.SpotRepository
+import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 
 class SpotRepositoryImpl @Inject constructor(
     private val spotRemoteDataSource: SpotRemoteDataSource,
     private val profileInfoCache: ProfileInfoCache,
-    private val profileRepository: ProfileRepository
+    private val profileRepository: ProfileRepository,
+    private val sessionHandler: SessionHandler
 ) : SpotRepository {
 
     override suspend fun fetchSpotList(
@@ -48,7 +51,7 @@ class SpotRepositoryImpl @Inject constructor(
                             )
                         }
                     ),
-                )
+                ), sessionHandler.getUserType().first()
             ).toSpotList()
         }
     }