Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stories: Upgrade Kanvas version #18967

Merged
merged 9 commits into from
Jul 8, 2022
+18 −16
Merged

Stories: Upgrade Kanvas version #18967

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7ae3140
Add camera confirmation color param due to updated Kanvas API.
twstokes Jun 29, 2022
58b08ce
Update calls to UIColor init from hex string which previously relied …
twstokes Jun 29, 2022
3e5ac53
Point to Kanvas PR.
twstokes Jun 30, 2022
74dc36f
Add release note for Kanvas upgrade.
twstokes Jun 30, 2022
a06cee5
Merge remote-tracking branch 'origin/trunk' into fix/multi-export-crash
twstokes Jul 6, 2022
6c3cef4
Bump Stories fix to 20.3
twstokes Jul 6, 2022
aca575d
Point to latest Kanvas commit.
twstokes Jul 6, 2022
1cb63ad
Point to Kanvas 1.4.3
twstokes Jul 8, 2022
4243877
Merge remote-tracking branch 'origin/trunk' into fix/multi-export-crash
twstokes Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => '9dbb644898d6b985d40b528fc3a12cf25b97d206'
twstokes marked this conversation as resolved.
Show resolved Hide resolved
# pod 'Kanvas', :path => '../Kanvas-iOS'
end

Expand Down
15 changes: 10 additions & 5 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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 `9dbb644898d6b985d40b528fc3a12cf25b97d206`)
- MediaEditor (~> 1.2.1)
- MRProgress (= 0.8.3)
- Nimble (~> 9.0.0)
Expand Down Expand Up @@ -619,7 +619,6 @@ SPEC REPOS:
- GTMAppAuth
- GTMSessionFetcher
- JTAppleCalendar
- Kanvas
- MediaEditor
- MRProgress
- Nimble
Expand Down Expand Up @@ -668,6 +667,9 @@ 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:
Expand Down Expand Up @@ -759,6 +761,9 @@ 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
Expand Down Expand Up @@ -791,7 +796,7 @@ SPEC CHECKSUMS:
GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91
Gutenberg: f9c3b0c398c2d1169b6a1cfdeb27ecf15b6f45e7
JTAppleCalendar: 932cadea40b1051beab10f67843451d48ba16c99
Kanvas: 9eab00cc89669b38858d42d5f30c810876b31344
Kanvas: 6355398addfc9856c27cc780cbf54df7cd822ab1
MediaEditor: 20cdeb46bdecd040b8bc94467ac85a52b53b193a
MRProgress: 16de7cc9f347e8846797a770db102a323fe7ef09
Nimble: 7bed62ffabd6dbfe05f5925cbc43722533248990
Expand Down Expand Up @@ -863,6 +868,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37

PODFILE CHECKSUM: 87c70090c27fd39b8403e83f381c4a9ab9bdca5b
PODFILE CHECKSUM: 528f689ba166a24853814b5cc72d9b094a5ec922

COCOAPODS: 1.11.2
2 changes: 1 addition & 1 deletion RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
20.3
-----

* [*] Stories: Fixed a crash that could occur when adding multiple items to a Story post. [#18967]

20.2
-----
Expand Down
1 change: 1 addition & 0 deletions WordPress/Classes/Utility/Kanvas/KanvasCameraCustomUI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
22 changes: 11 additions & 11 deletions WordPress/Classes/ViewRelated/Blog/Site Picker/SiteIconPickerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ struct SiteIconPickerView: View {
var onDismiss: (() -> Void)? = nil

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just FYI - the Site Icon Picker is not currently in production, so these low-risk changes won't affect anything.

@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 {
Expand Down Expand Up @@ -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 {
Expand Down