Skip to content

Commit 8fc643c

Browse files
MoLiceMoLice
committed
4.1.0
1 parent 2416a78 commit 8fc643c

File tree

303 files changed

+1483
-921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+1483
-921
lines changed

‎QMUIConfigurationTemplate/QMUIConfigurationTemplate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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 {
7575
QMUICMI.fillButtonColorWhite = UIColorWhite; // FillButtonColorWhite : QMUIFillButtonColorWhite 的颜色
7676

7777
#pragma mark - TextInput
78+
QMUICMI.textFieldTextColor = nil; // TextFieldTextColor : QMUITextField、QMUITextView 的 textColor，不影响 UIKit 的输入框
7879
QMUICMI.textFieldTintColor = nil; // TextFieldTintColor : QMUITextField、QMUITextView 的 tintColor，不影响 UIKit 的输入框
7980
QMUICMI.textFieldTextInsets = UIEdgeInsetsMake(0, 7, 0, 7); // TextFieldTextInsets : QMUITextField 的内边距，不影响 UITextField
8081
QMUICMI.keyboardAppearance = UIKeyboardAppearanceDefault; // KeyboardAppearance : UITextView、UITextField、UISearchBar 的 keyboardAppearance
@@ -232,6 +233,7 @@ - (void)applyConfigurationTemplate {
232233
QMUICMI.navigationBarHiddenInitially = NO; // NavigationBarHiddenInitially : QMUINavigationControllerDelegate preferredNavigationBarHidden 的初始值，默认为NO
233234
QMUICMI.shouldFixTabBarTransitionBugInIPhoneX = NO; // ShouldFixTabBarTransitionBugInIPhoneX : 是否需要自动修复 iOS 11 下，iPhone X 的设备在 push 界面时，tabBar 会瞬间往上跳的 bug
234235
QMUICMI.shouldFixTabBarButtonBugForAll = NO; // ShouldFixTabBarButtonBugForAll : 是否要对 iOS 12.1.1 及以后的版本也修复手势返回时 tabBarButton 布局错误的 bug(issue #410)，默认为 NO
236+
QMUICMI.shouldFixTabBarSafeAreaInsetsBugForNotchedScreen = NO; // ShouldFixTabBarSafeAreaInsetsBugForNotchedScreen : 是否要对 iOS 11 及以后的版本修复全面屏设备下 pop 界面时 UIScrollView 的 inset 会跳动导致滚动位置受影响的 bug（issue #934），默认为 NO
235237
QMUICMI.shouldPrintQMUIWarnLogToConsole = IS_DEBUG; // ShouldPrintQMUIWarnLogToConsole : 是否在出现 QMUILogWarn 时自动把这些 log 以 QMUIConsole 的方式显示到设备屏幕上
236238
QMUICMI.sendAnalyticsToQMUITeam = YES; // SendAnalyticsToQMUITeam : 是否允许在 DEBUG 模式下上报 Bundle Identifier 和 Display Name 给 QMUI 统计用
237239
QMUICMI.dynamicPreferredValueForIPad = NO; // DynamicPreferredValueForIPad : 当 iPad 处于 Slide Over 或 Split View 分屏模式下，宏 `PreferredValueForXXX` 是否把 iPad 视为某种屏幕宽度近似的 iPhone 来取值。

‎QMUIKit.podspec

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "QMUIKit"
3-
s.version = "4.0.4"
3+
s.version = "4.1.0"
44
s.summary = "致力于提高项目 UI 开发效率的解决方案"
55
s.description = <<-DESC
66
QMUI iOS 是一个致力于提高项目 UI 开发效率的解决方案，其设计目的是用于辅助快速搭建一个具备基本设计还原效果的 iOS 项目，同时利用自身提供的丰富控件及兼容处理， 让开发者能专注于业务需求而无需耗费精力在基础代码的设计上。不管是新项目的创建，或是已有项目的维护，均可使开发效率和项目质量得到大幅度提升。
@@ -63,6 +63,7 @@ Pod::Spec.new do |s|
6363
ss.subspec 'QMUINavigationTitleView' do |sss|
6464
sss.source_files = 'QMUIKit/QMUIComponents/QMUINavigationTitleView.{h,m}'
6565
sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
66+
sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
6667
end
6768

6869
ss.subspec 'QMUIButton' do |sss|
@@ -105,6 +106,7 @@ Pod::Spec.new do |s|
105106
ss.subspec 'QMUIEmptyView' do |sss|
106107
sss.source_files = 'QMUIKit/QMUIComponents/QMUIEmptyView.{h,m}'
107108
sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
109+
sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
108110
end
109111

110112
ss.subspec 'QMUILabel' do |sss|
@@ -126,6 +128,12 @@ Pod::Spec.new do |s|
126128
sss.dependency 'QMUIKit/QMUIComponents/QMUIModalPresentationViewController'
127129
sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
128130
sss.dependency 'QMUIKit/QMUIComponents/QMUITextField'
131+
sss.dependency 'QMUIKit/QMUIComponents/QMUIKeyboardManager'
132+
sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
133+
end
134+
135+
ss.subspec 'QMUIAppearance' do |sss|
136+
sss.source_files = 'QMUIKit/QMUIComponents/QMUIAppearance.{h,m}'
129137
end
130138

131139
ss.subspec 'QMUICellHeightCache' do |sss|
@@ -167,6 +175,7 @@ Pod::Spec.new do |s|
167175
sss.dependency 'QMUIKit/QMUIComponents/QMUITextField'
168176
sss.dependency 'QMUIKit/QMUIComponents/QMUITableViewCell'
169177
sss.dependency 'QMUIKit/QMUIComponents/QMUINavigationTitleView'
178+
sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
170179
end
171180

172181
ss.subspec 'QMUIEmotionView' do |sss|
@@ -189,6 +198,7 @@ Pod::Spec.new do |s|
189198
sss.dependency 'QMUIKit/QMUIComponents/QMUIEmptyView'
190199
sss.dependency 'QMUIKit/QMUIComponents/QMUIPieProgressView'
191200
sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
201+
sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
192202
sss.dependency 'QMUIKit/QMUIMainFrame'
193203
end
194204

@@ -199,12 +209,14 @@ Pod::Spec.new do |s|
199209
ss.subspec 'QMUIModalPresentationViewController' do |sss|
200210
sss.source_files = 'QMUIKit/QMUIComponents/QMUIModalPresentationViewController.{h,m}'
201211
sss.dependency 'QMUIKit/QMUIComponents/QMUIKeyboardManager'
212+
sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
202213
end
203214

204215
ss.subspec 'QMUIMoreOperationController' do |sss|
205216
sss.source_files = 'QMUIKit/QMUIComponents/QMUIMoreOperationController.{h,m}'
206217
sss.dependency 'QMUIKit/QMUIComponents/QMUIModalPresentationViewController'
207218
sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
219+
sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
208220
end
209221

210222
ss.subspec 'QMUIOrderedDictionary' do |sss|
@@ -218,6 +230,7 @@ Pod::Spec.new do |s|
218230
ss.subspec 'QMUIPopupContainerView' do |sss|
219231
sss.source_files = 'QMUIKit/QMUIComponents/QMUIPopupContainerView.{h,m}'
220232
sss.dependency 'QMUIKit/QMUIMainFrame'
233+
sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
221234
end
222235

223236
ss.subspec 'QMUIPopupMenuView' do |sss|
@@ -340,6 +353,7 @@ Pod::Spec.new do |s|
340353
sss.dependency 'QMUIKit/QMUIComponents/QMUIZoomImageView'
341354
sss.dependency 'QMUIKit/QMUIComponents/QMUIAlertController'
342355
sss.dependency 'QMUIKit/QMUIComponents/QMUIEmptyView'
356+
sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
343357
end
344358

345359

‎QMUIKit/QMUIComponents/AssetLibrary/QMUIAsset.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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

+14-25
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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 @@
2020
#import "QMUIAssetsManager.h"
2121
#import "QMUIImagePickerViewController.h"
2222
#import "QMUIImagePickerHelper.h"
23+
#import "QMUIAppearance.h"
2324
#import <Photos/PHPhotoLibrary.h>
2425
#import <Photos/PHAsset.h>
2526
#import <Photos/PHFetchOptions.h>
@@ -45,13 +46,8 @@ + (void)initialize {
4546

4647
- (void)didInitializeWithStyle:(UITableViewCellStyle)style {
4748
[super didInitializeWithStyle:style];
48-
self.albumImageSize = [QMUIAlbumTableViewCell appearance].albumImageSize;
49-
self.albumImageMarginLeft = [QMUIAlbumTableViewCell appearance].albumImageMarginLeft;
50-
self.albumNameInsets = [QMUIAlbumTableViewCell appearance].albumNameInsets;
51-
self.albumNameFont = [QMUIAlbumTableViewCell appearance].albumNameFont;
52-
self.albumNameColor = [QMUIAlbumTableViewCell appearance].albumNameColor;
53-
self.albumAssetsNumberFont = [QMUIAlbumTableViewCell appearance].albumAssetsNumberFont;
54-
self.albumAssetsNumberColor = [QMUIAlbumTableViewCell appearance].albumAssetsNumberColor;
49+
50+
[self qmui_applyAppearance];
5551

5652
self.imageView.contentMode = UIViewContentModeScaleAspectFill;
5753
self.imageView.clipsToBounds = YES;
@@ -109,23 +105,19 @@ - (void)setAlbumAssetsNumberColor:(UIColor *)albumAssetsNumberColor {
109105

110106
@implementation QMUIAlbumViewController (UIAppearance)
111107

108+
+ (instancetype)appearance {
109+
return [QMUIAppearance appearanceForClass:self];
110+
}
111+
112112
+ (void)initialize {
113-
static dispatch_once_t onceToken1;
114-
dispatch_once(&onceToken1, ^{
115-
[self appearance]; // +initialize 时就先设置好默认样式
113+
static dispatch_once_t onceToken;
114+
dispatch_once(&onceToken, ^{
115+
[self initAppearance];
116116
});
117117
}
118118

119-
static QMUIAlbumViewController *albumViewControllerAppearance;
120-
+ (nonnull instancetype)appearance {
121-
static dispatch_once_t onceToken2;
122-
dispatch_once(&onceToken2, ^{
123-
if (!albumViewControllerAppearance) {
124-
albumViewControllerAppearance = [[QMUIAlbumViewController alloc] init];
125-
albumViewControllerAppearance.albumTableViewCellHeight = 88;
126-
}
127-
});
128-
return albumViewControllerAppearance;
119+
+ (void)initAppearance {
120+
QMUIAlbumViewController.appearance.albumTableViewCellHeight = 88;
129121
}
130122

131123
@end
@@ -144,10 +136,7 @@ @implementation QMUIAlbumViewController
144136
- (void)didInitialize {
145137
[super didInitialize];
146138
_shouldShowDefaultLoadingView = YES;
147-
if (albumViewControllerAppearance) {
148-
// 避免 albumViewControllerAppearance init 时走到这里来，导致死循环
149-
self.albumTableViewCellHeight = [QMUIAlbumViewController appearance].albumTableViewCellHeight;
150-
}
139+
self.albumTableViewCellHeight = [QMUIAlbumViewController appearance].albumTableViewCellHeight;
151140
}
152141

153142
- (void)setupNavigationItems {

‎QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIImagePickerCollectionViewCell.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****
22
* Tencent is pleased to support the open source community by making QMUI_iOS available.
3-
* Copyright (C) 2016-2019 THL A29 Limited, a Tencent company. All rights reserved.
3+
* Copyright (C) 2016-2020 THL A29 Limited, a Tencent company. All rights reserved.
44
* 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
55
* http://opensource.org/licenses/MIT
66
* 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.

0 commit comments

Comments
 (0)