* android, desktop: settings navigation reorganization
Restructure the root Settings screen into two top-level sections and
fold previously-scattered items into three new sub-screens.
Root:
- Appearance, Your privacy, Chat data
- Help & support, Migrate to another device, Advanced settings
Your privacy (renamed from Privacy & security): keeps Device,
link previews / remove tracking, auto-accept images, blur media,
contact requests from groups. Adds a "More privacy" sub-screen.
More privacy (new): show last messages, message draft, encrypt local
files, protect IP address (with original dynamic footer preserved),
notification preview mode (moved from Notifications), and delivery
receipts.
Help & support (new): merges Help and Support SimpleX Chat sections
into Help / About (with App version) / Contact / Support the project.
Advanced settings (new): Network & servers, Notifications (Android),
Audio & video calls; then Developer tools, Restart and Shutdown
(Android), App update channel (desktop). Notifications is hidden on
desktop because the screen is empty after Show preview moves to
More privacy.
Chat data is the new top-level menu label for the existing
Database passphrase & export screen.
* android, desktop: trim settings reorg diff
- Remove 5 dead strings from base/strings.xml (privacy_and_security,
database_passphrase_and_export, settings_section_title_chat_database,
settings_section_title_support, settings_section_title_app) — no
Kotlin references after the reorg.
- Drop the now single-variant CurrentPage enum in
NotificationsSettingsView; replace with a direct callback.
- Read userDisplayName locally in HelpAndSupportView instead of
threading it through SettingsLayout/SettingsView/Preview.
* android, desktop: remove orphan locale strings
Companion to 442a368c9 which removed 5 dead keys from base/strings.xml.
The :common:adjustFormatting task enforces that every locale string has
a corresponding base entry, so these orphans broke the build. Removed
across 35 locale files (154 lines).
Keys removed:
- privacy_and_security
- database_passphrase_and_export
- settings_section_title_chat_database
- settings_section_title_support
- settings_section_title_app
* Revert "android, desktop: remove orphan locale strings"
This reverts commit 0ad5fc9308a3599d15bf50ca1980002ae0e467b2.
* android, desktop: restore base strings for removed keys
Counterpart to revert of 0ad5fc930: re-add the 5 base entries that
442a368c9 had deleted so the locale files (restored by the prior revert)
are no longer orphaned. Translation keys must not be removed once
introduced — the values can change but the keys stay.
Keys restored to base with their master English values:
- database_passphrase_and_export
- privacy_and_security
- settings_section_title_chat_database
- settings_section_title_support
- settings_section_title_app
* android, desktop: keep share-button helpers in SettingsView
ContributeItem, RateAppItem, StarOnGithubItem were moved from
SettingsView.kt to HelpAndSupportView.kt as part of the reorg.
Move them back: just drop the `private` modifier (one-word edit
per function) so HelpAndSupportView can call them in place. Saves
~60 lines of diff churn vs the move + matches the file's existing
pattern where helpers like AppVersionItem, ChatPreferencesItem,
ChatLockItem, etc. are all public top-level @Composable.
* android, desktop: inline HelpAndSupportView into SettingsView.kt
HelpAndSupportView is the only call site of SettingsView.kt's
share-button helpers; placing it as a top-level @Composable in
SettingsView.kt keeps the help/about/contact/support flow next to
the other settings entry points and removes the need for a new file.
Three imports (BuildConfigCommon, SimpleXInfo, WhatsNewView) that
the reorg was deleting from SettingsView.kt stay in place. Saves
~35 lines of diff and one new file.
* android, desktop: inline AdvancedSettingsView into SettingsView.kt
Same treatment as HelpAndSupportView in the previous commit:
AdvancedSettingsView is only reached from SettingsLayout, so the
function and its expect declaration live as top-level @Composable
in SettingsView.kt instead of a new file. NetworkAndServersView
import that the reorg was deleting from SettingsView.kt stays.
The .android.kt / .desktop.kt actuals are unchanged and keep
implementing the (now relocated) expect. Saves ~15 lines and a file.
* ios: settings navigation reorganization
Mirror the multiplatform reorg on iOS:
Root SettingsView: collapse the 5 sections into 2 unlabeled groups —
{Appearance, Your privacy, Chat data} and {Help & support, Migrate to
another device, Advanced settings}. "Privacy & security" becomes
"Your privacy"; the database row label becomes "Chat data".
PrivacySettings: keeps Device, link previews / remove tracking,
auto-accept images, blur media, contact requests from groups. Adds a
"More privacy" link.
MorePrivacy (new, inlined in PrivacySettings.swift): show last
messages, message draft, encrypt local files, protect IP address
(with original dynamic footer preserved), notification preview mode
(moved from NotificationsView), delivery receipts. Own state and
private helpers for the moved set* functions.
HelpAndSupportView (new, inlined in SettingsView.swift): merges Help
and Support sections into Help / About (with App version) / Contact /
Support the project.
AdvancedSettingsView (new, inlined in SettingsView.swift): Network &
servers, Notifications, Audio & video calls, Developer tools. iOS has
no Restart/Shutdown (Android-only) or App update channel (desktop).
NotificationsView: "Show preview" navigation removed — it now lives
in MorePrivacy. notificationsIcon() promoted to a free function so
AdvancedSettingsView can render the notifications status badge.
* android, desktop: keep platform file names as SettingsView.{android,desktop}.kt
Revert the file renames from {Advanced}SettingsView.{android,desktop}.kt.
Function rename SettingsSectionApp → AdvancedSettingsAppSection stays
inside each file; only the file path returns to its original name. No
behavior change; diff stat now shows two in-place modifications instead
of renames.
* ios: keep PrivacySettings/SettingsView state in place, use inline destinations
Restructure the iOS reorg to avoid moving state, helpers, and the alert
enum out of PrivacySettings — and to avoid moving notificationsIcon
out of SettingsView. The Help & Support, Advanced Settings, and
More Privacy "screens" become private computed properties on their
parent struct, so all @AppStorage, @State, set* helpers, and the
PrivacySettingsViewAlert enum stay UNCHANGED from master. NavigationLink
destinations reference the computed properties directly.
Net iOS diff vs master: 220+/154- (was 361+/259-) — saves ~245 lines.
* simplex settings
* android, desktop: mirror iOS settings reorganization
- inline Advanced settings section into the main settings list (Network &
servers, Notifications, Audio & video calls, App version); remove the
separate Advanced settings page
- reorder first section: Appearance, Your privacy, Help & support, Chat data,
Migrate; merge About SimpleX Chat into the Help section
- move the developer/maintenance section under App version (VersionInfoView);
load core version inside the view so it always opens (Developer tools and
Shutdown stay reachable even if the version request fails)
- keep "Developer tools" label (not renamed to "Developer")
- replace the Restart row with Cancel/Restart/Shutdown options in the
Shutdown dialog
- split DatabaseView: "Chat data" page (messages TTL, Database passphrase &
export, Files & media) and a sub-page with passphrase/export/import/delete
and the Run chat toggle; rename title to "Chat data"
- align delivery receipts alert wording with the renamed "Your privacy" settings
* android, desktop: simplify settings reorg internals
- VersionInfoView: drop the section/card wrapping, keep the original plain
version-text layout; load core version in-view so the screen always opens
- DatabaseView: make the "Database passphrase & export" sub-page a
self-contained DatabaseManagementView that owns its own state, mirroring the
DatabaseView/DatabaseLayout pattern instead of threading params through a modal
* android, desktop: show App version screen as a card screen
VersionInfoView now hosts a settings section (Developer tools / updates), so
open it with cardScreen = true like the other settings screens — otherwise the
section renders without the card box around it.
* android, desktop: show "Rate the app" only on mobile
The action opens a Play Store link, which does nothing on desktop (the
market:// scheme has no handler and the web fallback never fires). Gate it to
Android, like the Contribute item.
* android, desktop: move Shutdown to settings above app version
Move the Shutdown action out of the app version screen into the main
advanced settings section, just above the app version row. It stays
Android only (desktop is closed via the window) through an
AppShutdownItem expect/actual.
* android, desktop: show app version info in its own card
Wrap the version info block on the app version screen in a section card,
matching iOS and the rest of the card-screen settings.
* fix background
---------
Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com>
Narasimha-sc