feat: surface per-app accent discovery

Author: SysAdminDoc

CHANGELOG.md

@@ -2,6 +2,52 @@
 
 All SwiftFloris release history is consolidated here. This replaces the former root-level `RELEASE_NOTES_v*.md` file-per-release pattern.
 
+<a id="v1.8.210"></a>
+## v1.8.210
+
+Released: 2026-06-04
+
+### Per-app accent discovery and preview
+
+F6 makes the existing opt-in per-app accent feature visible without changing its privacy posture. Settings -> Theme now includes an illustrative preview that compares the active theme accent with app-tinted samples for Slack, WhatsApp, Discord, and Telegram. The preview is static: runtime tinting still computes locally from the focused editor app's launcher icon.
+
+The Smartbar can now show a one-time opt-in hint after SwiftFloris sees three distinct editor packages in the current IME process. Package names are not persisted for the hint; SwiftFloris stores only the discovery state (`COLLECTING`, `READY`, or `DISMISSED`). Enabling the feature or tapping Skip dismisses the hint permanently.
+
+### Changes
+
+- **`PerAppAccentPreview.kt`** (new) - compact Theme settings preview with selectable app-color samples and side-by-side keyboard illustrations.
+- **`PerAppAccentDiscoveryHint.kt`** (new, theme policy) - process-local three-app threshold tracker plus persisted hint-state enum.
+- **`PerAppAccentController.kt`** - observes editor package focus, promotes the hint state asynchronously, and suppresses future hints once per-app accent is enabled.
+- **`PerAppAccentDiscoveryHint.kt`** (new, Smartbar UI) / **`Smartbar.kt`** - renders the one-time enable/skip hint in the suggestion slot when the hint reaches `READY`.
+- **`ThemeScreen.kt` / `SettingsSearchIndex.kt`** - surfaces the preview, resource-backed switch copy, and searchable per-app accent entry.
+- **`PRIVACY_AND_AI.md`** - documents that discovery tracking does not persist package names.
+
+### Verification
+
+- `./gradlew.bat :app:compileDebugKotlin :app:compileDebugUnitTestKotlin` -> green with `JAVA_HOME=C:\Program Files\Eclipse Adoptium\jdk-21.0.11.10-hotspot`.
+- `./gradlew.bat :app:verifyNoInternetPermission :app:testDebugUnitTest :app:lintDebug :app:assembleDebug` -> green with `JAVA_HOME=C:\Program Files\Eclipse Adoptium\jdk-21.0.11.10-hotspot`.
+- `./gradlew.bat :app:verifyRoborazziDebug` -> green with `JAVA_HOME=C:\Program Files\Eclipse Adoptium\jdk-21.0.11.10-hotspot`.
+- `git diff --check` -> green; CRLF normalization warnings only.
+- `bash scripts/check-fastlane-metadata.sh` -> green for versionCode 2010.
+- `bash scripts/check-repo-hygiene.sh` -> green.
+
+### Files Touched
+
+- `app/src/main/kotlin/dev/patrickgold/florisboard/app/FlorisPreferenceModelImpl.kt`
+- `app/src/main/kotlin/dev/patrickgold/florisboard/app/prefs/ThemePrefs.kt`
+- `app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/search/SettingsSearchIndex.kt`
+- `app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/ThemeScreen.kt`
+- `app/src/main/kotlin/dev/patrickgold/florisboard/ime/smartbar/PerAppAccentDiscoveryHint.kt` (new)
+- `app/src/main/kotlin/dev/patrickgold/florisboard/ime/smartbar/Smartbar.kt`
+- `app/src/main/kotlin/dev/patrickgold/florisboard/ime/theme/PerAppAccentController.kt`
+- `app/src/main/kotlin/dev/patrickgold/florisboard/ime/theme/PerAppAccentDiscoveryHint.kt` (new)
+- `app/src/main/kotlin/dev/patrickgold/florisboard/ime/theme/PerAppAccentPreview.kt` (new)
+- `app/src/main/res/values/strings.xml`
+- `app/src/test/kotlin/dev/patrickgold/florisboard/app/AppPrefsPartitionTest.kt`
+- `app/src/test/kotlin/dev/patrickgold/florisboard/ime/theme/PerAppAccentDiscoveryHintTrackerTest.kt` (new)
+- `docs/PRIVACY_AND_AI.md`
+- `fastlane/metadata/android/en-US/changelogs/2010.txt` (new)
+
 <a id="v1.8.209"></a>
 ## v1.8.209
 

