Refactor/update project refactor (#120)

easydev991 · web-flow · commit 1e7e5542843c · 2023-09-30T18:11:01.000+03:00
* swiftformat 0.52.5

* Мелкий рефактор

* Обновил настройки проекта

- Применил рекомендуемые настройки для проекта в Xcode 15
- В том числе включил генерацию расширений для ассетов
diff --git a/.swiftformat b/.swiftformat
@@ -41,7 +41,7 @@ redundantGet, \
 redundantLet, \
 redundantObjc, \
 redundantOptionalBinding, \
-sortedImports, \
+sortImports, \
 spaceAroundBraces, \
 spaceInsideGenerics, \
 strongifiedSelf, \
diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ rbenv exec fastlane snapshot
 - 4.7 дюйма: iPhone SE (3rd generation)
 
 ### Форматирование кода
-- Используем [swiftformat (0.52.4)](https://github.com/nicklockwood/SwiftFormat) для форматирования кода
+- Используем [swiftformat (0.52.5)](https://github.com/nicklockwood/SwiftFormat) для форматирования кода
 - Правила форматирования перечислены в файле [.swiftformat](.swiftformat)
 - Все правила можно найти [тут](https://github.com/nicklockwood/SwiftFormat/blob/master/Rules.md)
 
diff --git a/SwiftUI-WorkoutApp.xcodeproj/project.pbxproj b/SwiftUI-WorkoutApp.xcodeproj/project.pbxproj
@@ -767,7 +767,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1420;
-				LastUpgradeCheck = 1330;
+				LastUpgradeCheck = 1500;
 				TargetAttributes = {
 					67138D83297311BD00BBF450 = {
 						CreatedOnToolsVersion = 14.2;
@@ -1051,6 +1051,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1085,6 +1086,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1114,6 +1116,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1148,6 +1151,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
diff --git a/SwiftUI-WorkoutApp.xcodeproj/xcshareddata/xcschemes/SwiftUI-WorkoutApp.xcscheme b/SwiftUI-WorkoutApp.xcodeproj/xcshareddata/xcschemes/SwiftUI-WorkoutApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1330"
+   LastUpgradeVersion = "1500"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/SwiftUI-WorkoutApp.xcodeproj/xcshareddata/xcschemes/WorkoutAppTests.xcscheme b/SwiftUI-WorkoutApp.xcodeproj/xcshareddata/xcschemes/WorkoutAppTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/SwiftUI-WorkoutApp.xcodeproj/xcshareddata/xcschemes/WorkoutAppUITests.xcscheme b/SwiftUI-WorkoutApp.xcodeproj/xcshareddata/xcschemes/WorkoutAppUITests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1500"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/SwiftUI-WorkoutApp/DesignSystem/.swiftpm/xcode/xcshareddata/xcschemes/DesignSystem.xcscheme b/SwiftUI-WorkoutApp/DesignSystem/.swiftpm/xcode/xcshareddata/xcschemes/DesignSystem.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/CachedImage/ResizableCachedImage.swift b/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/CachedImage/ResizableCachedImage.swift
@@ -22,7 +22,7 @@ public struct ResizableCachedImage: View {
                     .resizable()
             }
         } placeholder: {
-            Image.defaultWorkoutImage
+            Image.defaultWorkout
                 .resizable()
         }
     }
diff --git a/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/Color+.swift b/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/Color+.swift
@@ -2,35 +2,35 @@ import SwiftUI
 
 public extension Color {
     /// Фон
-    static let swBackground = Color("swBackground", bundle: .module)
+    static let swBackground = Color(.swBackground)
     /// Фон карточек
-    static let swCardBackground = Color("swCardBackground", bundle: .module)
+    static let swCardBackground = Color(.swCardBackground)
     /// Подписи/иконки
-    static let swSmallElements = Color("swSmallElements", bundle: .module)
+    static let swSmallElements = Color(.swSmallElements)
     /// Разделители
-    static let swSeparators = Color("swSeparators", bundle: .module)
+    static let swSeparators = Color(.swSeparators)
     /// Основной текст
-    static let swMainText = Color("swMainText", bundle: .module)
+    static let swMainText = Color(.swMainText)
     /// `AccentColor` для приложения
-    static let swAccent = Color("swAccent", bundle: .module)
+    static let swAccent = Color(.swAccent)
     /// Цвет текста в `filled`-кнопке
-    static let swFilledButtonText = Color("swFilledButtonText", bundle: .module)
+    static let swFilledButtonText = Color(.swFilledButtonText)
     /// Нажатые `filled`-кнопки
-    static let swFilledButtonPressed = Color("swFilledButtonPressed", bundle: .module)
+    static let swFilledButtonPressed = Color(.swFilledButtonPressed)
     /// Неактивные кнопки
-    static let swDisabledButton = Color("swDisabledButton", bundle: .module)
+    static let swDisabledButton = Color(.swDisabledButton)
     /// Цвет текста неактивных кнопок
-    static let swDisabledButtonText = Color("swDisabledButtonText", bundle: .module)
+    static let swDisabledButtonText = Color(.swDisabledButtonText)
     /// `tinted`-кнопки
-    static let swTintedButton = Color("swTintedButton", bundle: .module)
+    static let swTintedButton = Color(.swTintedButton)
     /// Нажатые `tinted`-кнопки
-    static let swTintedButtonPressed = Color("swTintedButtonPressed", bundle: .module)
+    static let swTintedButtonPressed = Color(.swTintedButtonPressed)
     /// Цвет кнопки удаления фото
-    static let swXmarkButton = Color("swXmarkButton", bundle: .module)
+    static let swXmarkButton = Color(.swXmarkButton)
     /// Цвет кнопки добавления фото
-    static let swAddPhotoButton = Color("swAddPhotoButton", bundle: .module)
+    static let swAddPhotoButton = Color(.swAddPhotoButton)
     /// Ошибки
-    static let swError = Color("swError", bundle: .module)
+    static let swError = Color(.swError)
 }
 
 #if DEBUG
diff --git a/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/Icons.swift b/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/Icons.swift
@@ -2,9 +2,9 @@ import SwiftUI
 
 public extension Image {
     /// Картинка для вкладки с площадками в таббаре
-    static let sportsGroundIcon = Image("SportsGroundTabbarIcon", bundle: .module)
+    static let sportsGroundIcon = Image(.sportsGroundTabbarIcon)
     /// Картинка-заглушка
-    static let defaultWorkoutImage = Image("defaultWorkoutImage", bundle: .module)
+    static let defaultWorkout = Image(.defaultWorkout)
 }
 
 public enum Icons {
diff --git a/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/RoundedDefaultImage.swift b/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/RoundedDefaultImage.swift
@@ -11,7 +11,7 @@ public struct RoundedDefaultImage: View {
     }
 
     public var body: some View {
-        Image.defaultWorkoutImage
+        Image.defaultWorkout
             .resizable()
             .scaledToFit()
             .frame(width: size.width, height: size.height)
diff --git a/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/ViewModifiers/BorderedClipshapeModifier.swift b/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/ViewModifiers/BorderedClipshapeModifier.swift
@@ -45,12 +45,12 @@ public extension View {
 #if DEBUG
 #Preview {
     VStack(spacing: 16) {
-        Image.defaultWorkoutImage
+        Image.defaultWorkout
             .resizable()
             .scaledToFit()
             .frame(width: 80, height: 80)
             .borderedClipshape(.circle)
-        Image.defaultWorkoutImage
+        Image.defaultWorkout
             .resizable()
             .scaledToFit()
             .frame(width: 120, height: 120)
diff --git a/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/ViewModifiers/LoadingOverlayModifier.swift b/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/ViewModifiers/LoadingOverlayModifier.swift
@@ -21,7 +21,7 @@ private struct LoadingIndicator: View {
     @State private var isAnimating = false
 
     var body: some View {
-        Image("LoadingIndicator", bundle: .module)
+        Image(.loadingIndicator)
             .resizable()
             .frame(width: 50, height: 50)
             .rotationEffect(Angle(degrees: isAnimating ? 360 : 0))
diff --git a/SwiftUI-WorkoutApp/Screens/Common/SportsGroundLocation/MapSnapshotView.swift b/SwiftUI-WorkoutApp/Screens/Common/SportsGroundLocation/MapSnapshotView.swift
@@ -28,7 +28,7 @@ private extension MapSnapshotView {
             if let image = snapshotImage {
                 Image(uiImage: image)
             }
-            Image.defaultWorkoutImage
+            Image.defaultWorkout
                 .resizable()
                 .scaledToFit()
                 .frame(maxWidth: .infinity)
diff --git a/SwiftUI-WorkoutApp/Services/AppThemeService.swift b/SwiftUI-WorkoutApp/Services/AppThemeService.swift
@@ -12,18 +12,17 @@ enum AppThemeService {
     ///
     /// - Parameter newTheme: Новая тема
     static func set(_ newTheme: Theme) {
-        var userInterfaceStyle: UIUserInterfaceStyle = switch newTheme {
+        let keyWindow = UIApplication.shared.connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+            .flatMap(\.windows)
+            .first(where: \.isKeyWindow)
+        keyWindow?.overrideUserInterfaceStyle = switch newTheme {
         case .dark:
             .dark
         case .light:
             .light
         case .system:
             .unspecified
         }
-        let keyWindow = UIApplication.shared.connectedScenes
-            .compactMap { $0 as? UIWindowScene }
-            .flatMap(\.windows)
-            .first(where: \.isKeyWindow)
-        keyWindow?.overrideUserInterfaceStyle = userInterfaceStyle
     }
 }
diff --git a/SwiftUI-WorkoutApp/ShortAddressService/.swiftpm/xcode/xcshareddata/xcschemes/ShortAddressService.xcscheme b/SwiftUI-WorkoutApp/ShortAddressService/.swiftpm/xcode/xcshareddata/xcschemes/ShortAddressService.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/swiftformat b/swiftformat

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public struct ResizableCachedImage: View {`
`22`	`22`	`.resizable()`
`23`	`23`	`}`
`24`	`24`	`} placeholder: {`
`25`		`- Image.defaultWorkoutImage`
	`25`	`+ Image.defaultWorkout`
`26`	`26`	`.resizable()`
`27`	`27`	`}`
`28`	`28`	`}`