Рефактор + смена языка в настройках телефона (#261)

- Обновил нейминг всех экранов - названия экранов заканчиваются на "Screen"
- Вынес в `Environment` некоторые ключи, чтобы меньше обращаться к `defaults` во вьюхах
- Теперь язык меняется в настройках телефона

Author: easydev991

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

@@ -1,14 +1,14 @@
 import SwiftUI
 
 /// Ключ для получения состояния подключения к интернету
-struct NetworkConnectedEnvironmentKey: EnvironmentKey {
+struct NetworkStatusEnvironmentKey: EnvironmentKey {
     static let defaultValue = false
 }
 
 extension EnvironmentValues {
     /// `true` - есть подключение, `false` - нет подключения
-    var networkConnected: Bool {
-        get { self[NetworkConnectedEnvironmentKey.self] }
-        set { self[NetworkConnectedEnvironmentKey.self] = newValue }
+    var isNetworkConnected: Bool {
+        get { self[NetworkStatusEnvironmentKey.self] }
+        set { self[NetworkStatusEnvironmentKey.self] = newValue }
     }
 }

SwiftUI-WorkoutApp/EnvironmentKeys/NetworkConnectedEnvironmentKey.swift renamed to SwiftUI-WorkoutApp/EnvironmentKeys/NetworkStatusEnvironmentKey.swift

@@ -0,0 +1,15 @@
+import SwiftUI
+import SWModels
+
+/// Ключ для получения "флагов" пользователя
+struct UserFlagsEnvironmentKey: EnvironmentKey {
+    static let defaultValue = UserFlags.defaultValue
+}
+
+extension EnvironmentValues {
+    /// Флаги пользователя
+    var userFlags: UserFlags {
+        get { self[UserFlagsEnvironmentKey.self] }
+        set { self[UserFlagsEnvironmentKey.self] = newValue }
+    }
+}

SwiftUI-WorkoutApp/EnvironmentKeys/UserFlagsEnvironmentKey.swift

@@ -2,7 +2,6 @@ import Foundation
 
 @MainActor
 public protocol DefaultsProtocol: AnyObject, Sendable {
-    var appLanguage: AppLanguage { get }
     var appTheme: AppColorTheme { get }
     var mainUserInfo: UserResponse? { get }
     var mainUserCountryID: Int { get }
@@ -15,7 +14,6 @@ public protocol DefaultsProtocol: AnyObject, Sendable {
     var unreadMessagesCount: Int { get }
     /// Дефолтная дата - предыдущее ручное обновление файла `countries.json`
     var lastCountriesUpdateDate: Date { get }
-    func setAppLanguage(_ language: AppLanguage)
     func setAppTheme(_ theme: AppColorTheme)
     func saveAuthData(_ info: AuthData) throws
     func basicAuthInfo() throws -> AuthData

SwiftUI-WorkoutApp/Libraries/SWModels/Sources/SWModels/AppLanguage.swift

@@ -0,0 +1,32 @@
+import Foundation
+
+/// Содержит флаги пользователя для `Environment`
+public struct UserFlags: Sendable {
+    public let isAuthorized: Bool
+    public let needUpdate: Bool
+    public let hasParks: Bool
+    public let hasFriends: Bool
+    public let hasJournals: Bool
+
+    public init(
+        isAuthorized: Bool,
+        needUpdate: Bool,
+        hasParks: Bool,
+        hasFriends: Bool,
+        hasJournals: Bool
+    ) {
+        self.isAuthorized = isAuthorized
+        self.needUpdate = needUpdate
+        self.hasParks = hasParks
+        self.hasFriends = hasFriends
+        self.hasJournals = hasJournals
+    }
+
+    public static let defaultValue = Self(
+        isAuthorized: false,
+        needUpdate: false,
+        hasParks: false,
+        hasFriends: false,
+        hasJournals: false
+    )
+}

SwiftUI-WorkoutApp/Libraries/SWModels/Sources/SWModels/DefaultsProtocol.swift

@@ -2717,6 +2717,22 @@
         }
       }
     },
+    "Отмена" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Cancel"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Отмена"
+          }
+        }
+      }
+    },
     "Отправить" : {
       "localizations" : {
         "en" : {
@@ -2835,6 +2851,16 @@
         }
       }
     },
+    "Перейти" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Go to settings"
+          }
+        }
+      }
+    },
     "Перейти на карту" : {
       "localizations" : {
         "en" : {
@@ -4147,19 +4173,35 @@
         }
       }
     },
-    "Язык" : {
+    "Язык можно поменять в настройках телефона" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "The language can be changed in the phone settings"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Язык можно поменять в настройках телефона"
+          }
+        }
+      }
+    },
+    "Язык приложения" : {
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Language"
+            "value" : "App language"
           }
         },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Язык"
+            "value" : "Язык приложения"
           }
         }
       }

