From 1d02aa8d78903b84eba994604d40fcd51cd73321 Mon Sep 17 00:00:00 2001 From: He4eT Date: Sat, 28 Dec 2024 13:43:20 +0100 Subject: [PATCH 01/11] Show recent apps with swipe --- .../java/eu/ottop/yamlauncher/MainActivity.kt | 15 ++++++++++++++- .../ottop/yamlauncher/tasks/ScreenLockService.kt | 7 +++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt index 55b02dd..eb67c0e 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt @@ -1196,7 +1196,7 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh } - // Swipe right + // Swipe right else if (deltaX > 0 && abs(deltaX) > swipeThreshold && abs(velocityX) > swipeVelocityThreshold && sharedPreferenceManager.isGestureEnabled("right")) { if (rightSwipeActivity.first != null && rightSwipeActivity.second != null) { canLaunchShortcut = false @@ -1205,6 +1205,19 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh Toast.makeText(this@MainActivity, getString(R.string.launch_error), Toast.LENGTH_SHORT).show() } } + else if (deltaX > 0 && abs(deltaX) > swipeThreshold && abs(velocityX) > swipeVelocityThreshold && !sharedPreferenceManager.isGestureEnabled("right")) { + if (gestureUtils.isAccessibilityServiceEnabled( + ScreenLockService::class.java + ) + ) { + val intent = Intent(this@MainActivity, ScreenLockService::class.java) + intent.action = "RECENTS" + startService(intent) + finishAndRemoveTask() + } else { + gestureUtils.promptEnableAccessibility() + } + } } return true } diff --git a/app/src/main/java/eu/ottop/yamlauncher/tasks/ScreenLockService.kt b/app/src/main/java/eu/ottop/yamlauncher/tasks/ScreenLockService.kt index 403ccec..afcf884 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/tasks/ScreenLockService.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/tasks/ScreenLockService.kt @@ -16,6 +16,9 @@ class ScreenLockService : AccessibilityService() { if (intent != null && intent.action == "LOCK_SCREEN") { performLockScreen() } + if (intent != null && intent.action == "RECENTS") { + performShowRecents() + } stopSelf() return super.onStartCommand(intent, flags, startId) } @@ -23,4 +26,8 @@ class ScreenLockService : AccessibilityService() { private fun performLockScreen() { performGlobalAction(GLOBAL_ACTION_LOCK_SCREEN) } + + private fun performShowRecents() { + performGlobalAction(GLOBAL_ACTION_RECENTS) + } } \ No newline at end of file From a1bcc6e389fda96f18c6e7aac90407fd71fc2062 Mon Sep 17 00:00:00 2001 From: He4eT Date: Sat, 28 Dec 2024 13:46:19 +0100 Subject: [PATCH 02/11] Swipes: change priorities --- .../java/eu/ottop/yamlauncher/MainActivity.kt | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt index eb67c0e..3b70360 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt @@ -1170,8 +1170,31 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh val deltaY = e2.y - e1.y val deltaX = e2.x - e1.x + // Swipe right + if (deltaX > 0 && abs(deltaX) > swipeThreshold && abs(velocityX) > swipeVelocityThreshold && sharedPreferenceManager.isGestureEnabled("right")) { + if (rightSwipeActivity.first != null && rightSwipeActivity.second != null) { + canLaunchShortcut = false + appUtils.launchApp(rightSwipeActivity.first!!.componentName, launcherApps.profiles[rightSwipeActivity.second!!]) + } else { + Toast.makeText(this@MainActivity, getString(R.string.launch_error), Toast.LENGTH_SHORT).show() + } + } + else if (deltaX > 0 && abs(deltaX) > swipeThreshold && abs(velocityX) > swipeVelocityThreshold && !sharedPreferenceManager.isGestureEnabled("right")) { + if (gestureUtils.isAccessibilityServiceEnabled( + ScreenLockService::class.java + ) + ) { + val intent = Intent(this@MainActivity, ScreenLockService::class.java) + intent.action = "RECENTS" + startService(intent) + finishAndRemoveTask() + } else { + gestureUtils.promptEnableAccessibility() + } + } + // Swipe up - if (deltaY < -swipeThreshold && abs(velocityY) > swipeVelocityThreshold) { + else if (deltaY < -swipeThreshold && abs(velocityY) > swipeVelocityThreshold) { canLaunchShortcut = false openAppMenu() } @@ -1194,30 +1217,6 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh Toast.makeText(this@MainActivity, getString(R.string.launch_error), Toast.LENGTH_SHORT).show() } } - - - // Swipe right - else if (deltaX > 0 && abs(deltaX) > swipeThreshold && abs(velocityX) > swipeVelocityThreshold && sharedPreferenceManager.isGestureEnabled("right")) { - if (rightSwipeActivity.first != null && rightSwipeActivity.second != null) { - canLaunchShortcut = false - appUtils.launchApp(rightSwipeActivity.first!!.componentName, launcherApps.profiles[rightSwipeActivity.second!!]) - } else { - Toast.makeText(this@MainActivity, getString(R.string.launch_error), Toast.LENGTH_SHORT).show() - } - } - else if (deltaX > 0 && abs(deltaX) > swipeThreshold && abs(velocityX) > swipeVelocityThreshold && !sharedPreferenceManager.isGestureEnabled("right")) { - if (gestureUtils.isAccessibilityServiceEnabled( - ScreenLockService::class.java - ) - ) { - val intent = Intent(this@MainActivity, ScreenLockService::class.java) - intent.action = "RECENTS" - startService(intent) - finishAndRemoveTask() - } else { - gestureUtils.promptEnableAccessibility() - } - } } return true } From 89b8437d0b98e9159e4a6926b27587c78b44c583 Mon Sep 17 00:00:00 2001 From: He4eT Date: Sat, 28 Dec 2024 15:19:30 +0100 Subject: [PATCH 03/11] Appearance: clock and date --- app/src/main/res/layout/activity_main.xml | 45 ++++++++++++----------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f6c8ff7..0707945 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -160,13 +160,31 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> + + - - + app:layout_constraintTop_toBottomOf="@+id/textDate" /> From bf32b045ab3798db123eb4a65dd3f83c664d5ced Mon Sep 17 00:00:00 2001 From: He4eT Date: Sat, 28 Dec 2024 15:44:25 +0100 Subject: [PATCH 04/11] Appearance: app shortcuts --- app/src/main/res/layout/activity_main.xml | 64 +++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0707945..d5acaf5 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -169,7 +169,7 @@ android:format12Hour="dd MMM yyyy" android:format24Hour="yyyy-MM-dd / EEEE" android:lineSpacingExtra="8sp" - android:paddingHorizontal="20dp" + android:paddingHorizontal="22dp" android:textAlignment="textStart" android:textAppearance="@android:style/TextAppearance.DeviceDefault" android:textColor="#F3F3F3" @@ -184,7 +184,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="0dp" - android:paddingHorizontal="20dp" + android:paddingHorizontal="22dp" android:format12Hour="hh:mm" android:format24Hour="HH:mm" android:textAlignment="textStart" @@ -211,9 +211,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -228,9 +228,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -245,9 +245,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -262,9 +262,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -279,9 +279,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -296,9 +296,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -313,9 +313,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -330,9 +330,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -347,9 +347,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -364,9 +364,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -381,9 +381,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -398,9 +398,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -415,9 +415,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -432,9 +432,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" @@ -449,9 +449,9 @@ android:layout_weight="0.09" android:autoSizeTextType="uniform" android:clickable="false" - android:drawablePadding="3dp" android:gravity="center_vertical" - android:paddingHorizontal="20dp" + android:drawablePadding="8dp" + android:paddingHorizontal="0dp" android:shadowColor="#00FFFFFF" android:shadowRadius="10" android:text="@string/shortcut_default" From 7821e3de1a04d48ce42218f1b176faedb8df9aa8 Mon Sep 17 00:00:00 2001 From: He4eT Date: Sat, 28 Dec 2024 16:05:48 +0100 Subject: [PATCH 05/11] Appearance: app list paddings --- app/src/main/res/layout/activity_main.xml | 10 ++-------- app/src/main/res/layout/app_item_layout.xml | 5 ++--- app/src/main/res/values/themes.xml | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d5acaf5..b26aa1b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -17,10 +17,6 @@ android:orientation="vertical" android:visibility="invisible"> - - shortEdges false false - #FF80CBC4 + #FFCDCDCD