diff options
| -rw-r--r-- | app/src/main/java/app/olauncher/MainActivity.kt | 1 | ||||
| -rw-r--r-- | app/src/main/java/app/olauncher/MainViewModel.kt | 20 | ||||
| -rw-r--r-- | app/src/main/java/app/olauncher/data/Constants.kt | 7 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
4 files changed, 29 insertions, 1 deletions
diff --git a/app/src/main/java/app/olauncher/MainActivity.kt b/app/src/main/java/app/olauncher/MainActivity.kt index db4fed0..03bb7b6 100644 --- a/app/src/main/java/app/olauncher/MainActivity.kt +++ b/app/src/main/java/app/olauncher/MainActivity.kt @@ -94,6 +94,7 @@ class MainActivity : AppCompatActivity() { viewModel.firstOpen(true) prefs.firstOpen = false prefs.firstOpenTime = System.currentTimeMillis() + viewModel.setDefaultClockApp() viewModel.resetLauncherLiveData.call() } diff --git a/app/src/main/java/app/olauncher/MainViewModel.kt b/app/src/main/java/app/olauncher/MainViewModel.kt index 21579bd..31fb486 100644 --- a/app/src/main/java/app/olauncher/MainViewModel.kt +++ b/app/src/main/java/app/olauncher/MainViewModel.kt @@ -29,6 +29,7 @@ import app.olauncher.helper.formattedTimeSpent import app.olauncher.helper.getAppsList import app.olauncher.helper.hasBeenMinutes import app.olauncher.helper.isOlauncherDefault +import app.olauncher.helper.isPackageInstalled import app.olauncher.helper.showToast import kotlinx.coroutines.launch import java.util.concurrent.TimeUnit @@ -206,6 +207,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { } } + // com.sec.android.app.clockpackage + // com.sec.android.app.clockpackage.ClockPackageApplication + fun getAppList(includeHiddenApps: Boolean = false) { viewModelScope.launch { appList.value = getAppsList(appContext, prefs, includeRegularApps = true, includeHiddenApps) @@ -351,4 +355,20 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { screenTimeValue.postValue(viewTimeSpent) prefs.screenTimeLastUpdated = endTime } + + fun setDefaultClockApp() { + viewModelScope.launch { + try { + Constants.CLOCK_APP_PACKAGES.firstOrNull { appContext.isPackageInstalled(it) }?.let { packageName -> + appContext.packageManager.getLaunchIntentForPackage(packageName)?.component?.className?.let { + prefs.clockAppPackage = packageName + prefs.clockAppClassName = it + prefs.clockAppUser = android.os.Process.myUserHandle().toString() + } + } + } catch (e: Exception) { + e.printStackTrace() + } + } + } }
\ No newline at end of file diff --git a/app/src/main/java/app/olauncher/data/Constants.kt b/app/src/main/java/app/olauncher/data/Constants.kt index 1ef4d0d..0dc89da 100644 --- a/app/src/main/java/app/olauncher/data/Constants.kt +++ b/app/src/main/java/app/olauncher/data/Constants.kt @@ -61,6 +61,13 @@ object Constants { const val HIDE = 101 } + val CLOCK_APP_PACKAGES = arrayOf( + "com.google.android.deskclock", //Google Clock + "com.sec.android.app.clockpackage", //Samsung Clock + "com.oneplus.deskclock", //OnePlus Clock + "com.miui.clock", //Xiaomi Clock + ) + const val WALL_TYPE_LIGHT = "light" const val WALL_TYPE_DARK = "dark" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bcf9416..5d4e97e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -127,7 +127,7 @@ <string name="please_turn_on_double_tap_to_unlock">Please turn on double tap to lock</string> <string name="launcher_failed_to_lock_device">Olauncher failed to lock device.\nPlease check your app settings.</string> <string name="long_press_to_select_app">Long press to select app</string> - <string name="unable_to_open_app">Unable to open app info</string> + <string name="unable_to_open_app">Unable to open app</string> <string name="copied">Copied</string> <string name="system_app_cannot_delete">System app, cannot delete</string> <string name="type_a_new_app_name_first">Type a new app name first</string> |