Merge branch 'develop' into element_4218

# Conflicts: # CHANGES.rst # Riot/Managers/Settings/RiotSettings.swift
2026-05-03 22:56:57 +02:00 · 2021-04-20 15:27:27 +02:00
parent 0c265b3917 655584d9f5
commit bc282c7fdb
17 changed files with 986 additions and 229 deletions
@@ -60,6 +60,13 @@ final class RiotSettings: NSObject {
        static let roomSettingsScreenShowFlairSettings = "roomSettingsScreenShowFlairSettings"
        static let roomSettingsScreenShowAdvancedSettings = "roomSettingsScreenShowAdvancedSettings"
        static let roomSettingsScreenAdvancedShowEncryptToVerifiedOption = "roomSettingsScreenAdvancedShowEncryptToVerifiedOption"
+        static let homeScreenShowFavouritesTab = "homeScreenShowFavouritesTab"
+        static let homeScreenShowPeopleTab = "homeScreenShowPeopleTab"
+        static let homeScreenShowRoomsTab = "homeScreenShowRoomsTab"
+        static let homeScreenShowCommunitiesTab = "homeScreenShowCommunitiesTab"
+        static let roomScreenAllowVoIPForDirectRoom = "roomScreenAllowVoIPForDirectRoom"
+        static let roomScreenAllowVoIPForNonDirectRoom = "roomScreenAllowVoIPForNonDirectRoom"
+        static let unifiedSearchScreenShowPublicDirectory = "unifiedSearchScreenShowPublicDirectory"
    }
    
    static let shared = RiotSettings()
@@ -258,6 +265,29 @@ final class RiotSettings: NSObject {
        }
    }
    
+    // MARK: - Room Screen
+    
+    var roomScreenAllowVoIPForDirectRoom: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.roomScreenAllowVoIPForDirectRoom) != nil else {
+                return BuildSettings.roomScreenAllowVoIPForDirectRoom
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.roomScreenAllowVoIPForDirectRoom)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.roomScreenAllowVoIPForDirectRoom)
+        }
+    }
+    var roomScreenAllowVoIPForNonDirectRoom: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.roomScreenAllowVoIPForNonDirectRoom) != nil else {
+                return BuildSettings.roomScreenAllowVoIPForNonDirectRoom
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.roomScreenAllowVoIPForNonDirectRoom)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.roomScreenAllowVoIPForNonDirectRoom)
+        }
+    }
+
    // MARK: - Room Creation Screen

    var roomCreationScreenAllowEncryptionConfiguration: Bool {
@@ -313,6 +343,49 @@ final class RiotSettings: NSObject {
            defaults.set(newValue, forKey: UserDefaultsKeys.allowInviteExernalUsers)
        }
    }
+    
+    // MARK: - Main Tabs
+    
+    var homeScreenShowFavouritesTab: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.homeScreenShowFavouritesTab) != nil else {
+                return BuildSettings.homeScreenShowFavouritesTab
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.homeScreenShowFavouritesTab)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.homeScreenShowFavouritesTab)
+        }
+    }
+    var homeScreenShowPeopleTab: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.homeScreenShowPeopleTab) != nil else {
+                return BuildSettings.homeScreenShowPeopleTab
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.homeScreenShowPeopleTab)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.homeScreenShowPeopleTab)
+        }
+    }
+    var homeScreenShowRoomsTab: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.homeScreenShowRoomsTab) != nil else {
+                return BuildSettings.homeScreenShowRoomsTab
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.homeScreenShowRoomsTab)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.homeScreenShowRoomsTab)
+        }
+    }
+    var homeScreenShowCommunitiesTab: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.homeScreenShowCommunitiesTab) != nil else {
+                return BuildSettings.homeScreenShowCommunitiesTab
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.homeScreenShowCommunitiesTab)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.homeScreenShowCommunitiesTab)
+        }
+    }

    // MARK: General Settings
    
@@ -500,4 +573,17 @@ final class RiotSettings: NSObject {
        }
    }

+    // Mark: - Unified Search
+    
+    var unifiedSearchScreenShowPublicDirectory: Bool {
+        get {
+            guard defaults.object(forKey: UserDefaultsKeys.unifiedSearchScreenShowPublicDirectory) != nil else {
+                return BuildSettings.unifiedSearchScreenShowPublicDirectory
+            }
+            return defaults.bool(forKey: UserDefaultsKeys.unifiedSearchScreenShowPublicDirectory)
+        } set {
+            defaults.set(newValue, forKey: UserDefaultsKeys.unifiedSearchScreenShowPublicDirectory)
+        }
+    }
+    
 }