feat: [FC-0047] Account Settings and Profile split

Authorization/Authorization/Presentation/Login/SignInView.swift

@@ -27,7 +27,7 @@ public struct SignInView: View {
     public var body: some View {
         ZStack(alignment: .top) {
             VStack {
-                ThemeAssets.authBackground.swiftUIImage
+                ThemeAssets.headerBackground.swiftUIImage
                     .resizable()
                     .edgesIgnoringSafeArea(.top)
                     .accessibilityIdentifier("auth_bg_image")

Authorization/Authorization/Presentation/Registration/SignUpView.swift

@@ -29,7 +29,7 @@ public struct SignUpView: View {
     public var body: some View {
         ZStack(alignment: .top) {
             VStack {
-                ThemeAssets.authBackground.swiftUIImage
+                ThemeAssets.headerBackground.swiftUIImage
                     .resizable()
                     .edgesIgnoringSafeArea(.top)
             }

Authorization/Authorization/Presentation/Reset Password/ResetPasswordView.swift

@@ -28,7 +28,7 @@ public struct ResetPasswordView: View {
         GeometryReader { proxy in
             ZStack(alignment: .top) {
                 VStack {
-                    ThemeAssets.authBackground.swiftUIImage
+                    ThemeAssets.headerBackground.swiftUIImage
                         .resizable()
                         .edgesIgnoringSafeArea(.top)
                 }

Core/Core/Assets.xcassets/Profile/deleteAccount.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "deleteAccount.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Core/Core/Assets.xcassets/settings.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "settingsIcon.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Core/Core/Data/Model/Data_UserProfile.swift

@@ -133,6 +133,7 @@ public extension DataLayer.UserProfile {
             country: country ?? "",
             spokenLanguage: languageProficiencies?[safe: 0]?.code ?? "",
             shortBiography: bio ?? "",
-            isFullProfile: accountPrivacy?.boolValue ?? true)
+            isFullProfile: accountPrivacy?.boolValue ?? true,
+            email: email ?? "")
     }
 }

Core/Core/Domain/Model/UserProfile.swift

@@ -17,6 +17,7 @@ public struct UserProfile: Hashable {
     public let spokenLanguage: String?
     public let shortBiography: String
     public let isFullProfile: Bool
+    public let email: String
 
     public init(
         avatarUrl: String,
@@ -27,7 +28,8 @@ public struct UserProfile: Hashable {
         country: String,
         spokenLanguage: String? = nil,
         shortBiography: String,
-        isFullProfile: Bool
+        isFullProfile: Bool,
+        email: String
     ) {
         self.avatarUrl = avatarUrl
         self.name = name
@@ -38,6 +40,7 @@ public struct UserProfile: Hashable {
         self.spokenLanguage = spokenLanguage
         self.shortBiography = shortBiography
         self.isFullProfile = isFullProfile
+        self.email = email
     }
 
     public init() {
@@ -50,5 +53,6 @@ public struct UserProfile: Hashable {
         self.spokenLanguage = ""
         self.shortBiography = ""
         self.isFullProfile = true
+        self.email = ""
     }
 }

Core/Core/SwiftGen/Assets.swift

@@ -75,6 +75,7 @@ public enum CoreAssets {
   public static let addPhoto = ImageAsset(name: "addPhoto")
   public static let bgDelete = ImageAsset(name: "bg_delete")
   public static let checkmark = ImageAsset(name: "checkmark")
+  public static let deleteAccount = ImageAsset(name: "deleteAccount")
   public static let deleteChar = ImageAsset(name: "delete_char")
   public static let deleteEyes = ImageAsset(name: "delete_eyes")
   public static let done = ImageAsset(name: "done")
@@ -113,6 +114,7 @@ public enum CoreAssets {
   public static let noWifiMini = ImageAsset(name: "noWifiMini")
   public static let notAvaliable = ImageAsset(name: "notAvaliable")
   public static let playVideo = ImageAsset(name: "playVideo")
+  public static let settings = ImageAsset(name: "settings")
   public static let star = ImageAsset(name: "star")
   public static let starOutline = ImageAsset(name: "star_outline")
   public static let warning = ImageAsset(name: "warning")

Core/Core/View/Base/VideoDownloadQualityView.swift

@@ -33,11 +33,14 @@ public struct VideoDownloadQualityView: View {
     @StateObject
     private var viewModel: VideoDownloadQualityViewModel
     private var analytics: CoreAnalytics
+    private var router: BaseRouter
+    @Environment (\.isHorizontal) private var isHorizontal
 
     public init(
         downloadQuality: DownloadQuality,
         didSelect: ((DownloadQuality) -> Void)?,
-        analytics: CoreAnalytics
+        analytics: CoreAnalytics,
+        router: BaseRouter
     ) {
         self._viewModel = StateObject(
             wrappedValue: .init(
@@ -46,58 +49,87 @@ public struct VideoDownloadQualityView: View {
             )
         )
         self.analytics = analytics
+        self.router = router
     }
 
     public var body: some View {
         GeometryReader { proxy in
             ZStack(alignment: .top) {
-                // MARK: - Page Body
-                ScrollView {
-                    VStack(alignment: .leading, spacing: 24) {
-                        ForEach(viewModel.downloadQuality, id: \.self) { quality in
-                            Button(action: {
-                                analytics.videoQualityChanged(
-                                    .videoDownloadQualityChanged,
-                                    bivalue: .videoDownloadQualityChanged,
-                                    value: quality.value ?? "",
-                                    oldValue: viewModel.selectedDownloadQuality.value ?? ""
-                                )
-
-                                viewModel.selectedDownloadQuality = quality
-                            }, label: {
-                                HStack {
-                                    SettingsCell(
-                                        title: quality.title,
-                                        description: quality.description
+                VStack {
+                    ThemeAssets.headerBackground.swiftUIImage
+                        .resizable()
+                        .edgesIgnoringSafeArea(.top)
+                }
+                .frame(maxWidth: .infinity, maxHeight: 200)
+                .accessibilityIdentifier("auth_bg_image")
+
+                // MARK: - Page name
+                VStack(alignment: .center) {
+                    ZStack {
+                        HStack {
+                            Text(CoreLocalization.Settings.videoDownloadQualityTitle)
+                                .titleSettings(color: Theme.Colors.loginNavigationText)
+                                .accessibilityIdentifier("manage_account_text")
+                        }
+                        VStack {
+                            BackNavigationButton(
+                                color: Theme.Colors.loginNavigationText,
+                                action: {
+                                    router.back()
+                                }
+                            )
+                            .backViewStyle()
+                            .padding(.leading, isHorizontal ? 48 : 0)
+                            .accessibilityIdentifier("back_button")
+
+                        }.frame(minWidth: 0,
+                                maxWidth: .infinity,
+                                alignment: .topLeading)
+                    }
+                    // MARK: - Page Body
+                    ScrollView {
+                        VStack(alignment: .leading, spacing: 24) {
+                            ForEach(viewModel.downloadQuality, id: \.self) { quality in
+                                Button(action: {
+                                    analytics.videoQualityChanged(
+                                        .videoDownloadQualityChanged,
+                                        bivalue: .videoDownloadQualityChanged,
+                                        value: quality.value ?? "",
+                                        oldValue: viewModel.selectedDownloadQuality.value ?? ""
                                     )
-                                    .accessibilityElement(children: .ignore)
-                                    .accessibilityLabel("\(quality.title) \(quality.description ?? "")")
-                                    Spacer()
-                                    CoreAssets.checkmark.swiftUIImage
-                                        .renderingMode(.template)
-                                        .foregroundColor(Theme.Colors.accentXColor)
-                                        .opacity(quality == viewModel.selectedDownloadQuality ? 1 : 0)
-                                        .accessibilityIdentifier("checkmark_image")
 
-                                }
-                                .foregroundColor(Theme.Colors.textPrimary)
-                            })
-                            .accessibilityIdentifier("select_quality_button")
-                            Divider()
+                                    viewModel.selectedDownloadQuality = quality
+                                }, label: {
+                                    HStack {
+                                        SettingsCell(
+                                            title: quality.title,
+                                            description: quality.description
+                                        )
+                                        .accessibilityElement(children: .ignore)
+                                        .accessibilityLabel("\(quality.title) \(quality.description ?? "")")
+                                        Spacer()
+                                        CoreAssets.checkmark.swiftUIImage
+                                            .renderingMode(.template)
+                                            .foregroundColor(Theme.Colors.accentXColor)
+                                            .opacity(quality == viewModel.selectedDownloadQuality ? 1 : 0)
+                                            .accessibilityIdentifier("checkmark_image")
+
+                                    }
+                                    .foregroundColor(Theme.Colors.textPrimary)
+                                })
+                                .accessibilityIdentifier("select_quality_button")
+                                Divider()
+                            }
                         }
+                        .padding(.horizontal, 24)
+                        .padding(.top, 24)
+                        .frameLimit(width: proxy.size.width)
                     }
-                    .frame(
-                        minWidth: 0,
-                        maxWidth: .infinity,
-                        alignment: .topLeading
-                    )
-                    .padding(.horizontal, 24)
-                    .frameLimit(width: proxy.size.width)
+                    .roundedBackground(Theme.Colors.background)
                 }
-                .padding(.top, 8)
             }
-            .navigationBarHidden(false)
-            .navigationBarBackButtonHidden(false)
+            .navigationBarHidden(true)
+            .navigationBarBackButtonHidden(true)
             .navigationTitle(CoreLocalization.Settings.videoDownloadQualityTitle)
             .background(
                 Theme.Colors.background

Course/Course/Presentation/Outline/CourseOutlineView.swift

@@ -223,7 +223,8 @@ public struct CourseOutlineView: View {
                 VideoDownloadQualityContainerView(
                     downloadQuality: $0.downloadQuality,
                     didSelect: viewModel.update(downloadQuality:),
-                    analytics: viewModel.coreAnalytics
+                    analytics: viewModel.coreAnalytics,
+                    router: viewModel.router
                 )
             }
         }

Course/Course/Presentation/Subviews/VideoDownloadQualityBarView/VideoDownloadQualityContainerView.swift

@@ -16,19 +16,27 @@ struct VideoDownloadQualityContainerView: View {
     private var downloadQuality: DownloadQuality
     private var didSelect: ((DownloadQuality) -> Void)?
     private let analytics: CoreAnalytics
+    private let router: CourseRouter
 
-    init(downloadQuality: DownloadQuality, didSelect: ((DownloadQuality) -> Void)?, analytics: CoreAnalytics) {
+    init(
+        downloadQuality: DownloadQuality,
+        didSelect: ((DownloadQuality) -> Void)?,
+        analytics: CoreAnalytics,
+        router: CourseRouter
+    ) {
         self.downloadQuality = downloadQuality
         self.didSelect = didSelect
         self.analytics = analytics
+        self.router = router
     }
 
     var body: some View {
         NavigationView {
             VideoDownloadQualityView(
                 downloadQuality: downloadQuality,
                 didSelect: didSelect,
-                analytics: analytics
+                analytics: analytics, 
+                router: router
             )
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {

OpenEdX/DI/ScreenAssembly.swift

@@ -188,7 +188,6 @@ class ScreenAssembly: Assembly {
         container.register(ProfileViewModel.self) { r in
             ProfileViewModel(
                 interactor: r.resolve(ProfileInteractorProtocol.self)!,
-                downloadManager: r.resolve(DownloadManagerProtocol.self)!,
                 router: r.resolve(ProfileRouter.self)!,
                 analytics: r.resolve(ProfileAnalytics.self)!,
                 config: r.resolve(ConfigProtocol.self)!,
@@ -208,8 +207,21 @@ class ScreenAssembly: Assembly {
         container.register(SettingsViewModel.self) { r in
             SettingsViewModel(
                 interactor: r.resolve(ProfileInteractorProtocol.self)!,
+                downloadManager: r.resolve(DownloadManagerProtocol.self)!,
                 router: r.resolve(ProfileRouter.self)!,
-                analytics: r.resolve(CoreAnalytics.self)!
+                analytics: r.resolve(ProfileAnalytics.self)!,
+                coreAnalytics: r.resolve(CoreAnalytics.self)!,
+                config: r.resolve(ConfigProtocol.self)!
+            )
+        }
+
+        container.register(ManageAccountViewModel.self) { r in
+            ManageAccountViewModel(
+                router: r.resolve(ProfileRouter.self)!,
+                analytics: r.resolve(ProfileAnalytics.self)!,
+                config: r.resolve(ConfigProtocol.self)!,
+                connectivity: r.resolve(ConnectivityProtocol.self)!,
+                interactor: r.resolve(ProfileInteractorProtocol.self)!
             )
         }