diff --git a/Package.swift b/Package.swift index bf4b8f6..c71d0ea 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let productionDependencies: [PackageDescription.Package.Dependency] = { [ .package(url: "https://github.com/oversizedev/OversizeServices.git", .upToNextMajor(from: "1.4.0")), .package(url: "https://github.com/oversizedev/OversizeLocalizable.git", .upToNextMajor(from: "1.4.0")), .package(url: "https://github.com/oversizedev/OversizeComponents.git", .upToNextMajor(from: "1.2.0")), - .package(url: "https://github.com/oversizedev/OversizeResources.git", .upToNextMajor(from: "1.3.0")), + .package(url: "https://github.com/oversizedev/OversizeResources.git", .upToNextMajor(from: "2.0.0")), .package(url: "https://github.com/hmlongco/Factory.git", .upToNextMajor(from: "2.1.3")), .package(url: "https://github.com/lorenzofiamingo/swiftui-cached-async-image.git", .upToNextMajor(from: "2.1.1")), /* @@ -29,8 +29,8 @@ let developmentDependencies: [PackageDescription.Package.Dependency] = { [ .package(name: "OversizeResources", path: "../OversizeResources"), .package(name: "OversizeNetwork", path: "../OversizeNetwork"), .package(url: "https://github.com/lorenzofiamingo/swiftui-cached-async-image.git", .upToNextMajor(from: "2.1.1")), + .package(url: "https://github.com/hmlongco/Factory.git", .upToNextMajor(from: "2.1.3")), /* - .package(url: "https://github.com/hmlongco/Factory.git", .upToNextMajor(from: "2.1.3")), .package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.1.0")), .package(url: "https://github.com/apple/swift-openapi-urlsession", .upToNextMinor(from: "0.1.0")), */ diff --git a/Sources/OversizeKit/SettingsKit/Views/About/AboutView.swift b/Sources/OversizeKit/SettingsKit/Views/About/AboutView.swift index 93cca30..eb367ef 100644 --- a/Sources/OversizeKit/SettingsKit/Views/About/AboutView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/About/AboutView.swift @@ -93,7 +93,7 @@ import SwiftUI if isLargeScreen { HStack(spacing: .xxSmall) { - Icon.Solid.SocialMediaandBrands.oversize + Image.Brands.Oversize.fill .resizable() .renderingMode(.template) .foregroundColor(Color.onSurfaceHighEmphasis) @@ -108,7 +108,7 @@ import SwiftUI } else { VStack(spacing: .xxSmall) { - Icon.Solid.SocialMediaandBrands.oversize + Image.Brands.Oversize.fill .resizable() .renderingMode(.template) .foregroundColor(Color.onSurfaceHighEmphasis) @@ -300,7 +300,7 @@ import SwiftUI // Surface { HStack { Spacer() - Icon.Solid.SocialMediaandBrands.facebook + Image.Brands.Facebook.Circle.fill .renderingMode(.template) .foregroundColor(Color.onSurfaceMediumEmphasis) Spacer() @@ -314,7 +314,7 @@ import SwiftUI // Surface { HStack { Spacer() - Icon.Solid.SocialMediaandBrands.instagram + Image.Brands.Instagram.fill .renderingMode(.template) .foregroundColor(Color.onSurfaceMediumEmphasis) Spacer() @@ -328,7 +328,7 @@ import SwiftUI // Surface { HStack { Spacer() - Icon.Solid.SocialMediaandBrands.twitter + Image.Brands.xCom .renderingMode(.template) .foregroundColor(Color.onSurfaceMediumEmphasis) Spacer() @@ -342,7 +342,7 @@ import SwiftUI // Surface { HStack { Spacer() - Icon.Solid.SocialMediaandBrands.telegram + Image.Brands.Telegram.fill .renderingMode(.template) .foregroundColor(Color.onSurfaceMediumEmphasis) Spacer() @@ -356,7 +356,7 @@ import SwiftUI // Surface { HStack { Spacer() - Icon.Solid.SocialMediaandBrands.dribbble + Image.Brands.Dribbble.fill .renderingMode(.template) .foregroundColor(Color.onSurfaceMediumEmphasis) Spacer() @@ -458,33 +458,33 @@ import SwiftUI var rateSettingsIcon: Image { switch iconStyle { case .line: - return Icon.Line.UserInterface.heart - case .solid: - return Icon.Solid.UserInterface.heart - case .duotone: - return Icon.Duotone.UserInterface.heart + return Image.Base.heart + case .fill: + return Image.Base.Heart.fill + case .twoTone: + return Image.Base.Heart.TwoTone.fill } } var ideaSettingsIcon: Image { switch iconStyle { case .line: - return Icon.Line.DevicesandElectronics.lightBulb - case .solid: - return Icon.Solid.DevicesandElectronics.lightBulb - case .duotone: - return Icon.Duotone.DevicesandElectronics.lightBulb + return Image.Electricity.lamp + case .fill: + return Image.Electricity.Lamp.fill + case .twoTone: + return Image.Electricity.Lamp.TwoTone.fill } } var shareSettingsIcon: Image { switch iconStyle { case .line: - return Icon.Line.UserInterface.export - case .solid: - return Icon.Solid.UserInterface.export - case .duotone: - return Icon.Duotone.UserInterface.export + return Image.Base.send + case .fill: + return Image.Base.Send.fill + case .twoTone: + return Image.Base.Send.TwoTone.fill } } } diff --git a/Sources/OversizeKit/SettingsKit/Views/About/FeedbackView.swift b/Sources/OversizeKit/SettingsKit/Views/About/FeedbackView.swift index bc53ff9..cf97d05 100644 --- a/Sources/OversizeKit/SettingsKit/Views/About/FeedbackView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/About/FeedbackView.swift @@ -10,7 +10,6 @@ import OversizeComponents import OversizeLocalizable import OversizeResources import OversizeServices - import OversizeUI import SwiftUI @@ -102,33 +101,33 @@ public struct FeedbackView: View { var heartIcon: Image { switch iconStyle { case .line: - return Icon.Line.SocialMediaandBrands.apple - case .solid: - return Icon.Solid.SocialMediaandBrands.apple - case .duotone: - return Icon.Duotone.SocialMediaandBrands.apple + return Image.Brands.appStore + case .fill: + return Image.Brands.AppStore.fill + case .twoTone: + return Image.Brands.AppStore.twoTone } } var mailIcon: Image { switch iconStyle { case .line: - return Icon.Line.Communication.mail - case .solid: - return Icon.Solid.Communication.mail - case .duotone: - return Icon.Duotone.Communication.mail + return Image.Email.email + case .fill: + return Image.Email.Email.fill + case .twoTone: + return Image.Email.Email.twoTone } } var chatIcon: Image { switch iconStyle { case .line: - return Icon.Line.SocialMediaandBrands.telegram - case .solid: - return Icon.Solid.SocialMediaandBrands.telegram - case .duotone: - return Icon.Duotone.SocialMediaandBrands.telegram + return Image.Brands.telegram + case .fill: + return Image.Brands.Telegram.fill + case .twoTone: + return Image.Brands.Telegram.twoTone } } } diff --git a/Sources/OversizeKit/SettingsKit/Views/About/OurResorsesView.swift b/Sources/OversizeKit/SettingsKit/Views/About/OurResorsesView.swift index 6aa1d2b..cac6b70 100644 --- a/Sources/OversizeKit/SettingsKit/Views/About/OurResorsesView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/About/OurResorsesView.swift @@ -10,7 +10,6 @@ import OversizeComponents import OversizeLocalizable import OversizeResources import OversizeServices - import OversizeUI import SwiftUI @@ -22,7 +21,7 @@ public struct OurResorsesView: View { public var body: some View { PageView("Our open resources") { links - .surfaceContentRowInsets() + .surfaceContentRowMargins() } .leadingBar { BarButton(.back) @@ -57,22 +56,22 @@ public struct OurResorsesView: View { var figmaIcon: Image { switch iconStyle { case .line: - return Icon.Line.SocialMediaandBrands.figma - case .solid: - return Icon.Solid.SocialMediaandBrands.figma - case .duotone: - return Icon.Duotone.SocialMediaandBrands.figma + return Image.Brands.figma + case .fill: + return Image.Brands.figma + case .twoTone: + return Image.Brands.figma } } var githubIcon: Image { switch iconStyle { case .line: - return Icon.Line.SocialMediaandBrands.github - case .solid: - return Icon.Solid.SocialMediaandBrands.github - case .duotone: - return Icon.Duotone.SocialMediaandBrands.github + return Image.Brands.github + case .fill: + return Image.Brands.github + case .twoTone: + return Image.Brands.github } } } diff --git a/Sources/OversizeKit/SettingsKit/Views/About/SupportView.swift b/Sources/OversizeKit/SettingsKit/Views/About/SupportView.swift index 1da5973..af969c6 100644 --- a/Sources/OversizeKit/SettingsKit/Views/About/SupportView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/About/SupportView.swift @@ -10,7 +10,6 @@ import OversizeComponents import OversizeLocalizable import OversizeResources import OversizeServices - import OversizeUI import SwiftUI @@ -93,33 +92,33 @@ public struct SupportView: View { var heartIcon: Image { switch iconStyle { case .line: - return Icon.Line.SocialMediaandBrands.apple - case .solid: - return Icon.Solid.SocialMediaandBrands.apple - case .duotone: - return Icon.Duotone.SocialMediaandBrands.apple + return Image.Brands.appStore + case .fill: + return Image.Brands.AppStore.fill + case .twoTone: + return Image.Brands.AppStore.twoTone } } var mailIcon: Image { switch iconStyle { case .line: - return Icon.Line.Communication.mail - case .solid: - return Icon.Solid.Communication.mail - case .duotone: - return Icon.Duotone.Communication.mail + return Image.Email.email + case .fill: + return Image.Email.Email.fill + case .twoTone: + return Image.Email.Email.twoTone } } var chatIcon: Image { switch iconStyle { case .line: - return Icon.Line.SocialMediaandBrands.telegram - case .solid: - return Icon.Solid.SocialMediaandBrands.telegram - case .duotone: - return Icon.Duotone.SocialMediaandBrands.telegram + return Image.Brands.telegram + case .fill: + return Image.Brands.Telegram.fill + case .twoTone: + return Image.Brands.Telegram.twoTone } } diff --git a/Sources/OversizeKit/SettingsKit/Views/Apperance/AppearanceSettingView.swift b/Sources/OversizeKit/SettingsKit/Views/Apperance/AppearanceSettingView.swift index de844a7..701b88d 100644 --- a/Sources/OversizeKit/SettingsKit/Views/Apperance/AppearanceSettingView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/Apperance/AppearanceSettingView.swift @@ -5,9 +5,7 @@ import OversizeCore import OversizeLocalizable -import OversizeResources import OversizeServices - import OversizeUI import SwiftUI @@ -66,7 +64,7 @@ import SwiftUI #if os(iOS) PageView(L10n.Settings.apperance) { iOSSettings - .surfaceContentRowInsets() + .surfaceContentRowMargins() } .leadingBar { /* @@ -271,33 +269,33 @@ import SwiftUI var textIcon: Image { switch iconStyle { case .line: - return Icon.Line.Design.text - case .solid: - return Icon.Solid.Design.text - case .duotone: - return Icon.Duotone.Design.text + return Image.Editor.Font.square + case .fill: + return Image.Editor.Font.Square.fill + case .twoTone: + return Image.Editor.Font.Square.TwoTone.fill } } var borderIcon: Image { switch iconStyle { case .line: - return Icon.Line.Design.scale - case .solid: - return Icon.Solid.Design.scale - case .duotone: - return Icon.Duotone.Design.scale + return Image.Design.verticalMirror + case .fill: + return Image.Editor.Font.Square.fill + case .twoTone: + return Image.Editor.Font.Square.TwoTone.fill } } var radiusIcon: Image { switch iconStyle { case .line: - return Icon.Line.Design.vectorEditCircle - case .solid: - return Icon.Solid.Design.vectorEditCircle - case .duotone: - return Icon.Duotone.Design.vectorEditCircle + return Image.Design.path + case .fill: + return Image.Design.Path.fill + case .twoTone: + return Image.Design.Path.twoTone } } } diff --git a/Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift b/Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift index 3a6377e..d70f40e 100644 --- a/Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift @@ -26,7 +26,7 @@ import SwiftUI public var body: some View { PageView(L10n.Security.title) { iOSSettings - .surfaceContentRowInsets() + .surfaceContentRowMargins() } .leadingBar { BarButton(.back) @@ -60,7 +60,8 @@ import SwiftUI Row(biometricService.biometricType.rawValue) { Image(systemName: biometricImageName) .foregroundColor(Color.onBackgroundHighEmphasis) - .font(.system(size: 24)) + + .font(.system(size: 20, weight: .semibold)) .frame(width: 24, height: 24, alignment: .center) } } @@ -79,7 +80,7 @@ import SwiftUI }) ) { Row(L10n.Security.pinCode) { - IconDeprecated(.lock) + Image.Security.lock } }.sheet(item: $isSetPINCodeSheet) { sheet in SetPINCodeView(action: sheet) diff --git a/Sources/OversizeKit/SettingsKit/Views/SettingsView.swift b/Sources/OversizeKit/SettingsKit/Views/SettingsView.swift index 3cb339f..8ae9d10 100644 --- a/Sources/OversizeKit/SettingsKit/Views/SettingsView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/SettingsView.swift @@ -103,7 +103,7 @@ import SwiftUI SectionView { PrmiumBannerRow() } - .surfaceContentInsets(.zero) + .surfaceContentMargins(.zero) } } Group { @@ -111,7 +111,7 @@ import SwiftUI help about } - .surfaceContentRowInsets() + .surfaceContentRowMargins() } } } @@ -133,7 +133,7 @@ import SwiftUI NavigationLink(destination: AppearanceSettingView() ) { Row(L10n.Settings.apperance) { - apperanceSettingsIcon + apperanceSettingsIcon.icon() } .rowArrow(isShowArrow) } @@ -144,7 +144,7 @@ import SwiftUI NavigationLink(destination: iCloudSettingsView() ) { Row(L10n.Title.synchronization) { - cloudKitIcon + cloudKitIcon.icon() } .rowArrow(isShowArrow) } @@ -162,7 +162,7 @@ import SwiftUI NavigationLink(destination: SecuritySettingsView() ) { Row(L10n.Security.title) { - securityIcon + securityIcon.icon() } .rowArrow(isShowArrow) } @@ -173,7 +173,7 @@ import SwiftUI NavigationLink(destination: SoundsAndVibrationsSettingsView() ) { Row(soundsAndVibrationTitle) { - FeatureFlags.app.sounds.valueOrFalse ? soundIcon : vibrationIcon + FeatureFlags.app.sounds.valueOrFalse ? soundIcon.icon() : vibrationIcon.icon() } .rowArrow(isShowArrow) } @@ -184,7 +184,7 @@ import SwiftUI NavigationLink(destination: NotificationsSettingsView() ) { Row(L10n.Settings.notifications) { - notificationsIcon + notificationsIcon.icon() } .rowArrow(isShowArrow) } @@ -199,66 +199,66 @@ import SwiftUI var apperanceSettingsIcon: Image { switch iconStyle { case .line: - return Icon.Line.Design.brush - case .solid: - return Icon.Solid.Design.brush - case .duotone: - return Icon.Duotone.Design.brush + return Image.Design.paintingPalette + case .fill: + return Image.Design.PaintingPalette.fill + case .twoTone: + return Image.Design.PaintingPalette.twoTone } } var cloudKitIcon: Image { switch iconStyle { case .line: - return Icon.Line.Weather.cloudy02 - case .solid: - return Icon.Solid.Weather.cloudy02 - case .duotone: - return Icon.Duotone.Weather.cloudy02 + return Image.Weather.cloud2 + case .fill: + return Image.Weather.Cloud.Square.fill + case .twoTone: + return Image.Weather.Cloud.Square.twoTone } } var securityIcon: Image { switch iconStyle { case .line: - return Icon.Line.UserInterface.lock - case .solid: - return Icon.Solid.UserInterface.lock - case .duotone: - return Icon.Duotone.UserInterface.lock + return Image.Base.lock + case .fill: + return Image.Base.Lock.fill + case .twoTone: + return Image.Base.Lock.TwoTone.fill } } var soundIcon: Image { switch iconStyle { case .line: - return Icon.Line.MediaControls.musicalNote02 - case .solid: - return Icon.Solid.MediaControls.musicalNote02 - case .duotone: - return Icon.Duotone.MediaControls.musicalNote02 + return Image.Base.volumeUp + case .fill: + return Image.Base.VolumeUp.fill + case .twoTone: + return Image.Base.VolumeUp.TwoTone.fill } } var vibrationIcon: Image { switch iconStyle { case .line: - return Icon.Line.Weather.windy - case .solid: - return Icon.Solid.Weather.windy - case .duotone: - return Icon.Duotone.Weather.windy + return Image.Mobile.vibration + case .fill: + return Image.Mobile.Vibration.fill + case .twoTone: + return Image.Mobile.Vibration.twoTone } } var notificationsIcon: Image { switch iconStyle { case .line: - return Icon.Line.UserInterface.bell - case .solid: - return Icon.Solid.UserInterface.bell - case .duotone: - return Icon.Duotone.UserInterface.bell + return Image.Base.notification + case .fill: + return Image.Base.Notification.fill + case .twoTone: + return Image.Base.Notification.TwoTone.fill } } @@ -269,7 +269,7 @@ import SwiftUI Row("Get help") { isShowSupport.toggle() } leading: { - helpIcon + helpIcon.icon() } .rowArrow(isShowArrow) @@ -285,7 +285,7 @@ import SwiftUI Row("Send feedback") { isShowFeedback.toggle() } leading: { - chatIcon + chatIcon.icon() } .rowArrow(isShowArrow) @@ -304,66 +304,66 @@ import SwiftUI var heartIcon: Image { switch iconStyle { case .line: - return Icon.Line.UserInterface.heart - case .solid: - return Icon.Solid.UserInterface.heart - case .duotone: - return Icon.Duotone.UserInterface.heart + return Image.Base.heart + case .fill: + return Image.Base.Heart.fill + case .twoTone: + return Image.Base.Heart.TwoTone.fill } } var mailIcon: Image { switch iconStyle { case .line: - return Icon.Line.Communication.mail - case .solid: - return Icon.Solid.Communication.mail - case .duotone: - return Icon.Duotone.Communication.mail + return Image.Base.message + case .fill: + return Image.Base.Message.fill + case .twoTone: + return Image.Base.Message.TwoTone.fill } } var chatIcon: Image { switch iconStyle { case .line: - return Icon.Line.Communication.chatDots - case .solid: - return Icon.Solid.Communication.chatDots - case .duotone: - return Icon.Duotone.Communication.chatDots + return Image.Base.chat + case .fill: + return Image.Base.Chat.fill + case .twoTone: + return Image.Base.Chat.twoTone } } var infoIcon: Image { switch iconStyle { case .line: - return Icon.Line.UserInterface.infoCrFr - case .solid: - return Icon.Solid.UserInterface.infoCrFr - case .duotone: - return Icon.Duotone.UserInterface.infoCrFr + return Image.Base.info + case .fill: + return Image.Base.Info.Circle.fill + case .twoTone: + return Image.Base.Info.Circle.twoTone } } var oversizeIcon: Image { switch iconStyle { case .line: - return Icon.Line.SocialMediaandBrands.oversize - case .solid: - return Icon.Solid.SocialMediaandBrands.oversize - case .duotone: - return Icon.Duotone.SocialMediaandBrands.oversize + return Image.Brands.oversize + case .fill: + return Image.Brands.Oversize.fill + case .twoTone: + return Image.Brands.Oversize.TwoTone.fill } } var helpIcon: Image { switch iconStyle { case .line: - return Icon.Line.UserInterface.questionMarkCrFr - case .solid: - return Icon.Solid.UserInterface.questionMarkCrFr - case .duotone: - return Icon.Duotone.UserInterface.questionMarkCrFr + return Image.Alert.Help.circle + case .fill: + return Image.Alert.Help.Circle.fill + case .twoTone: + return Image.Alert.Help.Circle.twoTone } } @@ -372,7 +372,7 @@ import SwiftUI VStack(spacing: .zero) { NavigationLink(destination: AboutView()) { Row(L10n.Settings.about) { - infoIcon + infoIcon.icon() } .rowArrow(isShowArrow) } diff --git a/Sources/OversizeKit/SettingsKit/Views/iCloud/iCloudSettingsView.swift b/Sources/OversizeKit/SettingsKit/Views/iCloud/iCloudSettingsView.swift index e5876a0..d83cc16 100644 --- a/Sources/OversizeKit/SettingsKit/Views/iCloud/iCloudSettingsView.swift +++ b/Sources/OversizeKit/SettingsKit/Views/iCloud/iCloudSettingsView.swift @@ -44,7 +44,7 @@ import SwiftUI if FeatureFlags.app.сloudKit.valueOrFalse { Switch(isOn: $settingsService.cloudKitEnabled) { Row(L10n.Settings.iCloudSync) { - IconDeprecated(.cloud) + Image.Weather.Cloud.square } .premium() } @@ -55,15 +55,19 @@ import SwiftUI Switch(isOn: $settingsService.cloudKitCVVEnabled) { Row(L10n.Security.iCloudSyncCVVDescriptionCloudKit, subtitle: settingsService.cloudKitCVVEnabled ? L10n.Security.iCloudSyncCVVDescriptionCloudKit : L10n.Security.iCloudSyncCVVDescriptionLocal) - .premium() - .onPremiumTap() + { + Image.Security.cloudLock + .frame(width: 24, height: 24) + } + .premium() + .onPremiumTap() } } if FeatureFlags.app.healthKit.valueOrFalse { Switch(isOn: $settingsService.healthKitEnabled) { Row("HealthKit synchronization", subtitle: "After switching on, data from the Health app will be downloaded") { - IconDeprecated(.heart) + Image.Romantic.heart } } } diff --git a/Sources/OversizeKit/StoreKit/StoreScreen/StoreInstuctinsView.swift b/Sources/OversizeKit/StoreKit/StoreScreen/StoreInstuctinsView.swift index 123c0c8..3ed51ac 100644 --- a/Sources/OversizeKit/StoreKit/StoreScreen/StoreInstuctinsView.swift +++ b/Sources/OversizeKit/StoreKit/StoreScreen/StoreInstuctinsView.swift @@ -116,13 +116,13 @@ public struct StoreInstuctinsView: View { .foregroundColor(.onSurfaceHighEmphasis.opacity(0.3)) .frame(width: 30) .offset(y: screenSize.safeAreaHeight - 300) - //.opacity(1 - (offset * 0.01)) + // .opacity(1 - (offset * 0.01)) } StoreFeaturesLargeView() .paddingContent(.horizontal) .environmentObject(viewModel) - //.opacity(0 + (offset * 0.01)) + // .opacity(0 + (offset * 0.01)) } .padding(.bottom, 220) } @@ -164,13 +164,13 @@ public struct StoreInstuctinsView: View { .foregroundColor(.onSurfaceHighEmphasis.opacity(0.3)) .frame(width: 30) .offset(y: screenSize.safeAreaHeight - 300) - //.opacity(1 - (offset * 0.01)) + // .opacity(1 - (offset * 0.01)) } StoreFeaturesLargeView() .paddingContent(.horizontal) .environmentObject(viewModel) - //.opacity(0 + (offset * 0.01)) + // .opacity(0 + (offset * 0.01)) if isShowAllPlans { productsLust(data: data) @@ -230,7 +230,7 @@ public struct StoreInstuctinsView: View { } HStack(alignment: .top, spacing: .small) { - Icon.Solid.UserInterface.bell + Image.Base.Notification.fill .renderingMode(.template) .foregroundColor(Color.onSurfaceDisabled) .padding(14) @@ -256,7 +256,7 @@ public struct StoreInstuctinsView: View { } HStack(alignment: .top, spacing: .small) { - Icon.Solid.UserInterface.star + Image.Base.Star.fill .renderingMode(.template) .foregroundColor(Color.onSurfaceDisabled) .padding(14) diff --git a/Sources/OversizeKit/StoreKit/Views/StoreFeatureDetailView.swift b/Sources/OversizeKit/StoreKit/Views/StoreFeatureDetailView.swift index 8d5adb1..19f18cd 100644 --- a/Sources/OversizeKit/StoreKit/Views/StoreFeatureDetailView.swift +++ b/Sources/OversizeKit/StoreKit/Views/StoreFeatureDetailView.swift @@ -6,7 +6,6 @@ import CachedAsyncImage import OversizeComponents import OversizeCore -import OversizeResources import OversizeServices import OversizeUI import SwiftUI @@ -135,7 +134,7 @@ struct StoreFeatureDetailView: View { .padding(.bottom, geometry.size.height * 0.07) } else { - Icon.Solid.UserInterface.checkCrFr + Image.Base.Check.square .resizable() .renderingMode(.template) .foregroundColor(Color.accent) diff --git a/Sources/OversizeKit/StoreKit/Views/StoreFeaturesLargeView.swift b/Sources/OversizeKit/StoreKit/Views/StoreFeaturesLargeView.swift index e537579..58a4b53 100644 --- a/Sources/OversizeKit/StoreKit/Views/StoreFeaturesLargeView.swift +++ b/Sources/OversizeKit/StoreKit/Views/StoreFeaturesLargeView.swift @@ -5,7 +5,6 @@ import CachedAsyncImage import OversizeComponents -import OversizeResources import OversizeServices import OversizeUI import SwiftUI @@ -66,7 +65,7 @@ struct StoreFeaturesLargeView: View { .multilineTextAlignment(.center) } .controlRadius(.large) - .surfaceContentInsets(.xxxSmall) + .surfaceContentMargins(.xxxSmall) .padding(.vertical, .large) .elevation(.z3) } @@ -103,7 +102,7 @@ struct StoreFeaturesLargeView: View { .padding(.bottom, .large) } else { - Icon.Solid.UserInterface.checkCrFr + Image.Base.Check.square .resizable() .renderingMode(.template) .foregroundColor(Color.accent) diff --git a/Sources/OversizeKit/StoreKit/Views/StoreFeaturesView.swift b/Sources/OversizeKit/StoreKit/Views/StoreFeaturesView.swift index cb1554a..a8abf62 100644 --- a/Sources/OversizeKit/StoreKit/Views/StoreFeaturesView.swift +++ b/Sources/OversizeKit/StoreKit/Views/StoreFeaturesView.swift @@ -4,7 +4,6 @@ // import OversizeCore -import OversizeResources import OversizeServices import OversizeUI import SwiftUI @@ -27,7 +26,7 @@ struct StoreFeaturesView: View { Image(resourceImage: feature.image.valueOrEmpty) .renderingMode(.template) } else { - Icon.Solid.UserInterface.checkCrFr + Image.Base.Check.square .renderingMode(.template) } } @@ -41,7 +40,7 @@ struct StoreFeaturesView: View { } .surfaceBorderColor(Color.surfaceSecondary) .surfaceBorderWidth(2) - .surfaceContentRowInsets() + .surfaceContentRowMargins() .sheet(item: $selection) { selection = nil } content: { feature in