feat: 약속 상세 화면 기능 개발

android/app/src/main/java/com/mulberry/ody/data/remote/core/entity/meeting/mapper/MeetingResponseMapper.kt

@@ -11,19 +11,22 @@ fun MeetingResponse.toMeeting(): Meeting =
     Meeting(
         id = id,
         name = name,
-        targetPosition = targetAddress,
-        meetingDate = date.parseToLocalDate(),
-        meetingTime = time.parseToLocalTime(),
+        date = date.toLocalDate(),
+        time = time.toLocalTime(),
+        destinationAddress = targetAddress,
+        departureAddress = departureAddress,
+        departureTime = departureTime.toLocalTime(),
+        routeTime = routeTime,
         mates = mates.map { Mate(nickname = it.nickname, imageUrl = it.imageUrl) },
         inviteCode = inviteCode,
     )
 
-private fun String.parseToLocalDate(): LocalDate {
+private fun String.toLocalDate(): LocalDate {
     val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
     return LocalDate.parse(this, formatter)
 }
 
-private fun String.parseToLocalTime(): LocalTime {
+private fun String.toLocalTime(): LocalTime {
     val formatter = DateTimeFormatter.ofPattern("HH:mm")
     return LocalTime.parse(this, formatter)
 }

android/app/src/main/java/com/mulberry/ody/data/remote/core/entity/meeting/response/MeetingResponse.kt

@@ -13,6 +13,12 @@ data class MeetingResponse(
     val date: String,
     @Json(name = "time")
     val time: String,
+    @Json(name = "departureAddress")
+    val departureAddress: String,
+    @Json(name = "departureTime")
+    val departureTime: String,
+    @Json(name = "routeTime")
+    val routeTime: Int,
     @Json(name = "targetAddress")
     val targetAddress: String,
     @Json(name = "targetLatitude")

android/app/src/main/java/com/mulberry/ody/data/remote/core/repository/DefaultMeetingRepository.kt

@@ -3,20 +3,22 @@ package com.mulberry.ody.data.remote.core.repository
 import com.mulberry.ody.data.local.db.MateEtaInfoDao
 import com.mulberry.ody.data.local.entity.eta.MateEtaInfoEntity
 import com.mulberry.ody.data.remote.core.entity.meeting.mapper.toMateEtaInfo
-import com.mulberry.ody.data.remote.core.entity.meeting.mapper.toMeeting
 import com.mulberry.ody.data.remote.core.entity.meeting.mapper.toMeetingCatalogs
 import com.mulberry.ody.data.remote.core.entity.meeting.mapper.toMeetingRequest
 import com.mulberry.ody.data.remote.core.entity.meeting.mapper.toNudgeRequest
 import com.mulberry.ody.data.remote.core.entity.meeting.request.MatesEtaRequest
 import com.mulberry.ody.data.remote.core.service.MeetingService
 import com.mulberry.ody.domain.apiresult.ApiResult
 import com.mulberry.ody.domain.apiresult.map
+import com.mulberry.ody.domain.model.Mate
 import com.mulberry.ody.domain.model.MateEtaInfo
 import com.mulberry.ody.domain.model.Meeting
 import com.mulberry.ody.domain.model.MeetingCatalog
 import com.mulberry.ody.domain.model.MeetingCreationInfo
 import com.mulberry.ody.domain.model.Nudge
 import com.mulberry.ody.domain.repository.ody.MeetingRepository
+import java.time.LocalDate
+import java.time.LocalTime
 import javax.inject.Inject
 
 class DefaultMeetingRepository
@@ -30,7 +32,21 @@ class DefaultMeetingRepository
         }
 
         override suspend fun fetchMeeting(meetingId: Long): ApiResult<Meeting> {
-            return service.fetchMeeting(meetingId).map { it.toMeeting() }
+            return ApiResult.Success(
+                Meeting(
+                    id = 1,
+                    name = "약속 이름",
+                    date = LocalDate.of(2025, 2, 1),
+                    time = LocalTime.of(11, 30),
+                    destinationAddress = "서울특별시 강남구 테헤란로 411 (성담빌딩)",
+                    departureAddress = "서울특별시 송파구 올림픽로 35다길 (한국루터회관)",
+                    departureTime = LocalTime.of(10, 0),
+                    routeTime = 70,
+                    mates = listOf(Mate("올리브1", ""), Mate("올리브2", "")),
+                    inviteCode = "12345",
+                ),
+            )
+            // return service.fetchMeeting(meetingId).map { it.toMeeting() }
         }
 
         override suspend fun postNudge(nudge: Nudge): ApiResult<Unit> = service.postNudge(nudge.toNudgeRequest())

android/app/src/main/java/com/mulberry/ody/data/remote/core/service/MeetingService.kt

@@ -35,7 +35,7 @@ interface MeetingService {
     @GET("/v1/meetings/me")
     suspend fun fetchMeetingCatalogs(): ApiResult<MeetingCatalogsResponse>
 
-    @GET("/v1/meetings/{meetingId}")
+    @GET("/v2/meetings/{meetingId}")
     suspend fun fetchMeeting(
         @Path(value = "meetingId") meetingId: Long,
     ): ApiResult<MeetingResponse>

android/app/src/main/java/com/mulberry/ody/domain/model/Meeting.kt

@@ -6,9 +6,12 @@ import java.time.LocalTime
 data class Meeting(
     val id: Long,
     val name: String,
-    val targetPosition: String,
-    val meetingDate: LocalDate,
-    val meetingTime: LocalTime,
+    val date: LocalDate,
+    val time: LocalTime,
+    val destinationAddress: String,
+    val departureAddress: String,
+    val departureTime: LocalTime,
+    val routeTime: Int,
     val mates: List<Mate>,
     val inviteCode: String,
 )

android/app/src/main/java/com/mulberry/ody/presentation/common/DimensionExtensions.kt

@@ -1,8 +1,16 @@
 package com.mulberry.ody.presentation.common
 
 import android.content.Context
+import android.graphics.Point
+import android.view.View
 
 fun Int.toPixel(context: Context): Int {
     val density = context.resources.displayMetrics.density
     return (this * density).toInt()
 }
+
+fun View.getPointOnScreen(): Point {
+    val location = IntArray(2)
+    this.getLocationOnScreen(location)
+    return Point(location[0], location[1])
+}

android/app/src/main/java/com/mulberry/ody/presentation/join/MeetingJoinActivity.kt

@@ -18,6 +18,7 @@ import com.mulberry.ody.presentation.common.listener.BackListener
 import com.mulberry.ody.presentation.common.listener.NextListener
 import com.mulberry.ody.presentation.join.complete.JoinCompleteActivity
 import com.mulberry.ody.presentation.room.MeetingRoomActivity
+import com.mulberry.ody.presentation.room.MeetingRoomActivity.Companion.NAVIGATE_TO_DETAIL_MEETING
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -90,7 +91,7 @@ class MeetingJoinActivity :
             MeetingRoomActivity.getIntent(
                 this,
                 meetingId,
-                MeetingRoomActivity.NAVIGATE_TO_NOTIFICATION_LOG,
+                NAVIGATE_TO_DETAIL_MEETING,
             )
         startActivity(intent)
         finish()

android/app/src/main/java/com/mulberry/ody/presentation/meetings/MeetingsActivity.kt

@@ -19,6 +19,8 @@ import com.mulberry.ody.presentation.login.LoginActivity
 import com.mulberry.ody.presentation.meetings.adapter.MeetingsAdapter
 import com.mulberry.ody.presentation.meetings.listener.MeetingsListener
 import com.mulberry.ody.presentation.room.MeetingRoomActivity
+import com.mulberry.ody.presentation.room.MeetingRoomActivity.Companion.NAVIGATE_TO_DETAIL_MEETING
+import com.mulberry.ody.presentation.room.MeetingRoomActivity.Companion.NAVIGATE_TO_ETA_DASHBOARD
 import com.mulberry.ody.presentation.setting.SettingActivity
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -116,7 +118,7 @@ class MeetingsActivity :
             MeetingRoomActivity.getIntent(
                 this,
                 meetingId,
-                MeetingRoomActivity.NAVIGATE_TO_NOTIFICATION_LOG,
+                NAVIGATE_TO_DETAIL_MEETING,
             )
         startActivity(intent)
     }
@@ -126,7 +128,7 @@ class MeetingsActivity :
             MeetingRoomActivity.getIntent(
                 this,
                 meetingId,
-                MeetingRoomActivity.NAVIGATE_TO_ETA_DASHBOARD,
+                NAVIGATE_TO_ETA_DASHBOARD,
             )
         startActivity(intent)
     }
@@ -137,7 +139,7 @@ class MeetingsActivity :
     }
 
     override fun guideItemDisabled() {
-        showSnackBar(R.string.meetings_entrance_unavailable_guide)
+        showSnackBar(R.string.inaccessible_eta_guide)
     }
 
     override fun onClickSetting() {

android/app/src/main/java/com/mulberry/ody/presentation/notification/FCMNotification.kt

@@ -12,8 +12,8 @@ import com.mulberry.ody.data.local.db.OdyDatastore
 import com.mulberry.ody.domain.model.NotificationType
 import com.mulberry.ody.presentation.meetings.MeetingsActivity
 import com.mulberry.ody.presentation.room.MeetingRoomActivity
+import com.mulberry.ody.presentation.room.MeetingRoomActivity.Companion.NAVIGATE_TO_DETAIL_MEETING
 import com.mulberry.ody.presentation.room.MeetingRoomActivity.Companion.NAVIGATE_TO_ETA_DASHBOARD
-import com.mulberry.ody.presentation.room.MeetingRoomActivity.Companion.NAVIGATE_TO_NOTIFICATION_LOG
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
@@ -93,7 +93,7 @@ class FCMNotification
         ): PendingIntent? {
             val navigationTarget =
                 when (type) {
-                    NotificationType.ENTRY, NotificationType.DEPARTURE_REMINDER -> NAVIGATE_TO_NOTIFICATION_LOG
+                    NotificationType.ENTRY, NotificationType.DEPARTURE_REMINDER -> NAVIGATE_TO_DETAIL_MEETING
                     NotificationType.NUDGE, NotificationType.ETA_NOTICE -> NAVIGATE_TO_ETA_DASHBOARD
                     NotificationType.DEFAULT -> ""
                 }

android/app/src/main/java/com/mulberry/ody/presentation/room/MeetingRoomActivity.kt

@@ -12,15 +12,19 @@ import com.mulberry.ody.databinding.ActivityMeetingRoomBinding
 import com.mulberry.ody.presentation.collectWhenStarted
 import com.mulberry.ody.presentation.common.binding.BindingActivity
 import com.mulberry.ody.presentation.common.listener.BackListener
+import com.mulberry.ody.presentation.room.detail.DetailMeetingFragment
 import com.mulberry.ody.presentation.room.etadashboard.EtaDashboardFragment
+import com.mulberry.ody.presentation.room.listener.MeetingRoomListener
+import com.mulberry.ody.presentation.room.log.ExitMeetingRoomDialog
 import com.mulberry.ody.presentation.room.log.NotificationLogFragment
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class MeetingRoomActivity :
     BindingActivity<ActivityMeetingRoomBinding>(R.layout.activity_meeting_room),
-    BackListener {
+    BackListener,
+    MeetingRoomListener {
     @Inject
     lateinit var viewModelFactory: MeetingRoomViewModel.MeetingViewModelFactory
 
@@ -30,6 +34,7 @@ class MeetingRoomActivity :
 
     private val fragments: Map<String, Fragment> by lazy {
         mapOf(
+            NAVIGATE_TO_DETAIL_MEETING to DetailMeetingFragment(),
             NAVIGATE_TO_ETA_DASHBOARD to EtaDashboardFragment(),
             NAVIGATE_TO_NOTIFICATION_LOG to NotificationLogFragment(),
         )
@@ -54,8 +59,13 @@ class MeetingRoomActivity :
 
     private fun initializeObserve() {
         onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
-        collectWhenStarted(viewModel.navigateToEtaDashboardEvent) {
-            addFragment(EtaDashboardFragment())
+        collectWhenStarted(viewModel.navigationEvent) {
+            val fragment =
+                when (it) {
+                    MeetingRoomNavigateAction.NavigateToEtaDashboard -> fragments[NAVIGATE_TO_ETA_DASHBOARD]
+                    MeetingRoomNavigateAction.NavigateToNotificationLog -> fragments[NAVIGATE_TO_NOTIFICATION_LOG]
+                } ?: return@collectWhenStarted
+            addFragment(fragment)
         }
         collectWhenStarted(viewModel.networkErrorEvent) {
             showRetrySnackBar { viewModel.retryLastAction() }
@@ -73,6 +83,9 @@ class MeetingRoomActivity :
             }
             hideLoadingDialog()
         }
+        collectWhenStarted(viewModel.inaccessibleEtaEvent) {
+            showSnackBar(R.string.inaccessible_eta_guide)
+        }
     }
 
     private fun initializeFragment() {
@@ -102,14 +115,22 @@ class MeetingRoomActivity :
 
     private fun getMeetingId(): Long = intent.getLongExtra(MEETING_ID_KEY, MEETING_ID_DEFAULT_VALUE)
 
-    private fun getNavigateView(): String = intent.getStringExtra(NAVIGATE_VIEW_KEY) ?: NAVIGATE_TO_NOTIFICATION_LOG
+    private fun getNavigateView(): String = intent.getStringExtra(NAVIGATE_VIEW_KEY) ?: NAVIGATE_TO_DETAIL_MEETING
+
+    override fun onExitMeetingRoom() {
+        ExitMeetingRoomDialog().show(supportFragmentManager, EXIT_MEETING_ROOM_DIALOG_TAG)
+    }
 
     companion object {
+        private const val EXIT_MEETING_ROOM_DIALOG_TAG = "exitMeetingRoomDialog"
+
         private const val MEETING_ID_KEY = "meeting_id"
         private const val MEETING_ID_DEFAULT_VALUE = -1L
+
         private const val NAVIGATE_VIEW_KEY = "navigate_view"
+        const val NAVIGATE_TO_DETAIL_MEETING = "detail_meeting"
         const val NAVIGATE_TO_ETA_DASHBOARD = "eta_dashboard"
-        const val NAVIGATE_TO_NOTIFICATION_LOG = "notification_log"
+        private const val NAVIGATE_TO_NOTIFICATION_LOG = "notification_log"
 
         fun getIntent(
             context: Context,

android/app/src/main/java/com/mulberry/ody/presentation/room/MeetingRoomNavigateAction.kt

@@ -0,0 +1,7 @@
+package com.mulberry.ody.presentation.room
+
+sealed interface MeetingRoomNavigateAction {
+    data object NavigateToEtaDashboard : MeetingRoomNavigateAction
+
+    data object NavigateToNotificationLog : MeetingRoomNavigateAction
+}

android/app/src/main/java/com/mulberry/ody/presentation/room/MeetingRoomViewModel.kt

@@ -22,15 +22,15 @@ import com.mulberry.ody.presentation.common.analytics.logButtonClicked
 import com.mulberry.ody.presentation.common.analytics.logNetworkErrorEvent
 import com.mulberry.ody.presentation.common.image.ImageShareContent
 import com.mulberry.ody.presentation.common.image.ImageShareHelper
+import com.mulberry.ody.presentation.room.detail.model.DetailMeetingUiModel
+import com.mulberry.ody.presentation.room.detail.model.InviteCodeCopyInfo
+import com.mulberry.ody.presentation.room.detail.model.MateUiModel
+import com.mulberry.ody.presentation.room.detail.model.toDetailMeetingUiModel
+import com.mulberry.ody.presentation.room.detail.model.toMateUiModels
 import com.mulberry.ody.presentation.room.etadashboard.listener.NudgeListener
 import com.mulberry.ody.presentation.room.etadashboard.model.MateEtaUiModel
 import com.mulberry.ody.presentation.room.etadashboard.model.toMateEtaUiModels
-import com.mulberry.ody.presentation.room.log.model.InviteCodeCopyInfo
-import com.mulberry.ody.presentation.room.log.model.MateUiModel
-import com.mulberry.ody.presentation.room.log.model.MeetingDetailUiModel
 import com.mulberry.ody.presentation.room.log.model.NotificationLogUiModel
-import com.mulberry.ody.presentation.room.log.model.toMateUiModels
-import com.mulberry.ody.presentation.room.log.model.toMeetingUiModel
 import com.mulberry.ody.presentation.room.log.model.toNotificationUiModels
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -74,18 +74,17 @@ class MeetingRoomViewModel
                 initialValue = null,
             )
 
-        private val _meeting: MutableStateFlow<MeetingDetailUiModel> =
-            MutableStateFlow(MeetingDetailUiModel.DEFAULT)
-        val meeting: StateFlow<MeetingDetailUiModel> = _meeting.asStateFlow()
+        private val _meeting: MutableStateFlow<DetailMeetingUiModel> = MutableStateFlow(DetailMeetingUiModel.DEFAULT)
+        val meeting: StateFlow<DetailMeetingUiModel> = _meeting.asStateFlow()
 
         private val _mates: MutableStateFlow<List<MateUiModel>> = MutableStateFlow(listOf())
         val mates: StateFlow<List<MateUiModel>> = _mates.asStateFlow()
 
         private val _notificationLogs = MutableStateFlow<List<NotificationLogUiModel>>(listOf())
         val notificationLogs: StateFlow<List<NotificationLogUiModel>> = _notificationLogs.asStateFlow()
 
-        private val _navigateToEtaDashboardEvent: MutableSharedFlow<Unit> = MutableSharedFlow()
-        val navigateToEtaDashboardEvent: SharedFlow<Unit> get() = _navigateToEtaDashboardEvent.asSharedFlow()
+        private val _navigationEvent: MutableSharedFlow<MeetingRoomNavigateAction> = MutableSharedFlow()
+        val navigationEvent: SharedFlow<MeetingRoomNavigateAction> get() = _navigationEvent.asSharedFlow()
 
         private val _nudgeSuccessMate: MutableSharedFlow<String> = MutableSharedFlow()
         val nudgeSuccessMate: SharedFlow<String> get() = _nudgeSuccessMate.asSharedFlow()
@@ -104,6 +103,12 @@ class MeetingRoomViewModel
 
         private val matesNudgeTimes: MutableMap<Long, LocalDateTime> = mutableMapOf()
 
+        private val _isVisibleNavigation: MutableStateFlow<Boolean> = MutableStateFlow(false)
+        val isVisibleNavigation: StateFlow<Boolean> get() = _isVisibleNavigation
+
+        private val _inaccessibleEtaEvent: MutableSharedFlow<Unit> = MutableSharedFlow()
+        val inaccessibleEtaEvent: SharedFlow<Unit> get() = _inaccessibleEtaEvent
+
         init {
             fetchMeeting()
         }
@@ -180,7 +185,7 @@ class MeetingRoomViewModel
                 startLoading()
                 meetingRepository.fetchMeeting(meetingId)
                     .onSuccess {
-                        _meeting.value = it.toMeetingUiModel()
+                        _meeting.value = it.toDetailMeetingUiModel()
                         _mates.value = it.toMateUiModels()
                         fetchNotificationLogs()
                     }.onFailure { code, errorMessage ->
@@ -196,12 +201,27 @@ class MeetingRoomViewModel
         }
 
         fun navigateToEtaDashboard() {
+            viewModelScope.launch {
+                if (!meeting.value.isEtaAccessible()) {
+                    _inaccessibleEtaEvent.emit(Unit)
+                    return@launch
+                }
+
+                analyticsHelper.logButtonClicked(
+                    eventName = "navigate_to_eta_dashboard",
+                    location = TAG,
+                )
+                _navigationEvent.emit(MeetingRoomNavigateAction.NavigateToEtaDashboard)
+            }
+        }
+
+        fun navigateToNotificationLog() {
             viewModelScope.launch {
                 analyticsHelper.logButtonClicked(
-                    eventName = "eta_button_from_notification_log",
+                    eventName = "navigate_to_notification_log",
                     location = TAG,
                 )
-                _navigateToEtaDashboardEvent.emit(Unit)
+                _navigationEvent.emit(MeetingRoomNavigateAction.NavigateToNotificationLog)
             }
         }
 
@@ -288,6 +308,10 @@ class MeetingRoomViewModel
             }
         }
 
+        fun handleNavigationVisibility() {
+            _isVisibleNavigation.value = !_isVisibleNavigation.value
+        }
+
         @AssistedFactory
         interface MeetingViewModelFactory {
             fun create(meetingId: Long): MeetingRoomViewModel