Merge pull request #34 from OlegEremenko991/develop

Доработки

Author: easydev991

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

@@ -1210,7 +1210,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
@@ -1246,7 +1246,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;

SwiftUI-WorkoutApp/Preview Content/PreviewContent.swift

@@ -22,13 +22,13 @@ extension SportsGround {
 extension UserResponse {
     static var preview: UserResponse {
         .init(
-            userName: "TestUserName",
-            fullName: "TestFullName",
+            userName: "Kahar",
+            fullName: "",
             email: "[email protected]",
-            imageStringURL: "avatar_default",
+            imageStringURL: "https://workout.su/uploads/avatars/2019/10/2019-10-07-01-10-08-yow.jpg",
             birthDateIsoString: "1990-11-25",
             createdIsoDateTimeSec: nil,
-            userID: .zero,
+            userID: 24798,
             cityID: 1,
             countryID: 17,
             genderCode: 1,
@@ -47,7 +47,33 @@ extension UserModel {
 
 extension EventResponse {
     static var preview: EventResponse {
-        try! Bundle.main.decodeJson([EventResponse].self, fileName: "oldEvents.json").first!
+        .init(
+            id: 4414,
+            title: "Открытая тренировка участников SOTKA и воркаутеров #2 в 2022 году",
+            eventDescription: "!!! ВРЕМЯ ТРЕНИРОВКИ - 12:00",
+            fullAddress: nil,
+            createDate: "2022-10-16T09:00:00+00:00",
+            modifyDate: "2022-10-16T09:00:00+00:00",
+            beginDate: "2022-10-16T09:00:00+00:00",
+            countryID: 17,
+            cityID: 1,
+            commentsCount: 2,
+            previewImageStringURL: "https://workout.su/thumbs/6_100x100_FFFFFF//uploads/userfiles/2022/10/2022-10-12-21-10-42-skz.jpg",
+            sportsGroundID: 5464,
+            latitude: "55.72681766162947",
+            longitude: "37.50063106774381",
+            participantsCount: 3,
+            isCurrent: false,
+            photos: [
+                .init(
+                    id: 1,
+                    stringURL: "https://workout.su/uploads/userfiles/2022/10/2022-10-12-21-10-42-skz.jpg"
+                )
+            ],
+            authorName: "Kahar",
+            author: .preview,
+            trainHereOptional: false
+        )
     }
 }
 

SwiftUI-WorkoutApp/Screens/Common/Comments/Comments.swift

@@ -9,7 +9,7 @@ struct Comments: View {
 
     var body: some View {
         Section("Комментарии") {
-            List(items) { comment in
+            ForEach(items) { comment in
                 CommentViewCell(
                     model: comment,
                     reportClbk: reportClbk,
@@ -24,7 +24,7 @@ struct Comments: View {
 #if DEBUG
 struct Comments_Previews: PreviewProvider {
     static var previews: some View {
-        Form {
+        List {
             Comments(
                 items: [.preview, .preview],
                 reportClbk: { _ in },

SwiftUI-WorkoutApp/Screens/Common/SendMessage/SendMessageView.swift

@@ -89,6 +89,7 @@ private extension SendMessageView {
     }
 
     func showKeyboard() {
+        guard !isFocused else { return }
         DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
             isFocused.toggle()
         }

SwiftUI-WorkoutApp/Screens/Common/TextEntry/TextEntryView.swift

@@ -122,6 +122,7 @@ private extension TextEntryView {
     }
 
     func showKeyboard() {
+        guard !isFocused else { return }
         DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
             isFocused.toggle()
         }

SwiftUI-WorkoutApp/Screens/Common/UsersList/UsersListView.swift

@@ -73,7 +73,7 @@ private extension UsersListView.Mode {
         case .friends, .friendsForChat:
             return "Друзья"
         case .eventParticipants:
-            return "Пойдут на мероприятие"
+            return "Участники мероприятия"
         case .groundParticipants:
             return "Здесь тренируются"
         case .blacklist:

SwiftUI-WorkoutApp/Screens/Events/Detail/EventDetailsView.swift

@@ -28,13 +28,13 @@ struct EventDetailsView: View {
     }
 
     var body: some View {
-        Form {
+        List {
             mainInfo
             locationInfo
             if viewModel.event.hasDescription {
                 descriptionSection
             }
-            if defaults.isAuthorized {
+            if showParticipantSection {
                 participantsSection
             }
             if let photos = viewModel.event.photos,
@@ -151,7 +151,7 @@ private extension EventDetailsView {
     }
 
     var participantsSection: some View {
-        Section("Участники") {
+        Section {
             if viewModel.hasParticipants {
                 participantsButton
             }
@@ -167,12 +167,8 @@ private extension EventDetailsView {
         NavigationLink {
             UsersListView(mode: .eventParticipants(list: viewModel.event.participants))
         } label: {
-            HStack {
-                Text("Идут")
-                Spacer()
-                Text("peopleTrainHere \(viewModel.event.participants.count)")
-                .foregroundColor(.secondary)
-            }
+            Text("Участники")
+                .badge("peopleTrainHere \(viewModel.event.participants.count)")
         }
     }
 
@@ -196,9 +192,7 @@ private extension EventDetailsView {
     /// Обновляем состояние `trainHere` при получении изменений от `viewModel`
     ///
     /// Например, если сервер вернул ошибку при попытке сменить статус
-    func onChangeOfTrainHere(value: Bool) {
-        trainHere = value
-    }
+    func onChangeOfTrainHere(value: Bool) { trainHere = value }
 
     var authorSection: some View {
         Section("Организатор") {
@@ -290,6 +284,14 @@ private extension EventDetailsView {
         : false
     }
 
+    var showParticipantSection: Bool {
+        if defaults.isAuthorized {
+            return viewModel.hasParticipants || viewModel.isEventCurrent
+        } else {
+            return false
+        }
+    }
+
     func closeAlert() {
         viewModel.clearErrorMessage()
     }

SwiftUI-WorkoutApp/Screens/Events/List/EventsListView.swift

@@ -85,9 +85,7 @@ private extension EventsListView {
 
     var eventsList: some View {
         List(selectedEventType == .future ? $viewModel.futureEvents : $viewModel.pastEvents) { $event in
-            NavigationLink {
-                EventDetailsView(with: event, deleteClbk: refreshAction)
-            } label: {
+            NavigationLink(destination: EventDetailsView(with: event, deleteClbk: refreshAction)) {
                 EventViewCell(for: $event)
             }
         }

SwiftUI-WorkoutApp/Screens/Messages/DialogList/DialogListView.swift

@@ -95,9 +95,14 @@ private extension DialogListView {
 
     var dialogList: some View {
         List {
-            ForEach($viewModel.list) { $dialog in
+            ForEach(viewModel.list) { dialog in
                 NavigationLink {
-                    DialogView(dialog: $dialog)
+                    DialogView(
+                        dialog: dialog,
+                        markedAsReadClbk: {
+                            viewModel.markAsRead(dialog, with: defaults)
+                        }
+                    )
                 } label: {
                     GenericListCell(for: .dialog(dialog))
                 }

SwiftUI-WorkoutApp/Screens/Messages/DialogList/DialogListViewModel.swift

@@ -11,6 +11,7 @@ final class DialogListViewModel: ObservableObject {
         if !refresh { isLoading.toggle() }
         do {
             list = try await APIService(with: defaults).getDialogs()
+            defaults.unreadMessagesCount = list.map(\.unreadMessagesCount).reduce(0, +)
         } catch {
             errorMessage = ErrorFilterService.message(from: error)
         }
@@ -31,5 +32,21 @@ final class DialogListViewModel: ObservableObject {
         isLoading.toggle()
     }
 
+    func markAsRead(_ dialog: DialogResponse, with defaults: DefaultsProtocol) {
+        list = list.map { item in
+            if item.id == dialog.id {
+                var updatedDialog = dialog
+                updatedDialog.unreadMessagesCount = 0
+                return updatedDialog
+            } else {
+                return item
+            }
+        }
+        guard dialog.unreadMessagesCount > 0,
+              defaults.unreadMessagesCount >= dialog.unreadMessagesCount
+        else { return }
+        defaults.unreadMessagesCount -= dialog.unreadMessagesCount
+    }
+
     func clearErrorMessage() { errorMessage = "" }
 }