Select clock and calendar app on long press

5 files changed, 88 insertions, 5 deletions

diff --git a/app/src/main/java/app/olauncher/MainViewModel.kt b/app/src/main/java/app/olauncher/MainViewModel.kt
index 8cf080c..5a045d8 100644
--- a/app/src/main/java/app/olauncher/MainViewModel.kt
+++ b/app/src/main/java/app/olauncher/MainViewModel.kt
@@ -131,6 +131,18 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 prefs.appActivityClassNameRight = appModel.activityClassName
                 updateSwipeApps()
             }
+
+            Constants.FLAG_SET_CLOCK_APP -> {
+                prefs.clockAppPackage = appModel.appPackage
+                prefs.clockAppUser = appModel.user.toString()
+                prefs.clockAppClassName = appModel.activityClassName
+            }
+
+            Constants.FLAG_SET_CALENDAR_APP -> {
+                prefs.calendarAppPackage = appModel.appPackage
+                prefs.calendarAppUser = appModel.user.toString()
+                prefs.calendarAppClassName = appModel.activityClassName
+            }
         }
     }
 
diff --git a/app/src/main/java/app/olauncher/data/Constants.kt b/app/src/main/java/app/olauncher/data/Constants.kt
index 712aaf7..62f2a38 100644
--- a/app/src/main/java/app/olauncher/data/Constants.kt
+++ b/app/src/main/java/app/olauncher/data/Constants.kt
@@ -57,11 +57,13 @@ object Constants {
 
     const val FLAG_SET_SWIPE_LEFT_APP = 11
     const val FLAG_SET_SWIPE_RIGHT_APP = 12
+    const val FLAG_SET_CLOCK_APP = 13
+    const val FLAG_SET_CALENDAR_APP = 14
 
     const val REQUEST_CODE_ENABLE_ADMIN = 666
 
-    const val HINT_RATE_US = 30
-    const val HINT_SHARE = 50
+    const val HINT_RATE_US = 20
+    const val HINT_SHARE = 30
 
     const val TRIPLE_TAP_DELAY_MS = 300L
     const val LONG_PRESS_DELAY_MS = 500L
diff --git a/app/src/main/java/app/olauncher/data/Prefs.kt b/app/src/main/java/app/olauncher/data/Prefs.kt
index 38389ac..36f25e7 100644
--- a/app/src/main/java/app/olauncher/data/Prefs.kt
+++ b/app/src/main/java/app/olauncher/data/Prefs.kt
@@ -77,6 +77,12 @@ class Prefs(context: Context) {
     private val APP_ACTIVITY_CLASS_NAME_SWIPE_RIGHT = "APP_ACTIVITY_CLASS_NAME_SWIPE_RIGHT"
     private val APP_USER_SWIPE_LEFT = "APP_USER_SWIPE_LEFT"
     private val APP_USER_SWIPE_RIGHT = "APP_USER_SWIPE_RIGHT"
+    private val CLOCK_APP_PACKAGE = "CLOCK_APP_PACKAGE"
+    private val CLOCK_APP_USER = "CLOCK_APP_USER"
+    private val CLOCK_APP_CLASS_NAME = "CLOCK_APP_CLASS_NAME"
+    private val CALENDAR_APP_PACKAGE = "CALENDAR_APP_PACKAGE"
+    private val CALENDAR_APP_USER = "CALENDAR_APP_USER"
+    private val CALENDAR_APP_CLASS_NAME = "CALENDAR_APP_CLASS_NAME"
 
     private val prefs: SharedPreferences = context.getSharedPreferences(PREFS_FILENAME, 0);
 
@@ -344,6 +350,30 @@ class Prefs(context: Context) {
         get() = prefs.getString(APP_USER_SWIPE_RIGHT, "").toString()
         set(value) = prefs.edit().putString(APP_USER_SWIPE_RIGHT, value).apply()
 
+    var clockAppPackage: String
+        get() = prefs.getString(CLOCK_APP_PACKAGE, "").toString()
+        set(value) = prefs.edit().putString(CLOCK_APP_PACKAGE, value).apply()
+
+    var clockAppUser: String
+        get() = prefs.getString(CLOCK_APP_USER, "").toString()
+        set(value) = prefs.edit().putString(CLOCK_APP_USER, value).apply()
+
+    var clockAppClassName: String?
+        get() = prefs.getString(CLOCK_APP_CLASS_NAME, "").toString()
+        set(value) = prefs.edit().putString(CLOCK_APP_CLASS_NAME, value).apply()
+
+    var calendarAppPackage: String
+        get() = prefs.getString(CALENDAR_APP_PACKAGE, "").toString()
+        set(value) = prefs.edit().putString(CALENDAR_APP_PACKAGE, value).apply()
+
+    var calendarAppUser: String
+        get() = prefs.getString(CALENDAR_APP_USER, "").toString()
+        set(value) = prefs.edit().putString(CALENDAR_APP_USER, value).apply()
+
+    var calendarAppClassName: String?
+        get() = prefs.getString(CALENDAR_APP_CLASS_NAME, "").toString()
+        set(value) = prefs.edit().putString(CALENDAR_APP_CLASS_NAME, value).apply()
+
     fun getAppName(location: Int): String {
         return when (location) {
             1 -> prefs.getString(APP_NAME_1, "").toString()
diff --git a/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt b/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
index 233b6d8..0793768 100644
--- a/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/AppDrawerFragment.kt
@@ -58,7 +58,7 @@ class AppDrawerFragment : Fragment() {
     private fun initViews() {
         if (flag == Constants.FLAG_HIDDEN_APPS)
             binding.search.queryHint = "Hidden apps"
-        else if (flag in Constants.FLAG_SET_HOME_APP_1..Constants.FLAG_SET_SWIPE_RIGHT_APP)
+        else if (flag in Constants.FLAG_SET_HOME_APP_1..Constants.FLAG_SET_CALENDAR_APP)
             binding.search.queryHint = "Please select an app"
         if (canRename && prefs.renameTipShown.not()) {
             binding.appDrawerTip.text = getString(R.string.tip_start_typing_for_rename)
diff --git a/app/src/main/java/app/olauncher/ui/HomeFragment.kt b/app/src/main/java/app/olauncher/ui/HomeFragment.kt
index defc345..dac7044 100644
--- a/app/src/main/java/app/olauncher/ui/HomeFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/HomeFragment.kt
@@ -69,8 +69,8 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
     override fun onClick(view: View) {
         when (view.id) {
             R.id.lock -> {}
-            R.id.clock -> openAlarmApp(requireContext())
-            R.id.date -> openCalendar(requireContext())
+            R.id.clock -> openClockApp()
+            R.id.date -> openCalendarApp()
             R.id.setDefaultLauncher -> viewModel.resetDefaultLauncherApp(requireContext())
             else -> {
                 try { // Launch app
@@ -83,6 +83,30 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
         }
     }
 
+    private fun openClockApp() {
+        if (prefs.clockAppPackage.isBlank())
+            openAlarmApp(requireContext())
+        else
+            launchApp(
+                "Clock",
+                prefs.clockAppPackage,
+                prefs.clockAppClassName,
+                prefs.clockAppUser
+            )
+    }
+
+    private fun openCalendarApp() {
+        if (prefs.calendarAppPackage.isBlank())
+            openCalendar(requireContext())
+        else
+            launchApp(
+                "Calendar",
+                prefs.calendarAppPackage,
+                prefs.calendarAppClassName,
+                prefs.calendarAppUser
+            )
+    }
+
     override fun onLongClick(view: View): Boolean {
         when (view.id) {
             R.id.homeApp1 -> showAppList(Constants.FLAG_SET_HOME_APP_1, prefs.appName1.isNotEmpty(), true)
@@ -93,6 +117,19 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
             R.id.homeApp6 -> showAppList(Constants.FLAG_SET_HOME_APP_6, prefs.appName6.isNotEmpty(), true)
             R.id.homeApp7 -> showAppList(Constants.FLAG_SET_HOME_APP_7, prefs.appName7.isNotEmpty(), true)
             R.id.homeApp8 -> showAppList(Constants.FLAG_SET_HOME_APP_8, prefs.appName8.isNotEmpty(), true)
+            R.id.clock -> {
+                showAppList(Constants.FLAG_SET_CLOCK_APP)
+                prefs.clockAppPackage = ""
+                prefs.clockAppClassName = ""
+                prefs.clockAppUser = ""
+            }
+
+            R.id.date -> {
+                showAppList(Constants.FLAG_SET_CALENDAR_APP)
+                prefs.calendarAppPackage = ""
+                prefs.calendarAppClassName = ""
+                prefs.calendarAppUser = ""
+            }
         }
         return true
     }
@@ -140,6 +177,8 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
         binding.lock.setOnClickListener(this)
         binding.clock.setOnClickListener(this)
         binding.date.setOnClickListener(this)
+        binding.clock.setOnLongClickListener(this)
+        binding.date.setOnLongClickListener(this)
         binding.setDefaultLauncher.setOnClickListener(this)
     }