Release 2.12.1 (openedx-unsupported#1045)

* * Updating version number to 2.12 for release 2.12.0
* Updating What's New strings and resources for v 2.12
* Forcefully showing Done button on What's New screen [LEARNER-3567]

* Updating Spanish translations

* Fixes LEARNER-3587

* Updating Build number to 2.12.1

* Updating entitlements for branch

Source/CourseDashboardTabBarViewController.swift

@@ -27,6 +27,7 @@ class CourseDashboardTabBarViewController: UITabBarController, UITabBarControlle
     private lazy var progressController : ProgressController = {
         ProgressController(owner: self, router: self.environment.router, dataInterface: self.environment.interface)
     }()
+    private let shareButton = UIButton(type: .system)
 
     fileprivate let courseStream = BackedStream<UserCourseEnrollment>()
 
@@ -60,12 +61,21 @@ class CourseDashboardTabBarViewController: UITabBarController, UITabBarControlle
     }
 
     private func addShareButton(withCourse course: OEXCourse) {
-        let shareButton = UIBarButtonItem(image: UIImage(named: "shareCourse.png"), style: UIBarButtonItemStyle.plain, target: self, action: nil)
+        shareButton.setImage(UIImage(named: "shareCourse.png"), for: .normal)
         shareButton.accessibilityLabel = Strings.Accessibility.shareACourse
-        shareButton.oex_setAction { [weak self] in
+
+        shareButton.snp_makeConstraints(closure: { (make) -> Void in
+            make.height.equalTo(26)
+            make.width.equalTo(26)
+        })
+
+        shareButton.oex_removeAllActions()
+        shareButton.oex_addAction({[weak self] _ in
             self?.shareCourse(course: course)
-        }        
-        navigationItem.rightBarButtonItems = [shareButton]
+            }, for: .touchUpInside)
+
+        let shareItem = UIBarButtonItem(customView: shareButton)
+        navigationItem.rightBarButtonItems = [shareItem]
     }
 
     private func addNavigationItems(withCourse course: OEXCourse) {
@@ -177,10 +187,10 @@ class CourseDashboardTabBarViewController: UITabBarController, UITabBarControlle
             }, url: url, utmParams: course.courseShareUtmParams, analyticsCallback: { analyticsType in
                 analytics.trackCourseShared(courseID, url: urlString, socialTarget: analyticsType)
             })
+            controller.configurePresentationController(withSourceView: shareButton)
             present(controller, animated: true, completion: nil)
         }
