Merge pull request #1 from easydev991/feature/minorUpdate

easydev991 · web-flow · commit 185fa4c9f9d7 · 2024-03-09T13:51:37.000+03:00
Небольшое обновление
diff --git a/Package.resolved b/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/OlegEremenko991/CachedAsyncImage991",
       "state" : {
-        "revision" : "db996671b7b0cc3466f3a6b867bed02baeb7f428",
-        "version" : "1.0.8"
+        "revision" : "e308c3519417eba297c26b1d7c41eae20ccbf0e1",
+        "version" : "1.1.0"
       }
     }
   ],
diff --git a/Package.swift b/Package.swift
@@ -10,7 +10,7 @@ let package = Package(
         .library(name: "SWDesignSystem", targets: ["SWDesignSystem"])
     ],
     dependencies: [
-        .package(url: "https://github.com/OlegEremenko991/CachedAsyncImage991", from: "1.0.8")
+        .package(url: "https://github.com/OlegEremenko991/CachedAsyncImage991", from: "1.1.0")
     ],
     targets: [
         .target(
diff --git a/Sources/SWDesignSystem/Internal/CardBackgroundModifier.swift b/Sources/SWDesignSystem/Internal/CardBackgroundModifier.swift
@@ -19,12 +19,7 @@ struct CardBackgroundModifier: ViewModifier {
 
 #if DEBUG
 #Preview {
-    VStack(spacing: 16) {
-        Text("Light mode text")
-            .insideCardBackground()
-        Text("Dark mode text")
-            .insideCardBackground()
-            .environment(\.colorScheme, .dark)
-    }
+    Text("Текст для превью")
+        .insideCardBackground()
 }
 #endif
diff --git a/Sources/SWDesignSystem/Internal/DefaultWorkoutImage.swift b/Sources/SWDesignSystem/Internal/DefaultWorkoutImage.swift
@@ -24,6 +24,5 @@ struct DefaultWorkoutImage: View {
         DefaultWorkoutImage(size: .init(width: 45, height: 45))
         DefaultWorkoutImage(size: .init(width: 60, height: 60))
     }
-    .padding()
 }
 #endif
diff --git a/Sources/SWDesignSystem/Public/Color+.swift b/Sources/SWDesignSystem/Public/Color+.swift
@@ -46,15 +46,9 @@ public extension Color {
     return ScrollView {
         VStack(spacing: 4) {
             ForEach(colors, id: \.self) { color in
-                HStack(spacing: 20) {
-                    Group {
-                        Circle()
-                        Circle()
-                            .environment(\.colorScheme, .dark)
-                    }
+                Circle()
                     .foregroundStyle(color)
                     .frame(width: 50, height: 50)
-                }
             }
         }
         .frame(maxWidth: .infinity)
diff --git a/Sources/SWDesignSystem/Public/Rows/CheckmarkRowView.swift b/Sources/SWDesignSystem/Public/Rows/CheckmarkRowView.swift
@@ -30,6 +30,6 @@ public struct TextWithCheckmarkRowView: View {
 #Preview {
     TextWithCheckmarkRowView(text: "Checked text", isChecked: true)
         .insideCardBackground(padding: 0)
-        .padding()
+        .padding(.horizontal)
 }
 #endif
diff --git a/Sources/SWDesignSystem/Public/Rows/CommentRowView.swift b/Sources/SWDesignSystem/Public/Rows/CommentRowView.swift
@@ -1,4 +1,3 @@
-import CachedAsyncImage991
 import SwiftUI
 
 /// Вьюшка с комментарием (в списке комментариев)
@@ -118,6 +117,5 @@ private extension CommentRowView {
         editAction: {},
         deleteAction: {}
     )
-    .padding()
 }
 #endif
diff --git a/Sources/SWDesignSystem/Public/Rows/DialogRowView.swift b/Sources/SWDesignSystem/Public/Rows/DialogRowView.swift
@@ -93,6 +93,6 @@ private extension DialogRowView {
             unreadCount: 3
         )
     )
-    .padding()
+    .padding(.horizontal)
 }
 #endif
diff --git a/Sources/SWDesignSystem/Public/Rows/EventRowView.swift b/Sources/SWDesignSystem/Public/Rows/EventRowView.swift
@@ -1,4 +1,3 @@
-import CachedAsyncImage991
 import SwiftUI
 
 /// Вьюшка с мероприятием (в списке мероприятий)
