lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Optimize dynamic clock icon

Browse Source
This commit is contained in:
MM20 2022-06-24 19:02:14 +02:00
parent 859c88e2c7
commit ca63393bab
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt
View File

@ -4,7 +4,10 @@ import android.graphics.*
import android.graphics.Matrix import android.graphics.Matrix
import android.graphics.Path import android.graphics.Path
import android.graphics.drawable.AdaptiveIconDrawable import android.graphics.drawable.AdaptiveIconDrawable
import androidx.compose.animation.core.* import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.LinearEasing
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween
import androidx.compose.foundation.* import androidx.compose.foundation.*
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
@ -39,6 +42,7 @@ import de.mm20.launcher2.ktx.drawWithColorFilter
import de.mm20.launcher2.preferences.Settings.IconSettings.IconShape import de.mm20.launcher2.preferences.Settings.IconSettings.IconShape
import de.mm20.launcher2.ui.base.LocalTime import de.mm20.launcher2.ui.base.LocalTime
import de.mm20.launcher2.ui.locals.LocalDarkTheme import de.mm20.launcher2.ui.locals.LocalDarkTheme
import kotlinx.coroutines.launch
import palettes.TonalPalette import palettes.TonalPalette
import java.time.Instant import java.time.Instant
import java.time.ZoneId import java.time.ZoneId
@ -58,8 +62,6 @@ fun ShapedLauncherIcon(
shape: Shape = LocalIconShape.current shape: Shape = LocalIconShape.current
) { ) {
val time = LocalTime.current
var currentIcon by remember(icon) { var currentIcon by remember(icon) {
mutableStateOf( mutableStateOf(
when (icon) { when (icon) {
@ -71,6 +73,7 @@ fun ShapedLauncherIcon(
} }
if (icon is DynamicLauncherIcon) { if (icon is DynamicLauncherIcon) {
val time = LocalTime.current
LaunchedEffect(time) { LaunchedEffect(time) {
currentIcon = icon.getIcon(time) currentIcon = icon.getIcon(time)
} }
@ -271,7 +274,6 @@ private fun ClockLayer(
scale: Float, scale: Float,
tintColor: Color?, tintColor: Color?,
) { ) {
val transition = rememberInfiniteTransition()
val time = remember(LocalTime.current) { val time = remember(LocalTime.current) {
Instant.ofEpochMilli(System.currentTimeMillis()).atZone(ZoneId.systemDefault()) Instant.ofEpochMilli(System.currentTimeMillis()).atZone(ZoneId.systemDefault())
} }
@ -290,23 +292,20 @@ private fun ClockLayer(
LaunchedEffect(time) { LaunchedEffect(time) {
val h = time.hour.toFloat() + time.minute.toFloat() / 60f val h = time.hour.toFloat() + time.minute.toFloat() / 60f
hour.snapTo(h)
hour.animateTo(
h + 1f / 60f,
tween(60000, easing = LinearEasing)
)
}
LaunchedEffect(time) {
val m = time.minute.toFloat() + time.second.toFloat() / 60f val m = time.minute.toFloat() + time.second.toFloat() / 60f
minute.snapTo(m) val s = time.second.toFloat() + (time.nano / 1000000f) / 1000f
minute.animateTo(m + 1f, tween(60000, easing = LinearEasing))
}
LaunchedEffect(time) {
val s = time.second.toFloat()
second.snapTo(s) second.snapTo(s)
second.animateTo(s + 60f, tween(60000, easing = LinearEasing)) hour.snapTo(h)
minute.snapTo(m)
launch {
hour.animateTo(h + 1.5f / 60f, tween(90000, easing = LinearEasing))
}
launch {
minute.animateTo(m + 1.5f, tween(90000, easing = LinearEasing))
}
launch {
second.animateTo(s + 90f, tween(90000, easing = LinearEasing))
}
} }
Canvas(modifier = Modifier.fillMaxSize()) { Canvas(modifier = Modifier.fillMaxSize()) {