diff --git a/AppExample/Example/Resources/AppConfig.plist b/AppExample/Example/Resources/AppConfig.plist index 55a1ad6..aad8e82 100644 --- a/AppExample/Example/Resources/AppConfig.plist +++ b/AppExample/Example/Resources/AppConfig.plist @@ -21,7 +21,7 @@ romanov.cc Email hello@oversize.app - Fecebook + Facebook Telegram @@ -54,7 +54,7 @@ Onboarding - Apperance + Appearance StoreKit @@ -68,7 +68,7 @@ Notifications - Lookscreen + Lockscreen Vibration @@ -92,7 +92,7 @@ BlurMinimize - Lookscreen + Lockscreen diff --git a/Sources/OversizeKit/AdsKit/AdView.swift b/Sources/OversizeKit/AdsKit/AdView.swift index a26c88c..38ef15f 100644 --- a/Sources/OversizeKit/AdsKit/AdView.swift +++ b/Sources/OversizeKit/AdsKit/AdView.swift @@ -86,7 +86,7 @@ public struct AdView: View { .subheadline(.bold) .onSurfacePrimaryForeground() - Bage(color: .warning) { + Badge(color: .warning) { Text("Our app") .bold() } diff --git a/Sources/OversizeKit/DebugKit/DebugMenuView/DebugMenuViewModel.swift b/Sources/OversizeKit/DebugKit/DebugMenuView/DebugMenuViewModel.swift index 6b29e96..7ca598f 100644 --- a/Sources/OversizeKit/DebugKit/DebugMenuView/DebugMenuViewModel.swift +++ b/Sources/OversizeKit/DebugKit/DebugMenuView/DebugMenuViewModel.swift @@ -21,10 +21,10 @@ public final class DebugMenuViewModel: ObservableObject { public init() {} func onTapRestOnboarding() { - appStateService.restOnbarding() + appStateService.resetOnboarding() } func onTapRestAppRunCount() { - appStateService.restAppRunCount() + appStateService.resetAppRunCount() } } diff --git a/Sources/OversizeKit/LauncherKit/Launcher.swift b/Sources/OversizeKit/LauncherKit/Launcher.swift index b611c7e..0553949 100644 --- a/Sources/OversizeKit/LauncherKit/Launcher.swift +++ b/Sources/OversizeKit/LauncherKit/Launcher.swift @@ -57,7 +57,7 @@ public struct Launcher: View { .onAppear { Task { @MainActor in await viewModel.reviewService.launchEvent() - await viewModel.launcherSheetsChek() + await viewModel.launcherSheetsCheck() } } } @@ -67,7 +67,7 @@ public struct Launcher: View { private func fullScreenCover(sheet: LauncherViewModel.FullScreenSheet) -> some View { switch sheet { case .onboarding: onboarding - case .payWall: StoreInstuctinsView() + case .payWall: StoreInstructionsView() case .rate: RateAppScreen() case let .specialOffer(event): StoreSpecialOfferView(event: event) } @@ -79,7 +79,7 @@ public struct Launcher: View { state: $viewModel.authState, title: L10n.Security.enterPINCode, errorText: L10n.Security.invalidPIN, - pinCodeEnabled: viewModel.settingsService.pinCodeEnabend, + pinCodeEnabled: viewModel.settingsService.pinCodeEnabled, biometricEnabled: viewModel.settingsService.biometricEnabled, biometricType: viewModel.biometricService.biometricType ) { diff --git a/Sources/OversizeKit/LauncherKit/LauncherViewModel.swift b/Sources/OversizeKit/LauncherKit/LauncherViewModel.swift index e1c0e7e..bdd4619 100644 --- a/Sources/OversizeKit/LauncherKit/LauncherViewModel.swift +++ b/Sources/OversizeKit/LauncherKit/LauncherViewModel.swift @@ -39,7 +39,7 @@ public final class LauncherViewModel: ObservableObject { var isShowLockscreen: Bool { if FeatureFlags.secure.lookscreen ?? false { - if settingsService.pinCodeEnabend || settingsService.biometricEnabled, authState != .unlocked { + if settingsService.pinCodeEnabled || settingsService.biometricEnabled, authState != .unlocked { true } else { false @@ -77,7 +77,7 @@ extension LauncherViewModel { // Lockscreen public extension LauncherViewModel { - func launcherSheetsChek() async { + func launcherSheetsCheck() async { checkOnboarding() await checkAppRate() checkSpecialOffer() diff --git a/Sources/OversizeKit/SettingsKit/SettingsRouter/ResolveRouter.swift b/Sources/OversizeKit/SettingsKit/SettingsRouter/ResolveRouter.swift index da52d79..186cd3a 100644 --- a/Sources/OversizeKit/SettingsKit/SettingsRouter/ResolveRouter.swift +++ b/Sources/OversizeKit/SettingsKit/SettingsRouter/ResolveRouter.swift @@ -26,8 +26,8 @@ extension SettingsDestinations: NavigationDestination { case .feedback: FeedbackView() .presentationDetents([.height(485)]) - case .ourResorses: - OurResorsesView() + case .ourResources: + OurResourcesView() case .support: SupportView() .presentationDetents([.height(460)]) diff --git a/Sources/OversizeKit/SettingsKit/SettingsRouter/SettingsDestinations.swift b/Sources/OversizeKit/SettingsKit/SettingsRouter/SettingsDestinations.swift index 12ce9cb..c9191e3 100644 --- a/Sources/OversizeKit/SettingsKit/SettingsRouter/SettingsDestinations.swift +++ b/Sources/OversizeKit/SettingsKit/SettingsRouter/SettingsDestinations.swift @@ -15,7 +15,7 @@ public enum SettingsDestinations: Hashable { case sync case about case feedback - case ourResorses + case ourResources case support case border case font diff --git a/Sources/OversizeKit/SettingsKit/Views/About/About/AboutView.swift b/Sources/OversizeKit/SettingsKit/Views/About/About/AboutView.swift index 8b6bb4a..461c754 100644 --- a/Sources/OversizeKit/SettingsKit/Views/About/About/AboutView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/About/About/AboutView.swift @@ -281,7 +281,7 @@ public struct AboutView: View { SectionView { VStack(spacing: .zero) { Row("Our open resources") { - navigator.navigate(to: SettingsDestinations.ourResorses) + navigator.navigate(to: SettingsDestinations.ourResources) } .rowArrow() diff --git a/Sources/OversizeKit/SettingsKit/Views/About/OurResorsesView.swift b/Sources/OversizeKit/SettingsKit/Views/About/OurResourcesView.swift similarity index 96% rename from Sources/OversizeKit/SettingsKit/Views/About/OurResorsesView.swift rename to Sources/OversizeKit/SettingsKit/Views/About/OurResourcesView.swift index fc50fb1..ae218cc 100644 --- a/Sources/OversizeKit/SettingsKit/Views/About/OurResorsesView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/About/OurResourcesView.swift @@ -1,6 +1,6 @@ // // Copyright © 2022 Alexander Romanov -// OurResorsesView.swift +// OurResourcesView.swift // #if canImport(MessageUI) @@ -14,7 +14,7 @@ import OversizeServices import OversizeUI import SwiftUI -public struct OurResorsesView: View { +public struct OurResourcesView: View { @Environment(\.iconStyle) var iconStyle: IconStyle public init() {} diff --git a/Sources/OversizeKit/SettingsKit/Views/Apperance/AppearanceSettingView.swift b/Sources/OversizeKit/SettingsKit/Views/Appearance/AppearanceSettingView.swift similarity index 99% rename from Sources/OversizeKit/SettingsKit/Views/Apperance/AppearanceSettingView.swift rename to Sources/OversizeKit/SettingsKit/Views/Appearance/AppearanceSettingView.swift index c8cc38e..c12371f 100644 --- a/Sources/OversizeKit/SettingsKit/Views/Apperance/AppearanceSettingView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/Appearance/AppearanceSettingView.swift @@ -38,7 +38,7 @@ public struct AppearanceSettingView: View { private var settings: some View { LazyVStack(alignment: .leading, spacing: 0) { - apperance + appearance .padding(.top, .xxxSmall) #if os(iOS) @@ -70,7 +70,7 @@ public struct AppearanceSettingView: View { .preferredColorScheme(theme.appearance.colorScheme) } - private var apperance: some View { + private var appearance: some View { SectionView { HStack { ForEach(Appearance.allCases, id: \.self) { appearance in diff --git a/Sources/OversizeKit/SettingsKit/Views/Apperance/BorderSettingView.swift b/Sources/OversizeKit/SettingsKit/Views/Appearance/BorderSettingView.swift similarity index 100% rename from Sources/OversizeKit/SettingsKit/Views/Apperance/BorderSettingView.swift rename to Sources/OversizeKit/SettingsKit/Views/Appearance/BorderSettingView.swift diff --git a/Sources/OversizeKit/SettingsKit/Views/Apperance/FontSettingView.swift b/Sources/OversizeKit/SettingsKit/Views/Appearance/FontSettingView.swift similarity index 100% rename from Sources/OversizeKit/SettingsKit/Views/Apperance/FontSettingView.swift rename to Sources/OversizeKit/SettingsKit/Views/Appearance/FontSettingView.swift diff --git a/Sources/OversizeKit/SettingsKit/Views/Apperance/RadiusSettingView.swift b/Sources/OversizeKit/SettingsKit/Views/Appearance/RadiusSettingView.swift similarity index 100% rename from Sources/OversizeKit/SettingsKit/Views/Apperance/RadiusSettingView.swift rename to Sources/OversizeKit/SettingsKit/Views/Appearance/RadiusSettingView.swift diff --git a/Sources/OversizeKit/SettingsKit/Views/Security/PINCode/SetPINCodeView.swift b/Sources/OversizeKit/SettingsKit/Views/Security/PINCode/SetPINCodeView.swift index fe06d46..4219173 100644 --- a/Sources/OversizeKit/SettingsKit/Views/Security/PINCode/SetPINCodeView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/Security/PINCode/SetPINCodeView.swift @@ -43,7 +43,7 @@ public struct SetPINCodeView: View { title: L10n.Security.oldPINCode, errorText: viewModel.errorText ) { - viewModel.chekOldPINCode() + viewModel.checkOldPINCode() } biometricAction: {} case .newPINField: diff --git a/Sources/OversizeKit/SettingsKit/Views/Security/PINCode/SetPINCodeViewModel.swift b/Sources/OversizeKit/SettingsKit/Views/Security/PINCode/SetPINCodeViewModel.swift index 3ef7f19..ce5b24a 100644 --- a/Sources/OversizeKit/SettingsKit/Views/Security/PINCode/SetPINCodeViewModel.swift +++ b/Sources/OversizeKit/SettingsKit/Views/Security/PINCode/SetPINCodeViewModel.swift @@ -52,7 +52,7 @@ public final class SetPINCodeViewModel: ObservableObject { } } - public func chekOldPINCode() { + public func checkOldPINCode() { if oldCodeField != curentPinCode { authState = .error errorText = L10n.Security.invalidCurrentPINCode @@ -74,7 +74,7 @@ public final class SetPINCodeViewModel: ObservableObject { let result = await settingsStore.updatePINCode(oldPIN: curentPinCode, newPIN: newPinCodeField) switch result { case true: - settingsStore.pinCodeEnabend = true + settingsStore.pinCodeEnabled = true TapticEngine.success.vibrate() return true case false: diff --git a/Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift b/Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift index 94ba20d..57ae67d 100644 --- a/Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift @@ -70,10 +70,10 @@ extension SecuritySettingsView { if FeatureFlags.secure.lookscreen.valueOrFalse { Switch(isOn: Binding(get: { - settingsService.pinCodeEnabend + settingsService.pinCodeEnabled }, set: { - if settingsService.isSetedPinCode() { - settingsService.pinCodeEnabend = $0 + if settingsService.isSetPinCode() { + settingsService.pinCodeEnabled = $0 } else { navigator.navigate(to: SettingsDestinations.setPINCode) } @@ -84,7 +84,7 @@ extension SecuritySettingsView { } } - if settingsService.isSetedPinCode() { + if settingsService.isSetPinCode() { Row(L10n.Security.changePINCode) { navigator.navigate(to: SettingsDestinations.updatePINCode) } @@ -104,11 +104,11 @@ extension SecuritySettingsView { private var additionally: some View { SectionView(L10n.Settings.additionally) { VStack(spacing: .zero) { -// if FeatureFlags.secure.lookscreen.valueOrFalse { +// if FeatureFlags.secure.lockscreen.valueOrFalse { // Row(L10n.Security.inactiveAskPassword, trallingType: .toggle(isOn: $settingsStore.askPasswordWhenInactiveEnabend)) // } // -// if FeatureFlags.secure.lookscreen.valueOrFalse { +// if FeatureFlags.secure.lockscreen.valueOrFalse { // Row(L10n.Security.minimizeAskPassword, trallingType: .toggle(isOn: $settingsStore.askPasswordAfterMinimizeEnabend)) // } @@ -122,7 +122,7 @@ extension SecuritySettingsView { // .onPremiumTap() // } -// if FeatureFlags.secure.lookscreen.valueOrFalse { +// if FeatureFlags.secure.lockscreen.valueOrFalse { // Row(L10n.Security.alertPINCode, trallingType: .toggle(isOn: $settingsStore.alertPINCodeEnabled)) // } // @@ -130,12 +130,12 @@ extension SecuritySettingsView { // Row(L10n.Security.photoBreaker, trallingType: .toggle(isOn: $settingsStore.photoBreakerEnabend)) // } // -// if FeatureFlags.secure.lookscreen.valueOrFalse { +// if FeatureFlags.secure.lockscreen.valueOrFalse { // Row(L10n.Security.facedownLock, trallingType: .toggle(isOn: $settingsStore.lookScreenDownEnabend)) // } // if FeatureFlags.secure.blurMinimize.valueOrFalse { - Switch(isOn: $settingsService.blurMinimizeEnabend) { + Switch(isOn: $settingsService.blurMinimizeEnabled) { Row(L10n.Security.blurMinimize) .premium() } @@ -150,7 +150,7 @@ extension SecuritySettingsView { if settingsService.fastEnter { Row("Time to enter", trailing: { Picker("", selection: $settingsService.appLockTimeout) { - ForEach(0 ..< min.count) { + ForEach(0 ..< min.count, id: \.self) { // Non-constant range: argument must be an integer literal let min = Int(self.min[$0] / 60) Text("\(min) \(OversizeLocalizable.L10n.Time.mins)") @@ -166,7 +166,7 @@ extension SecuritySettingsView { .rowArrow() } -// if FeatureFlags.secure.lookscreen.valueOrFalse { +// if FeatureFlags.secure.lockscreen.valueOrFalse { // Row(L10n.Security.authHistory, trallingType: .toggle(isOn: $settingsService.authHistoryEnabend)) // .premium() // .onPremiumTap() diff --git a/Sources/OversizeKit/SettingsKit/Views/SettingsView.swift b/Sources/OversizeKit/SettingsKit/Views/SettingsView.swift index 12e591e..8b4445c 100644 --- a/Sources/OversizeKit/SettingsKit/Views/SettingsView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/SettingsView.swift @@ -48,10 +48,10 @@ public struct SettingsView: View { extension SettingsView { private var iOSSettings: some View { VStack(alignment: .center, spacing: 0) { - if let stoteKit = FeatureFlags.app.storeKit { - if stoteKit { + if let storeKit = FeatureFlags.app.storeKit { + if storeKit { SectionView { - PrmiumBannerRow() + PremiumBannerRow() } .surfaceContentMargins(.zero) } @@ -81,11 +81,11 @@ extension SettingsView { private var app: some View { SectionView("General") { VStack(spacing: .zero) { - if FeatureFlags.app.apperance.valueOrFalse { + if FeatureFlags.app.appearance.valueOrFalse { Row(L10n.Settings.apperance) { navigator.navigate(to: SettingsDestinations.appearance) } leading: { - apperanceSettingsIcon.icon() + appearanceSettingsIcon.icon() } .rowArrow() } @@ -146,7 +146,7 @@ extension SettingsView { appSection } - var apperanceSettingsIcon: Image { + var appearanceSettingsIcon: Image { switch iconStyle { case .line: Image.Design.paintingPalette @@ -387,10 +387,10 @@ extension SettingsView { @available(macOS 13.0, *) private var macSettings: some View { VStack(alignment: .center, spacing: 0) { - if let stoteKit = FeatureFlags.app.storeKit { - if stoteKit { + if let storeKit = FeatureFlags.app.storeKit { + if storeKit { SectionView { - PrmiumBannerRow() + PremiumBannerRow() } .surfaceContentMargins(.zero) } diff --git a/Sources/OversizeKit/StoreKit/StoreScreen/StoreInstuctinsView.swift b/Sources/OversizeKit/StoreKit/StoreScreen/StoreInstructionsView.swift similarity index 97% rename from Sources/OversizeKit/StoreKit/StoreScreen/StoreInstuctinsView.swift rename to Sources/OversizeKit/StoreKit/StoreScreen/StoreInstructionsView.swift index f27f5b7..37d2274 100644 --- a/Sources/OversizeKit/StoreKit/StoreScreen/StoreInstuctinsView.swift +++ b/Sources/OversizeKit/StoreKit/StoreScreen/StoreInstructionsView.swift @@ -1,6 +1,6 @@ // // Copyright © 2023 Alexander Romanov -// StoreInstuctinsView.swift +// StoreInstructionsView.swift // import OversizeComponents @@ -11,7 +11,7 @@ import OversizeStoreService import OversizeUI import SwiftUI -public struct StoreInstuctinsView: View { +public struct StoreInstructionsView: View { @StateObject var viewModel: StoreViewModel @Environment(\.screenSize) var screenSize @Environment(\.isPremium) var isPremium @@ -135,7 +135,7 @@ public struct StoreInstuctinsView: View { Text("Begin your path towards feeling better with a ") .foregroundColor(.onSurfaceSecondary) - + Text("\(viewModel.saleProcent)% discount") + + Text("\(viewModel.salePercent)% discount") .foregroundColor(.accent) } .body(.semibold) @@ -242,7 +242,7 @@ public struct StoreInstuctinsView: View { .background { Circle() .fill(Color.surfacePrimary) - .shadowElevaton(.z2) + .shadowElevation(.z2) } TextBox( @@ -270,7 +270,7 @@ public struct StoreInstuctinsView: View { .background { Circle() .fill(Color.surfacePrimary) - .shadowElevaton(.z2) + .shadowElevation(.z2) } TextBox( @@ -308,8 +308,8 @@ public struct StoreInstuctinsView: View { } } -struct StoreViewInstuctins_Previews: PreviewProvider { +struct StoreViewInstructions_Previews: PreviewProvider { static var previews: some View { - StoreInstuctinsView() + StoreInstructionsView() } } diff --git a/Sources/OversizeKit/StoreKit/StoreScreen/StoreView.swift b/Sources/OversizeKit/StoreKit/StoreScreen/StoreView.swift index 5bfe152..f42e62b 100644 --- a/Sources/OversizeKit/StoreKit/StoreScreen/StoreView.swift +++ b/Sources/OversizeKit/StoreKit/StoreScreen/StoreView.swift @@ -211,14 +211,14 @@ public struct StoreView: View { StoreProductView(product: product, products: data, isSelected: .constant(viewModel.selectedProduct == product)) { viewModel.selectedProduct = product } - .storeProductStyle(.collumn) + .storeProductStyle(.column) } } ForEach(data.nonConsumable) { product in StoreProductView(product: product, products: data, isSelected: .constant(viewModel.selectedProduct == product)) { viewModel.selectedProduct = product } - .storeProductStyle(.collumn) + .storeProductStyle(.column) } } } diff --git a/Sources/OversizeKit/StoreKit/StoreScreen/ViewModel/StoreViewModel.swift b/Sources/OversizeKit/StoreKit/StoreScreen/ViewModel/StoreViewModel.swift index 82ae9f0..77ea3dd 100644 --- a/Sources/OversizeKit/StoreKit/StoreScreen/ViewModel/StoreViewModel.swift +++ b/Sources/OversizeKit/StoreKit/StoreScreen/ViewModel/StoreViewModel.swift @@ -61,7 +61,7 @@ public class StoreViewModel: ObservableObject { // MARK: - Descriptions extension StoreViewModel { - var subsribtionStatusText: String { + var subscriptionStatusText: String { guard case let .result(products) = state else { return "" } if !products.purchasedNonConsumable.isEmpty { return "Lifetime" @@ -103,7 +103,7 @@ extension StoreViewModel { } } - var subsribtionStatusColor: Color { + var subscriptionStatusColor: Color { guard case let .result(products) = state else { return .gray } if !products.purchasedNonConsumable.isEmpty { return .green } guard let subscriptionStatus = products.subscriptionGroupStatus else { return .red } @@ -135,12 +135,12 @@ extension StoreViewModel { } } - var saleProcent: String { + var salePercent: String { guard let yearSubscriptionProduct else { return "" } if let monthSubscriptionProduct { let yearPriceMonthly = monthSubscriptionProduct.price * 12 - let procent = (yearPriceMonthly - yearSubscriptionProduct.price) / yearPriceMonthly - return (procent * 100).rounded(0).toString + let percent = (yearPriceMonthly - yearSubscriptionProduct.price) / yearPriceMonthly + return (percent * 100).rounded(0).toString } else { return "" } diff --git a/Sources/OversizeKit/StoreKit/Views/BuyButtonStyle.swift b/Sources/OversizeKit/StoreKit/Views/BuyButtonStyle.swift index 1ca74d8..fd3ef83 100644 --- a/Sources/OversizeKit/StoreKit/Views/BuyButtonStyle.swift +++ b/Sources/OversizeKit/StoreKit/Views/BuyButtonStyle.swift @@ -56,7 +56,7 @@ public struct PaymentButtonStyle: ButtonStyle { .background(background) .overlay(loadingView(for: configuration.role)) .scaleEffect(configuration.isPressed ? 0.98 : 1) - .shadowElevaton(elevation) + .shadowElevation(elevation) } @ViewBuilder diff --git a/Sources/OversizeKit/StoreKit/Views/PrmiumBannerRow.swift b/Sources/OversizeKit/StoreKit/Views/PremiumBannerRow.swift similarity index 94% rename from Sources/OversizeKit/StoreKit/Views/PrmiumBannerRow.swift rename to Sources/OversizeKit/StoreKit/Views/PremiumBannerRow.swift index 4e751b3..3301ab7 100644 --- a/Sources/OversizeKit/StoreKit/Views/PrmiumBannerRow.swift +++ b/Sources/OversizeKit/StoreKit/Views/PremiumBannerRow.swift @@ -1,6 +1,6 @@ // // Copyright © 2023 Alexander Romanov -// PrmiumBannerRow.swift +// PremiumBannerRow.swift // import NavigatorUI @@ -12,7 +12,7 @@ import OversizeUI import SwiftUI // swiftlint:disable all -public struct PrmiumBannerRow: View { +public struct PremiumBannerRow: View { @Environment(\.colorScheme) var colorScheme @StateObject private var viewModel: StoreViewModel #if os(macOS) @@ -83,12 +83,12 @@ public struct PrmiumBannerRow: View { Spacer() HStack(spacing: .small) { - Text(viewModel.subsribtionStatusText) + Text(viewModel.subscriptionStatusText) .headline(.medium) .foregroundColor(.onSurfaceSecondary) Circle() - .foregroundColor(viewModel.subsribtionStatusColor) + .foregroundColor(viewModel.subscriptionStatusColor) .frame(width: 8, height: 8) } @@ -99,7 +99,7 @@ public struct PrmiumBannerRow: View { } } -public extension PrmiumBannerRow { +public extension PremiumBannerRow { var banner: some View { HStack { Spacer() @@ -154,8 +154,8 @@ public extension PrmiumBannerRow { } } -struct PrmiumBannerRow_Previews: PreviewProvider { +struct PremiumBannerRow_Previews: PreviewProvider { static var previews: some View { - PrmiumBannerRow() + PremiumBannerRow() } } diff --git a/Sources/OversizeKit/StoreKit/Views/StoreProductView.swift b/Sources/OversizeKit/StoreKit/Views/StoreProductView.swift index b8c54d1..d1f1e30 100644 --- a/Sources/OversizeKit/StoreKit/Views/StoreProductView.swift +++ b/Sources/OversizeKit/StoreKit/Views/StoreProductView.swift @@ -12,7 +12,7 @@ import SwiftUI public struct StoreProductView: View { public enum StoreProductViewType { - case row, collumn + case row, column } @Injected(\.storeKitService) private var store: StoreKitService @@ -48,11 +48,11 @@ public struct StoreProductView: View { } } - var saleProcent: String { + var salePercent: String { if let monthSubscriptionProduct { let yearPriceMonthly = monthSubscriptionProduct.price * 12 - let procent = (yearPriceMonthly - product.price) / yearPriceMonthly - return (procent * 100).rounded(0).toString + let percent = (yearPriceMonthly - product.price) / yearPriceMonthly + return (percent * 100).rounded(0).toString } else { return "" } @@ -76,7 +76,7 @@ public struct StoreProductView: View { if product.type == .autoRenewable, let offer = product.subscription?.introductoryOffer { topLabelRow(offer: offer) } - case .collumn: + case .column: topLabelCollumn } } @@ -151,7 +151,7 @@ public struct StoreProductView: View { } .padding(.vertical, platform == .macOS ? .xxSmall : .small) .padding(.horizontal, platform == .macOS ? 12 : 18) - case .collumn: + case .column: VStack(spacing: .zero) { Text(product.displayMonthsCount) .title2() @@ -215,7 +215,7 @@ public struct StoreProductView: View { .foregroundColor(.onSurfacePrimary) if isHaveSale, !isPurchased { - Text("Save " + saleProcent + "%") + Text("Save " + salePercent + "%") .caption2(.bold) .foregroundColor(.onPrimary) .padding(.horizontal, .xxSmall) @@ -255,7 +255,7 @@ public struct StoreProductView: View { #if os(iOS) || os(macOS) if isHaveSale, !isPurchased { - Text("Save " + saleProcent + "%") + Text("Save " + salePercent + "%") .caption2(.bold) .foregroundColor(.onPrimary) .padding(.vertical, .xxxSmall) @@ -310,7 +310,7 @@ public struct StoreProductView: View { RoundedRectangle(cornerRadius: platform == .macOS ? 5 : 10, style: .continuous) .fill(Color.surfacePrimary) .overlay { - if type == .collumn, !isSelected { + if type == .column, !isSelected { RoundedRectangle(cornerRadius: platform == .macOS ? 6 : 12, style: .continuous) .strokeBorder(Color.backgroundTertiary, lineWidth: platform == .macOS ? 1 : 2) .padding(-2) @@ -344,7 +344,7 @@ public struct StoreProductView: View { switch type { case .row: .backgroundTertiary - case .collumn: + case .column: .surfaceSecondary } } @@ -384,7 +384,7 @@ public struct StoreProductView: View { } } - public func storeProductStyle(_ type: StoreProductViewType = .collumn) -> StoreProductView { + public func storeProductStyle(_ type: StoreProductViewType = .column) -> StoreProductView { var control = self control.type = type return control diff --git a/Sources/OversizeKit/SystemKit/SystemServices.swift b/Sources/OversizeKit/SystemKit/SystemServices.swift index d88b8e5..fc42c12 100644 --- a/Sources/OversizeKit/SystemKit/SystemServices.swift +++ b/Sources/OversizeKit/SystemKit/SystemServices.swift @@ -54,19 +54,19 @@ public struct SystemServicesModifier: ViewModifier { private func onChangeScenePhase(_ phase: ScenePhase) { switch phase { case .active: - if settingsService.blurMinimizeEnabend { + if settingsService.blurMinimizeEnabled { withAnimation { blurRadius = 0 } } case .background: - if settingsService.blurMinimizeEnabend { + if settingsService.blurMinimizeEnabled { withAnimation { blurRadius = 10 } } case .inactive: - if settingsService.blurMinimizeEnabend { + if settingsService.blurMinimizeEnabled { withAnimation { blurRadius = 10 } diff --git a/Sources/OversizeLocationKit/MapCoordinateView/MapCoordinateView.swift b/Sources/OversizeLocationKit/MapCoordinateView/MapCoordinateView.swift index cd525b3..07b8366 100644 --- a/Sources/OversizeLocationKit/MapCoordinateView/MapCoordinateView.swift +++ b/Sources/OversizeLocationKit/MapCoordinateView/MapCoordinateView.swift @@ -96,7 +96,7 @@ public struct MapCoordinateView: View { .background { Capsule() .fillSurfacePrimary() - .shadowElevaton(.z1) + .shadowElevation(.z1) } Spacer() } @@ -112,7 +112,7 @@ public struct MapCoordinateView: View { .background { Capsule() .fillSurfacePrimary() - .shadowElevaton(.z1) + .shadowElevation(.z1) } }) .padding(.trailing, 16)