Merge pull request #958 from Infomaniak/revert-928-createAccount-view

Revert "feat: Create account view"
Infomaniak · Sep 1, 2023 · 36efd26 · 36efd26
2 parents f53ee1c + 7530ab1
commit 36efd26
Show file tree

Hide file tree

Showing 15 changed files with 69 additions and 632 deletions.
diff --git a/Mail/Views/Onboarding/OnboardingView.swift b/Mail/Views/Onboarding/OnboardingView.swift
@@ -93,6 +93,7 @@ final class LoginHandler: InfomaniakLoginDelegate, ObservableObject {
 
     func loginAfterAccountCreation(from viewController: UIViewController) {
         isLoading = true
+        matomo.track(eventWithCategory: .account, name: "openCreationWebview")
         loginService.setupWebviewNavbar(
             title: MailResourcesStrings.Localizable.buttonLogin,
             titleColor: nil,
@@ -172,80 +173,79 @@ struct OnboardingView: View {
     }
 
     var body: some View {
-        NavigationView {
-            VStack(spacing: 0) {
-                Group {
-                    if !isScrollEnabled,
-                       let slide = slides.first(where: { $0.id == selection }) {
-                        SlideView(slide: slide, updateAnimationColors: updateAnimationColors)
-                    } else {
-                        TabView(selection: $selection) {
-                            ForEach(slides) { slide in
-                                SlideView(slide: slide, updateAnimationColors: updateAnimationColors)
-                                    .tag(slide.id)
-                            }
+        VStack(spacing: 0) {
+            Group {
+                if !isScrollEnabled,
+                   let slide = slides.first(where: { $0.id == selection }) {
+                    SlideView(slide: slide, updateAnimationColors: updateAnimationColors)
+                } else {
+                    TabView(selection: $selection) {
+                        ForEach(slides) { slide in
+                            SlideView(slide: slide, updateAnimationColors: updateAnimationColors)
+                                .tag(slide.id)
                         }
-                        .tabViewStyle(.page)
-                        .ignoresSafeArea(edges: .top)
                     }
+                    .tabViewStyle(.page)
+                    .ignoresSafeArea(edges: .top)
                 }
-                .overlay(alignment: .top) {
-                    MailResourcesAsset.logoText.swiftUIImage
-                        .resizable()
-                        .scaledToFit()
-                        .frame(height: UIConstants.onboardingLogoHeight)
-                        .padding(.top, UIConstants.onboardingLogoPaddingTop)
-                }
+            }
+            .overlay(alignment: .top) {
+                MailResourcesAsset.logoText.swiftUIImage
+                    .resizable()
+                    .scaledToFit()
+                    .frame(height: UIConstants.onboardingLogoHeight)
+                    .padding(.top, UIConstants.onboardingLogoPaddingTop)
+            }
 
-                VStack(spacing: 24) {
-                    if selection == slides.count {
-                        MailButton(label: MailResourcesStrings.Localizable.buttonLogin) {
-                            loginHandler.login()
-                        }
-                        .mailButtonFullWidth(true)
-                        .mailButtonLoading(loginHandler.isLoading)
-
-                        NavigationLink(isActive: $isPresentingCreateAccount) {
-                            CreateAccountView()
-                        } label: {
-                            MailButton(label: MailResourcesStrings.Localizable.buttonCreateAccount) {
-                                isPresentingCreateAccount = true
-                            }
-                            .mailButtonStyle(.link)
-                            .disabled(false)
-                        }
-                    } else {
-                        MailButton(icon: MailResourcesAsset.fullArrowRight) {
-                            withAnimation {
-                                selection += 1
-                            }
+            VStack(spacing: 24) {
+                if selection == slides.count {
+                    MailButton(label: MailResourcesStrings.Localizable.buttonLogin) {
+                        loginHandler.login()
+                    }
+                    .mailButtonFullWidth(true)
+                    .mailButtonLoading(loginHandler.isLoading)
+
+                    MailButton(label: MailResourcesStrings.Localizable.buttonCreateAccount) {
+                        isPresentingCreateAccount.toggle()
+                    }
+                    .mailButtonStyle(.link)
+                    .disabled(loginHandler.isLoading)
+                } else {
+                    MailButton(icon: MailResourcesAsset.fullArrowRight) {
+                        withAnimation {
+                            selection += 1
                         }
-                        .mailButtonIconSize(UIConstants.onboardingArrowIconSize)
                     }
+                    .mailButtonIconSize(UIConstants.onboardingArrowIconSize)
                 }
-                .frame(height: UIConstants.onboardingButtonHeight + UIConstants.onboardingBottomButtonPadding, alignment: .top)
-                .padding(.horizontal, 24)
             }
-            .overlay(alignment: .topLeading) {
-                if !isScrollEnabled {
-                    Button {
-                        dismiss()
-                    } label: {
-                        Image(systemName: "xmark")
-                            .resizable()
-                    }
-                    .frame(width: 24, height: 24)
-                    .padding(.top, 16)
-                    .padding(.leading, 24)
+            .frame(height: UIConstants.onboardingButtonHeight + UIConstants.onboardingBottomButtonPadding, alignment: .top)
+            .padding(.horizontal, 24)
+        }
+        .overlay(alignment: .topLeading) {
+            if !isScrollEnabled {
+                Button {
+                    dismiss()
+                } label: {
+                    Image(systemName: "xmark")
+                        .resizable()
                 }
+                .frame(width: 24, height: 24)
+                .padding(.top, 16)
+                .padding(.leading, 24)
             }
-            .navigationBarTitle("")
         }
         .alert(MailResourcesStrings.Localizable.errorLoginTitle, isPresented: $loginHandler.isPresentingErrorAlert) {
             // Use default button
         } message: {
             Text(MailResourcesStrings.Localizable.errorLoginDescription)
         }
+        .sheet(isPresented: $isPresentingCreateAccount) {
+            RegisterView(registrationProcess: .mail) { viewController in
+                guard let viewController else { return }
+                loginHandler.loginAfterAccountCreation(from: viewController)
+            }
+        }
         .onAppear {
             if UIDevice.current.userInterfaceIdiom == .phone {
                 UIDevice.current
@@ -259,7 +259,6 @@ struct OnboardingView: View {
                 navigationState.transitionToRootViewDestination(.noMailboxes)
             }
         }
-        .matomoView(view: [MatomoUtils.View.onboarding.displayName, "Main"])
     }
 
     // MARK: - Private methods

diff --git a/Mail/Views/Switch User/CreateAccountView.swift b/Mail/Views/Switch User/CreateAccountView.swift
diff --git a/MailCore/Models/Settings/AccentColor.swift b/MailCore/Models/Settings/AccentColor.swift
@@ -99,15 +99,6 @@ public enum AccentColor: String, CaseIterable, SettingsOptionEnum {
         }
     }
 
-    public var createAccountImage: MailResourcesImages {
-        switch self {
-        case .pink:
-            return MailResourcesAsset.createAccountPink
-        case .blue:
-            return MailResourcesAsset.createAccountBlue
-        }
-    }
-
     // MARK: Swipe settings icons
 
     public var fullTrailingIcon: MailResourcesImages {

diff --git a/MailCore/Utils/Matomo+Extension.swift b/MailCore/Utils/Matomo+Extension.swift
@@ -26,7 +26,6 @@ import SwiftUI
 public extension MatomoUtils.View {
     static let accountView = MatomoUtils.View(displayName: "AccountView")
     static let bottomSheet = MatomoUtils.View(displayName: "BottomSheet")
-    static let onboarding = MatomoUtils.View(displayName: "Onboarding")
     static let threadListView = MatomoUtils.View(displayName: "ThreadListView")
     static let threadView = MatomoUtils.View(displayName: "ThreadView")
     static let settingsView = MatomoUtils.View(displayName: "SettingsView")

diff --git a/MailResources/Assets.xcassets/create-account-blue.imageset/Contents.json b/MailResources/Assets.xcassets/create-account-blue.imageset/Contents.json