From e8272e3bc2b9ec298b01ab2d9908b6b5fcba4221 Mon Sep 17 00:00:00 2001 From: Petri Tilli Date: Thu, 14 May 2020 18:13:07 +0300 Subject: [PATCH 1/4] Fix for iPad split view bug (#173) * Fixed the iPad animation bug when bulletin shown, also couple deprecation warnings * Updated Changelog * Corrected the available -check --- CHANGELOG.md | 5 +++++ .../Animations/BulletinDismissAnimationController.swift | 6 +++++- .../BulletinPresentationAnimationController.swift | 5 +++++ Sources/Support/BulletinViewController.swift | 6 +++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8ef64f..25a7e9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,11 @@ - Remove testing dependencies from the Cartfile [#166](https://github.com/alexaubry/BulletinBoard/pull/166) +## Unreleased +### Fixes +- Fix for iPad split view bug +[#173] (https://github.com/alexaubry/BulletinBoard/pull/173) + ## 🔖 v4.0.0 ### Fixes - Upgrade to Swift 5 diff --git a/Sources/Support/Animations/BulletinDismissAnimationController.swift b/Sources/Support/Animations/BulletinDismissAnimationController.swift index 6955f5e..24a6193 100644 --- a/Sources/Support/Animations/BulletinDismissAnimationController.swift +++ b/Sources/Support/Animations/BulletinDismissAnimationController.swift @@ -42,7 +42,11 @@ class BulletinDismissAnimationController: NSObject, UIViewControllerAnimatedTran snapshotActivityIndicator.rightAnchor.constraint(equalTo: snapshot.rightAnchor).isActive = true snapshotActivityIndicator.bottomAnchor.constraint(equalTo: snapshot.bottomAnchor).isActive = true - snapshotActivityIndicator.style = .whiteLarge + if #available(iOS 13.0, *) { + snapshotActivityIndicator.style = UIActivityIndicatorView.Style.large + } else { + snapshotActivityIndicator.style = .whiteLarge + } snapshotActivityIndicator.color = .black snapshotActivityIndicator.isUserInteractionEnabled = false diff --git a/Sources/Support/Animations/BulletinPresentationAnimationController.swift b/Sources/Support/Animations/BulletinPresentationAnimationController.swift index 671ad15..2eaf3ee 100644 --- a/Sources/Support/Animations/BulletinPresentationAnimationController.swift +++ b/Sources/Support/Animations/BulletinPresentationAnimationController.swift @@ -31,6 +31,11 @@ class BulletinPresentationAnimationController: NSObject, UIViewControllerAnimate return } + // Fix the frame (Needed for iPad app running in split view) + if let fromFrame = transitionContext.viewController(forKey: .from)?.view.frame { + toVC.view.frame = fromFrame + } + let rootView = toVC.view! let contentView = toVC.contentView let backgroundView = toVC.backgroundView! diff --git a/Sources/Support/BulletinViewController.swift b/Sources/Support/BulletinViewController.swift index f05e6d2..054a953 100644 --- a/Sources/Support/BulletinViewController.swift +++ b/Sources/Support/BulletinViewController.swift @@ -165,7 +165,11 @@ extension BulletinViewController { activityIndicator.topAnchor.constraint(equalTo: contentView.topAnchor).isActive = true activityIndicator.bottomAnchor.constraint(equalTo: contentView.bottomAnchor).isActive = true - activityIndicator.style = .whiteLarge + if #available(iOS 13.0, *) { + activityIndicator.style = UIActivityIndicatorView.Style.large + } else { + activityIndicator.style = .whiteLarge + } activityIndicator.color = .black activityIndicator.isUserInteractionEnabled = false From 72210a0b457448738fe65bfe18aaa2f60fe84d5c Mon Sep 17 00:00:00 2001 From: Alexis Aubry Date: Thu, 14 May 2020 16:14:58 -0400 Subject: [PATCH 2/4] Remove project resources --- BLTNBoard.xcodeproj/project.pbxproj | 109 ------------------ BLTNBoardTests/BLTNBoardTests.swift | 33 ------ BulletinBoard.podspec | 1 - Resources/CloseGlyph.png | Bin 234 -> 0 bytes Resources/CloseGlyph@2x.png | Bin 414 -> 0 bytes Resources/CloseGlyph@3x.png | Bin 586 -> 0 bytes .../Strings/ar.lproj/Localizable.strings | 6 - .../Strings/ca.lproj/Localizable.strings | 6 - .../Strings/cs.lproj/Localizable.strings | 6 - .../Strings/da.lproj/Localizable.strings | 6 - .../Strings/de.lproj/Localizable.strings | 6 - .../Strings/el.lproj/Localizable.strings | 6 - .../Strings/en.lproj/Localizable.strings | 6 - .../Strings/es.lproj/Localizable.strings | 6 - .../Strings/fi.lproj/Localizable.strings | 6 - .../Strings/fr.lproj/Localizable.strings | 6 - .../Strings/he.lproj/Localizable.strings | 6 - .../Strings/hi.lproj/Localizable.strings | 6 - .../Strings/hr.lproj/Localizable.strings | 6 - .../Strings/hu.lproj/Localizable.strings | 6 - .../Strings/id.lproj/Localizable.strings | 6 - .../Strings/it.lproj/Localizable.strings | 6 - .../Strings/ja.lproj/Localizable.strings | 6 - .../Strings/ko.lproj/Localizable.strings | 6 - .../Strings/ms.lproj/Localizable.strings | 6 - .../Strings/nb.lproj/Localizable.strings | 6 - .../Strings/nl.lproj/Localizable.strings | 6 - .../Strings/pl.lproj/Localizable.strings | 6 - .../Strings/pt-BR.lproj/Localizable.strings | 6 - .../Strings/pt-PT.lproj/Localizable.strings | 6 - .../Strings/ro.lproj/Localizable.strings | 6 - .../Strings/ru.lproj/Localizable.strings | 6 - .../Strings/sk.lproj/Localizable.strings | 6 - .../Strings/sv.lproj/Localizable.strings | 6 - .../Strings/th.lproj/Localizable.strings | 6 - .../Strings/tr.lproj/Localizable.strings | 6 - .../Strings/uk.lproj/Localizable.strings | 6 - .../Strings/vi.lproj/Localizable.strings | 6 - .../Strings/zh-Hans.lproj/Localizable.strings | 6 - .../Strings/zh-Hant.lproj/Localizable.strings | 6 - .../Views/Internal/BulletinCloseButton.swift | 54 +++++++-- test/BLTNBoard-BLTNBoard.log | 10 -- test/report.junit | 2 - 43 files changed, 47 insertions(+), 366 deletions(-) delete mode 100644 BLTNBoardTests/BLTNBoardTests.swift delete mode 100644 Resources/CloseGlyph.png delete mode 100644 Resources/CloseGlyph@2x.png delete mode 100644 Resources/CloseGlyph@3x.png delete mode 100644 Resources/Strings/ar.lproj/Localizable.strings delete mode 100644 Resources/Strings/ca.lproj/Localizable.strings delete mode 100644 Resources/Strings/cs.lproj/Localizable.strings delete mode 100644 Resources/Strings/da.lproj/Localizable.strings delete mode 100644 Resources/Strings/de.lproj/Localizable.strings delete mode 100644 Resources/Strings/el.lproj/Localizable.strings delete mode 100644 Resources/Strings/en.lproj/Localizable.strings delete mode 100644 Resources/Strings/es.lproj/Localizable.strings delete mode 100644 Resources/Strings/fi.lproj/Localizable.strings delete mode 100644 Resources/Strings/fr.lproj/Localizable.strings delete mode 100644 Resources/Strings/he.lproj/Localizable.strings delete mode 100644 Resources/Strings/hi.lproj/Localizable.strings delete mode 100644 Resources/Strings/hr.lproj/Localizable.strings delete mode 100644 Resources/Strings/hu.lproj/Localizable.strings delete mode 100644 Resources/Strings/id.lproj/Localizable.strings delete mode 100644 Resources/Strings/it.lproj/Localizable.strings delete mode 100644 Resources/Strings/ja.lproj/Localizable.strings delete mode 100644 Resources/Strings/ko.lproj/Localizable.strings delete mode 100644 Resources/Strings/ms.lproj/Localizable.strings delete mode 100644 Resources/Strings/nb.lproj/Localizable.strings delete mode 100644 Resources/Strings/nl.lproj/Localizable.strings delete mode 100644 Resources/Strings/pl.lproj/Localizable.strings delete mode 100644 Resources/Strings/pt-BR.lproj/Localizable.strings delete mode 100644 Resources/Strings/pt-PT.lproj/Localizable.strings delete mode 100644 Resources/Strings/ro.lproj/Localizable.strings delete mode 100644 Resources/Strings/ru.lproj/Localizable.strings delete mode 100644 Resources/Strings/sk.lproj/Localizable.strings delete mode 100644 Resources/Strings/sv.lproj/Localizable.strings delete mode 100644 Resources/Strings/th.lproj/Localizable.strings delete mode 100644 Resources/Strings/tr.lproj/Localizable.strings delete mode 100644 Resources/Strings/uk.lproj/Localizable.strings delete mode 100644 Resources/Strings/vi.lproj/Localizable.strings delete mode 100644 Resources/Strings/zh-Hans.lproj/Localizable.strings delete mode 100644 Resources/Strings/zh-Hant.lproj/Localizable.strings delete mode 100644 test/BLTNBoard-BLTNBoard.log delete mode 100644 test/report.junit diff --git a/BLTNBoard.xcodeproj/project.pbxproj b/BLTNBoard.xcodeproj/project.pbxproj index 936666b..c2645e8 100644 --- a/BLTNBoard.xcodeproj/project.pbxproj +++ b/BLTNBoard.xcodeproj/project.pbxproj @@ -21,13 +21,9 @@ 558D808B218DC5B6000ADAFD /* BLTNBoard.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6D97C1BEFF229002C0205 /* BLTNBoard.framework */; }; 558D8093218DCA81000ADAFD /* FBSnapshotTestCase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 558D8092218DCA81000ADAFD /* FBSnapshotTestCase.framework */; }; 558D8095218DCA98000ADAFD /* FBSnapshotTestCase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 558D8092218DCA81000ADAFD /* FBSnapshotTestCase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 5590C04B20B852150045C315 /* CloseGlyph.png in Resources */ = {isa = PBXBuildFile; fileRef = 5590C04820B852150045C315 /* CloseGlyph.png */; }; - 5590C04C20B852150045C315 /* CloseGlyph@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5590C04920B852150045C315 /* CloseGlyph@2x.png */; }; - 5590C04D20B852150045C315 /* CloseGlyph@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5590C04A20B852150045C315 /* CloseGlyph@3x.png */; }; 5590C04F20B85BCE0045C315 /* BLTNTitleLabelContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5590C04E20B85BCE0045C315 /* BLTNTitleLabelContainer.swift */; }; 5590C05120B934230045C315 /* Highlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5590C05020B934230045C315 /* Highlighter.swift */; }; 5590C05320B93B350045C315 /* UIColor+Luminance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5590C05220B93B350045C315 /* UIColor+Luminance.swift */; }; - 5590C05420B93F3A0045C315 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5590C05620B93F3A0045C315 /* Localizable.strings */; }; 559F8E95204DB9BA00322949 /* BLTNItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 559F8E94204DB9BA00322949 /* BLTNItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; 559F8EA3204DC42D00322949 /* UIView+RoundedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 559F8EA2204DC42D00322949 /* UIView+RoundedView.swift */; }; 55B3D1CF1FDADA8E00737791 /* AnimationChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55B3D1CE1FDADA8E00737791 /* AnimationChain.swift */; }; @@ -90,46 +86,9 @@ 558D8088218DC5B6000ADAFD /* BLTNBoardTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLTNBoardTests.swift; sourceTree = ""; }; 558D808A218DC5B6000ADAFD /* BLTNBoardTests.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = BLTNBoardTests.plist; sourceTree = ""; }; 558D8092218DCA81000ADAFD /* FBSnapshotTestCase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSnapshotTestCase.framework; path = Carthage/Build/iOS/FBSnapshotTestCase.framework; sourceTree = ""; }; - 5590C04820B852150045C315 /* CloseGlyph.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseGlyph.png; sourceTree = ""; }; - 5590C04920B852150045C315 /* CloseGlyph@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "CloseGlyph@2x.png"; sourceTree = ""; }; - 5590C04A20B852150045C315 /* CloseGlyph@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "CloseGlyph@3x.png"; sourceTree = ""; }; 5590C04E20B85BCE0045C315 /* BLTNTitleLabelContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLTNTitleLabelContainer.swift; sourceTree = ""; }; 5590C05020B934230045C315 /* Highlighter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Highlighter.swift; sourceTree = ""; }; 5590C05220B93B350045C315 /* UIColor+Luminance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Luminance.swift"; sourceTree = ""; }; - 5590C05520B93F3A0045C315 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; - 5590C05820B93F750045C315 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; - 5590C05920B93F790045C315 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; - 5590C05A20B93FFC0045C315 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; - 5590C05B20B940190045C315 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; - 5590C05C20B940310045C315 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = ""; }; - 5590C05D20B940420045C315 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = ""; }; - 5590C05E20B940590045C315 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = ""; }; - 5590C05F20B9406C0045C315 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06020B9407A0045C315 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06120B940930045C315 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06220B940AA0045C315 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06320B940B80045C315 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06420B940E50045C315 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06520B940F90045C315 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06620B9410C0045C315 /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06720B941150045C315 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06820B9412B0045C315 /* ms */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ms; path = ms.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06920B941390045C315 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06A20B941440045C315 /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06B20B941540045C315 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06C20B9415D0045C315 /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06D20B941750045C315 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06E20B941860045C315 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = ""; }; - 5590C06F20B941990045C315 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = ""; }; - 5590C07020B941A90045C315 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = ""; }; - 5590C07120B941BC0045C315 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Localizable.strings; sourceTree = ""; }; - 5590C07220B941CD0045C315 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = ""; }; - 5590C07320B941DC0045C315 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = ""; }; - 5590C07420B941E60045C315 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Localizable.strings"; sourceTree = ""; }; - 5590C07520B942060045C315 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = ""; }; - 5590C07620B942170045C315 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = ""; }; - 5590C07720B942620045C315 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/Localizable.strings; sourceTree = ""; }; - 5590C07820B943210045C315 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = ""; }; 559F8E94204DB9BA00322949 /* BLTNItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BLTNItem.h; sourceTree = ""; }; 559F8EA2204DC42D00322949 /* UIView+RoundedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+RoundedView.swift"; sourceTree = ""; }; 55B3D1CE1FDADA8E00737791 /* AnimationChain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationChain.swift; sourceTree = ""; }; @@ -178,7 +137,6 @@ isa = PBXGroup; children = ( 5E9D32682108FB9A0032FB06 /* BulletinBoard.podspec */, - 55E8621C20B84DE500584EAC /* Resources */, 8933C7811EB5B7E0000D00A4 /* Sources */, 52D6D99C1BEFF38C002C0205 /* Configs */, 558D8087218DC5B6000ADAFD /* BLTNBoardTests */, @@ -221,14 +179,6 @@ name = Frameworks; sourceTree = ""; }; - 5590C05720B93F610045C315 /* Strings */ = { - isa = PBXGroup; - children = ( - 5590C05620B93F3A0045C315 /* Localizable.strings */, - ); - path = Strings; - sourceTree = ""; - }; 55B3D1D01FDD643B00737791 /* Appearance */ = { isa = PBXGroup; children = ( @@ -328,17 +278,6 @@ path = ContinuousCorners; sourceTree = ""; }; - 55E8621C20B84DE500584EAC /* Resources */ = { - isa = PBXGroup; - children = ( - 5590C05720B93F610045C315 /* Strings */, - 5590C04820B852150045C315 /* CloseGlyph.png */, - 5590C04920B852150045C315 /* CloseGlyph@2x.png */, - 5590C04A20B852150045C315 /* CloseGlyph@3x.png */, - ); - path = Resources; - sourceTree = ""; - }; 8933C7811EB5B7E0000D00A4 /* Sources */ = { isa = PBXGroup; children = ( @@ -485,10 +424,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5590C04D20B852150045C315 /* CloseGlyph@3x.png in Resources */, - 5590C04B20B852150045C315 /* CloseGlyph.png in Resources */, - 5590C05420B93F3A0045C315 /* Localizable.strings in Resources */, - 5590C04C20B852150045C315 /* CloseGlyph@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -555,50 +490,6 @@ }; /* End PBXTargetDependency section */ -/* Begin PBXVariantGroup section */ - 5590C05620B93F3A0045C315 /* Localizable.strings */ = { - isa = PBXVariantGroup; - children = ( - 5590C05520B93F3A0045C315 /* en */, - 5590C05820B93F750045C315 /* fr */, - 5590C05920B93F790045C315 /* de */, - 5590C05A20B93FFC0045C315 /* zh-Hans */, - 5590C05B20B940190045C315 /* es */, - 5590C05C20B940310045C315 /* it */, - 5590C05D20B940420045C315 /* da */, - 5590C05E20B940590045C315 /* nl */, - 5590C05F20B9406C0045C315 /* hr */, - 5590C06020B9407A0045C315 /* el */, - 5590C06120B940930045C315 /* he */, - 5590C06220B940AA0045C315 /* ar */, - 5590C06320B940B80045C315 /* cs */, - 5590C06420B940E50045C315 /* ja */, - 5590C06520B940F90045C315 /* ko */, - 5590C06620B9410C0045C315 /* th */, - 5590C06720B941150045C315 /* uk */, - 5590C06820B9412B0045C315 /* ms */, - 5590C06920B941390045C315 /* vi */, - 5590C06A20B941440045C315 /* sk */, - 5590C06B20B941540045C315 /* ru */, - 5590C06C20B9415D0045C315 /* ro */, - 5590C06D20B941750045C315 /* ca */, - 5590C06E20B941860045C315 /* fi */, - 5590C06F20B941990045C315 /* hu */, - 5590C07020B941A90045C315 /* id */, - 5590C07120B941BC0045C315 /* nb */, - 5590C07220B941CD0045C315 /* pl */, - 5590C07320B941DC0045C315 /* pt-BR */, - 5590C07420B941E60045C315 /* pt-PT */, - 5590C07520B942060045C315 /* sv */, - 5590C07620B942170045C315 /* tr */, - 5590C07720B942620045C315 /* hi */, - 5590C07820B943210045C315 /* zh-Hant */, - ); - name = Localizable.strings; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - /* Begin XCBuildConfiguration section */ 52D6D98E1BEFF229002C0205 /* Debug */ = { isa = XCBuildConfiguration; diff --git a/BLTNBoardTests/BLTNBoardTests.swift b/BLTNBoardTests/BLTNBoardTests.swift deleted file mode 100644 index 3966087..0000000 --- a/BLTNBoardTests/BLTNBoardTests.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// BLTNBoardTests.swift -// BLTNBoardTests -// -// Created by Alexis AUBRY on 11/3/18. -// Copyright © 2018 Bulletin. All rights reserved. -// - -import XCTest - -class BLTNBoardTests: XCTestCase { - - override func setUp() { - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDown() { - // Put teardown code here. This method is called after the invocation of each test method in the class. - } - - func testExample() { - // This is an example of a functional test case. - // Use XCTAssert and related functions to verify your tests produce the correct results. - } - - func testPerformanceExample() { - // This is an example of a performance test case. - self.measure { - // Put the code you want to measure the time of here. - } - } - -} diff --git a/BulletinBoard.podspec b/BulletinBoard.podspec index aecbc3a..1652043 100644 --- a/BulletinBoard.podspec +++ b/BulletinBoard.podspec @@ -18,6 +18,5 @@ Pod::Spec.new do |s| s.frameworks = "UIKit" s.documentation_url = "https://alexaubry.github.io/BulletinBoard" s.module_name = "BLTNBoard" - s.resources = "Resources/**/*.{lproj,png}" s.swift_version = "5.0" end diff --git a/Resources/CloseGlyph.png b/Resources/CloseGlyph.png deleted file mode 100644 index b2d49b0d492b996644c06898610fc2e91d5be2f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|mUy~2hFA!$ zo$SrmV8G$hS$Px$SV=@dR9FekmrYK@FbqZ`E-?q-F5Hs~a4A>-d&H9QGjbP}r{kYWok&)iY5l#g zi91Tx`fnHMUM1coz9ilxo+XZIXrYNV3|KI=aq%hf=i*1kFA~#+23lSprkcQwziH!N zxi>LEE*hrid)Vt^=K&JBChoz}hP}QeyfZ(pn#jOmP!n1l9vF?YCbDoC6sA^tR3se} z6*$c8ORFT_nu)Q-L|~H3Dr~JI)XCX^(M45|C5h_A|8{HXA`klKlNI)$Xk3DuqsmM~ zQ2VU~Kgz@iJ~eR&ylWy2e=@=&_uXPl&%)lzci|851&mBg-`wEVmzJXfN0>0sUY{~i zh4XwTC#<`P&?HyQj0Gk$!M5nsEg2ibz2dQZsUj-QglPx%1W80eRA>d|n%_;tFbsz)#0E^k8{@DBo82qSz!bb9W;py=xVrY5%1P{06_KK} zxt#s|^2d>qPSY~I%Iih)m*j8B?~>mnKS~~*@QH62V1WrX81K@P)bQiAkUypVS@Nia zFMO7GV1;>3d+=uDM_Rwk|Hym52foa2sf1Y*LsDwAuFn?Xg*PspPAIVoPnjj679Lg| z1r~<~{I*TBh!%KwVAmCX3+H`~6443|C(%j6loxv4u2)14JS>D*jkRmAn)g-_z3?!y zPv|DK7jr#gYDGlA!#r=WY#cy%U`uVhA|l}Nb+@rb8OBa2rTfTqkZF6-VHu7xY%ZYJ zFOd!-ZLK+X-=iFl3J#lMB1Dv;mZ#nu**4*=@+c7@@JERVg&!><1%8x>RQPNWL*TPS z426#t(FOltH2rxzSt(^zlTl)dnO8oKrgy<$53CEulT1fqK0M!?FJ=>)red*Gcq zS@5kQ=ID?)qU{&f0}JxmBgf-)91E1VEZtetNI<#|-H&uw6U1t!?$X(P|m YFSk7kYb2@TiU0rr07*qoM6N<$g6h=@M*si- diff --git a/Resources/Strings/ar.lproj/Localizable.strings b/Resources/Strings/ar.lproj/Localizable.strings deleted file mode 100644 index 5b920b7..0000000 --- a/Resources/Strings/ar.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "إغلاق"; diff --git a/Resources/Strings/ca.lproj/Localizable.strings b/Resources/Strings/ca.lproj/Localizable.strings deleted file mode 100644 index 8af6cef..0000000 --- a/Resources/Strings/ca.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Tancar"; diff --git a/Resources/Strings/cs.lproj/Localizable.strings b/Resources/Strings/cs.lproj/Localizable.strings deleted file mode 100644 index 4df7849..0000000 --- a/Resources/Strings/cs.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Zavřít"; diff --git a/Resources/Strings/da.lproj/Localizable.strings b/Resources/Strings/da.lproj/Localizable.strings deleted file mode 100644 index 08068bf..0000000 --- a/Resources/Strings/da.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Luk"; diff --git a/Resources/Strings/de.lproj/Localizable.strings b/Resources/Strings/de.lproj/Localizable.strings deleted file mode 100644 index e5c54f8..0000000 --- a/Resources/Strings/de.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Schließen"; diff --git a/Resources/Strings/el.lproj/Localizable.strings b/Resources/Strings/el.lproj/Localizable.strings deleted file mode 100644 index 1ece50c..0000000 --- a/Resources/Strings/el.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Κλείσιμο"; diff --git a/Resources/Strings/en.lproj/Localizable.strings b/Resources/Strings/en.lproj/Localizable.strings deleted file mode 100644 index 65d0940..0000000 --- a/Resources/Strings/en.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Close"; diff --git a/Resources/Strings/es.lproj/Localizable.strings b/Resources/Strings/es.lproj/Localizable.strings deleted file mode 100644 index ba2a98a..0000000 --- a/Resources/Strings/es.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Cerrar"; diff --git a/Resources/Strings/fi.lproj/Localizable.strings b/Resources/Strings/fi.lproj/Localizable.strings deleted file mode 100644 index fc2aa51..0000000 --- a/Resources/Strings/fi.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Sulje"; diff --git a/Resources/Strings/fr.lproj/Localizable.strings b/Resources/Strings/fr.lproj/Localizable.strings deleted file mode 100644 index 1542301..0000000 --- a/Resources/Strings/fr.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Fermer"; diff --git a/Resources/Strings/he.lproj/Localizable.strings b/Resources/Strings/he.lproj/Localizable.strings deleted file mode 100644 index bef3c6f..0000000 --- a/Resources/Strings/he.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "סגור"; diff --git a/Resources/Strings/hi.lproj/Localizable.strings b/Resources/Strings/hi.lproj/Localizable.strings deleted file mode 100644 index 3a0a930..0000000 --- a/Resources/Strings/hi.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "बंद करें"; diff --git a/Resources/Strings/hr.lproj/Localizable.strings b/Resources/Strings/hr.lproj/Localizable.strings deleted file mode 100644 index d57a19c..0000000 --- a/Resources/Strings/hr.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Zatvori"; diff --git a/Resources/Strings/hu.lproj/Localizable.strings b/Resources/Strings/hu.lproj/Localizable.strings deleted file mode 100644 index c6dac63..0000000 --- a/Resources/Strings/hu.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Bezárás"; diff --git a/Resources/Strings/id.lproj/Localizable.strings b/Resources/Strings/id.lproj/Localizable.strings deleted file mode 100644 index 575045f..0000000 --- a/Resources/Strings/id.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Tutup"; diff --git a/Resources/Strings/it.lproj/Localizable.strings b/Resources/Strings/it.lproj/Localizable.strings deleted file mode 100644 index c3285b5..0000000 --- a/Resources/Strings/it.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Chiudi"; diff --git a/Resources/Strings/ja.lproj/Localizable.strings b/Resources/Strings/ja.lproj/Localizable.strings deleted file mode 100644 index 20bc395..0000000 --- a/Resources/Strings/ja.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "閉じる"; diff --git a/Resources/Strings/ko.lproj/Localizable.strings b/Resources/Strings/ko.lproj/Localizable.strings deleted file mode 100644 index e7c1a8a..0000000 --- a/Resources/Strings/ko.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "닫기"; diff --git a/Resources/Strings/ms.lproj/Localizable.strings b/Resources/Strings/ms.lproj/Localizable.strings deleted file mode 100644 index 575045f..0000000 --- a/Resources/Strings/ms.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Tutup"; diff --git a/Resources/Strings/nb.lproj/Localizable.strings b/Resources/Strings/nb.lproj/Localizable.strings deleted file mode 100644 index c4cc01b..0000000 --- a/Resources/Strings/nb.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Lukk"; diff --git a/Resources/Strings/nl.lproj/Localizable.strings b/Resources/Strings/nl.lproj/Localizable.strings deleted file mode 100644 index f48263c..0000000 --- a/Resources/Strings/nl.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Sluit"; diff --git a/Resources/Strings/pl.lproj/Localizable.strings b/Resources/Strings/pl.lproj/Localizable.strings deleted file mode 100644 index 8a44a88..0000000 --- a/Resources/Strings/pl.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Zamknij"; diff --git a/Resources/Strings/pt-BR.lproj/Localizable.strings b/Resources/Strings/pt-BR.lproj/Localizable.strings deleted file mode 100644 index 0ae2f36..0000000 --- a/Resources/Strings/pt-BR.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Fechar"; diff --git a/Resources/Strings/pt-PT.lproj/Localizable.strings b/Resources/Strings/pt-PT.lproj/Localizable.strings deleted file mode 100644 index 0ae2f36..0000000 --- a/Resources/Strings/pt-PT.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Fechar"; diff --git a/Resources/Strings/ro.lproj/Localizable.strings b/Resources/Strings/ro.lproj/Localizable.strings deleted file mode 100644 index bdc7fb4..0000000 --- a/Resources/Strings/ro.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Închideți"; diff --git a/Resources/Strings/ru.lproj/Localizable.strings b/Resources/Strings/ru.lproj/Localizable.strings deleted file mode 100644 index 1a7ae5c..0000000 --- a/Resources/Strings/ru.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Закрыть"; diff --git a/Resources/Strings/sk.lproj/Localizable.strings b/Resources/Strings/sk.lproj/Localizable.strings deleted file mode 100644 index 5883f21..0000000 --- a/Resources/Strings/sk.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Zatvoriť"; diff --git a/Resources/Strings/sv.lproj/Localizable.strings b/Resources/Strings/sv.lproj/Localizable.strings deleted file mode 100644 index c0ed97c..0000000 --- a/Resources/Strings/sv.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Stäng"; diff --git a/Resources/Strings/th.lproj/Localizable.strings b/Resources/Strings/th.lproj/Localizable.strings deleted file mode 100644 index d4f0961..0000000 --- a/Resources/Strings/th.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "ปิด"; diff --git a/Resources/Strings/tr.lproj/Localizable.strings b/Resources/Strings/tr.lproj/Localizable.strings deleted file mode 100644 index 70c1d97..0000000 --- a/Resources/Strings/tr.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Kapat"; diff --git a/Resources/Strings/uk.lproj/Localizable.strings b/Resources/Strings/uk.lproj/Localizable.strings deleted file mode 100644 index b05e603..0000000 --- a/Resources/Strings/uk.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Закрити"; diff --git a/Resources/Strings/vi.lproj/Localizable.strings b/Resources/Strings/vi.lproj/Localizable.strings deleted file mode 100644 index ddb087d..0000000 --- a/Resources/Strings/vi.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "Đóng"; diff --git a/Resources/Strings/zh-Hans.lproj/Localizable.strings b/Resources/Strings/zh-Hans.lproj/Localizable.strings deleted file mode 100644 index bf36ecb..0000000 --- a/Resources/Strings/zh-Hans.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "关闭"; diff --git a/Resources/Strings/zh-Hant.lproj/Localizable.strings b/Resources/Strings/zh-Hant.lproj/Localizable.strings deleted file mode 100644 index 2f1491d..0000000 --- a/Resources/Strings/zh-Hant.lproj/Localizable.strings +++ /dev/null @@ -1,6 +0,0 @@ -/** - * BulletinBoard - * Copyright (c) 2017 - present Alexis Aubry. Licensed under the MIT license. - */ - -"Close" = "關閉"; diff --git a/Sources/Support/Views/Internal/BulletinCloseButton.swift b/Sources/Support/Views/Internal/BulletinCloseButton.swift index 1e53f21..afb4afb 100644 --- a/Sources/Support/Views/Internal/BulletinCloseButton.swift +++ b/Sources/Support/Views/Internal/BulletinCloseButton.swift @@ -37,18 +37,16 @@ class BulletinCloseButton: UIControl, HighlighterTarget { // Content isAccessibilityElement = true - accessibilityLabel = NSLocalizedString("Close", tableName: "Localizable", - bundle: Bundle(for: BulletinCloseButton.self), comment: "") - + accessibilityLabel = Bundle.UIKitCore.localizedString(forKey: "Close", value: "Close", table: nil) + // Layout - addSubview(backgroundContainer) addSubview(closeGlyph) backgroundContainer.layer.cornerRadius = 14 - - let glyph = UIImage(named: "CloseGlyph", in: Bundle(for: BulletinCloseButton.self), compatibleWith: nil)! - closeGlyph.image = glyph.withRenderingMode(.alwaysTemplate) + + closeGlyph.image = UIImage.closeButton.withRenderingMode(.alwaysTemplate) + closeGlyph.contentMode = .scaleAspectFit closeGlyph.clipsToBounds = true backgroundContainer.isUserInteractionEnabled = false @@ -120,3 +118,45 @@ class BulletinCloseButton: UIControl, HighlighterTarget { } } + +extension Bundle { + fileprivate static var UIKitCore: Bundle { + return Bundle(identifier: "com.apple.UIKitCore")! + } +} + +extension UIImage { + fileprivate static var closeButton: UIImage { + let shape = UIBezierPath() + shape.move(to: CGPoint(x: 0.93, y: 30.21)) + shape.addCurve(to: CGPoint(x: 0.97, y: 35.02), controlPoint1: CGPoint(x: -0.28, y: 31.44), controlPoint2: CGPoint(x: -0.35, y: 33.72)) + shape.addCurve(to: CGPoint(x: 5.78, y: 35.06), controlPoint1: CGPoint(x: 2.29, y: 36.34), controlPoint2: CGPoint(x: 4.55, y: 36.3)) + shape.addLine(to: CGPoint(x: 18.01, y: 22.84)) + shape.addLine(to: CGPoint(x: 30.21, y: 35.04)) + shape.addCurve(to: CGPoint(x: 35, y: 34.99), controlPoint1: CGPoint(x: 31.49, y: 36.34), controlPoint2: CGPoint(x: 33.7, y: 36.32)) + shape.addCurve(to: CGPoint(x: 35.05, y: 30.21), controlPoint1: CGPoint(x: 36.33, y: 33.69), controlPoint2: CGPoint(x: 36.33, y: 31.48)) + shape.addLine(to: CGPoint(x: 22.84, y: 18.01)) + shape.addLine(to: CGPoint(x: 35.05, y: 5.79)) + shape.addCurve(to: CGPoint(x: 35, y: 1), controlPoint1: CGPoint(x: 36.33, y: 4.51), controlPoint2: CGPoint(x: 36.33, y: 2.3)) + shape.addCurve(to: CGPoint(x: 30.21, y: 0.95), controlPoint1: CGPoint(x: 33.7, y: -0.32), controlPoint2: CGPoint(x: 31.49, y: -0.32)) + shape.addLine(to: CGPoint(x: 18.01, y: 13.15)) + shape.addLine(to: CGPoint(x: 5.78, y: 0.93)) + shape.addCurve(to: CGPoint(x: 0.97, y: 0.98), controlPoint1: CGPoint(x: 4.55, y: -0.28), controlPoint2: CGPoint(x: 2.27, y: -0.35)) + shape.addCurve(to: CGPoint(x: 0.93, y: 5.79), controlPoint1: CGPoint(x: -0.33, y: 2.3), controlPoint2: CGPoint(x: -0.28, y: 4.55)) + shape.addLine(to: CGPoint(x: 13.15, y: 18.01)) + shape.addLine(to: CGPoint(x: 0.93, y: 30.21)) + shape.close() + + let size = CGSize(width: 36, height: 36) + UIGraphicsBeginImageContext(size) + + defer { + UIGraphicsEndImageContext() + } + + UIColor.black.setFill() + shape.fill() + + return UIGraphicsGetImageFromCurrentImageContext()! + } +} diff --git a/test/BLTNBoard-BLTNBoard.log b/test/BLTNBoard-BLTNBoard.log deleted file mode 100644 index 28d0326..0000000 --- a/test/BLTNBoard-BLTNBoard.log +++ /dev/null @@ -1,10 +0,0 @@ -User defaults from command line: - IDEDerivedDataPathOverride = /Users/aleks/Developer/OSS/BulletinBoard/DerivedData - -Testing started on 'iPhone 7' - - -*** If you believe this error represents a bug, please attach the result bundle at /Users/aleks/Developer/OSS/BulletinBoard/DerivedData/Logs/Test/Test-BLTNBoard-2018.11.03_13-05-47-+0100.xcresult - -Generating coverage data... -Generated coverage report: /Users/aleks/Developer/OSS/BulletinBoard/DerivedData/Logs/Test/Test-BLTNBoard-2018.11.03_13-05-47-+0100.xcresult/1_Test/action.xccovreport diff --git a/test/report.junit b/test/report.junit deleted file mode 100644 index 1e19aa8..0000000 --- a/test/report.junit +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file From 1de57aabdcc352287ea08cb4869b73bf74635944 Mon Sep 17 00:00:00 2001 From: Alexis Aubry Date: Thu, 14 May 2020 18:33:28 -0400 Subject: [PATCH 3/4] Update CHANGELOG --- .../contents.xcworkspacedata | 7 +++++++ CHANGELOG.md | 13 ++++++++----- Package.swift | 19 +++++++++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata create mode 100644 Package.swift diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 25a7e9c..c22b965 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # _BulletinBoard_ Changelog ## Unreleased +## 🔖 v4.1.1 +### Changes +- Do not use external resources for close button + +### Fixes +- Fix for iPad split view bug +[#173](https://github.com/alexaubry/BulletinBoard/pull/173) + ## 🔖 v4.1.0 ### New Features - iOS 13 Dark Mode support @@ -12,11 +20,6 @@ - Remove testing dependencies from the Cartfile [#166](https://github.com/alexaubry/BulletinBoard/pull/166) -## Unreleased -### Fixes -- Fix for iPad split view bug -[#173] (https://github.com/alexaubry/BulletinBoard/pull/173) - ## 🔖 v4.0.0 ### Fixes - Upgrade to Swift 5 diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..c88b0d2 --- /dev/null +++ b/Package.swift @@ -0,0 +1,19 @@ +// swift-tools-version:5.0 +import PackageDescription + +let package = Package( + name: "BLTNBoard", + products: [ + .library( + name: "BLTNBoard", + targets: ["BLTNBoard"]), + ], + dependencies: [ + ], + targets: [ + .target( + name: "BLTNBoard", + dependencies: [], + path: "Sources"), + ] +) From 11faa91a1203db7535b5d96ab0e7fc804985b81d Mon Sep 17 00:00:00 2001 From: Alexis Aubry Date: Thu, 14 May 2020 18:36:55 -0400 Subject: [PATCH 4/4] Update Podspec --- BulletinBoard.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BulletinBoard.podspec b/BulletinBoard.podspec index 1652043..2e8ef6a 100644 --- a/BulletinBoard.podspec +++ b/BulletinBoard.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "BulletinBoard" - s.version = "4.1.0" + s.version = "4.1.1" s.summary = "Generate and Display Bottom Card Interfaces for iOS" s.description = <<-DESC BulletinBoard is an iOS library that generates and manages contextual cards displayed at the bottom of the screen. It is especially well suited for quick user interactions such as onboarding screens or configuration.