Merge branch 'master' into app_nav

openedx-unsupported · Aug 4, 2023 · 2e737f7 · 2e737f7
2 parents 2c13e77 + fa87add
commit 2e737f7
Show file tree

Hide file tree

Showing 51 changed files with 79 additions and 1,260 deletions.
diff --git a/Source/CoursesContainerViewController.swift b/Source/CoursesContainerViewController.swift
@@ -207,6 +207,7 @@ class CoursesContainerViewController: UICollectionViewController, ScrollableDele
             let footerView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: EnrolledCoursesFooterView.identifier, for: indexPath) as! EnrolledCoursesFooterView
             footerView.findCoursesAction = { [weak self] in
                 self?.environment.router?.showCourseCatalog(fromController: self, bottomBar: nil)
+                self?.environment.analytics.trackUserFindsCourses(self?.courses.count ?? 0)
             }
             return footerView
         }

diff --git a/Source/CutomePlayer/OEXVideoPlayerSettings.swift b/Source/CutomePlayer/OEXVideoPlayerSettings.swift
@@ -9,6 +9,7 @@
 import Foundation
 
 private let cellId = "CustomCell"
+let captionLanguageNone = "none"
 
 public typealias RowType = (title: String, value: Any)
 public struct OEXVideoPlayerSetting {
@@ -66,20 +67,23 @@ class VideoPlayerSettings : NSObject {
                         rows.append(item)
                     }
                 }
