[mod] #62 뒤로가기 로직 개선 및 SharedPreferences 값 초기화

app/src/main/java/sopt/motivoo/data/datasource/local/MotivooStorageImpl.kt

@@ -96,6 +96,16 @@ class MotivooStorageImpl @Inject constructor(@ApplicationContext context: Contex
         }
     }
 
+    override fun logout() {
+        val userData = pref.edit()
+        userData.remove(USER_ID)
+        userData.remove(ACCESS_TOKEN)
+        userData.remove(REFRESH_TOKEN)
+        userData.remove(INVITE_CODE)
+        userData.remove(IS_LOGIN)
+        userData.apply()
+    }
+
     companion object {
         private const val FILE_NAME = "MtDataStore"
         private const val NAME = "name"

app/src/main/java/sopt/motivoo/di/RetrofitModule.kt

@@ -72,9 +72,8 @@ object RetrofitModule {
 
     @Provides
     @Singleton
-    fun providesRetrofit(okHttpClient: OkHttpClient): Retrofit {
-        return Retrofit.Builder().baseUrl(BASE_URL).client(okHttpClient).addConverterFactory(
-            Json.asConverterFactory("application/json".toMediaType()),
+    fun providesRetrofit(okHttpClient: OkHttpClient, json: Json): Retrofit =
+        Retrofit.Builder().baseUrl(BASE_URL).client(okHttpClient).addConverterFactory(
+            json.asConverterFactory("application/json".toMediaType()),
         ).build()
-    }
 }

app/src/main/java/sopt/motivoo/domain/entity/MotivooStorage.kt

@@ -14,5 +14,6 @@ interface MotivooStorage {
     var otherId: Long
     var myGoalStepCount: Int
     var otherGoalStepCount: Int
+    fun logout()
     fun clear()
 }

app/src/main/java/sopt/motivoo/presentation/SplashFragment.kt

@@ -22,7 +22,7 @@ class SplashFragment : BindingFragment<FragmentSplashBinding>(R.layout.fragment_
 
     private fun showSplash() {
         lifecycleScope.launch {
-            delay(1500)
+            delay(2000)
             navigateToNextFragment()
         }
     }

app/src/main/java/sopt/motivoo/presentation/auth/AuthViewModel.kt

@@ -71,6 +71,7 @@ class AuthViewModel @Inject constructor(
             authRepository.postLogout()
                 .onSuccess {
                     _logoutState.value = UiState.Success(true)
+                    motivooStorage.logout()
                 }.onFailure { throwable ->
                     _logoutState.value = UiState.Failure(throwable.message.toString())
                 }
@@ -82,6 +83,7 @@ class AuthViewModel @Inject constructor(
             authRepository.deleteWithDraw()
                 .onSuccess {
                     _withDrawState.value = UiState.Success(true)
+                    motivooStorage.clear()
                 }.onFailure { throwable ->
                     _withDrawState.value = UiState.Failure(throwable.message.toString())
                 }

app/src/main/java/sopt/motivoo/presentation/invitecode/GetInviteCodeFragment.kt

@@ -9,6 +9,7 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.animation.AnimationUtils
+import androidx.activity.OnBackPressedCallback
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
@@ -49,11 +50,27 @@ class GetInviteCodeFragment :
         collectData()
         checkMatching()
         clickBackButton()
+        backPressed()
+    }
+
+    private fun backPressed() {
+        requireActivity().onBackPressedDispatcher.addCallback(
+            viewLifecycleOwner,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    if (motivooStorage.isFinishedOnboarding) {
+                        passedOnboardingClickBackButton()
+                    } else {
+                        afterOnboardingClickBackButton()
+                    }
+                }
+            }
+        )
     }
 
     private fun clickBackButton() {
         binding.includeGetInviteCodeToolbar.tvToolbarBack.setOnSingleClickListener {
-            if (motivooStorage.isFinishedOnboarding) passedOnboardingClickBackButton() else afterOnboardingClickBackButton()
+            backPressed()
         }
     }
 
@@ -100,19 +117,17 @@ class GetInviteCodeFragment :
     }
 
     private fun afterOnboardingClickBackButton() {
-        binding.includeGetInviteCodeToolbar.tvToolbarBack.setOnSingleClickListener {
-            val navController = findNavController()
-            val startDestinationId = navController.findStartDestination().id
-            val navOptions = NavOptions.Builder()
-                .setPopUpTo(startDestinationId, true)
-                .build()
-
-            findNavController().navigate(
-                R.id.action_getInviteCodeFragment_to_startMotivooFragment,
-                null,
-                navOptions
-            )
-        }
+        val navController = findNavController()
+        val startDestinationId = navController.findStartDestination().id
+        val navOptions = NavOptions.Builder()
+            .setPopUpTo(startDestinationId, true)
+            .build()
+
+        findNavController().navigate(
+            R.id.action_getInviteCodeFragment_to_startMotivooFragment,
+            null,
+            navOptions
+        )
     }
 
     private fun setClipboard() {

app/src/main/java/sopt/motivoo/presentation/onboarding/OnboardingViewModel.kt

@@ -100,7 +100,6 @@ class OnboardingViewModel @Inject constructor(
 
     private val _isPostOnboardingInfoSuccess = MutableStateFlow<UiState<Boolean>>(UiState.Loading)
     val isPostOnboardingInfoSuccess get() = _isPostOnboardingInfoSuccess.asStateFlow()
-
     fun setDoExerciseType(doExerciseType: DoExerciseType) {
         _doExerciseType.value = doExerciseType
         viewModelScope.launch {
@@ -186,7 +185,7 @@ class OnboardingViewModel @Inject constructor(
         }
     }
 
-    fun resetOnboardingFinishedState() {
+    private fun resetOnboardingFinishedState() {
         _isPostOnboardingInfoSuccess.value = UiState.Loading
     }
 }

app/src/main/res/layout/fragment_splash.xml

@@ -10,16 +10,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <ImageView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/motivoo_logo"
-            android:src="@drawable/ic_motivoo_splash"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        <com.airbnb.lottie.LottieAnimationView
+            android:id="@+id/lav_splash_lottie"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:lottie_autoPlay="true"
+            app:lottie_loop="true"
+            app:lottie_rawRes="@raw/splash_view_lottie" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>