Merge pull request #26 from okanerdogan09/master

JanGorman · web-flow · commit 9d7d21e6220e · 2019-02-08T09:20:44.000+01:00
adding accessory view to the right of Message Bar
diff --git a/Example/SwiftMessageBarExample/SwiftMessageBarExample.xcodeproj/project.pbxproj b/Example/SwiftMessageBarExample/SwiftMessageBarExample.xcodeproj/project.pbxproj
@@ -272,7 +272,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -321,7 +321,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
diff --git a/Example/SwiftMessageBarExample/SwiftMessageBarExample/Base.lproj/Main.storyboard b/Example/SwiftMessageBarExample/SwiftMessageBarExample/Base.lproj/Main.storyboard
@@ -1,7 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="15A178w" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -13,64 +18,65 @@
                         <viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g3H-aA-9F1">
-                                <rect key="frame" x="249" y="397" width="102" height="30"/>
-                                <animations/>
+                                <rect key="frame" x="137.5" y="426" width="100" height="30"/>
                                 <state key="normal" title="Show Success">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
-                                    <action selector="showSuccess:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="UXp-O5-5af"/>
+                                    <action selector="showSuccess" destination="vXZ-lx-hvc" eventType="touchUpInside" id="LcG-Pk-Pd8"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nha-ta-9BD" userLabel="Show Succes with custom view">
+                                <rect key="frame" x="67.5" y="464" width="240" height="30"/>
+                                <state key="normal" title="Show Succes With Accessory View"/>
+                                <connections>
+                                    <action selector="showSuccessWithAccesoryView" destination="vXZ-lx-hvc" eventType="touchUpInside" id="e3k-x5-dIy"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tfK-dL-iQe">
-                                <rect key="frame" x="266" y="435" width="69" height="30"/>
-                                <animations/>
+                                <rect key="frame" x="153.5" y="502" width="68" height="30"/>
                                 <state key="normal" title="Show Info">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
-                                    <action selector="showInfo:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="0IS-En-Vtu"/>
+                                    <action selector="showInfo" destination="vXZ-lx-hvc" eventType="touchUpInside" id="sSJ-3z-lvi"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vTD-O1-rRw">
-                                <rect key="frame" x="262" y="473" width="77" height="30"/>
-                                <animations/>
+                                <rect key="frame" x="149.5" y="540" width="76" height="30"/>
                                 <state key="normal" title="Show Error">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
-                                    <action selector="showError:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="dfc-Cu-ILl"/>
+                                    <action selector="showError" destination="vXZ-lx-hvc" eventType="touchUpInside" id="xga-jW-viM"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tgG-aC-S2q">
-                                <rect key="frame" x="245" y="511" width="110" height="30"/>
-                                <animations/>
+                                <rect key="frame" x="132.5" y="578" width="110" height="30"/>
                                 <state key="normal" title="Clear Messages">
                                     <color key="titleColor" red="0.96326452493667603" green="0.096623696386814117" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <connections>
-                                    <action selector="clearAll:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="pqO-1x-qOR"/>
+                                    <action selector="clearAll" destination="vXZ-lx-hvc" eventType="touchUpInside" id="acw-re-8lv"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EGE-TM-z4L">
-                                <rect key="frame" x="254" y="549" width="92" height="30"/>
-                                <animations/>
+                                <rect key="frame" x="141.5" y="616" width="92" height="30"/>
                                 <state key="normal" title="Clear Current">
-                                    <color key="titleColor" red="0.96326452493667603" green="0.096623696386814117" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleColor" red="0.94059276580810547" green="0.0" blue="0.02498987689614296" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
-                                    <action selector="clearCurrent:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="Zc0-4F-4Rk"/>
+                                    <action selector="clearCurrent" destination="vXZ-lx-hvc" eventType="touchUpInside" id="DhZ-cG-jZf"/>
                                 </connections>
                             </button>
                         </subviews>
-                        <animations/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="centerX" secondItem="vTD-O1-rRw" secondAttribute="centerX" id="2Pw-Rj-x4i"/>
                             <constraint firstItem="tgG-aC-S2q" firstAttribute="top" secondItem="vTD-O1-rRw" secondAttribute="bottom" constant="8" id="47L-d1-JEj"/>
