Поправил большинство ворнингов (#226)

easydev991 · web-flow · commit 79b9ced4c661 · 2023-12-23T11:55:50.000+03:00
Дождемся swift 6 и посмотрим, был ли смысл их править. Но без них все-равно лучше.
diff --git a/SwiftUI-WorkoutApp/Screens/Common/UsersList/UsersListView.swift b/SwiftUI-WorkoutApp/Screens/Common/UsersList/UsersListView.swift
@@ -46,7 +46,7 @@ struct UsersListView: View {
         .background(Color.swBackground)
         .disabled(!network.isConnected)
         .alert(errorTitle, isPresented: $showErrorAlert) {
-            Button("Ok", action: closeAlert)
+            Button("Ok") { closeAlert() }
         }
         .task { await askForUsers() }
         .refreshable { await askForUsers(refresh: true) }
diff --git a/SwiftUI-WorkoutApp/Screens/Events/Detail/EventDetailsView.swift b/SwiftUI-WorkoutApp/Screens/Events/Detail/EventDetailsView.swift
@@ -38,8 +38,8 @@ struct EventDetailsView: View {
                     PhotoSectionView(
                         with: event.photos,
                         canDelete: isEventAuthor,
-                        reportClbk: reportPhoto,
-                        deleteClbk: deletePhoto
+                        reportClbk: { reportPhoto() },
+                        deleteClbk: { deletePhoto(id: $0) }
                     )
                 }
                 if event.hasDescription {
@@ -200,7 +200,7 @@ private extension EventDetailsView {
                     trailingContent: .toggle(
                         .init(
                             get: { event.trainHere },
-                            set: changeTrainHereStatus
+                            set: { changeTrainHereStatus(newValue: $0) }
                         )
                     )
                 )
@@ -360,7 +360,7 @@ private extension EventDetailsView {
         }
     }
 
-    func deletePhoto(with id: Int) {
+    func deletePhoto(id: Int) {
         isLoading = true
         deletePhotoTask = Task {
             do {
diff --git a/SwiftUI-WorkoutApp/Screens/Events/List/EventsListView.swift b/SwiftUI-WorkoutApp/Screens/Events/List/EventsListView.swift
@@ -33,7 +33,7 @@ struct EventsListView: View {
             .loadingOverlay(if: isLoading)
             .background(Color.swBackground)
             .alert("Необходимо выбрать площадку", isPresented: $showEventCreationRule) {
-                Button("Перейти на карту", action: goToMap)
+                Button("Перейти на карту") { goToMap() }
                 Button(role: .cancel, action: {}, label: { Text("Понятно") })
             } message: {
                 Text(.init(Constants.Alert.eventCreationRule))
@@ -131,7 +131,7 @@ private extension EventsListView {
         .opacity(isLoading ? 0 : 1)
         .sheet(item: $selectedEvent) { event in
             NavigationView {
-                EventDetailsView(event: event, onDeletion: removeEvent)
+                EventDetailsView(event: event) { removeEvent(id: $0) }
             }
         }
     }
@@ -203,7 +203,7 @@ private extension EventsListView {
         isLoading = false
     }
 
-    func removeEvent(with id: Int) {
+    func removeEvent(id: Int) {
         selectedEvent = nil
         futureEvents.removeAll(where: { $0.id == id })
         pastEvents.removeAll(where: { $0.id == id })
diff --git a/SwiftUI-WorkoutApp/Screens/Messages/DialogListView.swift b/SwiftUI-WorkoutApp/Screens/Messages/DialogListView.swift
@@ -102,7 +102,7 @@ private extension DialogListView {
                         .listRowBackground(Color.swBackground)
                         .listRowSeparator(.hidden)
                 }
-                .onDelete(perform: initiateDeletion)
+                .onDelete { initiateDeletion(at: $0) }
             }
             .listStyle(.plain)
             .opacity(dialogs.isEmpty ? 0 : 1)
@@ -122,7 +122,7 @@ private extension DialogListView {
         )
         .background {
             NavigationLink {
-                DialogView(dialog: model, markedAsReadClbk: markAsRead)
+                DialogView(dialog: model) { markAsRead($0) }
             } label: {
                 EmptyView()
             }
diff --git a/SwiftUI-WorkoutApp/Screens/Messages/DialogView.swift b/SwiftUI-WorkoutApp/Screens/Messages/DialogView.swift
@@ -126,7 +126,7 @@ private extension DialogView {
                 )
                 .background(Color.swBackground)
                 .animation(.default, value: isMessageBarFocused)
-            SendChatMessageButton(action: sendMessage)
+            SendChatMessageButton { sendMessage() }
                 .disabled(isSendButtonDisabled)
         }
         .padding()
diff --git a/SwiftUI-WorkoutApp/Screens/Messages/DialogsScreen.swift b/SwiftUI-WorkoutApp/Screens/Messages/DialogsScreen.swift
@@ -15,7 +15,7 @@ struct DialogsScreen: View {
                 }
             }
             .background(Color.swBackground)
-            .animation(nil)
+            .transaction { $0.animation = nil }
             .navigationTitle("Сообщения")
             .navigationBarTitleDisplayMode(defaults.isAuthorized ? .inline : .large)
         }
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/Detail/UserDetailsView.swift b/SwiftUI-WorkoutApp/Screens/Profile/Detail/UserDetailsView.swift
@@ -55,7 +55,7 @@ struct UserDetailsView: View {
         .loadingOverlay(if: isLoading)
         .background(Color.swBackground)
         .alert(alertMessage, isPresented: $showAlertMessage) {
-            Button("Ok", action: closeAlert)
+            Button("Ok") { closeAlert() }
         }
         .refreshable { await askForUserInfo(refresh: true) }
         .toolbar {
@@ -112,12 +112,10 @@ private extension UserDetailsView {
 
     var communicationSection: some View {
         VStack(spacing: 12) {
-            Button("Сообщение") {
-                messagingModel.recipient = user
-            }
-            .buttonStyle(SWButtonStyle(icon: .message, mode: .filled, size: .large))
-            .sheet(item: $messagingModel.recipient, content: messageSheet)
-            Button(.init(socialActions.friend.rawValue), action: performFriendAction)
+            Button("Сообщение") { messagingModel.recipient = user }
+                .buttonStyle(SWButtonStyle(icon: .message, mode: .filled, size: .large))
+                .sheet(item: $messagingModel.recipient) { messageSheet(for: $0) }
+            Button(.init(socialActions.friend.rawValue)) { performFriendAction() }
                 .buttonStyle(
                     SWButtonStyle(
                         icon: socialActions.friend == .removeFriend
@@ -152,9 +150,8 @@ private extension UserDetailsView {
         ) {
             Button(
                 .init(socialActions.blacklist.rawValue),
-                role: .destructive,
-                action: performBlacklistAction
-            )
+                role: .destructive
+            ) { performBlacklistAction() }
         } message: {
             Text(.init(socialActions.blacklist.dialogMessage))
         }
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/EditAccount/EditAccountScreen.swift b/SwiftUI-WorkoutApp/Screens/Profile/EditAccount/EditAccountScreen.swift
@@ -126,7 +126,7 @@ private extension EditAccountScreen {
                 mode: .country,
                 allItems: locations.countries.map(\.name),
                 selectedItem: userForm.country.name,
-                didSelectItem: selectCountry
+                didSelectItem: { selectCountry(name: $0) }
             )
         } label: {
             ListRowView(
@@ -146,7 +146,7 @@ private extension EditAccountScreen {
                 mode: .city,
                 allItems: locations.cities.map(\.name),
                 selectedItem: userForm.city.name,
-                didSelectItem: selectCity
+                didSelectItem: { selectCity(name: $0) }
             )
         } label: {
             ListRowView(
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/Journals/EntriesList/JournalEntriesList.swift b/SwiftUI-WorkoutApp/Screens/Profile/Journals/EntriesList/JournalEntriesList.swift
@@ -61,7 +61,7 @@ struct JournalEntriesList: View {
                         oldEntry: $0.formattedMessage
                     )
                 ),
-                refreshClbk: updateEntries
+                refreshClbk: { updateEntries() }
             )
         }
         .confirmationDialog(
@@ -119,7 +119,7 @@ private extension JournalEntriesList {
                         ownerId: userID,
                         journalId: currentJournal.id
                     ),
-                    refreshClbk: updateEntries
+                    refreshClbk: { updateEntries() }
                 )
             }
         }
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/Journals/JournalsList/JournalsListView.swift b/SwiftUI-WorkoutApp/Screens/Profile/Journals/JournalsList/JournalsListView.swift
@@ -34,7 +34,7 @@ struct JournalsListView: View {
             ) { deleteJournalButton }
             .sheet(isPresented: $isCreatingJournal) { newJournalSheet }
             .alert(errorTitle, isPresented: $showErrorAlert) {
-                Button("Ok", action: closeAlert)
+                Button("Ok") { closeAlert() }
             }
             .task { await askForJournals() }
             .refreshable { await askForJournals(refresh: true) }
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/SearchUsers/SearchUsersView.swift b/SwiftUI-WorkoutApp/Screens/Profile/SearchUsers/SearchUsersView.swift
@@ -50,7 +50,7 @@ struct SearchUsersView: View {
             content: messageSheet
         )
         .alert(errorMessage, isPresented: $showErrorAlert) {
-            Button("Ok", action: onCloseAlert)
+            Button("Ok") { closeAlert() }
         }
         .onChange(of: errorMessage, perform: setupErrorAlert)
         .onDisappear(perform: cancelTasks)
@@ -106,7 +106,7 @@ private extension SearchUsersView {
             sendAction: { sendMessage(to: recipient.id) },
             showErrorAlert: $showErrorAlert,
             errorTitle: $errorMessage,
-            dismissError: onCloseAlert
+            dismissError: closeAlert
         )
     }
 
@@ -152,7 +152,7 @@ private extension SearchUsersView {
         errorMessage = message
     }
 
-    func onCloseAlert() { errorMessage = "" }
+    func closeAlert() { errorMessage = "" }
 
     func cancelTasks() {
         [searchTask, sendMessageTask].forEach { $0?.cancel() }
diff --git a/SwiftUI-WorkoutApp/Screens/Settings/LoggerScreen.swift b/SwiftUI-WorkoutApp/Screens/Settings/LoggerScreen.swift
@@ -23,7 +23,7 @@ private final class LogStore: ObservableObject {
     @Published private(set) var levels = [State.LogModel.Level]()
 
     func getLogs() async {
-        await MainActor.run { state = .loading }
+        state = .loading
         do {
             let store = try OSLogStore(scope: .currentProcessIdentifier)
             let position = store.position(timeIntervalSinceLatestBoot: 1)
@@ -39,16 +39,13 @@ private final class LogStore: ObservableObject {
                         message: $0.composedMessage
                     )
                 }
-            let uniqueCategories = Array(Set(entries.map(\.category)))
-            let uniqueLevels = Array(Set(entries.map(\.level)))
-            await MainActor.run {
-                categories = uniqueCategories
-                levels = uniqueLevels
-                state = .ready(entries)
-            }
+            try Task.checkCancellation()
+            categories = Array(Set(entries.map(\.category)))
+            levels = Array(Set(entries.map(\.level)))
+            state = .ready(entries)
         } catch {
             logger.error("\(error.localizedDescription, privacy: .public)")
-            await MainActor.run { state = .empty }
+            state = .empty
         }
     }
 
diff --git a/SwiftUI-WorkoutApp/Screens/SportsGrounds/Detail/SportsGroundDetailView.swift b/SwiftUI-WorkoutApp/Screens/SportsGrounds/Detail/SportsGroundDetailView.swift
@@ -37,8 +37,8 @@ struct SportsGroundDetailView: View {
                     PhotoSectionView(
                         with: ground.photos,
                         canDelete: canDeletePhoto,
-                        reportClbk: reportPhoto,
-                        deleteClbk: deletePhoto
+                        reportClbk: { reportPhoto() },
+                        deleteClbk: { deletePhoto(id: $0) }
                     )
                 }
                 authorSection
@@ -49,7 +49,7 @@ struct SportsGroundDetailView: View {
         }
         .background {
             NavigationLink(isActive: $isEditingGround) {
-                SportsGroundFormView(.editExisting(ground), refreshClbk: refreshAction)
+                SportsGroundFormView(.editExisting(ground)) { refreshAction() }
             } label: {
                 EmptyView()
             }
@@ -65,7 +65,7 @@ struct SportsGroundDetailView: View {
                         oldEntry: $0.formattedBody
                     )
                 ),
-                refreshClbk: refreshAction
+                refreshClbk: { refreshAction() }
             )
         }
         .task { await askForInfo() }
@@ -185,7 +185,7 @@ private extension SportsGroundDetailView {
                 trailingContent: .toggle(
                     .init(
                         get: { ground.trainHere },
-                        set: changeTrainHereStatus
+                        set: { changeTrainHereStatus(newValue: $0) }
                     )
                 )
             )
@@ -256,10 +256,7 @@ private extension SportsGroundDetailView {
             isCreatingComment: $isCreatingComment
         )
         .sheet(isPresented: $isCreatingComment) {
-            TextEntryView(
-                mode: .newForGround(id: ground.id),
-                refreshClbk: refreshAction
-            )
+            TextEntryView(mode: .newForGround(id: ground.id)) { refreshAction() }
         }
     }
 
@@ -337,7 +334,7 @@ private extension SportsGroundDetailView {
         }
     }
 
-    func deletePhoto(with id: Int) {
+    func deletePhoto(id: Int) {
         isLoading = true
         deletePhotoTask = Task {
             do {
diff --git a/SwiftUI-WorkoutApp/Screens/SportsGrounds/List/SportsGroundsListView.swift b/SwiftUI-WorkoutApp/Screens/SportsGrounds/List/SportsGroundsListView.swift
@@ -46,10 +46,7 @@ struct SportsGroundsListView: View {
         .background(Color.swBackground)
         .sheet(item: $selectedGround) { ground in
             NavigationView {
-                SportsGroundDetailView(
-                    ground: ground,
-                    onDeletion: deleteGround
-                )
+                SportsGroundDetailView(ground: ground) { deleteGround(id: $0) }
             }
         }
         .onChange(of: grounds) { list in
@@ -146,7 +143,7 @@ private extension SportsGroundsListView {
         grounds = try await SWClient(with: defaults).getSportsGroundsForUser(userID)
     }
 
-    func deleteGround(with id: Int) {
+    func deleteGround(id: Int) {
         selectedGround = nil
         grounds.removeAll(where: { $0.id == id })
         do {
diff --git a/SwiftUI-WorkoutApp/Screens/SportsGrounds/Map/SportsGroundsMapView.swift b/SwiftUI-WorkoutApp/Screens/SportsGrounds/Map/SportsGroundsMapView.swift
@@ -53,7 +53,7 @@ struct SportsGroundsMapView: View {
                 Button("Ok") { alertMessage = "" }
             }
             .task { await askForGrounds() }
-            .sheet(item: $sheetItem, content: makeContentView)
+            .sheet(item: $sheetItem) { makeContentView(for: $0) }
             .toolbar {
                 ToolbarItemGroup(placement: .navigationBarLeading) {
                     Group {
@@ -208,7 +208,7 @@ private extension SportsGroundsMapView {
         await getUpdatedGrounds(from: groundsManager.lastGroundsUpdateDateString)
     }
 
-    func deleteGround(with id: Int) {
+    func deleteGround(id: Int) {
         sheetItem = nil
         do {
             try groundsManager.deleteGround(with: id)
@@ -290,10 +290,7 @@ private extension SportsGroundsMapView {
             }
         case let .groundDetails(ground):
             NavigationView {
-                SportsGroundDetailView(
-                    ground: ground,
-                    onDeletion: deleteGround
-                )
+                SportsGroundDetailView(ground: ground) { deleteGround(id: $0) }
             }
         }
     }
diff --git a/SwiftUI-WorkoutApp/Screens/SportsGrounds/Map/SportsGroundsMapViewModel.swift b/SwiftUI-WorkoutApp/Screens/SportsGrounds/Map/SportsGroundsMapViewModel.swift
@@ -3,9 +3,13 @@ import MapView991
 import SWModels
 import SWNetworkClient
 import Utils
+import OSLog
 
-@MainActor
 final class SportsGroundsMapViewModel: NSObject, ObservableObject {
+    private let logger = Logger(
+        subsystem: Bundle.main.bundleIdentifier!,
+        category: String(describing: SportsGroundsMapViewModel.self)
+    )
     /// Менеджер локации
     private let manager = CLLocationManager()
     @Published private(set) var locationErrorMessage = ""
@@ -40,7 +44,7 @@ extension SportsGroundsMapViewModel {
 }
 
 extension SportsGroundsMapViewModel: CLLocationManagerDelegate {
-    func locationManager(_: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
         guard let location = locations.last else { return }
         if !isRegionSet {
             region = .init(
@@ -69,6 +73,10 @@ extension SportsGroundsMapViewModel: CLLocationManagerDelegate {
             if !ignoreUserLocation {
                 setupDefaultLocation(permissionDenied: true)
             }
+        @unknown default:
+            let message = "Не обработан новый кейс `authorizationStatus`"
+            logger.error("\(message, privacy: .public)")
+            assertionFailure(message)
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ struct UsersListView: View {`
`46`	`46`	`.background(Color.swBackground)`
`47`	`47`	`.disabled(!network.isConnected)`
`48`	`48`	`.alert(errorTitle, isPresented: $showErrorAlert) {`
`49`		`- Button("Ok", action: closeAlert)`
	`49`	`+ Button("Ok") { closeAlert() }`
`50`	`50`	`}`
`51`	`51`	`.task { await askForUsers() }`
`52`	`52`	`.refreshable { await askForUsers(refresh: true) }`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ struct EventDetailsView: View {`
`38`	`38`	`PhotoSectionView(`
`39`	`39`	`with: event.photos,`
`40`	`40`	`canDelete: isEventAuthor,`
`41`		`- reportClbk: reportPhoto,`
`42`		`- deleteClbk: deletePhoto`
	`41`	`+ reportClbk: { reportPhoto() },`
	`42`	`+ deleteClbk: { deletePhoto(id: $0) }`
`43`	`43`	`)`
`44`	`44`	`}`
`45`	`45`	`if event.hasDescription {`
`@@ -200,7 +200,7 @@ private extension EventDetailsView {`
`200`	`200`	`trailingContent: .toggle(`
`201`	`201`	`.init(`
`202`	`202`	`get: { event.trainHere },`
`203`		`- set: changeTrainHereStatus`
	`203`	`+ set: { changeTrainHereStatus(newValue: $0) }`
`204`	`204`	`)`
`205`	`205`	`)`
`206`	`206`	`)`
`@@ -360,7 +360,7 @@ private extension EventDetailsView {`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`
`363`		`- func deletePhoto(with id: Int) {`
	`363`	`+ func deletePhoto(id: Int) {`
`364`	`364`	`isLoading = true`
`365`	`365`	`deletePhotoTask = Task {`
`366`	`366`	`do {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ struct EventsListView: View {`
`33`	`33`	`.loadingOverlay(if: isLoading)`
`34`	`34`	`.background(Color.swBackground)`
`35`	`35`	`.alert("Необходимо выбрать площадку", isPresented: $showEventCreationRule) {`
`36`		`- Button("Перейти на карту", action: goToMap)`
	`36`	`+ Button("Перейти на карту") { goToMap() }`
`37`	`37`	`Button(role: .cancel, action: {}, label: { Text("Понятно") })`
`38`	`38`	`} message: {`
`39`	`39`	`Text(.init(Constants.Alert.eventCreationRule))`
`@@ -131,7 +131,7 @@ private extension EventsListView {`
`131`	`131`	`.opacity(isLoading ? 0 : 1)`
`132`	`132`	`.sheet(item: $selectedEvent) { event in`
`133`	`133`	`NavigationView {`
`134`		`- EventDetailsView(event: event, onDeletion: removeEvent)`
	`134`	`+ EventDetailsView(event: event) { removeEvent(id: $0) }`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`}`
`@@ -203,7 +203,7 @@ private extension EventsListView {`
`203`	`203`	`isLoading = false`
`204`	`204`	`}`
`205`	`205`
`206`		`- func removeEvent(with id: Int) {`
	`206`	`+ func removeEvent(id: Int) {`
`207`	`207`	`selectedEvent = nil`
`208`	`208`	`futureEvents.removeAll(where: { $0.id == id })`
`209`	`209`	`pastEvents.removeAll(where: { $0.id == id })`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private extension DialogListView {`
`102`	`102`	`.listRowBackground(Color.swBackground)`
`103`	`103`	`.listRowSeparator(.hidden)`
`104`	`104`	`}`
`105`		`- .onDelete(perform: initiateDeletion)`
	`105`	`+ .onDelete { initiateDeletion(at: $0) }`
`106`	`106`	`}`
`107`	`107`	`.listStyle(.plain)`
`108`	`108`	`.opacity(dialogs.isEmpty ? 0 : 1)`
`@@ -122,7 +122,7 @@ private extension DialogListView {`
`122`	`122`	`)`
`123`	`123`	`.background {`
`124`	`124`	`NavigationLink {`
`125`		`- DialogView(dialog: model, markedAsReadClbk: markAsRead)`
	`125`	`+ DialogView(dialog: model) { markAsRead($0) }`
`126`	`126`	`} label: {`
`127`	`127`	`EmptyView()`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ private extension DialogView {`
`126`	`126`	`)`
`127`	`127`	`.background(Color.swBackground)`
`128`	`128`	`.animation(.default, value: isMessageBarFocused)`
`129`		`- SendChatMessageButton(action: sendMessage)`
	`129`	`+ SendChatMessageButton { sendMessage() }`
`130`	`130`	`.disabled(isSendButtonDisabled)`
`131`	`131`	`}`
`132`	`132`	`.padding()`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ struct DialogsScreen: View {`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`.background(Color.swBackground)`
`18`		`- .animation(nil)`
	`18`	`+ .transaction { $0.animation = nil }`
`19`	`19`	`.navigationTitle("Сообщения")`
`20`	`20`	`.navigationBarTitleDisplayMode(defaults.isAuthorized ? .inline : .large)`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ struct JournalEntriesList: View {`
`61`	`61`	`oldEntry: $0.formattedMessage`
`62`	`62`	`)`
`63`	`63`	`),`
`64`		`- refreshClbk: updateEntries`
	`64`	`+ refreshClbk: { updateEntries() }`
`65`	`65`	`)`
`66`	`66`	`}`
`67`	`67`	`.confirmationDialog(`
`@@ -119,7 +119,7 @@ private extension JournalEntriesList {`
`119`	`119`	`ownerId: userID,`
`120`	`120`	`journalId: currentJournal.id`
`121`	`121`	`),`
`122`		`- refreshClbk: updateEntries`
	`122`	`+ refreshClbk: { updateEntries() }`
`123`	`123`	`)`
`124`	`124`	`}`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ struct JournalsListView: View {`
`34`	`34`	`) { deleteJournalButton }`
`35`	`35`	`.sheet(isPresented: $isCreatingJournal) { newJournalSheet }`
`36`	`36`	`.alert(errorTitle, isPresented: $showErrorAlert) {`
`37`		`- Button("Ok", action: closeAlert)`
	`37`	`+ Button("Ok") { closeAlert() }`
`38`	`38`	`}`
`39`	`39`	`.task { await askForJournals() }`
`40`	`40`	`.refreshable { await askForJournals(refresh: true) }`