Skip to content

Commit 716c925

Browse files
committed
Fix Kanvas for iPad issues
1 parent e874813 commit 716c925

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ end
5757
def kanvas
5858
#pod 'Kanvas', '~> 1.2.5'
5959
#pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :tag => ''
60-
pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :commit => '797d7cc'
60+
pod 'Kanvas', :git => 'https://github.com/tumblr/Kanvas-iOS.git', :commit => 'b2d90a'
6161
#pod 'Kanvas', :path => '../Kanvas-iOS'
6262
end
6363

Podfile.lock

+3-7
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ DEPENDENCIES:
452452
- Gridicons (~> 1.1.0)
453453
- Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, tag `v1.50.0`)
454454
- JTAppleCalendar (~> 8.0.2)
455-
- Kanvas (from `https://github.com/tumblr/Kanvas-iOS.git`, commit `797d7cc`)
455+
- Kanvas (from `../Kanvas-iOS`)
456456
- MediaEditor (~> 1.2.1)
457457
- MRProgress (= 0.8.3)
458458
- Nimble (~> 7.3.1)
@@ -581,8 +581,7 @@ EXTERNAL SOURCES:
581581
:submodules: true
582582
:tag: v1.50.0
583583
Kanvas:
584-
:commit: 797d7cc
585-
:git: https://github.com/tumblr/Kanvas-iOS.git
584+
:path: "../Kanvas-iOS"
586585
RCTRequired:
587586
:podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.50.0/third-party-podspecs/RCTRequired.podspec.json
588587
RCTTypeSafety:
@@ -664,9 +663,6 @@ CHECKOUT OPTIONS:
664663
:git: https://github.com/wordpress-mobile/gutenberg-mobile.git
665664
:submodules: true
666665
:tag: v1.50.0
667-
Kanvas:
668-
:commit: 797d7cc
669-
:git: https://github.com/tumblr/Kanvas-iOS.git
670666
RNTAztecView:
671667
:git: https://github.com/wordpress-mobile/gutenberg-mobile.git
672668
:submodules: true
@@ -768,6 +764,6 @@ SPEC CHECKSUMS:
768764
ZendeskSupportSDK: e100a7a0a1bb5d7d43abbde3338727d985a4986d
769765
ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
770766

771-
PODFILE CHECKSUM: ddd74e3316cbc54094674658e059c53e867163b5
767+
PODFILE CHECKSUM: 413e06e1f14408a36b8f952b1d8d0736101ddaf7
772768

773769
COCOAPODS: 1.10.0

WordPress/Classes/Services/Stories/StoryEditor.swift

+2
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ class StoryEditor: CameraController {
8686
settings.exportStopMotionPhotoAsVideo = false
8787
settings.fontSelectorUsesFont = true
8888
settings.aspectRatio = 9/16
89+
settings.showShadowOverMediaClips = false
8990

9091
return settings
9192
}
@@ -141,6 +142,7 @@ class StoryEditor: CameraController {
141142
Kanvas.KanvasColors.shared = KanvasCustomUI.shared.cameraColors()
142143
Kanvas.KanvasFonts.shared = KanvasCustomUI.shared.cameraFonts()
143144
Kanvas.KanvasImages.shared = KanvasCustomUI.shared.cameraImages()
145+
Kanvas.KanvasEditorDesign.shared = Kanvas.KanvasEditorDesign.storiesDesign
144146
Kanvas.KanvasStrings.shared = KanvasStrings(
145147
cameraPermissionsTitleLabel: NSLocalizedString("Post to WordPress", comment: "Title of camera permissions screen"),
146148
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")

0 commit comments

Comments
 (0)