mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-10-06 03:38:23 +00:00
Claude
4871200ad2
main landed its own move of UiSettings/UiSettingsFlow into commons/model
with the StringResource labels split into commonsUI — the same design this
branch had already shipped in 0387ef33. Where the two overlap, main wins:
it is canonical, and keeping two copies of the same enums is worse than
losing the small differences between them.
- commons/model/UiSettings.kt and UiSettingsFlow.kt: main's versions.
Verified first that nothing would be lost — the `ui.*` key sets and the
UiSettings field lists are identical between the two.
- commonsUI: main's commons/model/UiSettingsLabels.kt kept, this branch's
commons/ui/settings/UiSettingsLabels.kt deleted. Main kept labels for
ConnectivityType, FeatureSetType and FontFamilyType that this branch had
dropped as unused; keeping them costs nothing and avoids an argument.
- TorSettingsLabels moves to commons/tor to follow main's convention of
putting a model's labels in that model's own package, rather than a
separate ui/settings one. That package is now gone.
The one place this branch is kept over main's is UISharedPreferences.
main moved only the model and left the 322-line class in amethyst, still
holding the key table and the `Context.preferencesDataStore` delegate.
This branch had already extracted the store to
commons/model/preferences/UiSettingsStore and retired that delegate for
AppPreferenceStores, so main's copy is deleted rather than merged: taking
it back would put a second DataStore on the shared_settings path, which is
the crash the holder exists to prevent.
Verified on the merge: :commons + :commonsUI + :amethyst compile, the full
pre-push task list green (commons 2502/0, amethyst play 1614/0, plus
quartz, commonsUI, commonsUI androidHostTest, nestsClient, fdroid, cli),
verifyKmpPurity x3, compileCommonMainKotlinMetadata x2, :desktopApp
compile, spotlessCheck.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AXvKXakvup4inNFfAhhr4L