Compare commits

..

11 commits

Author SHA1 Message Date
159a875f10 Appearance: tune animations 2024-12-28 20:50:54 +01:00
ba95df1e0f Appearance: no timers 2024-12-28 20:31:41 +01:00
734e1a8b97 Appearance: shuffle clock and date 2024-12-28 20:30:56 +01:00
b3774350e6 Appearance: swipe not run 2024-12-28 20:30:20 +01:00
6b3d396631 Appearance: dirty font sizes 2024-12-28 17:49:59 +01:00
7821e3de1a Appearance: app list paddings 2024-12-28 16:05:48 +01:00
bf32b045ab Appearance: app shortcuts 2024-12-28 15:44:25 +01:00
89b8437d0b Appearance: clock and date 2024-12-28 15:19:30 +01:00
649444e730
Merge pull request #1 from He4eT/recent_apps
Recent apps
2024-12-28 13:50:32 +01:00
a1bcc6e389 Swipes: change priorities 2024-12-28 13:46:19 +01:00
1d02aa8d78 Show recent apps with swipe 2024-12-28 13:43:20 +01:00
8 changed files with 102 additions and 122 deletions

View file

@ -145,25 +145,6 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
setHomeListeners()
// Task to update the app menu every 5 seconds
lifecycleScope.launch {
lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
while (true) {
refreshAppMenu()
delay(5000)
}
}
}
// Task to update the weather every 10 minutes
lifecycleScope.launch(Dispatchers.IO) {
repeatOnLifecycle(Lifecycle.State.STARTED) {
while (true) {
updateWeather()
delay(600000)
}
}
}
setupApps()
}
@ -1170,8 +1151,32 @@ 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")) {
canLaunchShortcut = false
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,17 +1199,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()
}
}
}
return true
}

View file

@ -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)
}
}

View file

