Skip to content

Commit

Permalink
Fix Kanvas for iPad issues
Browse files Browse the repository at this point in the history
  • Loading branch information
bjtitus committed Apr 30, 2021
1 parent e874813 commit 716c925
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ end
def kanvas
#pod 'Kanvas', '~> 1.2.5'
#pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :tag => ''
pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :commit => '797d7cc'
pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :commit => 'b2d90a'
#pod 'Kanvas', :path => '../Kanvas-iOS'
end

Expand Down
10 changes: 3 additions & 7 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ DEPENDENCIES:
- Gridicons (~> 1.1.0)
- Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, tag `v1.50.0`)
- JTAppleCalendar (~> 8.0.2)
- Kanvas (from `https://github.com/tumblr/Kanvas-iOS.git`, commit `797d7cc`)
- Kanvas (from `../Kanvas-iOS`)
- MediaEditor (~> 1.2.1)
- MRProgress (= 0.8.3)
- Nimble (~> 7.3.1)
Expand Down Expand Up @@ -581,8 +581,7 @@ EXTERNAL SOURCES:
:submodules: true
:tag: v1.50.0
Kanvas:
:commit: 797d7cc
:git: https://github.com/tumblr/Kanvas-iOS.git
:path: "../Kanvas-iOS"
RCTRequired:
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.50.0/third-party-podspecs/RCTRequired.podspec.json
RCTTypeSafety:
Expand Down Expand Up @@ -664,9 +663,6 @@ CHECKOUT OPTIONS:
:git: https://github.com/wordpress-mobile/gutenberg-mobile.git
:submodules: true
:tag: v1.50.0
Kanvas:
:commit: 797d7cc
:git: https://github.com/tumblr/Kanvas-iOS.git
RNTAztecView:
:git: https://github.com/wordpress-mobile/gutenberg-mobile.git
:submodules: true
Expand Down Expand Up @@ -768,6 +764,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: e100a7a0a1bb5d7d43abbde3338727d985a4986d
ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e

PODFILE CHECKSUM: ddd74e3316cbc54094674658e059c53e867163b5
PODFILE CHECKSUM: 413e06e1f14408a36b8f952b1d8d0736101ddaf7

COCOAPODS: 1.10.0
2 changes: 2 additions & 0 deletions WordPress/Classes/Services/Stories/StoryEditor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ class StoryEditor: CameraController {
settings.exportStopMotionPhotoAsVideo = false
settings.fontSelectorUsesFont = true
settings.aspectRatio = 9/16
settings.showShadowOverMediaClips = false

return settings
}
Expand Down Expand Up @@ -141,6 +142,7 @@ class StoryEditor: CameraController {
Kanvas.KanvasColors.shared = KanvasCustomUI.shared.cameraColors()
Kanvas.KanvasFonts.shared = KanvasCustomUI.shared.cameraFonts()
Kanvas.KanvasImages.shared = KanvasCustomUI.shared.cameraImages()
Kanvas.KanvasEditorDesign.shared = Kanvas.KanvasEditorDesign.storiesDesign
Kanvas.KanvasStrings.shared = KanvasStrings(
cameraPermissionsTitleLabel: NSLocalizedString("Post to WordPress", comment: "Title of camera permissions screen"),
cameraPermissionsDescriptionLabel: NSLocalizedString("Allow access so you can start taking photos and videos.", comment: "Message on camera permissions screen to explain why the app needs camera and microphone permissions")
Expand Down

0 comments on commit 716c925

Please sign in to comment.