diff --git a/Cards.podspec b/Cards.podspec index 0e58113..d5ae011 100644 --- a/Cards.podspec +++ b/Cards.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Cards' - s.version = '1.3.1' + s.version = '1.3.4' s.summary = 'Awesome iOS 11 appstore cards in swift 4.' s.homepage = 'https://github.com/PaoloCuscela/Cards' s.screenshots = 'https://raw.githubusercontent.com/PaoloCuscela/Cards/master/Images/Header.png', 'https://raw.githubusercontent.com/PaoloCuscela/Cards/master/Images/DetailView.gif' diff --git a/Cards/Sources/DetailViewController.swift b/Cards/Sources/DetailViewController.swift index cc05dca..dfa0bf0 100644 --- a/Cards/Sources/DetailViewController.swift +++ b/Cards/Sources/DetailViewController.swift @@ -136,7 +136,7 @@ internal class DetailViewController: UIViewController { // Layout for present in non-fullscreen } else { - scrollView.frame.size = CGSize(width: LayoutHelper.XScreen(85), height: LayoutHelper.YScreen(100) - 20) + scrollView.frame.size = CGSize(width: LayoutHelper.YScreen(90), height: LayoutHelper.XScreen(100) - 20) scrollView.center = blurView.center scrollView.frame.origin.y = 40 } diff --git a/Cards/Sources/LayoutHelper.swift b/Cards/Sources/LayoutHelper.swift index 234d332..c824b31 100644 --- a/Cards/Sources/LayoutHelper.swift +++ b/Cards/Sources/LayoutHelper.swift @@ -55,20 +55,16 @@ open class LayoutHelper { static open func XScreen(_ percentage: CGFloat) -> CGFloat { - if UIDevice.current.orientation == .landscapeLeft || UIDevice.current.orientation == .landscapeRight { + return percentage * UIScreen.main.bounds.height / 100 - } else { - return percentage * UIScreen.main.bounds.width / 100 - } + } static open func YScreen(_ percentage: CGFloat) -> CGFloat { - if UIDevice.current.orientation == .landscapeLeft || UIDevice.current.orientation == .landscapeRight { + return percentage * UIScreen.main.bounds.width / 100 - } else { - return percentage * UIScreen.main.bounds.height / 100 - } + } } diff --git a/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Demo/Demo.xcworkspace/xcuserdata/paolocuscela.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Demo/Demo.xcworkspace/xcuserdata/paolocuscela.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index e187144..2f1d1d1 100644 --- a/Demo/Demo.xcworkspace/xcuserdata/paolocuscela.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Demo/Demo.xcworkspace/xcuserdata/paolocuscela.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -90,7 +90,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "../Cards/Sources/Card.swift" - timestampString = "555085162.8374161" + timestampString = "555086835.8593301" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "149" @@ -186,7 +186,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "../Cards/Sources/Card.swift" - timestampString = "555085162.8375469" + timestampString = "555086835.85947" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "187" @@ -234,7 +234,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "../Cards/Sources/Card.swift" - timestampString = "555085162.837618" + timestampString = "555086835.859544" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "186" @@ -378,7 +378,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "../Cards/Sources/Card.swift" - timestampString = "555085162.837718" + timestampString = "555086835.8596489" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "192" @@ -490,7 +490,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "../Cards/Sources/Card.swift" - timestampString = "555085162.837816" + timestampString = "555086835.859755" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "245" @@ -600,13 +600,13 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Demo/ViewControllers/HighlightViewController.swift" - timestampString = "555085162.837919" + timestampString = "555086835.85987" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "61" endingLineNumber = "61" - landmarkName = "cardHighlightDidTapButton(card:button:)" - landmarkType = "7"> + landmarkName = "HighlightViewController" + landmarkType = "21"> + landmarkName = "HighlightViewController" + landmarkType = "21">