diff --git a/Podfile b/Podfile index 161ea0c585b9..bc679956373b 100644 --- a/Podfile +++ b/Podfile @@ -55,7 +55,7 @@ def wordpress_kit end def kanvas - pod 'Kanvas', '~> 1.2.7' + pod 'Kanvas', '~> 1.4.3' # pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :tag => '' # pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :commit => '' # pod 'Kanvas', :path => '../Kanvas-iOS' diff --git a/Podfile.lock b/Podfile.lock index 519b1870ce3d..4bdd808ad173 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -64,7 +64,7 @@ PODS: - React-RCTImage (= 0.66.2) - RNTAztecView - JTAppleCalendar (8.0.3) - - Kanvas (1.2.8) + - Kanvas (1.4.3) - MediaEditor (1.2.1): - CropViewController (~> 2.5.3) - MRProgress (0.8.3): @@ -534,7 +534,7 @@ DEPENDENCIES: - Gridicons (~> 1.1.0) - Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, tag `v1.78.1`) - JTAppleCalendar (~> 8.0.2) - - Kanvas (~> 1.2.7) + - Kanvas (~> 1.4.3) - MediaEditor (~> 1.2.1) - MRProgress (= 0.8.3) - Nimble (~> 9.0.0) @@ -788,7 +788,7 @@ SPEC CHECKSUMS: GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 Gutenberg: f9c3b0c398c2d1169b6a1cfdeb27ecf15b6f45e7 JTAppleCalendar: 932cadea40b1051beab10f67843451d48ba16c99 - Kanvas: 9eab00cc89669b38858d42d5f30c810876b31344 + Kanvas: 6355398addfc9856c27cc780cbf54df7cd822ab1 MediaEditor: 20cdeb46bdecd040b8bc94467ac85a52b53b193a MRProgress: 16de7cc9f347e8846797a770db102a323fe7ef09 Nimble: 7bed62ffabd6dbfe05f5925cbc43722533248990 @@ -859,6 +859,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37 -PODFILE CHECKSUM: 79800958b2dc4569f400268535754c141c769eb0 +PODFILE CHECKSUM: ffd0bc26abe4e18299cec53be912cdfb24066c87 COCOAPODS: 1.11.2 diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 86b24f082eba..393ffbe10c51 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,6 @@ 20.3 ----- +* [*] Stories: Fixed a crash that could occur when adding multiple items to a Story post. [#18967] * [*] User Mention: When replying to a post or a comment, the post author or comment author shows up at the top of the suggestions list. [#18979] * [*] Block Editor: Fixed an issue where the media picker search query was being retained after dismissing the picker and opening it again. [#18980] diff --git a/WordPress/Classes/Utility/Kanvas/KanvasCameraCustomUI.swift b/WordPress/Classes/Utility/Kanvas/KanvasCameraCustomUI.swift index fc0ceab8ecd1..0e28c9a937b5 100644 --- a/WordPress/Classes/Utility/Kanvas/KanvasCameraCustomUI.swift +++ b/WordPress/Classes/Utility/Kanvas/KanvasCameraCustomUI.swift @@ -57,6 +57,7 @@ public class KanvasCustomUI { trashColor: Self.brightRed, tooltipBackgroundColor: .systemRed, closeButtonColor: black25, + cameraConfirmationColor: firstPrimary, primaryButtonBackgroundColor: Self.brightRed, permissionsButtonColor: Self.brightBlue, permissionsButtonAcceptedBackgroundColor: UIColor.muriel(color: MurielColor(name: .green, shade: .shade20)), diff --git a/WordPress/Classes/ViewRelated/Blog/Site Picker/SiteIconPickerView.swift b/WordPress/Classes/ViewRelated/Blog/Site Picker/SiteIconPickerView.swift index 39e58305b2bb..2ff48ba5ca86 100644 --- a/WordPress/Classes/ViewRelated/Blog/Site Picker/SiteIconPickerView.swift +++ b/WordPress/Classes/ViewRelated/Blog/Site Picker/SiteIconPickerView.swift @@ -9,7 +9,7 @@ struct SiteIconPickerView: View { var onDismiss: (() -> Void)? = nil @SwiftUI.State private var currentIcon: String? = nil - @SwiftUI.State private var currentBackgroundColor = UIColor(hex: "#969CA1") + @SwiftUI.State private var currentBackgroundColor: UIColor = .init(hexString: "#969CA1") ?? .gray @SwiftUI.State private var scrollOffsetColumn: Int? = nil private var hasMadeSelection: Bool { @@ -314,17 +314,17 @@ struct SiteIconPickerView: View { } private static let backgroundColors = [ - UIColor(hex: "#d1e4dd"), - UIColor(hex: "#d1dfe4"), - UIColor(hex: "#d1d1e4"), - UIColor(hex: "#e4d1d1"), - UIColor(hex: "#e4dad1"), - UIColor(hex: "#eeeadd"), - UIColor(hex: "#ffffff"), - UIColor(hex: "#39414d"), - UIColor(hex: "#28303d"), + UIColor(hexString: "#d1e4dd"), + UIColor(hexString: "#d1dfe4"), + UIColor(hexString: "#d1d1e4"), + UIColor(hexString: "#e4d1d1"), + UIColor(hexString: "#e4dad1"), + UIColor(hexString: "#eeeadd"), + UIColor(hexString: "#ffffff"), + UIColor(hexString: "#39414d"), + UIColor(hexString: "#28303d"), UIColor.black - ] + ].compactMap { $0 } } private struct EmojiColumnView: View {