The collapsible Advanced section in SettingsScreen.kt (~lines 218-260) currently renders, in
order: Push mail (IMAP IDLE), Background battery usage, Allow insecure STARTTLS fallback, Load
remote images by default, Encrypt local cache, Require screen lock. This ticket reorders it and
relocates one item out of Advanced entirely.
Requested order (all existing strings already match this wording, so this is a pure
reorder/relocate — no renames needed):
Push Mail (settings_adv_idle)
Load Remote Images by Default (settings_adv_remote_images)
Encrypt Local Cache (settings_adv_encrypt_cache)
Require Screen Lock (settings_adv_app_lock)
Allow insecure fallback / STARTTLS (settings_adv_starttls) — moved to last.
Background battery usage (settings_adv_battery, the ClickRow that deep-links to system
battery settings — see #150 for a related deep-link improvement) moves out of Advanced entirely
and into the main (non-collapsible) settings list, positioned "just above local message retention
options" — i.e. immediately before the RetentionSection ("Storage on this device").
Scope
Reorder the five remaining SwitchRows inside the AnimatedVisibility(visible = advancedExpanded) block in SettingsScreen.kt per the list above.
Move the settings_adv_batteryClickRow out of that block and into the main settings Column, immediately above RetentionSection (~line 209).
No string changes needed — only composable placement.
Acceptance criteria
Advanced settings render in the specified order with Battery no longer present there.
Background battery usage appears in the main (always-visible) settings list, directly above
"Storage on this device".
No behavior change to any individual toggle/row — this is a layout/placement pass.
Relevant files
ui/settings/SettingsScreen.kt (~lines 199-260).
Dependencies
Coordinate with #158 (Settings hierarchy list), which reorders the surrounding top-level sections
that this ticket's relocated Battery row will sit among.
## Context
The collapsible Advanced section in `SettingsScreen.kt` (~lines 218-260) currently renders, in
order: Push mail (IMAP IDLE), Background battery usage, Allow insecure STARTTLS fallback, Load
remote images by default, Encrypt local cache, Require screen lock. This ticket reorders it and
relocates one item out of Advanced entirely.
Requested order (all existing strings already match this wording, so this is a pure
reorder/relocate — no renames needed):
1. Push Mail (`settings_adv_idle`)
2. Load Remote Images by Default (`settings_adv_remote_images`)
3. Encrypt Local Cache (`settings_adv_encrypt_cache`)
4. Require Screen Lock (`settings_adv_app_lock`)
5. Allow insecure fallback / STARTTLS (`settings_adv_starttls`) — moved to last.
**Background battery usage** (`settings_adv_battery`, the `ClickRow` that deep-links to system
battery settings — see #150 for a related deep-link improvement) moves **out of Advanced entirely**
and into the main (non-collapsible) settings list, positioned "just above local message retention
options" — i.e. immediately before the `RetentionSection` ("Storage on this device").
## Scope
- [ ] Reorder the five remaining `SwitchRow`s inside the `AnimatedVisibility(visible =
advancedExpanded)` block in `SettingsScreen.kt` per the list above.
- [ ] Move the `settings_adv_battery` `ClickRow` out of that block and into the main settings
`Column`, immediately above `RetentionSection` (~line 209).
- [ ] No string changes needed — only composable placement.
## Acceptance criteria
- Advanced settings render in the specified order with Battery no longer present there.
- Background battery usage appears in the main (always-visible) settings list, directly above
"Storage on this device".
- No behavior change to any individual toggle/row — this is a layout/placement pass.
## Relevant files
- `ui/settings/SettingsScreen.kt` (~lines 199-260).
## Dependencies
Coordinate with #158 (Settings hierarchy list), which reorders the surrounding top-level sections
that this ticket's relocated Battery row will sit among.
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Context
The collapsible Advanced section in
SettingsScreen.kt(~lines 218-260) currently renders, inorder: Push mail (IMAP IDLE), Background battery usage, Allow insecure STARTTLS fallback, Load
remote images by default, Encrypt local cache, Require screen lock. This ticket reorders it and
relocates one item out of Advanced entirely.
Requested order (all existing strings already match this wording, so this is a pure
reorder/relocate — no renames needed):
settings_adv_idle)settings_adv_remote_images)settings_adv_encrypt_cache)settings_adv_app_lock)settings_adv_starttls) — moved to last.Background battery usage (
settings_adv_battery, theClickRowthat deep-links to systembattery settings — see #150 for a related deep-link improvement) moves out of Advanced entirely
and into the main (non-collapsible) settings list, positioned "just above local message retention
options" — i.e. immediately before the
RetentionSection("Storage on this device").Scope
SwitchRows inside theAnimatedVisibility(visible = advancedExpanded)block inSettingsScreen.ktper the list above.settings_adv_batteryClickRowout of that block and into the main settingsColumn, immediately aboveRetentionSection(~line 209).Acceptance criteria
"Storage on this device".
Relevant files
ui/settings/SettingsScreen.kt(~lines 199-260).Dependencies
Coordinate with #158 (Settings hierarchy list), which reorders the surrounding top-level sections
that this ticket's relocated Battery row will sit among.