SwiftUI-WorkoutApp/Libraries/SWModels/Sources/SWModels/UserFlags.swift

@@ -4,8 +4,9 @@ import SWModels
 
 /// Список комментариев
 struct CommentsView: View {
-    @Environment(\.networkConnected) private var isNetworkConnected
-    @EnvironmentObject private var defaults: DefaultsService
+    @Environment(\.userFlags) private var userFlags
+    @Environment(\.isNetworkConnected) private var isNetworkConnected
+    let mainUserId: Int?
     let items: [CommentResponse]
     let reportClbk: (CommentResponse) -> Void
     let deleteClbk: (Int) -> Void
@@ -23,7 +24,7 @@ struct CommentsView: View {
                                 userName: comment.user?.userName ?? "",
                                 dateText: comment.formattedDateString,
                                 bodyText: comment.formattedBody,
-                                isCommentByMainUser: comment.user?.id == defaults.mainUserInfo?.id,
+                                isCommentByMainUser: comment.user?.id == mainUserId,
                                 isNetworkConnected: isNetworkConnected,
                                 reportAction: { reportClbk(comment) },
                                 editAction: { editClbk(comment) },
@@ -34,7 +35,7 @@ struct CommentsView: View {
                     }
                 }
             }
-            if defaults.isAuthorized {
+            if userFlags.isAuthorized {
                 Button("Добавить комментарий", action: createCommentClbk)
                     .buttonStyle(SWButtonStyle(mode: .filled, size: .large))
             }
@@ -45,25 +46,25 @@ struct CommentsView: View {
 #if DEBUG
 #Preview("Single") {
     CommentsView(
+        mainUserId: nil,
         items: [.preview],
         reportClbk: { _ in },
         deleteClbk: { _ in },
         editClbk: { _ in },
         createCommentClbk: {}
     )
     .padding(.horizontal)
-    .environmentObject(DefaultsService())
 }
 
 #Preview("Multiple") {
     CommentsView(
+        mainUserId: nil,
         items: [.preview, .preview, .preview],
         reportClbk: { _ in },
         deleteClbk: { _ in },
         editClbk: { _ in },
         createCommentClbk: {}
     )
     .padding(.horizontal)
-    .environmentObject(DefaultsService())
 }
 #endif

SwiftUI-WorkoutApp/Resources/Localizable.xcstrings

@@ -4,18 +4,16 @@ import SWModels
 
 /// Заглушка на случай, когда нет контента
 struct EmptyContentView: View {
+    @Environment(\.isNetworkConnected) private var isNetworkConnected
+    @Environment(\.userFlags) private var userFlags
     let mode: Mode
-    let isAuthorized: Bool
-    let hasFriends: Bool
-    let hasParks: Bool
-    let isNetworkConnected: Bool
     let action: () -> Void
 
     var body: some View {
         VStack(spacing: 16) {
             if isNetworkConnected {
                 titleText(mode.message)
-                if isAuthorized {
+                if userFlags.isAuthorized {
                     Button(actionButtonTitle, action: action)
                         .buttonStyle(SWButtonStyle(mode: .filled, size: .large))
                 }
@@ -55,17 +53,17 @@ private extension EmptyContentView {
     var actionButtonTitle: LocalizedStringKey {
         switch mode {
         case .events:
-            hasParks && isAuthorized
+            userFlags.hasParks && userFlags.isAuthorized
                 ? "Создать мероприятие"
                 : "Выбрать площадку"
         case .dialogs:
-            hasFriends ? "Открыть список друзей" : "Найти пользователя"
+            userFlags.hasFriends ? "Открыть список друзей" : "Найти пользователя"
         case .journals: "Создать дневник"
         }
     }
 
     var isHintAvailable: Bool {
-        mode == .events && isAuthorized && !hasParks
+        mode == .events && userFlags.isAuthorized && !userFlags.hasParks
     }
 }
 
@@ -94,20 +92,13 @@ private extension EmptyContentView.Mode {
         ForEach(EmptyContentView.Mode.allCases, id: \.self) { mode in
             EmptyContentView(
                 mode: mode,
-                isAuthorized: true,
-                hasFriends: true,
-                hasParks: true,
-                isNetworkConnected: true,
                 action: {}
             )
             Divider()
         }
+        .environment(\.isNetworkConnected, true)
         EmptyContentView(
             mode: .dialogs,
-            isAuthorized: true,
-            hasFriends: true,
-            hasParks: true,
-            isNetworkConnected: false,
             action: {}
         )
     }

SwiftUI-WorkoutApp/Screens/Common/CommentsView.swift

@@ -17,7 +17,7 @@ struct IncognitoProfileView: View {
         .background(Color.swBackground)
         .sheet(isPresented: $showAuthScreen) {
             ContentInSheet(title: "Авторизация") {
-                LoginView()
+                LoginScreen()
             }
         }
     }