Re-organise SettingsScreen to have distinct Account/App settings. (#6288)

* Re-organise SettingsScreen to have distinct Account/App settings.

* Remove the AdvancedSettingsScreen.

ElementX/Sources/Screens/Settings/SettingsScreen/SettingsScreenModels.swift

@@ -10,23 +10,30 @@ import SwiftUI
 
 enum SettingsScreenViewModelAction {
     case close
+    
     case userDetails
     case userStatusEmojiPicker(EmojiPickerScreenContinuation)
+    
     case addAccount
-    case linkNewDevice
+    
     case manageAccount(url: URL)
-    case analytics
-    case appLock
-    case reportBug
-    case about
-    case blockedUsers
-    case secureBackup
+    case linkNewDevice
     case notifications
-    case advancedSettings
-    case labs
-    case developerOptions
+    case secureBackup
+    case moderationAndSafety
+    case reportBug
+    
     case logout
     case deactivateAccount
+    
+    case mediaUploadQuality
+    case appLock
+    case locationSharing
+    case analytics
+    case labs
+    case about
+    
+    case developerOptions
 }
 
 enum SettingsScreenSecuritySectionMode {
@@ -47,14 +54,13 @@ struct SettingsScreenViewState: BindableState {
     var securitySectionMode = SettingsScreenSecuritySectionMode.none
     var showSecuritySectionBadge = false
     
-    var showBlockedUsers = false
     let showAnalyticsSettings: Bool
     
     let isBugReportServiceEnabled: Bool
     
     let navigationBarVisibility: Visibility
     
-    var bindings = SettingsScreenViewStateBindings()
+    var bindings: SettingsScreenViewStateBindings
     
     var userStatusRowMode: SettingsScreenUserStatusRow.Mode {
         if bindings.isShowingCustomStatusField {
@@ -68,6 +74,8 @@ struct SettingsScreenViewState: BindableState {
 }
 
 struct SettingsScreenViewStateBindings {
+    private let userSettings: UserSettings
+    
     var isPresentingStatusPicker = false
     var customStatusEmoji: Character = "😄"
     var isShowingCustomStatusField = false {
@@ -79,29 +87,45 @@ struct SettingsScreenViewStateBindings {
     }
     
     var isPresentingAccountDeactivationConfirmation = false
+    
+    var appAppearance: AppAppearance {
+        get { userSettings.appAppearance }
+        set { userSettings.appAppearance = newValue }
+    }
+    
+    init(userSettings: UserSettings) {
+        self.userSettings = userSettings
+    }
 }
 
 enum SettingsScreenViewAction {
     case close
+    
     case userDetails
     case userStatus(UserStatusAction)
+    
     case addAccount
-    case analytics
-    case appLock
-    case reportBug
-    case about
-    case blockedUsers
-    case secureBackup
-    case linkNewDevice
+    
     case manageAccount(url: URL)
+    case linkNewDevice
     case notifications
-    case enableDeveloperOptions
-    case developerOptions
-    case advancedSettings
-    case labs
+    case secureBackup
+    case moderationAndSafety
+    case reportBug
+    
     case logout
     case deactivateAccount
     
+    case mediaUploadQuality
+    case appLock
+    case locationSharing
+    case analytics
+    case labs
+    case about
+    
+    case enableDeveloperOptions
+    case developerOptions
+    
     enum UserStatusAction {
         /// Show status picker sheet to select a preset status.
         case pickStatus