@@ -74,21 +73,12 @@ private extension EventRowView {
 
 #if DEBUG
 #Preview {
-    VStack(spacing: 30) {
-        EventRowView(
-            imageURL: nil,
-            title: "Открытая воскресная тренировка #3 в 2023 году (участники)",
-            dateTimeText: "22 янв, 12:00",
-            locationText: "Россия, Москва"
-        )
-        EventRowView(
-            imageURL: nil,
-            title: "Открытая воскресная тренировка #3 в 2023 году (участники)",
-            dateTimeText: "22 янв, 12:00",
-            locationText: "Россия, Москва"
-        )
-        .environment(\.colorScheme, .dark)
-    }
-    .padding()
+    EventRowView(
+        imageURL: nil,
+        title: "Открытая воскресная тренировка #3 в 2023 году (участники)",
+        dateTimeText: "22 янв, 12:00",
+        locationText: "Россия, Москва"
+    )
+    .padding(.horizontal)
 }
 #endif
diff --git a/Sources/SWDesignSystem/Public/Rows/FormRowView.swift b/Sources/SWDesignSystem/Public/Rows/FormRowView.swift
@@ -73,19 +73,12 @@ public extension FormRowView {
 
 #if DEBUG
 #Preview {
-    Group {
-        ForEach(ColorScheme.allCases, id: \.self) { scheme in
-            VStack(spacing: 20) {
-                FormRowView(title: "Друзья", trailingContent: .textWithChevron("56 друзей"))
-                FormRowView(title: "Друзья", trailingContent: .textWithBadgeAndChevron("56 друзей", 5))
-                FormRowView(title: "Где тренируется", trailingContent: .textWithChevron("26 площадок"))
-                FormRowView(title: "Тренируюсь здесь", trailingContent: .toggle(.constant(true)))
-            }
-            .padding()
-            .background(Color.swBackground)
-            .environment(\.colorScheme, scheme)
-            .previewDisplayName(scheme == .dark ? "Dark" : "Light")
-        }
+    VStack(spacing: 20) {
+        FormRowView(title: "Друзья", trailingContent: .textWithChevron("56 друзей"))
+        FormRowView(title: "Друзья", trailingContent: .textWithBadgeAndChevron("56 друзей", 5))
+        FormRowView(title: "Где тренируется", trailingContent: .textWithChevron("26 площадок"))
+        FormRowView(title: "Тренируюсь здесь", trailingContent: .toggle(.constant(true)))
     }
+    .padding(.horizontal)
 }
 #endif
diff --git a/Sources/SWDesignSystem/Public/Rows/JournalRowView.swift b/Sources/SWDesignSystem/Public/Rows/JournalRowView.swift
@@ -1,4 +1,3 @@
-import CachedAsyncImage991
 import SwiftUI
 
 /// Вьюшка для записи в дневнике
@@ -150,26 +149,15 @@ private extension JournalRowView {
 
 #if DEBUG
 #Preview {
-    VStack(spacing: 30) {
-        JournalRowView(
-            model: .init(
-                avatarURL: .init(string: "https://workout.su/uploads/avatars/2019/10/2019-10-07-01-10-08-yow.jpg")!,
-                title: "Дневник 1",
-                dateText: "21 мая 2023",
-                bodyText: "Классная площадка, часто тренируюсь здесь с друзьями. Сегодня тренировался на стадионе. Для начала небольшая пробежка для разминки",
-                bodyTextLinelimit: 2
-            )
+    JournalRowView(
+        model: .init(
+            avatarURL: .init(string: "https://workout.su/uploads/avatars/2019/10/2019-10-07-01-10-08-yow.jpg")!,
+            title: "Дневник 1",
+            dateText: "21 мая 2023",
+            bodyText: "Классная площадка, часто тренируюсь здесь с друзьями. Сегодня тренировался на стадионе. Для начала небольшая пробежка для разминки",
+            bodyTextLinelimit: 2
         )
-        JournalRowView(
-            model: .init(
-                avatarURL: .init(string: "https://workout.su/uploads/avatars/2019/10/2019-10-07-01-10-08-yow.jpg")!,
-                title: "Kahar",
-                dateText: "21 мая 2023",
-                bodyText: "Классная площадка, часто тренируюсь здесь с друзьями. Сегодня тренировался на стадионе. Для начала небольшая пробежка для разминки"
-            )
-        )
-        .environment(\.colorScheme, .dark)
-    }
-    .padding()
+    )
+    .padding(.horizontal)
 }
 #endif
diff --git a/Sources/SWDesignSystem/Public/Rows/ListRowView.swift b/Sources/SWDesignSystem/Public/Rows/ListRowView.swift
@@ -116,6 +116,6 @@ public extension ListRowView {
             ListRowView(leadingContent: model.left, trailingContent: model.right)
         }
     }
-    .padding()
+    .padding(.horizontal)
 }
 #endif
diff --git a/Sources/SWDesignSystem/Public/Rows/ParkRowView.swift b/Sources/SWDesignSystem/Public/Rows/ParkRowView.swift
@@ -1,4 +1,3 @@
-import CachedAsyncImage991
 import SwiftUI
 
 /// Вьюшка с площадкой (в списке площадок)
