Небольшие доработки (#377)

easydev991 · web-flow · commit 2026972e63fd · 2025-10-26T19:43:07.000+03:00
- Обновил локальный список площадок
- Задал правильный цвет для кнопок в навбаре, т.к. на iOS 26 почему-то игнорируется стандартная настройка цвета из ассетов (`AccentColor`)
diff --git a/SwiftUI-WorkoutApp/Resources/oldParks.json b/SwiftUI-WorkoutApp/Resources/oldParks.json
diff --git a/SwiftUI-WorkoutApp/Screens/Events/EventDetailsScreen.swift b/SwiftUI-WorkoutApp/Screens/Events/EventDetailsScreen.swift
@@ -56,10 +56,13 @@ struct EventDetailsScreen: View {
                 CloseButton(mode: .text) { dismiss() }
             }
             ToolbarItemGroup(placement: .topBarTrailing) {
-                if isEventAuthor {
-                    toolbarMenuButton
+                Group {
+                    if isEventAuthor {
+                        toolbarMenuButton
+                    }
+                    shareButton
                 }
-                shareButton
+                .tint(.accent)
             }
         }
         .navigationTitle("Мероприятие")
diff --git a/SwiftUI-WorkoutApp/Screens/Events/EventsListScreen.swift b/SwiftUI-WorkoutApp/Screens/Events/EventsListScreen.swift
@@ -138,6 +138,7 @@ private extension EventsListScreen {
                 Icons.Regular.plus.view
                     .symbolVariant(.circle)
             }
+            .tint(.accent)
             .sheet(isPresented: $showEventCreationSheet) {
                 NavigationStack {
                     EventFormScreen(
diff --git a/SwiftUI-WorkoutApp/Screens/Messages/DialogScreen.swift b/SwiftUI-WorkoutApp/Screens/Messages/DialogScreen.swift
@@ -61,6 +61,7 @@ private extension DialogScreen {
         } label: {
             Icons.Regular.refresh.view
         }
+        .tint(.accent)
         .disabled(isLoading)
     }
 
diff --git a/SwiftUI-WorkoutApp/Screens/Messages/DialogsListScreen.swift b/SwiftUI-WorkoutApp/Screens/Messages/DialogsListScreen.swift
@@ -106,16 +106,20 @@ private extension DialogsListScreen {
         } label: {
             Icons.Regular.refresh.view
         }
+        .tint(.accent)
         .disabled(viewModel.currentState.isLoading)
     }
 
+    @ViewBuilder
     var friendListButton: some View {
-        Button {
-            openFriendList.toggle()
-        } label: {
-            Icons.Regular.plus.view.symbolVariant(.circle)
+        if hasFriends || viewModel.currentState.isReadyAndNotEmpty {
+            Button {
+                openFriendList.toggle()
+            } label: {
+                Icons.Regular.plus.view.symbolVariant(.circle)
+            }
+            .tint(.accent)
         }
-        .opacity(hasFriends || viewModel.currentState.isReadyAndNotEmpty ? 1 : 0)
     }
 
     var emptyContentView: some View {
diff --git a/SwiftUI-WorkoutApp/Screens/More/LoggerScreen.swift b/SwiftUI-WorkoutApp/Screens/More/LoggerScreen.swift
@@ -129,6 +129,7 @@ struct LoggerScreen: View {
                         Icons.Regular.filter.view
                             .symbolVariant(isFilterOn ? .fill : .none)
                     }
+                    .tint(.accent)
                     .disabled(logStore.state.isLoading)
                 }
             }
diff --git a/SwiftUI-WorkoutApp/Screens/Parks/Map/ParksMapScreen.swift b/SwiftUI-WorkoutApp/Screens/Parks/Map/ParksMapScreen.swift
@@ -59,12 +59,9 @@ struct ParksMapScreen: View {
                 ToolbarItemGroup(placement: .topBarLeading) {
                     Group {
                         filterButton
-                        Button {
-                            Task { await askForParks(refresh: true) }
-                        } label: {
-                            Icons.Regular.refresh.view
-                        }
+                        refreshButton
                     }
+                    .tint(.accent)
                     .disabled(isLoading)
                 }
                 ToolbarItem(placement: .topBarTrailing) {
@@ -115,6 +112,14 @@ private extension ParksMapScreen {
         }
     }
 
+    var refreshButton: some View {
+        Button {
+            Task { await askForParks(refresh: true) }
+        } label: {
+            Icons.Regular.refresh.view
+        }
+    }
+
     var segmentedControl: some View {
         Picker("Способ отображения", selection: $presentation) {
             ForEach(Presentation.allCases, id: \.self) {
@@ -205,13 +210,11 @@ private extension ParksMapScreen {
     func askForParks(refresh: Bool = false) async {
         if !filteredParks.isEmpty, !refresh { return }
         guard !parksManager.fullList.isEmpty else {
-            // Заполняем дефолтный список площадок контентом из `json`-файла
             do {
                 try parksManager.makeDefaultList()
             } catch {
                 SWAlert.shared.presentDefaultUIKit(error)
             }
-            // Если прошло больше одного дня с момента предыдущего обновления, делаем обновление
             if parksManager.needUpdateDefaultList {
                 await askForParks(refresh: true)
             }
@@ -265,6 +268,7 @@ private extension ParksMapScreen {
                     .symbolVariant(.circle)
             }
             .disabled(!viewModel.canCreateNewPark || isLoading)
+            .tint(.accent)
         }
     }
 
diff --git a/SwiftUI-WorkoutApp/Screens/Parks/ParkDetailScreen.swift b/SwiftUI-WorkoutApp/Screens/Parks/ParkDetailScreen.swift
@@ -58,12 +58,15 @@ struct ParkDetailScreen: View {
                 CloseButton(mode: .text) { dismiss() }
             }
             ToolbarItemGroup(placement: .topBarTrailing) {
-                if isParkAuthor {
-                    toolbarMenuButton
-                } else {
-                    feedbackButton
+                Group {
+                    if isParkAuthor {
+                        toolbarMenuButton
+                    } else {
+                        feedbackButton
+                    }
+                    shareButton
                 }
-                shareButton
+                .tint(.accent)
             }
         }
         .navigationTitle("Площадка")
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/Journals/JournalEntriesScreen.swift b/SwiftUI-WorkoutApp/Screens/Profile/Journals/JournalEntriesScreen.swift
@@ -140,6 +140,7 @@ private extension JournalEntriesScreen {
                 Icons.Regular.plus.view
                     .symbolVariant(.circle)
             }
+            .tint(.accent)
             .disabled(currentState.isLoading)
             .sheet(isPresented: $showCreateEntrySheet) {
                 TextEntryScreen(
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/Journals/JournalsListScreen.swift b/SwiftUI-WorkoutApp/Screens/Profile/Journals/JournalsListScreen.swift
@@ -95,12 +95,15 @@ private extension JournalsListScreen {
         }
     }
 
+    @ViewBuilder
     var addJournalButton: some View {
-        Button(action: showNewJournalSheet) {
-            Icons.Regular.plus.view
-                .symbolVariant(.circle)
+        if showAddJournalButton {
+            Button(action: showNewJournalSheet) {
+                Icons.Regular.plus.view
+                    .symbolVariant(.circle)
+            }
+            .tint(.accent)
         }
-        .opacity(showAddJournalButton ? 1 : 0)
     }
 
     @ViewBuilder
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/MainUserProfileScreen.swift b/SwiftUI-WorkoutApp/Screens/Profile/MainUserProfileScreen.swift
@@ -46,7 +46,6 @@ private extension MainUserProfileScreen {
         .toolbar {
             ToolbarItem(placement: .topBarTrailing) {
                 searchUsersButton
-                    .disabled(viewModel.currentState.isLoading)
             }
         }
     }
@@ -79,6 +78,8 @@ private extension MainUserProfileScreen {
         } label: {
             Icons.Regular.magnifyingglass.view
         }
+        .tint(.accent)
+        .disabled(viewModel.currentState.isLoading)
         .accessibilityIdentifier("searchUsersButton")
         .sheet(isPresented: $showSearchUsersScreen) {
             NavigationStack {
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/UserDetailsScreen.swift b/SwiftUI-WorkoutApp/Screens/Profile/UserDetailsScreen.swift
@@ -47,7 +47,6 @@ struct UserDetailsScreen: View {
         .toolbar {
             ToolbarItem(placement: .topBarTrailing) {
                 blockUserButton
-                    .disabled(isLoading)
             }
         }
         .onDisappear(perform: cancelTasks)
@@ -92,6 +91,8 @@ private extension UserDetailsScreen {
             )
             .symbolVariant(socialActions.isBlacklisted ? .fill : .none)
         }
+        .tint(.accent)
+        .disabled(isLoading)
         .confirmationDialog(
             socialActions.blacklist.dialogTitle,
             isPresented: $showBlacklistConfirmation,
diff --git a/SwiftUI-WorkoutApp/Services/ParksManager.swift b/SwiftUI-WorkoutApp/Services/ParksManager.swift
@@ -9,10 +9,10 @@ import SWUtils
 final class ParksManager: ObservableObject {
     /// Дефолтная дата - предыдущее ручное обновление файла `oldParks.json`
     ///
-    /// - При обновлении справочника вручную необходимо обновить тут дату
-    /// - Неудобно, зато спасаемся от ошибок 500 при запросе слишком старых данных
+    /// При обновлении справочника вручную необходимо обновить тут дату -
+    /// это необходимо, чтобы избежать ошибок на сервере (код 500)
     @AppStorage("lastGroundsUpdateDateString")
-    private var lastParksUpdateDateString = "2023-01-12T00:00:00"
+    private var lastParksUpdateDateString = "2025-10-25T00:00:00"
     /// Хранилище файла с площадками
     private let swStorage = SWFileManager(fileName: "SportsGrounds.json")
     /// Все площадки, доступные для отображения на карте
@@ -27,7 +27,6 @@ final class ParksManager: ObservableObject {
     }
 
     init() {
-        // Подписываемся на изменения fullList
         $fullList
             .map { !$0.isEmpty }
             .assign(to: &$didLoad)

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,13 @@ struct EventDetailsScreen: View {`
`56`	`56`	`CloseButton(mode: .text) { dismiss() }`
`57`	`57`	`}`
`58`	`58`	`ToolbarItemGroup(placement: .topBarTrailing) {`
`59`		`- if isEventAuthor {`
`60`		`- toolbarMenuButton`
	`59`	`+ Group {`
	`60`	`+ if isEventAuthor {`
	`61`	`+ toolbarMenuButton`
	`62`	`+ }`
	`63`	`+ shareButton`
`61`	`64`	`}`
`62`		`- shareButton`
	`65`	`+ .tint(.accent)`
`63`	`66`	`}`
`64`	`67`	`}`
`65`	`68`	`.navigationTitle("Мероприятие")`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ private extension EventsListScreen {`
`138`	`138`	`Icons.Regular.plus.view`
`139`	`139`	`.symbolVariant(.circle)`
`140`	`140`	`}`
	`141`	`+ .tint(.accent)`
`141`	`142`	`.sheet(isPresented: $showEventCreationSheet) {`
`142`	`143`	`NavigationStack {`
`143`	`144`	`EventFormScreen(`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ private extension DialogScreen {`
`61`	`61`	`} label: {`
`62`	`62`	`Icons.Regular.refresh.view`
`63`	`63`	`}`
	`64`	`+ .tint(.accent)`
`64`	`65`	`.disabled(isLoading)`
`65`	`66`	`}`
`66`	`67`
Original file line number	Diff line number	Diff line change
`@@ -106,16 +106,20 @@ private extension DialogsListScreen {`
`106`	`106`	`} label: {`
`107`	`107`	`Icons.Regular.refresh.view`
`108`	`108`	`}`
	`109`	`+ .tint(.accent)`
`109`	`110`	`.disabled(viewModel.currentState.isLoading)`
`110`	`111`	`}`
`111`	`112`
	`113`	`+ @ViewBuilder`
`112`	`114`	`var friendListButton: some View {`
`113`		`- Button {`
`114`		`- openFriendList.toggle()`
`115`		`- } label: {`
`116`		`- Icons.Regular.plus.view.symbolVariant(.circle)`
	`115`	`+ if hasFriends \|\| viewModel.currentState.isReadyAndNotEmpty {`
	`116`	`+ Button {`
	`117`	`+ openFriendList.toggle()`
	`118`	`+ } label: {`
	`119`	`+ Icons.Regular.plus.view.symbolVariant(.circle)`
	`120`	`+ }`
	`121`	`+ .tint(.accent)`
`117`	`122`	`}`
`118`		`- .opacity(hasFriends \|\| viewModel.currentState.isReadyAndNotEmpty ? 1 : 0)`
`119`	`123`	`}`
`120`	`124`
`121`	`125`	`var emptyContentView: some View {`
Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ struct LoggerScreen: View {`
`129`	`129`	`Icons.Regular.filter.view`
`130`	`130`	`.symbolVariant(isFilterOn ? .fill : .none)`
`131`	`131`	`}`
	`132`	`+ .tint(.accent)`
`132`	`133`	`.disabled(logStore.state.isLoading)`
`133`	`134`	`}`
`134`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,9 @@ struct ParksMapScreen: View {`
`59`	`59`	`ToolbarItemGroup(placement: .topBarLeading) {`
`60`	`60`	`Group {`
`61`	`61`	`filterButton`
`62`		`- Button {`
`63`		`- Task { await askForParks(refresh: true) }`
`64`		`- } label: {`
`65`		`- Icons.Regular.refresh.view`
`66`		`- }`
	`62`	`+ refreshButton`
`67`	`63`	`}`
	`64`	`+ .tint(.accent)`
`68`	`65`	`.disabled(isLoading)`
`69`	`66`	`}`
`70`	`67`	`ToolbarItem(placement: .topBarTrailing) {`
`@@ -115,6 +112,14 @@ private extension ParksMapScreen {`
`115`	`112`	`}`
`116`	`113`	`}`
`117`	`114`
	`115`	`+ var refreshButton: some View {`
	`116`	`+ Button {`
	`117`	`+ Task { await askForParks(refresh: true) }`
	`118`	`+ } label: {`
	`119`	`+ Icons.Regular.refresh.view`
	`120`	`+ }`
	`121`	`+ }`
	`122`	`+`
`118`	`123`	`var segmentedControl: some View {`
`119`	`124`	`Picker("Способ отображения", selection: $presentation) {`
`120`	`125`	`ForEach(Presentation.allCases, id: \.self) {`
`@@ -205,13 +210,11 @@ private extension ParksMapScreen {`
`205`	`210`	`func askForParks(refresh: Bool = false) async {`
`206`	`211`	`if !filteredParks.isEmpty, !refresh { return }`
`207`	`212`	`guard !parksManager.fullList.isEmpty else {`
`208`		- // Заполняем дефолтный список площадок контентом из `json`-файла
`209`	`213`	`do {`
`210`	`214`	`try parksManager.makeDefaultList()`
`211`	`215`	`} catch {`
`212`	`216`	`SWAlert.shared.presentDefaultUIKit(error)`
`213`	`217`	`}`
`214`		`- // Если прошло больше одного дня с момента предыдущего обновления, делаем обновление`
`215`	`218`	`if parksManager.needUpdateDefaultList {`
`216`	`219`	`await askForParks(refresh: true)`
`217`	`220`	`}`
`@@ -265,6 +268,7 @@ private extension ParksMapScreen {`
`265`	`268`	`.symbolVariant(.circle)`
`266`	`269`	`}`
`267`	`270`	`.disabled(!viewModel.canCreateNewPark \|\| isLoading)`
	`271`	`+ .tint(.accent)`
`268`	`272`	`}`
`269`	`273`	`}`
`270`	`274`
Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,15 @@ struct ParkDetailScreen: View {`
`58`	`58`	`CloseButton(mode: .text) { dismiss() }`
`59`	`59`	`}`
`60`	`60`	`ToolbarItemGroup(placement: .topBarTrailing) {`
`61`		`- if isParkAuthor {`
`62`		`- toolbarMenuButton`
`63`		`- } else {`
`64`		`- feedbackButton`
	`61`	`+ Group {`
	`62`	`+ if isParkAuthor {`
	`63`	`+ toolbarMenuButton`
	`64`	`+ } else {`
	`65`	`+ feedbackButton`
	`66`	`+ }`
	`67`	`+ shareButton`
`65`	`68`	`}`
`66`		`- shareButton`
	`69`	`+ .tint(.accent)`
`67`	`70`	`}`
`68`	`71`	`}`
`69`	`72`	`.navigationTitle("Площадка")`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ private extension JournalEntriesScreen {`
`140`	`140`	`Icons.Regular.plus.view`
`141`	`141`	`.symbolVariant(.circle)`
`142`	`142`	`}`
	`143`	`+ .tint(.accent)`
`143`	`144`	`.disabled(currentState.isLoading)`
`144`	`145`	`.sheet(isPresented: $showCreateEntrySheet) {`
`145`	`146`	`TextEntryScreen(`
Original file line number	Diff line number	Diff line change
`@@ -95,12 +95,15 @@ private extension JournalsListScreen {`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
	`98`	`+ @ViewBuilder`
`98`	`99`	`var addJournalButton: some View {`
`99`		`- Button(action: showNewJournalSheet) {`
`100`		`- Icons.Regular.plus.view`
`101`		`- .symbolVariant(.circle)`
	`100`	`+ if showAddJournalButton {`
	`101`	`+ Button(action: showNewJournalSheet) {`
	`102`	`+ Icons.Regular.plus.view`
	`103`	`+ .symbolVariant(.circle)`
	`104`	`+ }`
	`105`	`+ .tint(.accent)`
`102`	`106`	`}`
`103`		`- .opacity(showAddJournalButton ? 1 : 0)`
`104`	`107`	`}`
`105`	`108`
`106`	`109`	`@ViewBuilder`