From c39f2d94d3abbeb583a3deb9d5089868e317e11f Mon Sep 17 00:00:00 2001 From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com> Date: Wed, 5 Aug 2020 23:45:57 -0700 Subject: [PATCH] Rename UserDefaults wrapper --- Development Assets/DevelopmentModels.swift | 14 +++++++------- Metatext.xcodeproj/project.pbxproj | 12 ++++++------ Shared/MetatextApp.swift | 2 +- Shared/Model/AppEnvironment.swift | 2 +- Shared/Model/{Preferences.swift => Defaults.swift} | 8 ++++---- 5 files changed, 19 insertions(+), 19 deletions(-) rename Shared/Model/{Preferences.swift => Defaults.swift} (78%) diff --git a/Development Assets/DevelopmentModels.swift b/Development Assets/DevelopmentModels.swift index 1381ee6..7199b1e 100644 --- a/Development Assets/DevelopmentModels.swift +++ b/Development Assets/DevelopmentModels.swift @@ -24,11 +24,11 @@ extension Secrets { }() } -extension Preferences { - static func fresh() -> Preferences { Preferences(userDefaults: FakeUserDefaults()) } +extension Defaults { + static func fresh() -> Defaults { Defaults(userDefaults: FakeUserDefaults()) } - static let development: Preferences = { - let preferences = Preferences.fresh() + static let development: Defaults = { + let preferences = Defaults.fresh() preferences[.recentIdentityID] = devIdentityID @@ -99,13 +99,13 @@ extension AppEnvironment { static func fresh( URLSessionConfiguration: URLSessionConfiguration = .stubbing, identityDatabase: IdentityDatabase = .fresh(), - preferences: Preferences = .fresh(), + defaults: Defaults = .fresh(), secrets: Secrets = .fresh(), webAuthSessionType: WebAuthSession.Type = SuccessfulStubbingWebAuthSession.self) -> AppEnvironment { AppEnvironment( URLSessionConfiguration: URLSessionConfiguration, identityDatabase: identityDatabase, - preferences: preferences, + defaults: defaults, secrets: secrets, webAuthSessionType: webAuthSessionType) } @@ -113,7 +113,7 @@ extension AppEnvironment { static let development = AppEnvironment( URLSessionConfiguration: .stubbing, identityDatabase: .development, - preferences: .development, + defaults: .development, secrets: .development, webAuthSessionType: SuccessfulStubbingWebAuthSession.self) } diff --git a/Metatext.xcodeproj/project.pbxproj b/Metatext.xcodeproj/project.pbxproj index 4b4c4ae..d12c4ed 100644 --- a/Metatext.xcodeproj/project.pbxproj +++ b/Metatext.xcodeproj/project.pbxproj @@ -24,8 +24,8 @@ D052BBC724D749C800A80A7A /* RootViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D052BBC624D749C800A80A7A /* RootViewModelTests.swift */; }; D052BBCA24D74C9200A80A7A /* FakeUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = D052BBC824D74B6400A80A7A /* FakeUserDefaults.swift */; }; D052BBCB24D74C9300A80A7A /* FakeUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = D052BBC824D74B6400A80A7A /* FakeUserDefaults.swift */; }; - D052BBCF24D750C000A80A7A /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = D052BBCE24D750C000A80A7A /* Preferences.swift */; }; - D052BBD024D750C000A80A7A /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = D052BBCE24D750C000A80A7A /* Preferences.swift */; }; + D052BBCF24D750C000A80A7A /* Defaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = D052BBCE24D750C000A80A7A /* Defaults.swift */; }; + D052BBD024D750C000A80A7A /* Defaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = D052BBCE24D750C000A80A7A /* Defaults.swift */; }; D052BBD124D750CA00A80A7A /* AppEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D052BBCC24D750A100A80A7A /* AppEnvironment.swift */; }; D052BBD224D750CB00A80A7A /* AppEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D052BBCC24D750A100A80A7A /* AppEnvironment.swift */; }; D052BBE024D805E300A80A7A /* MainNavigationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D052BBDF24D805E300A80A7A /* MainNavigationViewModel.swift */; }; @@ -166,7 +166,7 @@ D052BBC624D749C800A80A7A /* RootViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootViewModelTests.swift; sourceTree = ""; }; D052BBC824D74B6400A80A7A /* FakeUserDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeUserDefaults.swift; sourceTree = ""; }; D052BBCC24D750A100A80A7A /* AppEnvironment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppEnvironment.swift; sourceTree = ""; }; - D052BBCE24D750C000A80A7A /* Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = ""; }; + D052BBCE24D750C000A80A7A /* Defaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Defaults.swift; sourceTree = ""; }; D052BBDF24D805E300A80A7A /* MainNavigationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainNavigationViewModel.swift; sourceTree = ""; }; D065F53A24D3B33A00741304 /* View+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Extensions.swift"; sourceTree = ""; }; D065F53D24D3D20300741304 /* InstanceEndpoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstanceEndpoint.swift; sourceTree = ""; }; @@ -338,7 +338,7 @@ D0666A4D24C6C39600F3F04B /* Instance.swift */, D0DC177324D0B58800A75C65 /* Keychain.swift */, D0ED1BE224CFA84400B4899C /* MastodonError.swift */, - D052BBCE24D750C000A80A7A /* Preferences.swift */, + D052BBCE24D750C000A80A7A /* Defaults.swift */, D0666A7124C6E0D300F3F04B /* Secrets.swift */, ); path = Model; @@ -657,7 +657,7 @@ D0BEC94724CA22C400E864C4 /* TimelineViewModel.swift in Sources */, D0666A4E24C6C39600F3F04B /* Instance.swift in Sources */, D0ED1BDA24CF963E00B4899C /* AppAuthorizationEndpoint.swift in Sources */, - D052BBCF24D750C000A80A7A /* Preferences.swift in Sources */, + D052BBCF24D750C000A80A7A /* Defaults.swift in Sources */, D0ED1BE324CFA84400B4899C /* MastodonError.swift in Sources */, D0666A6324C6DC6C00F3F04B /* AppAuthorization.swift in Sources */, D065F53B24D3B33A00741304 /* View+Extensions.swift in Sources */, @@ -723,7 +723,7 @@ D0BEC94824CA22C400E864C4 /* TimelineViewModel.swift in Sources */, D0666A4F24C6C39600F3F04B /* Instance.swift in Sources */, D0ED1BDB24CF963E00B4899C /* AppAuthorizationEndpoint.swift in Sources */, - D052BBD024D750C000A80A7A /* Preferences.swift in Sources */, + D052BBD024D750C000A80A7A /* Defaults.swift in Sources */, D0ED1BE424CFA84400B4899C /* MastodonError.swift in Sources */, D0666A6424C6DC6C00F3F04B /* AppAuthorization.swift in Sources */, D065F53C24D3B33A00741304 /* View+Extensions.swift in Sources */, diff --git a/Shared/MetatextApp.swift b/Shared/MetatextApp.swift index 9949b9e..2944a73 100644 --- a/Shared/MetatextApp.swift +++ b/Shared/MetatextApp.swift @@ -18,7 +18,7 @@ struct MetatextApp: App { environment = AppEnvironment( URLSessionConfiguration: .default, identityDatabase: identityDatabase, - preferences: Preferences(userDefaults: .standard), + defaults: Defaults(userDefaults: .standard), secrets: Secrets(keychain: Keychain(service: "com.metabolist.metatext")), webAuthSessionType: RealWebAuthSession.self) } diff --git a/Shared/Model/AppEnvironment.swift b/Shared/Model/AppEnvironment.swift index a9536fe..ed5cba0 100644 --- a/Shared/Model/AppEnvironment.swift +++ b/Shared/Model/AppEnvironment.swift @@ -5,7 +5,7 @@ import Foundation struct AppEnvironment { let URLSessionConfiguration: URLSessionConfiguration let identityDatabase: IdentityDatabase - let preferences: Preferences + let defaults: Defaults let secrets: Secrets let webAuthSessionType: WebAuthSession.Type } diff --git a/Shared/Model/Preferences.swift b/Shared/Model/Defaults.swift similarity index 78% rename from Shared/Model/Preferences.swift rename to Shared/Model/Defaults.swift index 2993000..1237c92 100644 --- a/Shared/Model/Preferences.swift +++ b/Shared/Model/Defaults.swift @@ -2,7 +2,7 @@ import Foundation -class Preferences { +class Defaults { private let userDefaults: UserDefaults init(userDefaults: UserDefaults) { @@ -10,14 +10,14 @@ class Preferences { } } -extension Preferences { +extension Defaults { enum Item: String { case recentIdentityID = "recent-identity-id" } } -extension Preferences { - subscript(index: Preferences.Item) -> T? { +extension Defaults { + subscript(index: Defaults.Item) -> T? { get { userDefaults.value(forKey: index.rawValue) as? T } set { userDefaults.set(newValue, forKey: index.rawValue) } }