Merge pull request #162 from Link-MIND/refactor/#159-qa

[refactor] : #159 버튼 중복 클릭
Link-MIND · Mar 7, 2024 · c9a2dec · c9a2dec
2 parents 02cee44 + b091b2e
commit c9a2dec
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 13 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -10,7 +10,7 @@ android {
 
   defaultConfig {
     applicationId = "org.sopt.linkmind"
-    versionCode = 7
+    versionCode = 8
     versionName = "1.0.1"
   }
   viewBinding.enable = true

diff --git a/core/ui/src/main/java/org/sopt/ui/base/BindingFragment.kt b/core/ui/src/main/java/org/sopt/ui/base/BindingFragment.kt
@@ -1,6 +1,7 @@
 package org.sopt.ui.base
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,6 +14,7 @@ abstract class BindingFragment<T : ViewBinding>(
   private var _binding: T? = null
   protected val binding
     get() = requireNotNull(_binding) {
+      Log.d("error", "$_binding")
     }
 
   override fun onCreateView(

diff --git a/feature/clip/src/main/java/org/sopt/clip/webview/WebViewFragment.kt b/feature/clip/src/main/java/org/sopt/clip/webview/WebViewFragment.kt
@@ -172,7 +172,6 @@ class WebViewFragment : BindingFragment<FragmentWebviewBinding>({ FragmentWebvie
       wbClip.webViewClient = object : WebViewClient() {
         override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
           super.onPageStarted(view, url, favicon)
-
           runCatching { updateColors() }
         }
       }

diff --git a/feature/home/src/main/java/org/sopt/home/HomeFragment.kt b/feature/home/src/main/java/org/sopt/home/HomeFragment.kt
@@ -63,6 +63,9 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>({ FragmentHomeBinding.
         "featureSaveLink://ClipLinkFragment/${viewModel.container.stateFlow.value.categoryId}/${viewModel.container.stateFlow.value.categoryName}",
       )
       is HomeSideEffect.ShowBottomSheet -> showHomeBottomSheet()
+      is HomeSideEffect.NavigateWebView -> navigateToDestination(
+        "featureSaveLink://webViewFragment?site=${viewModel.container.stateFlow.value.url},,,${0},,,false",
+      )
       is HomeSideEffect.NavigateWebView -> {
         val encodedURL = URLEncoder.encode(viewModel.container.stateFlow.value.url, StandardCharsets.UTF_8.toString())
         navigateToDestination(

diff --git a/...re/savelink/src/main/java/org/sopt/savelink/ui/savelinksetclip/SaveLinkSetClipFragment.kt b/...re/savelink/src/main/java/org/sopt/savelink/ui/savelinksetclip/SaveLinkSetClipFragment.kt
@@ -3,12 +3,14 @@ package org.sopt.savelink.ui.savelinksetclip
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.viewModelScope
 import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
 import designsystem.components.bottomsheet.LinkMindBottomSheet
 import designsystem.components.button.state.LinkMindButtonState
 import designsystem.components.dialog.LinkMindDialog
 import designsystem.components.toast.linkMindSnackBar
+import kotlinx.coroutines.launch
 import org.orbitmvi.orbit.viewmodel.observe
 import org.sopt.mainfeature.R
 import org.sopt.savelink.databinding.FragmentSaveLinkSetClipBinding
@@ -111,7 +113,9 @@ class SaveLinkSetClipFragment : BindingFragment<FragmentSaveLinkSetClipBinding>(
     binding.btnSaveLinkComplete.apply {
       btnClick {
         if (state == LinkMindButtonState.DISABLE) return@btnClick
-        viewModel.saveLink(viewModel.container.stateFlow.value.url, viewModel.container.stateFlow.value.categoryId)
+        viewModel.viewModelScope.launch {
+          viewModel.saveLink(viewModel.container.stateFlow.value.url, viewModel.container.stateFlow.value.categoryId)
+        }
       }
     }
   }

diff --git a/feature/savelink/src/main/java/org/sopt/savelink/ui/savelinksetclip/SetLinkViewModel.kt b/feature/savelink/src/main/java/org/sopt/savelink/ui/savelinksetclip/SetLinkViewModel.kt
@@ -5,6 +5,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import org.orbitmvi.orbit.Container
 import org.orbitmvi.orbit.ContainerHost
 import org.orbitmvi.orbit.syntax.simple.intent
@@ -85,17 +87,22 @@ class SetLinkViewModel @Inject constructor(
     }
   }
 
+  private val mutex = Mutex()
   fun saveLink(linkUrl: String, categoryId: Long?) = viewModelScope.launch {
-    saveLinkUseCase(
-      PostSaveLinkUseCase.Param(
-        linkUrl = linkUrl,
-        categoryId = if (categoryId == 0.toLong()) null else categoryId,
-      ),
-    ).onSuccess {
-      navigateSetLink()
-      if (it != 201) showSnackBar()
-    }.onFailure {
-      showSnackBar()
+    if (!mutex.isLocked) {
+      mutex.withLock {
+        saveLinkUseCase(
+          PostSaveLinkUseCase.Param(
+            linkUrl = linkUrl,
+            categoryId = if (categoryId == 0.toLong()) null else categoryId,
+          ),
+        ).onSuccess {
+          navigateSetLink()
+          if (it != 201) showSnackBar()
+        }.onFailure {
+          showSnackBar()
+        }
+      }
     }
   }
 

diff --git a/feature/timer/src/main/java/org/sopt/timer/TimerFragment.kt b/feature/timer/src/main/java/org/sopt/timer/TimerFragment.kt
@@ -256,6 +256,7 @@ class TimerFragment : BindingFragment<FragmentTimerBinding>({ FragmentTimerBindi
         is UiState.Failure -> {}
         is UiState.Empty -> {}
         is UiState.Loading -> {}
+        else -> {}
       }
     }.launchIn(viewLifeCycleScope)
   }