fix navigation titles

This reverts commit 3aa1688cbd.

apps/ios/Shared/ContentView.swift

@@ -13,6 +13,7 @@ struct ContentView: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var alertManager = AlertManager.shared
     @ObservedObject var callController = CallController.shared
+    @ObservedObject var appSheetState = AppSheetState.shared
     @Environment(\.colorScheme) var colorScheme
     @EnvironmentObject var theme: AppTheme
     @EnvironmentObject var sceneDelegate: SceneDelegate
@@ -250,7 +251,8 @@ struct ContentView: View {
 
     private func mainView() -> some View {
         ZStack(alignment: .top) {
-            ChatListView(activeUserPickerSheet: $chatListUserPickerSheet).privacySensitive(protectScreen)
+            ChatListView(activeUserPickerSheet: $chatListUserPickerSheet)
+                .redacted(reason: appSheetState.redactionReasons(protectScreen))
             .onAppear {
                 requestNtfAuthorization()
                 // Local Authentication notice is to be shown on next start after onboarding is complete

apps/ios/Shared/Views/ChatList/ChatListView.swift

@@ -121,9 +121,11 @@ struct ChatListView: View {
                 UserPicker(userPickerShown: $userPickerShown, activeSheet: $activeUserPickerSheet)
             }
         )
-        .sheet(item: $activeUserPickerSheet) {
-            UserPickerSheetView(sheet: $0)
-        }
+        .appSheet(
+            item: $activeUserPickerSheet,
+            onDismiss: { chatModel.laRequest = nil },
+            content: { UserPickerSheetView(sheet: $0) }
+        )
         .onChange(of: activeUserPickerSheet) {
             if $0 != nil {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {

apps/ios/Shared/Views/Helpers/AppSheet.swift

@@ -11,6 +11,12 @@ import SwiftUI
 class AppSheetState: ObservableObject {
     static let shared = AppSheetState()
     @Published var scenePhaseActive: Bool = false
+
+    func redactionReasons(_ protectScreen: Bool) -> RedactionReasons {
+        !protectScreen || scenePhaseActive
+        ? RedactionReasons()
+        : RedactionReasons.placeholder
+    }
 }
 
 private struct PrivacySensitive: ViewModifier {
@@ -19,11 +25,7 @@ private struct PrivacySensitive: ViewModifier {
     @ObservedObject var appSheetState: AppSheetState = AppSheetState.shared
 
     func body(content: Content) -> some View {
-        if !protectScreen {
-            content
-        } else {
-            content.privacySensitive(!appSheetState.scenePhaseActive).redacted(reason: .privacy)
-        }
+        content.redacted(reason: appSheetState.redactionReasons(protectScreen))
     }
 }
 

apps/ios/Shared/Views/TerminalView.swift

@@ -105,7 +105,11 @@ struct TerminalView: View {
             }
         }
         .navigationViewStyle(.stack)
-        .navigationTitle("Chat console")
+        .toolbar {
+            ToolbarItem(placement: .principal) {
+                Text("Chat console").font(.headline)
+            }
+        }
         .modifier(ThemedBackground())
     }
 

apps/ios/Shared/Views/UserSettings/SettingsView.swift

@@ -331,7 +331,11 @@ struct SettingsView: View {
                     chatDatabaseRow()
                     NavigationLink {
                         MigrateFromDevice(showProgressOnSettings: $showProgress)
-                            .navigationTitle("Migrate device")
+                            .toolbar {
+                                ToolbarItem(placement: .principal) {
+                                    Text("Migrate device").font(.headline)
+                                }
+                            }
                             .modifier(ThemedBackground(grouped: true))
                             .navigationBarTitleDisplayMode(.large)
                     } label: {