Небольшие улучшения и рефактор (#209)

easydev991 · web-flow · commit 958fb79feb05 · 2023-11-26T17:04:42.000+03:00
* Удалил лишний модификатор

* Поменял авторизацию на модалку

* Забыли пароль? -&gt; Восстановить пароль

* Отключил лишнюю проверку metal api

* Убрал лишний код из превью

* Рефактор

+ выключил анимацию смены состояния экрана с диалогами (с авторизованного на неавторизованного)

* Рефактор + анимация в профиле

* Поднял версию приложения до 3.5.3 (1)
diff --git a/SwiftUI-WorkoutApp.xcodeproj/project.pbxproj b/SwiftUI-WorkoutApp.xcodeproj/project.pbxproj
@@ -57,7 +57,6 @@
 		6798AA7B280BE8E200DB76F1 /* oldSportsGrounds.json in Resources */ = {isa = PBXBuildFile; fileRef = 6798AA77280BE8E200DB76F1 /* oldSportsGrounds.json */; };
 		6798AA84280C0F7D00DB76F1 /* EditAccountScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6798AA83280C0F7D00DB76F1 /* EditAccountScreen.swift */; };
 		679F3B03296841DD00BB3590 /* URLOpener.swift in Sources */ = {isa = PBXBuildFile; fileRef = 679F3B02296841DD00BB3590 /* URLOpener.swift */; };
-		679F3B072969D4E200BB3590 /* IncognitoUserButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 679F3B062969D4E200BB3590 /* IncognitoUserButton.swift */; };
 		67A079F22A758E7D005EAF70 /* PickedPhotoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67A079F12A758E7D005EAF70 /* PickedPhotoView.swift */; };
 		67A4710D2AEED8F8004D341D /* PastEventStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67A4710C2AEED8F8004D341D /* PastEventStorage.swift */; };
 		67A64A242AC83A0F00CBDD5F /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 67A64A232AC83A0F00CBDD5F /* Localizable.xcstrings */; };
@@ -153,7 +152,6 @@
 		6798AA77280BE8E200DB76F1 /* oldSportsGrounds.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = oldSportsGrounds.json; sourceTree = "<group>"; };
 		6798AA83280C0F7D00DB76F1 /* EditAccountScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditAccountScreen.swift; sourceTree = "<group>"; };
 		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>"; };
 		67A079F12A758E7D005EAF70 /* PickedPhotoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PickedPhotoView.swift; sourceTree = "<group>"; };
 		67A4710C2AEED8F8004D341D /* PastEventStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PastEventStorage.swift; sourceTree = "<group>"; };
 		67A64A232AC83A0F00CBDD5F /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
@@ -539,7 +537,6 @@
 			isa = PBXGroup;
 			children = (
 				6798AA65280B232F00DB76F1 /* IncognitoProfileView.swift */,
-				679F3B062969D4E200BB3590 /* IncognitoUserButton.swift */,
 			);
 			path = Incognito;
 			sourceTree = "<group>";
@@ -789,7 +786,6 @@
 				671D7DEC28210D2F0068E728 /* EmptyContentView.swift in Sources */,
 				6773111A2965FFAA003CD13A /* PreviewContent.swift in Sources */,
 				67551C362AEC338600084A35 /* SWAddress.swift in Sources */,
-				679F3B072969D4E200BB3590 /* IncognitoUserButton.swift in Sources */,
 				6798AA59280AF4B100DB76F1 /* SportsGroundsMapView.swift in Sources */,
 				6798AA68280B23B700DB76F1 /* UserDetailsView.swift in Sources */,
 				67B78712281D654C008B104F /* DefaultsService.swift in Sources */,
@@ -1069,7 +1065,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
@@ -1087,7 +1083,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.5.2;
+				MARKETING_VERSION = 3.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
 				PRODUCT_NAME = WorkoutApp;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1106,7 +1102,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
@@ -1124,7 +1120,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.5.2;
+				MARKETING_VERSION = 3.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.FGU.WorkOut;
 				PRODUCT_NAME = WorkoutApp;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
diff --git a/SwiftUI-WorkoutApp.xcodeproj/xcshareddata/xcschemes/SwiftUI-WorkoutApp.xcscheme b/SwiftUI-WorkoutApp.xcodeproj/xcshareddata/xcschemes/SwiftUI-WorkoutApp.xcscheme
@@ -67,6 +67,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/SwiftUI-WorkoutApp/Resources/Localizable.xcstrings b/SwiftUI-WorkoutApp/Resources/Localizable.xcstrings
@@ -1552,18 +1552,18 @@
         }
       }
     },
-    "Забыли пароль?" : {
+    "Восстановить пароль" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Forgot your password?"
+            "value" : "Restore your password"
           }
         },
         "ru" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Забыли пароль?"
+            "value" : "Восстановить пароль"
           }
         }
       }
@@ -4077,4 +4077,4 @@
     }
   },
   "version" : "1.0"