-    }
-
+    }    
 }
 
 extension UITabBarController {

Source/WhatsNewViewController.swift

@@ -87,7 +87,7 @@ class WhatsNewViewController: UIViewController, UIPageViewControllerDelegate, UI
     private func configureViews() {
         view.backgroundColor = environment.styles.primaryBaseColor()
         doneButton.setAttributedTitle(doneButtonStyle.attributedString(withText: Strings.WhatsNew.done), for: .normal)
-        doneButton.isHidden = true
+        doneButton.isHidden = false
         headerLabel.accessibilityLabel = Strings.Accessibility.Whatsnew.headerLabel(appVersion: Bundle.main.oex_buildVersionString())
         closeButton.accessibilityLabel = Strings.Accessibility.Whatsnew.closeLabel
         closeButton.accessibilityHint = Strings.Accessibility.closeHint

Source/edX-Info.plist

@@ -34,7 +34,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.11</string>
+	<string>2.12</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSpokenName</key>
@@ -53,7 +53,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.11.2</string>
+	<string>2.12.1</string>
 	<key>FIREBASE_ANALYTICS_COLLECTION_ENABLED</key>
 	<false/>
 	<key>FacebookDisplayName</key>

Source/en.lproj/whats_new.json

@@ -1,4 +1,18 @@
 [
+ {
+ "version": "2.12",
+ "messages": [
+              {
+              "platforms": [
+                            "ios",
+                            "android"
+                            ],
+              "image": "screen_1",
+              "title": "Improved Course Navigation",
+              "message": "Quickly jump to course videos, discussions, and important dates in your course using new in-course navigation."
+              }
+              ]
+ },
  {
  "version": "2.11",
  "messages": [

Source/es-419.lproj/Localizable.strings

@@ -34,8 +34,6 @@
 "ACCESSIBILITY.DISCUSSION_UNREPORT_HINT" = "Toque dos veces para eliminar su reporte.";
 /* Accessibility hint for Follow button for discussion responses*/
 "ACCESSIBILITY.DISCUSSION_FOLLOW_HINT" = "Toque dos veces para seguir.";
-/* Accessibility hint for error*/
-"ACCESSIBILITY.ERROR_TEXT" = "Error";
 /* Accessibility hint for Unfollow button for discussion responses*/
 "ACCESSIBILITY.DISCUSSION_UNFOLLOW_HINT" = "Toque dos veces para dejar de seguir.";
 /* Acessibility label for the download progress button. {percent_complete} is an already localized numeric percentage like "44%" */
@@ -56,6 +54,8 @@
 "ACCESSIBILITY_FULLSCREEN" = "Pantalla completa";
 /* Accessibility label for fullscreen button on video player when player is in fullscreen mode*/
 "ACCESSIBILITY_EXIT_FULLSCREEN" = "Salir de pantalla completa";
+/* Accessibility hint for error*/
+"ACCESSIBILITY.ERROR_TEXT" = "Error";
 /* Accessibility label for HTML Icon in the Courseware screens */
 "ACCESSIBILITY_HTML" = "HTML";
 /* Accessibility label for Pause Button in the Video Player */
@@ -67,9 +67,9 @@
 /* Accessibility label for Problem Icon in the Courseware screens */
 "ACCESSIBILITY_PROBLEM" = "Problema";
 /* Required text needs to be added for accesibility*/
-"ACCESSIBILITY.REQUIRED_INPUT"="Required";
+"ACCESSIBILITY.REQUIRED_INPUT"="Requerido";
 /* Optional text needs to be added for accesibility*/
-"ACCESSIBILITY.OPTIONAL_INPUT"="Optional";
+"ACCESSIBILITY.OPTIONAL_INPUT"="Opcional";
 /* Accessibility label for Rewind Button in the Video Player */
 "ACCESSIBILITY_REWIND" = "Retroceder";
 /* Call to action for Rewind Button in the Video Player */
@@ -165,13 +165,13 @@
 /* Positive review message */
 "APP_REVIEW.POSITIVE_REVIEW_MESSAGE" = "Comparta su opinión sobre la aplicación con los demás escribiendo una breve crítica en la App Store";
 /* Send feedback message for negative app review */
-"APP_REVIEW.SEND_FEEDBACK_TITLE" = "Send Feedback?";
+"APP_REVIEW.SEND_FEEDBACK_TITLE" = "Enviar Comentario?";
 /* Help us improve message for negative app review */
 "APP_REVIEW.HELP_US_IMPROVE" = "¡Ayúdenos a mejorar!";
 /* Maybe later message for positive/negative app review */
 "APP_REVIEW.MAYBE_LATER" = "Quizás más tarde";
 /* Send feedback message for negative app review */
-"APP_REVIEW.SEND_FEEDBACK" = "Send Feedback";
+"APP_REVIEW.SEND_FEEDBACK" = "Enviar Comentario";
 /* Question for rating view */
 "APP_REVIEW.RATE_THE_APP_QUESTION" = "¿Cómo valoraría la aplicación?";
 /* Submit button for rating view */
@@ -199,7 +199,7 @@
 /* Title of course handouts section */
 "COURSE_HANDOUTS"="Recursos";
 /* Title of resources tab in course dashboardTabBar view */
-"RESOURSES"="Resources";
+"RESOURSES"="Recursos";
 /* Title of course important dates screen */
 "COURSEDATES.COURSE_IMPORTANT_DATES_TITLE"="Fechas y plazos del curso";
 /* Button text for cancelling any action */
@@ -255,7 +255,7 @@
 /* Message shown when there is no course content */
 "COURSEWARE_UNAVAILABLE"="No hay ningún contenido del curso disponible en este momento.";
 /* Message shown when there is no course video */
-"COURSE_VIDEO_UNAVAILABLE"="This course does not include any videos";
+"COURSE_VIDEO_UNAVAILABLE"="Este curso no incluye ningún video.";
 /* Message shown when attempting to display content not available on the app */
 "COURSE_CONTENT_UNKNOWN" = "Este componente interactivo aún no está disponible desde dispositivos móviles.\n\nExplore otras partes de este curso o véalo en línea.";
 /* Message shown when there is no course dates */
@@ -267,11 +267,11 @@
 /* Title text for the Courseware section of the course dashboard */
 "DASHBOARD.COURSE_COURSEWARE"="Curso";
 /* Text describing the Courseware section within the course dashboard */
-"DASHBOARD.COURSE_COURSE_DETAIL"="Access course content and assignments";
+"DASHBOARD.COURSE_COURSE_DETAIL"="Acceda a videos y actividades";
 /* Title text for the videos section of the course dashboard */
 "DASHBOARD.COURSE_Videos"="Videos";
 /* Text describing the Videos section within the course dashboard */
-"DASHBOARD.COURSE_Videos_DETAIL"="Watch course videos";
+"DASHBOARD.COURSE_Videos_DETAIL"="Ver videos del curso";
 /* Title text for the Discussions section of the course dashboard */
 "DASHBOARD.COURSE_DISCUSSION"="Debate";
 /* Text describing the Discussions section within the course dashboard */
@@ -285,9 +285,9 @@
 /* Text describing the Important dates section of the course dashboard  */
 "DASHBOARD.COURSE_IMPORTANT_DATES_DETAIL"="Realice un seguimiento de los plazos y cumpla con lo planeado";
 /* Text describing the course due date for same day*/
-"COURSE_DUE_DATE_SAME_DAY"="due today at {due_date}";
+"COURSE_DUE_DATE_SAME_DAY"="debido hoy a las {due_date} {time_zone}";
 /* Text describing the course due date*/
-"COURSE_DUE_DATE"="due {due_date}";
+"COURSE_DUE_DATE"="debido {due date}";
 /* Label indicated that a course has ended */
 "COURSE_ENDED"="Terminado - {end_date}";
 /* Label indicating that a course will end */
@@ -348,10 +348,10 @@
 "DOWNLOADS"="Descargas";
 /* Overlay message after user chooses to download a video */
 "DOWNLOADING_1_VIDEO"="Descargando 1 video.";
-/* Error message shown when email address is not properly formatted */
-"ERROR_MESSAGE.INVALID_EMAIL_FORMAT"="Please make sure your e-mail address is formatted correctly and try again.";
 /*Discover in left drawer(used for courses and programs discovery)*/
-"DISCOVER"="Discover";
+"DISCOVER"="Exploración";
+/* Error message shown when email address is not properly formatted */
+"ERROR_MESSAGE.INVALID_EMAIL_FORMAT"="Por favor revise su dirección de correo e intente de nuevo.";
 /* Alert message shown when user tries to send an email, but email isn't setup */
 "EMAIL_ACCOUNT_NOT_SET_UP_MESSAGE"="Al parecer su cliente de correo no está configurado.";
 /* Alert dialog title shown when user tries to send an email, but email isn't setup */
@@ -589,9 +589,10 @@
 /* Heading on registration screen allowing users to sign up using external services like Facebook and Google. Will be preceded by text "Sign up with" */
 "REGISTRATION_REGISTER_ALTERNATE_PROMPT"="o registrarse con el correo electrónico";
 /*Title of registration error alert*/
-"REGISTRATION_ERROR_ALERT_TITLE"="Registration Error";
+"REGISTRATION_ERROR_ALERT_TITLE"="Error de Registro";
 /* Detailed info message for registration error alert*/
-"REGISTRATION_ERROR_ALERT_MESSAGE"="Update the highlighted fields and try again";
+"REGISTRATION_ERROR_ALERT_MESSAGE"="Modifique los campos señalados e intente nuevamente.";
+
 /* Alert dialog title prompting user to enter an email address to reset their password */
 "RESET_PASSWORD_TITLE"="Restablecer contraseña";
 /* Alert dialog content prompting user to enter an email address to reset their password */
@@ -687,9 +688,9 @@
 /*Error message when operation failed with unknow error*/
 "UNKNOWN_ERROR" = "Su acción no pudo ser completada.";
 /* Screen title showing a user's account */
-"USER_ACCOUNT"="Account";
+"USER_ACCOUNT"="Cuenta";
 /* Button title for profile view in account*/
-"USER_ACCOUNT.PROFILE"= "Profile";
+"USER_ACCOUNT.PROFILE"= "Perfil";
 /* Text shown to display the current version number. Environment is a server name like "prod", "dev", stage" and may be empty. For example "Version 1.2.3 Prod" */
 "VERSION_DISPLAY" = "Versión {number} {environment}";
 /* Error shown when video download fails */

Source/es-419.lproj/whats_new.json

@@ -1,4 +1,18 @@
  [
+  {
+  "version": "2.12",
+  "messages": [
+               {
+               "platforms": [
+                             "ios",
+                             "android"
+                             ],
+               "image": "screen_1",
+               "title": "Mejora de la Navegación del Curso",
+               "message": "Pase rápidamente a los videos del curso, a las discusiones y a las fechas importantes de su curso usando una nueva navegación en curso."
+               }
+               ]
+  },
   {
   "version": "2.11",
   "messages": [
@@ -36,16 +50,16 @@
                },
                {
                "platforms": [
-                            "android"
-                            ],
+                             "android"
+                             ],
                "image": "screen_2",
                "title": "Borrar Videos",
                "message": "En la lista de videos de cursos descargados, pulse prolongadamente una vez para seleccionar los videos que desea eliminar."
                },
                {
                "platforms": [
-                            "ios"
-                            ],
+                             "ios"
+                             ],
                "image": "screen_2",
                "title": "Borrar Videos",
                "message": "Desliza hacia la izquierda para eliminar los videos descargados."

edX.entitlements

@@ -8,8 +8,8 @@
 	<array>
 		<string>applinks:edx.test-app.link</string>
 		<string>applinks:edx.app.link</string>
-		<string>edx-alternate.app.link</string>
-		<string>edx-alternate.test-app.link</string>
+		<string>applinks:edx-alternate.app.link</string>
+		<string>applinks:edx-alternate.test-app.link</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>

edX.xcodeproj/project.pbxproj

@@ -694,7 +694,6 @@
 		E08863F31F209B9C0009A06D /* DateFormatting.swift in Sources */ = {isa = PBXBuildFile; fileRef = E08863F21F209B9C0009A06D /* DateFormatting.swift */; };
 		E08A008B1CF7546200F92DE7 /* DiscussionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E08A008A1CF7546200F92DE7 /* DiscussionModel.swift */; };
 		E08A4FBF1D1A6B9700B1A40A /* DiscussionCommentsViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E08A4FBE1D1A6B9700B1A40A /* DiscussionCommentsViewControllerTests.swift */; };
-		E08EFCD31EC1E4A1008ECEC9 /* screen_2.png in Resources */ = {isa = PBXBuildFile; fileRef = E08EFCCF1EC1E4A1008ECEC9 /* screen_2.png */; };
 		E09B9D6B1D06C9700080BAE0 /* VersionUpgradeInfoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E09B9D6A1D06C9700080BAE0 /* VersionUpgradeInfoController.swift */; };
 		E09B9D6E1D06D79F0080BAE0 /* VersionUpgradeInfoControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E09B9D6C1D06D6C40080BAE0 /* VersionUpgradeInfoControllerTests.swift */; };
 		E09B9D701D06D8010080BAE0 /* VersionUpgradeDataFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = E09B9D6F1D06D8010080BAE0 /* VersionUpgradeDataFactory.swift */; };
@@ -1611,7 +1610,6 @@
 		E08CC57D1F33269D0092ACED /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "es-419"; path = "es-419.lproj/countries.json"; sourceTree = "<group>"; };
 		E08CC57E1F33269D0092ACED /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "es-419"; path = "es-419.lproj/languages.json"; sourceTree = "<group>"; };
 		E08CC57F1F33269D0092ACED /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "es-419"; path = "es-419.lproj/whats_new.json"; sourceTree = "<group>"; };
