diff --git a/Open in Slide/Info.plist b/Open in Slide/Info.plist index 2dbb6d591..fac809b2a 100644 --- a/Open in Slide/Info.plist +++ b/Open in Slide/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 198 + $(CURRENT_PROJECT_VERSION) NSExtension NSExtensionAttributes diff --git a/Slide Screenshot Automation/Info.plist b/Slide Screenshot Automation/Info.plist index af4b87ebd..3737c3d26 100644 --- a/Slide Screenshot Automation/Info.plist +++ b/Slide Screenshot Automation/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 198 + 199 diff --git a/Slide Widgets/Info.plist b/Slide Widgets/Info.plist index f735550e3..0b00c7574 100644 --- a/Slide Widgets/Info.plist +++ b/Slide Widgets/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 198 + $(CURRENT_PROJECT_VERSION) NSExtension IntentsSupported diff --git a/Slide for Apple Watch Extension/Info.plist b/Slide for Apple Watch Extension/Info.plist index 7d01c0850..d944df1c0 100644 --- a/Slide for Apple Watch Extension/Info.plist +++ b/Slide for Apple Watch Extension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 198 + $(CURRENT_PROJECT_VERSION) NSExtension NSExtensionAttributes diff --git a/Slide for Apple Watch/Info.plist b/Slide for Apple Watch/Info.plist index 99747d6c8..e42b62533 100644 --- a/Slide for Apple Watch/Info.plist +++ b/Slide for Apple Watch/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 198 + $(CURRENT_PROJECT_VERSION) UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/Slide for Reddit.xcodeproj/project.pbxproj b/Slide for Reddit.xcodeproj/project.pbxproj index 4fc26c574..4cb829118 100644 --- a/Slide for Reddit.xcodeproj/project.pbxproj +++ b/Slide for Reddit.xcodeproj/project.pbxproj @@ -2539,7 +2539,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 198; + CURRENT_PROJECT_VERSION = 200; DEVELOPMENT_TEAM = FTT89576VQ; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = WidgetConfigIntent/Info.plist; @@ -2549,7 +2549,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 6.0.2; + MARKETING_VERSION = 6.0.6; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(USR_BASE_IDENTIFIER).WidgetConfigIntent"; @@ -2572,7 +2572,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 198; + CURRENT_PROJECT_VERSION = 200; DEVELOPMENT_TEAM = FTT89576VQ; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = WidgetConfigIntent/Info.plist; @@ -2582,7 +2582,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 6.0.2; + MARKETING_VERSION = 6.0.6; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ccrama.me.redditslide.bundledwidgetconfigintent; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2606,12 +2606,12 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 198; + CURRENT_PROJECT_VERSION = 200; DEVELOPMENT_TEAM = FTT89576VQ; GCC_C_LANGUAGE_STANDARD = gnu11; IBSC_MODULE = Slide_for_Apple_Watch_Extension; INFOPLIST_FILE = "Slide for Apple Watch/Info.plist"; - MARKETING_VERSION = 6.0.2; + MARKETING_VERSION = 6.0.6; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(USR_BASE_IDENTIFIER).watchkitapp"; @@ -2639,12 +2639,12 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 198; + CURRENT_PROJECT_VERSION = 200; DEVELOPMENT_TEAM = ""; GCC_C_LANGUAGE_STANDARD = gnu11; IBSC_MODULE = Slide_for_Apple_Watch_Extension; INFOPLIST_FILE = "Slide for Apple Watch/Info.plist"; - MARKETING_VERSION = 6.0.2; + MARKETING_VERSION = 6.0.6; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ccrama.me.redditslide.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2667,7 +2667,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 198; + CURRENT_PROJECT_VERSION = 200; DEVELOPMENT_TEAM = FTT89576VQ; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Slide for Apple Watch Extension/Info.plist"; @@ -2676,7 +2676,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 6.0.2; + MARKETING_VERSION = 6.0.6; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(USR_BASE_IDENTIFIER).watchkitapp.watchkitextension"; @@ -2700,7 +2700,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 198; + CURRENT_PROJECT_VERSION = 200; DEVELOPMENT_TEAM = ""; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Slide for Apple Watch Extension/Info.plist"; @@ -2709,7 +2709,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 6.0.2; + MARKETING_VERSION = 6.0.6; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ccrama.me.redditslide.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; @@ -2734,7 +2734,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 198; + CURRENT_PROJECT_VERSION = 200; DEVELOPMENT_TEAM = FTT89576VQ; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Open in Slide/Info.plist"; @@ -2744,7 +2744,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 6.0.2; + MARKETING_VERSION = 6.0.6; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(USR_BASE_IDENTIFIER).Open-in-Slide"; @@ -2766,7 +2766,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 198; + CURRENT_PROJECT_VERSION = 200; DEVELOPMENT_TEAM = FTT89576VQ; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Open in Slide/Info.plist"; @@ -2776,7 +2776,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 6.0.2; + MARKETING_VERSION = 6.0.6; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "ccrama.me.redditslide.bundledOpen-in-Slide"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2921,7 +2921,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 198; + CURRENT_PROJECT_VERSION = 200; DEVELOPMENT_TEAM = FTT89576VQ; GCC_WARN_UNUSED_PARAMETER = YES; INFOPLIST_FILE = "Slide for Reddit/Info.plist"; @@ -2930,7 +2930,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 6.0.2; + MARKETING_VERSION = 6.0.6; OTHER_LDFLAGS = ( "$(inherited)", "-framework", @@ -2959,7 +2959,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 198; + CURRENT_PROJECT_VERSION = 200; DEVELOPMENT_TEAM = FTT89576VQ; GCC_OPTIMIZATION_LEVEL = fast; GCC_WARN_UNUSED_PARAMETER = YES; @@ -2969,7 +2969,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 6.0.2; + MARKETING_VERSION = 6.0.6; OTHER_LDFLAGS = ( "$(inherited)", "-framework", @@ -3136,7 +3136,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 198; + CURRENT_PROJECT_VERSION = 200; DEVELOPMENT_TEAM = FTT89576VQ; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Slide Widgets/Info.plist"; @@ -3146,7 +3146,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 6.0.2; + MARKETING_VERSION = 6.0.6; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "$(USR_BASE_IDENTIFIER).widgets"; @@ -3171,7 +3171,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 198; + CURRENT_PROJECT_VERSION = 200; DEVELOPMENT_TEAM = FTT89576VQ; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Slide Widgets/Info.plist"; @@ -3181,7 +3181,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 6.0.2; + MARKETING_VERSION = 6.0.6; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = ccrama.me.redditslide.bundledwidgets; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Slide for Reddit.xcodeproj/xcshareddata/xcschemes/Slide for Apple Watch.xcscheme b/Slide for Reddit.xcodeproj/xcshareddata/xcschemes/Slide for Apple Watch.xcscheme index 364ccce16..457a888c0 100644 --- a/Slide for Reddit.xcodeproj/xcshareddata/xcschemes/Slide for Apple Watch.xcscheme +++ b/Slide for Reddit.xcodeproj/xcshareddata/xcschemes/Slide for Apple Watch.xcscheme @@ -65,8 +65,10 @@ debugServiceExtension = "internal" allowLocationSimulation = "YES" notificationPayloadFile = "Slide for Apple Watch Extension/PushNotificationPayload.apns"> - + - + - + - + + + + + diff --git a/Slide for Reddit.xcodeproj/xcuserdata/carloscrane.xcuserdatad/xcschemes/xcschememanagement.plist b/Slide for Reddit.xcodeproj/xcuserdata/carloscrane.xcuserdatad/xcschemes/xcschememanagement.plist index 697122f5a..26b134c9a 100644 --- a/Slide for Reddit.xcodeproj/xcuserdata/carloscrane.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Slide for Reddit.xcodeproj/xcuserdata/carloscrane.xcuserdatad/xcschemes/xcschememanagement.plist @@ -27,7 +27,7 @@ Slide Widgets.xcscheme_^#shared#^_ orderHint - 54 + 42 Slide for Apple Watch (Notification).xcscheme @@ -52,7 +52,7 @@ WidgetConfigIntent.xcscheme_^#shared#^_ orderHint - 55 + 43 diff --git a/Slide for Reddit/AppDelegate.swift b/Slide for Reddit/AppDelegate.swift index 32002cda6..2df0932c5 100644 --- a/Slide for Reddit/AppDelegate.swift +++ b/Slide for Reddit/AppDelegate.swift @@ -459,7 +459,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { return main } - + @available(iOS 14.0, *) func resetSplit14(_ main: SplitMainViewController, window: UIWindow, _ split: Bool) { let style: UISplitViewController.Style = SettingValues.appMode == .SPLIT || split ? .tripleColumn : .doubleColumn @@ -495,10 +495,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate { // Set display mode and split behavior if splitViewController.style != .tripleColumn { - splitViewController.preferredDisplayMode = .secondaryOnly + splitViewController.preferredDisplayMode = .primaryOverlay splitViewController.preferredSplitBehavior = .overlay } else { - splitViewController.preferredDisplayMode = .secondaryOnly + splitViewController.preferredDisplayMode = .primaryOverlay splitViewController.preferredSplitBehavior = .displace } diff --git a/Slide for Reddit/Info.plist b/Slide for Reddit/Info.plist index d78dda265..c1dd3850a 100644 --- a/Slide for Reddit/Info.plist +++ b/Slide for Reddit/Info.plist @@ -404,7 +404,7 @@ CFBundleVersion - 198 + $(CURRENT_PROJECT_VERSION) LSApplicationCategoryType LSApplicationQueriesSchemes diff --git a/Slide for Reddit/PlaceholderViewController.swift b/Slide for Reddit/PlaceholderViewController.swift index c956d255c..ac731e712 100644 --- a/Slide for Reddit/PlaceholderViewController.swift +++ b/Slide for Reddit/PlaceholderViewController.swift @@ -43,6 +43,11 @@ class PlaceholderViewController: UIViewController { label.centerXAnchor == view.centerXAnchor label.topAnchor == imageView.bottomAnchor + 12 } + + override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) { + super.viewWillTransition(to: size, with: coordinator) + self.splitViewController?.preferredDisplayMode = .allVisible + } } extension UIImage { func convertToGrayScale() -> UIImage { diff --git a/Slide for Reddit/SettingsViewMode.swift b/Slide for Reddit/SettingsViewMode.swift index b381b3e71..0bec9f495 100644 --- a/Slide for Reddit/SettingsViewMode.swift +++ b/Slide for Reddit/SettingsViewMode.swift @@ -90,9 +90,8 @@ class SettingsViewMode: BubbleSettingTableViewController { createCell(subredditBar, subredditBarSwitch, isOn: !SettingValues.fullWidthHeaderCells, text: "Swipable subreddit bar on homepage") createCell(thireenPopup, thireenPopupSwitch, isOn: SettingValues.disable13Popup, text: "Disable iOS 13 popup behavior") - createCell(disablePopupSubreddit, disablePopupSubredditSwitch, isOn: SettingValues.disable13Popup, text: "Show subreddits full screen") + createCell(disablePopupSubreddit, disablePopupSubredditSwitch, isOn: SettingValues.disableSubredditPopupIpad, text: "Show subreddits full screen") createCell(disablePopup, disablePopupSwitch, isOn: SettingValues.disablePopupIpad, text: "Show comments full screen") - createCell(disablePopup, disablePopupSwitch, isOn: SettingValues.disableSubredditPopupIpad, text: "Show subreddits full screen") createCell(disableMulticolumn, disableMulticolumnSwitch, isOn: !SettingValues.disableMulticolumnCollections, text: "Multi-column in profile and inbox") createCell(singleMode, isOn: false, text: "Single-column posts") createCell(multicolumnMode, isOn: false, text: "Multi-column posts") diff --git a/Slide for Reddit/SplitMainViewController.swift b/Slide for Reddit/SplitMainViewController.swift index 5a8e2aaa4..ce6ea55cb 100644 --- a/Slide for Reddit/SplitMainViewController.swift +++ b/Slide for Reddit/SplitMainViewController.swift @@ -283,7 +283,7 @@ class SplitMainViewController: MainViewController { override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) { drawerButton.frame = CGRect(x: 8, y: size.height - 48, width: 40, height: 40) inHeadView.removeFromSuperview() - + doButtons() super.viewWillTransition(to: size, with: coordinator) DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) { @@ -296,7 +296,7 @@ class SplitMainViewController: MainViewController { return } if UIDevice.current.userInterfaceIdiom == .pad && SettingValues.appMode != .SPLIT { - if abs(size.width - oldSize.width) > 10 && abs(size.width - oldSize.height) > 10 { //Size changed, but not orientation + if abs(size.width - oldSize.width) > 40 && abs(size.width - oldSize.height) > 40 { //Size changed, but not orientation resetForSplit(size) } } @@ -550,7 +550,7 @@ class SplitMainViewController: MainViewController { if self.finalSubs.contains(subreddit) && !override { let index = self.finalSubs.firstIndex(of: subreddit) if index == nil { - if UIDevice.current.userInterfaceIdiom == .pad && !SettingValues.disableSubredditPopupIpad { + if UIDevice.current.userInterfaceIdiom == .pad && SettingValues.disableSubredditPopupIpad { if self.navigationController?.topViewController != self && !(self.navigationController?.topViewController is NavigationHomeViewController) { self.navigationController?.popToRootViewController(animated: false) } @@ -596,7 +596,7 @@ class SplitMainViewController: MainViewController { self.navigationController?.popToRootViewController(animated: false) } - if UIDevice.current.userInterfaceIdiom == .pad { + if UIDevice.current.userInterfaceIdiom == .pad && SettingValues.disableSubredditPopupIpad { VCPresenter.showVC(viewController: SingleSubredditViewController(subName: subreddit.replacingOccurrences(of: " ", with: ""), single: true), popupIfPossible: false, parentNavigationController: self.navigationController, parentViewController: self) } else { VCPresenter.openRedditLink("/r/" + subreddit.replacingOccurrences(of: " ", with: ""), self.navigationController, self) @@ -1097,7 +1097,7 @@ extension SplitMainViewController: NavigationHomeDelegate { toExecute?() } - if let nav = homeViewController.navigationController as? SwipeForwardNavigationController, nav.pushableViewControllers.count > 0 { + if let nav = homeViewController.navigationController as? SwipeForwardNavigationController, nav.pushableViewControllers.count > 0, nav.pushableViewControllers.first is SplitMainViewController { nav.pushNextViewControllerFromRight() { } } else { diff --git a/Slide for RedditTests/Info.plist b/Slide for RedditTests/Info.plist index f51d3d5cc..9b17f0a64 100644 --- a/Slide for RedditTests/Info.plist +++ b/Slide for RedditTests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 198 + 199 diff --git a/Slide for RedditUITests/Info.plist b/Slide for RedditUITests/Info.plist index f51d3d5cc..9b17f0a64 100644 --- a/Slide for RedditUITests/Info.plist +++ b/Slide for RedditUITests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 198 + 199 diff --git a/WidgetConfigIntent/Info.plist b/WidgetConfigIntent/Info.plist index 52fe070cc..2103eebd0 100644 --- a/WidgetConfigIntent/Info.plist +++ b/WidgetConfigIntent/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 198 + $(CURRENT_PROJECT_VERSION) NSExtension NSExtensionAttributes diff --git a/fastlane/report.xml b/fastlane/report.xml index d25741988..11b308cb4 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +