Сделал отдельный пакет для NetworkStatus

- Обновил нейминг: CheckNetworkService -> NetworkStatus
- Вынес NetworkStatus в отдельный пакет
- Поднял версию билда до 13

Author: easydev991

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

@@ -134,6 +134,7 @@
 		67BAF3FB28362AD100DB40D9 /* AddCommentButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67BAF3FA28362AD100DB40D9 /* AddCommentButton.swift */; };
 		67C87FD62843892D00D6377D /* PhotoSectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67C87FD52843892D00D6377D /* PhotoSectionCell.swift */; };
 		67C87FD828438F1600D6377D /* PhotoContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67C87FD728438F1600D6377D /* PhotoContainer.swift */; };
+		67CB32CE297BBEB3009380DF /* NetworkStatus in Frameworks */ = {isa = PBXBuildFile; productRef = 67CB32CD297BBEB3009380DF /* NetworkStatus */; };
 		67D9167C2838D6610098D3CB /* DialogResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67D9167B2838D6610098D3CB /* DialogResponse.swift */; };
 		67D9167E2838DC3E0098D3CB /* GenericListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67D9167D2838DC3E0098D3CB /* GenericListCell.swift */; };
 		67D916812838E2460098D3CB /* DialogListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67D916802838E2460098D3CB /* DialogListView.swift */; };
@@ -142,7 +143,6 @@
 		67D916882838F4C40098D3CB /* DialogViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67D916872838F4C40098D3CB /* DialogViewModel.swift */; };
 		67D9168A2838F79D0098D3CB /* MessageResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67D916892838F79D0098D3CB /* MessageResponse.swift */; };
 		67D9169628396C1E0098D3CB /* SendMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67D9169528396C1E0098D3CB /* SendMessageView.swift */; };
-		67D91698283A22840098D3CB /* CheckNetworkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67D91697283A22840098D3CB /* CheckNetworkService.swift */; };
 		67DD1120282C3CE400E3917C /* TextEntryViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67DD111F282C3CE400E3917C /* TextEntryViewModel.swift */; };
 		67E4266D2821429500DF82A7 /* UserModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67E4266C2821429500DF82A7 /* UserModel.swift */; };
 		67E4266F28218B6E00DF82A7 /* ShortAddressService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67E4266E28218B6E00DF82A7 /* ShortAddressService.swift */; };
@@ -293,6 +293,7 @@
 		67BAF3FA28362AD100DB40D9 /* AddCommentButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddCommentButton.swift; sourceTree = "<group>"; };
 		67C87FD52843892D00D6377D /* PhotoSectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoSectionCell.swift; sourceTree = "<group>"; };
 		67C87FD728438F1600D6377D /* PhotoContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoContainer.swift; sourceTree = "<group>"; };
+		67CB32CC297BBE03009380DF /* NetworkStatus */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = NetworkStatus; path = "SwiftUI-WorkoutApp/NetworkStatus"; sourceTree = "<group>"; };
 		67D9167B2838D6610098D3CB /* DialogResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DialogResponse.swift; sourceTree = "<group>"; };
 		67D9167D2838DC3E0098D3CB /* GenericListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenericListCell.swift; sourceTree = "<group>"; };
 		67D916802838E2460098D3CB /* DialogListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DialogListView.swift; sourceTree = "<group>"; };
@@ -301,7 +302,6 @@
 		67D916872838F4C40098D3CB /* DialogViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DialogViewModel.swift; sourceTree = "<group>"; };
 		67D916892838F79D0098D3CB /* MessageResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageResponse.swift; sourceTree = "<group>"; };
 		67D9169528396C1E0098D3CB /* SendMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendMessageView.swift; sourceTree = "<group>"; };
-		67D91697283A22840098D3CB /* CheckNetworkService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckNetworkService.swift; sourceTree = "<group>"; };
 		67DD111F282C3CE400E3917C /* TextEntryViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextEntryViewModel.swift; sourceTree = "<group>"; };
 		67E4266C2821429500DF82A7 /* UserModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserModel.swift; sourceTree = "<group>"; };
 		67E4266E28218B6E00DF82A7 /* ShortAddressService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortAddressService.swift; sourceTree = "<group>"; };
@@ -326,6 +326,7 @@
 				672609522977256900042226 /* CachedAcyncImage in Frameworks */,
 				67F9534F2964A5700077DFDC /* ImagePicker in Frameworks */,
 				675A370A2854810B00DAE071 /* Utils in Frameworks */,
