Your Android phone and your Windows PC, working as one. Local-first, end-to-end encrypted, no account.
Hive: a honey theme with a living honeycomb, on both apps
Bee4f31b6bd4670
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex fcb52d9..e30d706 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -6,8 +6,8 @@ change things that need a step from you, and its notes say so.## 0.1.3 (2026-10-15)-Updating the Windows app works on slow or unsteady connections, and shows-how far it is.+Hive, a new theme for both apps, and updates to the Windows app that work on+slow or unsteady connections and show how far they are.### Downloads@@ -21,6 +21,24 @@ Installed copies update themselves. If **Update** in 0.1.2 or earlier closesNectarlink and nothing happens, install this version from the link aboveonce; updates after it work from the app.+### New++- **Hive**, a theme for the Windows and Android apps: honey on charcoal in+ dark mode and on warm wax in light mode, with a living honeycomb behind the+ whole app. The comb grows from the logo, breathes slowly, and sends a soft+ pulse of light outward every few seconds, the same on the PC and the phone.+ On the PC the phone on Home shows it too. Its colors are fixed, so the+ wallpaper, artwork and phone color options are hidden while it's on.+ - Choose it in **Settings › Appearance**, or from the **Try Hive** card on+ Home. Dismissed, the card returns only after an update or a reinstall.+ - **Animated comb** (on by default) turns the motion off. The comb also+ holds still with reduced motion or battery saver on, and while the app+ isn't in front.+ - Light on resources: one GPU shader draws the comb, updated about 30+ times a second and only while the window is in front. On Android 12 and+ older, a still comb breathes.+- The installer and uninstaller share Hive's comb.+### Fixed- **Updating the Windows app.** Clicking **Update** closed Nectarlink rightdiff --git a/README.md b/README.mdindex 2943839..4079053 100644--- a/README.md+++ b/README.md@@ -112,7 +112,8 @@ The [user guide](docs/guide/README.md) walks through every step and feature.searchable **Timeline** of everything that moved, a **Command Palette**(`Ctrl+Alt+Space`), a slide-out **Shelf**, a home-screen widget, and a**Connection Doctor** that finds and fixes what keeps devices from connecting.-Three themes, **Bloom**, **Glass** and **Graphite**, each in light and dark.+Four themes, **Hive**, **Bloom**, **Glass** and **Graphite**, each in light+and dark.## Private by design@@ -133,9 +134,21 @@ Details: [Privacy and security](docs/guide/privacy-and-security.md) and the## Screenshots-The Windows app has three themes: **Bloom**, soft and colorful; **Glass**,-translucent cards over the Windows backdrop; and **Graphite**, ink on paper.-Each comes in light and dark.+**Hive** is honey on charcoal or warm wax, with a living honeycomb behind the+whole app that breathes and sends soft pulses of light from the logo. It looks+the same on the PC and the phone, and holds still with reduced motion or+battery saver, or when you turn the animation off.++<p align="center">+ <img src="docs/screenshots/desktop-hive-home.png" alt="Home on the PC in the Hive theme, dark, with the honeycomb behind it" width="660">+ <img src="docs/screenshots/android-hive-home.png" alt="The Android app's Home in the Hive theme, dark" width="200"><br>+ <img src="docs/screenshots/desktop-hive-settings.png" alt="Settings on the PC in the Hive theme, light" width="660"><br>+ <sub>Hive on the PC and the phone, in dark and light.</sub>+</p>++The other three: **Bloom**, soft and colorful; **Glass**, translucent cards over+the Windows backdrop; and **Graphite**, ink on paper. Each comes in light and+dark.| Bloom | Glass | Graphite ||:---:|:---:|:---:|diff --git a/android/app/src/main/kotlin/app/nectarlink/android/ui/MainActivity.kt b/android/app/src/main/kotlin/app/nectarlink/android/ui/MainActivity.ktindex 3a37d82..ed7b34c 100644--- a/android/app/src/main/kotlin/app/nectarlink/android/ui/MainActivity.kt+++ b/android/app/src/main/kotlin/app/nectarlink/android/ui/MainActivity.kt@@ -161,6 +161,7 @@ class MainActivity : ComponentActivity() {NectarlinkTheme(appearance = appearance,mediaSeedColor = state.activeMediaColor,+ backdrop = true,) {// Every screen sits on the theme's background, not the// window's (which can't follow the app's own light/dark choice).@@ -780,6 +781,7 @@ private fun App(val recorderSession by recorderFlow.collectAsStateWithLifecycle(recorderInitial)val touchpadSensitivity by preferences.touchpadSensitivity.collectAsStateWithLifecycle()val suggestClipboardActions by preferences.suggestClipboardActions.collectAsStateWithLifecycle()+ val hiveInviteShown by preferences.hiveInviteShown.collectAsStateWithLifecycle()val saveableStateHolder = androidx.compose.runtime.saveable.rememberSaveableStateHolder()// Only apply top scaffold padding here so LazyColumns in HomeScreen/SettingsScreen@@ -888,6 +890,12 @@ private fun App(onOpenRecorder = { pcId -> recordPcId = pcId },onStopRecorder = { RecorderService.stop(context) },showWhatsNewGuideBanner = startupWalkthrough.showWhatsNewGuideBanner,+ showHiveInvite = hiveInviteShown && appearance.theme != "hive",+ onTryHive = {+ preferences.answerHiveInvite()+ preferences.update { it.copy(theme = "hive") }+ },+ onDismissHiveInvite = preferences::answerHiveInvite,onDismissWhatsNewGuide = {preferences.updateWalkthrough { it.dismissWhatsNewGuide() }},diff --git a/android/app/src/main/kotlin/app/nectarlink/android/ui/Preferences.kt b/android/app/src/main/kotlin/app/nectarlink/android/ui/Preferences.ktindex d046e3f..b4ba832 100644--- a/android/app/src/main/kotlin/app/nectarlink/android/ui/Preferences.kt+++ b/android/app/src/main/kotlin/app/nectarlink/android/ui/Preferences.kt@@ -24,6 +24,21 @@ class Preferences(context: Context) {private val _suggestClipboardActions = MutableStateFlow(prefs.getBoolean(SUGGEST_CLIPBOARD_ACTIONS, true))val suggestClipboardActions: StateFlow<Boolean> = _suggestClipboardActions.asStateFlow()+ /**+ * The invitation to try Hive shows until it's answered, and again after+ * an update (a reinstall clears this anyway): it remembers the version+ * that answered it.+ */+ private val _hiveInviteShown = MutableStateFlow(+ prefs.getLong(HIVE_INVITE_ANSWERED, -1L) != app.nectarlink.android.BuildConfig.VERSION_CODE.toLong(),+ )+ val hiveInviteShown: StateFlow<Boolean> = _hiveInviteShown.asStateFlow()++ fun answerHiveInvite() {+ prefs.edit { putLong(HIVE_INVITE_ANSWERED, app.nectarlink.android.BuildConfig.VERSION_CODE.toLong()) }+ _hiveInviteShown.value = false+ }+private val _walkthrough = MutableStateFlow(loadWalkthrough())val walkthrough: StateFlow<WalkthroughPersistence> = _walkthrough.asStateFlow()@@ -35,6 +50,7 @@ class Preferences(context: Context) {seed = prefs.getString(SEED, defaults.seed),dynamicColor = prefs.getBoolean(DYNAMIC, defaults.dynamicColor),amoled = prefs.getBoolean(AMOLED, defaults.amoled),+ combMotion = prefs.getBoolean(COMB_MOTION, defaults.combMotion),)}@@ -58,6 +74,7 @@ class Preferences(context: Context) {putString(SEED, next.seed)putBoolean(DYNAMIC, next.dynamicColor)putBoolean(AMOLED, next.amoled)+ putBoolean(COMB_MOTION, next.combMotion)}_appearance.value = next}@@ -98,6 +115,8 @@ class Preferences(context: Context) {private const val SEED = "seed"private const val DYNAMIC = "dynamic_color"private const val AMOLED = "amoled_black"+ private const val COMB_MOTION = "comb_motion"+ private const val HIVE_INVITE_ANSWERED = "hive_invite_answered_version"private const val TOUCHPAD_SENSITIVITY = "touchpad_sensitivity"private const val SUGGEST_CLIPBOARD_ACTIONS = "suggest_clipboard_actions"private const val AWAY_MODE = "away_mode"@@ -105,7 +124,7 @@ class Preferences(context: Context) {private const val WALKTHROUGH_STEP = "walkthrough_step"private const val WHATS_NEW_GUIDE_DISMISSED = "whats_new_guide_dismissed"- val VALID_THEMES = setOf("bloom", "graphite", "glass")+ val VALID_THEMES = setOf("hive", "bloom", "graphite", "glass")val VALID_MODES = setOf("system", "light", "dark")fun sanitizeAppearance(@@ -114,6 +133,7 @@ class Preferences(context: Context) {seed: String?,dynamicColor: Boolean = true,amoled: Boolean = false,+ combMotion: Boolean = true,): Appearance {val defaults = Appearance()val safeTheme = theme?.takeIf { it in VALID_THEMES } ?: defaults.theme@@ -125,6 +145,7 @@ class Preferences(context: Context) {seed = safeSeed,dynamicColor = dynamicColor,amoled = amoled,+ combMotion = combMotion,)}@@ -135,6 +156,7 @@ class Preferences(context: Context) {seed = appearance.seed,dynamicColor = appearance.dynamicColor,amoled = appearance.amoled,+ combMotion = appearance.combMotion,)fun isSuggestClipboardActionsEnabled(context: Context): Boolean =diff --git a/android/app/src/main/kotlin/app/nectarlink/android/ui/home/HomeScreen.kt b/android/app/src/main/kotlin/app/nectarlink/android/ui/home/HomeScreen.ktindex 5628c5c..30c717d 100644--- a/android/app/src/main/kotlin/app/nectarlink/android/ui/home/HomeScreen.kt+++ b/android/app/src/main/kotlin/app/nectarlink/android/ui/home/HomeScreen.kt@@ -20,6 +20,7 @@ import androidx.compose.animation.fadeOutimport androidx.compose.animation.shrinkVerticallyimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.Image+import androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickableimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Box@@ -75,6 +76,7 @@ import androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.graphics.Color+import androidx.compose.ui.graphics.luminanceimport androidx.compose.ui.graphics.ImageBitmapimport androidx.compose.ui.graphics.SolidColorimport androidx.compose.ui.graphics.StrokeCap@@ -113,6 +115,7 @@ import app.nectarlink.android.mirror.MirrorSessionimport app.nectarlink.android.notifications.NotificationListenerimport app.nectarlink.android.photos.RecentPhotosimport app.nectarlink.android.recorder.RecorderSession+import androidx.compose.ui.draw.clipimport androidx.compose.ui.draw.drawBehindimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport app.nectarlink.android.sms.PhoneSms@@ -224,6 +227,9 @@ fun HomeScreen(onStopRecorder: () -> Unit = {},showWhatsNewGuideBanner: Boolean = false,onDismissWhatsNewGuide: () -> Unit = {},+ showHiveInvite: Boolean = false,+ onTryHive: () -> Unit = {},+ onDismissHiveInvite: () -> Unit = {},onOpenFeaturesGuide: () -> Unit = {},onOpenWalkthrough: () -> Unit = {},highlightTarget: GuideHighlightTarget? = null,@@ -335,6 +341,12 @@ fun HomeScreen()}}+ // After the What's new card, one at a time.+ if (showHiveInvite && !showWhatsNewGuideBanner) {+ item(key = "hive_invite", contentType = "banner") {+ HiveInviteCard(onTry = onTryHive, onDismiss = onDismissHiveInvite)+ }+ }state.ringingFrom?.let { from ->item(key = "ringing_banner", contentType = "banner") {RingingBanner(from, onStopRinging)@@ -753,6 +765,63 @@ private fun WhatsNewFeaturesGuideCard(}}+/** "Try Hive, the new theme", with a small window onto the comb in Hive's own colors. */+@OptIn(ExperimentalLayoutApi::class)+@Composable+private fun HiveInviteCard(onTry: () -> Unit, onDismiss: () -> Unit) {+ val isGlass = LocalGlassTheme.current+ val dark = MaterialTheme.colorScheme.surface.luminance() < 0.5f+ val reduced = app.nectarlink.android.ui.theme.LocalReducedMotion.current+ val saving = app.nectarlink.android.ui.theme.rememberPowerSaver()+ Row(+ modifier = Modifier+ .fillMaxWidth()+ .liquidGlassCard(+ cornerRadius = 24.dp,+ isGlass = isGlass,+ baseColor = MaterialTheme.colorScheme.surfaceContainerHigh,+ tintColor = MaterialTheme.colorScheme.primary,+ outlineColor = if (isGlass) MaterialTheme.colorScheme.outlineVariant else Color.Transparent,+ )+ .padding(16.dp),+ horizontalArrangement = Arrangement.spacedBy(14.dp),+ verticalAlignment = Alignment.CenterVertically,+ ) {+ androidx.compose.foundation.layout.Box(+ modifier = Modifier+ .size(56.dp)+ .clip(RoundedCornerShape(14.dp))+ .background(if (dark) Color(0xFF121214) else Color(0xFFFFF8F3)),+ contentAlignment = Alignment.Center,+ ) {+ app.nectarlink.android.ui.theme.HiveComb(+ dark = dark,+ animate = !reduced && !saving,+ cellDp = 9f,+ origin = { androidx.compose.ui.geometry.Offset(it.width / 2f, it.height / 2f) },+ )+ }+ Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(6.dp)) {+ Text(+ text = stringResource(R.string.hive_invite_title),+ style = MaterialTheme.typography.titleMedium,+ )+ Text(+ text = stringResource(R.string.hive_invite_text),+ style = MaterialTheme.typography.bodySmall,+ color = MaterialTheme.colorScheme.onSurfaceVariant,+ )+ FlowRow(+ horizontalArrangement = Arrangement.spacedBy(8.dp),+ verticalArrangement = Arrangement.spacedBy(8.dp),+ ) {+ Button(onClick = onTry) { Text(stringResource(R.string.hive_invite_try)) }+ TextButton(onClick = onDismiss) { Text(stringResource(R.string.hive_invite_dismiss)) }+ }+ }+ }+}+@OptIn(ExperimentalLayoutApi::class)@Composableprivate fun NoPairedPcCard(diff --git a/android/app/src/main/kotlin/app/nectarlink/android/ui/settings/SettingsScreen.kt b/android/app/src/main/kotlin/app/nectarlink/android/ui/settings/SettingsScreen.ktindex 47a40eb..8fb1b51 100644--- a/android/app/src/main/kotlin/app/nectarlink/android/ui/settings/SettingsScreen.kt+++ b/android/app/src/main/kotlin/app/nectarlink/android/ui/settings/SettingsScreen.kt@@ -231,6 +231,7 @@ fun SettingsScreen(Label(stringResource(R.string.settings_theme))Choice(listOf(+ "hive" to stringResource(R.string.theme_hive),"bloom" to stringResource(R.string.theme_bloom),"glass" to "Glass","graphite" to stringResource(R.string.theme_graphite),@@ -246,6 +247,26 @@ fun SettingsScreen(),appearance.mode,) { value -> onAppearance { it.copy(mode = value) } }+ if (appearance.theme == "hive") {+ SettingRowDivider()+ val combTitle = stringResource(R.string.settings_comb_motion)+ Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {+ Column(Modifier.weight(1f).padding(end = 12.dp)) {+ Text(combTitle, style = MaterialTheme.typography.titleSmall)+ Text(+ stringResource(R.string.settings_comb_motion_hint),+ style = MaterialTheme.typography.bodySmall,+ color = MaterialTheme.colorScheme.onSurfaceVariant,+ )+ }+ Switch(+ checked = appearance.combMotion,+ onCheckedChange = { on -> onAppearance { it.copy(combMotion = on) } },+ colors = app.nectarlink.android.ui.theme.nectarSwitchColors(),+ modifier = Modifier.semantics { contentDescription = combTitle },+ )+ }+ }if (appearance.theme == "graphite" && appearance.mode != "light") {SettingRowDivider()val amoledTitle = stringResource(R.string.settings_amoled)diff --git a/android/app/src/main/kotlin/app/nectarlink/android/ui/theme/HiveComb.kt b/android/app/src/main/kotlin/app/nectarlink/android/ui/theme/HiveComb.ktnew file mode 100644index 0000000..3610ae2--- /dev/null+++ b/android/app/src/main/kotlin/app/nectarlink/android/ui/theme/HiveComb.kt@@ -0,0 +1,261 @@+// SPDX-License-Identifier: GPL-3.0-or-later+package app.nectarlink.android.ui.theme++import android.content.BroadcastReceiver+import android.content.Context+import android.content.Intent+import android.content.IntentFilter+import android.graphics.RuntimeShader+import android.os.Build+import android.os.PowerManager+import android.os.SystemClock+import androidx.annotation.RequiresApi+import androidx.compose.foundation.Canvas+import androidx.compose.foundation.layout.fillMaxSize+import androidx.compose.runtime.Composable+import androidx.compose.runtime.DisposableEffect+import androidx.compose.runtime.LaunchedEffect+import androidx.compose.runtime.compositionLocalOf+import androidx.compose.runtime.getValue+import androidx.compose.runtime.mutableFloatStateOf+import androidx.compose.runtime.mutableStateOf+import androidx.compose.runtime.remember+import androidx.compose.runtime.setValue+import androidx.compose.ui.Modifier+import androidx.compose.ui.draw.drawWithCache+import androidx.compose.ui.geometry.Offset+import androidx.compose.ui.graphics.Color+import androidx.compose.ui.graphics.Path+import androidx.compose.ui.graphics.ShaderBrush+import androidx.compose.ui.graphics.drawscope.Stroke+import androidx.compose.ui.platform.LocalContext+import androidx.compose.ui.platform.LocalDensity+import androidx.lifecycle.Lifecycle+import androidx.lifecycle.compose.LocalLifecycleOwner+import androidx.lifecycle.repeatOnLifecycle+import kotlinx.coroutines.delay+import kotlin.math.PI+import kotlin.math.sin+import kotlin.math.sqrt++/** The Hive theme is active. */+val LocalHiveTheme = compositionLocalOf { false }++/** True while Android's battery saver is on: decorative animation rests. */+@Composable+fun rememberPowerSaver(): Boolean {+ val context = LocalContext.current+ val power = remember(context) { context.getSystemService(PowerManager::class.java) }+ var saving by remember { mutableStateOf(power?.isPowerSaveMode == true) }+ DisposableEffect(context) {+ val receiver = object : BroadcastReceiver() {+ override fun onReceive(c: Context, intent: Intent) {+ saving = power?.isPowerSaveMode == true+ }+ }+ context.registerReceiver(receiver, IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED))+ onDispose { runCatching { context.unregisterReceiver(receiver) } }+ }+ return saving+}++/**+ * Hive's living honeycomb behind the app, the same comb as the Windows app+ * and the installer: it breathes slowly and sends a soft pulse of light+ * outward from [origin] every few seconds.+ *+ * Light on the battery: on Android 13 and newer one GPU shader draws it;+ * time advances about 30 times a second (the motion is slow enough that more+ * looks the same), and only while the app is in front. Only the backdrop+ * redraws, never the content above it. With [animate] false it holds still.+ * Older Android draws the same comb from a cached path and only breathes.+ */+@Composable+fun HiveComb(+ dark: Boolean,+ animate: Boolean,+ modifier: Modifier = Modifier,+ cellDp: Float = Tokens.COMB_CELL_DP,+ origin: (androidx.compose.ui.geometry.Size) -> Offset = { Offset(it.width / 2f, it.height * 0.18f) },+) {+ val line = if (dark) {+ Color(0xFFFFB95F).copy(alpha = Tokens.COMB_LINE_ALPHA_DARK)+ } else {+ Color(0xFF8A5100).copy(alpha = Tokens.COMB_LINE_ALPHA_LIGHT)+ }+ val glow = if (dark) {+ Color(1.0f, 0.62f, 0.18f, Tokens.COMB_GLOW_ALPHA_DARK)+ } else {+ Color(1.0f, 0.72f, 0.37f, Tokens.COMB_GLOW_ALPHA_LIGHT)+ }+ val cellPx = with(LocalDensity.current) { cellDp * density }++ // Seconds, carried across pauses so it picks up where it stopped.+ var time by remember { mutableFloatStateOf(0f) }+ val lifecycle = LocalLifecycleOwner.current.lifecycle+ LaunchedEffect(animate, lifecycle) {+ if (!animate) return@LaunchedEffect+ lifecycle.repeatOnLifecycle(Lifecycle.State.RESUMED) {+ val base = time+ val since = SystemClock.uptimeMillis()+ while (true) {+ delay(Tokens.COMB_FRAME_MS)+ time = base + (SystemClock.uptimeMillis() - since) / 1000f+ }+ }+ }+ val pulse = if (animate) 1f else 0f++ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {+ ShaderComb(modifier, { time }, pulse, cellPx, line, glow, origin)+ } else {+ PathComb(modifier, { time }, pulse, cellPx, line, glow, origin)+ }+}++@RequiresApi(Build.VERSION_CODES.TIRAMISU)+@Composable+private fun ShaderComb(+ modifier: Modifier,+ time: () -> Float,+ pulse: Float,+ cell: Float,+ line: Color,+ glow: Color,+ origin: (androidx.compose.ui.geometry.Size) -> Offset,+) {+ val shader = remember { RuntimeShader(COMB_AGSL) }+ val brush = remember(shader) { ShaderBrush(shader) }+ Canvas(modifier.fillMaxSize()) {+ val o = origin(size)+ shader.setFloatUniform("size", size.width, size.height)+ shader.setFloatUniform("origin", o.x, o.y)+ shader.setFloatUniform("time", time())+ shader.setFloatUniform("cell", cell)+ shader.setFloatUniform("pulse", pulse)+ shader.setFloatUniform("breathPeriod", Tokens.COMB_BREATH_SECONDS)+ shader.setFloatUniform("pulsePeriod", Tokens.COMB_PULSE_SECONDS)+ shader.setFloatUniform("lineColor", line.red, line.green, line.blue, line.alpha)+ shader.setFloatUniform("glowColor", glow.red, glow.green, glow.blue, glow.alpha)+ drawRect(brush)+ }+}++/** Android 12 and older: the comb as one cached path, breathing as a whole. */+@Composable+private fun PathComb(+ modifier: Modifier,+ time: () -> Float,+ pulse: Float,+ cell: Float,+ line: Color,+ glow: Color,+ origin: (androidx.compose.ui.geometry.Size) -> Offset,+) {+ androidx.compose.foundation.layout.Box(+ modifier.fillMaxSize().drawWithCache {+ val path = combPath(size.width, size.height, cell, origin(size))+ val stroke = Stroke(width = 1.2f * density)+ val o = origin(size)+ val glowRadius = 150f * density+ onDrawBehind {+ val breathe = 0.78f + 0.22f * sin(time() * 2f * PI.toFloat() / Tokens.COMB_BREATH_SECONDS) * pulse+ drawPath(path, line.copy(alpha = line.alpha * breathe), style = stroke)+ drawCircle(+ brush = androidx.compose.ui.graphics.Brush.radialGradient(+ listOf(glow.copy(alpha = glow.alpha * 0.32f * breathe), Color.Transparent),+ center = o,+ radius = glowRadius,+ ),+ radius = glowRadius,+ center = o,+ )+ }+ },+ )+}++/** Hexagons of the shader's grid (flat sides left and right), in pixels. */+private fun combPath(width: Float, height: Float, cell: Float, origin: Offset): Path {+ val path = Path()+ val s = sqrt(3f)+ val half = 0.5f * cell+ val top = cell / s+ val side = 0.5f * cell / s+ val rows = (height / (s * cell)).toInt() + 3+ val cols = (width / cell).toInt() + 3+ val startCol = -(origin.x / cell).toInt() - 2+ val startRow = -(origin.y / (s * cell)).toInt() - 2+ for (row in startRow until startRow + rows) {+ for (col in startCol until startCol + cols) {+ for (shift in 0..1) {+ val cx = origin.x + (col + 0.5f * shift) * cell+ val cy = origin.y + (row + 0.5f * shift) * s * cell+ path.moveTo(cx, cy - top)+ path.lineTo(cx + half, cy - side)+ path.lineTo(cx + half, cy + side)+ path.lineTo(cx, cy + top)+ path.lineTo(cx - half, cy + side)+ path.lineTo(cx - half, cy - side)+ path.close()+ }+ }+ }+ return path+}++/** The comb's shader, the same as the Windows app's (desktop/app/shaders/hive.frag). */+private const val COMB_AGSL = """+uniform float2 size;+uniform float2 origin;+uniform float time;+uniform float cell;+uniform float pulse;+uniform float breathPeriod;+uniform float pulsePeriod;+uniform float4 lineColor;+uniform float4 glowColor;++const float2 S = float2(1.0, 1.7320508);++float4 hexCoords(float2 p) {+ float4 c = floor(float4(p, p - float2(0.5, 1.0)) / S.xyxy) + 0.5;+ float4 h = float4(p - c.xy * S, p - (c.zw + 0.5) * S);+ return dot(h.xy, h.xy) < dot(h.zw, h.zw) ? float4(h.xy, c.xy) : float4(h.zw, c.zw + 0.5);+}++float hexDist(float2 p) {+ p = abs(p);+ return max(dot(p, S * 0.5), p.x);+}++float hash(float2 p) {+ return fract(sin(dot(p, float2(127.1, 311.7))) * 43758.5453);+}++half4 main(float2 px) {+ float d = distance(px, origin);+ float far = length(size);++ float4 h = hexCoords((px - origin) / cell);+ float edge = 0.5 - hexDist(h.xy);+ float line = 1.0 - smoothstep(0.0, 1.5 / cell, edge);++ // Carries across the whole screen, fading only a little.+ float falloff = exp(-d / (far * 2.4));+ float breathe = 0.78 + 0.22 * sin(time * 6.2831853 / breathPeriod) * pulse;++ float t = fract(time / pulsePeriod);+ float ring = exp(-pow((d - t * far * 1.05) / (far * 0.06), 2.0)) * (1.0 - t) * pulse;++ float shade = 0.75 + 0.5 * hash(h.zw);++ float lineA = line * falloff * breathe * shade * 1.2 + line * ring * 1.6;+ float fillA = ring * 0.08 * shade;+ float glowA = exp(-d / (far * 0.12)) * breathe * 0.32;++ float3 rgb = lineColor.rgb * lineA * lineColor.a + glowColor.rgb * (glowA + fillA) * glowColor.a;+ float a = clamp(lineA * lineColor.a + (glowA + fillA) * glowColor.a, 0.0, 1.0);+ return half4(half3(rgb), half(a));+}+"""diff --git a/android/app/src/main/kotlin/app/nectarlink/android/ui/theme/Theme.kt b/android/app/src/main/kotlin/app/nectarlink/android/ui/theme/Theme.ktindex e9b57b2..8cdcbcb 100644--- a/android/app/src/main/kotlin/app/nectarlink/android/ui/theme/Theme.kt+++ b/android/app/src/main/kotlin/app/nectarlink/android/ui/theme/Theme.kt@@ -5,7 +5,9 @@ import android.animation.ValueAnimatorimport android.app.Activityimport android.graphics.Color as AndroidColorimport android.os.Build+import androidx.compose.foundation.backgroundimport androidx.compose.foundation.isSystemInDarkTheme+import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.ColorSchemeimport androidx.compose.material3.MaterialTheme@@ -70,6 +72,8 @@ data class Appearance(val dynamicColor: Boolean = true,/** True #000000 OLED black surfaces when in dark mode. */val amoled: Boolean = false,+ /** Hive's comb breathes and pulses (still with reduced motion or battery saver). */+ val combMotion: Boolean = true,)private fun hslTone(hue: Float, sat: Float, lightness: Float): Color {@@ -321,8 +325,15 @@ private fun ColorScheme.toAmoledScheme(glass: Boolean): ColorScheme = copy(outlineVariant = if (glass) Color.White.copy(alpha = 0.12f) else Color(0xFF22252E),)-/** Shapes from the tokens: Glass and Bloom are smoothly rounded, Graphite is crisp and architectural. */-private fun shapes(graphite: Boolean, glass: Boolean) = when {+/** Shapes from the tokens: Glass and Bloom are smoothly rounded, Hive a little firmer, Graphite crisp. */+private fun shapes(graphite: Boolean, glass: Boolean, hive: Boolean) = when {+ hive -> Shapes(+ extraSmall = RoundedCornerShape(6.dp),+ small = RoundedCornerShape(10.dp),+ medium = RoundedCornerShape(14.dp),+ large = RoundedCornerShape(18.dp),+ extraLarge = RoundedCornerShape(24.dp),+ )graphite -> Shapes(extraSmall = RoundedCornerShape(2.dp),small = RoundedCornerShape(3.dp),@@ -365,10 +376,16 @@ fun nectarSwitchColors(): androidx.compose.material3.SwitchColors {}}+/**+ * The app's theme. `backdrop`: this is the app's main window, which draws the+ * theme's background itself (and Hive's comb on it); other screens keep a+ * plain opaque background.+ */@Composablefun NectarlinkTheme(appearance: Appearance = Appearance(),mediaSeedColor: UInt? = null,+ backdrop: Boolean = false,content: @Composable () -> Unit,) {val dark = when (appearance.mode) {@@ -378,16 +395,24 @@ fun NectarlinkTheme(}val graphite = appearance.theme == "graphite"val glass = appearance.theme == "glass"+ // Hive keeps its own honey: no wallpaper, artwork or phone colors.+ val hive = appearance.theme == "hive"val isBlackSwatch = !appearance.dynamicColor && appearance.seed == "black"val amoledActive = dark && appearance.amoled && (graphite || isBlackSwatch)- val error = if (dark) Tokens.errorDark else Tokens.errorLight+ val error = when {+ hive -> if (dark) Tokens.hiveCombError else Tokens.hiveWaxError+ else -> if (dark) Tokens.errorDark else Tokens.errorLight+ }val context = LocalContext.current// The settings alone pick the color source. Artwork applies only when the user turned// "Media artwork color" on; with nothing playing, it falls back to the wallpaper or preset.- val artworkSeed = if (!graphite && appearance.seed == "artwork") mediaSeedColor else null- val wallpaper = !graphite && appearance.dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S+ val artworkSeed = if (!graphite && !hive && appearance.seed == "artwork") mediaSeedColor else null+ val wallpaper = !graphite && !hive && appearance.dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Sval wallpaperSeed = rememberWallpaperSeed(enabled = wallpaper && artworkSeed == null)val baseScheme = when {+ hive -> remember(dark, error) {+ (if (dark) Tokens.hiveComb else Tokens.hiveWax).toScheme(dark, error)+ }graphite -> remember(dark, error) {(if (dark) Tokens.graphiteSlate else Tokens.graphitePaper).toScheme(dark, error)}@@ -402,11 +427,15 @@ fun NectarlinkTheme((if (dark) seed.dark else seed.light).toScheme(dark, error)}}- val targetScheme = remember(baseScheme, glass, dark, amoledActive) {+ val combBehind = hive && backdrop+ val targetScheme = remember(baseScheme, glass, dark, amoledActive, combBehind) {val withGlass = if (glass) baseScheme.toGlassScheme(dark) else baseScheme- if (amoledActive) withGlass.toAmoledScheme(glass) else withGlass+ val withAmoled = if (amoledActive) withGlass.toAmoledScheme(glass) else withGlass+ // Screens let the comb show through; the window paints the surface under it.+ if (combBehind) withAmoled.copy(background = Color.Transparent) else withAmoled}val reducedMotion = rememberReducedMotion()+ val powerSaver = rememberPowerSaver()// System bar icons follow the app's theme, which can differ from the system's.val view = LocalView.current@@ -421,20 +450,34 @@ fun NectarlinkTheme(}val assets = context.assetsval fonts = remember(assets) { AppFonts(assets) }- val currentShapes = remember(graphite, glass) { shapes(graphite, glass) }+ val currentShapes = remember(graphite, glass, hive) { shapes(graphite, glass, hive) }val currentTypography = remember(fonts, graphite) { typography(fonts, graphite) }CompositionLocalProvider(LocalAppFonts provides fonts,LocalReducedMotion provides reducedMotion,LocalGlassTheme provides glass,LocalAmoledTheme provides amoledActive,+ LocalHiveTheme provides hive,) {MaterialTheme(colorScheme = targetScheme,shapes = currentShapes,typography = currentTypography,- content = content,- )+ ) {+ if (combBehind) {+ androidx.compose.foundation.layout.Box(+ androidx.compose.ui.Modifier.fillMaxSize().background(baseScheme.surface),+ ) {+ HiveComb(+ dark = dark,+ animate = appearance.combMotion && !reducedMotion && !powerSaver,+ )+ content()+ }+ } else {+ content()+ }+ }}}diff --git a/android/app/src/main/kotlin/app/nectarlink/android/ui/theme/Tokens.kt b/android/app/src/main/kotlin/app/nectarlink/android/ui/theme/Tokens.ktindex 153b589..c3c8f8a 100644--- a/android/app/src/main/kotlin/app/nectarlink/android/ui/theme/Tokens.kt+++ b/android/app/src/main/kotlin/app/nectarlink/android/ui/theme/Tokens.kt@@ -256,6 +256,57 @@ object Tokens {outlineVariant = Color(0xFF26272A),)+ val hiveWax = Palette(+ primary = Color(0xFF8A5100),+ onPrimary = Color(0xFFFFFFFF),+ primaryContainer = Color(0xFFFFDDB3),+ onPrimaryContainer = Color(0xFF2C1600),+ secondaryContainer = Color(0xFFF4E3CD),+ onSecondaryContainer = Color(0xFF2A1F14),+ surface = Color(0xFFFFF8F3),+ surfaceContainerLow = Color(0xFFFCF2E9),+ surfaceContainer = Color(0xFFF8ECE1),+ surfaceContainerHigh = Color(0xFFF3E5D7),+ surfaceContainerHighest = Color(0xFFEDDDCD),+ onSurface = Color(0xFF1F1B16),+ onSurfaceVariant = Color(0xFF5C4F43),+ outline = Color(0xFF85766A),+ outlineVariant = Color(0xFFDDCBBA),+ )++ val hiveComb = Palette(+ primary = Color(0xFFFFB95F),+ onPrimary = Color(0xFF2C1600),+ primaryContainer = Color(0xFF5A3A0E),+ onPrimaryContainer = Color(0xFFFFDDB3),+ secondaryContainer = Color(0xFF2F2A24),+ onSecondaryContainer = Color(0xFFF0E0CC),+ surface = Color(0xFF121214),+ surfaceContainerLow = Color(0xFF151517),+ surfaceContainer = Color(0xFF1A1A1D),+ surfaceContainerHigh = Color(0xFF212124),+ surfaceContainerHighest = Color(0xFF29292D),+ onSurface = Color(0xFFEDE6DD),+ onSurfaceVariant = Color(0xFFABA195),+ outline = Color(0xFF8D8379),+ outlineVariant = Color(0xFF34312D),+ )++ val hiveWaxWarning = Color(0xFF7A4A00)+ val hiveWaxError = Color(0xFF9E2B25)+ val hiveCombWarning = Color(0xFFF5D58A)+ val hiveCombError = Color(0xFFF0A39C)++ /** The honeycomb backdrop (themes.hive.comb). */+ const val COMB_CELL_DP = 24f+ const val COMB_LINE_ALPHA_DARK = 0.27f+ const val COMB_LINE_ALPHA_LIGHT = 0.11f+ const val COMB_GLOW_ALPHA_DARK = 0.7f+ const val COMB_GLOW_ALPHA_LIGHT = 0.75f+ const val COMB_BREATH_SECONDS = 6f+ const val COMB_PULSE_SECONDS = 4.5f+ const val COMB_FRAME_MS = 33L+val warningLight = Color(0xFF7D5200)val warningDark = Color(0xFFF2C14E)val errorLight = Color(0xFFBA1A1A)diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xmlindex c035a29..8692b93 100644--- a/android/app/src/main/res/values/strings.xml+++ b/android/app/src/main/res/values/strings.xml@@ -205,6 +205,13 @@<string name="battery_guide_pixel">On Pixel: open App info › App battery usage › tap Allow background usage and select Unrestricted.</string><string name="action_manage">Manage</string><string name="action_app_info">App info</string>+ <string name="theme_hive">Hive</string>+ <string name="hive_invite_title">Try Hive, the new theme</string>+ <string name="hive_invite_text">Honey on charcoal or warm wax, with a living honeycomb behind the app. Change it any time in Settings.</string>+ <string name="hive_invite_try">Try Hive</string>+ <string name="hive_invite_dismiss">Not now</string>+ <string name="settings_comb_motion">Animated comb</string>+ <string name="settings_comb_motion_hint">The honeycomb breathes and pulses. It holds still with Remove animations or battery saver on.</string><string name="theme_bloom">Bloom</string><string name="theme_graphite">Graphite</string><string name="mode_system">System</string>diff --git a/desktop/app/build.rs b/desktop/app/build.rsindex 571a836..e69e59f 100644--- a/desktop/app/build.rs+++ b/desktop/app/build.rs@@ -64,7 +64,7 @@ const QML: &[&str] = &["qml/pages/TimelinePage.qml","qml/pages/WalkthroughPage.qml","qml/pages/WelcomePage.qml",- "qml/setup/HiveBackdrop.qml",+ "qml/components/HiveBackdrop.qml","qml/setup/SadBee.qml","qml/setup/SetupButton.qml","qml/setup/SetupWindow.qml",diff --git a/desktop/app/qml/MainWindow.qml b/desktop/app/qml/MainWindow.qmlindex 831f6ef..b7ccb53 100644--- a/desktop/app/qml/MainWindow.qml+++ b/desktop/app/qml/MainWindow.qml@@ -126,7 +126,8 @@ NativeWindow {// through before it's there reveals the bare desktop (a flash), so the// window turns translucent only once the backdrop is in place, and opaque again// before it is removed.- readonly property bool wantBackdrop: (Preferences.backdrop || Theme.glass) && !Theme.amoled+ // Hive keeps its own fixed colors, so it never shows the wallpaper through.+ readonly property bool wantBackdrop: (Preferences.backdrop || Theme.glass) && !Theme.amoled && !Theme.hiveproperty bool micaApplied: falseproperty bool micaVisible: falsebackdrop: micaApplied@@ -186,7 +187,7 @@ NativeWindow {// Window background: a tinted veil of the theme over Mica/Acrylic (so the// theme's seed color is rich and clear), opaque otherwise.- readonly property color windowSurface: Theme.graphite || Theme.amoled+ readonly property color windowSurface: Theme.graphite || Theme.amoled || Theme.hive? Theme.surface: Qt.tint(Theme.surface,@@ -210,6 +211,41 @@ NativeWindow {Behavior on color { ColorAnimation { duration: Theme.fadeNormal } }}+ // Hive: the living comb behind everything, growing from the logo. It+ // holds its frame while the window isn't in front or is minimized.+ HiveBackdrop {+ id: hiveComb+ anchors.fill: parent+ visible: opacity > 0+ opacity: Theme.hive ? 1 : 0+ Behavior on opacity {+ enabled: !Theme.reduceMotion+ NumberAnimation { duration: 420; easing.type: Easing.OutCubic }+ }+ animate: Theme.combMotion+ ownClock: false+ time: Theme.combTime+ cell: Theme.comb.cell+ frameMs: Theme.comb.frameMs+ breathSeconds: Theme.comb.breathSeconds+ pulseSeconds: Theme.comb.pulseSeconds+ lineColor: Theme.combLine+ glowColor: Theme.combGlow+ // The center of the logo mark in the rail; the comb and its pulses+ // carry across the whole window.+ origin: Qt.point(Theme.railWidth / 2, Theme.topBarHeight / 2)+ reach: 2.4+ pulseReach: 1.05+ }++ // The comb's clock runs while this window is in front and showing Hive.+ Binding {+ target: Theme+ property: "combClockRunning"+ value: window.active && window.visible+ && window.visibility !== Window.Minimized && window.visibility !== Window.Hidden+ }+// Dynamic native GPU-blurred ambient layer when "Glass" theme mode is active.Item {id: artworkAmbient@@ -611,7 +647,10 @@ NativeWindow {width: parent.widthclip: truetopLeftRadius: 18- color: Theme.amoled+ // Hive: lets the comb show faintly through, under opaque cards.+ color: Theme.hive+ ? Qt.rgba(Theme.surfaceContainerLow.r, Theme.surfaceContainerLow.g, Theme.surfaceContainerLow.b, Theme.dark ? 0.50 : 0.58)+ : Theme.amoled? "#07080C": (Theme.glass? Qt.rgba(Theme.surfaceContainerLow.r, Theme.surfaceContainerLow.g, Theme.surfaceContainerLow.b, Theme.dark ? 0.34 : 0.46)diff --git a/desktop/app/qml/Theme.qml b/desktop/app/qml/Theme.qmlindex 926f35b..d5be6e0 100644--- a/desktop/app/qml/Theme.qml+++ b/desktop/app/qml/Theme.qml@@ -3,13 +3,15 @@ pragma Singletonimport QtQuickimport app.nectarlink-// The active theme: Bloom (Material You, seed presets) or Graphite (paper and-// slate), light or dark, resolved from Preferences and the system. Colors+// The active theme: Bloom (Material You, seed presets, the default), Hive+// (honey on charcoal or wax), Glass, or Graphite (paper and slate), light+// or dark, resolved from Preferences and the system. Colors// come from Tokens (generated from docs/design/tokens.json); Material's// "onX" roles are named "xContent" because QML reserves the "on" prefix.QtObject {id: theme+ readonly property bool hive: Preferences.theme === "hive"readonly property bool graphite: Preferences.theme === "graphite"readonly property bool glass: Preferences.theme === "glass" || Preferences.theme === "blurry"readonly property bool dark: Preferences.colorMode === "dark"@@ -17,6 +19,37 @@ QtObject {readonly property bool amoled: dark && Preferences.amoled && (graphite || Preferences.seed === "black")readonly property bool reduceMotion: AppController.reduceMotion+ // ---- Hive's comb ----+ readonly property var comb: Tokens.data.themes.hive.comb+ // Breathes and pulses: the user's setting, never with reduced motion or+ // battery saver (it holds still then).+ readonly property bool combMotion: hive && Preferences.combMotion && !reduceMotion && !AppController.powerSaver+ readonly property color combLine: Qt.rgba(primary.r, primary.g, primary.b,+ dark ? comb.lineAlphaDark : comb.lineAlphaLight)+ readonly property color combGlow: dark ? Qt.rgba(1.0, 0.62, 0.18, comb.glowAlphaDark)+ : Qt.rgba(1.0, 0.72, 0.37, comb.glowAlphaLight)+ // One clock for every comb in the app (seconds), so two combs never draw+ // twice as often. The main window runs it while it's in front.+ property real combTime: 0+ property bool combClockRunning: false+ // A comb is on screen outside Hive (the invitation to try it).+ property bool combPreviewShown: false+ property double _combSince: 0+ property real _combBase: 0+ readonly property Timer _combClock: Timer {+ interval: theme.comb.frameMs+ repeat: true+ running: theme.combClockRunning+ && (theme.combMotion || (theme.combPreviewShown && !theme.reduceMotion && !AppController.powerSaver))+ onRunningChanged: {+ if (running)+ theme._combSince = Date.now()+ else+ theme._combBase = theme.combTime+ }+ onTriggered: theme.combTime = theme._combBase + (Date.now() - theme._combSince) / 1000+ }+readonly property var bloomSeeds: Tokens.data.themes.bloom.seeds// Colors made from the desktop wallpaper (or null until they're known),// in the shape of a preset seed.@@ -77,10 +110,12 @@ QtObject {: (seed === "phone" || seed.startsWith("phone:"))? activePhoneSeed: (seed === "wallpaper" ? wallpaperSeed : bloomSeeds[seed])- readonly property var palette: graphite- ? Tokens.data.themes.graphite.variants[dark ? "slate" : "paper"]- : seedColors[dark ? "dark" : "light"]- readonly property var status: graphite ? palette : Tokens.data.themes.bloom.status[dark ? "dark" : "light"]+ readonly property var palette: hive+ ? Tokens.data.themes.hive.variants[dark ? "comb" : "wax"]+ : (graphite+ ? Tokens.data.themes.graphite.variants[dark ? "slate" : "paper"]+ : seedColors[dark ? "dark" : "light"])+ readonly property var status: graphite || hive ? palette : Tokens.data.themes.bloom.status[dark ? "dark" : "light"]// ---- Color roles ----readonly property color primary: palette.primary@@ -106,7 +141,14 @@ QtObject {readonly property color errorContent: status.onError// ---- Component colors (docs/design/assets/nl.css) ----- readonly property color cardColor: graphite ? "transparent"+ // Hive: nearly opaque, so the comb shows through as texture without+ // ever crossing text.+ readonly property color cardColor: hive+ ? (function() {+ const c = Qt.tint(surfaceContainer, Qt.rgba(primaryContainer.r, primaryContainer.g, primaryContainer.b, dark ? 0.12 : 0.18))+ return Qt.rgba(c.r, c.g, c.b, dark ? 0.90 : 0.92)+ })()+ : graphite ? "transparent": (glass? Qt.tint(Qt.rgba(surfaceContainer.r, surfaceContainer.g, surfaceContainer.b, amoled ? 0.56 : (dark ? 0.36 : 0.52)),@@ -120,13 +162,18 @@ QtObject {surfaceContainer,Qt.rgba(primaryContainer.r, primaryContainer.g, primaryContainer.b, isPhoneSeed ? (dark ? 0.28 : 0.36) : (dark ? 0.16 : 0.22))))))- readonly property color cardBorder: graphite ? outlineVariant+ // Hive: a faint honey edge, like wax around a cell.+ readonly property color cardBorder: hive+ ? Qt.rgba(primary.r, primary.g, primary.b, dark ? 0.14 : 0.16)+ : graphite ? outlineVariant: (glass? (dark ? Qt.rgba(1, 1, 1, 0.08) : Qt.rgba(1, 1, 1, 0.28)): (artworkAmbientActive? Qt.rgba(outlineVariant.r, outlineVariant.g, outlineVariant.b, dark ? 0.36 : 0.45): (amoled ? "#1D1F27" : "transparent")))- readonly property color tileColor: graphite ? "transparent"+ readonly property color tileColor: hive+ ? Qt.tint(surfaceContainerHigh, Qt.rgba(primaryContainer.r, primaryContainer.g, primaryContainer.b, dark ? 0.14 : 0.20))+ : graphite ? "transparent": (glass? Qt.tint(Qt.rgba(1, 1, 1, dark ? 0.08 : 0.48),@@ -140,7 +187,9 @@ QtObject {surfaceContainerHigh,Qt.rgba(primaryContainer.r, primaryContainer.g, primaryContainer.b, isPhoneSeed ? (dark ? 0.32 : 0.42) : (dark ? 0.18 : 0.24))))))- readonly property color heroColor: graphite ? "transparent"+ readonly property color heroColor: hive+ ? Qt.tint(surface, Qt.rgba(primaryContainer.r, primaryContainer.g, primaryContainer.b, dark ? 0.55 : 0.62))+ : graphite ? "transparent": Qt.tint(ambientBlurActive? Qt.rgba(surface.r, surface.g, surface.b, glass ? (amoled ? 0.54 : (dark ? 0.34 : 0.48)) : (dark ? 0.65 : 0.72))@@ -148,7 +197,8 @@ QtObject {Qt.rgba(primaryContainer.r, primaryContainer.g, primaryContainer.b, glass ? (dark ? 0.30 : 0.38) : (artworkAmbientActive ? 0.52 : (amoled ? 0.32 : 0.68))))readonly property color heroContent: graphite ? surfaceContent : primaryContainerContent- readonly property color railColor: graphite ? "transparent"+ // Hive's rail is the comb itself.+ readonly property color railColor: graphite || hive ? "transparent": (glass? Qt.rgba(surfaceLow.r, surfaceLow.g, surfaceLow.b, amoled ? 0.48 : (dark ? 0.28 : 0.42)): (artworkAmbientActive@@ -159,13 +209,16 @@ QtObject {surfaceLow,Qt.rgba(primaryContainer.r, primaryContainer.g, primaryContainer.b, isPhoneSeed ? (dark ? 0.24 : 0.32) : (dark ? 0.14 : 0.18))))))- readonly property color indicator: graphite ? surfaceContent : secondaryContainer- readonly property color indicatorContent: graphite ? surface : secondaryContainerContent+ readonly property color indicator: graphite ? surfaceContent : (hive ? primaryContainer : secondaryContainer)+ readonly property color indicatorContent: graphite ? surface : (hive ? primaryContainerContent : secondaryContainerContent)+ // Hive: the honey halo around a primary control on hover.+ readonly property color glow: Qt.rgba(primary.r, primary.g, primary.b, dark ? 0.30 : 0.22)readonly property color buttonShadow: graphite ? palette.buttonShadow : "transparent"readonly property color scrim: Qt.rgba(0, 0, 0, dark ? 0.5 : 0.32)// ---- Shape ----- readonly property var shape: graphite ? Tokens.data.themes.graphite.shape : Tokens.data.themes.bloom.shape+ readonly property var shape: graphite ? Tokens.data.themes.graphite.shape+ : (hive ? Tokens.data.themes.hive.shape : Tokens.data.themes.bloom.shape)readonly property int radiusXs: shape.xsreadonly property int radiusSm: shape.smreadonly property int radiusMd: shape.md@@ -180,7 +233,8 @@ QtObject {readonly property string fontDisplay: graphite ? "Instrument Serif" : "Figtree"readonly property string fontMono: "Space Mono"readonly property var typography: Tokens.data.typography- readonly property var labelStyle: graphite ? Tokens.data.themes.graphite.label : Tokens.data.themes.bloom.label+ readonly property var labelStyle: graphite ? Tokens.data.themes.graphite.label+ : (hive ? Tokens.data.themes.hive.label : Tokens.data.themes.bloom.label)// ---- Layout and spacing ----readonly property var layout: Tokens.data.layout.desktopdiff --git a/desktop/app/qml/Tokens.qml b/desktop/app/qml/Tokens.qmlindex 57a4f25..04e1127 100644--- a/desktop/app/qml/Tokens.qml+++ b/desktop/app/qml/Tokens.qml@@ -393,6 +393,90 @@ QtObject {"warning": "#E2C47A"}}+ },+ "hive": {+ "comb": {+ "breathSeconds": 6.0,+ "cell": 24,+ "frameMs": 33,+ "glowAlphaDark": 0.7,+ "glowAlphaLight": 0.75,+ "lineAlphaDark": 0.27,+ "lineAlphaLight": 0.11,+ "pulseSeconds": 4.5+ },+ "description": "Honey on charcoal (Comb, dark) and on warm wax (Wax, light), with a living honeycomb behind the app that grows from the logo, breathes and pulses. Colors are fixed: no wallpaper, artwork or phone colors.",+ "dynamicColor": false,+ "fonts": {+ "display": "Figtree",+ "label": "Figtree",+ "mono": "Space Mono",+ "ui": "Figtree"+ },+ "label": {+ "case": "none",+ "size": 12.5,+ "tracking": 0,+ "weight": 600+ },+ "rules": [+ "The installer and uninstaller always use Hive. In the apps it's a choice, offered by a card on Home that returns after an update or a reinstall once dismissed.",+ "The comb holds still with reduced motion, in battery or energy saver, when Animated comb is off, and while the window isn't in front.",+ "The comb is drawn by one shader behind everything; cards stay opaque so text never sits on moving lines.",+ "Primary buttons are honey with a soft honey glow on hover; outlines and focus rings use honey at low alpha."+ ],+ "shape": {+ "full": 999,+ "lg": 18,+ "md": 14,+ "sm": 10,+ "xl": 24,+ "xs": 6+ },+ "variants": {+ "comb": {+ "error": "#F0A39C",+ "onError": "#3B0B07",+ "onPrimary": "#2C1600",+ "onPrimaryContainer": "#FFDDB3",+ "onSecondaryContainer": "#F0E0CC",+ "onSurface": "#EDE6DD",+ "onSurfaceVariant": "#ABA195",+ "outline": "#8D8379",+ "outlineVariant": "#34312D",+ "primary": "#FFB95F",+ "primaryContainer": "#5A3A0E",+ "secondaryContainer": "#2F2A24",+ "success": "#FFB95F",+ "surface": "#121214",+ "surfaceContainer": "#1A1A1D",+ "surfaceContainerHigh": "#212124",+ "surfaceContainerHighest": "#29292D",+ "surfaceContainerLow": "#151517",+ "warning": "#F5D58A"+ },+ "wax": {+ "error": "#9E2B25",+ "onError": "#FFFFFF",+ "onPrimary": "#FFFFFF",+ "onPrimaryContainer": "#2C1600",+ "onSecondaryContainer": "#2A1F14",+ "onSurface": "#1F1B16",+ "onSurfaceVariant": "#5C4F43",+ "outline": "#85766A",+ "outlineVariant": "#DDCBBA",+ "primary": "#8A5100",+ "primaryContainer": "#FFDDB3",+ "secondaryContainer": "#F4E3CD",+ "success": "#8A5100",+ "surface": "#FFF8F3",+ "surfaceContainer": "#F8ECE1",+ "surfaceContainerHigh": "#F3E5D7",+ "surfaceContainerHighest": "#EDDDCD",+ "surfaceContainerLow": "#FCF2E9",+ "warning": "#7A4A00"+ }+ }}},"typography": {diff --git a/desktop/app/qml/components/Button.qml b/desktop/app/qml/components/Button.qmlindex 02eaa26..f00a5a7 100644--- a/desktop/app/qml/components/Button.qml+++ b/desktop/app/qml/components/Button.qml@@ -54,6 +54,18 @@ FocusScope {}}+ // Hive: a soft honey halo around a filled button under the pointer.+ Rectangle {+ visible: Theme.hive && button.variant === "fill"+ x: -4; y: -4+ width: parent.width + 8; height: parent.height + 8+ radius: body.radius + 4+ color: Theme.glow+ opacity: button.interactive && (mouse.containsMouse || Theme.focusVisible(button)) ? 1 : 0+ scale: body.scale+ Behavior on opacity { enabled: !Theme.reduceMotion; NumberAnimation { duration: 180; easing.type: Easing.OutCubic } }+ }+// Graphite's flat offset shadow under filled buttons.Rectangle {visible: Theme.graphite && button.variant === "fill"@@ -72,11 +84,23 @@ FocusScope {Behavior on color { enabled: !Theme.reduceMotion; ColorAnimation { duration: Theme.fadeFast } }border.width: button.variant === "outline" || (Theme.glass && (button.variant === "tonal" || button.variant === "fill")) ? 1 : 0border.color: button.variant === "outline"- ? (Theme.glass ? Qt.rgba(1, 1, 1, Theme.dark ? 0.14 : 0.38) : Theme.outline)+ ? (Theme.glass ? Qt.rgba(1, 1, 1, Theme.dark ? 0.14 : 0.38)+ : (Theme.hive ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, Theme.dark ? 0.42 : 0.38) : Theme.outline)): Qt.rgba(1, 1, 1, Theme.dark ? 0.10 : 0.32)scale: mouse.pressed && button.interactive ? Theme.pressScale : 1Behavior on scale { enabled: !Theme.reduceMotion; NumberAnimation { duration: 120; easing.type: Easing.OutCubic } }+ // Hive: honey catches the light along the top of a filled button.+ Rectangle {+ visible: Theme.hive && button.variant === "fill"+ anchors.fill: parent+ radius: parent.radius+ gradient: Gradient {+ GradientStop { position: 0.0; color: Qt.rgba(1, 1, 1, Theme.dark ? 0.22 : 0.16) }+ GradientStop { position: 0.55; color: Qt.rgba(1, 1, 1, 0) }+ }+ }+// Hover & Press state layer.Rectangle {anchors.fill: parentdiff --git a/desktop/app/qml/components/Card.qml b/desktop/app/qml/components/Card.qmlindex adcc87f..fb8d127 100644--- a/desktop/app/qml/components/Card.qml+++ b/desktop/app/qml/components/Card.qml@@ -2,7 +2,8 @@import QtQuickimport app.nectarlink-// A content surface: filled in Bloom, frosted optical glass in Glass, hairline-bordered in Graphite.+// A content surface: filled in Bloom, honey-edged in Hive, frosted optical glass in Glass,+// hairline-bordered in Graphite.Rectangle {id: cardRootproperty int padding: 16@@ -11,7 +12,7 @@ Rectangle {radius: Theme.radiusLgcolor: Theme.cardColor// Glass draws its own lit rim (GlassRim) instead of a flat hairline.- border.width: (Theme.graphite || Theme.ambientBlurActive || Theme.amoled) && !Theme.glass ? 1 : 0+ border.width: (Theme.graphite || Theme.hive || Theme.ambientBlurActive || Theme.amoled) && !Theme.glass ? 1 : 0border.color: Theme.cardBorderimplicitHeight: inner.childrenRect.height + padding * 2Behavior on color { ColorAnimation { duration: Theme.fadeNormal } }diff --git a/desktop/app/qml/components/HiveBackdrop.qml b/desktop/app/qml/components/HiveBackdrop.qmlnew file mode 100644index 0000000..756d62f--- /dev/null+++ b/desktop/app/qml/components/HiveBackdrop.qml@@ -0,0 +1,85 @@+// SPDX-License-Identifier: GPL-3.0-or-later+import QtQuick++// The Hive theme's living honeycomb (shaders/hive.frag), behind the setup+// window and, in the Hive theme, the whole app: it grows out of `origin`,+// breathes slowly, and sends a soft pulse of light outward every few seconds.+//+// Light on resources: one fragment shader and no textures. Its clock ticks+// every `frameMs` (about 30 frames a second; the motion is slow enough that+// more looks the same). In the app every comb shares Theme's clock, so two+// combs never draw twice as often; the setup window runs its own. `paused`+// holds the current frame; `animate` false draws a still comb with no+// breathing or pulses (reduced motion, battery saver, the user's setting).+ShaderEffect {+ id: hive++ // Breathing and pulses (false: a still comb).+ property bool animate: true+ // Hold the current frame (its own clock only).+ property bool paused: false+ // Keep time itself (setup), rather than following `time` set by the app.+ property bool ownClock: true+ // Grows out from the origin when it first appears (when it animates).+ property bool growIn: true+ property real cell: 24+ property real strength: 1+ property color lineColor+ property color glowColor+ property point origin: Qt.point(width / 2, height / 3)+ property int frameMs: 33+ property real breathSeconds: 6.0+ property real pulseSeconds: 4.5+ // Rounded-rectangle mask radius (0: none), for the phone preview.+ property real corner: 0+ // How far the comb carries before it fades (a fraction of the diagonal;+ // larger spreads it evenly), and how far each pulse travels.+ property real reach: 0.62+ property real pulseReach: 0.75++ readonly property size itemSize: Qt.size(width, height)+ readonly property real pulse: animate ? 1 : 0+ readonly property real breathPeriod: breathSeconds+ readonly property real pulsePeriod: pulseSeconds+ property real time: 0+ // 0 to 1 as it grows out; the shader gets it in pixels.+ property real grow: 1+ readonly property real reveal: grow * Math.hypot(width, height)++ blending: true+ fragmentShader: "qrc:/shaders/hive.frag.qsb"++ // Its own clock: seconds carried across pauses, so it picks up where it+ // stopped rather than jumping.+ property real _base: 0+ property double _since: 0+ Timer {+ interval: hive.frameMs+ repeat: true+ running: hive.ownClock && hive.animate && !hive.paused && hive.visible && hive.width > 0+ onRunningChanged: {+ if (running)+ hive._since = Date.now()+ else+ hive._base = hive.time+ }+ onTriggered: hive.time = hive._base + (Date.now() - hive._since) / 1000+ }++ // Grows out once, when it first appears; never again after that.+ NumberAnimation {+ id: growAnimation+ target: hive+ property: "grow"+ from: 0+ to: 1+ duration: 1800+ easing.type: Easing.OutCubic+ }+ Component.onCompleted: {+ if (growIn && animate) {+ grow = 0+ growAnimation.start()+ }+ }+}diff --git a/desktop/app/qml/components/Segmented.qml b/desktop/app/qml/components/Segmented.qmlindex 650f074..298a959 100644--- a/desktop/app/qml/components/Segmented.qml+++ b/desktop/app/qml/components/Segmented.qml@@ -46,7 +46,7 @@ Rectangle {? Theme.surfaceContent: (Theme.glass? Qt.tint(Qt.rgba(1, 1, 1, Theme.dark ? 0.16 : 0.78), Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, Theme.dark ? 0.24 : 0.14))- : Theme.surface)+ : (Theme.hive ? Theme.primaryContainer : Theme.surface))border.width: Theme.glass ? 1 : 0border.color: Qt.rgba(1, 1, 1, Theme.dark ? 0.28 : 0.85)Behavior on x {@@ -109,7 +109,7 @@ Rectangle {text: option.modelData.labelrole: "label"color: option.selected- ? (Theme.graphite ? Theme.surface : Theme.surfaceContent)+ ? (Theme.graphite ? Theme.surface : (Theme.hive ? Theme.primaryContainerContent : Theme.surfaceContent)): (segMouse.containsMouse ? Theme.surfaceContent : Theme.surfaceContentVariant)Behavior on color { enabled: !Theme.reduceMotion; ColorAnimation { duration: Theme.fadeFast } }}diff --git a/desktop/app/qml/components/Toggle.qml b/desktop/app/qml/components/Toggle.qmlindex f4bad92..f505d0a 100644--- a/desktop/app/qml/components/Toggle.qml+++ b/desktop/app/qml/components/Toggle.qml@@ -27,6 +27,17 @@ FocusScope {}}+ // Hive: a soft honey halo around a switch that's on.+ Rectangle {+ visible: Theme.hive+ anchors.fill: track+ anchors.margins: -3+ radius: track.radius + 3+ color: Theme.glow+ opacity: toggle.checked ? (mouse.containsMouse ? 1 : 0.55) : 0+ Behavior on opacity { enabled: !Theme.reduceMotion; NumberAnimation { duration: 180; easing.type: Easing.OutCubic } }+ }+Rectangle {id: trackanchors.fill: parentdiff --git a/desktop/app/qml/pages/HomePage.qml b/desktop/app/qml/pages/HomePage.qmlindex 9683623..b0516bf 100644--- a/desktop/app/qml/pages/HomePage.qml+++ b/desktop/app/qml/pages/HomePage.qml@@ -268,6 +268,98 @@ Item {}}+ // A one-time invitation to try Hive, after the What's new card.+ Card {+ id: hiveInvite+ width: column.width+ visible: Preferences.walkthroughCompleted && Preferences.whatsNewDismissed+ && !Preferences.hiveInviteDismissed && !Theme.hive+ padding: 14+ Binding {+ target: Theme+ property: "combPreviewShown"+ value: hiveInvite.visible+ }+ Item {+ width: parent.width+ height: Math.max(hiveSample.height, hiveInviteText.implicitHeight, hiveInviteButtons.implicitHeight)++ // A small window onto the comb, in Hive's own colors.+ Rectangle {+ id: hiveSample+ anchors.verticalCenter: parent.verticalCenter+ width: 56; height: 56+ radius: 14+ color: Theme.dark ? "#121214" : "#FFF8F3"+ border.width: 1+ border.color: Theme.dark ? Qt.rgba(1.0, 0.73, 0.37, 0.24) : Qt.rgba(0.54, 0.32, 0.0, 0.20)+ HiveBackdrop {+ anchors.fill: parent+ corner: parent.radius+ ownClock: false+ growIn: false+ time: Theme.combTime+ animate: !Theme.reduceMotion && !AppController.powerSaver+ cell: 9+ lineColor: Theme.dark ? Qt.rgba(1.0, 0.73, 0.37, 0.28) : Qt.rgba(0.54, 0.32, 0.0, 0.16)+ glowColor: Theme.dark ? Qt.rgba(1.0, 0.62, 0.18, 0.70) : Qt.rgba(1.0, 0.72, 0.37, 0.75)+ origin: Qt.point(width / 2, height / 2)+ }+ Icon {+ anchors.centerIn: parent+ width: 22; height: 22+ path: Icons.mark+ stroke: 2.2+ color: Theme.dark ? "#FFB95F" : "#8A5100"+ }+ }+ Column {+ id: hiveInviteText+ anchors.left: hiveSample.right+ anchors.leftMargin: 14+ anchors.right: hiveInviteButtons.left+ anchors.rightMargin: 16+ anchors.verticalCenter: parent.verticalCenter+ spacing: 4+ Txt {+ width: parent.width+ role: "title"+ text: qsTr("Try Hive, the new theme")+ wrapMode: Text.WordWrap+ }+ Txt {+ width: parent.width+ role: "bodySmall"+ muted: true+ text: qsTr("Honey on charcoal or warm wax, with a living honeycomb behind the app. Change it any time in Settings › Appearance.")+ wrapMode: Text.WordWrap+ }+ }+ Row {+ id: hiveInviteButtons+ anchors.right: parent.right+ anchors.verticalCenter: parent.verticalCenter+ spacing: 8+ Button {+ variant: "text"+ size: "sm"+ text: qsTr("Not now")+ onClicked: Preferences.hiveInviteDismissed = true+ }+ Button {+ variant: "tonal"+ size: "sm"+ iconPath: Icons.sparkle+ text: qsTr("Try Hive")+ onClicked: {+ Preferences.hiveInviteDismissed = true+ Preferences.theme = "hive"+ }+ }+ }+ }+ }+// Card shown when no phone is paired yet (for example after skipping first-run setup).Card {width: column.width@@ -616,22 +708,33 @@ Item {readonly property real rBl: home.screenData && home.screenData.corners? Math.max(3, home.screenData.corners.bl * width) : defaultCornerreadonly property var phonePalette: Theme.phonePalette(home.deviceId)- readonly property color seedColor: phonePalette+ // Hive keeps its own honey here too, whatever the phone's colors.+ readonly property color seedColor: Theme.hive+ ? Theme.primary+ : phonePalette? Qt.color(phonePalette.primary): (home.accent && home.accent.length > 0 ? Qt.color(home.accent) : Theme.primary)- readonly property color frameFill: Theme.graphite+ readonly property color frameFill: Theme.hive+ ? (Theme.dark ? "#0E0E10" : "#2A2420")+ : Theme.graphite? (Theme.dark ? "#1B1D21" : "#282B30"): Qt.darker(seedColor, Theme.dark ? 2.8 : 2.3)readonly property color frameStroke: Theme.graphite? Theme.outline: Qt.rgba(Theme.heroContent.r, Theme.heroContent.g, Theme.heroContent.b, 0.42)- readonly property color screenTop: Theme.graphite+ readonly property color screenTop: Theme.hive+ ? (Theme.dark ? "#3A2709" : "#FFE2BC")+ : Theme.graphite? (Theme.dark ? "#262930" : "#E4E7EC"): (Theme.dark ? Qt.darker(seedColor, 1.85) : Qt.lighter(seedColor, 1.35))- readonly property color screenBottom: Theme.graphite+ readonly property color screenBottom: Theme.hive+ ? (Theme.dark ? "#141210" : "#F1C27F")+ : Theme.graphite? (Theme.dark ? "#17191D" : "#CFD4DC"): (Theme.dark ? Qt.darker(seedColor, 2.55) : Qt.darker(seedColor, 1.25))- readonly property color screenInk: Theme.graphite && !Theme.dark ? "#1E2025" : "#FFFFFF"+ readonly property color screenInk: Theme.hive+ ? (Theme.dark ? "#FFDDB3" : "#2C1600")+ : (Theme.graphite && !Theme.dark ? "#1E2025" : "#FFFFFF")readonly property string cutoutSvg: {const s = home.screenDataif (!s) return ""@@ -703,11 +806,39 @@ Item {}}- // 3. Measured front camera cutout (SVG path or bounding rects; empty when plain/unknown).+ }++ // Hive: the comb on the phone's screen, in step with the app's.+ HiveBackdrop {+ visible: Theme.hive+ x: phoneArt.bezel+ y: phoneArt.bezel+ width: phoneArt.innerW+ height: phoneArt.innerH+ corner: Math.max(2, Math.min(phoneArt.rTl, phoneArt.rTr) - phoneArt.bezel)+ ownClock: false+ growIn: false+ time: Theme.combTime+ animate: Theme.combMotion+ cell: 7+ strength: home.online ? 1 : 0.6+ frameMs: Theme.comb.frameMs+ breathSeconds: Theme.comb.breathSeconds+ pulseSeconds: Theme.comb.pulseSeconds+ lineColor: Theme.dark ? Qt.rgba(1.0, 0.73, 0.37, 0.26) : Qt.rgba(0.54, 0.32, 0.0, 0.16)+ glowColor: Theme.combGlow+ origin: Qt.point(width / 2, height * 0.42)+ }++ // 3. Measured front camera cutout (SVG path or bounding rects; empty when plain/unknown).+ Shape {+ anchors.fill: parent+ visible: phoneArt.cutoutSvg.length > 0+ preferredRendererType: Shape.CurveRendererShapePath {- strokeWidth: phoneArt.cutoutSvg.length > 0 ? 0.8 : -1+ strokeWidth: 0.8strokeColor: Qt.rgba(1, 1, 1, Theme.dark ? 0.16 : 0.22)- fillColor: phoneArt.cutoutSvg.length > 0 ? phoneArt.frameFill : "transparent"+ fillColor: phoneArt.frameFillPathSvg { path: phoneArt.cutoutSvg }}}diff --git a/desktop/app/qml/pages/SettingsPage.qml b/desktop/app/qml/pages/SettingsPage.qmlindex 8b8f30a..0017fd4 100644--- a/desktop/app/qml/pages/SettingsPage.qml+++ b/desktop/app/qml/pages/SettingsPage.qml@@ -512,11 +512,12 @@ Item {title: qsTr("Theme")Segmented {options: [+ { value: "hive", label: qsTr("Hive") },{ value: "bloom", label: qsTr("Bloom") },{ value: "glass", label: qsTr("Glass") },{ value: "graphite", label: qsTr("Graphite") }]- value: Theme.glass ? "glass" : Preferences.theme+ value: Theme.hive ? "hive" : (Theme.glass ? "glass" : Preferences.theme)onPicked: (value) => Preferences.theme = value}}@@ -535,11 +536,12 @@ Item {onPicked: (value) => Preferences.colorMode = value}}- Divider { width: parent.width; visible: !Theme.graphite }+ // Hive's colors are fixed: no seed to pick.+ Divider { width: parent.width; visible: !Theme.graphite && !Theme.hive }ListRow {id: colorRowwidth: parent.width- visible: !Theme.graphite+ visible: !Theme.graphite && !Theme.hivestackBelow: trueiconPath: Icons.colorSwatchtitle: qsTr("Color")@@ -781,9 +783,28 @@ Item {}Divider { width: parent.width }+ // Hive: the comb's motion instead of Mica (Hive keeps its own colors).+ ListRow {+ width: parent.width+ visible: Theme.hive+ iconPath: Icons.sparkle+ title: qsTr("Animated comb")+ description: AppController.reduceMotion+ ? qsTr("Still while animations are off in Windows.")+ : (AppController.powerSaver+ ? qsTr("Still while energy saver is on.")+ : qsTr("The honeycomb breathes and pulses."))+ Toggle {+ label: qsTr("Animated comb")+ checked: Preferences.combMotion+ onToggled: (on) => Preferences.combMotion = on+ }+ }+// Side-by-side when Graphite Dark shows Pure Black + Mica backdropItem {id: appearanceBottomPair+ visible: !Theme.hivewidth: parent.widthreadonly property bool showGraphiteAmoled: Theme.graphite && Theme.darkreadonly property bool splitCols: showGraphiteAmoled && width >= 460diff --git a/desktop/app/qml/setup/HiveBackdrop.qml b/desktop/app/qml/setup/HiveBackdrop.qmldeleted file mode 100644index 2988063..0000000--- a/desktop/app/qml/setup/HiveBackdrop.qml+++ /dev/null@@ -1,43 +0,0 @@-// SPDX-License-Identifier: GPL-3.0-or-later-import QtQuick--// The setup window's backdrop: a honeycomb growing out of `origin`, breathing-// slowly, with a soft pulse of light every few seconds (shaders/hive.frag).-// Still, and fully grown, when animations are turned off in Windows.-ShaderEffect {- id: hive-- property bool animate: true- property real cell: 24- property real strength: 1- property color lineColor- property color glowColor- property point origin: Qt.point(width / 2, height / 3)-- readonly property size itemSize: Qt.size(width, height)- readonly property real pulse: animate ? 1 : 0- property real time: 0- // 0 to 1 as it grows out; the shader gets it in pixels.- property real grow: animate ? 0 : 1- readonly property real reveal: grow * Math.hypot(width, height)-- blending: true- fragmentShader: "qrc:/shaders/hive.frag.qsb"-- NumberAnimation on time {- running: hive.animate && hive.visible- from: 0- to: 3600- duration: 3600 * 1000- loops: Animation.Infinite- }-- // Grows out once, when the window opens.- NumberAnimation on grow {- running: hive.animate- from: 0- to: 1- duration: 1800- easing.type: Easing.OutCubic- }-}diff --git a/desktop/app/shaders/hive.frag b/desktop/app/shaders/hive.fragindex 63d62d8..2928a92 100644--- a/desktop/app/shaders/hive.frag+++ b/desktop/app/shaders/hive.frag@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-3.0-or-later-// The installer's backdrop: a honeycomb that grows outward from the logo,-// breathes slowly, and sends a soft pulse of light outward every few seconds.+// The Hive theme's backdrop (and the installer's): a honeycomb that grows+// outward from the logo, breathes slowly, and sends a soft pulse of light+// outward every few seconds.// Samples no textures. Output is premultiplied.//// Compiled to hive.frag.qsb with Qt's qsb (see shaders.qrc).@@ -19,6 +20,11 @@ layout(std140, binding = 0) uniform buf {float cell; // hexagon size, in pixelsfloat pulse; // 0: still (reduced motion), 1: pulsingfloat strength; // overall intensity+ float breathPeriod; // seconds per breath+ float pulsePeriod; // seconds between pulses+ float corner; // rounded-rectangle mask radius in pixels (0: none)+ float reach; // how far the comb carries (fraction of the diagonal)+ float pulseReach; // how far a pulse travels (fraction of the diagonal)vec4 lineColor;vec4 glowColor;};@@ -55,15 +61,14 @@ void main() {// Grows from the logo; the front is soft.float grown = 1.0 - smoothstep(reveal - 90.0, reveal, d);// Fades towards the corners so the content stays calm.- float falloff = exp(-d / (far * 0.62));+ float falloff = exp(-d / (far * reach));// Breathing: a slow rise and fall of the whole comb.- float breathe = 0.78 + 0.22 * sin(time * 6.2831853 / 6.0) * pulse;+ float breathe = 0.78 + 0.22 * sin(time * 6.2831853 / breathPeriod) * pulse;- // A pulse of light travelling outward every 4.5 seconds.- float period = 4.5;- float t = fract(time / period);- float ringRadius = t * far * 0.75;+ // A pulse of light travelling outward every few seconds.+ float t = fract(time / pulsePeriod);+ float ringRadius = t * far * pulseReach;float ring = exp(-pow((d - ringRadius) / 70.0, 2.0)) * (1.0 - t) * pulse;// A little variation from cell to cell, like light on real comb.@@ -75,6 +80,14 @@ void main() {vec3 rgb = lineColor.rgb * lineA * lineColor.a + glowColor.rgb * (glowA + fillA) * glowColor.a;float a = clamp(lineA * lineColor.a + (glowA + fillA) * glowColor.a, 0.0, 1.0);- float k = strength * qt_Opacity;+ // Inside a rounded rectangle when asked (the phone preview's screen).+ float inside = 1.0;+ if (corner > 0.0) {+ vec2 q = abs(px - itemSize * 0.5) - (itemSize * 0.5 - vec2(corner));+ float sd = length(max(q, 0.0)) + min(max(q.x, q.y), 0.0) - corner;+ inside = 1.0 - smoothstep(-0.75, 0.75, sd);+ }++ float k = strength * qt_Opacity * inside;fragColor = vec4(rgb * k, a * k);}diff --git a/desktop/app/shaders/hive.frag.qsb b/desktop/app/shaders/hive.frag.qsbindex cfe118e..bbc2d1d 100644Binary files a/desktop/app/shaders/hive.frag.qsb and b/desktop/app/shaders/hive.frag.qsb differdiff --git a/desktop/app/src/bridge/app.rs b/desktop/app/src/bridge/app.rsindex 0c150ab..abba1b4 100644--- a/desktop/app/src/bridge/app.rs+++ b/desktop/app/src/bridge/app.rs@@ -56,6 +56,8 @@ pub mod qobject {#[qproperty(QString, ringing_from)]#[qproperty(bool, system_dark)]#[qproperty(bool, reduce_motion)]+ /// Battery saver is on: decorative animation rests.+ #[qproperty(bool, power_saver)]/// Bloom colors from the desktop wallpaper, as JSON in the shape of/// a tokens.json seed (`{ seed, light, dark }`); "" until known.#[qproperty(QString, wallpaper_colors)]@@ -408,6 +410,7 @@ pub struct AppControllerRust {ringing_from: QString,system_dark: bool,reduce_motion: bool,+ power_saver: bool,wallpaper_colors: QString,phone_colors: QString,toasts_enabled: bool,@@ -915,20 +918,21 @@ fn dispatch_jump_task(qt: &CxxQtThread<qobject::AppController>, action: String)let mode = &s["theme:".len()..];let dir = &core_host::host().data_dir;let mut st = crate::settings::Settings::load(dir);- match mode {- "graphite" => {- st.theme = crate::settings::Theme::Graphite;- st.color_mode = crate::settings::ColorMode::Dark;- }- "bloom-dark" => {- st.theme = crate::settings::Theme::Bloom;- st.color_mode = crate::settings::ColorMode::Dark;- }- _ => {- st.theme = crate::settings::Theme::Bloom;- st.color_mode = crate::settings::ColorMode::Light;- }- }+ // `<theme>` or `<theme>-dark` / `<theme>-light`; plain "graphite" is dark.+ use crate::settings::{ColorMode, Theme};+ let (name, color) = match mode.rsplit_once('-') {+ Some((name, "dark")) => (name, Some(ColorMode::Dark)),+ Some((name, "light")) => (name, Some(ColorMode::Light)),+ _ => (mode, None),+ };+ st.theme = match name {+ "graphite" => Theme::Graphite,+ "glass" => Theme::Glass,+ "hive" => Theme::Hive,+ _ => Theme::Bloom,+ };+ st.color_mode =+ color.unwrap_or(if name == "graphite" { ColorMode::Dark } else { ColorMode::Light });let _ = st.save(dir);core_host::host().hub.changed(Changes::PREFS);object.activate_requested();@@ -1340,6 +1344,7 @@ impl qobject::AppController {fn refresh_appearance(mut self: Pin<&mut Self>) {self.as_mut().set_system_dark(win::system_dark());self.as_mut().set_reduce_motion(win::reduce_motion());+ self.as_mut().set_power_saver(win::power_saver());refresh_wallpaper_colors(self.qt_thread());self.refresh_toasts_enabled();}@@ -1489,7 +1494,10 @@ impl qobject::AppController {}}- pub fn refresh_toasts_enabled(self: Pin<&mut Self>) {+ pub fn refresh_toasts_enabled(mut self: Pin<&mut Self>) {+ // Also when the window comes back to the front: battery saver may+ // have changed meanwhile.+ self.as_mut().set_power_saver(win::power_saver());self.set_toasts_enabled(win::toast::enabled());core_host::spawn(core_host::refresh_wake());}diff --git a/desktop/app/src/bridge/prefs.rs b/desktop/app/src/bridge/prefs.rsindex cf561a1..d53448d 100644--- a/desktop/app/src/bridge/prefs.rs+++ b/desktop/app/src/bridge/prefs.rs@@ -45,6 +45,8 @@ pub mod qobject {#[qproperty(bool, amoled)]/// Mica behind the window.#[qproperty(bool, backdrop)]+ /// Hive's comb breathes and pulses.+ #[qproperty(bool, comb_motion)]#[qproperty(bool, close_to_tray)]/// Send what's copied on this PC to connected phones.#[qproperty(bool, auto_clipboard)]@@ -122,6 +124,8 @@ pub mod qobject {#[qproperty(i32, walkthrough_step)]/// Whether the gentle "What's new" card on Home has been dismissed.#[qproperty(bool, whats_new_dismissed)]+ /// Whether the card on Home inviting to try Hive has been answered.+ #[qproperty(bool, hive_invite_dismissed)]/// JSON array of configured `FolderSyncRule` items.#[qproperty(QString, folder_sync_rules_json)]/// JSON array of configured `AutomationRule` items.@@ -248,6 +252,7 @@ pub struct PreferencesRust {color_mode: QString,amoled: bool,backdrop: bool,+ comb_motion: bool,close_to_tray: bool,auto_clipboard: bool,clipboard_history: bool,@@ -287,6 +292,7 @@ pub struct PreferencesRust {walkthrough_completed: bool,walkthrough_step: i32,whats_new_dismissed: bool,+ hive_invite_dismissed: bool,folder_sync_rules_json: QString,automation_rules_json: QString,/// What the user chose (`start_with_windows` shows the default until then).@@ -300,6 +306,7 @@ impl cxx_qt::Initialize for qobject::Preferences {let settings = Settings::load(&core_host::host().data_dir);settings.apply_runtime();self.as_mut().set_theme(QString::from(match settings.theme {+ Theme::Hive => "hive",Theme::Bloom => "bloom",Theme::Glass => "glass",Theme::Graphite => "graphite",@@ -312,6 +319,7 @@ impl cxx_qt::Initialize for qobject::Preferences {}));self.as_mut().set_amoled(settings.amoled);self.as_mut().set_backdrop(settings.backdrop);+ self.as_mut().set_comb_motion(settings.comb_motion);self.as_mut().set_close_to_tray(settings.close_to_tray);self.as_mut().set_auto_clipboard(settings.auto_clipboard);crate::clipboard::set_auto_send(settings.auto_clipboard);@@ -362,6 +370,7 @@ impl cxx_qt::Initialize for qobject::Preferences {self.as_mut().set_walkthrough_completed(settings.walkthrough_completed);self.as_mut().set_walkthrough_step(i32::from(settings.walkthrough_step.min(6)));self.as_mut().set_whats_new_dismissed(settings.whats_new_dismissed);+ self.as_mut().set_hive_invite_dismissed(settings.hive_invite_dismissed);let folder_rules_json =serde_json::to_string(&settings.folder_sync_rules).unwrap_or_else(|_| "[]".into());self.as_mut().set_folder_sync_rules_json(QString::from(&folder_rules_json));@@ -383,6 +392,7 @@ impl cxx_qt::Initialize for qobject::Preferences {self.as_mut().on_color_mode_changed(|p| p.save()).release();self.as_mut().on_amoled_changed(|p| p.save()).release();self.as_mut().on_backdrop_changed(|p| p.save()).release();+ self.as_mut().on_comb_motion_changed(|p| p.save()).release();self.as_mut().on_close_to_tray_changed(|p| p.save()).release();self.as_mut().on_auto_clipboard_changed(|p| {@@ -612,6 +622,7 @@ impl cxx_qt::Initialize for qobject::Preferences {}).release();self.as_mut().on_whats_new_dismissed_changed(|p| p.save()).release();+ self.as_mut().on_hive_invite_dismissed_changed(|p| p.save()).release();super::subscribe(self.qt_thread(), crate::state::Changes::PREFS, Self::refresh_runtime_flags);}@@ -625,6 +636,7 @@ impl qobject::Preferences {}let disk = Settings::load(&core_host::host().data_dir);let disk_theme = QString::from(match disk.theme {+ Theme::Hive => "hive",Theme::Bloom => "bloom",Theme::Glass => "glass",Theme::Graphite => "graphite",@@ -833,6 +845,7 @@ impl qobject::Preferences {let p = self.rust();Settings {theme: match String::from(&p.theme).as_str() {+ "hive" => Theme::Hive,"graphite" => Theme::Graphite,"glass" | "blurry" => Theme::Glass,_ => Theme::Bloom,@@ -845,6 +858,7 @@ impl qobject::Preferences {},amoled: p.amoled,backdrop: p.backdrop,+ comb_motion: p.comb_motion,close_to_tray: p.close_to_tray,auto_clipboard: p.auto_clipboard,clipboard_history: p.clipboard_history,@@ -890,6 +904,7 @@ impl qobject::Preferences {walkthrough_completed: p.walkthrough_completed,walkthrough_step: p.walkthrough_step.clamp(0, 6) as u8,whats_new_dismissed: p.whats_new_dismissed,+ hive_invite_dismissed: p.hive_invite_dismissed,obs_port: crate::settings::obs_settings().0,obs_password: crate::settings::obs_settings().1,}diff --git a/desktop/app/src/main.rs b/desktop/app/src/main.rsindex 2b617a1..45a351f 100644--- a/desktop/app/src/main.rs+++ b/desktop/app/src/main.rs@@ -552,7 +552,17 @@ fn main() -> ExitCode {updater::set_auto_install(settings.install_updates);updater::start();match (updater::note_running_version(&data_dir), options.updated) {- (Some(previous), _) => updater::announce_update(previous, !options.minimized),+ (Some(previous), _) => {+ // A new version invites to try Hive again, once.+ let mut saved = settings::Settings::load(&data_dir);+ if saved.hive_invite_dismissed {+ saved.hive_invite_dismissed = false;+ if let Err(e) = saved.save(&data_dir) {+ tracing::warn!(error = %e, "can't save settings");+ }+ }+ updater::announce_update(previous, !options.minimized);+ }// Reopened by the relauncher, still on this version.(None, true) => updater::announce_update_failed(!options.minimized),(None, false) => {}diff --git a/desktop/app/src/settings.rs b/desktop/app/src/settings.rsindex 7aa322f..a7051a0 100644--- a/desktop/app/src/settings.rs+++ b/desktop/app/src/settings.rs@@ -17,6 +17,8 @@ const FILE_NAME: &str = "desktop-settings.json";pub enum Theme {#[default]Bloom,+ /// Honey on charcoal or wax, with the living comb.+ Hive,Glass,Graphite,}@@ -25,6 +27,7 @@ impl<'de> Deserialize<'de> for Theme {fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {let s = String::deserialize(deserializer).unwrap_or_default();Ok(match s.trim().to_ascii_lowercase().as_str() {+ "hive" => Theme::Hive,"graphite" => Theme::Graphite,"glass" | "blurry" => Theme::Glass,_ => Theme::Bloom,@@ -265,6 +268,10 @@ pub struct Settings {pub amoled: bool,/// Use the Windows 11 Mica backdrop.pub backdrop: bool,+ /// Hive's comb breathes and pulses (it holds still when off, and with+ /// reduced motion or battery saver whatever this says).+ #[serde(default = "default_true", alias = "comb_motion")]+ pub comb_motion: bool,/// Closing the window keeps Nectarlink running in the tray.#[serde(alias = "close_to_tray")]pub close_to_tray: bool,@@ -395,6 +402,9 @@ pub struct Settings {/// Whether the gentle "What's new" card on Home has been dismissed.#[serde(default, alias = "whats_new_dismissed")]pub whats_new_dismissed: bool,+ /// Whether the card on Home inviting to try Hive has been answered.+ #[serde(default, alias = "hive_invite_dismissed")]+ pub hive_invite_dismissed: bool,/// OBS Studio's WebSocket port, for `obs:` Deck commands.pub obs_port: u16,/// OBS's WebSocket password, encrypted with Windows DPAPI (base64). Never stored in clear.@@ -409,6 +419,7 @@ impl Default for Settings {color_mode: ColorMode::default(),amoled: false,backdrop: true,+ comb_motion: true,close_to_tray: true,auto_clipboard: true,clipboard_history: true,@@ -451,6 +462,7 @@ impl Default for Settings {walkthrough_completed: false,walkthrough_step: 0,whats_new_dismissed: false,+ hive_invite_dismissed: false,obs_port: crate::obs::DEFAULT_PORT,obs_password: None,}@@ -556,6 +568,7 @@ mod tests {color_mode: ColorMode::Dark,amoled: false,backdrop: false,+ comb_motion: false,close_to_tray: false,auto_clipboard: false,clipboard_history: false,@@ -598,6 +611,7 @@ mod tests {walkthrough_completed: true,walkthrough_step: 4,whats_new_dismissed: true,+ hive_invite_dismissed: true,obs_port: crate::obs::DEFAULT_PORT,obs_password: None,};diff --git a/desktop/app/src/win/mod.rs b/desktop/app/src/win/mod.rsindex 2db390d..ff2678e 100644--- a/desktop/app/src/win/mod.rs+++ b/desktop/app/src/win/mod.rs@@ -119,6 +119,15 @@ pub fn is_laptop() -> bool {ok && status.BatteryFlag != 128 && status.BatteryFlag != 255}+/// Whether battery saver (energy saver on Windows 11) is on: decorative+/// animation should rest.+pub fn power_saver() -> bool {+ let mut status = SYSTEM_POWER_STATUS::default();+ // SAFETY: status is a live, writable struct.+ let ok = unsafe { GetSystemPowerStatus(&mut status) }.is_ok();+ ok && status.SystemStatusFlag == 1+}+/// Whether Windows is set to dark mode for apps.pub fn system_dark() -> bool {reg_dword(diff --git a/desktop/app/src/win/tray.rs b/desktop/app/src/win/tray.rsindex d41c216..63f2fa4 100644--- a/desktop/app/src/win/tray.rs+++ b/desktop/app/src/win/tray.rs@@ -102,6 +102,7 @@ const CMD_SCAN_DOCUMENT: u32 = 6;const CMD_COMMAND_PALETTE: u32 = 7;const CMD_SHELF: u32 = 8;const PBT_APMRESUMEAUTOMATIC: usize = 0x12;+const PBT_APMPOWERSTATUSCHANGE: usize = 0x0A;/// NIN_SELECT | NINF_KEY (shellapi.h): the icon was activated with the keyboard.const NIN_KEYSELECT: u32 = NIN_SELECT | 0x1;const SPI_SETCLIENTAREAANIMATION: usize = 0x1043;@@ -723,6 +724,10 @@ unsafe extern "system" fn window_proc(hwnd: HWND, msg: u32, wparam: WPARAM, lparif wparam.0 == PBT_APMRESUMEAUTOMATIC {emit(TrayEvent::Resumed);}+ // Plugged in or out, or battery saver turned on or off.+ if wparam.0 == PBT_APMPOWERSTATUSCHANGE {+ emit(TrayEvent::AppearanceChanged);+ }LRESULT(1)}WM_SETTINGCHANGE => {diff --git a/docs/design/tokens.json b/docs/design/tokens.jsonindex 8a1c1df..9f4f112 100644--- a/docs/design/tokens.json+++ b/docs/design/tokens.json@@ -2,6 +2,91 @@"$schema": "nectarlink-design-tokens/v1","$description": "Single source of truth for Nectarlink design tokens. QML (desktop) and Compose (Android) themes are generated from this file. Bloom colors follow Material You tonal roles; at runtime the Android app derives them from the wallpaper and sends the seed to the PC (hello.device.accent). The palettes here are the fallbacks and brand presets.","themes": {+ "hive": {+ "description": "Honey on charcoal (Comb, dark) and on warm wax (Wax, light), with a living honeycomb behind the app that grows from the logo, breathes and pulses. Colors are fixed: no wallpaper, artwork or phone colors.",+ "dynamicColor": false,+ "variants": {+ "wax": {+ "primary": "#8A5100",+ "onPrimary": "#FFFFFF",+ "primaryContainer": "#FFDDB3",+ "onPrimaryContainer": "#2C1600",+ "secondaryContainer": "#F4E3CD",+ "onSecondaryContainer": "#2A1F14",+ "surface": "#FFF8F3",+ "surfaceContainerLow": "#FCF2E9",+ "surfaceContainer": "#F8ECE1",+ "surfaceContainerHigh": "#F3E5D7",+ "surfaceContainerHighest": "#EDDDCD",+ "onSurface": "#1F1B16",+ "onSurfaceVariant": "#5C4F43",+ "outline": "#85766A",+ "outlineVariant": "#DDCBBA",+ "success": "#8A5100",+ "warning": "#7A4A00",+ "error": "#9E2B25",+ "onError": "#FFFFFF"+ },+ "comb": {+ "primary": "#FFB95F",+ "onPrimary": "#2C1600",+ "primaryContainer": "#5A3A0E",+ "onPrimaryContainer": "#FFDDB3",+ "secondaryContainer": "#2F2A24",+ "onSecondaryContainer": "#F0E0CC",+ "surface": "#121214",+ "surfaceContainerLow": "#151517",+ "surfaceContainer": "#1A1A1D",+ "surfaceContainerHigh": "#212124",+ "surfaceContainerHighest": "#29292D",+ "onSurface": "#EDE6DD",+ "onSurfaceVariant": "#ABA195",+ "outline": "#8D8379",+ "outlineVariant": "#34312D",+ "success": "#FFB95F",+ "warning": "#F5D58A",+ "error": "#F0A39C",+ "onError": "#3B0B07"+ }+ },+ "shape": {+ "xs": 6,+ "sm": 10,+ "md": 14,+ "lg": 18,+ "xl": 24,+ "full": 999+ },+ "fonts": {+ "ui": "Figtree",+ "display": "Figtree",+ "label": "Figtree",+ "mono": "Space Mono"+ },+ "label": {+ "case": "none",+ "tracking": 0,+ "size": 12.5,+ "weight": 600+ },+ "comb": {+ "$note": "The honeycomb backdrop. Cell size in px (dp on Android); alphas are for the line color.",+ "cell": 24,+ "lineAlphaDark": 0.27,+ "lineAlphaLight": 0.11,+ "glowAlphaDark": 0.7,+ "glowAlphaLight": 0.75,+ "breathSeconds": 6.0,+ "pulseSeconds": 4.5,+ "frameMs": 33+ },+ "rules": [+ "The installer and uninstaller always use Hive. In the apps it's a choice, offered by a card on Home that returns after an update or a reinstall once dismissed.",+ "The comb holds still with reduced motion, in battery or energy saver, when Animated comb is off, and while the window isn't in front.",+ "The comb is drawn by one shader behind everything; cards stay opaque so text never sits on moving lines.",+ "Primary buttons are honey with a soft honey glow on hover; outlines and focus rings use honey at low alpha."+ ]+ },"bloom": {"description": "Default. Minimal Material You: neutral surfaces, color only where it carries meaning.","dynamicColor": true,@@ -449,4 +534,4 @@"size": 20,"stroke": "outlined, 400 weight; filled when selected"}-}\ No newline at end of file+}diff --git a/docs/guide/settings.md b/docs/guide/settings.mdindex f0d7e67..e0a9758 100644--- a/docs/guide/settings.md+++ b/docs/guide/settings.md@@ -18,10 +18,11 @@ Controls the visual theme, light/dark mode, accent palette, OLED black surfaces,| Setting | Options / Default | What It Does || :--- | :--- | :--- |-| **Theme** | `Bloom` (default), `Glass`, `Graphite` | Selects the visual style. **Bloom** uses soft, tinted Material You surfaces. **Glass** renders translucent cards over the Windows backdrop, each with a lit glass rim: a specular edge from the top left, a softer reflection at the bottom right, and a faint inner glow. **Graphite** uses high-contrast monochrome ink-on-paper surfaces. |+| **Theme** | `Hive`, `Bloom` (default), `Glass`, `Graphite` | Selects the visual style. **Hive** is honey on charcoal (dark) or warm wax (light), with a living honeycomb behind the whole window that grows from the logo, breathes, and sends soft pulses of light; its colors are fixed, so the color options below are hidden. **Bloom** uses soft, tinted Material You surfaces. **Glass** renders translucent cards over the Windows backdrop, each with a lit glass rim: a specular edge from the top left, a softer reflection at the bottom right, and a faint inner glow. **Graphite** uses high-contrast monochrome ink-on-paper surfaces. || **Mode** | `System` (default), `Light`, `Dark` | Follows Windows 11's system light/dark mode or locks Nectarlink to Light or Dark. || **Color** *(shown in Bloom and Glass)* | **Wallpaper** (default), **Honey**, **Lavender**, **Ocean**, **Sage**, **Black**, **Media artwork**, or **Phone color pills** | Picks the accent seed color. **Wallpaper** extracts colors from your desktop wallpaper. **Media artwork** dynamically adapts the app's palette to the album art of whatever song is currently playing. **Phone color pills** sync live with each paired phone's Material You wallpaper palette. || **Pure black (AMOLED)** | **Off** (default) | Shown inline as an **AMOLED** pill when the **Black** color swatch is selected in Bloom/Glass, or as a dedicated row in **Graphite Dark**. Replaces dark gray backgrounds with pure `#000000` black for OLED monitors. |+| **Animated comb** *(Hive)* | **On** (default) | Lets Hive's honeycomb breathe and pulse. It also holds still while animations are off in Windows, while energy saver is on, and while the window isn't in front. Shown in place of **Mica backdrop**, which Hive doesn't use. || **Mica backdrop** | **On** (default) | Uses Windows 11's native Desktop Window Manager (DWM) Mica material to subtly tint the window background with your desktop wallpaper. |---@@ -205,8 +206,9 @@ On Android, tap **Settings** in the floating bottom dock. You can view all setti| Setting | Options / Default | What It Does || :--- | :--- | :--- |-| **Theme** | `Graphite` (default), `Bloom`, `Glass` | Selects the visual style on Android, matching the Windows themes. In **Glass** on Android 13 and newer, the floating Home and Settings dock is Liquid Glass: content scrolling beneath it bends at the rim. |+| **Theme** | `Hive`, `Graphite` (default), `Bloom`, `Glass` | Selects the visual style on Android, matching the Windows themes. **Hive** draws the same honeycomb behind every screen, with fixed honey colors (no wallpaper or artwork colors). In **Glass** on Android 13 and newer, the floating Home and Settings dock is Liquid Glass: content scrolling beneath it bends at the rim. || **Mode** | `System` (default), `Light`, `Dark` | Follows Android's system dark theme or locks the app to Light or Dark. |+| **Animated comb** *(Hive)* | **On** (default) | Lets Hive's honeycomb breathe and pulse. It holds still with **Remove animations** or battery saver on, and while the app isn't in front. || **Pure black (AMOLED)** | **Off** (default) | Shown in Graphite Dark or as an inline **AMOLED** pill when the **Black** seed swatch is selected. Uses true `#000000` black surfaces for OLED phone screens. || **Media artwork color** *(Bloom and Glass)* | **Off** (default) | Tints the app to match the artwork of what is playing on the phone or a paired PC. Applies only while this is on. With nothing playing, the app uses the wallpaper or preset colors. || **Colors from wallpaper** *(Android 12+)* | **On** (default) | Uses your wallpaper's colors and updates when the wallpaper changes. On Samsung phones with One UI's **Color palette** off, Nectarlink reads the colors from the wallpaper itself. Paired PCs that select **My phone's colors** use the same seed. |diff --git a/docs/screenshots/android-hive-home.png b/docs/screenshots/android-hive-home.pngnew file mode 100644index 0000000..1eb3205Binary files /dev/null and b/docs/screenshots/android-hive-home.png differdiff --git a/docs/screenshots/desktop-hive-home.png b/docs/screenshots/desktop-hive-home.pngnew file mode 100644index 0000000..c92bc99Binary files /dev/null and b/docs/screenshots/desktop-hive-home.png differdiff --git a/docs/screenshots/desktop-hive-settings.png b/docs/screenshots/desktop-hive-settings.pngnew file mode 100644index 0000000..1b1b366Binary files /dev/null and b/docs/screenshots/desktop-hive-settings.png differdiff --git a/tools/xtask/src/main.rs b/tools/xtask/src/main.rsindex 59339a1..ce530bf 100644--- a/tools/xtask/src/main.rs+++ b/tools/xtask/src/main.rs@@ -109,14 +109,17 @@ fn validate(tokens: &Value) -> Result<()> {check_contrast(def.get(mode), status.get(mode), &name)?;}}- let variants = themes- .pointer("/graphite/variants")- .and_then(Value::as_object)- .context("missing graphite variants")?;- for (variant, palette) in variants {- let name = format!("graphite.{variant}");- check_palette(Some(palette), &name)?;- check_contrast(Some(palette), Some(palette), &name)?;+ // Fixed-palette themes carry their own status colors.+ for theme in ["graphite", "hive"] {+ let variants = themes+ .pointer(&format!("/{theme}/variants"))+ .and_then(Value::as_object)+ .with_context(|| format!("missing {theme} variants"))?;+ for (variant, palette) in variants {+ let name = format!("{theme}.{variant}");+ check_palette(Some(palette), &name)?;+ check_contrast(Some(palette), Some(palette), &name)?;+ }}Ok(())}@@ -316,6 +319,35 @@ fn render_kotlin(tokens: &Value) -> Result<String> {out.push(String::new());out.push(format!(" val graphiteSlate = {}", kotlin_palette(&variants["slate"], 4)?));out.push(String::new());+ let hive = tokens.pointer("/themes/hive/variants").context("missing hive variants")?;+ out.push(format!(" val hiveWax = {}", kotlin_palette(&hive["wax"], 4)?));+ out.push(String::new());+ out.push(format!(" val hiveComb = {}", kotlin_palette(&hive["comb"], 4)?));+ out.push(String::new());+ for (name, mode) in [("Wax", "wax"), ("Comb", "comb")] {+ for key in ["warning", "error"] {+ let hex = hive+ .pointer(&format!("/{mode}/{key}"))+ .and_then(Value::as_str)+ .context("missing hive status")?;+ let field = format!("hive{name}{}", if key == "warning" { "Warning" } else { "Error" });+ out.push(format!(" val {field} = {}", kotlin_color(hex)));+ }+ }+ let comb = tokens.pointer("/themes/hive/comb").context("missing hive comb")?;+ let number =+ |key: &str| comb.get(key).and_then(Value::as_f64).with_context(|| format!("missing comb.{key}"));+ out.push(String::new());+ out.push(" /** The honeycomb backdrop (themes.hive.comb). */".into());+ out.push(format!(" const val COMB_CELL_DP = {}f", number("cell")?));+ out.push(format!(" const val COMB_LINE_ALPHA_DARK = {}f", number("lineAlphaDark")?));+ out.push(format!(" const val COMB_LINE_ALPHA_LIGHT = {}f", number("lineAlphaLight")?));+ out.push(format!(" const val COMB_GLOW_ALPHA_DARK = {}f", number("glowAlphaDark")?));+ out.push(format!(" const val COMB_GLOW_ALPHA_LIGHT = {}f", number("glowAlphaLight")?));+ out.push(format!(" const val COMB_BREATH_SECONDS = {}f", number("breathSeconds")?));+ out.push(format!(" const val COMB_PULSE_SECONDS = {}f", number("pulseSeconds")?));+ out.push(format!(" const val COMB_FRAME_MS = {}L", number("frameMs")? as i64));+ out.push(String::new());out.push(format!(" val warningLight = {}", status_color("light", "warning")?));out.push(format!(" val warningDark = {}", status_color("dark", "warning")?));out.push(format!(" val errorLight = {}", status_color("light", "error")?));