-}
+}
diff --git a/SwiftUI-WorkoutApp/Screens/Common/EmptyContentView.swift b/SwiftUI-WorkoutApp/Screens/Common/EmptyContentView.swift
@@ -112,6 +112,5 @@ private extension EmptyContentView.Mode {
             action: {}
         )
     }
-    .previewLayout(.sizeThatFits)
 }
 #endif
diff --git a/SwiftUI-WorkoutApp/Screens/Common/Incognito/IncognitoProfileView.swift b/SwiftUI-WorkoutApp/Screens/Common/Incognito/IncognitoProfileView.swift
@@ -4,15 +4,22 @@ import SWModels
 
 /// Заглушка для неавторизованного пользователя
 struct IncognitoProfileView: View {
+    @State private var showAuthScreen = false
+    
     var body: some View {
         VStack(spacing: 16) {
             authInvitation
-            IncognitoUserButton()
+            goToLoginButton
             registrationInfo
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .padding()
         .background(Color.swBackground)
+        .sheet(isPresented: $showAuthScreen) {
+            ContentInSheet(title: "Авторизация") {
+                LoginView()
+            }
+        }
     }
 }
 
@@ -23,6 +30,14 @@ private extension IncognitoProfileView {
             .foregroundColor(.swMainText)
             .padding(.bottom, 6)
     }
+    
+    var goToLoginButton: some View {
+        Button("Авторизация") {
+            showAuthScreen = true
+        }
+        .buttonStyle(SWButtonStyle(mode: .filled, size: .large))
+        .accessibilityIdentifier("authorizeButton")
+    }
 
     var registrationInfo: some View {
         Text(.init(Constants.registrationInfoText))
@@ -35,6 +50,5 @@ private extension IncognitoProfileView {
 #if DEBUG
 #Preview {
     IncognitoProfileView()
-        .previewLayout(.sizeThatFits)
 }
 #endif
diff --git a/SwiftUI-WorkoutApp/Screens/Common/Incognito/IncognitoUserButton.swift b/SwiftUI-WorkoutApp/Screens/Common/Incognito/IncognitoUserButton.swift
diff --git a/SwiftUI-WorkoutApp/Screens/Common/PhotoSection/PhotoSectionView.swift b/SwiftUI-WorkoutApp/Screens/Common/PhotoSection/PhotoSectionView.swift
@@ -116,6 +116,5 @@ private extension PhotoSectionView {
         .padding()
         .background(Color.swBackground)
     }
-    .previewLayout(.sizeThatFits)
 }
 #endif
diff --git a/SwiftUI-WorkoutApp/Screens/Messages/DialogsScreen.swift b/SwiftUI-WorkoutApp/Screens/Messages/DialogsScreen.swift
@@ -1,3 +1,4 @@
+import SWDesignSystem
 import SwiftUI
 
 /// Экран с диалогами
@@ -6,29 +7,22 @@ struct DialogsScreen: View {
 
     var body: some View {
         NavigationView {
-            contentView
-                .navigationTitle("Сообщения")
-                .navigationBarTitleDisplayMode(titleDisplayMode)
+            ZStack {
+                if defaults.isAuthorized {
+                    DialogListView()
+                } else {
+                    IncognitoProfileView()
+                }
+            }
+            .background(Color.swBackground)
+            .animation(nil)
+            .navigationTitle("Сообщения")
+            .navigationBarTitleDisplayMode(defaults.isAuthorized ? .inline : .large)
         }
         .navigationViewStyle(.stack)
     }
 }
 
-private extension DialogsScreen {
-    var titleDisplayMode: NavigationBarItem.TitleDisplayMode {
-        defaults.isAuthorized ? .inline : .large
-    }
-
-    @ViewBuilder
-    var contentView: some View {
-        if defaults.isAuthorized {
-            DialogListView()
-        } else {
-            IncognitoProfileView()
-        }
-    }
-}
-
 #if DEBUG
 #Preview {
     DialogsScreen()
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/Journals/JournalCell.swift b/SwiftUI-WorkoutApp/Screens/Profile/Journals/JournalCell.swift
@@ -79,6 +79,5 @@ private extension JournalCell {
         mainUserID: nil,
         isJournalOwner: true
     )
-    .previewLayout(.sizeThatFits)
 }
 #endif
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/ProfileScreen.swift b/SwiftUI-WorkoutApp/Screens/Profile/ProfileScreen.swift
@@ -1,3 +1,4 @@
+import SWDesignSystem
 import SwiftUI
 
 /// Экран профиля пользователя
@@ -9,16 +10,16 @@ struct ProfileScreen: View {
             ZStack {
                 if defaults.isAuthorized {
                     UserDetailsView(for: defaults.mainUserInfo)
-                        .navigationBarTitleDisplayMode(.inline)
+                        .transition(.move(edge: .trailing).combined(with: .opacity))
                 } else {
                     IncognitoProfileView()
-                        .navigationTitle("Профиль")
-                        .navigationBarTitleDisplayMode(.large)
                 }
             }
+            .background(Color.swBackground)
+            .navigationTitle("Профиль")
+            .navigationBarTitleDisplayMode(defaults.isAuthorized ? .inline : .large)
         }
         .navigationViewStyle(.stack)
