From 7ae3140722c7145d4683ab79fdcc5607f174deb9 Mon Sep 17 00:00:00 2001 From: "Tanner W. Stokes" Date: Wed, 29 Jun 2022 16:54:48 -0400 Subject: [PATCH 1/7] Add camera confirmation color param due to updated Kanvas API. --- WordPress/Classes/Utility/Kanvas/KanvasCameraCustomUI.swift | 1 + 1 file changed, 1 insertion(+) 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)), From 58b08cef59f965714b8f0dda6f9651953ef22f8e Mon Sep 17 00:00:00 2001 From: "Tanner W. Stokes" Date: Wed, 29 Jun 2022 16:56:29 -0400 Subject: [PATCH 2/7] Update calls to UIColor init from hex string which previously relied on the Kanvas library. --- .../Blog/Site Picker/SiteIconPickerView.swift | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 { From 3e5ac53af3e0d4d0f9c3a9fff40aec3fcbdb9a7e Mon Sep 17 00:00:00 2001 From: "Tanner W. Stokes" Date: Thu, 30 Jun 2022 11:29:39 -0400 Subject: [PATCH 3/7] Point to Kanvas PR. --- Podfile | 4 ++-- Podfile.lock | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Podfile b/Podfile index d2ec81a485f8..79eddfdfda11 100644 --- a/Podfile +++ b/Podfile @@ -55,9 +55,9 @@ def wordpress_kit end def kanvas - pod 'Kanvas', '~> 1.2.7' + # pod 'Kanvas', '~> 1.2.7' # pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :tag => '' - # pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :commit => '' + pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :commit => 'c6c78b79beee4daeffa2d6e6f23eae70a01128c8' # pod 'Kanvas', :path => '../Kanvas-iOS' end diff --git a/Podfile.lock b/Podfile.lock index f80ae0c51ef2..3b199c12d9ab 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): @@ -535,7 +535,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 (from `https://github.com/tumblr/Kanvas-iOS.git`, commit `c6c78b79beee4daeffa2d6e6f23eae70a01128c8`) - MediaEditor (~> 1.2.1) - MRProgress (= 0.8.3) - Nimble (~> 9.0.0) @@ -619,7 +619,6 @@ SPEC REPOS: - GTMAppAuth - GTMSessionFetcher - JTAppleCalendar - - Kanvas - MediaEditor - MRProgress - Nimble @@ -668,6 +667,9 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/gutenberg-mobile.git :submodules: true :tag: v1.78.1 + Kanvas: + :commit: c6c78b79beee4daeffa2d6e6f23eae70a01128c8 + :git: https://github.com/tumblr/Kanvas-iOS.git RCT-Folly: :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.78.1/third-party-podspecs/RCT-Folly.podspec.json RCTRequired: @@ -759,6 +761,9 @@ CHECKOUT OPTIONS: :git: https://github.com/wordpress-mobile/gutenberg-mobile.git :submodules: true :tag: v1.78.1 + Kanvas: + :commit: c6c78b79beee4daeffa2d6e6f23eae70a01128c8 + :git: https://github.com/tumblr/Kanvas-iOS.git RNTAztecView: :git: https://github.com/wordpress-mobile/gutenberg-mobile.git :submodules: true @@ -791,7 +796,7 @@ SPEC CHECKSUMS: GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 Gutenberg: f9c3b0c398c2d1169b6a1cfdeb27ecf15b6f45e7 JTAppleCalendar: 932cadea40b1051beab10f67843451d48ba16c99 - Kanvas: 9eab00cc89669b38858d42d5f30c810876b31344 + Kanvas: 6355398addfc9856c27cc780cbf54df7cd822ab1 MediaEditor: 20cdeb46bdecd040b8bc94467ac85a52b53b193a MRProgress: 16de7cc9f347e8846797a770db102a323fe7ef09 Nimble: 7bed62ffabd6dbfe05f5925cbc43722533248990 @@ -863,6 +868,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37 -PODFILE CHECKSUM: 1df6eb961a870ad20226cb5cf90605b232cfc515 +PODFILE CHECKSUM: 6382fe8add023461ba2f27d05b52ade632386fc2 COCOAPODS: 1.11.2 From 74dc36f2dcf800beb73b8d15eec336ce72d79e28 Mon Sep 17 00:00:00 2001 From: "Tanner W. Stokes" Date: Thu, 30 Jun 2022 12:34:22 -0400 Subject: [PATCH 4/7] Add release note for Kanvas upgrade. --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 504934b1b460..ef6678b7127b 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -8,6 +8,7 @@ * [*] Preview: Post preview now resizes to account for device orientation change. [#18921] * [***] [Jetpack-only] Enables QR Code Login scanning from the Me menu. [#18904] * [*] Reverted the app icon back to Cool Blue. Users can reselect last month's icon in Me > App Settings > App Icon if they'd like. [#18934] +* [*] Stories: Fixed a crash that could occur when adding multiple items to a Story post. [#18967] 20.1 ----- From 6c3cef45420e32a52349552b1579ef27b2b488e0 Mon Sep 17 00:00:00 2001 From: "Tanner W. Stokes" Date: Wed, 6 Jul 2022 09:29:22 -0400 Subject: [PATCH 5/7] Bump Stories fix to 20.3 --- RELEASE-NOTES.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index ef6678b7127b..e17cf3ecce5e 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,6 +1,6 @@ 20.3 ----- - +* [*] Stories: Fixed a crash that could occur when adding multiple items to a Story post. [#18967] 20.2 ----- @@ -8,7 +8,6 @@ * [*] Preview: Post preview now resizes to account for device orientation change. [#18921] * [***] [Jetpack-only] Enables QR Code Login scanning from the Me menu. [#18904] * [*] Reverted the app icon back to Cool Blue. Users can reselect last month's icon in Me > App Settings > App Icon if they'd like. [#18934] -* [*] Stories: Fixed a crash that could occur when adding multiple items to a Story post. [#18967] 20.1 ----- From aca575d39f878de8cb669c1e0ce333ad0c191ac4 Mon Sep 17 00:00:00 2001 From: "Tanner W. Stokes" Date: Wed, 6 Jul 2022 09:38:59 -0400 Subject: [PATCH 6/7] Point to latest Kanvas commit. --- Podfile | 2 +- Podfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Podfile b/Podfile index f1767d6f8c0a..d7c47834e243 100644 --- a/Podfile +++ b/Podfile @@ -57,7 +57,7 @@ end def kanvas # pod 'Kanvas', '~> 1.2.7' # pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :tag => '' - pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :commit => 'c6c78b79beee4daeffa2d6e6f23eae70a01128c8' + pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :commit => '9dbb644898d6b985d40b528fc3a12cf25b97d206' # pod 'Kanvas', :path => '../Kanvas-iOS' end diff --git a/Podfile.lock b/Podfile.lock index c719c2db068b..2a6dcd537e9a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -535,7 +535,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 (from `https://github.com/tumblr/Kanvas-iOS.git`, commit `c6c78b79beee4daeffa2d6e6f23eae70a01128c8`) + - Kanvas (from `https://github.com/tumblr/Kanvas-iOS.git`, commit `9dbb644898d6b985d40b528fc3a12cf25b97d206`) - MediaEditor (~> 1.2.1) - MRProgress (= 0.8.3) - Nimble (~> 9.0.0) @@ -668,7 +668,7 @@ EXTERNAL SOURCES: :submodules: true :tag: v1.78.1 Kanvas: - :commit: c6c78b79beee4daeffa2d6e6f23eae70a01128c8 + :commit: 9dbb644898d6b985d40b528fc3a12cf25b97d206 :git: https://github.com/tumblr/Kanvas-iOS.git RCT-Folly: :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.78.1/third-party-podspecs/RCT-Folly.podspec.json @@ -762,7 +762,7 @@ CHECKOUT OPTIONS: :submodules: true :tag: v1.78.1 Kanvas: - :commit: c6c78b79beee4daeffa2d6e6f23eae70a01128c8 + :commit: 9dbb644898d6b985d40b528fc3a12cf25b97d206 :git: https://github.com/tumblr/Kanvas-iOS.git RNTAztecView: :git: https://github.com/wordpress-mobile/gutenberg-mobile.git @@ -868,6 +868,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37 -PODFILE CHECKSUM: 4041486b2068c37efcd010e82da1f41a7c503de4 +PODFILE CHECKSUM: 528f689ba166a24853814b5cc72d9b094a5ec922 COCOAPODS: 1.11.2 From 1cb63ad67de412a9972b6083175a0d1a30f1b28e Mon Sep 17 00:00:00 2001 From: "Tanner W. Stokes" Date: Fri, 8 Jul 2022 09:51:19 -0400 Subject: [PATCH 7/7] Point to Kanvas 1.4.3 --- Podfile | 4 ++-- Podfile.lock | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Podfile b/Podfile index d7c47834e243..92989650a451 100644 --- a/Podfile +++ b/Podfile @@ -55,9 +55,9 @@ 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 => '9dbb644898d6b985d40b528fc3a12cf25b97d206' + # pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :commit => '' # pod 'Kanvas', :path => '../Kanvas-iOS' end diff --git a/Podfile.lock b/Podfile.lock index 2a6dcd537e9a..dd40e2d71ce7 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -535,7 +535,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 (from `https://github.com/tumblr/Kanvas-iOS.git`, commit `9dbb644898d6b985d40b528fc3a12cf25b97d206`) + - Kanvas (~> 1.4.3) - MediaEditor (~> 1.2.1) - MRProgress (= 0.8.3) - Nimble (~> 9.0.0) @@ -619,6 +619,7 @@ SPEC REPOS: - GTMAppAuth - GTMSessionFetcher - JTAppleCalendar + - Kanvas - MediaEditor - MRProgress - Nimble @@ -667,9 +668,6 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/gutenberg-mobile.git :submodules: true :tag: v1.78.1 - Kanvas: - :commit: 9dbb644898d6b985d40b528fc3a12cf25b97d206 - :git: https://github.com/tumblr/Kanvas-iOS.git RCT-Folly: :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.78.1/third-party-podspecs/RCT-Folly.podspec.json RCTRequired: @@ -761,9 +759,6 @@ CHECKOUT OPTIONS: :git: https://github.com/wordpress-mobile/gutenberg-mobile.git :submodules: true :tag: v1.78.1 - Kanvas: - :commit: 9dbb644898d6b985d40b528fc3a12cf25b97d206 - :git: https://github.com/tumblr/Kanvas-iOS.git RNTAztecView: :git: https://github.com/wordpress-mobile/gutenberg-mobile.git :submodules: true @@ -868,6 +863,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37 -PODFILE CHECKSUM: 528f689ba166a24853814b5cc72d9b094a5ec922 +PODFILE CHECKSUM: dcbedf49e1471f4d0692c0fe3b73c62778f4411f COCOAPODS: 1.11.2