@@ -79,9 +85,11 @@
                             <constraint firstItem="EGE-TM-z4L" firstAttribute="top" secondItem="tgG-aC-S2q" secondAttribute="bottom" constant="8" id="H3Y-hp-4gv"/>
                             <constraint firstAttribute="centerX" secondItem="tfK-dL-iQe" secondAttribute="centerX" id="MZv-wF-YQk"/>
                             <constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="vTD-O1-rRw" secondAttribute="bottom" constant="97" id="RX8-LJ-8Gq"/>
+                            <constraint firstItem="tfK-dL-iQe" firstAttribute="top" secondItem="nha-ta-9BD" secondAttribute="bottom" constant="8" id="UnV-p0-unb"/>
                             <constraint firstItem="vTD-O1-rRw" firstAttribute="top" secondItem="tfK-dL-iQe" secondAttribute="bottom" constant="8" id="fUI-GQ-Zoy"/>
                             <constraint firstAttribute="centerX" secondItem="EGE-TM-z4L" secondAttribute="centerX" id="hj6-wm-cik"/>
-                            <constraint firstItem="tfK-dL-iQe" firstAttribute="top" secondItem="g3H-aA-9F1" secondAttribute="bottom" constant="8" id="lZg-Nx-Cwn"/>
+                            <constraint firstItem="nha-ta-9BD" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="u0y-PX-D4M"/>
+                            <constraint firstItem="nha-ta-9BD" firstAttribute="top" secondItem="g3H-aA-9F1" secondAttribute="bottom" constant="8" id="yl9-Pz-aHD"/>
                         </constraints>
                     </view>
                 </viewController>
diff --git a/Example/SwiftMessageBarExample/SwiftMessageBarExample/ViewController.swift b/Example/SwiftMessageBarExample/SwiftMessageBarExample/ViewController.swift
@@ -15,37 +15,57 @@ class ViewController: UIViewController {
     SwiftMessageBar.setSharedConfig(messageBarConfig)
   }
 