+				67CB32CE297BBEB3009380DF /* NetworkStatus in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -576,6 +577,7 @@
 		6798AA31280AEDC900DB76F1 = {
 			isa = PBXGroup;
 			children = (
+				67CB32CC297BBE03009380DF /* NetworkStatus */,
 				672609502977250B00042226 /* CachedAcyncImage */,
 				675A3707285480E600DAE071 /* Utils */,
 				6798AA3C280AEDC900DB76F1 /* SwiftUI-WorkoutApp */,
@@ -693,7 +695,6 @@
 				67B78711281D654C008B104F /* DefaultsService.swift */,
 				67E4266E28218B6E00DF82A7 /* ShortAddressService.swift */,
 				674B37AB282B9332001A5B66 /* FormatterService.swift */,
-				67D91697283A22840098D3CB /* CheckNetworkService.swift */,
 				67B65DAC289E860E00FBAFCB /* ErrorFilterService.swift */,
 				679F3B02296841DD00BB3590 /* URLOpener.swift */,
 			);
@@ -897,6 +898,7 @@
 				670431502964544D0090CAC3 /* FeedbackSender */,
 				67F9534E2964A5700077DFDC /* ImagePicker */,
 				672609512977256900042226 /* CachedAcyncImage */,
+				67CB32CD297BBEB3009380DF /* NetworkStatus */,
 			);
 			productName = "SwiftUI-WorkoutApp";
 			productReference = 6798AA3A280AEDC900DB76F1 /* WorkoutApp.app */;
@@ -1108,7 +1110,6 @@
 				67D9169628396C1E0098D3CB /* SendMessageView.swift in Sources */,
 				6758B936281E5EA9001D83D8 /* APIService.swift in Sources */,
 				6747575928128603002F0A24 /* SportsGroundDetailView.swift in Sources */,
-				67D91698283A22840098D3CB /* CheckNetworkService.swift in Sources */,
 				675EC6572815433600C2E229 /* UsersListView.swift in Sources */,
 				67B78710281D6110008B104F /* LoginViewModel.swift in Sources */,
 				675EC65F2815532800C2E229 /* EventFormView.swift in Sources */,
@@ -1316,7 +1317,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
@@ -1352,7 +1353,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
@@ -1447,6 +1448,10 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = Utils;
 		};
+		67CB32CD297BBEB3009380DF /* NetworkStatus */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = NetworkStatus;
+		};
 		67F9534E2964A5700077DFDC /* ImagePicker */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 67F9534D2964A5700077DFDC /* XCRemoteSwiftPackageReference "ImagePicker" */;

SwiftUI-WorkoutApp/NetworkStatus/.gitignore

@@ -0,0 +1,9 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+DerivedData/
+.swiftpm/config/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc

SwiftUI-WorkoutApp/NetworkStatus/Package.swift

@@ -0,0 +1,29 @@
+// swift-tools-version: 5.6
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "NetworkStatus",
+    platforms: [.iOS(.v15)],
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "NetworkStatus",
+            targets: ["NetworkStatus"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(
+            name: "NetworkStatus",
+            dependencies: []),
+        .testTarget(
+            name: "NetworkStatusTests",
+            dependencies: ["NetworkStatus"]),
+    ]
+)

SwiftUI-WorkoutApp/NetworkStatus/README.md

@@ -0,0 +1,3 @@
+# NetworkStatus
+
+Показывает статус подключения к сети

