UI细节优化

Author: Gdxy

TLDatePicker/TLDatePicker.m

@@ -118,8 +118,7 @@ - (void)viewDidLayoutSubviews {
     frame.size.height = 50;
     self.topBar.frame = frame;
 
-//    rect.size.height = 50;
-//    rect.origin.y = 50;
+    rect.origin.y = self.isIPhoneXOrLater ? 25 : 10;
     self.datePicker.frame = rect;
 
     [self.view bringSubviewToFront:self.topBar];

TLDatePicker/TLDatePickerBaseController.h

@@ -10,17 +10,19 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-#define kHeight 320.f               // 竖屏
+#define kHeight 270.f               // 竖屏
 #define kHeightOfLandscape 270.f    // 横屏
 
 @interface TLDatePickerBaseController : UIViewController
 
-/// Picker View 的有效高度，iPhoneX系列 自动增加34。 默认： kHeight
+/// Picker View 的有效高度，默认： kHeight (非iPhone X系列 额外增加30 )
 @property(nonatomic, assign) CGFloat height;
 
 @property(nonatomic, assign) BOOL disableTapMaskToDismiss;
 @property(nonatomic, copy) void (^didTapMaskView)(void);
 
+@property(nonatomic, assign, readonly) BOOL isIPhoneXOrLater;
+
 - (void)showInViewController:(UIViewController *)vc;
 @end
 

TLDatePicker/TLDatePickerBaseController.m

@@ -39,9 +39,8 @@ - (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection
 - (void)updatePreferredContentSizeWithTraitCollection:(UITraitCollection *)traitCollection {
     BOOL isCompact = traitCollection.verticalSizeClass == UIUserInterfaceSizeClassCompact;
     CGFloat H = isCompact ? kHeightOfLandscape : kHeight;
-    BOOL isIPhoneX = YES;
-    if (isIPhoneX) {
-        H += 34;
+    if (!self.isIPhoneXOrLater) {
+        H += 30;
     }
     self.preferredContentSize = CGSizeMake(self.view.bounds.size.width, H);
 }
@@ -59,5 +58,11 @@ - (void)showInViewController:(UIViewController *)vc {
     [vc presentViewController:self animated:YES completion:nil];
 }
 
-
+- (BOOL)isIPhoneXOrLater {
+    BOOL isIPhoneX = (CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(375, 812)) ||
+                      CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(812, 375)) ||
+                      CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(414, 896)) ||
+                      CGSizeEqualToSize([UIScreen mainScreen].bounds.size, CGSizeMake(896, 414)));
+    return isIPhoneX;
+}
 @end

TLDatePicker/TLDatePickerView.m

@@ -196,7 +196,7 @@ - (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComp
         // 恢复到上次选中的item
         [cpt selectItemOfIndex:index];
         [self scrollToSelectedDateWithAnimatedComponent:cpt];
-        [self showTip:@"无效选择，日期低于上限"];
+        [self showTip:@"无效选择，日期小于下限"];
         return;
     }else if (self.maxDate && [self.maxDate compareFrom:willSelectDate] < 0) {
         // 无效选择，日期不能大于self.maxDate