-  @IBAction private func showSuccess(_ sender: AnyObject) {
+  @IBAction private func showSuccess() {
     let message = "A really long message can go here, to provide a description for the user"
     uuid = SwiftMessageBar.showMessage(withTitle: nil, message: message, type: .success, duration: 3, dismiss: false) {
       print("Dismiss callback")
     }
   }
 
-  @IBAction private func showError(_ sender: AnyObject) {
+  @IBAction private func showError() {
     let message = "A really long message can go here, to provide a description for the user"
     uuid = SwiftMessageBar.showMessage(withTitle: "Error", message: message, type: .error, duration: 3) {
       print("Dismiss callback")
     }
   }
   
-  @IBAction private func showInfo(_ sender: AnyObject) {
+  @IBAction private func showInfo() {
     let message = "A really long message can go here, to provide a description for the user"
     uuid = SwiftMessageBar.showMessage(withTitle: "Info", message: message, type: .info, duration: 3) {
       print("Dismiss callback")
     }
   }
 
-  @IBAction private func clearAll(_ sender: AnyObject) {
+  @IBAction private func clearAll() {
     SwiftMessageBar.sharedMessageBar.cancelAll(force: true)
     uuid = nil
   }
 
-  @IBAction private func clearCurrent(_ sender: AnyObject) {
+  @IBAction private func clearCurrent() {
     if let id = uuid {
       SwiftMessageBar.sharedMessageBar.cancel(withId: id)
       uuid = nil
     }
   }
 
+  @IBAction private func showSuccessWithAccesoryView() {
+    let message = "A really long message can go here, to provide a description for the user"
+    let button = UIButton(type: .roundedRect)
+    button.contentEdgeInsets = UIEdgeInsets(top: 5, left: 5, bottom: 5, right: 5)
+    button.setContentHuggingPriority(.required, for: .horizontal)
+    button.setTitle("Open", for: .normal)
+    button.tintColor = .orange
+    button.backgroundColor = .white
+    button.layer.cornerRadius = 6
+    button.addTarget(self, action: #selector(handleButtonTap), for: .touchUpInside)
+
+    uuid = SwiftMessageBar.showMessage(withTitle: nil, message: message, type: .success, duration: 3, dismiss: false, accessoryView: button ) {
+      print("Dismiss callback")
+    }
+  }
+  
+  @objc private func handleButtonTap() {
+    print("button tapped")
+  }
+
 }
diff --git a/SwiftMessageBar.podspec b/SwiftMessageBar.podspec
@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.authors            = { "Jan Gorman" => "https://github.com/JanGorman/", "Ramy Kfoury" => "https://github.com/ramy-kfoury/" }
   s.social_media_url   = "http://twitter.com/JanGorman"
 
-  s.platform     = :ios, "8.4"
+  s.platform     = :ios, "9.0"
 
   s.source       = { :git => "https://github.com/JanGorman/SwiftMessageBar.git", :tag => s.version }
 
diff --git a/SwiftMessageBar.xcodeproj/project.pbxproj b/SwiftMessageBar.xcodeproj/project.pbxproj
@@ -253,7 +253,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -306,7 +306,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -329,7 +329,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = SwiftMessageBar/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.schnaub.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -350,7 +350,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = SwiftMessageBar/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.schnaub.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/SwiftMessageBar/Message.swift b/SwiftMessageBar/Message.swift
diff --git a/SwiftMessageBar/SwiftMessageBar.swift b/SwiftMessageBar/SwiftMessageBar.swift

Original file line number	Diff line number	Diff line change
`@@ -15,37 +15,57 @@ class ViewController: UIViewController {`
`15`	`15`	`SwiftMessageBar.setSharedConfig(messageBarConfig)`
`16`	`16`	`}`
`17`	`17`
`18`		`- @IBAction private func showSuccess(_ sender: AnyObject) {`
	`18`	`+ @IBAction private func showSuccess() {`
`19`	`19`	`let message = "A really long message can go here, to provide a description for the user"`
`20`	`20`	`uuid = SwiftMessageBar.showMessage(withTitle: nil, message: message, type: .success, duration: 3, dismiss: false) {`
`21`	`21`	`print("Dismiss callback")`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`- @IBAction private func showError(_ sender: AnyObject) {`
	`25`	`+ @IBAction private func showError() {`
`26`	`26`	`let message = "A really long message can go here, to provide a description for the user"`
`27`	`27`	`uuid = SwiftMessageBar.showMessage(withTitle: "Error", message: message, type: .error, duration: 3) {`
`28`	`28`	`print("Dismiss callback")`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`- @IBAction private func showInfo(_ sender: AnyObject) {`
	`32`	`+ @IBAction private func showInfo() {`
`33`	`33`	`let message = "A really long message can go here, to provide a description for the user"`
`34`	`34`	`uuid = SwiftMessageBar.showMessage(withTitle: "Info", message: message, type: .info, duration: 3) {`
`35`	`35`	`print("Dismiss callback")`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- @IBAction private func clearAll(_ sender: AnyObject) {`
	`39`	`+ @IBAction private func clearAll() {`
`40`	`40`	`SwiftMessageBar.sharedMessageBar.cancelAll(force: true)`
`41`	`41`	`uuid = nil`
`42`	`42`	`}`
`43`	`43`
`44`		`- @IBAction private func clearCurrent(_ sender: AnyObject) {`
	`44`	`+ @IBAction private func clearCurrent() {`
`45`	`45`	`if let id = uuid {`
`46`	`46`	`SwiftMessageBar.sharedMessageBar.cancel(withId: id)`
`47`	`47`	`uuid = nil`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ @IBAction private func showSuccessWithAccesoryView() {`
	`52`	`+ let message = "A really long message can go here, to provide a description for the user"`
	`53`	`+ let button = UIButton(type: .roundedRect)`
	`54`	`+ button.contentEdgeInsets = UIEdgeInsets(top: 5, left: 5, bottom: 5, right: 5)`
	`55`	`+ button.setContentHuggingPriority(.required, for: .horizontal)`
	`56`	`+ button.setTitle("Open", for: .normal)`
	`57`	`+ button.tintColor = .orange`
	`58`	`+ button.backgroundColor = .white`
	`59`	`+ button.layer.cornerRadius = 6`
	`60`	`+ button.addTarget(self, action: #selector(handleButtonTap), for: .touchUpInside)`
	`61`	`+`
	`62`	`+ uuid = SwiftMessageBar.showMessage(withTitle: nil, message: message, type: .success, duration: 3, dismiss: false, accessoryView: button ) {`
	`63`	`+ print("Dismiss callback")`
	`64`	`+ }`
	`65`	`+ }`
	`66`	`+`
	`67`	`+ @objc private func handleButtonTap() {`
	`68`	`+ print("button tapped")`
	`69`	`+ }`
	`70`	`+`
`51`	`71`	`}`