Skip to content

Your Android phone and your Windows PC, working as one. Local-first, end-to-end encrypted, no account.

Android: keep the selected tab when switching to or from Hive

Beeced47540a94d
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5d662b..5f09830 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to NectarLink. Versions follow
[semantic versioning](https://semver.org); before 1.0, a minor version may
change things that need a step from you, and its notes say so.
+## Unreleased
+
+### Fixed
+
+- **Windows 10.** NectarLink and its installer start on Windows 10 again. They
+ failed right away with "Entry Point Not Found" because the Windows 11-only
+ virtual camera was required at startup. On Windows 10, everything works
+ except Phone as webcam, which needs Windows 11.
+- Android: changing the theme in Settings no longer jumps back to Home
+ ([#8](https://github.com/thtbee/nectarlink/issues/8)).
+
## 0.1.3 (2026-10-15)
Hive, a new theme for both apps, and updates to the Windows app that work on
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.kt
index 8cdcbcb..b276313 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
@@ -464,17 +464,20 @@ fun NectarlinkTheme(
shapes = currentShapes,
typography = currentTypography,
) {
- if (combBehind) {
- androidx.compose.foundation.layout.Box(
- androidx.compose.ui.Modifier.fillMaxSize().background(baseScheme.surface),
- ) {
+ // The content stays in one place for every theme: calling it from
+ // separate branches would rebuild the whole app on a switch to or
+ // from Hive, losing state such as the selected tab.
+ androidx.compose.foundation.layout.Box(
+ androidx.compose.ui.Modifier.fillMaxSize().then(
+ if (combBehind) androidx.compose.ui.Modifier.background(baseScheme.surface) else androidx.compose.ui.Modifier,
+ ),
+ ) {
+ if (combBehind) {
HiveComb(
dark = dark,
animate = appearance.combMotion && !reducedMotion && !powerSaver,
)
- content()
}
- } else {
content()
}
}