-		E08EFCCF1EC1E4A1008ECEC9 /* screen_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = screen_2.png; sourceTree = "<group>"; };
 		E09B9D6A1D06C9700080BAE0 /* VersionUpgradeInfoController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VersionUpgradeInfoController.swift; sourceTree = "<group>"; };
 		E09B9D6C1D06D6C40080BAE0 /* VersionUpgradeInfoControllerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VersionUpgradeInfoControllerTests.swift; sourceTree = "<group>"; };
 		E09B9D6F1D06D8010080BAE0 /* VersionUpgradeDataFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VersionUpgradeDataFactory.swift; sourceTree = "<group>"; };
@@ -3441,7 +3439,6 @@
 			isa = PBXGroup;
 			children = (
 				E054B09E1EC3178200FACBA6 /* screen_1.png */,
-				E08EFCCF1EC1E4A1008ECEC9 /* screen_2.png */,
 			);
 			path = WhatsNew;
 			sourceTree = "<group>";
@@ -3727,7 +3724,6 @@
 				69ECC6501D50D1170030CF87 /* [email protected] in Resources */,
 				69ECC6341D50D1170030CF87 /* ic_next_deactive.png in Resources */,
 				1AFEB1B91BBD88F3004C471D /* languages.json in Resources */,
-				E08EFCD31EC1E4A1008ECEC9 /* screen_2.png in Resources */,
 				9E7D1BCC1AEA5BF5000AF768 /* OEXDownloadViewController.storyboard in Resources */,
 				69ECC6421D50D1170030CF87 /* [email protected] in Resources */,
 				69ECC61A1D50D1170030CF87 /* bt_grey_default.png in Resources */,