支持调整 header 部分的间距

Author: yulingtianxia

Example/TBAlertControllerDemo/ConditionerView.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,20 +15,20 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="按钮高度" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="haQ-d8-9b8">
-                    <rect key="frame" x="8" y="8" width="69.333333333333329" height="30"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="按钮高度（下次生效）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="haQ-d8-9b8">
+                    <rect key="frame" x="8" y="8" width="173.33333333333334" height="30"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="按钮宽度" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9C2-jg-wKE">
-                    <rect key="frame" x="8" y="46" width="69.333333333333329" height="29"/>
+                    <rect key="frame" x="8" y="46" width="69.333333333333329" height="30"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Y偏移量" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gSM-2S-Dxa">
-                    <rect key="frame" x="8" y="83" width="63" height="31"/>
+                    <rect key="frame" x="8" y="84" width="63" height="30"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
@@ -46,13 +46,13 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="矩形圆角半径" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ev7-5a-npH">
-                    <rect key="frame" x="8" y="200" width="104" height="29"/>
+                    <rect key="frame" x="8" y="200" width="104" height="30"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="动画持续时长" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qSa-Ek-8De">
-                    <rect key="frame" x="8" y="237" width="104" height="31"/>
+                    <rect key="frame" x="8" y="238" width="104" height="30"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>

Source/TBActionSheet/TBActionSheet.h

@@ -176,10 +176,29 @@ NS_ASSUME_NONNULL_BEGIN
  按钮之间的小间隙，default = 0.5
  */
 @property (nonatomic) CGFloat smallFragment UI_APPEARANCE_SELECTOR;
+
+/**
+ --------------------------
+ headerVerticalSpacing
+ --------------------------
+ title
+ --------------------------
+ headerLineSpacing
+ --------------------------
+ message
+ --------------------------
+ headerVerticalSpacing
+ --------------------------
+ */
+
 /**
  header 文字的纵向留白
  */
-@property (nonatomic) CGFloat headerVerticalSpace UI_APPEARANCE_SELECTOR;
+@property (nonatomic) CGFloat headerVerticalSpacing UI_APPEARANCE_SELECTOR;
+/**
+ title 与 message 文字的行距
+ */
+@property (nonatomic) CGFloat headerLineSpacing UI_APPEARANCE_SELECTOR;
 /**
  ActionSheet 内容超出屏幕后是否开启滚动，默认为 YES
  */

Source/TBActionSheet/TBActionSheet.m

@@ -14,7 +14,6 @@
 #import "UIWindow+TBAdditions.h"
 #import "UIView+TBAdditions.h"
 
-const CGFloat headerVerticalSpace = 10;
 const CGFloat blurRadius = 0.7;
 
 typedef void (^TBBlurEffectBlock)(void);
@@ -73,6 +72,7 @@ + (void)initialize
     appearance.animationVelocity = 1;
     appearance.supportedInterfaceOrientations = UIInterfaceOrientationMaskAll;
     appearance.scrollEnabled = YES;
+    appearance.headerVerticalSpacing = 10;
 }
 
 - (instancetype)init
@@ -385,7 +385,7 @@ - (void)setupLayout
 
     //处理标题
     if ([self hasTitle]) {
-        lastY += headerVerticalSpace;
+        lastY += self.headerVerticalSpacing;
         self.titleLabel.frame = CGRectMake(0, lastY, self.sheetWidth, 0);
         [self.actionContainer.header addSubview:self.titleLabel];
         self.titleLabel.text = self.title;
@@ -394,7 +394,10 @@ - (void)setupLayout
     //处理 message
     if ([self hasMessage]) {
         if (![self hasTitle]) {
-            lastY += headerVerticalSpace;
+            lastY += self.headerVerticalSpacing;
+        }
+        else {
+            lastY += self.headerLineSpacing;
         }
         self.messageLabel.frame = CGRectMake(0, lastY, self.sheetWidth, 0);
         [self.actionContainer.header addSubview:self.messageLabel];
@@ -404,7 +407,7 @@ - (void)setupLayout
 
     //处理title
     if ([self hasHeader]) {
-        lastY += headerVerticalSpace;
+        lastY += self.headerVerticalSpacing;
         self.actionContainer.header.frame = CGRectMake(0, 0, self.sheetWidth, lastY);
     }
 

TBActionSheet.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name         = "TBActionSheet"
-s.version      = "1.7.3"
+s.version      = "1.7.4"
 s.summary      = "A Custom&Magical ActionSheet."
 s.description  = <<-DESC
 TBActionSheet is a small library that allows you to substitute Apple's uncustomizable UIActionSheet, with a beautiful and totally customizable actionsheet that you can use in your iOS app. The default style is iOS9/10, you can make your own style. Enjoy!