Skip to content

Commit 0d43cb0

Browse files
Prep for iOS 16 (#223)
* Don’t render spacer in iOS 16+ * Bump version and build for TestFlight * Bump version and build of action extension * Run SwiftLint on all files for each build This prevents a build warning in Xcode 14 because SwiftLint doesn’t yet support input/output files for these script execution build phases. It’s fast enough, so running it on all files isn’t an issue. * Add missing error handling on login view * Clean up line_length warning * Update change log
1 parent b2f8049 commit 0d43cb0

4 files changed

Lines changed: 28 additions & 12 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3737
- [Mac] Fixed a potential crash if the system keychain wasn't available at app launch.
3838
- [Mac] Cleaned up some straggling project warnings.
3939
- [Mac] Improved error-handling under the hood for better app stability.
40+
- [iOS/Mac] Fixed a bug where the new-post button doesn't appear in the iOS 16 beta.
41+
- [iOS/Mac] Fixed a bug where alerts weren't presented for login errors.
4042

4143
## [1.0.10-ios] - 2022-07-28
4244

Shared/Account/AccountLoginView.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,16 @@ struct AccountLoginView: View {
8888
.padding()
8989
}
9090
}
91+
.onChange(of: model.hasError) { value in
92+
if value {
93+
if let error = model.currentError {
94+
self.errorHandling.handle(error: error)
95+
} else {
96+
self.errorHandling.handle(error: AppError.genericError())
97+
}
98+
model.hasError = false
99+
}
100+
}
91101
}
92102
}
93103

Shared/PostList/PostListView.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@ struct PostListView: View {
3737
)
3838
.toolbar {
3939
ToolbarItem(placement: .primaryAction) {
40-
// We have to add a Spacer as a sibling view to the Button in some kind of Stack, so that any
41-
// a11y modifiers are applied as expected: bug report filed as FB8956392.
4240
ZStack {
43-
Spacer()
41+
// We have to add a Spacer as a sibling view to the Button in some kind of Stack so that any
42+
// a11y modifiers are applied as expected: bug report filed as FB8956392.
43+
if #unavailable(iOS 16) {
44+
Spacer()
45+
}
4446
Button(action: {
4547
let managedPost = model.editor.generateNewLocalPost(withFont: model.preferences.font)
4648
withAnimation {

WriteFreely-MultiPlatform.xcodeproj/project.pbxproj

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -849,6 +849,7 @@
849849
/* Begin PBXShellScriptBuildPhase section */
850850
17DF32C424C87E6700BCE2E3 /* ShellScript */ = {
851851
isa = PBXShellScriptBuildPhase;
852+
alwaysOutOfDate = 1;
852853
buildActionMask = 2147483647;
853854
files = (
854855
);
@@ -866,6 +867,7 @@
866867
};
867868
17DF32C524C87FDB00BCE2E3 /* ShellScript */ = {
868869
isa = PBXShellScriptBuildPhase;
870+
alwaysOutOfDate = 1;
869871
buildActionMask = 2147483647;
870872
files = (
871873
);
@@ -1052,7 +1054,7 @@
10521054
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
10531055
CODE_SIGN_ENTITLEMENTS = "ActionExtension-iOS/ActionExtension-iOS.entitlements";
10541056
CODE_SIGN_STYLE = Automatic;
1055-
CURRENT_PROJECT_VERSION = 673;
1057+
CURRENT_PROJECT_VERSION = 674;
10561058
DEVELOPMENT_TEAM = TPPAB4YBA6;
10571059
GENERATE_INFOPLIST_FILE = YES;
10581060
INFOPLIST_FILE = "ActionExtension-iOS/Info.plist";
@@ -1064,7 +1066,7 @@
10641066
"@executable_path/Frameworks",
10651067
"@executable_path/../../Frameworks",
10661068
);
1067-
MARKETING_VERSION = 1.0.10;
1069+
MARKETING_VERSION = 1.0.11;
10681070
PRODUCT_BUNDLE_IDENTIFIER = "com.abunchtell.WriteFreely-MultiPlatform.ActionExtension-iOS";
10691071
PRODUCT_NAME = "$(TARGET_NAME)";
10701072
SDKROOT = iphoneos;
@@ -1083,7 +1085,7 @@
10831085
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
10841086
CODE_SIGN_ENTITLEMENTS = "ActionExtension-iOS/ActionExtension-iOS.entitlements";
10851087
CODE_SIGN_STYLE = Automatic;
1086-
CURRENT_PROJECT_VERSION = 673;
1088+
CURRENT_PROJECT_VERSION = 674;
10871089
DEVELOPMENT_TEAM = TPPAB4YBA6;
10881090
GENERATE_INFOPLIST_FILE = YES;
10891091
INFOPLIST_FILE = "ActionExtension-iOS/Info.plist";
@@ -1095,7 +1097,7 @@
10951097
"@executable_path/Frameworks",
10961098
"@executable_path/../../Frameworks",
10971099
);
1098-
MARKETING_VERSION = 1.0.10;
1100+
MARKETING_VERSION = 1.0.11;
10991101
PRODUCT_BUNDLE_IDENTIFIER = "com.abunchtell.WriteFreely-MultiPlatform.ActionExtension-iOS";
11001102
PRODUCT_NAME = "$(TARGET_NAME)";
11011103
SDKROOT = iphoneos;
@@ -1226,7 +1228,7 @@
12261228
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
12271229
CODE_SIGN_ENTITLEMENTS = "WriteFreely-MultiPlatform (iOS).entitlements";
12281230
CODE_SIGN_STYLE = Automatic;
1229-
CURRENT_PROJECT_VERSION = 673;
1231+
CURRENT_PROJECT_VERSION = 674;
12301232
DEVELOPMENT_TEAM = TPPAB4YBA6;
12311233
ENABLE_PREVIEWS = YES;
12321234
INFOPLIST_FILE = iOS/Info.plist;
@@ -1235,7 +1237,7 @@
12351237
"$(inherited)",
12361238
"@executable_path/Frameworks",
12371239
);
1238-
MARKETING_VERSION = 1.0.10;
1240+
MARKETING_VERSION = 1.0.11;
12391241
PRODUCT_BUNDLE_IDENTIFIER = "com.abunchtell.WriteFreely-MultiPlatform";
12401242
PRODUCT_NAME = "WriteFreely-MultiPlatform";
12411243
SDKROOT = iphoneos;
@@ -1252,7 +1254,7 @@
12521254
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
12531255
CODE_SIGN_ENTITLEMENTS = "WriteFreely-MultiPlatform (iOS).entitlements";
12541256
CODE_SIGN_STYLE = Automatic;
1255-
CURRENT_PROJECT_VERSION = 673;
1257+
CURRENT_PROJECT_VERSION = 674;
12561258
DEVELOPMENT_TEAM = TPPAB4YBA6;
12571259
ENABLE_PREVIEWS = YES;
12581260
INFOPLIST_FILE = iOS/Info.plist;
@@ -1261,7 +1263,7 @@
12611263
"$(inherited)",
12621264
"@executable_path/Frameworks",
12631265
);
1264-
MARKETING_VERSION = 1.0.10;
1266+
MARKETING_VERSION = 1.0.11;
12651267
PRODUCT_BUNDLE_IDENTIFIER = "com.abunchtell.WriteFreely-MultiPlatform";
12661268
PRODUCT_NAME = "WriteFreely-MultiPlatform";
12671269
SDKROOT = iphoneos;

0 commit comments

Comments
 (0)