diff --git a/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt b/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt
index 7c91398..88f3b88 100644
--- a/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt
@@ -8,7 +8,6 @@ import android.view.WindowManager
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
import com.finnmglas.launcher.choose.AppsRecyclerAdapter
import com.finnmglas.launcher.extern.*
import kotlinx.android.synthetic.main.activity_choose.*
diff --git a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt
index 8934ccd..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,14 @@ 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)
+ return false
+ }
// Tooltip
override fun onSingleTapConfirmed(event: MotionEvent): Boolean {
@@ -213,7 +220,6 @@ class MainActivity : AppCompatActivity(),
/* TODO: Remove those. For now they are necessary
* because this inherits from GestureDetector.OnGestureListener */
- override fun onDoubleTap(event: MotionEvent): Boolean { return false }
override fun onDoubleTapEvent(event: MotionEvent): Boolean { return false }
override fun onDown(event: MotionEvent): Boolean { return false }
override fun onScroll(e1: MotionEvent, e2: MotionEvent, dX: Float, dY: Float): Boolean { return false }
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 d0e7ed0..25600f6 100644
--- a/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt
+++ b/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt
@@ -29,6 +29,8 @@ var rightApp = ""
var leftApp = ""
var volumeUpApp = ""
var volumeDownApp = ""
+var doubleClickApp = ""
+var longClickApp = ""
var calendarApp = ""
var clockApp = ""
@@ -40,10 +42,10 @@ var vibrantColor = 0
/** REQUEST CODES */
-val REQUEST_PICK_IMAGE = 1
-val REQUEST_CHOOSE_APP = 2
-val REQUEST_UNINSTALL = 3
-val REQUEST_PERMISSION_STORAGE = 4
+const val REQUEST_PICK_IMAGE = 1
+const val REQUEST_CHOOSE_APP = 2
+const val REQUEST_UNINSTALL = 3
+const val REQUEST_PERMISSION_STORAGE = 4
/** Animate */
@@ -210,6 +212,9 @@ fun loadSettings(sharedPref : SharedPreferences){
volumeUpApp = sharedPref.getString("action_volumeUpApp", "").toString()
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()
@@ -269,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 93d2915..380a1c6 100644
--- a/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentApps.kt
+++ b/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentApps.kt
@@ -41,6 +41,8 @@ class SettingsFragmentApps : Fragment() {
setButtonColor(fragment_settings_apps_choose_right_btn, vibrantColor)
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)
@@ -53,6 +55,8 @@ class SettingsFragmentApps : Fragment() {
fragment_settings_apps_choose_right_btn.setOnClickListener{ chooseApp("rightApp") }
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/activity_firststartup.xml b/app/src/main/res/layout/activity_firststartup.xml
index 74ae392..9116e91 100644
--- a/app/src/main/res/layout/activity_firststartup.xml
+++ b/app/src/main/res/layout/activity_firststartup.xml
@@ -65,7 +65,6 @@
android:layout_height="wrap_content"
android:gravity="center"
android:onClick="clickAnywhere"
- android:textColor="#ccc"
android:textSize="64sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_settings_apps.xml b/app/src/main/res/layout/fragment_settings_apps.xml
index a1c3718..7a11651 100644
--- a/app/src/main/res/layout/fragment_settings_apps.xml
+++ b/app/src/main/res/layout/fragment_settings_apps.xml
@@ -157,6 +157,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+