Skip to content

Commit

Permalink
Update version number, Fix more Split View bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@ccrama
ccrama committed Oct 20, 2020
1 parent fe0a235 commit 4dd9163
Show file tree
Hide file tree
Showing 17 changed files with 71 additions and 54 deletions.
2 changes: 1 addition & 1 deletion Open in Slide/Info.plist
View file
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>198</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
Expand Down
2 changes: 1 addition & 1 deletion Slide Screenshot Automation/Info.plist
View file
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>198</string>
<string>199</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Slide Widgets/Info.plist
View file
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>198</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSExtension</key>
<dict>
<key>IntentsSupported</key>
Expand Down
2 changes: 1 addition & 1 deletion Slide for Apple Watch Extension/Info.plist
View file
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>198</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
Expand Down
2 changes: 1 addition & 1 deletion Slide for Apple Watch/Info.plist
View file
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>198</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
Expand Down
48 changes: 24 additions & 24 deletions Slide for Reddit.xcodeproj/project.pbxproj
View file
Expand Up @@ -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;
Expand All @@ -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";
Expand All @@ -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;
Expand All @@ -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)";
Expand All @@ -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";
Expand Down Expand Up @@ -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)";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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}";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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)";
Expand Down Expand Up @@ -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";
Expand All @@ -2930,7 +2930,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 6.0.2;
MARKETING_VERSION = 6.0.6;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
Expand Down Expand Up @@ -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;
Expand All @@ -2969,7 +2969,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 6.0.2;
MARKETING_VERSION = 6.0.6;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
Expand Down Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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)";
Expand Down
25 changes: 19 additions & 6 deletions Slide for Reddit.xcodeproj/xcshareddata/xcschemes/Slide for Apple Watch.xcscheme
View file
Expand Up @@ -65,33 +65,46 @@
debugServiceExtension = "internal"
allowLocationSimulation = "YES"
notificationPayloadFile = "Slide for Apple Watch Extension/PushNotificationPayload.apns">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<RemoteRunnable
runnableDebuggingMode = "2"
BundleIdentifier = "com.apple.Carousel"
RemotePath = "/Slide for Reddit">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BE20851021588F3900D8F33C"
BuildableName = "Slide for Apple Watch.app"
BlueprintName = "Slide for Apple Watch"
ReferencedContainer = "container:Slide for Reddit.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</RemoteRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<RemoteRunnable
runnableDebuggingMode = "2"
BundleIdentifier = "com.apple.Carousel"
RemotePath = "/Slide for Reddit">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BE20851021588F3900D8F33C"
BuildableName = "Slide for Apple Watch.app"
BlueprintName = "Slide for Apple Watch"
ReferencedContainer = "container:Slide for Reddit.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</RemoteRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BE20851021588F3900D8F33C"
BuildableName = "Slide for Apple Watch.app"
BlueprintName = "Slide for Apple Watch"
ReferencedContainer = "container:Slide for Reddit.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
Expand Down
4 changes: 2 additions & 2 deletions ...or Reddit.xcodeproj/xcuserdata/carloscrane.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Expand Up @@ -27,7 +27,7 @@
<key>Slide Widgets.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>54</integer>
<integer>42</integer>
</dict>
<key>Slide for Apple Watch (Notification).xcscheme</key>
<dict>
Expand All @@ -52,7 +52,7 @@
<key>WidgetConfigIntent.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>55</integer>
<integer>43</integer>
</dict>
</dict>
</dict>
Expand Down
6 changes: 3 additions & 3 deletions Slide for Reddit/AppDelegate.swift
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion Slide for Reddit/Info.plist
View file
Expand Up @@ -404,7 +404,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>198</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSApplicationCategoryType</key>
<string></string>
<key>LSApplicationQueriesSchemes</key>
Expand Down
5 changes: 5 additions & 0 deletions Slide for Reddit/PlaceholderViewController.swift
View file
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions Slide for Reddit/SettingsViewMode.swift
View file
Expand Up @@ -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")
Expand Down

0 comments on commit 4dd9163

Please sign in to comment.