diff --git a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt index 4eb5ef0..f11c5c3 100644 --- a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt +++ b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt @@ -175,7 +175,9 @@ class MainActivity : AppCompatActivity(), return true } - override fun onLongPress(event: MotionEvent) { openSettings() } + override fun onLongPress(event: MotionEvent) { + launchApp(longClickApp, this) + } override fun onDoubleTap(event: MotionEvent): Boolean { launchApp(doubleClickApp, this) diff --git a/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt b/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt index 3a1a283..25600f6 100644 --- a/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt +++ b/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt @@ -30,6 +30,7 @@ var leftApp = "" var volumeUpApp = "" var volumeDownApp = "" var doubleClickApp = "" +var longClickApp = "" var calendarApp = "" var clockApp = "" @@ -212,6 +213,7 @@ fun loadSettings(sharedPref : SharedPreferences){ volumeDownApp = sharedPref.getString("action_volumeDownApp", "").toString() doubleClickApp = sharedPref.getString("action_doubleClickApp", "").toString() + longClickApp = sharedPref.getString("action_longClickApp", "").toString() calendarApp = sharedPref.getString("action_calendarApp", "").toString() clockApp = sharedPref.getString("action_clockApp", "").toString() @@ -272,6 +274,9 @@ fun resetSettings(sharedPref : SharedPreferences, context: Context) : MutableLis editor.putString("action_volumeDownApp", chosenVolumeDownPackage) defaultList.add(chosenVolumeDownName) + editor.putString("action_doubleClickApp", "") + editor.putString("action_longClickApp", "") + val (_, chosenClockPackage) = pickDefaultApp( "action_clockApp", context diff --git a/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentApps.kt b/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentApps.kt index f12c5ca..380a1c6 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentApps.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentApps.kt @@ -42,6 +42,7 @@ class SettingsFragmentApps : Fragment() { setButtonColor(fragment_settings_apps_choose_vol_up_btn, vibrantColor) setButtonColor(fragment_settings_apps_choose_vol_down_btn, vibrantColor) setButtonColor(fragment_settings_apps_choose_double_click_btn, vibrantColor) + setButtonColor(fragment_settings_apps_choose_long_click_btn, vibrantColor) setButtonColor(fragment_settings_apps_btn, vibrantColor) setButtonColor(fragment_settings_apps_install_btn, vibrantColor) @@ -55,6 +56,7 @@ class SettingsFragmentApps : Fragment() { fragment_settings_apps_choose_vol_up_btn.setOnClickListener{ chooseApp("volumeUpApp")} fragment_settings_apps_choose_vol_down_btn.setOnClickListener{ chooseApp("volumeDownApp")} fragment_settings_apps_choose_double_click_btn.setOnClickListener { chooseApp("doubleClickApp") } + fragment_settings_apps_choose_long_click_btn.setOnClickListener { chooseApp("longClickApp") } // App management buttons fragment_settings_apps_btn.setOnClickListener{ diff --git a/app/src/main/res/layout/fragment_settings_apps.xml b/app/src/main/res/layout/fragment_settings_apps.xml index a39cabe..7a11651 100644 --- a/app/src/main/res/layout/fragment_settings_apps.xml +++ b/app/src/main/res/layout/fragment_settings_apps.xml @@ -180,6 +180,29 @@ + + + + +