marmot-protocol · agent-p1p · Jul 15, 2026
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -8,6 +8,7 @@ plugins {
     alias(libs.plugins.ktlint)
     alias(libs.plugins.roborazzi)
     alias(libs.plugins.kover)
+    alias(libs.plugins.oss.licenses)
 }
 
 // Apply the Firebase plugin only when its expected config file is present.
@@ -628,6 +629,7 @@ dependencies {
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.messaging)
     implementation(libs.play.services.base)
+    implementation(libs.play.services.oss.licenses)
     implementation(libs.androidx.security.crypto)
     implementation(libs.androidx.biometric)
     implementation(libs.androidx.work.runtime)

diff --git a/app/src/main/java/dev/ipf/whitenoise/android/ui/navigation/AppDestinations.kt b/app/src/main/java/dev/ipf/whitenoise/android/ui/navigation/AppDestinations.kt
@@ -14,10 +14,30 @@ internal enum class SettingsDetail {
     FontSize,
     Data,
     Profile,
-    Identity,
+    AccountKeys,
     Relays,
     KeyPackages,
     Notifications,
-    SecurityPrivacy,
+    DevicePrivacy,
+    Help,
+    About,
+    Developer,
     Donate,
 }
+
+private val defaultSettingsHomeDetails =
+    listOf(
+        SettingsDetail.Notifications,
+        SettingsDetail.DevicePrivacy,
+        SettingsDetail.Data,
+        SettingsDetail.Appearance,
+        SettingsDetail.Relays,
+        SettingsDetail.AccountKeys,
+        SettingsDetail.Help,
+    )
+
+private val developerSettingsHomeDetails = defaultSettingsHomeDetails + SettingsDetail.Developer
+
+internal fun settingsHomeDetails(developerMode: Boolean): List<SettingsDetail> = if (developerMode) developerSettingsHomeDetails else defaultSettingsHomeDetails
+
+internal fun shouldUnlockDeveloperMode(versionTapCount: Int): Boolean = versionTapCount >= 7
diff --git a/app/src/main/java/dev/ipf/whitenoise/android/ui/navigation/MainShell.kt b/app/src/main/java/dev/ipf/whitenoise/android/ui/navigation/MainShell.kt
@@ -472,7 +472,7 @@ internal fun MainShell(
                 },
                 onOpenDiagnostics = {
                     // Preserve `settingsDetailName` so backing out of
-                    // Diagnostics returns to Security & Privacy (its only
+                    // Diagnostics returns to Developer settings (its only
                     // entry point) rather than the Settings home, restoring
                     // the breadcrumb the user walked in on (#412).
                     sectionName = MainSection.Diagnostics.name
@@ -485,7 +485,7 @@ internal fun MainShell(
                 appState = appState,
                 onBack = {
                     // Leave `settingsDetailName` alone — it still holds the
-                    // detail (Security & Privacy) the user opened Diagnostics
+                    // Developer detail the user opened Diagnostics
                     // from, so Settings re-enters that screen directly (#412).
                     sectionName = MainSection.Settings.name
                 },

diff --git a/...ise/android/ui/settings/IdentityScreen.kt → .../android/ui/settings/AccountKeysScreen.kt b/...ise/android/ui/settings/IdentityScreen.kt → .../android/ui/settings/AccountKeysScreen.kt
@@ -117,9 +117,10 @@ private const val WIPE_ENGINE_FFI_AVAILABLE = true
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
-internal fun IdentityScreen(
+internal fun AccountKeysScreen(
     appState: WhiteNoiseAppState,
     onBack: () -> Unit,
+    onOpenKeyPackages: () -> Unit,
 ) {
     // The screen surfaces the raw nsec; keep it out of Recents thumbnails and
     // screenshots, matching the encrypted-backup sheet's posture.
@@ -154,7 +155,7 @@ internal fun IdentityScreen(
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(stringResource(R.string.identity)) },
+                title = { Text(stringResource(R.string.account_and_keys)) },
                 navigationIcon = {
                     IconButton(onClick = onBack) {
                         Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.back))
@@ -217,6 +218,13 @@ internal fun IdentityScreen(
                     }
                 }
             }
+            item {
+                SettingsCardRow(
+                    title = stringResource(R.string.key_packages),
+                    subtitle = stringResource(R.string.key_packages_settings_subtitle),
+                    onClick = onOpenKeyPackages,
+                )
+            }
             item {
                 SectionCard(title = stringResource(R.string.account_session)) {
                     Text(
@@ -371,7 +379,7 @@ internal fun IdentityScreen(
                         // screen's rememberCoroutineScope. signOutAndWipeActiveAccount
                         // flips activeAccountRef partway through and keeps suspending
                         // (push teardown, notification refresh); the account-change nav
-                        // reset in MainShell then pops IdentityScreen out of composition,
+                        // reset in MainShell then pops AccountKeysScreen out of composition,
                         // which would cancel a screen-scoped coroutine before the wipe
                         // finishes and before the outcome is presented (#547).
                         //

diff --git a/app/src/main/java/dev/ipf/whitenoise/android/ui/settings/AppearanceScreen.kt b/app/src/main/java/dev/ipf/whitenoise/android/ui/settings/AppearanceScreen.kt
@@ -10,6 +10,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@@ -116,7 +117,11 @@ internal fun AppearanceScreen(
                 }
             }
             item {
-                SectionCard(title = stringResource(R.string.enter_key_behavior_title)) {
+                SectionCard(title = stringResource(R.string.composer)) {
+                    Text(
+                        text = stringResource(R.string.enter_key_behavior_title),
+                        style = MaterialTheme.typography.labelLarge,
+                    )
                     EnterKeyBehavior.entries.forEach { behavior ->
                         SelectableSettingsRow(
                             title = stringResource(behavior.labelRes),

diff --git a/app/src/main/java/dev/ipf/whitenoise/android/ui/settings/DeveloperScreen.kt b/app/src/main/java/dev/ipf/whitenoise/android/ui/settings/DeveloperScreen.kt
@@ -0,0 +1,74 @@
+package dev.ipf.whitenoise.android.ui.settings
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import dev.ipf.whitenoise.android.R
+import dev.ipf.whitenoise.android.state.WhiteNoiseAppState
+import dev.ipf.whitenoise.android.ui.common.SectionCard
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+internal fun DeveloperScreen(
+    appState: WhiteNoiseAppState,
+    onBack: () -> Unit,
+    onOpenDiagnostics: () -> Unit,
+) {
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = { Text(stringResource(R.string.developer)) },
+                navigationIcon = {
+                    IconButton(onClick = onBack) {
+                        Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.back))
+                    }
+                },
+            )
+        },
+    ) { padding ->
+        LazyColumn(
+            Modifier.fillMaxSize().padding(padding).padding(16.dp),
+            verticalArrangement = Arrangement.spacedBy(16.dp),
+        ) {
+            item {
+                SectionCard(title = stringResource(R.string.developer)) {
+                    SettingsSwitchRow(
+                        title = stringResource(R.string.developer_mode),
+                        subtitle = stringResource(R.string.developer_mode_subtitle),
+                        checked = appState.developerMode,
+                        onCheckedChange = { appState.updateDeveloperMode(it) },
+                    )
+                    if (appState.developerMode) {
+                        HorizontalDivider(Modifier.padding(vertical = 12.dp))
+                        SettingsRow(
+                            title = stringResource(R.string.diagnostics),
+                            subtitle = stringResource(R.string.diagnostics_settings_subtitle),
+                            onClick = onOpenDiagnostics,
+                        )
+                        HorizontalDivider(Modifier.padding(vertical = 12.dp))
+                        SettingsSwitchRow(
+                            title = stringResource(R.string.streaming_debug),
+                            subtitle = stringResource(R.string.streaming_debug_subtitle),
+                            checked = appState.streamingDebugMode,
+                            onCheckedChange = { appState.updateStreamingDebugMode(it) },
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/...roid/ui/settings/SecurityPrivacyScreen.kt → ...ndroid/ui/settings/DevicePrivacyScreen.kt b/...roid/ui/settings/SecurityPrivacyScreen.kt → ...ndroid/ui/settings/DevicePrivacyScreen.kt
@@ -43,10 +43,9 @@ import kotlinx.coroutines.delay
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-internal fun SecurityPrivacyScreen(
+internal fun DevicePrivacyScreen(
     appState: WhiteNoiseAppState,
     onBack: () -> Unit,
-    onOpenDiagnostics: () -> Unit,
 ) {
     var telemetryBusy by remember { mutableStateOf(false) }
     var auditLogsBusy by remember { mutableStateOf(false) }
@@ -59,7 +58,7 @@ internal fun SecurityPrivacyScreen(
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(stringResource(R.string.security_and_privacy)) },
+                title = { Text(stringResource(R.string.device_privacy)) },
                 navigationIcon = {
                     IconButton(onClick = onBack) {
                         Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.back))
@@ -70,7 +69,7 @@ internal fun SecurityPrivacyScreen(
     ) { padding ->
         LazyColumn(Modifier.fillMaxSize().padding(padding).padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
             item {
-                SectionCard(title = stringResource(R.string.security_and_privacy)) {
+                SectionCard(title = stringResource(R.string.device_privacy)) {
                     SettingsSwitchRow(
                         title = stringResource(R.string.require_app_unlock),
                         subtitle =
@@ -208,27 +207,6 @@ internal fun SecurityPrivacyScreen(
                     }
                 }
             }
-            item {
-                SectionCard(title = stringResource(R.string.developer)) {
-                    SettingsSwitchRow(
-                        title = stringResource(R.string.developer_mode),
-                        subtitle = stringResource(R.string.developer_mode_subtitle),
-                        checked = appState.developerMode,
-                        onCheckedChange = { appState.updateDeveloperMode(it) },
-                    )
-                    if (appState.developerMode) {
-                        HorizontalDivider(Modifier.padding(vertical = 12.dp))
-                        SettingsRow(stringResource(R.string.diagnostics), stringResource(R.string.diagnostics_settings_subtitle)) { onOpenDiagnostics() }
-                        HorizontalDivider(Modifier.padding(vertical = 12.dp))
-                        SettingsSwitchRow(
-                            title = stringResource(R.string.streaming_debug),
-                            subtitle = stringResource(R.string.streaming_debug_subtitle),
-                            checked = appState.streamingDebugMode,
-                            onCheckedChange = { appState.updateStreamingDebugMode(it) },
-                        )
-                    }
-                }
-            }
         }
     }
 }