Merge pull request #49 from OlegEremenko991/develop/refactor

Перенес и переименовал модель для фильтра площадок

Author: easydev991

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

@@ -118,7 +118,6 @@
 		679F3B03296841DD00BB3590 /* URLOpener.swift in Sources */ = {isa = PBXBuildFile; fileRef = 679F3B02296841DD00BB3590 /* URLOpener.swift */; };
 		679F3B072969D4E200BB3590 /* IncognitoUserButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 679F3B062969D4E200BB3590 /* IncognitoUserButton.swift */; };
 		679F3B0C296B0A3500BB3590 /* BlacklistOption.swift in Sources */ = {isa = PBXBuildFile; fileRef = 679F3B0B296B0A3500BB3590 /* BlacklistOption.swift */; };
-		67A9C90528427D06005D6A36 /* SportsGroundFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67A9C90428427D06005D6A36 /* SportsGroundFilter.swift */; };
 		67A9C90828427DEA005D6A36 /* SportsGroundFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67A9C90728427DEA005D6A36 /* SportsGroundFilterView.swift */; };
 		67B65DAD289E860E00FBAFCB /* ErrorFilterService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67B65DAC289E860E00FBAFCB /* ErrorFilterService.swift */; };
 		67B78710281D6110008B104F /* LoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67B7870F281D6110008B104F /* LoginViewModel.swift */; };
@@ -286,7 +285,6 @@
 		679F3B02296841DD00BB3590 /* URLOpener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLOpener.swift; sourceTree = "<group>"; };
 		679F3B062969D4E200BB3590 /* IncognitoUserButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncognitoUserButton.swift; sourceTree = "<group>"; };
 		679F3B0B296B0A3500BB3590 /* BlacklistOption.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlacklistOption.swift; sourceTree = "<group>"; };
-		67A9C90428427D06005D6A36 /* SportsGroundFilter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SportsGroundFilter.swift; sourceTree = "<group>"; };
 		67A9C90728427DEA005D6A36 /* SportsGroundFilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SportsGroundFilterView.swift; sourceTree = "<group>"; };
 		67B65DAC289E860E00FBAFCB /* ErrorFilterService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorFilterService.swift; sourceTree = "<group>"; };
 		67B7870F281D6110008B104F /* LoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewModel.swift; sourceTree = "<group>"; };
@@ -707,7 +705,6 @@
 				67627758283A6148009C203F /* JournalEntryResponse.swift */,
 				675A370E2854B00B00DAE071 /* JournalAccess.swift */,
 				6751569A2841316400501346 /* MediaFile.swift */,
-				67A9C90428427D06005D6A36 /* SportsGroundFilter.swift */,
 				67C87FD728438F1600D6377D /* PhotoContainer.swift */,
 				675A37102854B04400DAE071 /* TextEntryOption.swift */,
 				6773111B296607AA003CD13A /* FriendAction.swift */,
@@ -1092,7 +1089,6 @@
 				679F3B072969D4E200BB3590 /* IncognitoUserButton.swift in Sources */,
 				67419AD1282E70F9004F5339 /* SportsGroundListViewModel.swift in Sources */,
 				675EC653281445E500C2E229 /* MapViewUI.swift in Sources */,
-				67A9C90528427D06005D6A36 /* SportsGroundFilter.swift in Sources */,
 				6798AA59280AF4B100DB76F1 /* SportsGroundsMapView.swift in Sources */,
 				6798AA68280B23B700DB76F1 /* UserDetailsView.swift in Sources */,
 				67DD1120282C3CE400E3917C /* TextEntryViewModel.swift in Sources */,

SwiftUI-WorkoutApp/Models/SportsGroundFilter.swift

@@ -3,8 +3,8 @@ import ShortAddressService
 
 struct SportsGroundFilterView: View {
     @EnvironmentObject private var defaults: DefaultsService
-    @Binding var filter: SportsGroundFilter
-    private let defaultFilter = SportsGroundFilter()
+    @Binding var filter: Model
+    private let defaultFilter = Model()
 
     var body: some View {
         ContentInSheet(title: "Фильтр площадок", spacing: .zero) {
@@ -34,6 +34,15 @@ struct SportsGroundFilterView: View {
     }
 }
 
+extension SportsGroundFilterView {
+    struct Model: Equatable {
+        var size = SportsGroundSize.allCases
+        var grade = SportsGroundGrade.allCases
+        var onlyMyCity = true
+        var currentCity: String?
+    }
+}
+
 private extension SportsGroundFilterView {
     func buttonFor(_ size: SportsGroundSize) -> some View {
         Button {

SwiftUI-WorkoutApp/Screens/SportsGrounds/Filter/SportsGroundFilterView.swift

@@ -26,7 +26,7 @@ final class SportsGroundsMapViewModel: NSObject, ObservableObject {
     @Published var needUpdateRegion = false
     @Published var sportsGrounds = [SportsGround]()
     @Published var selectedGround = SportsGround.emptyValue
-    @Published var filter = SportsGroundFilter()
+    @Published var filter = SportsGroundFilterView.Model()
 
     override init() {
         super.init()