4.1.0

QMUIConfigurationTemplate/QMUIConfigurationTemplate.h

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

QMUIConfigurationTemplate/QMUIConfigurationTemplate.m

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
@@ -75,6 +75,7 @@ - (void)applyConfigurationTemplate {
     QMUICMI.fillButtonColorWhite = UIColorWhite;                                // FillButtonColorWhite : QMUIFillButtonColorWhite 的颜色
 
     #pragma mark - TextInput
+    QMUICMI.textFieldTextColor = nil;                                           // TextFieldTextColor : QMUITextField、QMUITextView 的 textColor，不影响 UIKit 的输入框
     QMUICMI.textFieldTintColor = nil;                                           // TextFieldTintColor : QMUITextField、QMUITextView 的 tintColor，不影响 UIKit 的输入框
     QMUICMI.textFieldTextInsets = UIEdgeInsetsMake(0, 7, 0, 7);                 // TextFieldTextInsets : QMUITextField 的内边距，不影响 UITextField
     QMUICMI.keyboardAppearance = UIKeyboardAppearanceDefault;                   // KeyboardAppearance : UITextView、UITextField、UISearchBar 的 keyboardAppearance
@@ -232,6 +233,7 @@ - (void)applyConfigurationTemplate {
     QMUICMI.navigationBarHiddenInitially = NO;                                  // NavigationBarHiddenInitially : QMUINavigationControllerDelegate preferredNavigationBarHidden 的初始值，默认为NO
     QMUICMI.shouldFixTabBarTransitionBugInIPhoneX = NO;                         // ShouldFixTabBarTransitionBugInIPhoneX : 是否需要自动修复 iOS 11 下，iPhone X 的设备在 push 界面时，tabBar 会瞬间往上跳的 bug
     QMUICMI.shouldFixTabBarButtonBugForAll = NO;                                // ShouldFixTabBarButtonBugForAll : 是否要对 iOS 12.1.1 及以后的版本也修复手势返回时 tabBarButton 布局错误的 bug(issue #410)，默认为 NO
+    QMUICMI.shouldFixTabBarSafeAreaInsetsBugForNotchedScreen = NO;              // ShouldFixTabBarSafeAreaInsetsBugForNotchedScreen : 是否要对 iOS 11 及以后的版本修复全面屏设备下 pop 界面时 UIScrollView 的 inset 会跳动导致滚动位置受影响的 bug（issue #934），默认为 NO
     QMUICMI.shouldPrintQMUIWarnLogToConsole = IS_DEBUG;                         // ShouldPrintQMUIWarnLogToConsole : 是否在出现 QMUILogWarn 时自动把这些 log 以 QMUIConsole 的方式显示到设备屏幕上
     QMUICMI.sendAnalyticsToQMUITeam = YES;                                      // SendAnalyticsToQMUITeam : 是否允许在 DEBUG 模式下上报 Bundle Identifier 和 Display Name 给 QMUI 统计用
     QMUICMI.dynamicPreferredValueForIPad = NO;                                  // DynamicPreferredValueForIPad : 当 iPad 处于 Slide Over 或 Split View 分屏模式下，宏 `PreferredValueForXXX` 是否把 iPad 视为某种屏幕宽度近似的 iPhone 来取值。

QMUIKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "QMUIKit"
-  s.version          = "4.0.4"
+  s.version          = "4.1.0"
   s.summary          = "致力于提高项目 UI 开发效率的解决方案"
   s.description      = <<-DESC
                        QMUI iOS 是一个致力于提高项目 UI 开发效率的解决方案，其设计目的是用于辅助快速搭建一个具备基本设计还原效果的 iOS 项目，同时利用自身提供的丰富控件及兼容处理， 让开发者能专注于业务需求而无需耗费精力在基础代码的设计上。不管是新项目的创建，或是已有项目的维护，均可使开发效率和项目质量得到大幅度提升。
@@ -63,6 +63,7 @@ Pod::Spec.new do |s|
     ss.subspec 'QMUINavigationTitleView' do |sss|
       sss.source_files = 'QMUIKit/QMUIComponents/QMUINavigationTitleView.{h,m}'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
+      sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
     end
 
     ss.subspec 'QMUIButton' do |sss|
@@ -105,6 +106,7 @@ Pod::Spec.new do |s|
     ss.subspec 'QMUIEmptyView' do |sss|
       sss.source_files = 'QMUIKit/QMUIComponents/QMUIEmptyView.{h,m}'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
+      sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
     end
 
     ss.subspec 'QMUILabel' do |sss|
@@ -126,6 +128,12 @@ Pod::Spec.new do |s|
       sss.dependency 'QMUIKit/QMUIComponents/QMUIModalPresentationViewController'
 			sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
 			sss.dependency 'QMUIKit/QMUIComponents/QMUITextField'
+			sss.dependency 'QMUIKit/QMUIComponents/QMUIKeyboardManager'
+			sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
+    end
+
+    ss.subspec 'QMUIAppearance' do |sss|
+      sss.source_files = 'QMUIKit/QMUIComponents/QMUIAppearance.{h,m}'
     end
 
     ss.subspec 'QMUICellHeightCache' do |sss|
@@ -167,6 +175,7 @@ Pod::Spec.new do |s|
 			sss.dependency 'QMUIKit/QMUIComponents/QMUITextField'
 			sss.dependency 'QMUIKit/QMUIComponents/QMUITableViewCell'
 			sss.dependency 'QMUIKit/QMUIComponents/QMUINavigationTitleView'
+			sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
     end
 
     ss.subspec 'QMUIEmotionView' do |sss|
@@ -189,6 +198,7 @@ Pod::Spec.new do |s|
 			sss.dependency 'QMUIKit/QMUIComponents/QMUIEmptyView'
 			sss.dependency 'QMUIKit/QMUIComponents/QMUIPieProgressView'
 			sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
+			sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
       sss.dependency 'QMUIKit/QMUIMainFrame'
     end
 
@@ -199,12 +209,14 @@ Pod::Spec.new do |s|
     ss.subspec 'QMUIModalPresentationViewController' do |sss|
       sss.source_files = 'QMUIKit/QMUIComponents/QMUIModalPresentationViewController.{h,m}'
 			sss.dependency 'QMUIKit/QMUIComponents/QMUIKeyboardManager'
+			sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
     end
 
     ss.subspec 'QMUIMoreOperationController' do |sss|
       sss.source_files = 'QMUIKit/QMUIComponents/QMUIMoreOperationController.{h,m}'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIModalPresentationViewController'
 			sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
+			sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
     end
 
     ss.subspec 'QMUIOrderedDictionary' do |sss|
@@ -218,6 +230,7 @@ Pod::Spec.new do |s|
     ss.subspec 'QMUIPopupContainerView' do |sss|
       sss.source_files = 'QMUIKit/QMUIComponents/QMUIPopupContainerView.{h,m}'
       sss.dependency 'QMUIKit/QMUIMainFrame'
+      sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
     end
 
     ss.subspec 'QMUIPopupMenuView' do |sss|
@@ -340,6 +353,7 @@ Pod::Spec.new do |s|
       sss.dependency 'QMUIKit/QMUIComponents/QMUIZoomImageView'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIAlertController'
       sss.dependency 'QMUIKit/QMUIComponents/QMUIEmptyView'
+      sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
     end
 
 

QMUIKit/QMUIComponents/AssetLibrary/QMUIAsset.h

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

QMUIKit/QMUIComponents/AssetLibrary/QMUIAsset.m

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

QMUIKit/QMUIComponents/AssetLibrary/QMUIAssetsGroup.h

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

QMUIKit/QMUIComponents/AssetLibrary/QMUIAssetsGroup.m

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

QMUIKit/QMUIComponents/AssetLibrary/QMUIAssetsManager.h

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

QMUIKit/QMUIComponents/AssetLibrary/QMUIAssetsManager.m

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

QMUIKit/QMUIComponents/CAAnimation+QMUI.h

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

QMUIKit/QMUIComponents/CAAnimation+QMUI.m

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIAlbumViewController.h

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIAlbumViewController.m

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
@@ -20,6 +20,7 @@
 #import "QMUIAssetsManager.h"
 #import "QMUIImagePickerViewController.h"
 #import "QMUIImagePickerHelper.h"
+#import "QMUIAppearance.h"
 #import <Photos/PHPhotoLibrary.h>
 #import <Photos/PHAsset.h>
 #import <Photos/PHFetchOptions.h>
@@ -45,13 +46,8 @@ + (void)initialize {
 
 - (void)didInitializeWithStyle:(UITableViewCellStyle)style {
     [super didInitializeWithStyle:style];
-    self.albumImageSize = [QMUIAlbumTableViewCell appearance].albumImageSize;
-    self.albumImageMarginLeft = [QMUIAlbumTableViewCell appearance].albumImageMarginLeft;
-    self.albumNameInsets = [QMUIAlbumTableViewCell appearance].albumNameInsets;
-    self.albumNameFont = [QMUIAlbumTableViewCell appearance].albumNameFont;
-    self.albumNameColor = [QMUIAlbumTableViewCell appearance].albumNameColor;
-    self.albumAssetsNumberFont = [QMUIAlbumTableViewCell appearance].albumAssetsNumberFont;
-    self.albumAssetsNumberColor = [QMUIAlbumTableViewCell appearance].albumAssetsNumberColor;
+
+    [self qmui_applyAppearance];
 
     self.imageView.contentMode = UIViewContentModeScaleAspectFill;
     self.imageView.clipsToBounds = YES;
@@ -109,23 +105,19 @@ - (void)setAlbumAssetsNumberColor:(UIColor *)albumAssetsNumberColor {
 
 @implementation QMUIAlbumViewController (UIAppearance)
 
++ (instancetype)appearance {
+    return [QMUIAppearance appearanceForClass:self];
+}
+
 + (void)initialize {
-    static dispatch_once_t onceToken1;
-    dispatch_once(&onceToken1, ^{
-        [self appearance]; // +initialize 时就先设置好默认样式
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        [self initAppearance];
     });
 }
 
-static QMUIAlbumViewController *albumViewControllerAppearance;
-+ (nonnull instancetype)appearance {
-    static dispatch_once_t onceToken2;
-    dispatch_once(&onceToken2, ^{
-        if (!albumViewControllerAppearance) {
-            albumViewControllerAppearance = [[QMUIAlbumViewController alloc] init];
-            albumViewControllerAppearance.albumTableViewCellHeight = 88;
-        }
-    });
-    return albumViewControllerAppearance;
++ (void)initAppearance {
+    QMUIAlbumViewController.appearance.albumTableViewCellHeight = 88;
 }
 
 @end
@@ -144,10 +136,7 @@ @implementation QMUIAlbumViewController
 - (void)didInitialize {
     [super didInitialize];
     _shouldShowDefaultLoadingView = YES;
-    if (albumViewControllerAppearance) {
-        // 避免 albumViewControllerAppearance init 时走到这里来，导致死循环
-        self.albumTableViewCellHeight = [QMUIAlbumViewController appearance].albumTableViewCellHeight;
-    }
+    self.albumTableViewCellHeight = [QMUIAlbumViewController appearance].albumTableViewCellHeight;
 }
 
 - (void)setupNavigationItems {

QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIImagePickerCollectionViewCell.h

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIImagePickerCollectionViewCell.m

@@ -1,6 +1,6 @@
 /*****
  * Tencent is pleased to support the open source community by making QMUI_iOS available.
- * Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.