+
+                if !rows.isEmpty {
+                    rows.append(RowType(title: Strings.none, value: captionLanguageNone))
+                }
 
                 let cc = OEXVideoPlayerSetting(title: Strings.videoSettingClosedCaptions, rows: rows, isSelected: { (row) -> Bool in
                     var selected = false
-                    if let selectedLanguage:String = OEXInterface.getCCSelectedLanguage() {
-                        let lang = rows[row].value as! String
-                        selected = selectedLanguage == lang
+
+                    var selectedLanguage = OEXInterface.getCCSelectedLanguage() ?? captionLanguageNone
+                    if selectedLanguage.isEmpty {
+                        selectedLanguage = captionLanguageNone
                     }
+                    let lang = rows[row].value as? String ?? captionLanguageNone
+                    selected = selectedLanguage == lang
                     return selected
                 }) {[weak self] value in
-                    var language : String = value as! String
-                    if language == OEXInterface.getCCSelectedLanguage() && language != "" {
-                        language = ""
-                    }
-                    self?.delegate?.setCaption(language: language)
+                    self?.delegate?.setCaption(language: value as? String ?? "")
                 }
                 return [cc, speeds]
             } else {

diff --git a/Source/CutomePlayer/TranscriptManager.swift b/Source/CutomePlayer/TranscriptManager.swift
@@ -34,7 +34,17 @@ class TranscriptManager: NSObject {
 
     private var captionURL: String {
         var url: String = ""
-        if let ccSelectedLanguage = OEXInterface.getCCSelectedLanguage(), let transcriptURL = video.summary?.transcripts?[ccSelectedLanguage] as? String, !ccSelectedLanguage.isEmpty, !transcriptURL.isEmpty{
+        let devicelangue = Locale.current.languageCode ?? ""
+
+        if let ccSelectedLanguage = OEXInterface.getCCSelectedLanguage(), let transcriptURL = video.summary?.transcripts?[ccSelectedLanguage] as? String, !ccSelectedLanguage.isEmpty, !transcriptURL.isEmpty, ccSelectedLanguage != captionLanguageNone {
+            url = transcriptURL
+        }
+        else if let transcriptURL = video.summary?.transcripts?[devicelangue] as? String,!devicelangue.isEmpty, !transcriptURL.isEmpty {
+            // if no language is selected, give preference to device language
+            url = transcriptURL
+        }
+        else if let transcriptURL = video.summary?.transcripts?["en"] as? String, !transcriptURL.isEmpty {
+            // if no language is selected, and transcripts are not available for device langue, look for english
             url = transcriptURL
         }
         else if let transcriptURL = video.summary?.transcripts?.values.first as? String  {

diff --git a/Source/CutomePlayer/VideoPlayer.swift b/Source/CutomePlayer/VideoPlayer.swift
@@ -269,7 +269,7 @@ class VideoPlayer: UIViewController,VideoPlayerControlsDelegate,TranscriptManage
             transcriptManager = TranscriptManager(environment: environment, video: video)
             transcriptManager?.delegate = self
 
-            if let ccSelectedLanguage = OEXInterface.getCCSelectedLanguage(), let transcriptURL = video.summary?.transcripts?[ccSelectedLanguage] as? String, !ccSelectedLanguage.isEmpty, !transcriptURL.isEmpty {
+            if let ccSelectedLanguage = OEXInterface.getCCSelectedLanguage(), let transcriptURL = video.summary?.transcripts?[ccSelectedLanguage] as? String, !ccSelectedLanguage.isEmpty, !transcriptURL.isEmpty, ccSelectedLanguage != captionLanguageNone {
                 controls?.activateSubTitles()
             }
         }
@@ -660,9 +660,14 @@ class VideoPlayer: UIViewController,VideoPlayerControlsDelegate,TranscriptManage
     }
 
     func captionUpdate(playerControls: VideoPlayerControls, language: String) {
+        let alreadySelectedLanguage = OEXInterface.getCCSelectedLanguage() ?? ""
         OEXInterface.setCCSelectedLanguage(language)
-        if language.isEmpty {
+
+        if alreadySelectedLanguage == language { return }
+
+        if language == captionLanguageNone {
             playerControls.deAvtivateSubTitles()
+            transcriptManager?.loadTranscripts()
         }
         else {
             transcriptManager?.loadTranscripts()

diff --git a/Source/EnrolledTabBarViewController.swift b/Source/EnrolledTabBarViewController.swift
@@ -167,9 +167,6 @@ class EnrolledTabBarViewController: UITabBarController, InterfaceOrientationOver
 extension EnrolledTabBarViewController: UITabBarControllerDelegate {
     func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController) {
         navigationItem.title = viewController.navigationItem.title
-        if TabBarOptions.options[tabBarController.selectedIndex] == .CourseCatalog {
-            environment.analytics.trackUserFindsCourses()
-        }
     }
 }
 

diff --git a/Source/OEXAnalytics.h b/Source/OEXAnalytics.h
@@ -132,7 +132,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)trackUserDoesNotHaveAccount;
 
-- (void)trackUserFindsCourses;
+- (void)trackUserFindsCourses:(NSInteger) enrolledCounses;
 
 //Discussion search screen event
 - (void) trackDiscussionSearchScreenWithName:(NSString *) screenName courseId:(NSString *) courseID value:(nullable NSString *) value searchQuery:(NSString *) query;

diff --git a/Source/OEXAnalytics.m b/Source/OEXAnalytics.m
@@ -482,13 +482,13 @@ - (void)trackUserDoesNotHaveAccount {
     [self trackEvent:event forComponent:nil withInfo:@{}];
 }
 
-- (void)trackUserFindsCourses {
+- (void)trackUserFindsCourses:(NSInteger) enrolledCounses {
     OEXAnalyticsEvent* event = [[OEXAnalyticsEvent alloc] init];
     event.name = value_find_courses;
     event.displayName = @"Find Courses Clicked";
     event.category = OEXAnalyticsCategoryUserEngagement;
     event.label = @"course-discovery";
-    [self trackEvent:event forComponent:nil withInfo:@{}];
+    [self trackEvent:event forComponent:nil withInfo:@{@"enrolled_courses_count": [NSNumber numberWithInteger:enrolledCounses]}];
 }
 
 #pragma mark- Discussion

diff --git a/Source/OEXAppDelegate.m b/Source/OEXAppDelegate.m
@@ -64,10 +64,6 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
         });
         return YES;
     }
-    if([[NSProcessInfo processInfo].arguments containsObject:@"-END_TO_END_TEST"]) {
-        [[[OEXSession alloc] init] closeAndClearSession];
-        [OEXFileUtility nukeUserData];
-    }
 #endif
 
     // logout user automatically if server changed

diff --git a/Source/OEXLoginViewController.m b/Source/OEXLoginViewController.m
@@ -26,7 +26,6 @@
 #import "OEXGoogleSocial.h"
 #import "OEXInterface.h"
 #import "OEXNetworkConstants.h"
-#import "OEXNetworkUtility.h"
 #import "OEXSession.h"
 #import "OEXUserDetails.h"
 #import "OEXUserLicenseAgreementViewController.h"
@@ -90,11 +89,11 @@ - (void)viewWillDisappear:(BOOL)animated {
     [self.view setUserInteractionEnabled:NO];
 }
 - (BOOL)isFacebookEnabled {
-    return ![OEXNetworkUtility isOnZeroRatedNetwork] && [self.environment.config facebookConfig].enabled;
+    return [self.environment.config facebookConfig].enabled;
 }
 
 - (BOOL)isGoogleEnabled {
-    return ![OEXNetworkUtility isOnZeroRatedNetwork] && [self.environment.config googleConfig].enabled;
+    return [self.environment.config googleConfig].enabled;
 }
 
 - (BOOL)isMicrosoftEnabled {

diff --git a/Source/OEXNetworkUtility.h b/Source/OEXNetworkUtility.h
diff --git a/Source/OEXNetworkUtility.m b/Source/OEXNetworkUtility.m
diff --git a/Source/OEXRouter+Swift.swift b/Source/OEXRouter+Swift.swift
@@ -582,7 +582,6 @@ extension OEXRouter {
         } else {
             showControllerFromStartupScreen(controller: controller)
         }
-        self.environment.analytics.trackUserFindsCourses()
     }
 
     func discoveryViewController(bottomBar: UIView? = nil, searchQuery: String? = nil) -> UIViewController? {

diff --git a/Source/OEXRouter.m b/Source/OEXRouter.m
@@ -156,7 +156,11 @@ - (void)presentViewController:(UIViewController*)controller fromController:(UIVi
 }
 
 - (void)showLoggedOutScreen {
-    [self showLoginScreenFromController:nil completion:nil];
+    __block OEXRouter *blockSelf = self;
+    [self showLoginScreenFromController:nil completion:^{
+        [blockSelf showSplash];
+        blockSelf.logistrationCompletion = nil;
+    }];
 
 }
 

diff --git a/Source/OEXZeroRatingConfig.h b/Source/OEXZeroRatingConfig.h
diff --git a/Source/OEXZeroRatingConfig.m b/Source/OEXZeroRatingConfig.m
diff --git a/Source/ValuePropCourseCardView.swift b/Source/ValuePropCourseCardView.swift
@@ -90,13 +90,15 @@ class ValuePropCourseCardView: UIView {
 
         titleLabel.snp.makeConstraints { make in
             make.leading.equalTo(lockImageView.snp.trailing).offset(StandardVerticalMargin)
-            make.trailing.lessThanOrEqualTo(chevronImageView).inset(StandardHorizontalMargin)
+            make.trailing.equalTo(chevronImageView.snp.leading).inset(StandardHorizontalMargin)
             make.centerY.equalTo(lockImageView)
         }
 
         chevronImageView.snp.makeConstraints { make in
             make.trailing.equalTo(containerView).inset(StandardHorizontalMargin)
             make.centerY.equalTo(lockImageView)
+            make.height.equalTo(20)
+            make.width.equalTo(20)
         }
 
         tapButton.snp.makeConstraints { make in

diff --git a/Source/ar.lproj/Localizable-2.strings b/Source/ar.lproj/Localizable-2.strings
@@ -77,3 +77,5 @@
 "DASHBOARD.RESUME_COURSE"="Resume course";
 /* Course outline header gated content title */
 "COURSE_OUTLINE_HEADER.GATED_CONTENT_TITLE"="Some content in this part of the course is locked for upgraded users only.";
+/* None option in the caption list to de select caption language*/
+"NONE"="None";
diff --git a/Source/de.lproj/Localizable-2.strings b/Source/de.lproj/Localizable-2.strings
@@ -77,3 +77,5 @@
 "DASHBOARD.RESUME_COURSE"="Resume course";
 /* Course outline header gated content title */
 "COURSE_OUTLINE_HEADER.GATED_CONTENT_TITLE"="Some content in this part of the course is locked for upgraded users only.";
+/* None option in the caption list to de select caption language*/
+"NONE"="None";
diff --git a/Source/en.lproj/Localizable-2.strings b/Source/en.lproj/Localizable-2.strings
@@ -73,3 +73,5 @@
 "DASHBOARD.RESUME_COURSE"="Resume course";
 /* Course outline header gated content title */
 "COURSE_OUTLINE_HEADER.GATED_CONTENT_TITLE"="Some content in this part of the course is locked for upgraded users only.";
+/* None option in the caption list to de select caption language*/
+"NONE"="None";
diff --git a/Source/es-419.lproj/Localizable-2.strings b/Source/es-419.lproj/Localizable-2.strings
@@ -77,3 +77,5 @@
 "DASHBOARD.RESUME_COURSE"="Resume course";
 /* Course outline header gated content title */
 "COURSE_OUTLINE_HEADER.GATED_CONTENT_TITLE"="Some content in this part of the course is locked for upgraded users only.";
+/* None option in the caption list to de select caption language*/
+"NONE"="None";
diff --git a/Source/fr.lproj/Localizable-2.strings b/Source/fr.lproj/Localizable-2.strings
@@ -77,3 +77,5 @@
 "DASHBOARD.RESUME_COURSE"="Resume course";
 /* Course outline header gated content title */
 "COURSE_OUTLINE_HEADER.GATED_CONTENT_TITLE"="Some content in this part of the course is locked for upgraded users only.";
+/* None option in the caption list to de select caption language*/
+"NONE"="None";
diff --git a/Source/he.lproj/Localizable-2.strings b/Source/he.lproj/Localizable-2.strings
@@ -77,3 +77,5 @@
 "DASHBOARD.RESUME_COURSE"="Resume course";
 /* Course outline header gated content title */
 "COURSE_OUTLINE_HEADER.GATED_CONTENT_TITLE"="Some content in this part of the course is locked for upgraded users only.";
+/* None option in the caption list to de select caption language*/
+"NONE"="None";
diff --git a/Source/ja.lproj/Localizable-2.strings b/Source/ja.lproj/Localizable-2.strings
@@ -79,3 +79,5 @@
 "DASHBOARD.RESUME_COURSE"="Resume course";
 /* Course outline header gated content title */
 "COURSE_OUTLINE_HEADER.GATED_CONTENT_TITLE"="Some content in this part of the course is locked for upgraded users only.";
+/* None option in the caption list to de select caption language*/
+"NONE"="None";
diff --git a/Source/pt-BR.lproj/Localizable-2.strings b/Source/pt-BR.lproj/Localizable-2.strings
@@ -77,3 +77,5 @@
 "DASHBOARD.RESUME_COURSE"="Resume course";
 /* Course outline header gated content title */
 "COURSE_OUTLINE_HEADER.GATED_CONTENT_TITLE"="Some content in this part of the course is locked for upgraded users only.";
+/* None option in the caption list to de select caption language*/
+"NONE"="None";
diff --git a/Source/tr.lproj/Localizable-2.strings b/Source/tr.lproj/Localizable-2.strings
@@ -77,3 +77,5 @@
 "DASHBOARD.RESUME_COURSE"="Resume course";
 /* Course outline header gated content title */
 "COURSE_OUTLINE_HEADER.GATED_CONTENT_TITLE"="Some content in this part of the course is locked for upgraded users only.";
+/* None option in the caption list to de select caption language*/
+"NONE"="None";
diff --git a/Source/vi.lproj/Localizable-2.strings b/Source/vi.lproj/Localizable-2.strings
@@ -77,3 +77,5 @@
 "DASHBOARD.RESUME_COURSE"="Resume course";
 /* Course outline header gated content title */
 "COURSE_OUTLINE_HEADER.GATED_CONTENT_TITLE"="Some content in this part of the course is locked for upgraded users only.";
+/* None option in the caption list to de select caption language*/
+"NONE"="None";
diff --git a/Source/zh-Hans.lproj/Localizable-2.strings b/Source/zh-Hans.lproj/Localizable-2.strings
@@ -77,3 +77,5 @@
 "DASHBOARD.RESUME_COURSE"="Resume course";
 /* Course outline header gated content title */
 "COURSE_OUTLINE_HEADER.GATED_CONTENT_TITLE"="Some content in this part of the course is locked for upgraded users only.";
+/* None option in the caption list to de select caption language*/
+"NONE"="None";