@ -118,12 +118,10 @@ class Animations (context: Context) {
private fun View.fadeIn(duration: Long = sharedPreferenceManager.getAnimationSpeed()) {
if (visibility != View.VISIBLE) {
alpha = 0f
translationY = -height.toFloat()/100
visibility = View.VISIBLE
animate()
.alpha(1f)
.translationY(0f)
.setDuration(duration)
.setListener(null)
}
@ -131,12 +129,12 @@ class Animations (context: Context) {
private fun View.fadeOut() {
if (visibility == View.VISIBLE) {
alpha = 0f
isInAnim = true
val duration = sharedPreferenceManager.getAnimationSpeed()
animate()
.alpha(0f)
.translationY(-height.toFloat()/100)
.setDuration(duration/2)
.setListener(object : AnimatorListenerAdapter() {
override fun onAnimationEnd(animation: Animator) {

View file

@ -350,11 +350,11 @@ class UIUtils(private val context: Context) {
// Size
fun setClockSize(clock: TextClock) {
setTextSize(clock, sharedPreferenceManager.getClockSize(), 48F, 58F, 70F, 78F, 82F, 84F)
setTextSize(clock, sharedPreferenceManager.getClockSize(), 66F, 58F, 70F, 78F, 82F, 84F)
}
fun setDateSize(dateText: TextClock) {
setTextSize(dateText, sharedPreferenceManager.getDateSize(), 14F, 17F, 20F, 23F, 26F, 29F)
setTextSize(dateText, sharedPreferenceManager.getDateSize(), 22F, 17F, 20F, 23F, 26F, 29F)
}
fun setShortcutsSize(shortcuts: LinearLayout) {
@ -363,7 +363,9 @@ class UIUtils(private val context: Context) {
shortcuts.children.forEach {
if (it is TextView) {
setShortcutSize(it, size)
it.setTextSize(TypedValue.COMPLEX_UNIT_SP, 22F)
// val padding = 15
// it.setPadding(0, dpToPx(padding), 0, dpToPx(padding))
}
}
}
@ -373,9 +375,9 @@ class UIUtils(private val context: Context) {
when (size) {
"tiny" -> {
shortcut.setAutoSizeTextTypeUniformWithConfiguration(
5, // Min text size in SP
20, // Max text size in SP
2, // Step granularity in SP
22, // Min text size in SP
22, // Max text size in SP
1, // Step granularity in SP
TypedValue.COMPLEX_UNIT_SP // Unit of measurement
)
}
@ -434,9 +436,9 @@ class UIUtils(private val context: Context) {
regionText: TextView? = null
) {
val size = sharedPreferenceManager.getAppSize()
setTextSize(textView, size, 21F, 24F, 27F, 30F, 33F, 36F)
setTextSize(textView, size, 22F, 24F, 27F, 30F, 33F, 36F)
if (editText != null) {
setTextSize(editText, size, 21F, 24F, 27F, 30F, 33F, 36F)
setTextSize(editText, size, 22F, 24F, 27F, 30F, 33F, 36F)
}
if (regionText != null) {
setTextSize(regionText, size, 11F, 14F, 17F, 20F, 23F, 26F)
@ -444,11 +446,11 @@ class UIUtils(private val context: Context) {
}
fun setSearchSize(searchView: TextInputEditText) {
setTextSize(searchView, sharedPreferenceManager.getSearchSize(), 18F, 21F, 25F, 27F, 30F, 33F)
setTextSize(searchView, sharedPreferenceManager.getSearchSize(), 22F, 21F, 25F, 27F, 30F, 33F)
}
fun setMenuTitleSize(menuTitle: TextView) {
setTextSize(menuTitle, sharedPreferenceManager.getAppSize(), 27F, 30F, 33F, 36F, 39F, 42F)
setTextSize(menuTitle, sharedPreferenceManager.getAppSize(), 22F, 30F, 33F, 36F, 39F, 42F)
}
private fun setTextSize(view: TextView, size: String?, t: Float, s: Float, m: Float, l: Float, x: Float, h: Float) {

View file

@ -17,10 +17,6 @@
android:orientation="vertical"
android:visibility="invisible">
<Space
android:layout_width="match_parent"
android:layout_height="60dp" />
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/menuTitle"
android:layout_width="match_parent"
@ -28,9 +24,8 @@
android:background="@android:color/transparent"
android:clickable="false"
android:gravity="start"
android:paddingLeft="40dp"
android:paddingHorizontal="22dp"
android:paddingTop="20dp"
android:paddingRight="40dp"
android:paddingBottom="20dp"
android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
@ -50,7 +45,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:fadingEdgeLength="20dp"
android:fadingEdgeLength="2dp"
android:padding="0dp"
android:requiresFadingEdge="vertical"
android:scrollbars="none">
@ -75,8 +70,8 @@
android:id="@+id/searchLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="5dp"
android:layout_marginHorizontal="22dp"
android:layout_marginTop="0dp"
android:layout_marginBottom="10dp"
android:layout_weight="0.1"
android:orientation="horizontal"
@ -96,7 +91,6 @@
android:singleLine="true"
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColorHighlight="#5F33B5E5"
android:textSize="25sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/internetSearch"
@ -164,9 +158,10 @@
android:id="@+id/textClock"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="45dp"
android:layout_marginBottom="27dp"
android:layout_marginHorizontal="0dp"
android:layout_marginTop="0dp"
android:layout_marginBottom="78dp"
android:paddingHorizontal="19dp"
android:format12Hour="hh:mm"
android:format24Hour="HH:mm"
android:textAlignment="textStart"
@ -183,9 +178,11 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:format12Hour="dd MMM yyyy"
android:format24Hour="dd MMM yyyy"
android:lineSpacingExtra="8sp"
android:paddingHorizontal="2dp"
android:format24Hour="yyyy-MM-dd / EEEE"
android:lineSpacingExtra="0sp"
android:paddingTop="0dp"
android:paddingHorizontal="22dp"
android:layout_marginBottom="38dp"
android:textAlignment="textStart"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3"
@ -201,18 +198,17 @@
android:id="@+id/topSpace"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.22" />
android:layout_weight="0" />
<TextView
android:id="@+id/app1"
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -225,11 +221,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -242,11 +237,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -259,11 +253,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -276,11 +269,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -293,11 +285,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -310,11 +301,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -327,11 +317,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -344,11 +333,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -361,11 +349,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -378,11 +365,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -395,11 +381,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -412,11 +397,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -429,11 +413,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"
@ -446,11 +429,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
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"

View file

@ -13,7 +13,7 @@
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:paddingVertical="5dp"
android:paddingVertical="0dp"
android:visibility="invisible">
<com.google.android.material.textfield.TextInputEditText
@ -37,8 +37,6 @@
android:shadowRadius="10"
android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#FFF3F3F3"
android:textColorHighlight="#5F33B5E5"
android:textSize="28sp" />
<androidx.appcompat.widget.AppCompatButton
@ -62,12 +60,11 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:clickable="false"
android:drawablePadding="3dp"
android:drawablePadding="8dp"
android:gravity="start|center_vertical"
android:paddingLeft="20dp"
android:paddingTop="20dp"
android:paddingRight="20dp"
android:paddingBottom="20dp"
android:paddingHorizontal="0dp"
android:paddingTop="0dp"
android:paddingBottom="0dp"
android:shadowColor="#00FFFFFF"
android:shadowRadius="10"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
@ -89,7 +86,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/app_action_background"
android:paddingVertical="5dp"
android:paddingVertical="0dp"
android:singleLine="true"
android:text="@string/pin"
android:textAlignment="center"
@ -103,7 +100,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/app_action_background"
android:paddingVertical="5dp"
android:paddingVertical="0dp"
android:singleLine="true"
android:text="@string/info"
android:textAlignment="center"
@ -117,7 +114,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/app_action_background"
android:paddingVertical="5dp"
android:paddingVertical="0dp"
android:singleLine="true"
android:text="@string/uninstall"
android:textAlignment="center"
@ -131,7 +128,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/app_action_background"
android:paddingVertical="5dp"
android:paddingVertical="0dp"
android:singleLine="true"
android:text="@string/rename"
android:textAlignment="center"
@ -145,7 +142,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/app_action_background"
android:paddingVertical="5dp"
android:paddingVertical="0dp"
android:singleLine="true"
android:text="@string/hide"
android:textAlignment="center"
@ -159,7 +156,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/app_action_background"
android:paddingVertical="5dp"
android:paddingVertical="0dp"
android:singleLine="true"
android:text="@string/close"
android:textAlignment="center"

View file

@ -108,7 +108,7 @@
</string-array>
<string-array name="shortcut_spacing_values" translatable="false">
<item>0.06</item>
<item>0.15</item>
<item>0.09</item>
<item>0.11</item>
<item>0.14</item>

View file

@ -11,7 +11,7 @@
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
<item name="android:enforceNavigationBarContrast">false</item>
<item name="android:enforceStatusBarContrast">false</item>
<item name="colorAccent">#FF80CBC4</item>
<item name="colorAccent">#FFCDCDCD</item>
</style>
<style name="SettingsTheme" parent="Theme.AppCompat">