Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix] multiple touch #200

Merged
merged 5 commits into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import com.sopt.geonppang.presentation.type.PlatformType
import com.sopt.geonppang.util.UiState
import com.sopt.geonppang.util.binding.BindingActivity
import com.sopt.geonppang.util.extension.hideKeyboard
import com.sopt.geonppang.util.extension.setOnSingleClickListener
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
Expand Down Expand Up @@ -39,7 +40,7 @@ class SignUpNicknameActivity :
finish()
}

binding.btnNext.setOnClickListener {
binding.btnNext.setOnSingleClickListener {
completeSignUp()
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import com.sopt.geonppang.R
import com.sopt.geonppang.databinding.ItemBakeryBinding
import com.sopt.geonppang.domain.model.Bakery
import com.sopt.geonppang.util.extension.loadingImage
import com.sopt.geonppang.util.extension.setOnSingleClickListener

class BakeryListAdapter(
private val moveToDetail: (Int) -> Unit
Expand All @@ -23,7 +24,7 @@ class BakeryListAdapter(
binding.bakery = bakery
binding.executePendingBindings()

binding.root.setOnClickListener {
binding.root.setOnSingleClickListener {
moveToDetail(bakery.bakeryId)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import com.sopt.geonppang.databinding.ItemBakeryBinding
import com.sopt.geonppang.domain.model.Bakery
import com.sopt.geonppang.util.ItemDiffCallback
import com.sopt.geonppang.util.extension.loadingImage
import com.sopt.geonppang.util.extension.setOnSingleClickListener

class BakeryAdapter(
private val moveToDetail: (Int) -> Unit,
Expand All @@ -29,7 +30,7 @@ class BakeryAdapter(
binding.bakery = bakery
binding.executePendingBindings()

binding.root.setOnClickListener {
binding.root.setOnSingleClickListener {
moveToDetail(bakery.bakeryId)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import com.sopt.geonppang.databinding.ItemDetailReviewBinding
import com.sopt.geonppang.domain.model.DetailReview
import com.sopt.geonppang.util.AmplitudeUtils
import com.sopt.geonppang.util.ItemDiffCallback
import com.sopt.geonppang.util.extension.setOnSingleClickListener

class DetailReviewAdapter(
private val initChip: (ChipGroup, Int) -> Unit,
Expand All @@ -35,7 +36,7 @@ class DetailReviewAdapter(
initChip(this, position)
}

binding.tvItemDetailReviewReport.setOnClickListener {
binding.tvItemDetailReviewReport.setOnSingleClickListener {
AmplitudeUtils.trackEvent(START_REVIEW_REPORT)
moveToReport(detailReview.reviewId)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import com.sopt.geonppang.presentation.type.FilterInfoType
import com.sopt.geonppang.util.AmplitudeUtils
import com.sopt.geonppang.util.UiState
import com.sopt.geonppang.util.binding.BindingActivity
import com.sopt.geonppang.util.extension.setOnSingleClickListener
import com.sopt.geonppang.util.setInvisibility
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.launchIn
Expand Down Expand Up @@ -41,12 +42,12 @@ class FilterSettingActivity : BindingActivity<ActivityFilterBinding>(R.layout.ac
binding.vpFilterContainer.adapter = adapter
binding.vpFilterContainer.isUserInputEnabled = false
binding.vpFilterContainer.registerOnPageChangeCallback(object :
ViewPager2.OnPageChangeCallback() {
override fun onPageSelected(position: Int) {
super.onPageSelected(position)
viewModel.setCurrentPage(position)
}
})
ViewPager2.OnPageChangeCallback() {
override fun onPageSelected(position: Int) {
super.onPageSelected(position)
viewModel.setCurrentPage(position)
}
})
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ktlint 였λ₯˜ λ‚˜λŠ” κ±° μ—¬κΈ° λ•Œλ¬Έμž„μš” ν•œ μΉΈμ”© νƒ­ λˆŒλŸ¬μ€˜μ•Όν•¨

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ㅐ이거 μ§„μ§œ 화남..

setPreviousActivity()
}

Expand All @@ -64,7 +65,7 @@ class FilterSettingActivity : BindingActivity<ActivityFilterBinding>(R.layout.ac
}
}

binding.btnFilterNext.setOnClickListener {
binding.btnFilterNext.setOnSingleClickListener {
when (binding.vpFilterContainer.currentItem) {
2 -> {
viewModel.setUserFilter()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import com.sopt.geonppang.domain.model.BestBakery
import com.sopt.geonppang.util.AmplitudeUtils
import com.sopt.geonppang.util.ItemDiffCallback
import com.sopt.geonppang.util.extension.loadingImage
import com.sopt.geonppang.util.extension.setOnSingleClickListener
import com.sopt.geonppang.util.setVisibility

class BestBakeryAdapter(
Expand All @@ -31,7 +32,7 @@ class BestBakeryAdapter(
binding.bakery = bakery
binding.executePendingBindings()

binding.root.setOnClickListener {
binding.root.setOnSingleClickListener {
AmplitudeUtils.trackEvent(CLICK_RECOMMEND_STORE)
moveToDetail(bakery.bakeryId)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import com.sopt.geonppang.domain.model.BestReview
import com.sopt.geonppang.util.AmplitudeUtils
import com.sopt.geonppang.util.ItemDiffCallback
import com.sopt.geonppang.util.extension.loadingImage
import com.sopt.geonppang.util.extension.setOnSingleClickListener

class BestReviewAdapter(
private val moveToDetail: (Int) -> Unit,
Expand All @@ -30,7 +31,7 @@ class BestReviewAdapter(
binding.review = review
binding.executePendingBindings()

binding.root.setOnClickListener {
binding.root.setOnSingleClickListener {
AmplitudeUtils.trackEvent(CLICK_RECOMMEND_REVIEW)
moveToDetail(review.bakeryId)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import com.sopt.geonppang.presentation.filterSetting.FilterSettingActivity
import com.sopt.geonppang.presentation.type.FilterInfoType
import com.sopt.geonppang.util.AmplitudeUtils
import com.sopt.geonppang.util.binding.BindingFragment
import com.sopt.geonppang.util.extension.setOnSingleClickListener
import com.sopt.geonppang.util.setInvisibility
import com.sopt.geonppang.util.setVisibility
import dagger.hilt.android.AndroidEntryPoint
Expand Down Expand Up @@ -42,12 +43,12 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_
}

private fun addListeners() {
binding.layoutMyPageBookmark.setOnClickListener {
binding.layoutMyPageBookmark.setOnSingleClickListener {
AmplitudeUtils.trackEvent(CLICK_MY_STORE)
moveToStoreBakeryList()
}

binding.layoutMyPageReview.setOnClickListener {
binding.layoutMyPageReview.setOnSingleClickListener {
AmplitudeUtils.trackEvent(CLICK_MY_REVIEW)
moveToMyReview()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import com.sopt.geonppang.presentation.model.BakeryReviewWritingInfo
import com.sopt.geonppang.presentation.model.MyReviewBakeryInfo
import com.sopt.geonppang.util.ItemDiffCallback
import com.sopt.geonppang.util.extension.loadingImage
import com.sopt.geonppang.util.extension.setOnSingleClickListener

class MyReviewAdapter(
private val moveToReviewDetail: (Int, MyReviewBakeryInfo) -> Unit,
Expand All @@ -30,7 +31,7 @@ class MyReviewAdapter(
moveToReviewDetail: (Int, MyReviewBakeryInfo) -> Unit,
) {
binding.review = review
binding.root.setOnClickListener {
binding.root.setOnSingleClickListener {
moveToReviewDetail(
review.reviewId,
MyReviewBakeryInfo(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import com.sopt.geonppang.util.AmplitudeUtils
import com.sopt.geonppang.util.UiState
import com.sopt.geonppang.util.binding.BindingActivity
import com.sopt.geonppang.util.extension.hideKeyboard
import com.sopt.geonppang.util.extension.setOnSingleClickListener
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
Expand Down Expand Up @@ -43,7 +44,7 @@ class ReportActivity : BindingActivity<ActivityReportBinding>(R.layout.activity_
}
}

binding.btnReport.setOnClickListener {
binding.btnReport.setOnSingleClickListener {
viewModel.reportReview(reviewId)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ class ReportSuccessBottomDialogFragment :
super.onViewCreated(view, savedInstanceState)
binding.lifecycleOwner = this.viewLifecycleOwner

isCancelable = false

addListeners()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ class ReviewSuccessBottomDialogFragment(
private val moveToDetail: () -> Unit
) :
BindingBottomSheetDialogFragment<DialogBottomReviewWritingSuccessBinding>(R.layout.dialog_bottom_review_writing_success) {

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
binding.lifecycleOwner = this.viewLifecycleOwner

isCancelable = false

addListeners()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.sopt.geonppang.util.AmplitudeUtils
import com.sopt.geonppang.util.UiState
import com.sopt.geonppang.util.binding.BindingActivity
import com.sopt.geonppang.util.extension.hideKeyboard
import com.sopt.geonppang.util.extension.setOnSingleClickListener
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
Expand Down Expand Up @@ -55,7 +56,7 @@ class ReviewWritingActivity :
}
}

binding.btnReviewSuccess.setOnClickListener {
binding.btnReviewSuccess.setOnSingleClickListener {
viewModel.writeReview()
}

Expand Down
16 changes: 16 additions & 0 deletions app/src/main/java/com/sopt/geonppang/util/extension/ViewExt.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,19 @@ fun View.showSnackbar(message: String, isShort: Boolean = true) {
val duration = if (isShort) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
Snackbar.make(this, message, duration).show()
}

inline fun View.setOnSingleClickListener(
delay: Long = 500L,
crossinline block: (View) -> Unit
) {
var isClickable = true
setOnClickListener { view ->
if (isClickable) {
isClickable = false
block(view)
view.postDelayed({
isClickable = true
}, delay)
}
}
}
Comment on lines +11 to +25
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

κ°œμ©λ‹€ ν΄λ¦­ν•˜κ³  λ”œλ ˆμ΄ μ€˜μ„œ κ·Έ μ‹œκ°„ λ™μ•ˆ 클릭 μ•ˆ λ˜λ„λ‘ ν•˜λŠ” κ±° 맞음??

Loading