Build 4

Cartfile.resolved

@@ -1,14 +1,15 @@
 github "ChangbaDevs/KTVHTTPCache" "1.1.7"
 github "CocoaLumberjack/CocoaLumberjack" "3.4.2"
-github "MortimerGoro/MGSwipeTableCell" "1.6.7"
+github "MortimerGoro/MGSwipeTableCell" "1.6.8"
 github "SVGKit/SVGKit" "bfe62f6d45f55c9fe39619d9e91fed1844c59da6"
+github "WeTransfer/WeScan" "v0.9.1"
 github "calimarkus/JDStatusBarNotification" "1.6.0"
-github "danielsaidi/Sheeeeeeeeet" "1.0.1"
+github "danielsaidi/Sheeeeeeeeet" "1.0.2"
 github "dzenbot/DZNEmptyDataSet" "v1.8.1"
 github "ealeksandrov/EAIntroView" "2.12.0"
 github "ealeksandrov/EARestrictedScrollView" "1.1.0"
 github "jdg/MBProgressHUD" "1.1.0"
 github "kishikawakatsumi/UICKeyChainStore" "v2.1.2"
 github "realm/realm-cocoa" "v3.12.0"
-github "sgr-ksmt/PDFGenerator" "2.1"
-github "tilltue/TLPhotoPicker" "1.7.7"
+github "sgr-ksmt/PDFGenerator" "2.1.1"
+github "tilltue/TLPhotoPicker" "1.7.8"

Carthage/Checkouts/MGSwipeTableCell/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.6.8
+
+- Fix duplicaged buttons on orientation change.
+
 ## 1.6.7
 
 - Fix quality loss in snapshot image.

Carthage/Checkouts/MGSwipeTableCell/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Imanol Fernandez @MortimerGoro
+Copyright (c) 2018 Imanol Fernandez @MortimerGoro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Carthage/Checkouts/MGSwipeTableCell/MGSwipeTableCell.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'MGSwipeTableCell'
-  s.version  = '1.6.7'
+  s.version  = '1.6.8'
   s.author   = { 'Imanol Fernandez' => 'mortimergoro@gmail.com' }
   s.homepage = 'https://github.com/MortimerGoro/MGSwipeTableCell'
   s.summary  = 'An easy to use UITableViewCell subclass that allows to display swipeable buttons with a variety of transitions'

Carthage/Checkouts/MGSwipeTableCell/MGSwipeTableCell/MGSwipeTableCell.m