COMPLETED.md

@@ -48,6 +48,7 @@ Consolidated from the archived open-work checklist (closed items). Full per-rele
 - [x] EI7 (P1, reframed) — Voice input empty state now explains FUTO as a separate offline Android voice keyboard and keeps the F-Droid install action visible without migration-window framing. Shipped v1.8.207. — *Source: TODO_2026-06-03.md*
 - [x] F3 (P0, reframed) — First-run "Import your dictionary" setup hint for post-cutoff local keyboard exports, routing SwiftKey JSON, Gboard XML/ZIP, FlorisBoard CSV/.flbackup/.fldic, and SwiftFloris exports into the existing personal-dictionary importer. Shipped v1.8.208. — *Source: TODO_2026-06-03.md*
 - [x] EI3 (P2) — Personal dictionary bulk-import preview for modular imports, with first-50-row review, row exclusion before commit, excluded-row summary counts, and persisted skip-preview opt-out. Shipped v1.8.209. — *Source: TODO_2026-06-03.md*
+- [x] F6 (P2) — Per-app accent opt-in discovery hint and Settings preview, with process-local three-app threshold tracking, persisted hint state only, Settings search coverage, and privacy docs. Shipped v1.8.210. — *Source: TODO_2026-06-03.md*
 - [x] F1, F2, F15, F16, F17, F19, F20, F25, F26, F32, F34, F35, F36, F41, F42, EI8, EI11, EI4 (doc) — Closed across v1.8.174 -> v1.8.187. — *Source: TODO_2026-06-03.md*
 - [x] IMPROVEMENT_PLAN Workstreams 1, 3, 4, 5, 6 complete; Workstream 2 (lint) monotonically decreasing. — *Source: IMPROVEMENT_PLAN_2026-05-18.md*
 

README.md

@@ -1,6 +1,6 @@
 # SwiftFloris
 
