add logo coloring

2026-10-21 16:32:39 +00:00 · 2025-12-22 14:21:05 -07:00
1 parent 8b2544434d
commit b4dd1567c9
@@ -1,11 +1,22 @@
 package com.geode.launcher

 import android.content.Intent
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import android.os.Bundle
 import android.text.format.Formatter
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.animation.Crossfade
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -47,11 +58,20 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.BlendMode
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.CompositingStrategy
+import androidx.compose.ui.graphics.TileMode
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -59,6 +79,8 @@ import com.geode.launcher.main.*
 import com.geode.launcher.ui.theme.GeodeLauncherTheme
 import com.geode.launcher.ui.theme.LocalTheme
 import com.geode.launcher.ui.theme.Theme
+import com.geode.launcher.ui.theme.Theme.DARK
+import com.geode.launcher.ui.theme.Theme.LIGHT
 import com.geode.launcher.ui.theme.launcherTitleStyle
 import com.geode.launcher.updater.ReleaseManager
 import com.geode.launcher.utils.Constants
@@ -417,19 +439,157 @@ fun ExtraOptions(onSettings: () -> Unit) {
    }
 }

+val lightOuterColorGradient = arrayOf(
+    0.0f to Color(0xfff5b11d),
+    0.10f to Color(0xfff0834d),
+    0.24f to Color(0xffe85f6b),
+    0.49f to Color(0xffc9659e),
+    1.0f to Color(0xffb9588f)
+)
+
+val lightInnerColorGradient = arrayOf(
+    0.48f to Color(0xfff2ce00),
+    0.63f to Color(0xfff4b97e),
+    0.73f to Color(0xfff7b66a),
+    1.0f to Color(0xffeb8fac)
+)
+
+val darkOuterColorGradient = arrayOf(
+    0.0f to Color(0xfffffdff),
+    0.08f to Color(0xffF2EAF5),
+    0.12f to Color(0xffEDE5EF),
+    0.31f to Color(0xffCDB5CD),
+    0.49f to Color(0xffBA9BBC),
+    1.0f to Color(0xff8D7ACF),
+)
+
+val darkInnerColorGradient = arrayOf(
+    0.48f to Color(0xffffffff),
+    0.63f to Color(0xfff5e4c2),
+    0.73f to Color(0xffe5c7ad),
+    1.0f to Color(0xffb790a9),
+)
+
+@Preview(name = "non-animated, light")
+@Preview(name = "non-animated, dark", uiMode = UI_MODE_NIGHT_YES)
@Composable
-fun GeodeLogo(modifier: Modifier = Modifier) {
+fun GeodeLogoPreview() {
+    val theme = if (isSystemInDarkTheme()) DARK else LIGHT
+    CompositionLocalProvider(LocalTheme provides theme) {
+        GeodeLauncherTheme(theme = theme) {
+            Surface {
+                GeodeLogo()
+            }
+        }
+    }
+}
+
+@Preview(name = "animated, light")
+@Preview(name = "animated, dark", uiMode = UI_MODE_NIGHT_YES)
+@Composable
+fun GeodeLogoAnimatedPreview() {
+    val theme = if (isSystemInDarkTheme()) DARK else LIGHT
+    CompositionLocalProvider(LocalTheme provides theme) {
+        GeodeLauncherTheme(theme = theme) {
+            Surface {
+                GeodeLogo(true)
+            }
+        }
+    }
+}
+
+@Composable
+fun AnimatedLogo(modifier: Modifier = Modifier) {
+    val theme = LocalTheme.current
+    val innerColorPalette = remember(theme) {
+        if (theme == LIGHT) lightInnerColorGradient else darkInnerColorGradient
+    }
+
+    val outerColorPalette = remember(theme) {
+        if (theme == LIGHT) lightOuterColorGradient else darkOuterColorGradient
+    }
+
+    val infiniteTransition = rememberInfiniteTransition(label = "infinite transition")
+    val offset by infiniteTransition.animateFloat(
+        initialValue = -1.0f,
+        targetValue = 1.0f,
+        animationSpec = infiniteRepeatable(
+            animation = tween(2000, easing = LinearEasing),
+            repeatMode = RepeatMode.Restart
+        ),
+        label = "gradient offset"
+    )
+
+    val innerBrush = Brush.linearGradient(
+        colorStops = innerColorPalette,
+        start = Offset(0.0f, 0.0f + (165.06f * offset)),
+        end = Offset(0.0f, 165.06f + (165.06f * offset)),
+        tileMode = TileMode.Mirror
+    )
+
+    val outerBrush = Brush.linearGradient(
+        colorStops = outerColorPalette,
+        start = Offset(0.0f + (84.69f * offset), 0.0f + (165.06f * offset)),
+        end = Offset(84.69f + (84.69f * offset), 169.61f + (165.06f * offset)),
+        tileMode = TileMode.Mirror
+    )
+
+    Box(modifier = modifier) {
+        Icon(
+            painter = painterResource(id = R.drawable.geode_monochrome_inner),
+            contentDescription = null,
+            modifier = Modifier
+                .graphicsLayer(compositingStrategy = CompositingStrategy.Offscreen)
+                .drawWithContent {
+                    drawContent()
+                    drawRect(
+                        brush = innerBrush,
+                        blendMode = BlendMode.SrcIn
+                    )
+                }
+        )
+        Icon(
+            painter = painterResource(id = R.drawable.geode_monochrome_outer),
+            contentDescription = null,
+            modifier = Modifier
+                .graphicsLayer(compositingStrategy = CompositingStrategy.Offscreen)
+                .drawWithContent {
+                    drawContent()
+                    drawRect(
+                        brush = outerBrush,
+                        blendMode = BlendMode.SrcIn
+                    )
+                }
+        )
+    }
+}
+
+@Composable
+fun GeodeLogo(shouldAnimate: Boolean = false, modifier: Modifier = Modifier) {
    Row(
        horizontalArrangement = Arrangement.Center,
        verticalAlignment = Alignment.CenterVertically,
        modifier = modifier
    ) {
-        Icon(
-            painter = painterResource(id = R.drawable.geode_monochrome),
-            contentDescription = null,
-            modifier = Modifier
-                .size(64.dp, 64.dp)
-        )
+        val theme = LocalTheme.current
+
+        Crossfade(
+            targetState = shouldAnimate,
+            animationSpec = tween(durationMillis = 1000, easing = FastOutSlowInEasing),
+            label="logo fade"
+        ) { screen ->
+            when (screen) {
+                true -> AnimatedLogo(modifier = Modifier.size(64.dp, 64.dp))
+                false -> Image(
+                    painterResource(if (theme == LIGHT)
+                        R.drawable.geode_base_light else R.drawable.geode_base
+                    ),
+                    contentDescription = null,
+                    modifier = Modifier.size(64.dp, 64.dp)
+                )
+            }
+        }
+
        Text(
            stringResource(R.string.launcher_title),
            style = launcherTitleStyle,
@@ -506,12 +666,12 @@ fun AltMainScreen(
    val snackbarHostState = remember { SnackbarHostState() }

    Scaffold(
-        snackbarHost = { SnackbarHost(hostState = snackbarHostState) }
+        snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
+        modifier = Modifier.safeDrawingPadding()
    ) { innerPadding ->
        Box(
            modifier = Modifier
                .fillMaxSize()
-                .safeDrawingPadding()
                .padding(innerPadding),
            contentAlignment = Alignment.Center
        ) {
@@ -522,7 +682,7 @@ fun AltMainScreen(
                    .padding(8.dp)
                    .verticalScroll(rememberScrollState())
            ) {
-                GeodeLogo()
+                GeodeLogo(shouldAnimate = launchUIState.isInProgress())

                Column(
                    verticalArrangement = Arrangement.spacedBy(8.dp),
@@ -0,0 +1,43 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="204dp"
+    android:height="205dp"
+    android:viewportWidth="204"
+    android:viewportHeight="205">
+  <path
+      android:pathData="M114.92,6.98L109,2.47C104.7,-0.82 98.72,-0.82 94.42,2.47L4.72,70.96C0.72,74.02 -0.95,79.25 0.54,84.06L35.03,195.65C36.59,200.69 41.24,204.12 46.51,204.12H156.91C162.18,204.12 166.83,200.69 168.38,195.65L202.88,84.06C204.37,79.25 202.7,74.02 198.7,70.96L190.43,64.65L180.92,94.56L154.79,179.53C153.77,182.85 150.71,185.12 147.23,185.12H55.6C52.13,185.12 49.06,182.85 48.04,179.53L19.44,86.54C18.47,83.38 19.57,79.95 22.19,77.94L96.6,20.81C96.9,20.58 97.21,20.38 97.53,20.19L114.92,6.98Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="65.53"
+          android:startY="18.28"
+          android:endX="150.22"
+          android:endY="187.89"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFDFF"/>
+        <item android:offset="0.08" android:color="#FFF2EAF5"/>
+        <item android:offset="0.12" android:color="#FFEDE5EF"/>
+        <item android:offset="0.31" android:color="#FFCDB5CD"/>
+        <item android:offset="0.49" android:color="#FFBA9BBC"/>
+        <item android:offset="1" android:color="#FF8D7ACF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M98.37,41.8C100.69,40.03 103.9,40.03 106.22,41.8L161.71,84.35C163.85,85.98 164.74,88.78 163.95,91.36L142.61,160.64C141.78,163.35 139.28,165.19 136.45,165.19H68.14C65.31,165.19 62.81,163.35 61.98,160.64L58.33,148.8H76.42C76.63,148.84 76.85,148.87 77.07,148.87H126.35C127.77,148.87 129.03,147.93 129.44,146.57L144.82,95.62C145.2,94.35 144.76,92.97 143.72,92.15L103.69,60.85C102.53,59.94 100.89,59.94 99.72,60.85L63.01,89.56L44.33,103.33L40.65,91.36C39.85,88.78 40.75,85.98 42.88,84.35L98.37,41.8Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="102.3"
+          android:startY="-83.96"
+          android:endX="102.3"
+          android:endY="165.06"
+          android:type="linear">
+        <item android:offset="0.48" android:color="#FFFFFFFF"/>
+        <item android:offset="0.63" android:color="#FFF5E4C2"/>
+        <item android:offset="0.73" android:color="#FFE5C7AD"/>
+        <item android:offset="1" android:color="#FFB790A9"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
@@ -0,0 +1,42 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="204dp"
+    android:height="205dp"
+    android:viewportWidth="204"
+    android:viewportHeight="205">
+  <path
+      android:pathData="M114.92,6.98L109,2.47C104.7,-0.82 98.72,-0.82 94.42,2.47L4.72,70.96C0.72,74.02 -0.95,79.25 0.54,84.06L35.03,195.65C36.59,200.69 41.24,204.12 46.51,204.12H156.91C162.18,204.12 166.83,200.69 168.38,195.65L202.88,84.06C204.37,79.25 202.7,74.02 198.7,70.96L190.43,64.65L180.92,94.56L154.79,179.53C153.77,182.85 150.71,185.12 147.23,185.12H55.6C52.13,185.12 49.06,182.85 48.04,179.53L19.44,86.54C18.47,83.38 19.57,79.95 22.19,77.94L96.6,20.81C96.9,20.58 97.21,20.38 97.53,20.19L114.92,6.98Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="65.53"
+          android:startY="18.28"
+          android:endX="150.22"
+          android:endY="187.89"
+          android:type="linear">
+        <item android:offset="0.0" android:color="#fff5b11d"/>
+        <item android:offset="0.10" android:color="#fff0834d"/>
+        <item android:offset="0.24" android:color="#ffe85f6b"/>
+        <item android:offset="0.49" android:color="#ffc9659e"/>
+        <item android:offset="1" android:color="#ffb9588f"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M98.37,41.8C100.69,40.03 103.9,40.03 106.22,41.8L161.71,84.35C163.85,85.98 164.74,88.78 163.95,91.36L142.61,160.64C141.78,163.35 139.28,165.19 136.45,165.19H68.14C65.31,165.19 62.81,163.35 61.98,160.64L58.33,148.8H76.42C76.63,148.84 76.85,148.87 77.07,148.87H126.35C127.77,148.87 129.03,147.93 129.44,146.57L144.82,95.62C145.2,94.35 144.76,92.97 143.72,92.15L103.69,60.85C102.53,59.94 100.89,59.94 99.72,60.85L63.01,89.56L44.33,103.33L40.65,91.36C39.85,88.78 40.75,85.98 42.88,84.35L98.37,41.8Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="102.3"
+          android:startY="-83.96"
+          android:endX="102.3"
+          android:endY="165.06"
+          android:type="linear">
+        <item android:offset="0.48" android:color="#fff2ce00"/>
+        <item android:offset="0.63" android:color="#fff4b97e"/>
+        <item android:offset="0.73" android:color="#fff7b66a"/>
+        <item android:offset="1" android:color="#ffeb8fac"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="96dp"
+    android:height="96dp"
+    android:viewportWidth="696"
+    android:viewportHeight="698"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="M336.61,143.26C344.51,137.21 355.49,137.21 363.39,143.26L552.8,288.49C560.1,294.09 563.14,303.63 560.44,312.42L487.62,548.92C484.78,558.15 476.25,564.45 466.59,564.45H233.41C223.75,564.45 215.22,558.15 212.38,548.92L199.93,508.5H261.68C262.39,508.65 263.13,508.72 263.89,508.72H432.11C436.96,508.72 441.24,505.55 442.64,500.9L495.14,326.98C496.45,322.64 494.96,317.93 491.39,315.14L354.78,208.3C350.8,205.19 345.2,205.19 341.22,208.3L215.93,306.29L152.15,353.31L139.56,312.42C136.86,303.63 139.9,294.09 147.2,288.49L336.61,143.26Z"
+      android:fillType="evenOdd"
+      android:fillColor="@android:color/white">
+  </path>
+</vector>
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="96dp"
+    android:height="96dp"
+    android:viewportWidth="696"
+    android:viewportHeight="698"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="M393.08,24.42L372.88,9C358.19,-2.22 337.81,-2.22 323.12,9L16.94,242.81C3.28,253.24 -2.42,271.09 2.66,287.51L120.41,668.43C125.72,685.61 141.6,697.33 159.58,697.33H536.42C554.4,697.33 570.28,685.61 575.59,668.43L693.34,287.51C698.42,271.09 692.72,253.24 679.06,242.81L650.84,221.26L618.37,323.39L529.2,613.39C525.71,624.72 515.24,632.46 503.39,632.46H190.61C178.76,632.46 168.29,624.72 164.8,613.39L67.2,295.97C63.88,285.19 67.62,273.49 76.56,266.62L330.56,71.62C331.58,70.84 332.64,70.14 333.74,69.52L393.08,24.42Z"
+      android:fillType="evenOdd"
+      android:fillColor="@android:color/white">
+  </path>
+</vector>