From bad3677b550d6065be3d97e9058f517b539f123e Mon Sep 17 00:00:00 2001
From: Brandon Titus <b@titus.io>
Date: Thu, 29 Apr 2021 18:51:29 -0600
Subject: [PATCH] Fix Kanvas for iPad issues

---
 Podfile                                              | 2 +-
 Podfile.lock                                         | 8 ++++----
 WordPress/Classes/Services/Stories/StoryEditor.swift | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Podfile b/Podfile
index 6cf86febf4bd..df94a76a0ee3 100644
--- a/Podfile
+++ b/Podfile
@@ -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
 
diff --git a/Podfile.lock b/Podfile.lock
index 9c187aa3ab3f..1b9d9619d061 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -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 `https://github.com/tumblr/Kanvas-iOS.git`, commit `b2d90a`)
   - MediaEditor (~> 1.2.1)
   - MRProgress (= 0.8.3)
   - Nimble (~> 7.3.1)
@@ -581,7 +581,7 @@ EXTERNAL SOURCES:
     :submodules: true
     :tag: v1.50.0
   Kanvas:
-    :commit: 797d7cc
+    :commit: b2d90a
     :git: https://github.com/tumblr/Kanvas-iOS.git
   RCTRequired:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.50.0/third-party-podspecs/RCTRequired.podspec.json
@@ -665,7 +665,7 @@ CHECKOUT OPTIONS:
     :submodules: true
     :tag: v1.50.0
   Kanvas:
-    :commit: 797d7cc
+    :commit: b2d90a
     :git: https://github.com/tumblr/Kanvas-iOS.git
   RNTAztecView:
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
@@ -768,6 +768,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: e100a7a0a1bb5d7d43abbde3338727d985a4986d
   ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
 
-PODFILE CHECKSUM: ddd74e3316cbc54094674658e059c53e867163b5
+PODFILE CHECKSUM: 431fc0a0b74cbe0aaa5d158fe9d2a1c9d17a1deb
 
 COCOAPODS: 1.10.0
diff --git a/WordPress/Classes/Services/Stories/StoryEditor.swift b/WordPress/Classes/Services/Stories/StoryEditor.swift
index 1dc06533179c..9c2dc08fcc68 100644
--- a/WordPress/Classes/Services/Stories/StoryEditor.swift
+++ b/WordPress/Classes/Services/Stories/StoryEditor.swift
@@ -86,6 +86,7 @@ class StoryEditor: CameraController {
         settings.exportStopMotionPhotoAsVideo = false
         settings.fontSelectorUsesFont = true
         settings.aspectRatio = 9/16
+        settings.showShadowOverMediaClips = false
 
         return settings
     }
@@ -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")