Merge pull request #75 from OlegEremenko991/develop

- Вынес модели в отдельный пакет SWModels
- Убрал лишние импорты и сгенерировал публичные инициализаторы
- Включил еще несколько правил форматирования кода

Author: easydev991

.swiftformat

@@ -76,22 +76,12 @@ unusedArguments, \
 preferKeyPath
 
 --disable isEmpty, \
-indent, \
 markTypes, \
 organizeDeclarations, \
-wrapMultilineStatementBraces, \
-wrap, \
-linebreakAtEndOfFile, \
 numberFormatting, \
-opaqueGenericParameters, \
-redundantRawValues, \
 sortDeclarations, \
 sortedSwitchCases, \
-trailingClosures, \
-wrapSwitchCases, \
-wrapEnumCases, \
-wrapConditionalBodies, \
-yodaConditions
+wrapMultilineStatementBraces
 
 # Exclude
 --exclude \

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

@@ -7,23 +7,16 @@ let package = Package(
     name: "DateFormatterService",
     platforms: [.iOS(.v15)],
     products: [
-        // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
             name: "DateFormatterService",
             targets: ["DateFormatterService"]
         )
     ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-        .package(path: "../Utils")
-    ],
+    dependencies: [],
     targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "DateFormatterService",
-            dependencies: ["Utils"]
+            dependencies: []
         ),
         .testTarget(
             name: "DateFormatterServiceTests",

SwiftUI-WorkoutApp/Constants.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public extension Date {
+extension Date {
     var isToday: Bool {
         Calendar.current.isDateInToday(self)
     }

SwiftUI-WorkoutApp/DateFormatterService/Package.swift

@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 public enum DateFormatterService {
     public static func readableDate(from string: String?, locale: Locale = .autoupdatingCurrent) -> String {
@@ -34,14 +33,14 @@ public enum DateFormatterService {
     }
 
     public static func dateFromIsoString(_ string: String?) -> Date {
-        ISO8601DateFormatter().date(from: string.valueOrEmpty) ?? .now
+        ISO8601DateFormatter().date(from: string ?? "") ?? .now
     }
 
     public static func dateFromString(_ string: String?, format: DateFormat) -> Date {
         let formatter = DateFormatter()
         formatter.dateFormat = format.rawValue
         formatter.locale = Locale(identifier: "en_US_POSIX")
-        return formatter.date(from: string.valueOrEmpty) ?? .now
+        return formatter.date(from: string ?? "") ?? .now
     }
 }
 

…rkoutApp/Utils/Sources/Utils/Date+.swift …Sources/DateFormatterService/Date+.swiftSwiftUI-WorkoutApp/Utils/Sources/Utils/Date+.swift renamed to SwiftUI-WorkoutApp/DateFormatterService/Sources/DateFormatterService/Date+.swift SwiftUI-WorkoutApp/Utils/Sources/Utils/Date+.swift renamed to SwiftUI-WorkoutApp/DateFormatterService/Sources/DateFormatterService/Date+.swift

@@ -1,7 +1,7 @@
-import Foundation
+import SWModels
 import UIKit.UIImage
 
-extension Array where Element: UIImage {
+extension [UIImage] {
     /// Создает список медиафайлов из картинок для отправки на сервер
     var toMediaFiles: [MediaFile] {
         enumerated().compactMap { index, image in