🔀 #69 from boostcampwm-2022/feat/running_tab

러닝 엑티비티 백스택 관리, 뒤로가기 버튼 콜백 추가, 인증 글 쓰기 페이지 연결

Author: yonghanJu

presentation/src/main/java/com/whyranoid/presentation/running/RunningActivity.kt

@@ -2,7 +2,9 @@ package com.whyranoid.presentation.running
 
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.viewModels
+import com.google.android.material.snackbar.Snackbar
 import com.naver.maps.geometry.LatLng
 import com.naver.maps.map.CameraUpdate
 import com.naver.maps.map.LocationSource
@@ -28,6 +30,18 @@ internal class RunningActivity :
 
     private val viewModel: RunningViewModel by viewModels()
 
+    private val backPressedCallback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            Snackbar.make(
+                binding.root,
+                getString(R.string.running_finish_snackbar_content),
+                Snackbar.LENGTH_SHORT
+            ).setAction(getString(R.string.running_finish_snackbar_action)) {
+                viewModel.onFinishButtonClicked()
+            }.show()
+        }
+    }
+
     private lateinit var mapView: MapView
     private lateinit var naverMap: NaverMap
     private lateinit var paths: MutableList<PathOverlay>
@@ -125,6 +139,7 @@ internal class RunningActivity :
         mapView.getMapAsync(this)
 
         binding.vm = viewModel
+        this.onBackPressedDispatcher.addCallback(this, backPressedCallback)
     }
 
     private fun observeState() {

presentation/src/main/java/com/whyranoid/presentation/running/RunningWorker.kt

@@ -20,6 +20,7 @@ import com.google.android.gms.location.LocationRequest
 import com.google.android.gms.location.LocationResult
 import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.Priority
+import com.whyranoid.presentation.MainActivity
 import com.whyranoid.presentation.R
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
@@ -61,7 +62,7 @@ class RunningWorker @AssistedInject constructor(
         val id = context.getString(R.string.running_notification_id)
         val title = context.getString(R.string.running_notification_title)
 
-        val intent = Intent(context, RunningActivity::class.java)
+        val intent = Intent(context, MainActivity::class.java)
         val pendingIntent =
             PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)
 

presentation/src/main/java/com/whyranoid/presentation/runningfinish/RunningFinishFragment.kt

@@ -90,7 +90,10 @@ internal class RunningFinishFragment :
     }
 
     private fun handlePositiveButtonClicked(runningHistory: RunningHistoryUiModel) {
-        // TODO Safe-Args 활용 CreateRunningPostFragment로 이동
+        val direction = RunningFinishFragmentDirections.actionRunningFinishFragmentToCreateRunningPostFragment(
+            runningHistory
+        )
+        findNavController().navigate(direction)
     }
 
     override fun onMapReady(naverMap: NaverMap) {

presentation/src/main/java/com/whyranoid/presentation/runningstart/RunningStartFragment.kt

@@ -18,6 +18,7 @@ import com.whyranoid.presentation.base.BaseFragment
 import com.whyranoid.presentation.databinding.FragmentRunningStartBinding
 import com.whyranoid.presentation.running.RunningActivity
 import com.whyranoid.presentation.running.RunningFinishData
+import com.whyranoid.presentation.running.RunningState
 import com.whyranoid.presentation.running.RunningViewModel.Companion.RUNNING_FINISH_DATA_KEY
 import com.whyranoid.presentation.util.getSerializableData
 import com.whyranoid.presentation.util.gpsstate.GPSState
@@ -51,27 +52,41 @@ internal class RunningStartFragment :
                     RUNNING_FINISH_DATA_KEY
                 )
 
-            runningFinishData?.let {
-                // 결과 넘겨주기
-                val direction =
-                    RunningStartFragmentDirections.actionRunningStartFragmentToRunningFinish(
-                        runningFinishData
-                    )
-                findNavController().navigate(direction)
-            } ?: Snackbar.make(binding.root, "러닝 도중 에러가 발생했어요! 죄송해요..", Snackbar.LENGTH_SHORT)
-                .show()
+            // 결과 넘겨주기
+            if (runningFinishData?.runningPositionList.isNullOrEmpty().not()) {
+                runningFinishData?.let {
+                    val direction =
+                        RunningStartFragmentDirections.actionRunningStartFragmentToRunningFinish(
+                            runningFinishData
+                        )
+                    findNavController().navigate(direction)
+                } ?: Snackbar.make(binding.root, getString(R.string.running_start_error_message), Snackbar.LENGTH_SHORT)
+                    .show()
+            }
         }
     }
 
     private val viewModel by viewModels<RunningStartViewModel>()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding.vm = viewModel
 