@@ -76,33 +75,26 @@ private extension ParkRowView {
 
 #if DEBUG
 #Preview {
-    Group {
-        ForEach(ColorScheme.allCases, id: \.self) { scheme in
-            VStack(spacing: 12) {
-                ParkRowView(
-                    imageURL: URL(string: "https://workout.su/uploads/userfiles/измайлово.jpg"),
-                    title: "N° 3 Легендарная / Средняя",
-                    address: "м. Партизанская, улица 2-я Советская",
-                    usersTrainHereText: "Тренируются 5 человек"
-                )
-                ParkRowView(
-                    imageURL: URL(string: "https://workout.su/uploads/userfiles/измайлово.jpg"),
-                    title: "N° 3 Легендарная / Средняя",
-                    address: nil,
-                    usersTrainHereText: "Тренируются 5 человек"
-                )
-                ParkRowView(
-                    imageURL: URL(string: "https://workout.su/uploads/userfiles/измайлово.jpg"),
-                    title: "N° 3 Легендарная / Средняя",
-                    address: "м. Партизанская, улица 2-я Советская",
-                    usersTrainHereText: "Здесь пока никто не тренируется"
-                )
-            }
-            .padding()
-            .background(Color.swBackground)
-            .environment(\.colorScheme, scheme)
-            .previewDisplayName(scheme == .dark ? "Dark" : "Light")
-        }
+    VStack(spacing: 12) {
+        ParkRowView(
+            imageURL: URL(string: "https://workout.su/uploads/userfiles/измайлово.jpg"),
+            title: "N° 3 Легендарная / Средняя",
+            address: "м. Партизанская, улица 2-я Советская",
+            usersTrainHereText: "Тренируются 5 человек"
+        )
+        ParkRowView(
+            imageURL: URL(string: "https://workout.su/uploads/userfiles/измайлово.jpg"),
+            title: "N° 3 Легендарная / Средняя",
+            address: nil,
+            usersTrainHereText: "Тренируются 5 человек"
+        )
+        ParkRowView(
+            imageURL: URL(string: "https://workout.su/uploads/userfiles/измайлово.jpg"),
+            title: "N° 3 Легендарная / Средняя",
+            address: "м. Партизанская, улица 2-я Советская",
+            usersTrainHereText: "Здесь пока никто не тренируется"
+        )
     }
+    .padding(.horizontal)
 }
 #endif
diff --git a/Sources/SWDesignSystem/Public/Rows/UserRowView.swift b/Sources/SWDesignSystem/Public/Rows/UserRowView.swift
@@ -1,4 +1,3 @@
-import CachedAsyncImage991
 import SwiftUI
 
 /// Вьюшка для краткой информации о пользователе
@@ -130,24 +129,18 @@ private extension UserRowView {
 
 #if DEBUG
 #Preview {
-    let baseModel: UserRowView.Mode.BaseModel = .init(
+    let baseModel = UserRowView.Mode.BaseModel(
         imageURL: .init(string: "https://workout.su/uploads/avatars/2019/10/2019-10-07-01-10-08-yow.jpg")!,
         name: "Beautifulbutterfly101",
         address: "Россия, Краснодар"
     )
-    return Group {
-        ForEach(ColorScheme.allCases, id: \.self) { scheme in
-            VStack(spacing: 20) {
-                UserRowView(mode: .regular(baseModel))
-                UserRowView(
-                    mode: .friendRequest(baseModel, .init(accept: {}, reject: {}))
-                )
-                .insideCardBackground(padding: 0)
-            }
-            .environment(\.colorScheme, scheme)
-            .previewDisplayName(scheme == .dark ? "Dark" : "Light")
-        }
+    return VStack(spacing: 20) {
+        UserRowView(mode: .regular(baseModel))
+        UserRowView(
+            mode: .friendRequest(baseModel, .init(accept: {}, reject: {}))
+        )
+        .insideCardBackground(padding: 0)
     }
-    .padding()
+    .padding(.horizontal)
 }
 #endif
diff --git a/Sources/SWDesignSystem/Public/SWTextEditor.swift b/Sources/SWDesignSystem/Public/SWTextEditor.swift
@@ -60,7 +60,7 @@ private extension SWTextEditor {
                 .scrollContentBackground(.hidden)
         } else {
             TextEditor(text: $text)
-                .accentColor(.swAccent)
+                .tint(.swAccent)
         }
     }
 }
@@ -89,6 +89,6 @@ private extension SWTextEditor {
             height: 100
         )
     }
-    .padding()
+    .padding(.horizontal)
 }
 #endif
