Skip to content

Update target iOS to 13.0, fix compilation error #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hannadutkiewicz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update target iOS to 13.0, fix compilation error #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b4c4fd
Update iOS. Fix compilation error
Feb 3, 2021
2efa3f9
Fix a few warnings after iOS target update
Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MediaBrowser.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -547,7 +547,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down
12 changes: 5 additions & 7 deletions MediaBrowser/MediaBrowser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func floorcgf(x: CGFloat) -> CGFloat {
}
return $0
}(AVPlayerViewController())

internal var currentVideoIndex = 0
internal var currentVideoLoadingIndicator: UIActivityIndicatorView?

Expand Down Expand Up @@ -288,11 +289,8 @@ func floorcgf(x: CGFloat) -> CGFloat {
isVCBasedStatusBarAppearance = true
}


hidesBottomBarWhenPushed = true
automaticallyAdjustsScrollViewInsets = false
// extendedLayoutIncludesOpaqueBars = true
// navigationController?.view.backgroundColor = UIColor.white
pagingScrollView.contentInsetAdjustmentBehavior = .never

// Listen for Media falsetifications
NotificationCenter.default.addObserver(
Expand Down Expand Up @@ -383,7 +381,7 @@ func floorcgf(x: CGFloat) -> CGFloat {
toolbar.barTintColor = toolbarBarTintColor
toolbar.backgroundColor = toolbarBackgroundColor
toolbar.alpha = toolbarAlpha
toolbar.barStyle = .blackTranslucent
toolbar.barStyle = .black
toolbar.isTranslucent = true
toolbar.autoresizingMask = [.flexibleTopMargin, .flexibleWidth]

Expand Down Expand Up @@ -643,7 +641,7 @@ func floorcgf(x: CGFloat) -> CGFloat {
}

// Set style
if !leaveStatusBarAlone && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiom.phone {
if !leaveStatusBarAlone && UIDevice.current.userInterfaceIdiom == .phone {
previousStatusBarStyle = UIApplication.shared.statusBarStyle
UIApplication.shared.setStatusBarStyle(statusBarStyle, animated: animated)
}
Expand Down Expand Up @@ -728,7 +726,7 @@ func floorcgf(x: CGFloat) -> CGFloat {
setControlsHidden(hidden: false, animated: false, permanent: true)

// Status bar
if !leaveStatusBarAlone && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiom.phone {
if !leaveStatusBarAlone && UIDevice.current.userInterfaceIdiom == .phone {
UIApplication.shared.setStatusBarStyle(previousStatusBarStyle, animated: animated)
}

Expand Down
3 changes: 1 addition & 2 deletions MediaBrowser/MediaBrowserDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
import UIKit

/// Required delegate to use MediaBrowser
@objc
public protocol MediaBrowserDelegate {
public protocol MediaBrowserDelegate: AnyObject {
//MARK: Required methods

/**
Expand Down
5 changes: 1 addition & 4 deletions MediaBrowser/MediaCaptionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,7 @@ public class MediaCaptionView: UIToolbar {
tintColor = nil
barTintColor = nil
backgroundColor = UIColor.clear
// isOpaque = false
// isTranslucent = true
// clipsToBounds = true
barStyle = .blackTranslucent
barStyle = .black
isTranslucent = true

autoresizingMask =
Expand Down
2 changes: 1 addition & 1 deletion MediaBrowser/MediaZoomingScrollView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ class MediaZoomingScrollView: UIScrollView, UIScrollViewDelegate, TapDetectingIm

// Calculate Max
var maxScale: CGFloat = 3.0
if UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiom.pad {
if UIDevice.current.userInterfaceIdiom == .pad {
// Let them go a bit bigger on a bigger screen!
maxScale = 4.0
}
Expand Down
2 changes: 1 addition & 1 deletion Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform :ios, '8.1'
platform :ios, '13.0'

target 'MediaBrowser' do
use_frameworks!
Expand Down