-        .ignoresSafeArea()
     }
 }
 
diff --git a/SwiftUI-WorkoutApp/Screens/Settings/LoginView.swift b/SwiftUI-WorkoutApp/Screens/Settings/LoginView.swift
@@ -34,14 +34,13 @@ struct LoginView: View {
         .padding(.top, 22)
         .padding([.horizontal, .bottom])
         .loadingOverlay(if: isLoading)
+        .interactiveDismissDisabled(isLoading)
         .background(Color.swBackground)
         .onChange(of: credentials) { _ in errorMessage = "" }
         .alert(.init(Constants.Alert.resetSuccessful), isPresented: $showResetSuccessfulAlert) {
             Button("Ok") { showResetSuccessfulAlert = false }
         }
         .onDisappear(perform: cancelTasks)
-        .navigationTitle("Авторизация")
-        .navigationBarTitleDisplayMode(.inline)
     }
 }
 
@@ -109,7 +108,7 @@ private extension LoginView {
     }
 
     var forgotPasswordButton: some View {
-        Button("Забыли пароль?", action: forgotPasswordAction)
+        Button("Восстановить пароль", action: forgotPasswordAction)
             .tint(.swMainText)
             .alert(.init(Constants.Alert.forgotPassword), isPresented: $showResetInfoAlert) {
                 Button("Ok") { showResetInfoAlert = false }

Original file line number	Diff line number	Diff line change
`@@ -1552,18 +1552,18 @@`
`1552`	`1552`	`}`
`1553`	`1553`	`}`
`1554`	`1554`	`},`
`1555`		`- "Забыли пароль?" : {`
	`1555`	`+ "Восстановить пароль" : {`
`1556`	`1556`	`"localizations" : {`
`1557`	`1557`	`"en" : {`
`1558`	`1558`	`"stringUnit" : {`
`1559`	`1559`	`"state" : "translated",`
`1560`		`- "value" : "Forgot your password?"`
	`1560`	`+ "value" : "Restore your password"`
`1561`	`1561`	`}`
`1562`	`1562`	`},`
`1563`	`1563`	`"ru" : {`
`1564`	`1564`	`"stringUnit" : {`
`1565`	`1565`	`"state" : "translated",`
`1566`		`- "value" : "Забыли пароль?"`
	`1566`	`+ "value" : "Восстановить пароль"`
`1567`	`1567`	`}`
`1568`	`1568`	`}`
`1569`	`1569`	`}`
`@@ -4077,4 +4077,4 @@`
`4077`	`4077`	`}`
`4078`	`4078`	`},`
`4079`	`4079`	`"version" : "1.0"`
`4080`		`-}`
	`4080`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,5 @@ private extension EmptyContentView.Mode {`
`112`	`112`	`action: {}`
`113`	`113`	`)`
`114`	`114`	`}`
`115`		`- .previewLayout(.sizeThatFits)`
`116`	`115`	`}`
`117`	`116`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,5 @@ private extension PhotoSectionView {`
`116`	`116`	`.padding()`
`117`	`117`	`.background(Color.swBackground)`
`118`	`118`	`}`
`119`		`- .previewLayout(.sizeThatFits)`
`120`	`119`	`}`
`121`	`120`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,5 @@ private extension JournalCell {`
`79`	`79`	`mainUserID: nil,`
`80`	`80`	`isJournalOwner: true`
`81`	`81`	`)`
`82`		`- .previewLayout(.sizeThatFits)`
`83`	`82`	`}`
`84`	`83`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import SWDesignSystem`
`1`	`2`	`import SwiftUI`
`2`	`3`
`3`	`4`	`/// Экран профиля пользователя`
`@@ -9,16 +10,16 @@ struct ProfileScreen: View {`
`9`	`10`	`ZStack {`
`10`	`11`	`if defaults.isAuthorized {`
`11`	`12`	`UserDetailsView(for: defaults.mainUserInfo)`
`12`		`- .navigationBarTitleDisplayMode(.inline)`
	`13`	`+ .transition(.move(edge: .trailing).combined(with: .opacity))`
`13`	`14`	`} else {`
`14`	`15`	`IncognitoProfileView()`
`15`		`- .navigationTitle("Профиль")`
`16`		`- .navigationBarTitleDisplayMode(.large)`
`17`	`16`	`}`
`18`	`17`	`}`
	`18`	`+ .background(Color.swBackground)`
	`19`	`+ .navigationTitle("Профиль")`
	`20`	`+ .navigationBarTitleDisplayMode(defaults.isAuthorized ? .inline : .large)`
`19`	`21`	`}`
`20`	`22`	`.navigationViewStyle(.stack)`
`21`		`- .ignoresSafeArea()`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`