…utApp/Services/CheckNetworkService.swift …ources/NetworkStatus/NetworkStatus.swiftSwiftUI-WorkoutApp/Services/CheckNetworkService.swift renamed to SwiftUI-WorkoutApp/NetworkStatus/Sources/NetworkStatus/NetworkStatus.swift SwiftUI-WorkoutApp/Services/CheckNetworkService.swift renamed to SwiftUI-WorkoutApp/NetworkStatus/Sources/NetworkStatus/NetworkStatus.swift

@@ -1,13 +1,13 @@
 import Foundation
 import Network
 
-final class CheckNetworkService: ObservableObject {
+public final class NetworkStatus: ObservableObject {
     private let monitor = NWPathMonitor()
     private let queue = DispatchQueue.global(qos: .background)
 
-    @Published var isConnected = false
+    @Published public private(set) var isConnected = false
 
-    init() {
+    public init() {
         monitor.pathUpdateHandler = { [weak self] path in
             OperationQueue.main.addOperation {
                 self?.isConnected = path.status == .satisfied ? true : false

SwiftUI-WorkoutApp/NetworkStatus/Tests/NetworkStatusTests/NetworkStatusTests.swift

@@ -0,0 +1,10 @@
+import XCTest
+@testable import NetworkStatus
+
+final class NetworkStatusTests: XCTestCase {
+    func testExample() throws {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct
+        // results.
+    }
+}

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

@@ -1,7 +1,8 @@
 import SwiftUI
+import NetworkStatus
 
 struct CommentViewCell: View {
-    @EnvironmentObject private var network: CheckNetworkService
+    @EnvironmentObject private var network: NetworkStatus
     @EnvironmentObject private var defaults: DefaultsService
     let model: Comment
     let reportClbk: (Comment) -> Void
@@ -86,7 +87,7 @@ struct SportsGroundCommentView_Previews: PreviewProvider {
             deleteClbk: { _ in },
             editClbk: { _ in }
         )
-        .environmentObject(CheckNetworkService())
+        .environmentObject(NetworkStatus())
         .environmentObject(DefaultsService())
         .previewLayout(.sizeThatFits)
     }

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

@@ -1,4 +1,5 @@
 import SwiftUI
+import NetworkStatus
 
 /// Список комментариев
 struct Comments: View {
@@ -33,7 +34,7 @@ struct Comments_Previews: PreviewProvider {
             )
         }
         .environmentObject(DefaultsService())
-        .environmentObject(CheckNetworkService())
+        .environmentObject(NetworkStatus())
     }
 }
 #endif

SwiftUI-WorkoutApp/Screens/Common/EmptyContentView.swift

@@ -1,8 +1,9 @@
 import SwiftUI
+import NetworkStatus
 
 /// Заглушка на случай, когда нет контента
 struct EmptyContentView: View {
-    @EnvironmentObject private var network: CheckNetworkService
+    @EnvironmentObject private var network: NetworkStatus
     @EnvironmentObject private var defaults: DefaultsService
     let mode: Mode
     let action: () -> Void
@@ -86,7 +87,7 @@ struct EmptyContentView_Previews: PreviewProvider {
         ForEach(EmptyContentView.Mode.allCases, id: \.self) { mode in
             EmptyContentView(mode: mode, action: {})
         }
-        .environmentObject(CheckNetworkService())
+        .environmentObject(NetworkStatus())
         .environmentObject(DefaultsService())
         .previewLayout(.sizeThatFits)
     }

SwiftUI-WorkoutApp/Screens/Common/GenericListCell.swift

@@ -1,8 +1,9 @@
 import SwiftUI
+import NetworkStatus
 
 /// Ячейка для экранов с дневниками и диалогами
 struct GenericListCell: View {
-    @EnvironmentObject private var network: CheckNetworkService
+    @EnvironmentObject private var network: NetworkStatus
     @EnvironmentObject private var defaults: DefaultsService
     private let mode: Mode
 
@@ -123,7 +124,7 @@ private extension GenericListCell {
 struct GenericListCell_Previews: PreviewProvider {
     static var previews: some View {
         GenericListCell(for: .dialog(.preview))
-            .environmentObject(CheckNetworkService())
+            .environmentObject(NetworkStatus())
             .previewLayout(.sizeThatFits)
     }
 }