Skip to content

Commit c7ba2b9

Browse files
committed
Added DPI calculation for GestureManager distance variables. DPI values are stored with Constants.
Reverted some changes of 0cdaa9b regarding Prefs for threshold values.
1 parent e0bb106 commit c7ba2b9

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

app/src/main/java/com/github/droidworksstudio/mlauncher/data/Constants.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ object Constants {
6161
const val MAX_THRESHOLD = 100 // pixels
6262
var SHORT_SWIPE_THRESHOLD = 0f // pixels
6363
var LONG_SWIPE_THRESHOLD = 0f // pixels
64-
var USR_DPIX = 0
65-
var USR_DPIY = 0
64+
var USR_DPIX = 0f
65+
var USR_DPIY = 0f
6666

6767

6868
// Update MAX_HOME_PAGES dynamically based on MAX_HOME_APPS

app/src/main/java/com/github/droidworksstudio/mlauncher/data/Prefs.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -338,13 +338,13 @@ class Prefs(val context: Context) {
338338
get() = getSetting(FILTER_STRENGTH, 25)
339339
set(value) = prefsNormal.edit { putInt(FILTER_STRENGTH, value) }
340340

341-
var shortSwipeThreshold: Int
342-
get() = getSetting(SHORT_SWIPE_THRESHOLD, 25)
343-
set(value) = prefsNormal.edit { putInt(SHORT_SWIPE_THRESHOLD, value) }
341+
var shortSwipeThreshold: Float
342+
get() = getSetting(SHORT_SWIPE_THRESHOLD, 0.25f)
343+
set(value) = prefsNormal.edit { putFloat(SHORT_SWIPE_THRESHOLD, value) }
344344

345-
var longSwipeThreshold: Int
346-
get() = getSetting(LONG_SWIPE_THRESHOLD, 65)
347-
set(value) = prefsNormal.edit { putInt(LONG_SWIPE_THRESHOLD, value) }
345+
var longSwipeThreshold: Float
346+
get() = getSetting(LONG_SWIPE_THRESHOLD, 0.55f)
347+
set(value) = prefsNormal.edit { putFloat(LONG_SWIPE_THRESHOLD, value) }
348348

349349
var searchFromStart: Boolean
350350
get() = getSetting(SEARCH_START, false)

app/src/main/java/com/github/droidworksstudio/mlauncher/ui/SettingsFragment.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import androidx.compose.foundation.rememberScrollState
2424
import androidx.compose.foundation.verticalScroll
2525
import androidx.compose.runtime.Composable
2626
import androidx.compose.runtime.getValue
27+
import androidx.compose.runtime.mutableFloatStateOf
2728
import androidx.compose.runtime.mutableIntStateOf
2829
import androidx.compose.runtime.mutableStateOf
2930
import androidx.compose.runtime.remember
@@ -306,8 +307,8 @@ class SettingsFragment : Fragment() {
306307
var toggledSettingsLocked by remember { mutableStateOf(prefs.settingsLocked) }
307308
var toggledLockOrientation by remember { mutableStateOf(prefs.lockOrientation) }
308309

309-
var selectedShortSwipeThreshold by remember { mutableIntStateOf(prefs.shortSwipeThreshold) }
310-
var selectedLongSwipeThreshold by remember { mutableIntStateOf(prefs.longSwipeThreshold) }
310+
var selectedShortSwipeThreshold by remember { mutableFloatStateOf(prefs.shortSwipeThreshold) }
311+
var selectedLongSwipeThreshold by remember { mutableFloatStateOf(prefs.longSwipeThreshold) }
311312

312313
val contextMenuOptionLabels = listOf(
313314
getLocalizedString(R.string.pin),
@@ -2079,8 +2080,8 @@ class SettingsFragment : Fragment() {
20792080
maxValue = selectedLongSwipeThreshold,
20802081
currentValue = prefs.shortSwipeThreshold,
20812082
onValueSelected = { newSettingsSize ->
2082-
selectedShortSwipeThreshold = newSettingsSize.toInt()
2083-
prefs.shortSwipeThreshold = newSettingsSize.toInt()
2083+
selectedShortSwipeThreshold = newSettingsSize.toFloat()
2084+
prefs.shortSwipeThreshold = newSettingsSize.toFloat()
20842085
}
20852086
)
20862087
}
@@ -2098,8 +2099,8 @@ class SettingsFragment : Fragment() {
20982099
maxValue = Constants.MAX_THRESHOLD,
20992100
currentValue = prefs.longSwipeThreshold,
21002101
onValueSelected = { newSettingsSize ->
2101-
selectedLongSwipeThreshold = newSettingsSize.toInt()
2102-
prefs.longSwipeThreshold = newSettingsSize.toInt()
2102+
selectedLongSwipeThreshold = newSettingsSize.toFloat()
2103+
prefs.longSwipeThreshold = newSettingsSize.toFloat()
21032104
}
21042105
)
21052106
}

0 commit comments

Comments
 (0)