Update icons

oversizedev · Jun 8, 2023 · 92f38cb · 92f38cb
1 parent 5ac3e2f
commit 92f38cb
Show file tree

Hide file tree

Showing 29 changed files with 169 additions and 64 deletions.
diff --git a/.swiftformat b/.swiftformat
@@ -1,2 +1,2 @@
---swiftversion 5.8
+--swiftversion 5.7
 --disable preferKeyPath
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

diff --git a/Sources/OversizeCalendarKit/CreateEventScreen/AttachmentScreen/AttachmentView.swift b/Sources/OversizeCalendarKit/CreateEventScreen/AttachmentScreen/AttachmentView.swift
@@ -15,12 +15,12 @@ public struct AttachmentView: View {
             SectionView {
                 VStack(spacing: .zero) {
                     Row("Add investment") {
-                        Icon(.paperclip)
+                        IconDeprecated(.paperclip)
                             .iconColor(.onSurfaceHighEmphasis)
                     }
 
                     Row("Add link") {
-                        Icon(.link)
+                        IconDeprecated(.link)
                             .iconColor(.onSurfaceHighEmphasis)
                     }
                 }

diff --git a/Sources/OversizeCalendarKit/CreateEventScreen/CreateEventView.swift b/Sources/OversizeCalendarKit/CreateEventScreen/CreateEventView.swift
@@ -187,7 +187,7 @@ public struct CreateEventView: View {
                     Row(viewModel.repitRule.title, subtitle: repeatSubtitleText) {
                         viewModel.present(.repeat)
                     } leading: {
-                        Icon(.refresh)
+                        IconDeprecated(.refresh)
                             .iconColor(.onSurfaceHighEmphasis)
                     }
                     .rowClearButton(style: .onSurface) {
@@ -213,7 +213,7 @@ public struct CreateEventView: View {
                             Row(email) {
                                 viewModel.present(.invites)
                             } leading: {
-                                Icon(.user)
+                                IconDeprecated(.user)
                                     .iconColor(.onSurfaceHighEmphasis)
                             }
                             .rowClearButton(style: .onSurface) {
@@ -247,7 +247,7 @@ public struct CreateEventView: View {
                             Row(alarm.title) {
                                 viewModel.present(.alarm)
                             } leading: {
-                                Icon(.bell)
+                                IconDeprecated(.bell)
                                     .iconColor(.onSurfaceHighEmphasis)
                             }
                             .rowClearButton(style: .onSurface) {
@@ -281,7 +281,7 @@ public struct CreateEventView: View {
                             Row(locationName) {
                                 viewModel.present(.location)
                             } leading: {
-                                Icon(.mapPin)
+                                IconDeprecated(.mapPin)
                                     .iconColor(.onSurfaceHighEmphasis)
                             }
                             .rowClearButton(style: .onSurface) {
@@ -426,33 +426,33 @@ public struct CreateEventView: View {
                 if viewModel.isFetchUpdatePositon {
                     ProgressView()
                 } else {
-                    Icon(.mapPin)
+                    IconDeprecated(.mapPin)
 //                    Icon.Solid.NavigationandTravel.location
 //                        .renderingMode(.template)
                 }
             }
             .disabled(viewModel.isFetchUpdatePositon)
 
             Button { viewModel.present(.alarm) } label: {
-                Icon(.bell)
+                IconDeprecated(.bell)
 //                Icon.Solid.UserInterface.bell
 //                    .renderingMode(.template)
             }
 
             Button { viewModel.present(.repeat) } label: {
-                Icon(.refresh)
+                IconDeprecated(.refresh)
             }
 
             /*
              Button { viewModel.present(.attachment) } label: {
-                 Icon(.moreHorizontal)
+                IconDeprecated(.moreHorizontal)
              }
               */
 
             Spacer()
 
             Button { viewModel.present(.invites) } label: {
-                Icon(.userPlus)
+                IconDeprecated(.userPlus)
             }
 
 //            Icon.Solid.UserInterface.plusCrFr

diff --git a/Sources/OversizeContactsKit/AttendeesList/AttendeesViewModel.swift b/Sources/OversizeContactsKit/AttendeesList/AttendeesViewModel.swift
@@ -5,11 +5,11 @@
 
 import Contacts
 import EventKit
+import Factory
 import OversizeContactsService
 import OversizeCore
 import OversizeServices
 import SwiftUI
-import Factory
 
 @MainActor
 class AttendeesViewModel: ObservableObject {

diff --git a/Sources/OversizeContactsKit/ContactsLists/ContactsListsViewModel.swift b/Sources/OversizeContactsKit/ContactsLists/ContactsListsViewModel.swift
@@ -4,11 +4,11 @@
 //
 
 import Contacts
+import Factory
 import OversizeContactsService
 import OversizeCore
 import OversizeServices
 import SwiftUI
-import Factory
 
 @MainActor
 public class ContactsListsViewModel: ObservableObject {

diff --git a/Sources/OversizeContactsKit/ContactsPicker/EmailPickerViewModel.swift b/Sources/OversizeContactsKit/ContactsPicker/EmailPickerViewModel.swift
@@ -4,11 +4,11 @@
 //
 
 import Contacts
+import Factory
 import OversizeContactsService
 import OversizeCore
 import OversizeServices
 import SwiftUI
-import Factory
 
 @MainActor
 class EmailPickerViewModel: ObservableObject {

diff --git a/Sources/OversizeKit/LauncherKit/RateAppScreen.swift b/Sources/OversizeKit/LauncherKit/RateAppScreen.swift
@@ -3,9 +3,9 @@
 // RateAppScreen.swift
 //
 
+import Factory
 import OversizeResources
 import OversizeServices
-import Factory
 import OversizeUI
 import SwiftUI
 
@@ -36,7 +36,7 @@ struct RateAppScreen: View {
             if let reviewUrl = Info.url.appStoreReview {
                 HStack(spacing: .large) {
                     Link(destination: reviewUrl) {
-                        Icon(.thumbsUp, color: .onPrimaryHighEmphasis)
+                        IconDeprecated(.thumbsUp, color: .onPrimaryHighEmphasis)
                     }
                     .buttonStyle(.primary(infinityWidth: false))
                     .accent()
@@ -49,7 +49,7 @@ struct RateAppScreen: View {
                         reviewService.estimate(goodRating: false)
                         dismiss()
                     } label: {
-                        Icon(.thumbsDown, color: .onSurfaceHighEmphasis)
+                        IconDeprecated(.thumbsDown, color: .onSurfaceHighEmphasis)
                     }
                     .buttonStyle(.secondary(infinityWidth: false))
                 }
@@ -65,7 +65,7 @@ struct RateAppScreen: View {
                 reviewService.rewiewBunnerClosed()
                 dismiss()
             } label: {
-                Icon(.xMini, color: .onSurfaceHighEmphasis)
+                IconDeprecated(.xMini, color: .onSurfaceHighEmphasis)
             }
             .buttonStyle(.tertiary(infinityWidth: false))
             .controlSize(.mini)

diff --git a/Sources/OversizeKit/LockscreenKit/LockscreenView.swift b/Sources/OversizeKit/LockscreenKit/LockscreenView.swift
@@ -226,7 +226,7 @@ public struct LockscreenView: View {
                 } else if pinCode.isEmpty, !biometricEnabled {
                     EmptyView()
                 } else {
-                    Icon(.delete)
+                    IconDeprecated(.delete)
                 }
             } // .opacity(pinCode.isEmpty && biometricEnabled ? 1 : 0)
         }

diff --git a/Sources/OversizeKit/SettingsKit/Views/About/AboutView.swift b/Sources/OversizeKit/SettingsKit/Views/About/AboutView.swift
@@ -7,7 +7,6 @@ import OversizeComponents
 import OversizeLocalizable
 import OversizeResources
 import OversizeServices
-
 import OversizeUI
 import SwiftUI
 
@@ -238,7 +237,7 @@ import SwiftUI
                                                     .foregroundColor(.surfaceSecondary)
                                                     .frame(width: 74, height: 74)
 
-                                                Icon(.externalLink)
+                                                IconDeprecated(.externalLink)
                                             }
                                         }
 

diff --git a/Sources/OversizeKit/SettingsKit/Views/Apperance/AppearanceSettingView.swift b/Sources/OversizeKit/SettingsKit/Views/Apperance/AppearanceSettingView.swift
@@ -130,9 +130,9 @@ import SwiftUI
                                         .padding(.vertical, .medium)
 
                                     if appearance == theme.appearance {
-                                        Icon(.checkCircle, color: Color.accent)
+                                        IconDeprecated(.checkCircle, color: Color.accent)
                                     } else {
-                                        Icon(.circle, color: .onSurfaceMediumEmphasis)
+                                        IconDeprecated(.circle, color: .onSurfaceMediumEmphasis)
                                     }
                                 }
                                 Spacer()

diff --git a/Sources/OversizeKit/SettingsKit/Views/Notifications/NotificationsSettingsView.swift b/Sources/OversizeKit/SettingsKit/Views/Notifications/NotificationsSettingsView.swift
@@ -5,7 +5,6 @@
 
 import OversizeLocalizable
 import OversizeServices
-
 import OversizeUI
 import SwiftUI
 

diff --git a/Sources/OversizeKit/SettingsKit/Views/Security/PINCode/SetPINCodeView.swift b/Sources/OversizeKit/SettingsKit/Views/Security/PINCode/SetPINCodeView.swift
@@ -4,13 +4,12 @@
 //
 
 import OversizeLocalizable
-
 import OversizeUI
 import SwiftUI
 
 public struct SetPINCodeView: View {
     @ObservedObject var viewModel: SetPINCodeViewModel
-    @EnvironmentObject private var hud: HUD
+    @EnvironmentObject private var hud: HUDDeprecated
     @Environment(\.dismiss) var dismiss
 
     public init(action: PINCodeAction) {
@@ -25,7 +24,7 @@ public struct SetPINCodeView: View {
                 Button {
                     dismiss()
                 } label: {
-                    Icon(.xMini, color: .onSurfaceHighEmphasis)
+                    IconDeprecated(.xMini, color: .onSurfaceHighEmphasis)
                 }
                 .buttonStyle(.secondary)
 

diff --git a/Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift b/Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift
@@ -3,11 +3,11 @@
 // SecuritySettingsView.swift
 //
 
+import Factory
 import OversizeLocalizable
 import OversizeServices
 import OversizeUI
 import SwiftUI
-import Factory
 
 // swiftlint:disable line_length
 #if os(iOS)
@@ -61,7 +61,7 @@ import Factory
                             })
                         ) {
                             Row(biometricService.biometricType.rawValue) {
-                                Icon(.file)
+                                IconDeprecated(.file)
                                 // leadingType: .systemImage(biometricImageName)
                             }
                         }
@@ -80,7 +80,7 @@ import Factory
                             })
                         ) {
                             Row(biometricService.biometricType.rawValue) {
-                                Icon(.lock)
+                                IconDeprecated(.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
@@ -18,7 +18,7 @@ import SwiftUI
         @Environment(\.iconStyle) var iconStyle: IconStyle
         @Environment(\.theme) var theme: ThemeSettings
         @StateObject var settingsService = SettingsService()
-        @EnvironmentObject var hudState: HUD
+        @EnvironmentObject var hudState: HUDDeprecated
 
         let appSection: AppSection
         let headSection: HeadSection
@@ -292,15 +292,6 @@ import SwiftUI
                         FeedbackView()
                             .presentationDetents([.medium])
                     }
-
-//
-//                    // Telegramm chat
-//                    if let telegramChatUrl = AppInfo.url.appTelegramChat, let id = AppInfo.app.telegramChatID, !id.isEmpty {
-//                        Link(destination: telegramChatUrl) {
-//                            Row(L10n.Settings.telegramChat, leadingType: .image(chatIcon), trallingType: rowType)
-//                        }
-//                        .buttonStyle(.row)
-//                    }
                 }
             }
         }

diff --git a/...ces/OversizeKit/SettingsKit/Views/SoundAndVibration/SoundsAndVibrationsSettingsView.swift b/...ces/OversizeKit/SettingsKit/Views/SoundAndVibration/SoundsAndVibrationsSettingsView.swift
@@ -60,15 +60,15 @@ import SwiftUI
                     if FeatureFlags.app.sounds.valueOrFalse {
                         Switch(isOn: $settingsService.soundsEnabled) {
                             Row(L10n.Settings.sounds) {
-                                Icon(.music)
+                                IconDeprecated(.music)
                             }
                         }
                     }
 
                     if FeatureFlags.app.vibration.valueOrFalse {
                         Switch(isOn: $settingsService.vibrationEnabled) {
                             Row(L10n.Settings.vibration) {
-                                Icon(.radio)
+                                IconDeprecated(.radio)
                             }
                         }
                     }

diff --git a/Sources/OversizeKit/SettingsKit/Views/iCloud/iCloudSettingsView.swift b/Sources/OversizeKit/SettingsKit/Views/iCloud/iCloudSettingsView.swift
@@ -5,7 +5,6 @@
 
 import OversizeLocalizable
 import OversizeServices
-
 import OversizeUI
 import SwiftUI
 
@@ -48,7 +47,7 @@ import SwiftUI
                     if FeatureFlags.app.сloudKit.valueOrFalse {
                         Switch(isOn: $settingsService.cloudKitEnabled) {
                             Row(L10n.Settings.iCloudSync) {
-                                Icon(.cloud)
+                                IconDeprecated(.cloud)
                             }
                             .premium()
                             .onPremiumTap()
@@ -67,7 +66,7 @@ import SwiftUI
                     if FeatureFlags.app.healthKit.valueOrFalse {
                         Switch(isOn: $settingsService.healthKitEnabled) {
                             Row("HealthKit synchronization", subtitle: "After switching on, data from the Health app will be downloaded") {
-                                Icon(.heart)
+                                IconDeprecated(.heart)
                             }
                         }
                     }

diff --git a/Sources/OversizeKit/StoreKit/StoreScreen/ViewModel/StoreViewModel.swift b/Sources/OversizeKit/StoreKit/StoreScreen/ViewModel/StoreViewModel.swift
@@ -3,13 +3,13 @@
 // StoreViewModel.swift
 //
 
+import Factory
 import OversizeCore
 import OversizeLocalizable
 import OversizeServices
 import OversizeStoreService
 import StoreKit
 import SwiftUI
-import Factory
 
 @MainActor
 class StoreViewModel: ObservableObject {

diff --git a/Sources/OversizeKit/StoreKit/Views/StoreFeatureDetailView.swift b/Sources/OversizeKit/StoreKit/Views/StoreFeatureDetailView.swift
@@ -44,7 +44,7 @@ struct StoreFeatureDetailView: View {
                     Button {
                         dismiss()
                     } label: {
-                        Icon(.xMini, color: selection.screenURL != nil ? .onPrimaryHighEmphasis : .onSurfaceDisabled)
+                        IconDeprecated(.xMini, color: selection.screenURL != nil ? .onPrimaryHighEmphasis : .onSurfaceDisabled)
                             .padding(.xxSmall)
                             .background {
                                 Circle()

diff --git a/Sources/OversizeKit/StoreKit/Views/StoreProductView.swift b/Sources/OversizeKit/StoreKit/Views/StoreProductView.swift
@@ -152,7 +152,7 @@ public struct StoreProductView: View {
                     .fill(Color.onPrimaryHighEmphasis)
                     .frame(width: 20, height: 20)
                     .overlay {
-                        Icon(.checkMini, color: topLabelbackgroundColor)
+                        IconDeprecated(.checkMini, color: topLabelbackgroundColor)
                     }
                     .padding(.trailing, .xxSmall)
             }
@@ -210,7 +210,7 @@ public struct StoreProductView: View {
                                 .fill(topLabelbackgroundColor)
                                 .frame(width: 20, height: 20)
                                 .overlay {
-                                    Icon(.checkMini, color: Color.onPrimaryHighEmphasis)
+                                    IconDeprecated(.checkMini, color: Color.onPrimaryHighEmphasis)
                                 }
                                 .padding(.top, .xxxSmall)
                                 .padding(.trailing, .xxxSmall)