Merge pull request #44 from OlegEremenko991/develop/accountCreationOnWeb

Регистрация на сайте вместо приложения

Author: easydev991

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

@@ -1316,7 +1316,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
@@ -1352,7 +1352,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;

SwiftUI-WorkoutApp/Constants.swift

@@ -11,6 +11,7 @@ enum Constants {
     static let appReviewURL = URL(string: "https://apps.apple.com/app/id1035159361?action=write-review")!
     static let workoutShopURL = URL(string: "https://workoutshop.ru")!
     static let officialSiteURL = URL(string: "https://workout.su")!
+    static let accountCreationURL = URL(string: "https://m.workout.su/users/register")!
     static let feedbackRecipient = ["[email protected]"]
 
     enum RulesOfService {

SwiftUI-WorkoutApp/Screens/Common/IncognitoButtons/IncognitoUserButton.swift

@@ -6,31 +6,58 @@ struct IncognitoUserButton: View {
     var body: some View {
         NavigationLink(destination: mode.destination) {
             mode.label
-                .roundedStyle()
         }
     }
 }
 
 extension IncognitoUserButton {
-    enum Mode { case register, authorize }
+    enum Mode {
+        /// Регистрация
+        ///
+        /// `inForm = true` - отображаем кнопку внутри формы (`Form`), иначе - вне формы
+        case register(inForm: Bool)
+        /// Авторизация
+        case authorize(inForm: Bool)
+        
+        @ViewBuilder
+        var label: some View {
+            switch self {
+            case let .register(inForm), let .authorize(inForm):
+                if inForm {
+                    Label(title, systemImage: systemImageName)
+                } else {
+                    Label(title, systemImage: systemImageName)
+                        .roundedStyle()
+                }
+            }
+        }
+    }
 }
 
 private extension IncognitoUserButton.Mode {
-    @ViewBuilder
-    var destination: some View {
+    var title: String {
         switch self {
-        case .register: AccountInfoView(mode: .create)
-        case .authorize: LoginView()
+        case .register:
+            return "Регистрация"
+        case .authorize:
+            return "Авторизация"
         }
     }
 
-    @ViewBuilder
-    var label: some View {
+    var systemImageName: String {
         switch self {
         case .register:
-            Label("Регистрация", systemImage: "person.badge.plus")
+            return "person.badge.plus"
         case .authorize:
-            Label("Авторизация", systemImage: "arrow.forward.circle")
+            return "arrow.forward.circle"
+        }
+    }
+
+    @ViewBuilder
+    var destination: some View {
+        switch self {
+        case .register: AccountInfoView(mode: .create)
+        case .authorize: LoginView()
         }
     }
 }
@@ -39,8 +66,10 @@ private extension IncognitoUserButton.Mode {
 struct IncognitoUserButton_Previews: PreviewProvider {
     static var previews: some View {
         VStack(spacing: 16) {
-            IncognitoUserButton(mode: .authorize)
-            IncognitoUserButton(mode: .register)
+            IncognitoUserButton(mode: .authorize(inForm: true))
+            IncognitoUserButton(mode: .register(inForm: true))
+            IncognitoUserButton(mode: .authorize(inForm: false))
+            IncognitoUserButton(mode: .register(inForm: false))
         }
         .padding()
         .previewDisplayName("Инкогнито экран")

SwiftUI-WorkoutApp/Screens/Profile/IncognitoProfileView.swift

@@ -5,8 +5,8 @@ struct IncognitoProfileView: View {
     var body: some View {
         VStack(spacing: 16) {
             incognitoInformer
-            IncognitoUserButton(mode: .register)
-            IncognitoUserButton(mode: .authorize)
+            createAccountButton
+            IncognitoUserButton(mode: .authorize(inForm: false))
         }
         .toolbar {
             ToolbarItem(placement: .navigationBarTrailing) {
@@ -24,6 +24,12 @@ private extension IncognitoProfileView {
             .multilineTextAlignment(.center)
             .padding()
     }
+
+    var createAccountButton: some View {
+        Link(destination: Constants.accountCreationURL) {
+            IncognitoUserButton.Mode.register(inForm: false).label
+        }
+    }
 }
 
 #if DEBUG

SwiftUI-WorkoutApp/Screens/Profile/Settings/AccountInfo/AccountInfoView.swift

@@ -54,6 +54,8 @@ struct AccountInfoView: View {
 extension AccountInfoView {
     enum Mode: CaseIterable {
         /// Создание аккаунта
+        ///
+        /// Приложение не пропускают в `appstore`, пока на бэке поля "пол" и "дата рождения" являются обязательными
         case create
         /// Изменение личных данных
         case edit

SwiftUI-WorkoutApp/Screens/Profile/Settings/ProfileSettingsView.swift

@@ -136,8 +136,8 @@ private extension ProfileSettingsView {
     }
 
     var registerButton: some View {
-        NavigationLink(destination: AccountInfoView(mode: .create)) {
-            Label("Регистрация", systemImage: "person.badge.plus.fill")
+        Link(destination: Constants.accountCreationURL) {
+            IncognitoUserButton.Mode.register(inForm: true).label
                 .font(.system(.body).bold())
         }
     }