diff --git a/app/src/main/java/com/finnmglas/launcher/Functions.kt b/app/src/main/java/com/finnmglas/launcher/Functions.kt index f071af9..24a7b74 100644 --- a/app/src/main/java/com/finnmglas/launcher/Functions.kt +++ b/app/src/main/java/com/finnmglas/launcher/Functions.kt @@ -78,6 +78,8 @@ const val PREF_DATE_FORMAT = "dateFormat" const val PREF_DOUBLE_ACTIONS_ENABLED = "enableDoubleActions" const val PREF_SEARCH_AUTO_LAUNCH = "searchAutoLaunch" +const val PREF_SLIDE_SENSITIVITY = "slideSensitivity" + const val PREF_STARTED = "startedBefore" const val PREF_STARTED_TIME = "firstStartup" @@ -462,6 +464,7 @@ fun resetSettings(context: Context) { .putInt(PREF_DATE_FORMAT, 0) .putBoolean(PREF_SCREEN_FULLSCREEN, true) .putBoolean(PREF_DOUBLE_ACTIONS_ENABLED, false) + .putInt(PREF_SLIDE_SENSITIVITY, 50) // load action defaults for (actionKey in ACTIONS) diff --git a/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt b/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt index 1171658..e922b85 100644 --- a/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt +++ b/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt @@ -153,7 +153,8 @@ class HomeActivity: UIObject, AppCompatActivity(), val doubleActions = launcherPreferences.getBoolean(PREF_DOUBLE_ACTIONS_ENABLED, false) // how distinguished the swipe has to be to launch something - val strictness = (4 / bufferedPointerCount) + // strictness = opposite of sensitivity. TODO - May have to be adjusted + val strictness = (4 / bufferedPointerCount) * ((100 - launcherPreferences.getInt(PREF_SLIDE_SENSITIVITY, 50)) / 50) // Only open if the swipe was not from the phones top edge if (diffY < -height / 8 && abs(diffY) > strictness * abs(diffX) && e1.y > 100) { diff --git a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt index ab97a2a..82b0956 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt @@ -160,19 +160,17 @@ class SettingsFragmentLauncher : Fragment(), UIObject { activity!!.recreate() } - settings_seekbar_sensitivity.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener { - override fun onProgressChanged(p0: SeekBar?, p1: Int, p2: Boolean) { + settings_seekbar_sensitivity.setOnSeekBarChangeListener( + object : SeekBar.OnSeekBarChangeListener { + override fun onProgressChanged(p0: SeekBar?, p1: Int, p2: Boolean) {} + override fun onStartTrackingTouch(p0: SeekBar?) {} + override fun onStopTrackingTouch(p0: SeekBar?) { + launcherPreferences.edit() + .putInt(PREF_SLIDE_SENSITIVITY, p0!!.progress) + .apply() + } } - override fun onStartTrackingTouch(p0: SeekBar?) { - } - override fun onStopTrackingTouch(p0: SeekBar?) { - Toast.makeText( - context, - "Smooth Seekbar current progress ${p0?.progress}", - Toast.LENGTH_SHORT - ).show() - } - }) + ) } fun resetToCustomTheme(context: Activity) { @@ -231,7 +229,7 @@ class SettingsFragmentLauncher : Fragment(), UIObject { staticThemeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) settings_launcher_theme_spinner.adapter = staticThemeAdapter - var themeInt = when (getSavedTheme(activity!!)) { + val themeInt = when (getSavedTheme(activity!!)) { "finn" -> 0 "dark" -> 1 "custom" -> 2 @@ -253,5 +251,7 @@ class SettingsFragmentLauncher : Fragment(), UIObject { } } + + settings_seekbar_sensitivity.progress = launcherPreferences.getInt(PREF_SLIDE_SENSITIVITY, 50) } } \ No newline at end of file