Sync: Part 9 sync to upstream (#554)

* chore: added alpha for color to whitelabel (#87) Co-authored-by: Anton Yarmolenko <[email protected]> * chore: Elm theme improvements on Learn Tab (#88) * chore: Elm theme improvement on course home (#86) * chore: fix line length warning * chore: Elm theme improvement on Course Discussions (#90) * fix: fix after merge * chore: Elm theme improvements for modals and alerts (#91) * chore: fix after merge * chore: configureable resume button (#92) --------- Co-authored-by: Anton Yarmolenko <[email protected]> Co-authored-by: Saeed Bashir <[email protected]>
openedx · Dec 19, 2024 · dc28e34 · dc28e34
1 parent 2a0df7b
commit dc28e34
Show file tree

Hide file tree

Showing 27 changed files with 363 additions and 51 deletions.
diff --git a/Core/Core/Configuration/Config/ThemeConfig.swift b/Core/Core/Configuration/Config/ThemeConfig.swift
@@ -6,16 +6,20 @@
 //
 
 import Foundation
+import OEXFoundation
 
-private enum ThemeKeys: String {
+private enum ThemeKeys: String, RawStringExtractable {
     case isRoundedCorners = "ROUNDED_CORNERS_STYLE"
+    case buttonCornersRadius = "BUTTON_CORNERS_RADIUS"
 }
 
 public final class ThemeConfig: NSObject {
     public var isRoundedCorners: Bool
-
+    public var buttonCornersRadius: Double
+
     init(dictionary: [String: AnyObject]) {
-        isRoundedCorners = dictionary[ThemeKeys.isRoundedCorners.rawValue] as? Bool != false
+        isRoundedCorners = dictionary[ThemeKeys.isRoundedCorners] as? Bool != false
+        buttonCornersRadius = dictionary[ThemeKeys.buttonCornersRadius] as? Double ?? 8.0
         super.init()
     }
 }

diff --git a/Core/Core/SwiftGen/Strings.swift b/Core/Core/SwiftGen/Strings.swift
@@ -29,16 +29,16 @@ public enum CoreLocalization {
   /// Yesterday
   public static let yesterday = CoreLocalization.tr("Localizable", "YESTERDAY", fallback: "Yesterday")
   public enum Alert {
-    /// ACCEPT
-    public static let accept = CoreLocalization.tr("Localizable", "ALERT.ACCEPT", fallback: "ACCEPT")
+    /// Accept
+    public static let accept = CoreLocalization.tr("Localizable", "ALERT.ACCEPT", fallback: "Accept")
     /// Add
     public static let add = CoreLocalization.tr("Localizable", "ALERT.ADD", fallback: "Add")
     /// Remove course calendar
     public static let calendarShiftPromptRemoveCourseCalendar = CoreLocalization.tr("Localizable", "ALERT.CALENDAR_SHIFT_PROMPT_REMOVE_COURSE_CALENDAR", fallback: "Remove course calendar")
-    /// CANCEL
-    public static let cancel = CoreLocalization.tr("Localizable", "ALERT.CANCEL", fallback: "CANCEL")
-    /// DELETE
-    public static let delete = CoreLocalization.tr("Localizable", "ALERT.DELETE", fallback: "DELETE")
+    /// Cancel
+    public static let cancel = CoreLocalization.tr("Localizable", "ALERT.CANCEL", fallback: "Cancel")
+    /// Delete
+    public static let delete = CoreLocalization.tr("Localizable", "ALERT.DELETE", fallback: "Delete")
     /// Keep editing
     public static let keepEditing = CoreLocalization.tr("Localizable", "ALERT.KEEP_EDITING", fallback: "Keep editing")
     /// Leave

diff --git a/Core/Core/View/Base/AlertView.swift b/Core/Core/View/Base/AlertView.swift
@@ -290,7 +290,7 @@ public struct AlertView: View {
                         .fill(Theme.Colors.warning)
                 )
                 .overlay(
-                    RoundedRectangle(cornerRadius: 8)
+                    Theme.Shapes.buttonShape
                         .stroke(style: .init(
                             lineWidth: 1,
                             lineCap: .round,
@@ -319,7 +319,7 @@ public struct AlertView: View {
                             .fill(Theme.Colors.accentColor)
                     )
                     .overlay(
-                        RoundedRectangle(cornerRadius: 8)
+                        Theme.Shapes.buttonShape
                             .stroke(style: .init(
                                 lineWidth: 1,
                                 lineCap: .round,
@@ -344,17 +344,17 @@ public struct AlertView: View {
                     })
                     .background(
                         Theme.Shapes.buttonShape
-                            .fill(.clear)
+                            .fill(Theme.Colors.background)
                     )
                     .overlay(
-                        RoundedRectangle(cornerRadius: 8)
+                        Theme.Shapes.buttonShape
                             .stroke(style: .init(
                                 lineWidth: 1,
                                 lineCap: .round,
                                 lineJoin: .round,
                                 miterLimit: 1
                             ))
-                            .foregroundColor(Theme.Colors.secondaryButtonBorderColor)
+                            .foregroundColor(Theme.Colors.accentColor)
                     )
                     .frame(maxWidth: 215)
                 }
@@ -411,7 +411,7 @@ public struct AlertView: View {
             } label: {
                 ZStack {
                     Text(primaryButtonTitle)
-                        .foregroundColor(Theme.Colors.styledButtonText)
+                        .foregroundColor(Theme.Colors.primaryButtonTextColor)
                         .font(Theme.Fonts.labelLarge)
                         .frame(maxWidth: .infinity)
                         .padding(.horizontal, 16)
@@ -420,10 +420,10 @@ public struct AlertView: View {
             }
             .background(
                 Theme.Shapes.buttonShape
-                    .fill(Theme.Colors.accentButtonColor)
+                    .fill(Theme.Colors.accentColor)
             )
             .overlay(
-                RoundedRectangle(cornerRadius: 8)
+                Theme.Shapes.buttonShape
                     .stroke(style: .init(
                         lineWidth: 1,
                         lineCap: .round,
@@ -439,7 +439,7 @@ public struct AlertView: View {
             }, label: {
                 ZStack {
                     Text(secondaryButtonTitle)
-                        .foregroundColor(Theme.Colors.secondaryButtonTextColor)
+                        .foregroundColor(Theme.Colors.accentColor)
                         .font(Theme.Fonts.labelLarge)
                         .frame(maxWidth: .infinity)
                         .padding(.horizontal, 16)
@@ -448,17 +448,17 @@ public struct AlertView: View {
             })
             .background(
                 Theme.Shapes.buttonShape
-                    .fill(Theme.Colors.secondaryButtonBGColor)
+                    .fill(Theme.Colors.background)
             )
             .overlay(
-                RoundedRectangle(cornerRadius: 8)
+                Theme.Shapes.buttonShape
                     .stroke(style: .init(
                         lineWidth: 1,
                         lineCap: .round,
                         lineJoin: .round,
                         miterLimit: 1
                     ))
-                    .foregroundColor(Theme.Colors.secondaryButtonBorderColor)
+                    .foregroundColor(Theme.Colors.accentColor)
             )
             .frame(maxWidth: 215)
         }

diff --git a/Core/Core/View/Base/DownloadView.swift b/Core/Core/View/Base/DownloadView.swift
@@ -23,6 +23,7 @@ public struct DownloadAvailableView: View {
             CoreAssets.startDownloading.swiftUIImage.renderingMode(.template)
                 .resizable()
                 .scaledToFit()
+                .foregroundColor(Theme.Colors.textPrimary)
                 .frame(width: 24, height: 24)
         }
         .frame(width: 30, height: 30)

diff --git a/Core/Core/View/Base/LogistrationBottomView.swift b/Core/Core/View/Base/LogistrationBottomView.swift
@@ -15,6 +15,10 @@ public enum LogistrationSourceScreen: Equatable, Sendable {
     case discovery
     case courseDetail(String, String)
     case programDetails(String)
+
+    public var value: String? {
+        return String(describing: self).components(separatedBy: "(").first
+    }
 }
 
 public enum LogistrationAction: Sendable {

diff --git a/Core/Core/View/Base/UnitButtonView.swift b/Core/Core/View/Base/UnitButtonView.swift
@@ -145,13 +145,16 @@ public struct UnitButtonView: View {
                     case .continueLesson, .nextSection:
                         HStack {
                             Text(type.stringValue())
-                                .foregroundColor(Theme.Colors.styledButtonText)
+                                .foregroundColor(
+                                    type == .continueLesson ? Theme.Colors.resumeButtonText :
+                                    Theme.Colors.styledButtonText
+                                )
                                 .padding(.leading, 20)
                                 .font(Theme.Fonts.labelLarge)
                             CoreAssets.arrowLeft.swiftUIImage.renderingMode(.template)
                                 .foregroundColor(
                                         type == .continueLesson
-                                        ? Theme.Colors.accentColor
+                                        ? Theme.Colors.resumeButtonText
                                         : Theme.Colors.styledButtonText
                                     )
                                 .rotationEffect(Angle.degrees(180))
@@ -184,7 +187,10 @@ public struct UnitButtonView: View {
 
                         case .continueLesson, .nextSection, .reload, .finish, .custom:
                             Theme.Shapes.buttonShape
-                                .fill(bgColor ?? Theme.Colors.accentButtonColor)
+                                .fill(
+                                    type == .continueLesson ? Theme.Colors.resumeButtonBG :
+                                    bgColor ?? Theme.Colors.accentButtonColor
+                                )
 
                                 .shadow(color: (type == .first
                                                 || type == .next

diff --git a/Core/Core/en.lproj/Localizable.strings b/Core/Core/en.lproj/Localizable.strings
@@ -61,12 +61,12 @@
 "DATE.DUE_IN" = "Due in ";
 "DATE.DUE_IN_DAYS" = "Due in %@ Days";
 
-"ALERT.ACCEPT" = "ACCEPT";
-"ALERT.CANCEL" = "CANCEL";
+"ALERT.ACCEPT" = "Accept";
+"ALERT.CANCEL" = "Cancel";
 "ALERT.LOGOUT" = "Log out";
 "ALERT.LEAVE" = "Leave";
 "ALERT.KEEP_EDITING" = "Keep editing";
-"ALERT.DELETE" = "DELETE";
+"ALERT.DELETE" = "Delete";
 "ALERT.ADD" = "Add";
 "ALERT.REMOVE" = "Remove";
 "ALERT.CALENDAR_SHIFT_PROMPT_REMOVE_COURSE_CALENDAR"="Remove course calendar";

diff --git a/Course/Course/Presentation/Subviews/CourseProgressView.swift b/Course/Course/Presentation/Subviews/CourseProgressView.swift
@@ -21,7 +21,7 @@ public struct CourseProgressView: View {
             ZStack(alignment: .leading) {
                 GeometryReader { geometry in
                     RoundedRectangle(cornerRadius: 10)
-                        .fill(Theme.Colors.textSecondary.opacity(0.5))
+                        .fill(Theme.Colors.courseProgressBG)
                         .frame(width: geometry.size.width, height: 10)
 
                     if let total = progress.totalAssignmentsCount,

diff --git a/Course/Course/Presentation/Subviews/CustomDisclosureGroup.swift b/Course/Course/Presentation/Subviews/CustomDisclosureGroup.swift
@@ -41,7 +41,8 @@ struct CustomDisclosureGroup: View {
                                     .rotationEffect(.degrees(expandedSections[chapter.id] ?? false ? -90 : 90))
                                     .foregroundColor(Theme.Colors.textPrimary)
                                 if chapter.childs.allSatisfy({ $0.completion == 1 }) {
-                                    CoreAssets.finishedSequence.swiftUIImage
+                                    CoreAssets.finishedSequence.swiftUIImage.renderingMode(.template)
+                                        .foregroundColor(Theme.Colors.success)
                                 }
                                 Text(chapter.displayName)
                                     .font(Theme.Fonts.titleMedium)
@@ -112,7 +113,9 @@ struct CustomDisclosureGroup: View {
                                                     HStack {
                                                         if sequential.completion == 1 {
                                                             CoreAssets.finishedSequence.swiftUIImage
+                                                                .renderingMode(.template)
                                                                 .resizable()
+                                                                .foregroundColor(Theme.Colors.success)
                                                                 .frame(width: 20, height: 20)
                                                         } else {
                                                             sequential.type.image

diff --git a/Dashboard/Dashboard/Presentation/Elements/PrimaryCardView.swift b/Dashboard/Dashboard/Presentation/Elements/PrimaryCardView.swift
@@ -127,7 +127,7 @@ public struct PrimaryCardView: View {
     }
 
     private var assignments: some View {
-        VStack(alignment: .leading, spacing: 8) {
+        VStack(alignment: .leading, spacing: 0) {
             // pastAssignments
             if pastAssignments.count == 1, let pastAssignment = pastAssignments.first {
                 courseButton(
@@ -188,6 +188,7 @@ public struct PrimaryCardView: View {
                     description: DashboardLocalization.Learn.PrimaryCard.resume,
                     icon: CoreAssets.resumeCourse.swiftUIImage,
                     selected: true,
+                    bgColor: Theme.Colors.accentButtonColor,
                     action: { resumeAction() }
                 )
             } else {
@@ -196,6 +197,7 @@ public struct PrimaryCardView: View {
                     description: nil,
                     icon: CoreAssets.resumeCourse.swiftUIImage,
                     selected: true,
+                    bgColor: Theme.Colors.accentButtonColor,
                     action: { resumeAction() }
                 )
             }
@@ -207,6 +209,7 @@ public struct PrimaryCardView: View {
         description: String?,
         icon: Image,
         selected: Bool,
+        bgColor: Color = Theme.Colors.primaryCardCautionBG,
         action: @escaping () -> Void
     ) -> some View {
         Button(action: {
@@ -242,14 +245,15 @@ public struct PrimaryCardView: View {
                             .padding(.top, 2)
                         }
                     }
+                    .padding(.bottom, 8)
                     Spacer()
                     CoreAssets.chevronRight.swiftUIImage
                         .foregroundStyle(foregroundColor(selected))
                         .padding(8)
                 }
                 .padding(.top, 8)
                 .padding(.bottom, selected ? 10 : 0)
-            }.background(selected ? Theme.Colors.accentButtonColor : .clear)
+            }.background(bgColor)
         })
     }
 

diff --git a/Dashboard/Dashboard/Presentation/Elements/ProgressLineView.swift b/Dashboard/Dashboard/Presentation/Elements/ProgressLineView.swift
@@ -28,7 +28,7 @@ struct ProgressLineView: View {
         ZStack(alignment: .leading) {
                 GeometryReader { geometry in
                     Rectangle()
-                        .foregroundStyle(Theme.Colors.cardViewStroke)
+                        .foregroundStyle(Theme.Colors.primaryCardProgressBG)
                     Rectangle()
                         .foregroundStyle(Theme.Colors.accentButtonColor)
                         .frame(width: geometry.size.width * progressValue)

diff --git a/Discovery/Discovery/Presentation/WebDiscovery/DiscoveryWebviewViewModel.swift b/Discovery/Discovery/Presentation/WebDiscovery/DiscoveryWebviewViewModel.swift
@@ -138,14 +138,25 @@ extension DiscoveryWebviewViewModel: WebViewNavigationDelegate {
         }
 
         if let url = request.url, outsideLink || capturedLink || externalLink, UIApplication.shared.canOpenURL(url) {
+            analytics.externalLinkOpen(url: url.absoluteString, screen: sourceScreen.value ?? "")
             router.presentAlert(
                 alertTitle: DiscoveryLocalization.Alert.leavingAppTitle,
                 alertMessage: DiscoveryLocalization.Alert.leavingAppMessage,
                 positiveAction: CoreLocalization.Webview.Alert.continue,
                 onCloseTapped: { [weak self] in
                     self?.router.dismiss(animated: true)
-                }, okTapped: {
+                    self?.analytics.externalLinkOpenAction(
+                        url: url.absoluteString,
+                        screen: self?.sourceScreen.value ?? "",
+                        action: "cancel"
+                    )
+                }, okTapped: { [weak self] in
                     UIApplication.shared.open(url, options: [:])
+                    self?.analytics.externalLinkOpenAction(
+                        url: url.absoluteString,
+                        screen: self?.sourceScreen.value ?? "",
+                        action: "continue"
+                    )
                 }, type: .default(positiveAction: CoreLocalization.Webview.Alert.continue, image: nil)
             )
             return true

diff --git a/Discussion/Discussion/Presentation/Comments/Base/CommentCell.swift b/Discussion/Discussion/Presentation/Comments/Base/CommentCell.swift
@@ -57,6 +57,10 @@ public struct CommentCell: View {
                     .resizable()
                     .frame(width: 32, height: 32)
                     .cornerRadius(16)
+                    .overlay {
+                        Circle()
+                            .stroke(Theme.Colors.avatarStroke, lineWidth: 1)
+                    }
                 })
 
                 VStack(alignment: .leading) {
@@ -70,16 +74,18 @@ public struct CommentCell: View {
                 Button(action: {
                     onReportTap()
                 }, label: {
-                    comment.abuseFlagged
+                    let icon = comment.abuseFlagged
                     ? CoreAssets.reported.swiftUIImage
                     : CoreAssets.report.swiftUIImage
+                    icon.renderingMode(.template)
+
                     Text(comment.abuseFlagged
                          ? DiscussionLocalization.Comment.unreport
                          : DiscussionLocalization.Comment.report)
                     .font(Theme.Fonts.labelMedium)
                 }).foregroundColor(comment.abuseFlagged
-                                   ? Theme.Colors.alert
-                                      : Theme.Colors.textSecondary)
+                                   ? Theme.Colors.irreversibleAlert
+                                      : Theme.Colors.textSecondaryLight)
             }
             Text(comment.postBodyHtml.hideHtmlTagsAndUrls())
                 .font(Theme.Fonts.bodyMedium)
@@ -125,15 +131,16 @@ public struct CommentCell: View {
                     : CoreAssets.vote.swiftUIImage.renderingMode(.template)
                     Text("\(comment.votesCount)")
                     Text(DiscussionLocalization.votesCount(comment.votesCount))
-                        .font(Theme.Fonts.labelLarge)
                 }).foregroundColor(comment.voted
-                                   ? Theme.Colors.accentXColor
-                                   : Theme.Colors.textSecondary)
+                                   ? Theme.Colors.accentColor
+                                   : Theme.Colors.textSecondaryLight)
+                .font(Theme.Fonts.labelLarge)
 
                 Spacer()
                 if addCommentAvailable {
                         HStack {
                             Image(systemName: "message.fill")
+                                .renderingMode(.template)
                             Text("\(comment.responsesCount)")
                             Text(DiscussionLocalization.commentsCount(comment.responsesCount))
                         }