-![Version](https://img.shields.io/badge/version-v1.8.209-blue) ![License](https://img.shields.io/badge/license-Apache%202.0-green) ![Platform](https://img.shields.io/badge/platform-Android%208.0+-orange) ![Network](https://img.shields.io/badge/network-none-lightgrey) ![Dictionary imports](https://img.shields.io/badge/dictionary%20imports-local%20files-green)
+![Version](https://img.shields.io/badge/version-v1.8.210-blue) ![License](https://img.shields.io/badge/license-Apache%202.0-green) ![Platform](https://img.shields.io/badge/platform-Android%208.0+-orange) ![Network](https://img.shields.io/badge/network-none-lightgrey) ![Dictionary imports](https://img.shields.io/badge/dictionary%20imports-local%20files-green)
 
 **SwiftFloris** is a privacy-first Android keyboard, forked from FlorisBoard and pushed toward SwiftKey-class multilingual typing without the cloud. It ships under Apache-2.0, holds no `INTERNET` permission, and binds zero accounts.
 
@@ -37,7 +37,7 @@
 
 ## Highlights
 
-| Area | What's in v1.8.209 | Privacy posture |
+| Area | What's in v1.8.210 | Privacy posture |
 |------|-------------------|-----------------|
 | **Autocorrect / prediction** | SCOWL 117k English dictionary, SymSpell d1+d2, bigram + trigram next-word, capitalization-aware completions, contraction handling, instant-remember user-dictionary overlay | On-device |
 | **Multilingual typing** | Bilingual subtype presets (EN+ES / EN+FR / EN+DE), per-token Latin language identification, top-two straddle guard, sentence-local context scoring, and opt-in remembered keyboard language per app | On-device |
@@ -47,7 +47,7 @@
 | **Emoji & stickers** | Emoji search/history/pinned groups with an in-keyboard pin-to-group sheet, bundled local sticker packs, and user-imported SAF sticker folders for PNG / WebP / JPEG / GIF files | Local folder URI only |
 | **Clipboard** | Room-backed history with pinning + per-app source tag, media/provider metadata, sensitive-item gates, and startup/restore reconciliation | On-device |
 | **Productivity** | Calendar quick-insert reads local agenda entries for today + next 7 days; task quick-insert sends selected text to user-chosen task / note apps | Calendar permission is explicit opt-in; no network |
-| **Themes** | 21 bundled themes — SwiftKey Pure (Light/Dark + M3 Expressive), SwiftKey High Contrast (AAA), Aurora Animated, Floris Day/Night, Swift Glacier, Swift Slate, M3E Nord (light + dark), Tokyo Night, Dracula, Catppuccin Mocha; borderless variants where applicable; Snygg theme engine; per-app accent | No telemetry |
+| **Themes** | 21 bundled themes — SwiftKey Pure (Light/Dark + M3 Expressive), SwiftKey High Contrast (AAA), Aurora Animated, Floris Day/Night, Swift Glacier, Swift Slate, M3E Nord (light + dark), Tokyo Night, Dracula, Catppuccin Mocha; borderless variants where applicable; Snygg theme engine; per-app accent with Settings preview and one-time opt-in hint | No telemetry |
 | **MCP daemon bridge** | AIDL bridge to user-installed MCP daemons with per-daemon enable / disable in Settings → MCP daemon bridge | Local-only binder, no network |
 | **Addon packs** | Addon manifest/enumerator contracts, IME-startup registry reconciliation, Settings -> Addons status/rescan, trust reset/changed-certificate controls, dictionary-pack catalog details, persisted signing-certificate pins, descriptor validation, provenance reports, typed dictionary-pack catalog, and addon APK dictionary asset mounting | No-network addon rejection |
 | **Settings UX** | Clearer empty states for voice setup, selected user-dictionary languages, extension categories, language packs, filtered clipboard history, and theme-manager recovery; surfaced keyboard preview field with ready/active state feedback | Local UI only |
@@ -442,7 +442,7 @@ limitations under the License.
 
 ## Status
 
-🚀 **Active development.** Current release: **v1.8.209** (2026-06-04). The SwiftKey account export window closed on **2026-05-31**; local/on-device migration paths remain documented above.
+🚀 **Active development.** Current release: **v1.8.210** (2026-06-04). The SwiftKey account export window closed on **2026-05-31**; local/on-device migration paths remain documented above.
 
 ---
 

ROADMAP.md

@@ -2,7 +2,7 @@
 
 > Single source of truth for all planned work. Items above the --- are existing plans; items below are research conducted 2026-06-03.
 
-**Current release:** v1.8.209 (versionCode 2009). **Baseline green:** `:app:verifyNoInternetPermission :app:testDebugUnitTest :app:lintDebug :app:assembleDebug`.
+**Current release:** v1.8.210 (versionCode 2010). **Baseline green:** `:app:verifyNoInternetPermission :app:testDebugUnitTest :app:lintDebug :app:assembleDebug`.
 
 Hard rules still apply (see `AGENTS.md`): no `INTERNET` permission in `:app`; Apache-2.0 ceiling on `:app`; no closed-source blobs; one logical change per commit; every shipped release bumps `gradle.properties` version, writes a `CHANGELOG.md` section, and adds a `fastlane/metadata/android/en-US/changelogs/<versionCode>.txt` (draft <=480 chars for headroom).
 
@@ -12,11 +12,6 @@ Item IDs trace to their origin research: `F#`/`EI#` from the archived 2026-05-25
 
 ### Settings & UX surfaces
 
-- [ ] P2 — Per-app accent opt-in discovery hint + preview (F6)
-  - Why: Per-app accent feature is undiscoverable.
-  - Touches: single-fire discovery hint + Settings preview.
-  - Acceptance: hint fires once; Settings shows a preview.
-  - Source: TODO.md A3 / research feature plan F6.
 - [ ] P3 — Settings home cosmetic re-bucket (EI2)
   - Why: Settings home is already grouped into four labelled sections (Essentials / Experience / Data / System); the research's "15 sub-screens at one level" premise is stale. Only residual value is a cosmetic re-bucket into the 5 research groups.
   - Touches: `HomeScreen.kt` grouping.

app/src/main/kotlin/dev/patrickgold/florisboard/app/FlorisPreferenceModelImpl.kt

@@ -212,6 +212,7 @@ class FlorisPreferenceModelImpl : FlorisPreferenceModel() {
             theme.nightThemeId to "theme.nightThemeId",
             theme.accentColor to "theme.accentColor",
             theme.perAppAccentEnabled to "theme.perAppAccentEnabled",
+            theme.perAppAccentDiscoveryHintState to "theme.perAppAccentDiscoveryHintState",
             theme.sunriseTime to "theme.sunriseTime",
             theme.sunsetTime to "theme.sunsetTime",
             theme.editorColorRepresentation to "theme.editorColorRepresentation",

app/src/main/kotlin/dev/patrickgold/florisboard/app/prefs/ThemePrefs.kt

@@ -53,6 +53,7 @@ import dev.patrickgold.florisboard.ime.text.key.KeyHintConfiguration
 import dev.patrickgold.florisboard.ime.text.key.KeyHintMode
 import dev.patrickgold.florisboard.ime.text.key.UtilityKeyAction
 import dev.patrickgold.florisboard.ime.text.keyboard.TextKeyData
+import dev.patrickgold.florisboard.ime.theme.PerAppAccentDiscoveryHintState
 import dev.patrickgold.florisboard.ime.theme.ThemeMode
 import dev.patrickgold.florisboard.ime.theme.extCoreTheme
 import dev.patrickgold.florisboard.ime.voice.VoiceCommandCustomCommands
@@ -100,6 +101,10 @@ open class ThemePrefs : PreferenceModel() {
         key = "theme__per_app_accent_enabled",
         default = false,
     )
+    val perAppAccentDiscoveryHintState = enum(
+        key = "theme__per_app_accent_discovery_hint_state",
+        default = PerAppAccentDiscoveryHintState.COLLECTING,
+    )
     val sunriseTime = localTime(
         key = "theme__sunrise_time",
         default = LocalTime(6, 0),

app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/search/SettingsSearchIndex.kt

@@ -156,6 +156,7 @@ object SettingsSearchIndex {
         entry("theme.day", R.string.settings__theme__title, R.string.pref__theme__day, destination = SettingsSearchDestination.THEME),
         entry("theme.night", R.string.settings__theme__title, R.string.pref__theme__night, destination = SettingsSearchDestination.THEME),
         entry("theme.accent", R.string.settings__theme__title, R.string.pref__theme__theme_accent_color__label, destination = SettingsSearchDestination.THEME),
+        entry("theme.per-app-accent", R.string.settings__theme__title, R.string.pref__theme__per_app_accent_enabled__label, R.string.pref__theme__per_app_accent_enabled__summary, SettingsSearchDestination.THEME),
         entry("theme.customization", R.string.settings__theme__title, R.string.pref__theme__customization__label, R.string.pref__theme__customization__summary, SettingsSearchDestination.THEME),
         entry("theme.manager", R.string.ext__list__ext_theme, R.string.settings__theme_manager__title_manage, destination = SettingsSearchDestination.THEME_MANAGER, keywords = "installed themes"),
 

app/src/main/kotlin/dev/patrickgold/florisboard/app/settings/theme/ThemeScreen.kt

@@ -25,6 +25,7 @@ import androidx.compose.material.icons.filled.LightMode
 import androidx.compose.material.icons.filled.Tune
 import androidx.compose.material.icons.filled.WbTwilight
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.graphics.Color
@@ -34,6 +35,8 @@ import dev.patrickgold.florisboard.app.LocalNavController
 import dev.patrickgold.florisboard.app.Routes
 import dev.patrickgold.florisboard.app.enumDisplayEntriesOf
 import dev.patrickgold.florisboard.app.ext.ExtensionListScreenType
+import dev.patrickgold.florisboard.ime.theme.PerAppAccentDiscoveryHintState
+import dev.patrickgold.florisboard.ime.theme.PerAppAccentPreview
 import dev.patrickgold.florisboard.ime.theme.ThemeManager
 import dev.patrickgold.florisboard.ime.theme.ThemeMode
 import dev.patrickgold.florisboard.lib.compose.FlorisScreen
@@ -69,6 +72,15 @@ fun ThemeScreen() = FlorisScreen {
     content {
         val dayThemeId by prefs.theme.dayThemeId.collectAsState()
         val nightThemeId by prefs.theme.nightThemeId.collectAsState()
+        val perAppAccentEnabled by prefs.theme.perAppAccentEnabled.collectAsState()
+
+        LaunchedEffect(perAppAccentEnabled) {
+            if (perAppAccentEnabled &&
+                prefs.theme.perAppAccentDiscoveryHintState.get() != PerAppAccentDiscoveryHintState.DISMISSED
+            ) {
+                prefs.theme.perAppAccentDiscoveryHintState.set(PerAppAccentDiscoveryHintState.DISMISSED)
+            }
+        }
 
         PreferenceGroup(title = stringRes(R.string.pref__theme__group_schedule__label)) {
             ListPreference(
@@ -145,11 +157,12 @@ fun ThemeScreen() = FlorisScreen {
             // and fall through to the active Snygg theme's `--primary` token
             // when the toggle is off (or when the resolver finds no usable
             // accent in the active editor's app icon).
+            PerAppAccentPreview()
             SwitchPreference(
                 pref = prefs.theme.perAppAccentEnabled,
                 icon = Icons.Default.ColorLens,
-                title = "Tint to active app's icon",
-                summary = "When typing in an app, tint the keyboard accent to match the dominant color of that app's launcher icon. All on-device — no extra permissions, no network.",
+                title = stringRes(R.string.pref__theme__per_app_accent_enabled__label),
+                summary = stringRes(R.string.pref__theme__per_app_accent_enabled__summary),
             )
         }
     }

app/src/main/kotlin/dev/patrickgold/florisboard/ime/smartbar/PerAppAccentDiscoveryHint.kt

@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2026 SwiftFloris Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.patrickgold.florisboard.ime.smartbar
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.unit.dp
+import dev.patrickgold.florisboard.R
+import dev.patrickgold.florisboard.app.FlorisPreferenceStore
+import dev.patrickgold.florisboard.ime.theme.FlorisImeUi
+import dev.patrickgold.florisboard.ime.theme.PerAppAccentDiscoveryHintState
+import kotlinx.coroutines.launch
+import org.florisboard.lib.compose.stringRes
+import org.florisboard.lib.snygg.ui.SnyggRow
+import org.florisboard.lib.snygg.ui.SnyggText
+
+@Composable
+fun PerAppAccentDiscoveryHint(modifier: Modifier = Modifier) {
+    val prefs by FlorisPreferenceStore
+    val scope = rememberCoroutineScope()
+
+    fun dismiss() {
+        scope.launch {
+            prefs.theme.perAppAccentDiscoveryHintState.set(PerAppAccentDiscoveryHintState.DISMISSED)
+        }
+    }
+
+    SnyggRow(
+        elementName = FlorisImeUi.SmartbarCandidatesRow.elementName,
+        modifier = modifier
+            .fillMaxSize()
+            .padding(horizontal = 8.dp),
+        horizontalArrangement = Arrangement.spacedBy(10.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        SnyggText(
+            elementName = FlorisImeUi.SmartbarCandidateWordText.elementName,
+            modifier = Modifier.weight(1f),
+            text = stringRes(R.string.ime__per_app_accent_hint__message),
+        )
+        SnyggText(
+            elementName = FlorisImeUi.SmartbarCandidateWordText.elementName,
+            modifier = Modifier
+                .clickable(role = Role.Button) {
+                    scope.launch {
+                        prefs.theme.perAppAccentEnabled.set(true)
+                        prefs.theme.perAppAccentDiscoveryHintState.set(PerAppAccentDiscoveryHintState.DISMISSED)
+                    }
+                }
+                .padding(8.dp),
+            text = stringRes(R.string.ime__per_app_accent_hint__enable),
+        )
+        SnyggText(
+            elementName = FlorisImeUi.SmartbarCandidateWordSecondaryText.elementName,
+            modifier = Modifier
+                .clickable(role = Role.Button, onClick = ::dismiss)
+                .padding(8.dp),
+            text = stringRes(R.string.ime__per_app_accent_hint__dismiss),
+        )
+    }
+}