Рефактор

easydev991 · easydev991 · commit c1a80c58f902 · 2022-06-11T14:08:24.000+03:00
- Сократил отчеты с ответами сервера в консоли
- Убрал лишние импорты
- Поправил превью
diff --git a/SwiftUI-WorkoutApp/Constants.swift b/SwiftUI-WorkoutApp/Constants.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 import UIKit.UIDevice
 
 enum Constants {
diff --git a/SwiftUI-WorkoutApp/Models/DialogResponse.swift b/SwiftUI-WorkoutApp/Models/DialogResponse.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 /// Модель с информацией о диалоге
 struct DialogResponse: Codable, Identifiable {
diff --git a/SwiftUI-WorkoutApp/Models/ErrorResponse.swift b/SwiftUI-WorkoutApp/Models/ErrorResponse.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 struct ErrorResponse: Codable {
     let errors: [String]?
diff --git a/SwiftUI-WorkoutApp/Models/EventForm.swift b/SwiftUI-WorkoutApp/Models/EventForm.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 /// Форма для отправки создании/изменении мероприятия
 struct EventForm: Codable {
diff --git a/SwiftUI-WorkoutApp/Models/EventResponse.swift b/SwiftUI-WorkoutApp/Models/EventResponse.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 /// Модель со всей информацией о мероприятии
 struct EventResponse: Codable, Identifiable {
diff --git a/SwiftUI-WorkoutApp/Models/JournalEntryResponse.swift b/SwiftUI-WorkoutApp/Models/JournalEntryResponse.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 /// Модель с информацией о записи в дневнике
 struct JournalEntryResponse: Codable, Identifiable {
diff --git a/SwiftUI-WorkoutApp/Models/JournalResponse.swift b/SwiftUI-WorkoutApp/Models/JournalResponse.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 /// Модель с информацией о дневнике
 struct JournalResponse: Codable, Identifiable, Equatable {
diff --git a/SwiftUI-WorkoutApp/Models/MainUserForm.swift b/SwiftUI-WorkoutApp/Models/MainUserForm.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 /// Форма для отправки при регистрации или изменении данных профиля
 struct MainUserForm: Codable, Equatable {
diff --git a/SwiftUI-WorkoutApp/Models/MessageResponse.swift b/SwiftUI-WorkoutApp/Models/MessageResponse.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 /// Модель сообщения в диалоге
 struct MessageResponse: Codable, Identifiable, Hashable {
diff --git a/SwiftUI-WorkoutApp/Models/SportsGround.swift b/SwiftUI-WorkoutApp/Models/SportsGround.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 import MapKit.MKGeometry
 
 /// Модель данных спортивной площадки
diff --git a/SwiftUI-WorkoutApp/Models/SportsGroundForm.swift b/SwiftUI-WorkoutApp/Models/SportsGroundForm.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 /// Форма для отправки при создании/изменении площадки
 struct SportsGroundForm: Codable {
diff --git a/SwiftUI-WorkoutApp/Models/UserModel.swift b/SwiftUI-WorkoutApp/Models/UserModel.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 /// Упрощенная модель данных пользователя
 struct UserModel: Identifiable, Hashable {
@@ -77,4 +76,7 @@ extension UserModel {
     static var emptyValue: UserModel {
         .init(id: .zero, imageURL: nil, name: "", gender: "", age: .zero, countryID: .zero, cityID: .zero, usesSportsGrounds: .zero, addedSportsGrounds: [], friendsCount: .zero, journalsCount: .zero)
     }
+    static var mock: UserModel {
+        .init(.mock)
+    }
 }
diff --git a/SwiftUI-WorkoutApp/Models/UserResponse.swift b/SwiftUI-WorkoutApp/Models/UserResponse.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 /// Модель данных пользователя со всеми доступными свойствами
 struct UserResponse: Codable, Hashable {
diff --git a/SwiftUI-WorkoutApp/Screens/Components/ButtonInFormLabel.swift b/SwiftUI-WorkoutApp/Screens/Components/ButtonInFormLabel.swift
@@ -17,5 +17,6 @@ struct ButtonInFormLabel: View {
 struct ButtonInFormLabel_Previews: PreviewProvider {
     static var previews: some View {
         ButtonInFormLabel(title: "Кнопка")
+            .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Components/CacheImage/CacheImageView.swift b/SwiftUI-WorkoutApp/Screens/Components/CacheImage/CacheImageView.swift
@@ -35,5 +35,6 @@ extension CacheImageView {
 struct SmallProfileCacheImageView_Previews: PreviewProvider {
     static var previews: some View {
         CacheImageView(url: .init(string: "https://workout.su/img/avatar_default.jpg")!)
+            .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Components/Comments/AddCommentButton.swift b/SwiftUI-WorkoutApp/Screens/Components/Comments/AddCommentButton.swift
@@ -16,5 +16,6 @@ struct AddCommentButton: View {
 struct AddCommentButton_Previews: PreviewProvider {
     static var previews: some View {
         AddCommentButton(isCreatingComment: .constant(false))
+            .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Components/Comments/CommentViewCell.swift b/SwiftUI-WorkoutApp/Screens/Components/Comments/CommentViewCell.swift
@@ -77,5 +77,6 @@ struct SportsGroundCommentView_Previews: PreviewProvider {
         )
         .environmentObject(CheckNetworkService())
         .environmentObject(DefaultsService())
+        .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Components/Comments/Comments.swift b/SwiftUI-WorkoutApp/Screens/Components/Comments/Comments.swift
@@ -21,6 +21,10 @@ struct Comments: View {
 
 struct Comments_Previews: PreviewProvider {
     static var previews: some View {
-        Comments(items: [.mock, .mock], deleteClbk: {_ in}, editClbk: {_ in})
+        Form {
+            Comments(items: [.mock, .mock], deleteClbk: {_ in}, editClbk: {_ in})
+        }
+        .environmentObject(DefaultsService())
+        .environmentObject(CheckNetworkService())
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Components/CustomToggle.swift b/SwiftUI-WorkoutApp/Screens/Components/CustomToggle.swift
@@ -37,6 +37,6 @@ struct CustomToggle: View {
 struct CustomToggle_Previews: PreviewProvider {
     static var previews: some View {
         CustomToggle(isOn: .constant(true), title: "Тренируюсь здесь") {}
-            .padding()
+            .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Components/EmptyContentView.swift b/SwiftUI-WorkoutApp/Screens/Components/EmptyContentView.swift
@@ -41,9 +41,11 @@ struct EmptyContentView_Previews: PreviewProvider {
         EmptyContentView(
             message: "Чатов пока нет",
             buttonTitle: "Открыть список друзей",
-            action: {}
+            action: {},
+            hintText: "Подсказка"
         )
         .environmentObject(CheckNetworkService())
         .environmentObject(DefaultsService())
+        .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Components/GenericListCell.swift b/SwiftUI-WorkoutApp/Screens/Components/GenericListCell.swift
@@ -1,5 +1,4 @@
 import SwiftUI
-import Utils
 
 /// Ячейка для экранов с дневниками и диалогами
 struct GenericListCell: View {
diff --git a/SwiftUI-WorkoutApp/Screens/Components/ImagePicker/AddPhotoButton.swift b/SwiftUI-WorkoutApp/Screens/Components/ImagePicker/AddPhotoButton.swift
@@ -18,5 +18,6 @@ struct AddPhotoButton: View {
 struct AddPhotoButton_Previews: PreviewProvider {
     static var previews: some View {
         AddPhotoButton(isAddingPhotos: .constant(false), focusClbk: {})
+            .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Components/ImagePicker/PickedImagesList.swift b/SwiftUI-WorkoutApp/Screens/Components/ImagePicker/PickedImagesList.swift
@@ -33,7 +33,11 @@ private extension PickedImagesList {
 
 struct PickedImagesList_Previews: PreviewProvider {
     static var previews: some View {
-        PickedImagesList(images: .constant([]))
-            .padding()
+        PickedImagesList(
+            images: .constant([
+                .init(named: "defaultWorkoutImage")!,
+                .init(named: "defaultWorkoutImage")!
+            ])
+        )
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Components/MapSnapshotView.swift b/SwiftUI-WorkoutApp/Screens/Components/MapSnapshotView.swift
@@ -1,6 +1,5 @@
 import SwiftUI
 import MapKit
-import Utils
 
 /// Снапшот карты
 struct MapSnapshotView: View {
diff --git a/SwiftUI-WorkoutApp/Screens/Components/PhotoSection/DeletablePhotoCell.swift b/SwiftUI-WorkoutApp/Screens/Components/PhotoSection/DeletablePhotoCell.swift
@@ -42,7 +42,12 @@ private extension DeletablePhotoCell {
 
 struct DeletablePhotoCell_Previews: PreviewProvider {
     static var previews: some View {
-        DeletablePhotoCell(photo: .mock, canDelete: true, deleteClbk: {_ in})
-            .environmentObject(CheckNetworkService())
+        DeletablePhotoCell(
+            photo: .mock,
+            canDelete: true,
+            deleteClbk: {_ in}
+        )
+        .environmentObject(CheckNetworkService())
+        .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Components/PhotoSection/PhotoSectionView.swift b/SwiftUI-WorkoutApp/Screens/Components/PhotoSection/PhotoSectionView.swift
@@ -70,8 +70,10 @@ private extension PhotoSectionView {
     }
 }
 
-struct PhotosCollection_Previews: PreviewProvider {
+struct PhotoSectionView_Previews: PreviewProvider {
     static var previews: some View {
-        PhotoSectionView(with: [.mock, .mock, .mock], canDelete: true, deleteClbk: {_ in})
+        Form {
+            PhotoSectionView(with: [.mock, .mock, .mock], canDelete: true, deleteClbk: {_ in})
+        }
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Components/TextWithCheckmark.swift b/SwiftUI-WorkoutApp/Screens/Components/TextWithCheckmark.swift
@@ -18,5 +18,6 @@ struct TextWithCheckmark: View {
 struct LabelWithCheckmark_Previews: PreviewProvider {
     static var previews: some View {
         TextWithCheckmark(title: "Text", showMark: true)
+            .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Components/UsersList/UserViewCell.swift b/SwiftUI-WorkoutApp/Screens/Components/UsersList/UserViewCell.swift
@@ -17,8 +17,9 @@ struct UserViewCell: View {
     }
 }
 
-struct UserViewRow_Previews: PreviewProvider {
+struct UserViewCell_Previews: PreviewProvider {
     static var previews: some View {
-        UserViewCell(model: .emptyValue)
+        UserViewCell(model: .mock)
+            .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Events/Detail/EventDetailsView.swift b/SwiftUI-WorkoutApp/Screens/Events/Detail/EventDetailsView.swift
@@ -1,5 +1,4 @@
 import SwiftUI
-import Utils
 
 /// Экран с детальной информацией о мероприятии
 struct EventDetailsView: View {
diff --git a/SwiftUI-WorkoutApp/Screens/Events/Form/EventFormView.swift b/SwiftUI-WorkoutApp/Screens/Events/Form/EventFormView.swift
@@ -1,5 +1,4 @@
 import SwiftUI
-import Utils
 
 /// Экран для создания/изменения мероприятия
 struct EventFormView: View {
diff --git a/SwiftUI-WorkoutApp/Screens/Events/List/EventViewCell.swift b/SwiftUI-WorkoutApp/Screens/Events/List/EventViewCell.swift
@@ -31,5 +31,6 @@ struct EventViewCell: View {
 struct EventViewCell_Previews: PreviewProvider {
     static var previews: some View {
         EventViewCell(for: .constant(.mock))
+            .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Journals/EntriesList/JournalEntryCell.swift b/SwiftUI-WorkoutApp/Screens/Journals/EntriesList/JournalEntryCell.swift
@@ -1,5 +1,4 @@
 import SwiftUI
-import Utils
 
 struct JournalEntryCell: View {
     @EnvironmentObject private var network: CheckNetworkService
@@ -63,8 +62,13 @@ private extension JournalEntryCell {
 
 struct JournalEntryCell_Previews: PreviewProvider {
     static var previews: some View {
-        JournalEntryCell(model: .mock, deleteClbk: {_ in}, editClbk: {_ in})
-            .environmentObject(CheckNetworkService())
-            .environmentObject(DefaultsService())
+        JournalEntryCell(
+            model: .mock,
+            deleteClbk: {_ in},
+            editClbk: {_ in}
+        )
+        .environmentObject(CheckNetworkService())
+        .environmentObject(DefaultsService())
+        .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Messages/DialogView/ChatBubble.swift b/SwiftUI-WorkoutApp/Screens/Messages/DialogView/ChatBubble.swift
@@ -159,5 +159,6 @@ struct ChatBubble_Previews: PreviewProvider {
             }
         }
         .textSelection(.enabled)
+        .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Messages/DialogView/DialogView.swift b/SwiftUI-WorkoutApp/Screens/Messages/DialogView/DialogView.swift
@@ -1,5 +1,4 @@
 import SwiftUI
-import Utils
 
 /// Экран с диалогом
 struct DialogView: View {
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/FriendRequests/FriendRequestCell.swift b/SwiftUI-WorkoutApp/Screens/Profile/FriendRequests/FriendRequestCell.swift
@@ -37,9 +37,13 @@ private extension FriendRequestCell {
     func decline() { declineClbk(model.id) }
 }
 
-struct FriendRequestRow_Previews: PreviewProvider {
+struct FriendRequestCell_Previews: PreviewProvider {
     static var previews: some View {
-        FriendRequestCell(model: .emptyValue, acceptClbk: {_ in}, declineClbk: {_ in})
-            .previewDevice("iPhone 13 mini")
+        FriendRequestCell(
+            model: .emptyValue,
+            acceptClbk: {_ in},
+            declineClbk: {_ in}
+        )
+        .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/IncognitoProfileView.swift b/SwiftUI-WorkoutApp/Screens/Profile/IncognitoProfileView.swift
@@ -41,5 +41,6 @@ private extension IncognitoProfileView {
 struct IncognitoProfileView_Previews: PreviewProvider {
     static var previews: some View {
         IncognitoProfileView()
+            .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/SportsGrounds/Detail/SportsGroundDetailView.swift b/SwiftUI-WorkoutApp/Screens/SportsGrounds/Detail/SportsGroundDetailView.swift
@@ -1,5 +1,4 @@
 import SwiftUI
-import Utils
 
 /// Экран с детальной информацией о площадке
 struct SportsGroundDetailView: View {
diff --git a/SwiftUI-WorkoutApp/Screens/SportsGrounds/Filter/SportsGroundFilterView.swift b/SwiftUI-WorkoutApp/Screens/SportsGrounds/Filter/SportsGroundFilterView.swift
@@ -91,5 +91,6 @@ private extension SportsGroundFilterView {
 struct SportsGroundFilterView_Previews: PreviewProvider {
     static var previews: some View {
         SportsGroundFilterView(filter: .constant(.init()))
+            .environmentObject(DefaultsService())
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/SportsGrounds/List/SportsGroundViewCell.swift b/SwiftUI-WorkoutApp/Screens/SportsGrounds/List/SportsGroundViewCell.swift
@@ -26,5 +26,6 @@ struct SportsGroundViewCell: View {
 struct SportsGroundsForUserView_Previews: PreviewProvider {
     static var previews: some View {
         SportsGroundViewCell(model: .mock)
+            .previewLayout(.sizeThatFits)
     }
 }
diff --git a/SwiftUI-WorkoutApp/Screens/SportsGrounds/Map/SportsGroundsMapView.swift b/SwiftUI-WorkoutApp/Screens/SportsGrounds/Map/SportsGroundsMapView.swift
@@ -1,5 +1,4 @@
 import SwiftUI
-import Utils
 
 /// Экран с картой и площадками
 struct SportsGroundsMapView: View {
diff --git a/SwiftUI-WorkoutApp/Screens/SportsGrounds/Map/SportsGroundsMapViewModel.swift b/SwiftUI-WorkoutApp/Screens/SportsGrounds/Map/SportsGroundsMapViewModel.swift
@@ -1,5 +1,4 @@
 import MapKit.MKGeometry
-import Utils
 
 @MainActor
 final class SportsGroundsMapViewModel: NSObject, ObservableObject {
diff --git a/SwiftUI-WorkoutApp/Services/APIService.swift b/SwiftUI-WorkoutApp/Services/APIService.swift
@@ -552,9 +552,8 @@ private extension APIService {
             throw handleError(from: data, with: responseCode)
         }
 #if DEBUG
-        print("--- Получили ответ:")
-        print(response)
-        print("--- Полученный JSON:\n\(data.prettyJson)")
+        print("--- Получили JSON по запросу:", (response?.url?.absoluteString).valueOrEmpty)
+        print(data.prettyJson)
         do {
             _ = try JSONDecoder().decode(type, from: data)
         } catch {
@@ -567,11 +566,11 @@ private extension APIService {
 
     /// Обрабатывает ответ сервера, в котором важен только статус
     func handle(_ response: URLResponse?) throws -> Bool {
+        let responseCode = (response as? HTTPURLResponse)?.statusCode
 #if DEBUG
-        print("--- Получили ответ:")
-        print(response)
+        print("--- Получили статус по запросу:", (response?.url?.absoluteString).valueOrEmpty)
+        print(responseCode.valueOrZero)
 #endif
-        let responseCode = (response as? HTTPURLResponse)?.statusCode
         if responseCode != Constants.API.codeOK {
             throw APIError(with: responseCode)
         }
diff --git a/SwiftUI-WorkoutApp/Services/DefaultsService.swift b/SwiftUI-WorkoutApp/Services/DefaultsService.swift
@@ -1,5 +1,4 @@
 import SwiftUI
-import Utils
 
 @MainActor
 final class DefaultsService: ObservableObject {
diff --git a/SwiftUI-WorkoutApp/Services/FormatterService.swift b/SwiftUI-WorkoutApp/Services/FormatterService.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 struct FormatterService {
     static func readableDate(from string: String?) -> String {
diff --git a/SwiftUI-WorkoutApp/Services/ShortAddressService.swift b/SwiftUI-WorkoutApp/Services/ShortAddressService.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Utils
 
 struct ShortAddressService {
     func addressFor(_ countryID: Int, _ cityID: Int) -> String {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import Foundation`
`2`		`-import Utils`
`3`	`2`	`import UIKit.UIDevice`
`4`	`3`
`5`	`4`	`enum Constants {`