Reorder the collapsible Advanced section's SwitchRows in SettingsScreen.kt to the order specified in #162: Push Mail, Load Remote Images by Default, Encrypt Local Cache, Require Screen Lock, then Allow insecure STARTTLS fallback (moved last).
Relocate the Background battery usageClickRow out of Advanced entirely and into the main (always-visible) settings list, directly above local retention ("Storage on this device") — it's common enough (OEM battery optimization delaying push mail) that it shouldn't be hidden behind "Advanced".
Pure composable-placement change: no string changes (existing wording already matched), no behavior change to any individual toggle/row.
Coordinates with #158/#169 (already merged), which reordered the surrounding top-level sections that the relocated Battery row now sits among.
assembleDebug, testDebugUnitTest, lintDebug, ktlintCheck, detekt, compileDebugAndroidTestKotlin all green locally (JDK 21).
Reviewed SettingsScreenTest.kt (androidTest): its app-lock test clicks the Advanced header then the row by text, not position — unaffected by reorder. No order-dependent tests found for the Advanced block or the Battery row.
## Summary
- Reorder the collapsible **Advanced** section's `SwitchRow`s in `SettingsScreen.kt` to the order specified in #162: Push Mail, Load Remote Images by Default, Encrypt Local Cache, Require Screen Lock, then Allow insecure STARTTLS fallback (moved last).
- Relocate the **Background battery usage** `ClickRow` out of Advanced entirely and into the main (always-visible) settings list, directly above local retention ("Storage on this device") — it's common enough (OEM battery optimization delaying push mail) that it shouldn't be hidden behind "Advanced".
- Pure composable-placement change: no string changes (existing wording already matched), no behavior change to any individual toggle/row.
Coordinates with #158/#169 (already merged), which reordered the surrounding top-level sections that the relocated Battery row now sits among.
Closes #162
## Test plan
- [x] `assembleDebug`, `testDebugUnitTest`, `lintDebug`, `ktlintCheck`, `detekt`, `compileDebugAndroidTestKotlin` all green locally (JDK 21).
- [x] Reviewed `SettingsScreenTest.kt` (androidTest): its app-lock test clicks the Advanced header then the row by text, not position — unaffected by reorder. No order-dependent tests found for the Advanced block or the Battery row.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
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.
Summary
SwitchRows inSettingsScreen.ktto the order specified in #162: Push Mail, Load Remote Images by Default, Encrypt Local Cache, Require Screen Lock, then Allow insecure STARTTLS fallback (moved last).ClickRowout of Advanced entirely and into the main (always-visible) settings list, directly above local retention ("Storage on this device") — it's common enough (OEM battery optimization delaying push mail) that it shouldn't be hidden behind "Advanced".Coordinates with #158/#169 (already merged), which reordered the surrounding top-level sections that the relocated Battery row now sits among.
Closes #162
Test plan
assembleDebug,testDebugUnitTest,lintDebug,ktlintCheck,detekt,compileDebugAndroidTestKotlinall green locally (JDK 21).SettingsScreenTest.kt(androidTest): its app-lock test clicks the Advanced header then the row by text, not position — unaffected by reorder. No order-dependent tests found for the Advanced block or the Battery row.🤖 Generated with Claude Code