Skip to content

Commit 2d4da67

Browse files
committed
fix double haptic feedback.
1 parent c365c9a commit 2d4da67

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

mobile/src/main/java/com/windscribe/mobile/ui/serverlist/ServerListNavigation.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.windscribe.mobile.ui.serverlist
22

33
import android.annotation.SuppressLint
44
import androidx.compose.foundation.Image
5+
import androidx.compose.foundation.clickable
56
import androidx.compose.foundation.layout.Box
67
import androidx.compose.foundation.layout.Row
78
import androidx.compose.foundation.layout.Spacer
@@ -49,7 +50,6 @@ fun ServerListNavigation(
4950
homeViewmodel: HomeViewmodel,
5051
onTabSelected: (Int) -> Unit
5152
) {
52-
val isHapticEnabled by homeViewmodel.hapticFeedbackEnabled.collectAsState()
5353
val selectedType by viewModel.selectedServerListType.collectAsState()
5454
val serverTabs = listOf(
5555
ServerTabIcon(
@@ -147,7 +147,7 @@ fun ServerListNavigation(
147147
Image(
148148
painter = painterResource(if (isSelected) tab.filledIcon else tab.unfilledIcon),
149149
contentDescription = null,
150-
modifier = Modifier.Companion.hapticClickable() {
150+
modifier = Modifier.Companion.clickable {
151151
onTabSelected(index)
152152
},
153153
colorFilter = ColorFilter.tint(

mobile/src/main/java/com/windscribe/mobile/ui/serverlist/ServerListScreen.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ fun ServerListScreen(
5151
val hapticFeedback by homeViewmodel.hapticFeedbackEnabled.collectAsState()
5252
val haptic = LocalHapticFeedback.current
5353
LaunchedEffect(selectedType) {
54+
if (hapticFeedback) {
55+
haptic.performHapticFeedback(HapticFeedbackType.GestureEnd)
56+
}
5457
pagerState.animateScrollToPage(selectedType.toPageIndex())
5558
}
5659
LaunchedEffect(pagerState.targetPage) {
@@ -70,9 +73,6 @@ fun ServerListScreen(
7073
state = pagerState,
7174
modifier = Modifier.fillMaxSize(),
7275
) { pageIndex ->
73-
if (hapticFeedback) {
74-
haptic.performHapticFeedback(HapticFeedbackType.GestureEnd)
75-
}
7676
Box(
7777
modifier = Modifier.fillMaxSize(),
7878
contentAlignment = Alignment.TopStart

0 commit comments

Comments
 (0)