+        initViews()
         observeState()
     }
 
+    private fun initViews() {
+        binding.vm = viewModel
+        if ((viewModel.runningDataManager.runningState.value is RunningState.NotRunning).not()) {
+            runningActivityLauncher.launch(
+                Intent(
+                    requireContext(),
+                    RunningActivity::class.java
+                )
+            )
+        }
+    }
+
     private fun observeState() {
         viewLifecycleOwner.repeatWhenUiStarted {
             viewModel.runnerCount.collect { runnerCount ->

presentation/src/main/java/com/whyranoid/presentation/runningstart/RunningStartViewModel.kt

@@ -3,6 +3,7 @@ package com.whyranoid.presentation.runningstart
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.whyranoid.domain.usecase.GetRunnerCountUseCase
+import com.whyranoid.presentation.running.RunningDataManager
 import com.whyranoid.presentation.util.networkconnection.NetworkConnectionStateHolder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -13,7 +14,8 @@ import javax.inject.Inject
 @HiltViewModel
 class RunningStartViewModel @Inject constructor(
     getRunnerCountUseCase: GetRunnerCountUseCase,
-    networkConnectionStateHolder: NetworkConnectionStateHolder
+    networkConnectionStateHolder: NetworkConnectionStateHolder,
+    val runningDataManager: RunningDataManager
 ) : ViewModel() {
 
     val networkState = networkConnectionStateHolder.networkState

presentation/src/main/res/layout/fragment_running_finish.xml

@@ -3,6 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
+        <import type="com.whyranoid.presentation.model.UiState"/>
+        <import type="android.view.View"/>
 
         <variable
             name="vm"
@@ -80,5 +82,26 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/btn_positive" />
 
+        <FrameLayout
+            android:id="@+id/frame_progress_running"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/black"
+            android:alpha="0.8"
+            android:translationZ="@{vm.runningFinishDataState instanceof UiState.Success ? 0f : 10f }"
+            android:visibility="@{vm.runningFinishDataState instanceof UiState.Success ? View.GONE : View.VISIBLE }">
+
+            <com.google.android.material.progressindicator.CircularProgressIndicator
+                android:id="@+id/progressindicator_running"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:contentDescription="@string/running_finish_progress_description"
+                android:indeterminate="true"
+                android:visibility="@{vm.runningFinishDataState instanceof UiState.Success ? View.GONE : View.VISIBLE }"
+                app:indicatorColor="?attr/colorOnPrimary" />
+
+        </FrameLayout>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

presentation/src/main/res/navigation/navigation_graph.xml

@@ -97,6 +97,9 @@
             android:name="runningFinishData"
             app:argType="com.whyranoid.presentation.running.RunningFinishData"
             app:nullable="true" />
+        <action
+            android:id="@+id/action_runningFinishFragment_to_createRunningPostFragment"
+            app:destination="@id/createRunningPostFragment" />
     </fragment>
 
 </navigation>

presentation/src/main/res/values/strings.xml

@@ -119,5 +119,9 @@
     <string name="running_finish_tool_bar">러닝 종료</string>
     <string name="running_finish_positive_btn">자랑할래요</string>
     <string name="running_finish_negative_btn">괜찮아요</string>
+    <string name="running_finish_progress_description">러닝 종료 화면 프로그레스바</string>
+    <string name="running_finish_snackbar_content">러닝을 종료하시겠습니까?</string>
+    <string name="running_finish_snackbar_action">종료하기</string>
+    <string name="running_start_error_message">러닝 도중 에러가 발생했어요! 죄송해요..</string>
 
 </resources>

presentation/src/main/res/values/themes.xml

@@ -10,7 +10,8 @@
         <item name="colorSecondaryVariant">@color/mogakrun_secondary_dark</item>
         <item name="colorOnSecondary">@color/mogakrun_on_secondary</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">@color/mogakrun_background</item>
+        <item name="android:windowLightStatusBar">true</item>
         <!-- TabLayout color. -->
         <item name="tabSelectedTextColor">@color/mogakrun_on_primary</item>
         <!-- Base color. -->