Merge branch 'release/2.7.1'

SRGSSR · Jul 29, 2019 · 5429a38 · 5429a38
2 parents 60ea448 + a379bdd
commit 5429a38
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,3 @@
 github "SRGSSR/libextobjc" "0.6_srg1"
 github "SRGSSR/MAKVONotificationCenter" "1.0_srg3"
-github "SRGSSR/srglogger-ios" "1.0.9"
+github "SRGSSR/srglogger-ios" "1.1"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "SRGSSR/MAKVONotificationCenter" "1.0_srg3"
 github "SRGSSR/libextobjc" "0.6_srg1"
-github "SRGSSR/srglogger-ios" "1.0.9"
+github "SRGSSR/srglogger-ios" "1.1"
diff --git a/Framework/Sources/Overlays/SRGAlternateTracksViewController.m b/Framework/Sources/Overlays/SRGAlternateTracksViewController.m
@@ -152,6 +152,26 @@ - (void)viewWillAppear:(BOOL)animated
     }
 }
 
+#pragma mark Responsiveness
+
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
+{
+    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+
+    [coordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
+        self.popoverPresentationController.sourceRect = self.popoverPresentationController.sourceView.bounds;
+    }];
+}
+
+- (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
+{
+    [super willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator];
+
+    [coordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
+        self.popoverPresentationController.sourceRect = self.popoverPresentationController.sourceView.bounds;
+    }];
+}
+
 #pragma mark Accessibility
 
 - (BOOL)accessibilityPerformEscape

diff --git a/SRGMediaPlayer.xcodeproj/project.pbxproj b/SRGMediaPlayer.xcodeproj/project.pbxproj
@@ -1329,7 +1329,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 2.7;
+				MARKETING_VERSION = 2.7.1;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1466,7 +1466,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 2.7;
+				MARKETING_VERSION = 2.7.1;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -1692,7 +1692,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 2.7;
+				MARKETING_VERSION = 2.7.1;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1743,7 +1743,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				MARKETING_VERSION = 2.7;
+				MARKETING_VERSION = 2.7.1;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;