chore: theme improvements and no handouts handling (#294)

* chore: theme improvements and no handouts navigation fix * fix: removing extra items * refactor: address review feedback
openedx · Feb 28, 2024 · 2b68d2e · 2b68d2e
1 parent 739ec5c
commit 2b68d2e
Show file tree

Hide file tree

Showing 20 changed files with 82 additions and 29 deletions.
diff --git a/Authorization/Authorization/Presentation/Login/SignInView.swift b/Authorization/Authorization/Presentation/Login/SignInView.swift
@@ -50,7 +50,8 @@ public struct SignInView: View {
             VStack(alignment: .center) {
                 ThemeAssets.appLogoLight.swiftUIImage
                     .resizable()
-                    .frame(maxWidth: 189, maxHeight: 54)
+                    .aspectRatio(contentMode: .fit)
+                    .frame(maxWidth: 189, maxHeight: 89)
                     .padding(.top, isHorizontal ? 20 : 40)
                     .padding(.bottom, isHorizontal ? 10 : 40)
                     .accessibilityIdentifier("logo_image")

diff --git a/Authorization/Authorization/Presentation/Startup/StartupView.swift b/Authorization/Authorization/Presentation/Startup/StartupView.swift
@@ -28,7 +28,8 @@ public struct StartupView: View {
             VStack(alignment: .leading) {
                 ThemeAssets.appLogo.swiftUIImage
                     .resizable()
-                    .frame(maxWidth: 189, maxHeight: 54)
+                    .aspectRatio(contentMode: .fit)
+                    .frame(maxWidth: 189, maxHeight: 89)
                     .padding(.top, isHorizontal ? 20 : 40)
                     .padding(.bottom, isHorizontal ? 0 : 20)
                     .padding(.horizontal, isHorizontal ? 10 : 24)

diff --git a/Core/Core/View/Base/CourseButton.swift b/Core/Core/View/Base/CourseButton.swift
@@ -29,7 +29,7 @@ public struct CourseButton: View {
             if isCompleted {
                 CoreAssets.finished.swiftUIImage
                     .renderingMode(.template)
-                    .foregroundColor(.accentColor)
+                    .foregroundColor(Theme.Colors.accentXColor)
             } else {
                 image
                     .foregroundColor(Theme.Colors.textPrimary)
@@ -41,7 +41,7 @@ public struct CourseButton: View {
             Spacer()
             Image(systemName: "chevron.right")
                 .padding(.vertical, 8)
-                .foregroundColor(.accentColor)
+                .foregroundColor(Theme.Colors.accentXColor)
         }
         .padding(.horizontal, 36)
         .padding(.vertical, 14)

diff --git a/Core/Core/View/Base/SnackBarView.swift b/Core/Core/View/Base/SnackBarView.swift
@@ -28,6 +28,7 @@ public struct SnackBarView: View {
         HStack {
             Text(message)
                 .font(Theme.Fonts.titleSmall)
+                .foregroundColor(Theme.Colors.snackbarTextColor)
             Spacer()
 
             if let action = action {

diff --git a/Core/Core/View/Base/VideoDownloadQualityView.swift b/Core/Core/View/Base/VideoDownloadQualityView.swift
@@ -64,7 +64,7 @@ public struct VideoDownloadQualityView: View {
                                 Spacer()
                                 CoreAssets.checkmark.swiftUIImage
                                     .renderingMode(.template)
-                                    .foregroundColor(.accentColor)
+                                    .foregroundColor(Theme.Colors.accentXColor)
                                     .opacity(quality == viewModel.selectedDownloadQuality ? 1 : 0)
                                     .accessibilityIdentifier("checkmark_image")
 
@@ -163,4 +163,3 @@ public extension DownloadQuality {
         }
     }
 }
-
diff --git a/Course/Course/Presentation/Handouts/HandoutsUpdatesDetailView.swift b/Course/Course/Presentation/Handouts/HandoutsUpdatesDetailView.swift
@@ -27,12 +27,15 @@ public struct HandoutsUpdatesDetailView: View {
         router: CourseRouter,
         cssInjector: CSSInjector
     ) {
-        if handouts != nil {
+        let noHandouts = handouts == nil && announcements == nil
+
+        if announcements == nil {
             self.title = CourseLocalization.HandoutsCellHandouts.title
         } else {
             self.title = CourseLocalization.HandoutsCellAnnouncements.title
         }
-        self.handouts = handouts
+
+        self.handouts = noHandouts ? CourseLocalization.Error.noHandouts : handouts
         self.announcements = announcements
         self.router = router
         self.cssInjector = cssInjector

diff --git a/Course/Course/Presentation/Handouts/HandoutsView.swift b/Course/Course/Presentation/Handouts/HandoutsView.swift
@@ -39,9 +39,8 @@ struct HandoutsView: View {
                     } else {
                         VStack(alignment: .leading) {
                             HandoutsItemCell(type: .handouts, onTapAction: {
-                                guard let handouts = viewModel.handouts else { return }
                                 viewModel.router.showHandoutsUpdatesView(
-                                    handouts: handouts,
+                                    handouts: viewModel.handouts,
                                     announcements: nil,
                                     router: viewModel.router,
                                     cssInjector: viewModel.cssInjector)

diff --git a/Course/Course/Presentation/Outline/CourseStructure/CourseStructureNestedListView.swift b/Course/Course/Presentation/Outline/CourseStructure/CourseStructureNestedListView.swift
@@ -84,7 +84,7 @@ struct CourseStructureNestedListView: View {
                     if sequential.completion == 1 {
                         CoreAssets.finished.swiftUIImage
                             .renderingMode(.template)
-                            .foregroundColor(.accentColor)
+                            .foregroundColor(Theme.Colors.accentXColor)
                     } else {
                         sequential.type.image
                     }

diff --git a/Course/Course/Presentation/Outline/CourseStructure/CourseStructureView.swift b/Course/Course/Presentation/Outline/CourseStructure/CourseStructureView.swift
@@ -53,7 +53,7 @@ struct CourseStructureView: View {
                                 if child.completion == 1 {
                                     CoreAssets.finished.swiftUIImage
                                         .renderingMode(.template)
-                                        .foregroundColor(.accentColor)
+                                        .foregroundColor(Theme.Colors.accentXColor)
                                 } else {
                                     child.type.image
                                 }

diff --git a/Course/Course/Presentation/Unit/Subviews/DropdownList/CourseUnitDropDownCell.swift b/Course/Course/Presentation/Unit/Subviews/DropdownList/CourseUnitDropDownCell.swift
@@ -27,7 +27,7 @@ struct CourseUnitDropDownCell: View {
                             if vertical.completion == 1 {
                                 CoreAssets.finished.swiftUIImage
                                     .renderingMode(.template)
-                                    .foregroundColor(.accentColor)
+                                    .foregroundColor(Theme.Colors.accentXColor)
                             }
                         }
                         .frame(width: 25)

diff --git a/Course/Course/SwiftGen/Strings.swift b/Course/Course/SwiftGen/Strings.swift
@@ -98,6 +98,8 @@ public enum CourseLocalization {
   public enum Error {
     /// Course component not found, please reload
     public static let componentNotFount = CourseLocalization.tr("Localizable", "ERROR.COMPONENT_NOT_FOUNT", fallback: "Course component not found, please reload")
+    /// There are currently no handouts for this course
+    public static let noHandouts = CourseLocalization.tr("Localizable", "ERROR.NO_HANDOUTS", fallback: "There are currently no handouts for this course")
     /// You are not connected to the Internet. Please check your Internet connection.
     public static let noInternet = CourseLocalization.tr("Localizable", "ERROR.NO_INTERNET", fallback: "You are not connected to the Internet. Please check your Internet connection.")
     /// Reload

diff --git a/Course/Course/en.lproj/Localizable.strings b/Course/Course/en.lproj/Localizable.strings
@@ -28,6 +28,7 @@
 "ERROR.NO_INTERNET" = "You are not connected to the Internet. Please check your Internet connection.";
 "ERROR.RELOAD" = "Reload";
 "ERROR.COMPONENT_NOT_FOUNT" = "Course component not found, please reload";
+"ERROR.NO_HANDOUTS" = "There are currently no handouts for this course";
 
 "ALERT.ROTATE_DEVICE" = "Rotate your device to view this video in full screen.";
 "ALERT.ACCEPT" = "Accept";

diff --git a/Course/Course/uk.lproj/Localizable.strings b/Course/Course/uk.lproj/Localizable.strings
@@ -27,6 +27,7 @@
 "ERROR.NO_INTERNET" = "Ви не підключені до Інтернету. Перевірте підключення до Інтернету і спробуйте ще.";
 "ERROR.RELOAD" = "Перезавантажити";
 "ERROR.COMPONENT_NOT_FOUNT" = "Course component not found, please reload";
+"ERROR.NO_HANDOUTS" = "There are currently no handouts for this course";
 
 "ALERT.ROTATE_DEVICE" = "Поверніть пристрій, щоб переглянути це відео на весь екран.";
 "ALERT.ACCEPT" = "Accept";

diff --git a/Profile/Profile/Presentation/DeleteAccount/DeleteAccountView.swift b/Profile/Profile/Presentation/DeleteAccount/DeleteAccountView.swift
@@ -27,7 +27,7 @@ public struct DeleteAccountView: View {
                         ZStack {
                             CoreAssets.bgDelete.swiftUIImage
                             CoreAssets.deleteChar.swiftUIImage
-                                .foregroundColor(.accentColor)
+                                .foregroundColor(Theme.Colors.accentXColor)
                                 .offset(y: -31)
                             CoreAssets.deleteEyes.swiftUIImage
                                 .offset(x: -7, y: -27)

diff --git a/Profile/Profile/Presentation/Profile/Subviews/ProfileSupportInfoView.swift b/Profile/Profile/Presentation/Profile/Subviews/ProfileSupportInfoView.swift
@@ -165,7 +165,7 @@ struct ProfileSupportInfoView: View {
                         HStack {
                             CoreAssets.checkmark.swiftUIImage
                                 .renderingMode(.template)
-                                .foregroundColor(.green)
+                                .foregroundColor(Theme.Colors.success)
                             Text(ProfileLocalization.Settings.upToDate)
                                 .font(Theme.Fonts.labelMedium)
                                 .foregroundStyle(Theme.Colors.textSecondary)

diff --git a/.../SnackbarInfoAlert.colorset/Contents.json → .../SnackbarInfoColor.colorset/Contents.json b/.../SnackbarInfoAlert.colorset/Contents.json → .../SnackbarInfoColor.colorset/Contents.json
diff --git a/...edButtonBackground.colorset/Contents.json → .../SnackbarTextColor.colorset/Contents.json b/...edButtonBackground.colorset/Contents.json → .../SnackbarTextColor.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "0.408",
-          "red" : "0.235"
+          "blue" : "1.0",
+          "green" : "1.0",
+          "red" : "1.0"
         }
       },
       "idiom" : "universal"
@@ -20,12 +20,12 @@
         }
       ],
       "color" : {
-        "color-space" : "display-p3",
+        "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "0.482",
-          "red" : "0.565"
+          "blue" : "1.0",
+          "green" : "1.0",
+          "red" : "1.0"
         }
       },
       "idiom" : "universal"

diff --git a/Theme/Theme/Assets.xcassets/Colors/Success.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/Success.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x71",
+          "green" : "0xA1",
+          "red" : "0x30"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x4D",
+          "green" : "0x7D",
+          "red" : "0x0D"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Theme/Theme/SwiftGen/ThemeAssets.swift b/Theme/Theme/SwiftGen/ThemeAssets.swift
@@ -38,15 +38,15 @@ public enum ThemeAssets {
   public static let commentCellBackground = ColorAsset(name: "CommentCellBackground")
   public static let loginBackground = ColorAsset(name: "LoginBackground")
   public static let loginNavigationText = ColorAsset(name: "LoginNavigationText")
-  public static let secondaryButtonBorderColor = ColorAsset(name: "SecondaryButtonBorderColor")
   public static let secondaryButtonTextColor = ColorAsset(name: "SecondaryButtonTextColor")
   public static let shadowColor = ColorAsset(name: "ShadowColor")
   public static let snackbarErrorColor = ColorAsset(name: "SnackbarErrorColor")
-  public static let snackbarInfoAlert = ColorAsset(name: "SnackbarInfoAlert")
+  public static let snackbarInfoColor = ColorAsset(name: "SnackbarInfoColor")
+  public static let snackbarTextColor = ColorAsset(name: "SnackbarTextColor")
   public static let snackbarWarningColor = ColorAsset(name: "SnackbarWarningColor")
   public static let splashBackground = ColorAsset(name: "SplashBackground")
-  public static let styledButtonBackground = ColorAsset(name: "StyledButtonBackground")
   public static let styledButtonText = ColorAsset(name: "StyledButtonText")
+  public static let success = ColorAsset(name: "Success")
   public static let textPrimary = ColorAsset(name: "TextPrimary")
   public static let textSecondary = ColorAsset(name: "TextSecondary")
   public static let textSecondaryLight = ColorAsset(name: "TextSecondaryLight")
@@ -55,6 +55,7 @@ public enum ThemeAssets {
   public static let textInputUnfocusedBackground = ColorAsset(name: "TextInputUnfocusedBackground")
   public static let textInputUnfocusedStroke = ColorAsset(name: "TextInputUnfocusedStroke")
   public static let navigationBarTintColor = ColorAsset(name: "navigationBarTintColor")
+  public static let secondaryButtonBorderColor = ColorAsset(name: "secondaryButtonBorderColor")
   public static let warning = ColorAsset(name: "warning")
   public static let white = ColorAsset(name: "white")
   public static let datesSectionBackground = ColorAsset(name: "DatesSectionBackground")

diff --git a/Theme/Theme/Theme.swift b/Theme/Theme/Theme.swift
@@ -33,7 +33,8 @@ public struct Theme {
         public private(set) static var shadowColor = ThemeAssets.shadowColor.swiftUIColor
         public private(set) static var snackbarErrorColor = ThemeAssets.snackbarErrorColor.swiftUIColor
         public private(set) static var snackbarWarningColor = ThemeAssets.snackbarWarningColor.swiftUIColor
-        public private(set) static var snackbarInfoAlert = ThemeAssets.snackbarInfoAlert.swiftUIColor
+        public private(set) static var snackbarInfoColor = ThemeAssets.snackbarInfoColor.swiftUIColor
+        public private(set) static var snackbarTextColor = ThemeAssets.snackbarTextColor.swiftUIColor
         public private(set) static var styledButtonText = ThemeAssets.styledButtonText.swiftUIColor
         public private(set) static var textPrimary = ThemeAssets.textPrimary.swiftUIColor
         public private(set) static var textSecondary = ThemeAssets.textSecondary.swiftUIColor
@@ -54,6 +55,7 @@ public struct Theme {
         public private(set) static var navigationBarTintColor = ThemeAssets.navigationBarTintColor.swiftUIColor
         public private(set) static var secondaryButtonBorderColor = ThemeAssets.secondaryButtonBorderColor.swiftUIColor
         public private(set) static var secondaryButtonTextColor = ThemeAssets.secondaryButtonTextColor.swiftUIColor
+        public private(set) static var success = ThemeAssets.success.swiftUIColor
 
         public static func update(
             accentColor: Color = ThemeAssets.accentColor.swiftUIColor,
@@ -73,7 +75,8 @@ public struct Theme {
             upcomingTimelineColor: Color = ThemeAssets.upcomingTimelineColor.swiftUIColor,
             shadowColor: Color = ThemeAssets.shadowColor.swiftUIColor,
             snackbarErrorColor: Color = ThemeAssets.snackbarErrorColor.swiftUIColor,
-            snackbarInfoAlert: Color = ThemeAssets.snackbarInfoAlert.swiftUIColor,
+            snackbarInfoColor: Color = ThemeAssets.snackbarInfoColor.swiftUIColor,
+            snackbarTextColor: Color = ThemeAssets.snackbarTextColor.swiftUIColor,
             styledButtonText: Color = ThemeAssets.styledButtonText.swiftUIColor,
             textPrimary: Color = ThemeAssets.textPrimary.swiftUIColor,
             textSecondary: Color = ThemeAssets.textSecondary.swiftUIColor,
@@ -91,7 +94,8 @@ public struct Theme {
             datesSectionStroke: Color = ThemeAssets.datesSectionStroke.swiftUIColor,
             navigationBarTintColor: Color = ThemeAssets.navigationBarTintColor.swiftUIColor,
             secondaryButtonBorderColor: Color = ThemeAssets.secondaryButtonBorderColor.swiftUIColor,
-            secondaryButtonTextColor: Color = ThemeAssets.secondaryButtonTextColor.swiftUIColor
+            secondaryButtonTextColor: Color = ThemeAssets.secondaryButtonTextColor.swiftUIColor,
+            success: Color = ThemeAssets.success.swiftUIColor
         ) {
             self.accentColor = accentColor
             self.accentXColor = accentXColor
@@ -110,7 +114,8 @@ public struct Theme {
             self.upcomingTimelineColor = upcomingTimelineColor
             self.shadowColor = shadowColor
             self.snackbarErrorColor = snackbarErrorColor
-            self.snackbarInfoAlert = snackbarInfoAlert
+            self.snackbarInfoColor = snackbarInfoColor
+            self.snackbarTextColor = snackbarTextColor
             self.styledButtonText = styledButtonText
             self.textPrimary = textPrimary
             self.textSecondary = textSecondary
@@ -129,6 +134,7 @@ public struct Theme {
             self.navigationBarTintColor = navigationBarTintColor
             self.secondaryButtonBorderColor = secondaryButtonBorderColor
             self.secondaryButtonTextColor = secondaryButtonTextColor
+            self.success = success
         }
     }