diff --git a/Riot/Assets/Riot-Defaults.plist b/Riot/Assets/Riot-Defaults.plist deleted file mode 100644 index 06791225c..000000000 --- a/Riot/Assets/Riot-Defaults.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - pinRoomsWithMissedNotif - - pinRoomsWithUnread - - matrixApps - - showAllEventsInRoomHistory - - showRedactionsInRoomHistory - - showUnsupportedEventsInRoomHistory - - sortRoomMembersUsingLastSeenTime - - showLeftMembersInRoomMemberList - - syncLocalContacts - - enableRageShake - - maxAllowedMediaCacheSize - 1073741824 - presenceColorForOnlineUser - 3401011 - presenceColorForUnavailableUser - 15066368 - presenceColorForOfflineUser - 15020851 - enableBotCreation - - enableRingingForGroupCalls - - - diff --git a/Riot/Generated/RiotDefaults.swift b/Riot/Generated/RiotDefaults.swift deleted file mode 100644 index 793d63662..000000000 --- a/Riot/Generated/RiotDefaults.swift +++ /dev/null @@ -1,73 +0,0 @@ -// swiftlint:disable all -// Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen - -import Foundation - -// swiftlint:disable superfluous_disable_command -// swiftlint:disable file_length - -// MARK: - Plist Files - -// swiftlint:disable identifier_name line_length type_body_length -internal enum RiotDefaults { - private static let _document = PlistDocument(path: "Riot-Defaults.plist") - - internal static let enableBotCreation: Bool = _document["enableBotCreation"] - internal static let enableRageShake: Bool = _document["enableRageShake"] - internal static let enableRingingForGroupCalls: Bool = _document["enableRingingForGroupCalls"] - internal static let matrixApps: Bool = _document["matrixApps"] - internal static let maxAllowedMediaCacheSize: Int = _document["maxAllowedMediaCacheSize"] - internal static let pinRoomsWithMissedNotif: Bool = _document["pinRoomsWithMissedNotif"] - internal static let pinRoomsWithUnread: Bool = _document["pinRoomsWithUnread"] - internal static let presenceColorForOfflineUser: Int = _document["presenceColorForOfflineUser"] - internal static let presenceColorForOnlineUser: Int = _document["presenceColorForOnlineUser"] - internal static let presenceColorForUnavailableUser: Int = _document["presenceColorForUnavailableUser"] - internal static let showAllEventsInRoomHistory: Bool = _document["showAllEventsInRoomHistory"] - internal static let showLeftMembersInRoomMemberList: Bool = _document["showLeftMembersInRoomMemberList"] - internal static let showRedactionsInRoomHistory: Bool = _document["showRedactionsInRoomHistory"] - internal static let showUnsupportedEventsInRoomHistory: Bool = _document["showUnsupportedEventsInRoomHistory"] - internal static let sortRoomMembersUsingLastSeenTime: Bool = _document["sortRoomMembersUsingLastSeenTime"] - internal static let syncLocalContacts: Bool = _document["syncLocalContacts"] -} -// swiftlint:enable identifier_name line_length type_body_length - -// MARK: - Implementation Details - -private func arrayFromPlist(at path: String) -> [T] { - guard let url = BundleToken.bundle.url(forResource: path, withExtension: nil), - let data = NSArray(contentsOf: url) as? [T] else { - fatalError("Unable to load PLIST at path: \(path)") - } - return data -} - -private struct PlistDocument { - let data: [String: Any] - - init(path: String) { - guard let url = BundleToken.bundle.url(forResource: path, withExtension: nil), - let data = NSDictionary(contentsOf: url) as? [String: Any] else { - fatalError("Unable to load PLIST at path: \(path)") - } - self.data = data - } - - subscript(key: String) -> T { - guard let result = data[key] as? T else { - fatalError("Property '\(key)' is not of type \(T.self)") - } - return result - } -} - -// swiftlint:disable convenience_type -private final class BundleToken { - static let bundle: Bundle = { - #if SWIFT_PACKAGE - return Bundle.module - #else - return Bundle(for: BundleToken.self) - #endif - }() -} -// swiftlint:enable convenience_type diff --git a/Riot/SupportingFiles/Info.plist b/Riot/SupportingFiles/Info.plist index 668798a9a..4eaf0aa24 100644 --- a/Riot/SupportingFiles/Info.plist +++ b/Riot/SupportingFiles/Info.plist @@ -139,8 +139,6 @@ im.vector.app.pills - UserDefaults - ${PRODUCT_NAME}-Defaults applicationGroupIdentifier $(APPLICATION_GROUP_IDENTIFIER) baseBundleIdentifier diff --git a/Tools/SwiftGen/swiftgen-config.yml b/Tools/SwiftGen/swiftgen-config.yml index 957f70fae..7c498ccbc 100755 --- a/Tools/SwiftGen/swiftgen-config.yml +++ b/Tools/SwiftGen/swiftgen-config.yml @@ -29,11 +29,4 @@ xcassets: - Assets/SharedImages.xcassets outputs: templatePath: Templates/Assets/swift4-element.stencil - output: Images.swift -plist: - inputs: Assets/Riot-Defaults.plist - outputs: - templateName: runtime-swift4 - output: RiotDefaults.swift - params: - enumName: RiotDefaults + output: Images.swift \ No newline at end of file