diff --git a/Sources/SWDesignSystem/Public/SWTextField.swift b/Sources/SWDesignSystem/Public/SWTextField.swift
@@ -31,7 +31,8 @@ public struct SWTextField: View {
 
     public var body: some View {
         VStack(alignment: .leading, spacing: 6) {
-            textFieldView
+            textField
+                .tint(.swAccent)
                 .foregroundStyle(Color.swMainText)
                 .padding(12)
                 .background {
@@ -61,15 +62,6 @@ public extension SWTextField {
 }
 
 private extension SWTextField {
-    @ViewBuilder
-    var textFieldView: some View {
-        if #available(iOS 16.0, *) {
-            textField.tint(.swAccent)
-        } else {
-            textField.accentColor(.swAccent)
-        }
-    }
-
     @ViewBuilder
     var textField: some View {
         if isSecure {
@@ -127,7 +119,6 @@ private extension SWTextField {
             errorState: .message("Error message")
         )
     }
-    .padding()
-    .previewLayout(.sizeThatFits)
+    .padding(.horizontal)
 }
 #endif
diff --git a/Sources/SWDesignSystem/Public/SWTextFieldSearchButton.swift b/Sources/SWDesignSystem/Public/SWTextFieldSearchButton.swift
@@ -49,12 +49,20 @@ public struct SWTextFieldSearchButton: View {
 
 #if DEBUG
 #Preview {
-    SWTextFieldSearchButton(
-        "Найти город",
-        showClearButton: true,
-        mainAction: { print("main action!") },
-        clearAction: { print("clear action")}
-    )
-    .padding()
+    VStack(spacing: 16) {
+        SWTextFieldSearchButton(
+            "Найти город",
+            showClearButton: false,
+            mainAction: { print("main action!") },
+            clearAction: {}
+        )
+        SWTextFieldSearchButton(
+            "Красноярск",
+            showClearButton: true,
+            mainAction: { print("main action!") },
+            clearAction: { print("clear action") }
+        )
+    }
+    .padding(.horizontal)
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`"kind" : "remoteSourceControl",`
`6`	`6`	`"location" : "https://github.com/OlegEremenko991/CachedAsyncImage991",`
`7`	`7`	`"state" : {`
`8`		`- "revision" : "db996671b7b0cc3466f3a6b867bed02baeb7f428",`
`9`		`- "version" : "1.0.8"`
	`8`	`+ "revision" : "e308c3519417eba297c26b1d7c41eae20ccbf0e1",`
	`9`	`+ "version" : "1.1.0"`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`],`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,5 @@ struct DefaultWorkoutImage: View {`
`24`	`24`	`DefaultWorkoutImage(size: .init(width: 45, height: 45))`
`25`	`25`	`DefaultWorkoutImage(size: .init(width: 60, height: 60))`
`26`	`26`	`}`
`27`		`- .padding()`
`28`	`27`	`}`
`29`	`28`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ public struct TextWithCheckmarkRowView: View {`
`30`	`30`	`#Preview {`
`31`	`31`	`TextWithCheckmarkRowView(text: "Checked text", isChecked: true)`
`32`	`32`	`.insideCardBackground(padding: 0)`
`33`		`- .padding()`
	`33`	`+ .padding(.horizontal)`
`34`	`34`	`}`
`35`	`35`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import CachedAsyncImage991`
`2`	`1`	`import SwiftUI`
`3`	`2`
`4`	`3`	`/// Вьюшка с комментарием (в списке комментариев)`
`@@ -118,6 +117,5 @@ private extension CommentRowView {`
`118`	`117`	`editAction: {},`
`119`	`118`	`deleteAction: {}`
`120`	`119`	`)`
`121`		`- .padding()`
`122`	`120`	`}`
`123`	`121`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,6 @@ private extension DialogRowView {`
`93`	`93`	`unreadCount: 3`
`94`	`94`	`)`
`95`	`95`	`)`
`96`		`- .padding()`
	`96`	`+ .padding(.horizontal)`
`97`	`97`	`}`
`98`	`98`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,6 @@ public extension ListRowView {`
`116`	`116`	`ListRowView(leadingContent: model.left, trailingContent: model.right)`
`117`	`117`	`}`
`118`	`118`	`}`
`119`		`- .padding()`
	`119`	`+ .padding(.horizontal)`
`120`	`120`	`}`
`121`	`121`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ private extension SWTextEditor {`
`60`	`60`	`.scrollContentBackground(.hidden)`
`61`	`61`	`} else {`
`62`	`62`	`TextEditor(text: $text)`
`63`		`- .accentColor(.swAccent)`
	`63`	`+ .tint(.swAccent)`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`}`
`@@ -89,6 +89,6 @@ private extension SWTextEditor {`
`89`	`89`	`height: 100`
`90`	`90`	`)`
`91`	`91`	`}`
`92`		`- .padding()`
	`92`	`+ .padding(.horizontal)`
`93`	`93`	`}`
`94`	`94`	`#endif`