diff --git a/.swiftlint.yml b/.swiftlint.yml index 7169aa4..b5d861e 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -20,13 +20,6 @@ opt_in_rules: included: - NativeAppTemplate -# Excluded paths -excluded: - - Pods - - Carthage - - DerivedData - - .build - # Configured rules line_length: warning: 120 @@ -62,6 +55,4 @@ identifier_name: max_length: warning: 50 excluded: - - by - id - - db diff --git a/NativeAppTemplate.xcodeproj/project.pbxproj b/NativeAppTemplate.xcodeproj/project.pbxproj index 638b575..9ed3710 100644 --- a/NativeAppTemplate.xcodeproj/project.pbxproj +++ b/NativeAppTemplate.xcodeproj/project.pbxproj @@ -56,7 +56,6 @@ 0172046625AA82BF008FD63B /* MessageBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172045925AA82B4008FD63B /* MessageBarView.swift */; }; 0172046725AA82BF008FD63B /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172045725AA82B4008FD63B /* MainView.swift */; }; 0172046925AA82BF008FD63B /* PermissionsLoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172045D25AA82B4008FD63B /* PermissionsLoadingView.swift */; }; - 0172047925AA8335008FD63B /* UIFont+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172046E25AA8325008FD63B /* UIFont+Extensions.swift */; }; 0172047E25AA8343008FD63B /* Font+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172047525AA8325008FD63B /* Font+Extensions.swift */; }; 0172048125AA8343008FD63B /* Color+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172047625AA8325008FD63B /* Color+Extensions.swift */; }; 017204B625AA8467008FD63B /* DataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172049225AA8449008FD63B /* DataManager.swift */; }; @@ -215,7 +214,6 @@ 0172045925AA82B4008FD63B /* MessageBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageBarView.swift; sourceTree = ""; }; 0172045C25AA82B4008FD63B /* SnackbarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnackbarView.swift; sourceTree = ""; }; 0172045D25AA82B4008FD63B /* PermissionsLoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionsLoadingView.swift; sourceTree = ""; }; - 0172046E25AA8325008FD63B /* UIFont+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Extensions.swift"; sourceTree = ""; }; 0172047525AA8325008FD63B /* Font+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Font+Extensions.swift"; sourceTree = ""; }; 0172047625AA8325008FD63B /* Color+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Extensions.swift"; sourceTree = ""; }; 0172049225AA8449008FD63B /* DataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataManager.swift; sourceTree = ""; }; @@ -648,7 +646,6 @@ children = ( 0172047625AA8325008FD63B /* Color+Extensions.swift */, 0172047525AA8325008FD63B /* Font+Extensions.swift */, - 0172046E25AA8325008FD63B /* UIFont+Extensions.swift */, ); path = Styleguide; sourceTree = ""; @@ -895,7 +892,6 @@ 011F6DE9259EF16400BED22E /* Sources */ = { isa = PBXSourcesBuildPhase; files = ( - 0172047925AA8335008FD63B /* UIFont+Extensions.swift in Sources */, 01E2477029A570D300D4B00D /* SignUp.swift in Sources */, 01D85B4A2E07F16900A95798 /* ShopkeeperEditViewModel.swift in Sources */, 0172052F25AC41A7008FD63B /* SessionRequest.swift in Sources */, diff --git a/NativeAppTemplate/App.swift b/NativeAppTemplate/App.swift index 0fdcb9e..2aed334 100644 --- a/NativeAppTemplate/App.swift +++ b/NativeAppTemplate/App.swift @@ -29,7 +29,6 @@ private final class NullSessionController: SessionControllerProtocol { var shouldUpdateApp: Bool = false var shouldUpdatePrivacy: Bool = false var shouldUpdateTerms: Bool = false - var shopLimitCount: Int = 0 var shopkeeper: Shopkeeper? var isLoggedIn: Bool { false @@ -105,8 +104,6 @@ struct App { dataManager = nativeAppTemplateObjects.dataManager messageBus = nativeAppTemplateObjects.messageBus -// Tips.showAllTipsForTesting() - try? Tips.configure() } } diff --git a/NativeAppTemplate/Constants.swift b/NativeAppTemplate/Constants.swift index ce72d37..f997360 100644 --- a/NativeAppTemplate/Constants.swift +++ b/NativeAppTemplate/Constants.swift @@ -47,16 +47,6 @@ enum NativeAppTemplateConstants { static let xxxxl: CGFloat = 128 } - // MARK: - Animation Durations - - enum Animation { - /// 0.15s - Fast animations, micro-interactions - static let fast: Double = 0.15 - - /// 0.3s - Standard animations, most UI transitions - static let standard: Double = 0.3 - } - // MARK: - Glass enum Glass { @@ -147,7 +137,6 @@ enum Strings { // MARK: Shop View static let shopName = String(localized: "Shop Name") - static let createShop = String(localized: "Create Shop") static let addShop = String(localized: "Add Shop") static let addShopDescription = String(localized: "Add a new shop.") static let deleteShop = String(localized: "Delete Shop") @@ -307,9 +296,7 @@ enum Strings { // MARK: Other static let ok = String(localized: "OK") - static let no = String(localized: "No") static let cancel = String(localized: "Cancel") - static let close = String(localized: "Close") static let save = String(localized: "Save") static let edit = String(localized: "Edit") static let delete = String(localized: "Delete") @@ -321,10 +308,7 @@ enum Strings { static let emailIsInvalid = String(localized: "Email is invalid.") static let passwordIsRequired = String(localized: "Password is required.") static let passwordIsInvalid = String(localized: "Password is invalid.") - static let role = String(localized: "Role") static let complete = String(localized: "Complete") - static let open = String(localized: "Open") - static let instructions = String(localized: "Instructions") static let forceSignOut = String(localized: "Force Sign Out?") static let signOut = String(localized: "Sign Out") static let noConnection = String(localized: "No Connection") diff --git a/NativeAppTemplate/Data/Repositories/ItemTagRepository.swift b/NativeAppTemplate/Data/Repositories/ItemTagRepository.swift index 16c2801..778b438 100644 --- a/NativeAppTemplate/Data/Repositories/ItemTagRepository.swift +++ b/NativeAppTemplate/Data/Repositories/ItemTagRepository.swift @@ -22,10 +22,6 @@ import SwiftUI self.itemTagsService = itemTagsService } - var isEmpty: Bool { - itemTags.isEmpty - } - func reloadPage(shopId: String, page: Int) { if Task.isCancelled { return diff --git a/NativeAppTemplate/Data/Repositories/ItemTagRepositoryProtocol.swift b/NativeAppTemplate/Data/Repositories/ItemTagRepositoryProtocol.swift index 0487015..9528534 100644 --- a/NativeAppTemplate/Data/Repositories/ItemTagRepositoryProtocol.swift +++ b/NativeAppTemplate/Data/Repositories/ItemTagRepositoryProtocol.swift @@ -8,7 +8,6 @@ import SwiftUI @MainActor protocol ItemTagRepositoryProtocol: AnyObject, Observable, Sendable { var itemTags: [ItemTag] { get set } var state: DataState { get set } - var isEmpty: Bool { get } var paginationMeta: PaginationMeta? { get } var isLoadingMore: Bool { get } diff --git a/NativeAppTemplate/Localizable.xcstrings b/NativeAppTemplate/Localizable.xcstrings index d936b0b..a398f42 100644 --- a/NativeAppTemplate/Localizable.xcstrings +++ b/NativeAppTemplate/Localizable.xcstrings @@ -227,16 +227,6 @@ } } }, - "Close" : { - "localizations" : { - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "閉じる" - } - } - } - }, "Complete" : { "localizations" : { "ja" : { @@ -318,16 +308,6 @@ } } }, - "Create Shop" : { - "localizations" : { - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "店舗を作成" - } - } - } - }, "Current Password" : { "localizations" : { "ja" : { @@ -589,16 +569,6 @@ } } }, - "Instructions" : { - "localizations" : { - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "手順" - } - } - } - }, "Item tag created successfully." : { "localizations" : { "ja" : { @@ -769,16 +739,6 @@ } } }, - "No" : { - "localizations" : { - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "いいえ" - } - } - } - }, "No Connection" : { "localizations" : { "ja" : { @@ -799,16 +759,6 @@ } } }, - "Open" : { - "localizations" : { - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "開く" - } - } - } - }, "or" : { "localizations" : { "ja" : { @@ -989,16 +939,6 @@ } } }, - "Role" : { - "localizations" : { - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "権限" - } - } - } - }, "Save" : { "localizations" : { "ja" : { diff --git a/NativeAppTemplate/Login/SignUpRepository.swift b/NativeAppTemplate/Login/SignUpRepository.swift index 11dd747..8ea0f1e 100644 --- a/NativeAppTemplate/Login/SignUpRepository.swift +++ b/NativeAppTemplate/Login/SignUpRepository.swift @@ -28,12 +28,12 @@ import os return shopkeeper } - func update(id: String, signUp: SignUp, networkClient: NativeAppTemplateAPI) async throws -> Shopkeeper { + func update(signUp: SignUp, networkClient: NativeAppTemplateAPI) async throws -> Shopkeeper { var shopkeeper: Shopkeeper do { let signUpsService = SignUpsService(networkClient: networkClient) - shopkeeper = try await signUpsService.updateShopkeeper(id: id, signUp: signUp) + shopkeeper = try await signUpsService.updateShopkeeper(signUp: signUp) } catch { Failure .update(from: Self.self, reason: error.codedDescription) diff --git a/NativeAppTemplate/Login/SignUpRepositoryProtocol.swift b/NativeAppTemplate/Login/SignUpRepositoryProtocol.swift index c1935bd..a478166 100644 --- a/NativeAppTemplate/Login/SignUpRepositoryProtocol.swift +++ b/NativeAppTemplate/Login/SignUpRepositoryProtocol.swift @@ -7,7 +7,7 @@ import Foundation @MainActor protocol SignUpRepositoryProtocol: AnyObject, Sendable { func signUp(signUp: SignUp) async throws -> Shopkeeper - func update(id: String, signUp: SignUp, networkClient: NativeAppTemplateAPI) async throws -> Shopkeeper + func update(signUp: SignUp, networkClient: NativeAppTemplateAPI) async throws -> Shopkeeper func destroy(networkClient: NativeAppTemplateAPI) async throws func sendResetPasswordInstruction(sendResetPassword: SendResetPassword) async throws func sendConfirmationInstruction(sendConfirmation: SendConfirmation) async throws diff --git a/NativeAppTemplate/Login/SignUpRequest.swift b/NativeAppTemplate/Login/SignUpRequest.swift index bfb4da1..e341aed 100644 --- a/NativeAppTemplate/Login/SignUpRequest.swift +++ b/NativeAppTemplate/Login/SignUpRequest.swift @@ -55,7 +55,6 @@ struct UpdateShopkeeperRequest: Request { // MARK: - Parameters - let id: String let signUp: SignUp // MARK: - Internal diff --git a/NativeAppTemplate/Login/SignUpService.swift b/NativeAppTemplate/Login/SignUpService.swift index c5208e3..4a0491e 100644 --- a/NativeAppTemplate/Login/SignUpService.swift +++ b/NativeAppTemplate/Login/SignUpService.swift @@ -15,8 +15,8 @@ extension SignUpsService { try await makeRequest(request: MakeShopkeeperRequest(signUp: signUp)) } - func updateShopkeeper(id: String, signUp: SignUp) async throws -> UpdateShopkeeperRequest.Response { - let request = UpdateShopkeeperRequest(id: id, signUp: signUp) + func updateShopkeeper(signUp: SignUp) async throws -> UpdateShopkeeperRequest.Response { + let request = UpdateShopkeeperRequest(signUp: signUp) return try await makeRequest(request: request) } diff --git a/NativeAppTemplate/Models/Shopkeeper.swift b/NativeAppTemplate/Models/Shopkeeper.swift index eeabfb6..1f05981 100644 --- a/NativeAppTemplate/Models/Shopkeeper.swift +++ b/NativeAppTemplate/Models/Shopkeeper.swift @@ -139,23 +139,3 @@ public extension Shopkeeper { locale == appLocale ? nil : appLocale } } - -private extension Shopkeeper { - private init( - shopkeeper: Shopkeeper - ) { - id = shopkeeper.id - accountId = shopkeeper.accountId - personalAccountId = shopkeeper.personalAccountId - accountOwnerId = shopkeeper.accountOwnerId - accountName = shopkeeper.accountName - email = shopkeeper.email - name = shopkeeper.name - timeZone = shopkeeper.timeZone - locale = shopkeeper.locale - uid = shopkeeper.uid - token = shopkeeper.token - client = shopkeeper.client - expiry = shopkeeper.expiry - } -} diff --git a/NativeAppTemplate/Networking/JSONAPI/JSONAPIResource.swift b/NativeAppTemplate/Networking/JSONAPI/JSONAPIResource.swift index 3d6d5b7..8f72cb2 100644 --- a/NativeAppTemplate/Networking/JSONAPI/JSONAPIResource.swift +++ b/NativeAppTemplate/Networking/JSONAPI/JSONAPIResource.swift @@ -25,10 +25,6 @@ public class JSONAPIResource { return EntityIdentity(id: id, type: entityType) } - subscript(key: String) -> Any? { - attributes[key] - } - // MARK: - Initializers convenience init( @@ -66,9 +62,3 @@ public class JSONAPIResource { meta = dict["meta"] as? [String: Any] ?? [:] } } - -extension JSONAPIResource { - subscript(key: some CustomStringConvertible) -> T? { - self[key.description] as? T - } -} diff --git a/NativeAppTemplate/Networking/Requests/ShopsRequest.swift b/NativeAppTemplate/Networking/Requests/ShopsRequest.swift index 89ef34b..6e43e9b 100644 --- a/NativeAppTemplate/Networking/Requests/ShopsRequest.swift +++ b/NativeAppTemplate/Networking/Requests/ShopsRequest.swift @@ -41,7 +41,6 @@ struct GetShopsRequest: Request { } struct GetShopDetailRequest: Request { - /// typealias Response = (shop: Shop, cacheUpdate: DataCacheUpdate) typealias Response = Shop // MARK: - Properties diff --git a/NativeAppTemplate/Persistence/KeychainStore/Keychain.swift b/NativeAppTemplate/Persistence/KeychainStore/Keychain.swift index 9e5e96b..2c3caef 100644 --- a/NativeAppTemplate/Persistence/KeychainStore/Keychain.swift +++ b/NativeAppTemplate/Persistence/KeychainStore/Keychain.swift @@ -34,12 +34,6 @@ struct Keychain { } } - func string(for account: String) throws -> String? { - guard let data = try data(for: account) else { return nil } - guard let string = String(data: data, encoding: .utf8) else { throw Self.error(errSecDecode) } - return string - } - func set(_ data: Data, for account: String) throws { let attributes: [String: Any] = [ kSecValueData as String: data, @@ -61,10 +55,6 @@ struct Keychain { } } - func set(_ string: String, for account: String) throws { - try set(Data(string.utf8), for: account) - } - func remove(_ account: String) throws { let status = SecItemDelete(baseQuery(account: account) as CFDictionary) guard status == errSecSuccess || status == errSecItemNotFound else { throw Self.error(status) } diff --git a/NativeAppTemplate/Persistence/KeychainStore/KeychainStore.swift b/NativeAppTemplate/Persistence/KeychainStore/KeychainStore.swift index 4b6fee5..8f8ecf2 100644 --- a/NativeAppTemplate/Persistence/KeychainStore/KeychainStore.swift +++ b/NativeAppTemplate/Persistence/KeychainStore/KeychainStore.swift @@ -4,7 +4,6 @@ // import Foundation -import os protocol KeychainStore { associatedtype DataType: NSObject, NSCoding @@ -53,7 +52,6 @@ extension KeychainStore { func store(_ data: DataType) throws { let archived: Data - appLogger.debug("KeychainStore data: \(data, privacy: .private)") do { archived = try NSKeyedArchiver.archivedData(withRootObject: data, requiringSecureCoding: true) } catch { diff --git a/NativeAppTemplate/Sessions/SessionControllerProtocol.swift b/NativeAppTemplate/Sessions/SessionControllerProtocol.swift index d75296e..c56aeee 100644 --- a/NativeAppTemplate/Sessions/SessionControllerProtocol.swift +++ b/NativeAppTemplate/Sessions/SessionControllerProtocol.swift @@ -39,7 +39,6 @@ protocol SessionControllerProtocol: AnyObject, Observable, Sendable { var shouldUpdateApp: Bool { get set } var shouldUpdatePrivacy: Bool { get set } var shouldUpdateTerms: Bool { get set } - var shopLimitCount: Int { get set } var shopkeeper: Shopkeeper? { get set } diff --git a/NativeAppTemplate/Styleguide/Color+Extensions.swift b/NativeAppTemplate/Styleguide/Color+Extensions.swift index 89e42a5..47d2862 100644 --- a/NativeAppTemplate/Styleguide/Color+Extensions.swift +++ b/NativeAppTemplate/Styleguide/Color+Extensions.swift @@ -94,17 +94,6 @@ extension Color { static let backgroundColor = coolGrey1 // #1F2933 - Page background static let cardBackground = coolGrey2 // #323F4B - Card background - static let coloredPrimaryBackground = lightBlue10 // #E3F8FF - static let coloredSecondaryBackground = coolGrey10 // #F5F7FA - static let failureBackground = pink1 // #620042 - static let successBackground = green1 // #014807 - static let weekEndBackground = coolGrey2 // #323F4B - - // MARK: Foregrounds (on colored backgrounds) - - static let coloredPrimaryForeground = lightBlue1 // #035388 - static let coloredSecondaryForeground = coolGrey1 // #1F2933 - static let successSecondaryForeground = green9 // #C1F2C7 // MARK: Text @@ -112,9 +101,6 @@ extension Color { static let contentText = coolGrey7 // #9AA5B1 static let secondaryText = coolGrey6 // #7B8794 static let snackText = coolGrey10 // #F5F7FA - static let coloredPrimaryFootnoteText = lightBlue1 // #035388 - static let coloredSecondaryFootnoteText = coolGrey1 // #1F2933 - static let textButtonText = coolGrey10 // #F5F7FA // MARK: Buttons @@ -123,49 +109,20 @@ extension Color { static let coloredPrimaryButtonForeground = lightBlue9 // #B3ECFF static let coloredSecondaryButtonForeground = coolGrey9 // #E4E7EB static let destructiveButtonForeground = coolGrey10 // #F5F7FA - static let failureSecondaryForeground = pink9 // #FFB8D2 - - // MARK: Borders - - static let secondaryBorderColor = coolGrey3 // #3E4C59 - - // MARK: Snackbar - - static let snackError = coolGrey1 // #1F2933 - static let snackWarning = coolGrey1 // #1F2933 - static let snackSuccess = coolGrey1 // #1F2933 // MARK: Tags - Idled static let idledTagBackground = coolGrey8 // #CBD2D9 - static let idledTagBorder = coolGrey10 // #F5F7FA static let idledTagForeground = coolGrey2 // #323F4B // MARK: Tags - Completed static let completedTagBackground = green9 // #C1F2C7 - static let completedTagBorder = coolGrey10 // #F5F7FA static let completedTagForeground = green1 // #014807 - // MARK: Tags - Personal - - static let personalTagBackground = lightBlue9 // #B3ECFF - static let personalTagBorder = coolGrey10 // #F5F7FA - static let personalTagForeground = lightBlue1 // #035388 - - // MARK: Tags - Current Account - - static let currentAccountTagBackground = pink9 // #FFB8D2 - static let currentAccountTagBorder = coolGrey10 // #F5F7FA - static let currentAccountTagForeground = pink1 // #620042 - // MARK: Write to Tag - static let customerBackground = lightBlue10 // #E3F8FF static let customerForeground = lightBlue6 // #40C3F7 - static let lockBackground = yellow10 // #FFFBEA - static let lockForeground = yellow6 // #F7C948 - static let serverBackground = lightBlue7 // #5ED0FA static let serverForeground = red6 // #EF4E4E // MARK: Validation @@ -176,7 +133,6 @@ extension Color { static let glassBorder = coolGrey10 // #F5F7FA static let glassShadow = coolGrey1 // #1F2933 - static let glassForeground = coolGrey10 // #F5F7FA // MARK: Button Arrow @@ -185,7 +141,6 @@ extension Color { // MARK: Accent static let accent = lightBlue7 // #5ED0FA - static let lightestAccent = lightBlue10 // #E3F8FF static let alarm = red7 // #F86A6A } @@ -201,39 +156,6 @@ extension ShapeStyle where Self == Color { Color.cardBackground } - static var coloredPrimaryBackground: Color { - Color.coloredPrimaryBackground - } - - static var coloredSecondaryBackground: Color { - Color.coloredSecondaryBackground - } - - static var failureBackground: Color { - Color.failureBackground - } - - static var successBackground: Color { - Color.successBackground - } - - static var weekEndBackground: Color { - Color.weekEndBackground - } - - /// Foregrounds - static var coloredPrimaryForeground: Color { - Color.coloredPrimaryForeground - } - - static var coloredSecondaryForeground: Color { - Color.coloredSecondaryForeground - } - - static var successSecondaryForeground: Color { - Color.successSecondaryForeground - } - /// Text static var titleText: Color { Color.titleText @@ -251,18 +173,6 @@ extension ShapeStyle where Self == Color { Color.snackText } - static var coloredPrimaryFootnoteText: Color { - Color.coloredPrimaryFootnoteText - } - - static var coloredSecondaryFootnoteText: Color { - Color.coloredSecondaryFootnoteText - } - - static var textButtonText: Color { - Color.textButtonText - } - /// Buttons static var primaryButtonForeground: Color { Color.primaryButtonForeground @@ -284,37 +194,11 @@ extension ShapeStyle where Self == Color { Color.destructiveButtonForeground } - static var failureSecondaryForeground: Color { - Color.failureSecondaryForeground - } - - /// Borders - static var secondaryBorderColor: Color { - Color.secondaryBorderColor - } - - /// Snackbar - static var snackError: Color { - Color.snackError - } - - static var snackWarning: Color { - Color.snackWarning - } - - static var snackSuccess: Color { - Color.snackSuccess - } - /// Tags static var idledTagBackground: Color { Color.idledTagBackground } - static var idledTagBorder: Color { - Color.idledTagBorder - } - static var idledTagForeground: Color { Color.idledTagForeground } @@ -323,59 +207,15 @@ extension ShapeStyle where Self == Color { Color.completedTagBackground } - static var completedTagBorder: Color { - Color.completedTagBorder - } - static var completedTagForeground: Color { Color.completedTagForeground } - static var personalTagBackground: Color { - Color.personalTagBackground - } - - static var personalTagBorder: Color { - Color.personalTagBorder - } - - static var personalTagForeground: Color { - Color.personalTagForeground - } - - static var currentAccountTagBackground: Color { - Color.currentAccountTagBackground - } - - static var currentAccountTagBorder: Color { - Color.currentAccountTagBorder - } - - static var currentAccountTagForeground: Color { - Color.currentAccountTagForeground - } - /// Write to Tag - static var customerBackground: Color { - Color.customerBackground - } - static var customerForeground: Color { Color.customerForeground } - static var lockBackground: Color { - Color.lockBackground - } - - static var lockForeground: Color { - Color.lockForeground - } - - static var serverBackground: Color { - Color.serverBackground - } - static var serverForeground: Color { Color.serverForeground } @@ -394,10 +234,6 @@ extension ShapeStyle where Self == Color { Color.glassShadow } - static var glassForeground: Color { - Color.glassForeground - } - /// Button Arrow static var arrowBackground: Color { Color.arrowBackground @@ -408,10 +244,6 @@ extension ShapeStyle where Self == Color { Color.accent } - static var lightestAccent: Color { - Color.lightestAccent - } - static var alarm: Color { Color.alarm } diff --git a/NativeAppTemplate/Styleguide/Font+Extensions.swift b/NativeAppTemplate/Styleguide/Font+Extensions.swift index 4a60a41..7396170 100644 --- a/NativeAppTemplate/Styleguide/Font+Extensions.swift +++ b/NativeAppTemplate/Styleguide/Font+Extensions.swift @@ -6,10 +6,6 @@ import SwiftUI extension Font { - static var uiLargeTitle: Font { - .system(size: UIFontMetrics.default.scaledValue(for: 36.0)).weight(.bold) - } - static var uiTitle1: Font { .system(size: UIFontMetrics.default.scaledValue(for: 30.0)).weight(.medium) } diff --git a/NativeAppTemplate/Styleguide/UIFont+Extensions.swift b/NativeAppTemplate/Styleguide/UIFont+Extensions.swift deleted file mode 100644 index cb104ee..0000000 --- a/NativeAppTemplate/Styleguide/UIFont+Extensions.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// UIFont+Extensions.swift -// NativeAppTemplate -// - -import UIKit - -extension UIFont { - static var uiLargeTitle: UIFont { - .systemFont(ofSize: 36.0, weight: .bold) - } - - static var uiHeadline: UIFont { - .systemFont(ofSize: 18.0, weight: .medium) - } -} diff --git a/NativeAppTemplate/UI/App Root/SnackbarView.swift b/NativeAppTemplate/UI/App Root/SnackbarView.swift index 5bc4bfd..acc07ff 100644 --- a/NativeAppTemplate/UI/App Root/SnackbarView.swift +++ b/NativeAppTemplate/UI/App Root/SnackbarView.swift @@ -8,17 +8,6 @@ import SwiftUI struct SnackbarState { enum Status: String { case success, warning, error - - var color: Color { - switch self { - case .success: - .snackSuccess - case .warning: - .snackWarning - case .error: - .snackError - } - } } let status: Status diff --git a/NativeAppTemplate/UI/Settings/ShopkeeperEditViewModel.swift b/NativeAppTemplate/UI/Settings/ShopkeeperEditViewModel.swift index f2261c9..08158b0 100644 --- a/NativeAppTemplate/UI/Settings/ShopkeeperEditViewModel.swift +++ b/NativeAppTemplate/UI/Settings/ShopkeeperEditViewModel.swift @@ -90,7 +90,6 @@ final class ShopkeeperEditViewModel { timeZone: selectedTimeZone ) let updatedShopkeeper = try await signUpRepository.update( - id: shopkeeper.id, signUp: signUp, networkClient: sessionController.client ) diff --git a/NativeAppTemplate/UI/Shared/Tags/CompletedTag.swift b/NativeAppTemplate/UI/Shared/Tags/CompletedTag.swift index f2896ec..088f8d5 100644 --- a/NativeAppTemplate/UI/Shared/Tags/CompletedTag.swift +++ b/NativeAppTemplate/UI/Shared/Tags/CompletedTag.swift @@ -10,8 +10,7 @@ struct CompletedTag: View { TagView( text: String(localized: "completed"), textColor: .completedTagForeground, - backgroundColor: .completedTagBackground, - borderColor: .completedTagBorder + backgroundColor: .completedTagBackground ) } } diff --git a/NativeAppTemplate/UI/Shared/Tags/IdledTagView.swift b/NativeAppTemplate/UI/Shared/Tags/IdledTagView.swift index 7f7255f..943f0b1 100644 --- a/NativeAppTemplate/UI/Shared/Tags/IdledTagView.swift +++ b/NativeAppTemplate/UI/Shared/Tags/IdledTagView.swift @@ -10,8 +10,7 @@ struct IdledTag: View { TagView( text: String(localized: "idled"), textColor: .idledTagForeground, - backgroundColor: .idledTagBackground, - borderColor: .idledTagBorder + backgroundColor: .idledTagBackground ) } } diff --git a/NativeAppTemplate/UI/Shared/Tags/TagView.swift b/NativeAppTemplate/UI/Shared/Tags/TagView.swift index 1c0a2f9..eef081b 100644 --- a/NativeAppTemplate/UI/Shared/Tags/TagView.swift +++ b/NativeAppTemplate/UI/Shared/Tags/TagView.swift @@ -8,18 +8,9 @@ import SwiftUI struct TagView: View { private static let defaultIconHeight: CGFloat = 12.0 - private struct SizeKey: PreferenceKey { - static func reduce(value: inout CGSize?, nextValue: () -> CGSize?) { - value = value ?? nextValue() - } - } - - @State private var height: CGFloat? - let text: String let textColor: Color let backgroundColor: Color - let borderColor: Color var image: Image? var body: some View { @@ -34,21 +25,11 @@ struct TagView: View { .foregroundStyle(textColor) .font(.uiUppercaseTag) .kerning(0.5) - .background( - GeometryReader { proxy in - Color.clear.preference(key: SizeKey.self, value: proxy.size) - } - ) } .padding([.vertical], NativeAppTemplateConstants.Spacing.xxxs) .padding([.horizontal], NativeAppTemplateConstants.Spacing.xxs) .background(backgroundColor) .cornerRadius(NativeAppTemplateConstants.CornerRadius.xs) // This is a bit hacky. - .onPreferenceChange(SizeKey.self) { size in - Task { @MainActor in - height = size?.height - } - } } } @@ -58,15 +39,13 @@ struct TagView_Previews: PreviewProvider { TagView( text: "this is a tag", textColor: .coolGrey10, - backgroundColor: .red5, - borderColor: .yellow5 + backgroundColor: .red5 ) TagView( text: "with an image", textColor: .coolGrey10, backgroundColor: .red5, - borderColor: .yellow5, image: Image(systemName: "checkmark") ) } diff --git a/NativeAppTemplate/UI/Shop Detail/ShopDetailView.swift b/NativeAppTemplate/UI/Shop Detail/ShopDetailView.swift index de67b06..d3dbb90 100644 --- a/NativeAppTemplate/UI/Shop Detail/ShopDetailView.swift +++ b/NativeAppTemplate/UI/Shop Detail/ShopDetailView.swift @@ -40,15 +40,15 @@ private extension ShopDetailView { @ViewBuilder var contentView: some View { if viewModel.isBusy { LoadingView() - } else if let shop = viewModel.shop { - shopDetailView(shop: shop) + } else if viewModel.shop != nil { + shopDetailView } } return contentView } - func header(shop: Shop) -> some View { + var header: some View { Text(Strings.shopDetailInstruction) .foregroundStyle(.contentText) .frame(maxWidth: .infinity, alignment: .leading) @@ -77,9 +77,9 @@ private extension ShopDetailView { } } - func shopDetailView(shop: Shop) -> some View { + var shopDetailView: some View { VStack { - header(shop: shop) + header .padding(.top) .padding(.horizontal, NativeAppTemplateConstants.Spacing.xxs) List { diff --git a/NativeAppTemplate/UI/Shop Detail/ShopDetailViewModel.swift b/NativeAppTemplate/UI/Shop Detail/ShopDetailViewModel.swift index a8b296f..baafd4a 100644 --- a/NativeAppTemplate/UI/Shop Detail/ShopDetailViewModel.swift +++ b/NativeAppTemplate/UI/Shop Detail/ShopDetailViewModel.swift @@ -46,10 +46,6 @@ final class ShopDetailViewModel { isFetching || isIdling || isCompleting } - var isLoggedIn: Bool { - sessionController.isLoggedIn - } - func reload() { guard sessionController.isLoggedIn else { return } fetchShopDetail() @@ -124,7 +120,6 @@ final class ShopDetailViewModel { ShopSettingsViewModel( sessionController: sessionController, shopRepository: shopRepository, - itemTagRepository: itemTagRepository, messageBus: messageBus, shopId: shopId ) diff --git a/NativeAppTemplate/UI/Shop Settings/ItemTag Detail/ItemTagDetailViewModel.swift b/NativeAppTemplate/UI/Shop Settings/ItemTag Detail/ItemTagDetailViewModel.swift index 2af94a2..d3e35e7 100644 --- a/NativeAppTemplate/UI/Shop Settings/ItemTag Detail/ItemTagDetailViewModel.swift +++ b/NativeAppTemplate/UI/Shop Settings/ItemTag Detail/ItemTagDetailViewModel.swift @@ -19,20 +19,17 @@ final class ItemTagDetailViewModel { let itemTagRepository: ItemTagRepositoryProtocol let messageBus: MessageBus - let sessionController: SessionControllerProtocol let shop: Shop let itemTagId: String init( itemTagRepository: ItemTagRepositoryProtocol, messageBus: MessageBus, - sessionController: SessionControllerProtocol, shop: Shop, itemTagId: String ) { self.itemTagRepository = itemTagRepository self.messageBus = messageBus - self.sessionController = sessionController self.shop = shop self.itemTagId = itemTagId } diff --git a/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagListView.swift b/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagListView.swift index 1455d6d..8acff23 100644 --- a/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagListView.swift +++ b/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagListView.swift @@ -70,7 +70,6 @@ private extension ItemTagListView { viewModel: ItemTagDetailViewModel( itemTagRepository: dataManager.itemTagRepository, messageBus: messageBus, - sessionController: dataManager.sessionController, shop: viewModel.shop, itemTagId: itemTag.id ) diff --git a/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagListViewModel.swift b/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagListViewModel.swift index f7bd6c3..65a9249 100644 --- a/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagListViewModel.swift +++ b/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagListViewModel.swift @@ -34,18 +34,15 @@ final class ItemTagListViewModel { private let itemTagRepository: ItemTagRepositoryProtocol private let messageBus: MessageBus - private let sessionController: SessionControllerProtocol let shop: Shop init( itemTagRepository: ItemTagRepositoryProtocol, messageBus: MessageBus, - sessionController: SessionControllerProtocol, shop: Shop ) { self.itemTagRepository = itemTagRepository self.messageBus = messageBus - self.sessionController = sessionController self.shop = shop } diff --git a/NativeAppTemplate/UI/Shop Settings/ShopBasicSettingsViewModel.swift b/NativeAppTemplate/UI/Shop Settings/ShopBasicSettingsViewModel.swift index 4927175..fce31ce 100644 --- a/NativeAppTemplate/UI/Shop Settings/ShopBasicSettingsViewModel.swift +++ b/NativeAppTemplate/UI/Shop Settings/ShopBasicSettingsViewModel.swift @@ -17,18 +17,15 @@ final class ShopBasicSettingsViewModel { var shouldDismiss: Bool = false private(set) var shop: Shop? - private let sessionController: SessionControllerProtocol private let shopRepository: ShopRepositoryProtocol private(set) var messageBus: MessageBus let shopId: String init( - sessionController: SessionControllerProtocol, shopRepository: ShopRepositoryProtocol, messageBus: MessageBus, shopId: String ) { - self.sessionController = sessionController self.shopRepository = shopRepository self.messageBus = messageBus self.shopId = shopId diff --git a/NativeAppTemplate/UI/Shop Settings/ShopSettingsView.swift b/NativeAppTemplate/UI/Shop Settings/ShopSettingsView.swift index 8cf5214..2d6b344 100644 --- a/NativeAppTemplate/UI/Shop Settings/ShopSettingsView.swift +++ b/NativeAppTemplate/UI/Shop Settings/ShopSettingsView.swift @@ -59,7 +59,6 @@ private extension ShopSettingsView { NavigationLink { ShopBasicSettingsView( viewModel: ShopBasicSettingsViewModel( - sessionController: dataManager.sessionController, shopRepository: dataManager.shopRepository, messageBus: messageBus, shopId: viewModel.shopId @@ -77,7 +76,6 @@ private extension ShopSettingsView { viewModel: ItemTagListViewModel( itemTagRepository: dataManager.itemTagRepository, messageBus: messageBus, - sessionController: dataManager.sessionController, shop: shop ) ) diff --git a/NativeAppTemplate/UI/Shop Settings/ShopSettingsViewModel.swift b/NativeAppTemplate/UI/Shop Settings/ShopSettingsViewModel.swift index cb973a0..7303a41 100644 --- a/NativeAppTemplate/UI/Shop Settings/ShopSettingsViewModel.swift +++ b/NativeAppTemplate/UI/Shop Settings/ShopSettingsViewModel.swift @@ -17,20 +17,17 @@ final class ShopSettingsViewModel { private let sessionController: SessionControllerProtocol private let shopRepository: ShopRepositoryProtocol - let itemTagRepository: ItemTagRepositoryProtocol private(set) var messageBus: MessageBus let shopId: String init( sessionController: SessionControllerProtocol, shopRepository: ShopRepositoryProtocol, - itemTagRepository: ItemTagRepositoryProtocol, messageBus: MessageBus, shopId: String ) { self.sessionController = sessionController self.shopRepository = shopRepository - self.itemTagRepository = itemTagRepository self.messageBus = messageBus self.shopId = shopId } diff --git a/NativeAppTemplateTests/Demo/Data/Repositories/DemoItemTagRepository.swift b/NativeAppTemplateTests/Demo/Data/Repositories/DemoItemTagRepository.swift index cb967fa..d4e357a 100644 --- a/NativeAppTemplateTests/Demo/Data/Repositories/DemoItemTagRepository.swift +++ b/NativeAppTemplateTests/Demo/Data/Repositories/DemoItemTagRepository.swift @@ -11,10 +11,6 @@ import Testing final class DemoItemTagRepository: ItemTagRepositoryProtocol { var itemTags: [ItemTag] = [] var state: DataState = .initial - var isEmpty: Bool { - itemTags.isEmpty - } - var paginationMeta: PaginationMeta? var isLoadingMore = false diff --git a/NativeAppTemplateTests/Testing/Repositories/TestItemTagRepository.swift b/NativeAppTemplateTests/Testing/Repositories/TestItemTagRepository.swift index 7db9b61..d15c05e 100644 --- a/NativeAppTemplateTests/Testing/Repositories/TestItemTagRepository.swift +++ b/NativeAppTemplateTests/Testing/Repositories/TestItemTagRepository.swift @@ -10,10 +10,6 @@ import Foundation final class TestItemTagRepository: ItemTagRepositoryProtocol { var itemTags: [ItemTag] = [] var state: DataState = .initial - var isEmpty: Bool { - itemTags.isEmpty - } - var paginationMeta: PaginationMeta? var isLoadingMore = false diff --git a/NativeAppTemplateTests/Testing/Repositories/TestSessionController.swift b/NativeAppTemplateTests/Testing/Repositories/TestSessionController.swift index 66bcdc3..85bff91 100644 --- a/NativeAppTemplateTests/Testing/Repositories/TestSessionController.swift +++ b/NativeAppTemplateTests/Testing/Repositories/TestSessionController.swift @@ -21,7 +21,6 @@ import Foundation public var shouldUpdateTerms: Bool = false public var shouldThrowPrivacyError: Bool = false public var shouldThrowTermsError: Bool = false - public var shopLimitCount: Int = 1 public var shopkeeper: Shopkeeper? /// Points at a closed local port, so a repository built from it (DataManager) diff --git a/NativeAppTemplateTests/Testing/Repositories/TestSignUpRepository.swift b/NativeAppTemplateTests/Testing/Repositories/TestSignUpRepository.swift index 7ef7e65..0fc5847 100644 --- a/NativeAppTemplateTests/Testing/Repositories/TestSignUpRepository.swift +++ b/NativeAppTemplateTests/Testing/Repositories/TestSignUpRepository.swift @@ -18,7 +18,6 @@ final class TestSignUpRepository: SignUpRepositoryProtocol { var sendResetPasswordCalled = false var sendConfirmationCalled = false var lastSignUp: SignUp? - var lastUpdateId: String? var lastSendResetPassword: SendResetPassword? var lastSendConfirmation: SendConfirmation? var shopkeeperToReturn: Shopkeeper? @@ -48,10 +47,9 @@ final class TestSignUpRepository: SignUpRepositoryProtocol { ])! } - func update(id: String, signUp: SignUp, networkClient: NativeAppTemplateAPI) async throws -> Shopkeeper { + func update(signUp: SignUp, networkClient: NativeAppTemplateAPI) async throws -> Shopkeeper { await gate?.wait() updateCalled = true - lastUpdateId = id lastSignUp = signUp guard error == nil else { @@ -59,7 +57,7 @@ final class TestSignUpRepository: SignUpRepositoryProtocol { } return shopkeeperToReturn ?? Shopkeeper(dictionary: [ - "id": id, + "id": "1", "account_id": "account_1", "personal_account_id": "personal_1", "account_owner_id": "owner_1", diff --git a/NativeAppTemplateTests/UI/Shop List/ShopListViewModelTest.swift b/NativeAppTemplateTests/UI/Shop List/ShopListViewModelTest.swift index 3c9feaf..51e7707 100644 --- a/NativeAppTemplateTests/UI/Shop List/ShopListViewModelTest.swift +++ b/NativeAppTemplateTests/UI/Shop List/ShopListViewModelTest.swift @@ -24,12 +24,8 @@ struct ShopListViewModelTest { let shopRepository = TestShopRepository( shopsService: ShopsService() ) - let itemTagRepository = TestItemTagRepository( - itemTagsService: ItemTagsService() - ) let tabViewModel = TabViewModel() let mainTab = MainTab.shops - let messageBus = MessageBus() @Test func leftInShopSlots() { diff --git a/NativeAppTemplateTests/UI/Shop Settings/ItemTag Detail/ItemTagDetailViewModelTest.swift b/NativeAppTemplateTests/UI/Shop Settings/ItemTag Detail/ItemTagDetailViewModelTest.swift index 5f3d645..121c1f5 100644 --- a/NativeAppTemplateTests/UI/Shop Settings/ItemTag Detail/ItemTagDetailViewModelTest.swift +++ b/NativeAppTemplateTests/UI/Shop Settings/ItemTag Detail/ItemTagDetailViewModelTest.swift @@ -10,7 +10,6 @@ import Testing @MainActor @Suite struct ItemTagDetailViewModelTest { - let sessionController = TestSessionController() let itemTagRepository = TestItemTagRepository( itemTagsService: ItemTagsService() ) @@ -40,7 +39,6 @@ struct ItemTagDetailViewModelTest { let viewModel = ItemTagDetailViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop, itemTagId: itemTagId ) @@ -61,7 +59,6 @@ struct ItemTagDetailViewModelTest { let viewModel = ItemTagDetailViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop, itemTagId: itemTagId ) @@ -88,7 +85,6 @@ struct ItemTagDetailViewModelTest { let viewModel = ItemTagDetailViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop, itemTagId: itemTagId ) @@ -111,7 +107,6 @@ struct ItemTagDetailViewModelTest { let viewModel = ItemTagDetailViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop, itemTagId: itemTagId ) @@ -133,7 +128,6 @@ struct ItemTagDetailViewModelTest { let viewModel = ItemTagDetailViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop, itemTagId: itemTagId ) @@ -155,7 +149,6 @@ struct ItemTagDetailViewModelTest { let viewModel = ItemTagDetailViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop, itemTagId: itemTagId ) @@ -184,7 +177,6 @@ struct ItemTagDetailViewModelTest { let viewModel = ItemTagDetailViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop, itemTagId: itemTagId ) @@ -209,7 +201,6 @@ struct ItemTagDetailViewModelTest { let viewModel = ItemTagDetailViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop, itemTagId: itemTagId ) @@ -233,7 +224,6 @@ struct ItemTagDetailViewModelTest { let viewModel = ItemTagDetailViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop, itemTagId: itemTagId ) @@ -253,7 +243,6 @@ struct ItemTagDetailViewModelTest { let viewModel = ItemTagDetailViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop, itemTagId: itemTagId ) @@ -278,7 +267,6 @@ struct ItemTagDetailViewModelTest { let viewModel = ItemTagDetailViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop, itemTagId: itemTagId ) @@ -311,7 +299,6 @@ struct ItemTagDetailViewModelTest { let viewModel = ItemTagDetailViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop, itemTagId: itemTagId ) @@ -329,7 +316,6 @@ struct ItemTagDetailViewModelTest { let viewModel = ItemTagDetailViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop, itemTagId: itemTagId ) diff --git a/NativeAppTemplateTests/UI/Shop Settings/ItemTag List/ItemTagListViewModelTest.swift b/NativeAppTemplateTests/UI/Shop Settings/ItemTag List/ItemTagListViewModelTest.swift index 4d1f858..bde0e5a 100644 --- a/NativeAppTemplateTests/UI/Shop Settings/ItemTag List/ItemTagListViewModelTest.swift +++ b/NativeAppTemplateTests/UI/Shop Settings/ItemTag List/ItemTagListViewModelTest.swift @@ -20,7 +20,6 @@ struct ItemTagListViewModelTest { ] } - let sessionController = TestSessionController() let itemTagRepository = TestItemTagRepository( itemTagsService: ItemTagsService() ) @@ -34,7 +33,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) @@ -52,7 +50,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) @@ -72,7 +69,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) @@ -88,7 +84,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) @@ -105,7 +100,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) @@ -127,7 +121,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) @@ -152,7 +145,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) @@ -174,7 +166,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) @@ -196,7 +187,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) @@ -216,7 +206,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) @@ -232,7 +221,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) @@ -259,7 +247,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) @@ -282,7 +269,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) @@ -305,7 +291,6 @@ struct ItemTagListViewModelTest { let viewModel = ItemTagListViewModel( itemTagRepository: itemTagRepository, messageBus: messageBus, - sessionController: sessionController, shop: shop ) diff --git a/NativeAppTemplateTests/UI/Shop Settings/ShopBasicSettingsViewModelTest.swift b/NativeAppTemplateTests/UI/Shop Settings/ShopBasicSettingsViewModelTest.swift index dbfe235..60b28a2 100644 --- a/NativeAppTemplateTests/UI/Shop Settings/ShopBasicSettingsViewModelTest.swift +++ b/NativeAppTemplateTests/UI/Shop Settings/ShopBasicSettingsViewModelTest.swift @@ -20,20 +20,15 @@ struct ShopBasicSettingsViewModelTest { ] } - let sessionController = TestSessionController() let shopRepository = TestShopRepository( shopsService: ShopsService() ) let messageBus = MessageBus() let shopId = "1" - let tabViewModel = TabViewModel() - let mainTab = MainTab.shops - @Test func stateIsInitiallyLoading() { let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId @@ -48,7 +43,6 @@ struct ShopBasicSettingsViewModelTest { shopRepository.setShops(shops: shops) let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId @@ -66,7 +60,6 @@ struct ShopBasicSettingsViewModelTest { shopRepository.setShops(shops: shops) let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId @@ -82,7 +75,6 @@ struct ShopBasicSettingsViewModelTest { @Test func maximumNameLength() { let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId @@ -94,7 +86,6 @@ struct ShopBasicSettingsViewModelTest { @Test func maximumDescriptionLength() { let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId @@ -114,7 +105,6 @@ struct ShopBasicSettingsViewModelTest { shopRepository.setShops(shops: shops) let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId @@ -138,7 +128,6 @@ struct ShopBasicSettingsViewModelTest { shopRepository.setShops(shops: shops) let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId @@ -157,7 +146,6 @@ struct ShopBasicSettingsViewModelTest { shopRepository.setShops(shops: shops) let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId @@ -177,7 +165,6 @@ struct ShopBasicSettingsViewModelTest { shopRepository.setShops(shops: shops) let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId @@ -197,7 +184,6 @@ struct ShopBasicSettingsViewModelTest { shopRepository.setShops(shops: shops) let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId @@ -221,7 +207,6 @@ struct ShopBasicSettingsViewModelTest { shopRepository.error = NativeAppTemplateAPIError.requestFailed(nil, httpResponseCode, message) let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId @@ -239,7 +224,6 @@ struct ShopBasicSettingsViewModelTest { shopRepository.setShops(shops: shops) let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId @@ -278,7 +262,6 @@ struct ShopBasicSettingsViewModelTest { shopRepository.setShops(shops: shops) let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId @@ -329,7 +312,6 @@ struct ShopBasicSettingsViewModelTest { @Test func hasInvalidDataBeforeTheShopLoads() { let viewModel = ShopBasicSettingsViewModel( - sessionController: sessionController, shopRepository: shopRepository, messageBus: messageBus, shopId: shopId diff --git a/NativeAppTemplateTests/UI/Shop Settings/ShopSettingsViewModelTest.swift b/NativeAppTemplateTests/UI/Shop Settings/ShopSettingsViewModelTest.swift index 4e98b4a..92e66d0 100644 --- a/NativeAppTemplateTests/UI/Shop Settings/ShopSettingsViewModelTest.swift +++ b/NativeAppTemplateTests/UI/Shop Settings/ShopSettingsViewModelTest.swift @@ -24,9 +24,6 @@ struct ShopSettingsViewModelTest { let shopRepository = TestShopRepository( shopsService: ShopsService() ) - let itemTagRepository = TestItemTagRepository( - itemTagsService: ItemTagsService() - ) let messageBus = MessageBus() let shopId = "1" @@ -35,7 +32,6 @@ struct ShopSettingsViewModelTest { let viewModel = ShopSettingsViewModel( sessionController: sessionController, shopRepository: shopRepository, - itemTagRepository: itemTagRepository, messageBus: messageBus, shopId: shopId ) @@ -51,7 +47,6 @@ struct ShopSettingsViewModelTest { let viewModel = ShopSettingsViewModel( sessionController: sessionController, shopRepository: shopRepository, - itemTagRepository: itemTagRepository, messageBus: messageBus, shopId: shopId ) @@ -79,7 +74,6 @@ struct ShopSettingsViewModelTest { let viewModel = ShopSettingsViewModel( sessionController: sessionController, shopRepository: shopRepository, - itemTagRepository: itemTagRepository, messageBus: messageBus, shopId: shopId ) @@ -103,7 +97,6 @@ struct ShopSettingsViewModelTest { let viewModel = ShopSettingsViewModel( sessionController: sessionController, shopRepository: shopRepository, - itemTagRepository: itemTagRepository, messageBus: messageBus, shopId: shopId ) @@ -131,7 +124,6 @@ struct ShopSettingsViewModelTest { let viewModel = ShopSettingsViewModel( sessionController: sessionController, shopRepository: shopRepository, - itemTagRepository: itemTagRepository, messageBus: messageBus, shopId: shopId )