From 20b2706635f8e0563b827110933ec26c10ec5316 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 10:30:32 +0500 Subject: [PATCH 01/25] update package file --- Package.swift | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Package.swift b/Package.swift index 8ebc2e5..5ac7739 100644 --- a/Package.swift +++ b/Package.swift @@ -3,3 +3,26 @@ import PackageDescription let package = Package( name: "MediaBrowser" ) + + +let package = Package( + name: "MediaBrowser", + platforms: [ + .iOS(.v11) + ], + products: [ + .library( + name: "MediaBrowser", + targets: ["MediaBrowser"]) + ], + dependencies: [ + // Dependencies declare other packages that this package depends on. + ], + targets: [ + .target( + name: "MediaBrowser", + dependencies: [], + path: "MediaBrowser", + ) + ] +) From dc08885199e23dc515ac7393f95bb668233dd22a Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 10:38:13 +0500 Subject: [PATCH 02/25] Update Package.swift --- Package.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Package.swift b/Package.swift index 5ac7739..03c6b8c 100644 --- a/Package.swift +++ b/Package.swift @@ -1,3 +1,4 @@ +// swift-tools-version:5.5 import PackageDescription let package = Package( From 65816989c4d911d837a0b56a9e9a151f7a018cb6 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 10:39:14 +0500 Subject: [PATCH 03/25] Update Package.swift --- Package.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Package.swift b/Package.swift index 03c6b8c..03a723d 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,6 @@ // swift-tools-version:5.5 +// The swift-tools-version declares the minimum version of Swift required to build this package. + import PackageDescription let package = Package( From 776106a7a29ccbbd73ebc078595b6b6e52e58163 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 10:52:20 +0500 Subject: [PATCH 04/25] Update Package.swift --- Package.swift | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Package.swift b/Package.swift index 03a723d..3dcbfa3 100644 --- a/Package.swift +++ b/Package.swift @@ -3,11 +3,6 @@ import PackageDescription -let package = Package( - name: "MediaBrowser" -) - - let package = Package( name: "MediaBrowser", platforms: [ From 08dd716f3b93ac9449edbb1c05bf2403d96f7721 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 10:56:52 +0500 Subject: [PATCH 05/25] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 3dcbfa3..fd9bac4 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let package = Package( .target( name: "MediaBrowser", dependencies: [], - path: "MediaBrowser", + path: "MediaBrowser" ) ] ) From b9a608d83df0367530621ba086e6f71ec9df9481 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 12:32:22 +0500 Subject: [PATCH 06/25] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index fd9bac4..35f3f38 100644 --- a/Package.swift +++ b/Package.swift @@ -14,7 +14,7 @@ let package = Package( targets: ["MediaBrowser"]) ], dependencies: [ - // Dependencies declare other packages that this package depends on. + .package(name: "SDWebImage", url: "https://github.com/SDWebImage/SDWebImage.git", .branch("master")) ], targets: [ .target( From 3ed61743209ed77c21f66dc26cc53b06a8d84b3d Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 12:34:25 +0500 Subject: [PATCH 07/25] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 35f3f38..6c577c2 100644 --- a/Package.swift +++ b/Package.swift @@ -19,7 +19,7 @@ let package = Package( targets: [ .target( name: "MediaBrowser", - dependencies: [], + dependencies: ["SDWebImage"], path: "MediaBrowser" ) ] From 4d9b0b18f36b896b495d8540594519d0ce7cc140 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 14:46:02 +0500 Subject: [PATCH 08/25] Update Package.swift --- Package.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 6c577c2..186fe96 100644 --- a/Package.swift +++ b/Package.swift @@ -14,12 +14,13 @@ let package = Package( targets: ["MediaBrowser"]) ], dependencies: [ - .package(name: "SDWebImage", url: "https://github.com/SDWebImage/SDWebImage.git", .branch("master")) + .package(name: "SDWebImage", url: "https://github.com/SDWebImage/SDWebImage.git", .branch("master")), + .package(name: "UICircularProgressRing", url: "https://github.com/luispadron/UICircularProgressRing.git", .branch("master")) ], targets: [ .target( name: "MediaBrowser", - dependencies: ["SDWebImage"], + dependencies: ["SDWebImage", "UICircularProgressRing"], path: "MediaBrowser" ) ] From 0c646217c9c1bc55893296cea89386be86f520e1 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 14:48:52 +0500 Subject: [PATCH 09/25] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 186fe96..7f9bbd8 100644 --- a/Package.swift +++ b/Package.swift @@ -6,7 +6,7 @@ import PackageDescription let package = Package( name: "MediaBrowser", platforms: [ - .iOS(.v11) + .iOS(.v13) ], products: [ .library( From 62a84c73b4ca42f9c5bcface6282410b7994df38 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 16:37:52 +0500 Subject: [PATCH 10/25] Update UIImageExtension.swift --- MediaBrowser/UIImageExtension.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser/UIImageExtension.swift b/MediaBrowser/UIImageExtension.swift index 636a0d4..666dd4d 100755 --- a/MediaBrowser/UIImageExtension.swift +++ b/MediaBrowser/UIImageExtension.swift @@ -7,7 +7,7 @@ // // -import Foundation +import UIKit public extension UIImage { /// Get bundle Image or return nil when it is not exist From eb9ea31f680b6423ee04efab3dbb88910c909621 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 16:38:24 +0500 Subject: [PATCH 11/25] Update MediaTapDetectingView.swift --- MediaBrowser/MediaTapDetectingView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser/MediaTapDetectingView.swift b/MediaBrowser/MediaTapDetectingView.swift index 6a56014..9c3d7bb 100755 --- a/MediaBrowser/MediaTapDetectingView.swift +++ b/MediaBrowser/MediaTapDetectingView.swift @@ -7,7 +7,7 @@ // // -import Foundation +import UIKit class MediaTapDetectingView: UIView { weak var tapDelegate: TapDetectingViewDelegate? From 998d3f6a705a60ba13e2602141f590f6ddbc9f49 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 16:38:42 +0500 Subject: [PATCH 12/25] Update MediaTapDetectingImageView.swift --- MediaBrowser/MediaTapDetectingImageView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser/MediaTapDetectingImageView.swift b/MediaBrowser/MediaTapDetectingImageView.swift index 281af0c..3f01e53 100755 --- a/MediaBrowser/MediaTapDetectingImageView.swift +++ b/MediaBrowser/MediaTapDetectingImageView.swift @@ -7,7 +7,7 @@ // // -import Foundation +import UIKit class MediaTapDetectingImageView: UIImageView { weak var tapDelegate: TapDetectingImageViewDelegate? From ce2773e56d86c3b5211e57199670e7eae0d42994 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 16:39:04 +0500 Subject: [PATCH 13/25] Update MediaBrowser+UIScrollViewDelegate.swift --- MediaBrowser/MediaBrowser+UIScrollViewDelegate.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser/MediaBrowser+UIScrollViewDelegate.swift b/MediaBrowser/MediaBrowser+UIScrollViewDelegate.swift index a378056..02fbcf3 100644 --- a/MediaBrowser/MediaBrowser+UIScrollViewDelegate.swift +++ b/MediaBrowser/MediaBrowser+UIScrollViewDelegate.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Seungyoun Yi. All rights reserved. // -import Foundation +import UIKit extension MediaBrowser: UIScrollViewDelegate { public func scrollViewDidScroll(_ scrollView: UIScrollView) { From 74eef4d97143628cd966aabe30d610cdd08bebde Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 16:39:26 +0500 Subject: [PATCH 14/25] Update MediaBrowser+Paging.swift --- MediaBrowser/MediaBrowser+Paging.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser/MediaBrowser+Paging.swift b/MediaBrowser/MediaBrowser+Paging.swift index b1af133..9ae918e 100644 --- a/MediaBrowser/MediaBrowser+Paging.swift +++ b/MediaBrowser/MediaBrowser+Paging.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Seungyoun Yi. All rights reserved. // -import Foundation +import UIKit extension MediaBrowser { /** setCurrentIndex to show first. From bf1fd3ef1e0e18fd9f9c330153a07a9a8e24d611 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Wed, 9 Mar 2022 17:18:46 +0500 Subject: [PATCH 15/25] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 7f9bbd8..b0e97b2 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,7 @@ let package = Package( ], dependencies: [ .package(name: "SDWebImage", url: "https://github.com/SDWebImage/SDWebImage.git", .branch("master")), - .package(name: "UICircularProgressRing", url: "https://github.com/luispadron/UICircularProgressRing.git", .branch("master")) + .package(name: "UICircularProgressRing", url: "https://github.com/luispadron/UICircularProgressRing.git", from: "6.3.0") ], targets: [ .target( From b728c35ad34805bbee0ee0ae2f0a763428514e42 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Sun, 20 Mar 2022 09:05:45 +0500 Subject: [PATCH 16/25] Update Package.swift --- Package.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index b0e97b2..f3cb4f9 100644 --- a/Package.swift +++ b/Package.swift @@ -21,7 +21,8 @@ let package = Package( .target( name: "MediaBrowser", dependencies: ["SDWebImage", "UICircularProgressRing"], - path: "MediaBrowser" + path: "MediaBrowser", + resources: ["Info.plist"] ) ] ) From 2d7de7105858b63694c15a98ffb4d6b8a4926f33 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Sun, 20 Mar 2022 09:20:43 +0500 Subject: [PATCH 17/25] Update Package.swift --- Package.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index f3cb4f9..a08457a 100644 --- a/Package.swift +++ b/Package.swift @@ -22,7 +22,9 @@ let package = Package( name: "MediaBrowser", dependencies: ["SDWebImage", "UICircularProgressRing"], path: "MediaBrowser", - resources: ["Info.plist"] + resources: [ + .process("Info.plist") + ] ) ] ) From 42a1513fb58b230fb8142de8a6c4777265f9bc31 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Sun, 20 Mar 2022 09:22:21 +0500 Subject: [PATCH 18/25] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index a08457a..9a7924d 100644 --- a/Package.swift +++ b/Package.swift @@ -23,7 +23,7 @@ let package = Package( dependencies: ["SDWebImage", "UICircularProgressRing"], path: "MediaBrowser", resources: [ - .process("Info.plist") + .process("MediaBrowser/Info.plist") ] ) ] From 4717820377a1a446cf363743c8e5a680bebff287 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Sun, 20 Mar 2022 09:24:33 +0500 Subject: [PATCH 19/25] Update Package.swift --- Package.swift | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 9a7924d..b0e97b2 100644 --- a/Package.swift +++ b/Package.swift @@ -21,10 +21,7 @@ let package = Package( .target( name: "MediaBrowser", dependencies: ["SDWebImage", "UICircularProgressRing"], - path: "MediaBrowser", - resources: [ - .process("MediaBrowser/Info.plist") - ] + path: "MediaBrowser" ) ] ) From 36fdbb6d10160532c9cfbc1449a407a031c53728 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Thu, 26 Feb 2026 20:30:13 +0500 Subject: [PATCH 20/25] Update MediaBrowser.swift --- MediaBrowser/MediaBrowser.swift | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/MediaBrowser/MediaBrowser.swift b/MediaBrowser/MediaBrowser.swift index d51b104..0c9611c 100755 --- a/MediaBrowser/MediaBrowser.swift +++ b/MediaBrowser/MediaBrowser.swift @@ -290,9 +290,7 @@ func floorcgf(x: CGFloat) -> CGFloat { hidesBottomBarWhenPushed = true - automaticallyAdjustsScrollViewInsets = false -// extendedLayoutIncludesOpaqueBars = true -// navigationController?.view.backgroundColor = UIColor.white + pagingScrollView.contentInsetAdjustmentBehavior = .never // Listen for Media falsetifications NotificationCenter.default.addObserver( @@ -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] @@ -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) } @@ -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) } From 1b661c64c08685a8d6b71f001348f4e1d05f0391 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Thu, 26 Feb 2026 20:30:58 +0500 Subject: [PATCH 21/25] Update MediaCaptionView.swift --- MediaBrowser/MediaCaptionView.swift | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/MediaBrowser/MediaCaptionView.swift b/MediaBrowser/MediaCaptionView.swift index 8da550a..13ec471 100755 --- a/MediaBrowser/MediaCaptionView.swift +++ b/MediaBrowser/MediaCaptionView.swift @@ -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 = From 0a2ee35bf0c9bf2ad8fa3d9e5cc3460ecfd99264 Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Thu, 26 Feb 2026 20:31:44 +0500 Subject: [PATCH 22/25] Update MediaZoomingScrollView.swift --- MediaBrowser/MediaZoomingScrollView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser/MediaZoomingScrollView.swift b/MediaBrowser/MediaZoomingScrollView.swift index 91c15b3..b4695b7 100755 --- a/MediaBrowser/MediaZoomingScrollView.swift +++ b/MediaBrowser/MediaZoomingScrollView.swift @@ -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 } From fb81ff62fdd303304a3f9c33604b91a608526b5c Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Thu, 26 Feb 2026 20:33:31 +0500 Subject: [PATCH 23/25] Update MediaBrowserDelegate.swift --- MediaBrowser/MediaBrowserDelegate.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MediaBrowser/MediaBrowserDelegate.swift b/MediaBrowser/MediaBrowserDelegate.swift index 8c58aaf..4704308 100644 --- a/MediaBrowser/MediaBrowserDelegate.swift +++ b/MediaBrowser/MediaBrowserDelegate.swift @@ -9,8 +9,7 @@ import UIKit /// Required delegate to use MediaBrowser -@objc -public protocol MediaBrowserDelegate { +public protocol MediaBrowserDelegate: AnyObject { //MARK: Required methods /** From a4b480f8b6175c3992ffa87ec2d0e9339c79ca4f Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Thu, 26 Feb 2026 20:34:05 +0500 Subject: [PATCH 24/25] Update Podfile --- Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Podfile b/Podfile index d08c445..31fe40b 100644 --- a/Podfile +++ b/Podfile @@ -1,4 +1,4 @@ -platform :ios, '8.1' +platform :ios, '15.6' target 'MediaBrowser' do use_frameworks! From d17667446e2db71d13e6bc211bdb177ae8732bac Mon Sep 17 00:00:00 2001 From: Bonobo23 Date: Thu, 26 Feb 2026 20:35:16 +0500 Subject: [PATCH 25/25] Update project.pbxproj --- MediaBrowser.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.xcodeproj/project.pbxproj b/MediaBrowser.xcodeproj/project.pbxproj index 07b1669..bea76b2 100644 --- a/MediaBrowser.xcodeproj/project.pbxproj +++ b/MediaBrowser.xcodeproj/project.pbxproj @@ -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 = 15.6; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -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 = 15.6; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";