fix: Part 2 sync to upstream (openedx#530)

* Merge pull request #29 from edx/Shafqat/LEARNER-10022-Accessibility chore: Fix Initial Accessibility Testing Issues * chore: auto-generated string * fix: snack bar and resume course button color fix for light dark modes (#34) * Merge pull request #31 from edx/about-blank-links-fix fix: open link in Safari if link has target blank * Merge pull request #36 from edx/Shafqat/AllCoursesFilterFix Fix All Courses Taping Issue --------- Co-authored-by: Anton Yarmolenko <37253+rnr@users.noreply.github.com> Co-authored-by: Saeed Bashir <sbashir@2u.com> Co-authored-by: Vadim Kuznetsov <vadim@touchappmedia.com>
edx · Oct 28, 2024 · d7ad72a · d7ad72a
1 parent ca2a32d
commit d7ad72a
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 22 deletions.
diff --git a/Core/Core/SwiftGen/Strings.swift b/Core/Core/SwiftGen/Strings.swift
@@ -10,16 +10,22 @@ import Foundation
 // swiftlint:disable explicit_type_interface function_parameter_count identifier_name line_length
 // swiftlint:disable nesting type_body_length type_name vertical_whitespace_opening_braces
 public enum CoreLocalization {
+  /// Back
+  public static let back = CoreLocalization.tr("Localizable", "BACK", fallback: "Back")
+  /// Close
+  public static let close = CoreLocalization.tr("Localizable", "CLOSE", fallback: "Close")
   /// Done
   public static let done = CoreLocalization.tr("Localizable", "DONE", fallback: "Done")
+  /// Ok
+  public static let ok = CoreLocalization.tr("Localizable", "OK", fallback: "Ok")
   /// View in Safari
   public static let openInBrowser = CoreLocalization.tr("Localizable", "OPEN_IN_BROWSER", fallback: "View in Safari")
   /// The user canceled the sign-in flow.
   public static let socialSignCanceled = CoreLocalization.tr("Localizable", "SOCIAL_SIGN_CANCELED", fallback: "The user canceled the sign-in flow.")
   /// Tomorrow
   public static let tomorrow = CoreLocalization.tr("Localizable", "TOMORROW", fallback: "Tomorrow")
   /// View
-  public static let view = CoreLocalization.tr("Localizable", "VIEW ", fallback: "View")
+  public static let view = CoreLocalization.tr("Localizable", "VIEW", fallback: "View")
   /// Yesterday
   public static let yesterday = CoreLocalization.tr("Localizable", "YESTERDAY", fallback: "Yesterday")
   public enum Alert {

diff --git a/Core/Core/View/Base/BackNavigationButton.swift b/Core/Core/View/Base/BackNavigationButton.swift
@@ -78,6 +78,8 @@ public struct BackNavigationButton: View {
 
     public var body: some View {
         BackNavigationButtonRepresentable(action: action, color: color, viewModel: viewModel)
+            .accessibilityIdentifier("back_button")
+            .accessibilityLabel(CoreLocalization.back)
         .onAppear {
             viewModel.loadItems()
         }

diff --git a/Core/Core/View/Base/OfflineSnackBarView.swift b/Core/Core/View/Base/OfflineSnackBarView.swift
@@ -29,23 +29,29 @@ public struct OfflineSnackBarView: View {
                 HStack(spacing: 12) {
                     Text(CoreLocalization.NoInternet.offline)
                         .accessibilityIdentifier("no_internet_text")
+                        .foregroundColor(Theme.Colors.snackbarTextColor)
                     Spacer()
-                    Button(CoreLocalization.NoInternet.dismiss,
-                           action: {
+                    Button(action: {
                         withAnimation {
                             dismiss = true
                         }
+                    }, label: {
+                        Text(CoreLocalization.NoInternet.dismiss)
+                            .foregroundColor(Theme.Colors.snackbarTextColor)
                     })
                     .accessibilityIdentifier("no_internet_dismiss_button")
-                    Button(CoreLocalization.NoInternet.reload,
-                           action: {
+                    Button(action: {
                         Task {
                             await reloadAction()
                         }
                         withAnimation {
                             dismiss = true
                         }
-                    })
+                    }, label: {
+                        Text(CoreLocalization.NoInternet.reload)
+                            .foregroundColor(Theme.Colors.snackbarTextColor)
+                    }
+                    )
                     .accessibilityIdentifier("no_internet_reload_button")
                 }.padding(.horizontal, 16)
                     .font(Theme.Fonts.titleSmall)

diff --git a/Core/Core/View/Base/UnitButtonView.swift b/Core/Core/View/Base/UnitButtonView.swift
@@ -149,7 +149,11 @@ public struct UnitButtonView: View {
                                 .padding(.leading, 20)
                                 .font(Theme.Fonts.labelLarge)
                             CoreAssets.arrowLeft.swiftUIImage.renderingMode(.template)
-                                .foregroundColor(Theme.Colors.styledButtonText)
+                                .foregroundColor(
+                                        type == .continueLesson
+                                        ? Theme.Colors.accentColor
+                                        : Theme.Colors.styledButtonText
+                                    )
                                 .rotationEffect(Angle.degrees(180))
                                 .padding(.trailing, 20)
                         }

diff --git a/Core/Core/View/Base/Webview/WebView.swift b/Core/Core/View/Base/Webview/WebView.swift
@@ -177,20 +177,23 @@ public struct WebView: UIViewRepresentable {
             }
 
             let baseURL = await parent.viewModel.baseURL
-            if !baseURL.isEmpty, !url.absoluteString.starts(with: baseURL) {
-                if navigationAction.navigationType == .other {
-                    return .allow
-                } else if navigationAction.navigationType == .linkActivated {
-                    await MainActor.run {
+            switch navigationAction.navigationType {
+            case .other, .formSubmitted, .formResubmitted:
+                return .allow
+            case .linkActivated:
+                await MainActor.run {
+                    if UIApplication.shared.canOpenURL(url) {
                         UIApplication.shared.open(url, options: [:])
                     }
-                } else if navigationAction.navigationType == .formSubmitted {
-                    return .allow
                 }
                 return .cancel
+            default:
+                if !baseURL.isEmpty, !url.absoluteString.starts(with: baseURL) {
+                    return .cancel
+                } else {
+                    return .allow
+                }
             }
-
-            return .allow
         }
 
         public func webView(

diff --git a/Core/Core/en.lproj/Localizable.strings b/Core/Core/en.lproj/Localizable.strings
@@ -92,7 +92,10 @@
 "SETTINGS.DOWNLOAD_QUALITY_720_DESCRIPTION" = "Best quality";
 
 "DONE" = "Done";
-"VIEW " = "View";
+"VIEW" = "View";
+"BACK" = "Back";
+"OK" = "Ok";
+"CLOSE" = "Close";
 
 "PICKER.SEARCH" = "Search";
 "PICKER.ACCEPT" = "Accept";

diff --git a/Dashboard/Dashboard/Data/Network/DashboardEndpoint.swift b/Dashboard/Dashboard/Data/Network/DashboardEndpoint.swift
@@ -51,8 +51,9 @@ enum DashboardEndpoint: EndPointType {
             return .requestParameters(parameters: params, encoding: URLEncoding.queryString)
 
         case let .getAllCourses(_, filteredBy, page):
+            var idiom: UIUserInterfaceIdiom { UIDevice.current.userInterfaceIdiom }
             let params: Parameters = [
-                "page_size": 10,
+                "page_size": idiom == .pad ? 24 : 12,
                 "status": filteredBy,
                 "requested_fields": "course_progress",
                 "page": page

diff --git a/Profile/Profile/Presentation/Settings/SettingsView.swift b/Profile/Profile/Presentation/Settings/SettingsView.swift
@@ -29,7 +29,7 @@ public struct SettingsView: View {
                         .resizable()
                         .edgesIgnoringSafeArea(.top)
                 }
-                .frame(maxWidth: .infinity, maxHeight: 200)
+                .frame(maxWidth: .infinity, maxHeight: 50)
                 .accessibilityIdentifier("auth_bg_image")
 
                 // MARK: - Page name
@@ -120,7 +120,7 @@ public struct SettingsView: View {
                 viewModel.router.showDatesAndCalendar()
             }, label: {
                 HStack {
-                    Text("Dates & Calendar") // TODO: add ProfileLocalization...
+                    Text(ProfileLocalization.datesAndCalendar)
                         .font(Theme.Fonts.titleMedium)
                     Spacer()
                     Image(systemName: "chevron.right")
@@ -130,7 +130,7 @@ public struct SettingsView: View {
 
         }
         .accessibilityElement(children: .ignore)
-        .accessibilityLabel(ProfileLocalization.settingsVideo)
+        .accessibilityLabel(ProfileLocalization.datesAndCalendar)
         .cardStyle(
             bgColor: Theme.Colors.textInputUnfocusedBackground,
             strokeColor: .clear
@@ -156,7 +156,7 @@ public struct SettingsView: View {
             .accessibilityIdentifier("video_settings_button")
         }
         .accessibilityElement(children: .ignore)
-        .accessibilityLabel(ProfileLocalization.settingsVideo)
+        .accessibilityLabel(ProfileLocalization.manageAccount)
         .cardStyle(
             bgColor: Theme.Colors.textInputUnfocusedBackground,
             strokeColor: .clear

diff --git a/Profile/Profile/SwiftGen/Strings.swift b/Profile/Profile/SwiftGen/Strings.swift
@@ -18,6 +18,8 @@ public enum ProfileLocalization {
   public static let contact = ProfileLocalization.tr("Localizable", "CONTACT", fallback: "Contact support")
   /// Cookie policy
   public static let cookiePolicy = ProfileLocalization.tr("Localizable", "COOKIE_POLICY", fallback: "Cookie policy")
+  /// Dates & Calendar
+  public static let datesAndCalendar = ProfileLocalization.tr("Localizable", "DATES_AND_CALENDAR", fallback: "Dates & Calendar")
   /// Do not sell my personal information
   public static let doNotSellInformation = ProfileLocalization.tr("Localizable", "DO_NOT_SELL_INFORMATION", fallback: "Do not sell my personal information")
   /// Edit Profile

diff --git a/Profile/Profile/en.lproj/Localizable.strings b/Profile/Profile/en.lproj/Localizable.strings
@@ -14,6 +14,7 @@
 "BIO" = "Bio:";
 "SETTINGS" = "Settings";
 "SETTINGS_VIDEO" = "Video settings";
+"DATES_AND_CALENDAR" = "Dates & Calendar";
 "SUPPORT_INFO" = "Support info";
 "CONTACT" = "Contact support";
 "TERMS" = "Terms of use";