feat: Open edX app theming capability improvements (Option 2) (#182)

* feat: openedX app theming capability improvements * fix: mixup after rebasing with develop * refactor: code refactor * chore: Apply accentColor to tabbar items for theme configureable * fix: fixup after merging the develop branch * feat: openedX app theming capability improvements * chore: remove configureable assets and font parser from Core * chore: address review feedback(linked the Theme framework with Core framework) * fix: fix broken code after conflicts resolve * fix: fix the broken archive process * refactor: remove unused old Environment file
openedx · Dec 4, 2023 · 153e195 · 153e195
1 parent ec53c4c
commit 153e195
Show file tree

Hide file tree

Showing 136 changed files with 2,352 additions and 473 deletions.
diff --git a/Authorization/Authorization/Presentation/Login/SignInView.swift b/Authorization/Authorization/Presentation/Login/SignInView.swift
@@ -7,6 +7,7 @@
 
 import SwiftUI
 import Core
+import Theme
 import Swinject
 
 public struct SignInView: View {
@@ -26,7 +27,7 @@ public struct SignInView: View {
     public var body: some View {
         ZStack(alignment: .top) {
             VStack {
-                CoreAssets.authBackground.swiftUIImage
+                ThemeAssets.authBackground.swiftUIImage
                     .resizable()
                     .edgesIgnoringSafeArea(.top)
             }.frame(maxWidth: .infinity, maxHeight: 200)
@@ -45,7 +46,7 @@ public struct SignInView: View {
             }
 
             VStack(alignment: .center) {
-                CoreAssets.appLogo.swiftUIImage
+                ThemeAssets.appLogo.swiftUIImage
                     .resizable()
                     .frame(maxWidth: 189, maxHeight: 54)
                     .padding(.top, isHorizontal ? 20 : 40)
@@ -142,7 +143,7 @@ public struct SignInView: View {
                 VStack {
                     Text(viewModel.alertMessage ?? "")
                         .shadowCardStyle(bgColor: Theme.Colors.accentColor,
-                                         textColor: .white)
+                                         textColor: Theme.Colors.white)
                         .padding(.top, 80)
                     Spacer()
 

diff --git a/Authorization/Authorization/Presentation/Registration/SignUpView.swift b/Authorization/Authorization/Presentation/Registration/SignUpView.swift
@@ -7,6 +7,7 @@
 
 import SwiftUI
 import Core
+import Theme
 
 public struct SignUpView: View {
 
@@ -28,7 +29,7 @@ public struct SignUpView: View {
     public var body: some View {
         ZStack(alignment: .top) {
             VStack {
-                CoreAssets.authBackground.swiftUIImage
+                ThemeAssets.authBackground.swiftUIImage
                     .resizable()
                     .edgesIgnoringSafeArea(.top)
             }.frame(maxWidth: .infinity, maxHeight: 200)
@@ -38,12 +39,12 @@ public struct SignUpView: View {
                 ZStack {
                     HStack {
                         Text(AuthLocalization.SignIn.registerBtn)
-                            .titleSettings(color: .white)
+                            .titleSettings(color: Theme.Colors.white)
                     }
                     VStack {
                         Button(action: { viewModel.router.back() }, label: {
                             CoreAssets.arrowLeft.swiftUIImage.renderingMode(.template)
-                                .backButtonStyle(color: .white)
+                                .backButtonStyle(color: Theme.Colors.white)
                         })
                         .foregroundColor(Theme.Colors.styledButtonText)
                         .padding(.leading, isHorizontal ? 48 : 0)

diff --git a/Authorization/Authorization/Presentation/Reset Password/ResetPasswordView.swift b/Authorization/Authorization/Presentation/Reset Password/ResetPasswordView.swift
@@ -7,6 +7,7 @@
 
 import SwiftUI
 import Core
+import Theme
 
 public struct ResetPasswordView: View {
 
@@ -26,15 +27,15 @@ public struct ResetPasswordView: View {
     public var body: some View {
         ZStack(alignment: .top) {
             VStack {
-                CoreAssets.authBackground.swiftUIImage
+                ThemeAssets.authBackground.swiftUIImage
                     .resizable()
                     .edgesIgnoringSafeArea(.top)
             }.frame(maxWidth: .infinity, maxHeight: 200)
 
             VStack(alignment: .center) {
                 NavigationBar(title: AuthLocalization.Forgot.title,
-                             titleColor: .white,
-                             leftButtonColor: .white,
+                             titleColor: Theme.Colors.white,
+                             leftButtonColor: Theme.Colors.white,
                              leftButtonAction: {
                    viewModel.router.back()
                }).padding(.leading, isHorizontal ? 48 : 0)
@@ -125,7 +126,7 @@ public struct ResetPasswordView: View {
                 VStack {
                     Text(viewModel.alertMessage ?? "")
                         .shadowCardStyle(bgColor: Theme.Colors.accentColor,
-                                         textColor: .white)
+                                         textColor: Theme.Colors.white)
                         .padding(.top, 80)
                     Spacer()
 

diff --git a/Authorization/Authorization/Presentation/Startup/LogistrationBottomView.swift b/Authorization/Authorization/Presentation/Startup/LogistrationBottomView.swift
@@ -8,6 +8,7 @@
 import Foundation
 import SwiftUI
 import Core
+import Theme
 
 public struct LogistrationBottomView: View {
     @ObservedObject
@@ -43,6 +44,7 @@ public struct LogistrationBottomView: View {
     }
 }
 
+#if DEBUG
 struct LogistrationBottomView_Previews: PreviewProvider {
     static var previews: some View {
         let vm = StartupViewModel(
@@ -61,3 +63,4 @@ struct LogistrationBottomView_Previews: PreviewProvider {
             .loadFonts()
     }
 }
+#endif
diff --git a/Authorization/Authorization/Presentation/Startup/StartupView.swift b/Authorization/Authorization/Presentation/Startup/StartupView.swift
@@ -8,6 +8,7 @@
 import Foundation
 import SwiftUI
 import Core
+import Theme
 
 public struct StartupView: View {
 
@@ -25,7 +26,7 @@ public struct StartupView: View {
     public var body: some View {
         ZStack(alignment: .top) {
             VStack(alignment: .leading) {
-                CoreAssets.appLogo.swiftUIImage
+                ThemeAssets.appLogo.swiftUIImage
                     .resizable()
                     .frame(maxWidth: 189, maxHeight: 54)
                     .padding(.top, isHorizontal ? 20 : 40)