@@ -1027,7 +1027,7 @@ static inline CGFloat mgEaseInOutBounce(CGFloat t, CGFloat b, CGFloat c) {
 
 - (UIImage *)imageFromView:(UIView *)view cropSize:(CGSize)cropSize{
     UIGraphicsBeginImageContextWithOptions(cropSize, NO, 0);
-    [view drawViewHierarchyInRect:view.bounds afterScreenUpdates:NO];
+    [view drawViewHierarchyInRect:view.bounds afterScreenUpdates:YES];
     UIImage * image = UIGraphicsGetImageFromCurrentImageContext();
     UIGraphicsEndImageContext();
     return image;

Carthage/Checkouts/MGSwipeTableCell/demo/MailAppDemoSwift/MailAppDemoSwift/AppDelegate.swift

@@ -11,7 +11,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         
         window = UIWindow(frame: UIScreen.main.bounds);
         let controller = MailViewController();

Carthage/Checkouts/MGSwipeTableCell/demo/MailAppDemoSwift/MailAppDemoSwift/MailTableCell.swift

@@ -68,7 +68,7 @@ class MailTableCell: MGSwipeTableCell {
         mailMessage.isScrollEnabled = false;
         mailMessage.isEditable = false;
         mailMessage.backgroundColor = UIColor.clear;
-        mailMessage.contentInset = UIEdgeInsetsMake(-5, -5, 0, 0);
+        mailMessage.contentInset = UIEdgeInsets.init(top: -5, left: -5, bottom: 0, right: 0);
         mailMessage.textColor = UIColor.gray;
         mailMessage.isUserInteractionEnabled = false;
         
@@ -83,7 +83,7 @@ class MailTableCell: MGSwipeTableCell {
         
     }
     
-    override init(style: UITableViewCellStyle, reuseIdentifier:String?)
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier:String?)
     {
         super.init(style:style, reuseIdentifier: reuseIdentifier);
         initViews();

Carthage/Checkouts/MGSwipeTableCell/demo/MailAppDemoSwift/MailAppDemoSwift/MailViewController.swift

@@ -140,7 +140,7 @@ class MailViewController: UIViewController, UITableViewDataSource, UITableViewDe
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        tableView = UITableView(frame: view.bounds, style: UITableViewStyle.plain);
+        tableView = UITableView(frame: view.bounds, style: UITableView.Style.plain);
         tableView.delegate = self;
         tableView.dataSource = self;
         view.addSubview(tableView);
@@ -148,7 +148,7 @@ class MailViewController: UIViewController, UITableViewDataSource, UITableViewDe
         self.title = "MSwipeTableCell MailApp";
         
         refreshControl = UIRefreshControl();
-        refreshControl.addTarget(self, action: #selector(refreshCallback), for: UIControlEvents.valueChanged);
+        refreshControl.addTarget(self, action: #selector(refreshCallback), for: UIControl.Event.valueChanged);
         tableView.addSubview(refreshControl);
         prepareDemoData();
     }
@@ -169,7 +169,7 @@ class MailViewController: UIViewController, UITableViewDataSource, UITableViewDe
         
         var cell: MailTableCell! = tableView.dequeueReusableCell(withIdentifier: identifier) as? MailTableCell;
         if cell == nil {
-            cell = MailTableCell(style: UITableViewCellStyle.default, reuseIdentifier: identifier);
+            cell = MailTableCell(style: UITableViewCell.CellStyle.default, reuseIdentifier: identifier);
         }
         cell.delegate = self;
         
@@ -209,7 +209,7 @@ class MailViewController: UIViewController, UITableViewDataSource, UITableViewDe
                     mail.read = !mail.read;
                     self.updateCellIndicator(mail, cell: cell as! MailTableCell);
                     cell.refreshContentView();
-                    (cell.leftButtons[0] as! UIButton).setTitle(self.readButtonText(mail.read), for: UIControlState());
+                    (cell.leftButtons[0] as! UIButton).setTitle(self.readButtonText(mail.read), for: UIControl.State());
                     
                     return true;
                 })
@@ -251,7 +251,7 @@ class MailViewController: UIViewController, UITableViewDataSource, UITableViewDe
                         mail.read = !mail.read;
                         self.updateCellIndicator(mail, cell: cell as! MailTableCell);
                         cell.refreshContentView();
-                        (cell.leftButtons[0] as! UIButton).setTitle(self.readButtonText(mail.read), for: UIControlState());
+                        (cell.leftButtons[0] as! UIButton).setTitle(self.readButtonText(mail.read), for: UIControl.State());
                         cell.hideSwipe(animated: true);
                     }
                     else if index == 2 {

Carthage/Checkouts/MGSwipeTableCell/demo/MailAppDemoSwift/MailAppDemoSwiftTests/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>mortimergoro.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

Carthage/Checkouts/PDFGenerator/PDFGenerator.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "PDFGenerator"
-  s.version          = "2.1"
+  s.version          = "2.1.1"
   s.summary          = "A simple PDF generator."
   s.homepage         = "https://github.com/sgr-ksmt/PDFGenerator"
   # s.screenshots     = ""
@@ -9,6 +9,6 @@ Pod::Spec.new do |s|
   s.source           = { :git => "https://github.com/sgr-ksmt/PDFGenerator.git", :tag => s.version.to_s }
   s.platform         = :ios, '8.0'
   s.requires_arc     = true
-  s.source_files     = "PDFGenerator/**/*"
+  s.source_files     = "PDFGenerator/**/*.swift"
   s.frameworks   = 'WebKit'
 end

Carthage/Checkouts/Sheeeeeeeeet/Fastlane/Fastfile

@@ -14,7 +14,7 @@ platform :ios do
     test
     version = version_bump_podspec(path: "Sheeeeeeeeet.podspec", version_number: options[:name])
     increment_version_number(version_number: version)
-    increment_build_number(build_number: version)
+    increment_build_number(build_number: `date "+%y%m%d%H%M"`)
 
     git_commit(
       path: [

Carthage/Checkouts/Sheeeeeeeeet/RELEASE_NOTES.md

@@ -1,5 +1,20 @@
 # Release Notes
 
+## 1.0.2
+
+This version adds new background color properties to the action sheet appearance,
+to make it possible to set the background color of the table views.
+
+This version fixes a bug, where the background color behind an action sheet went
+black when the action sheet was presented in a split view.
+
+
+## 1.0.1
+
+This version fixes a bug, where the presenters incorrectly updated the scrolling
+behavior of the action sheet when rotating the device.
+
+
 ## 1.0.0
 
 Sheeeeeeeeet 1.0.0 is finally here, with many internal changes and some external.

Carthage/Checkouts/Sheeeeeeeeet/Sheeeeeeeeet.podspec

@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Sheeeeeeeeet'
-  s.version          = '1.0.1'
+  s.version          = '1.0.2'
   s.summary          = 'Sheeeeeeeeet is a Swift library for custom iOS action sheets.'
 
   s.description      = <<-DESC

Carthage/Checkouts/Sheeeeeeeeet/Sheeeeeeeeet/ActionSheet/ActionSheet+Presenter.swift

@@ -20,8 +20,17 @@ extension UIUserInterfaceIdiom {
     
     var defaultPresenter: ActionSheetPresenter {
         switch self {
-        case .pad: return ActionSheetPopoverPresenter()
-        default: return ActionSheetStandardPresenter()
+        case .pad: return ipadPresenter
+        default: return iphonePresenter
         }
     }
+    
+    var ipadPresenter: ActionSheetPresenter {
+        let isFullscreen = UIApplication.shared.isFullScreen
+        return isFullscreen ? ActionSheetPopoverPresenter() : ActionSheetStandardPresenter()
+    }
+    
+    var iphonePresenter: ActionSheetPresenter {
+        return ActionSheetStandardPresenter()
+    }
 }

Carthage/Checkouts/Sheeeeeeeeet/Sheeeeeeeeet/ActionSheet/ActionSheet.swift

@@ -181,7 +181,7 @@ open class ActionSheet: UIViewController {
     
     public lazy var itemHandler = ActionSheetItemHandler(actionSheet: self, itemType: .items)
     
-    @IBOutlet weak var itemsTableView: UITableView? {
+    @IBOutlet weak var itemsTableView: ActionSheetTableView? {
         didSet { setup(itemsTableView, with: itemHandler) }
     }
     
@@ -196,7 +196,7 @@ open class ActionSheet: UIViewController {
     
     public lazy var buttonHandler = ActionSheetItemHandler(actionSheet: self, itemType: .buttons)
     
-    @IBOutlet weak var buttonsTableView: UITableView? {
+    @IBOutlet weak var buttonsTableView: ActionSheetTableView? {
         didSet {
             setup(buttonsTableView, with: buttonHandler)
             refreshButtonsVisibility()
@@ -250,6 +250,7 @@ open class ActionSheet: UIViewController {
     
     open func refreshItems() {
         items.forEach { $0.applyAppearance(appearance) }
+        itemsTableView?.backgroundColor = appearance.itemsBackgroundColor
         itemsTableView?.separatorColor = appearance.itemsSeparatorColor
         itemsTableViewHeight?.constant = itemsHeight
     }
@@ -257,6 +258,7 @@ open class ActionSheet: UIViewController {
     open func refreshButtons() {
         refreshButtonsVisibility()
         buttons.forEach { $0.applyAppearance(appearance) }
+        buttonsTableView?.backgroundColor = appearance.buttonsBackgroundColor
         buttonsTableView?.separatorColor = appearance.buttonsSeparatorColor
         buttonsTableViewHeight?.constant = buttonsHeight
     }

Carthage/Checkouts/Sheeeeeeeeet/Sheeeeeeeeet/ActionSheet/ActionSheet.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -46,14 +46,14 @@
                                 <constraint firstAttribute="height" constant="150" id="ZKw-6e-7h3"/>
                             </constraints>
                         </view>
-                        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="iQT-dy-e7d">
+                        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="iQT-dy-e7d" customClass="ActionSheetTableView" customModule="Sheeeeeeeeet" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="170" width="375" height="100"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="height" priority="900" constant="100" id="929-kf-L2B"/>
                             </constraints>
                         </tableView>
-                        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" scrollEnabled="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="4ww-lg-Kl7">
+                        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" scrollEnabled="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="4ww-lg-Kl7" customClass="ActionSheetTableView" customModule="Sheeeeeeeeet" customModuleProvider="target">
                             <rect key="frame" x="0.0" y="290" width="375" height="100"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>

Carthage/Checkouts/Sheeeeeeeeet/Sheeeeeeeeet/Appearance/ActionSheetAppearance.swift

@@ -33,6 +33,10 @@ open class ActionSheetAppearance {
         contentInset = copy.contentInset
         groupMargins = copy.groupMargins
         
+        backgroundColor = copy.backgroundColor
+        itemsBackgroundColor = copy.itemsBackgroundColor ?? backgroundColor
+        buttonsSeparatorColor = copy.buttonsSeparatorColor ?? backgroundColor
+        
         separatorColor = copy.separatorColor
         itemsSeparatorColor = copy.itemsSeparatorColor ?? separatorColor
         buttonsSeparatorColor = copy.buttonsSeparatorColor ?? separatorColor
@@ -64,8 +68,11 @@ open class ActionSheetAppearance {
     public var contentInset: CGFloat = 15
     public var groupMargins: CGFloat = 15
     
+    public var backgroundColor: UIColor?
     public var separatorColor: UIColor?
+    public var itemsBackgroundColor: UIColor?
     public var itemsSeparatorColor: UIColor?
+    public var buttonsBackgroundColor: UIColor?
     public var buttonsSeparatorColor: UIColor?
     
     

Carthage/Checkouts/Sheeeeeeeeet/Sheeeeeeeeet/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.1</string>
+	<string>1811242240</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

Carthage/Checkouts/Sheeeeeeeeet/SheeeeeeeeetExample/Base.lproj/Main.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="g6h-E6-DAd">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="g6h-E6-DAd">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -75,11 +75,11 @@
             </objects>
             <point key="canvasLocation" x="2410.4000000000001" y="115.59220389805098"/>
         </scene>
-        <!--Demo Application-->
+        <!--Navigation Controller-->
         <scene sceneID="BI4-bw-sjW">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="f0y-2v-eNx" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="Demo Application" id="jOV-pg-98y"/>
+                    <tabBarItem key="tabBarItem" systemItem="more" id="jOV-pg-98y"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="t4r-bp-MhJ">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>

Carthage/Checkouts/Sheeeeeeeeet/SheeeeeeeeetExample/Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.1</string>
+	<string>1811242240</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIAppFonts</key>

Carthage/Checkouts/Sheeeeeeeeet/SheeeeeeeeetTests/ActionSheet/ActionSheetTests.swift

@@ -26,6 +26,10 @@ class ActionSheetTests: QuickSpec {
             return MockActionSheet(items: items, action: { _, _ in })
         }
         
+        func createTableView() -> ActionSheetTableView {
+            return ActionSheetTableView(frame: .zero)
+        }
+        
         
         // MARK: - Initialization
         
@@ -162,7 +166,7 @@ class ActionSheetTests: QuickSpec {
             
             it("is correctly setup when set") {
                 let sheet = createSheet()
-                let view = UITableView(frame: .zero)
+                let view = createTableView()
                 sheet.itemsTableView = view
                 
                 expect(view.delegate).to(be(sheet.itemHandler))
@@ -214,7 +218,7 @@ class ActionSheetTests: QuickSpec {
             
             it("is correctly setup when set") {
                 let sheet = createSheet()
-                let view = UITableView(frame: .zero)
+                let view = createTableView()
                 sheet.buttonsTableView = view
                 
                 expect(view.delegate).to(be(sheet.buttonHandler))
@@ -309,8 +313,8 @@ class ActionSheetTests: QuickSpec {
             
             var sheet: MockActionSheet!
             var headerViewContainer: UIView!
-            var itemsView: UITableView!
-            var buttonsView: UITableView!
+            var itemsView: ActionSheetTableView!
+            var buttonsView: ActionSheetTableView!
             var stackView: UIStackView!
             
             beforeEach {
@@ -318,8 +322,8 @@ class ActionSheetTests: QuickSpec {
                 sheet.appearance.groupMargins = 123
                 sheet.appearance.cornerRadius = 90
                 headerViewContainer = UIView(frame: .zero)
-                itemsView = UITableView(frame: .zero)
-                buttonsView = UITableView(frame: .zero)
+                itemsView = createTableView()
+                buttonsView = createTableView()
                 stackView = UIStackView(frame: .zero)
                 sheet.headerViewContainer = headerViewContainer
                 sheet.itemsTableView = itemsView
@@ -404,12 +408,21 @@ class ActionSheetTests: QuickSpec {
                     expect(item2.applyAppearanceInvokeAppearances[0]).to(be(sheet.appearance))
                 }
                 
+                it("applies background color") {
+                    sheet.appearance.itemsBackgroundColor = .yellow
+                    let view = createTableView()
+                    sheet.itemsTableView = view
+                    sheet.refresh()
+                    
+                    expect(view.backgroundColor).to(equal(.yellow))
+                }
+                
                 it("applies separator color") {
                     sheet.appearance.itemsSeparatorColor = .yellow
-                    let view = UITableView(frame: .zero)
+                    let view = createTableView()
                     sheet.itemsTableView = view
                     sheet.refresh()
-                    
+
                     expect(view.separatorColor).to(equal(.yellow))
                 }
             }
@@ -434,9 +447,18 @@ class ActionSheetTests: QuickSpec {
                     expect(item2.applyAppearanceInvokeAppearances[0]).to(be(sheet.appearance))
                 }
                 
+                it("applies background color") {
+                    sheet.appearance.buttonsBackgroundColor = .yellow
+                    let view = createTableView()
+                    sheet.buttonsTableView = view
+                    sheet.refresh()
+                    
+                    expect(view.backgroundColor).to(equal(.yellow))
+                }
+                
                 it("applies separator color") {
                     sheet.appearance.buttonsSeparatorColor = .yellow
-                    let view = UITableView(frame: .zero)
+                    let view = createTableView()
                     sheet.buttonsTableView = view
                     sheet.refresh()
                     

Carthage/Checkouts/Sheeeeeeeeet/SheeeeeeeeetTests/Info.plist

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.1</string>
+	<string>1811242240</string>
 </dict>
 </plist>

Carthage/Checkouts/Sheeeeeeeeet/SheeeeeeeeetTests/Views/MockTableView.swift

@@ -7,8 +7,9 @@
 //
 
 import UIKit
+import Sheeeeeeeeet
 
-class MockTableView: UITableView {
+class MockTableView: ActionSheetTableView {
 
     var deselectRowInvokeCount = 0
     var deselectRowInvokePaths = [IndexPath]()

Carthage/Checkouts/TLPhotoPicker/TLPhotoPicker.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'TLPhotoPicker'
-  s.version          = '1.7.7'
+  s.version          = '1.7.8'
   s.summary          = 'multiple phassets picker for iOS lib. like facebook'
 
 # This description is used to generate tags and improve search results.

Carthage/Checkouts/TLPhotoPicker/TLPhotoPicker/Classes/TLPhotoLibrary.swift

@@ -135,16 +135,23 @@ extension TLPhotoLibrary {
         let options = configure.fetchOption ?? PHFetchOptions()
         options.sortDescriptors = [NSSortDescriptor(key: "creationDate", ascending: false)]
         if let mediaType = configure.mediaType {
-            let mediaTypePredicate = configure.maxVideoDuration != nil && mediaType == PHAssetMediaType.video ? NSPredicate(format: "mediaType = %i AND duration < %f", mediaType.rawValue, configure.maxVideoDuration! + 1) : NSPredicate(format: "mediaType = %i", mediaType.rawValue)
-            options.merge(predicate: mediaTypePredicate)
-        } else if !configure.allowedVideo {
-            let mediaTypePredicate = NSPredicate(format: "mediaType = %i", PHAssetMediaType.image.rawValue)
-            options.merge(predicate: mediaTypePredicate)
-        } else if let duration = configure.maxVideoDuration {
-            let mediaTypePredicate = NSPredicate(format: "mediaType = %i OR (mediaType = %i AND duration < %f)", PHAssetMediaType.image.rawValue, PHAssetMediaType.video.rawValue, duration + 1)
-            options.merge(predicate: mediaTypePredicate)
+            let mediaPredicate = NSPredicate(format: "mediaType = %i", mediaType.rawValue)
+            options.merge(predicate: mediaPredicate)
+        }
+        if configure.allowedVideo == false {
+            let notVideoPredicate = NSPredicate(format: "mediaType != %i", PHAssetMediaType.video.rawValue)
+            options.merge(predicate: notVideoPredicate)
+        }
+        if configure.allowedLivePhotos == false {
+            let notLivePhotoPredicate = NSPredicate(format: "mediaType = %i OR mediaSubtype != %i",
+                                                    PHAssetMediaType.video.rawValue,
+                                                    PHAssetMediaSubtype.photoLive.rawValue)
+            options.merge(predicate: notLivePhotoPredicate)
+        }
+        if let maxVideoDuration = configure.maxVideoDuration {
+            let durationPredicate = NSPredicate(format: "duration < %f", maxVideoDuration)
+            options.merge(predicate: durationPredicate)
         }
-        
         return options
     }
     

Carthage/Checkouts/TLPhotoPicker/TLPhotoPicker/Classes/TLPhotosPickerViewController.swift

@@ -618,8 +618,7 @@ extension TLPhotosPickerViewController: PHLivePhotoViewDelegate {
             if requestId > 0 {
                 self.playRequestId = (indexPath,requestId)
             }
-        }else if asset.type == .livePhoto {
-            
+        }else if asset.type == .livePhoto && self.allowedLivePhotos {
             guard let cell = self.collectionView.cellForItem(at: indexPath) as? TLPhotoCollectionViewCell else { return }
             let requestId = self.photoLibrary.livePhotoAsset(asset: phAsset, size: self.thumbnailSize, completionBlock: { [weak cell] (livePhoto,complete) in
                 cell?.livePhotoView?.isHidden = false
@@ -813,7 +812,7 @@ extension TLPhotosPickerViewController: UICollectionViewDelegate,UICollectionVie
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: nibName, for: indexPath) as! TLPhotoCollectionViewCell
             cell.configure = self.configure
             cell.imageView?.image = self.placeholderThumbnail
-            cell.liveBadgeImageView = nil
+            cell.liveBadgeImageView?.image = nil
             return cell
         }
         let nibName = self.configure.nibSet?.nibName ?? "TLPhotoCollectionViewCell"

iOSClient/Brand/File_Provider_Extension.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.22.7</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionFileProviderDocumentGroup</key>

iOSClient/Brand/Notification_Service_Extension.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.22.7</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

iOSClient/Brand/Share.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.22.7</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>4</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

iOSClient/Brand/iOSClient.plist

@@ -50,7 +50,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>4</string>
 	<key>FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED</key>
 	<true/>
 	<key>Fabric</key>