Skip to content

Commit 1a0a6a5

Browse files
committed
4.3.0
1 parent 0f4a3eb commit 1a0a6a5

File tree

100 files changed

+2188
-1010
lines changed

Some content is hidden

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

100 files changed

+2188
-1010
lines changed

QMUIConfigurationTemplate/QMUIConfigurationTemplate.m

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,15 @@ - (void)applyConfigurationTemplate {
8383
#pragma mark - UISwitch
8484
QMUICMI.switchOnTintColor = nil; // SwitchOnTintColor : UISwitch 打开时的背景色(除了圆点外的其他颜色)
8585
QMUICMI.switchOffTintColor = nil; // SwitchOffTintColor : UISwitch 关闭时的背景色(除了圆点外的其他颜色)
86-
QMUICMI.switchTintColor = nil; // SwitchTintColor : UISwitch 关闭时的周围边框颜色
8786
QMUICMI.switchThumbTintColor = nil; // SwitchThumbTintColor : UISwitch 中间的操控圆点的颜色
8887

8988
#pragma mark - NavigationBar
9089

9190
QMUICMI.navBarContainerClasses = nil; // NavBarContainerClasses : NavigationBar 系列开关被用于 UIAppearance 时的生效范围(默认情况下除了用于 UIAppearance 外,还用于实现了 QMUINavigationControllerAppearanceDelegate 的 UIViewController),默认为 nil。当赋值为 nil 或者空数组时等效于 @[UINavigationController.class],也即对所有 UINavigationBar 生效,包括系统的通讯录(ContactsUI.framework)、打印等。当值不为空时,获取 UINavigationBar 的 appearance 请使用 UINavigationBar.qmui_appearanceConfigured 方法代替系统的 UINavigationBar.appearance。请保证这个配置项先于其他任意 NavBar 配置项执行。
9291
QMUICMI.navBarHighlightedAlpha = 0.2f; // NavBarHighlightedAlpha : QMUINavigationButton 在 highlighted 时的 alpha
9392
QMUICMI.navBarDisabledAlpha = 0.2f; // NavBarDisabledAlpha : QMUINavigationButton 在 disabled 时的 alpha
94-
QMUICMI.navBarButtonFont = nil; // NavBarButtonFont : QMUINavigationButtonTypeNormal 和 UINavigationBar 上的 UIBarButtonItem 的字体
95-
QMUICMI.navBarButtonFontBold = nil; // NavBarButtonFontBold : QMUINavigationButtonTypeBold 的字体
93+
QMUICMI.navBarButtonFont = nil; // NavBarButtonFont : UINavigationBar UIBarButtonItem 以及 QMUINavigationButtonTypeNormal 的字体
94+
QMUICMI.navBarButtonFontBold = nil; // NavBarButtonFontBold : UINavigationBar 里 Done 类型的 UIBarButtonItem 以及 QMUINavigationButtonTypeBold 的字体
9695
QMUICMI.navBarBackgroundImage = nil; // NavBarBackgroundImage : UINavigationBar 的背景图
9796
QMUICMI.navBarShadowImage = nil; // NavBarShadowImage : UINavigationBar.shadowImage,也即导航栏底部那条分隔线,配合 NavBarShadowImageColor 使用。
9897
QMUICMI.navBarShadowImageColor = nil; // NavBarShadowImageColor : UINavigationBar.shadowImage 的颜色,如果为 nil,则使用 NavBarShadowImage 的值,如果 NavBarShadowImage 也为 nil,则使用系统默认的分隔线。如果不为 nil,而 NavBarShadowImage 为 nil,则自动创建一张 1px 高的图并将其设置为 NavBarShadowImageColor 的颜色然后设置上去,如果 NavBarShadowImage 不为 nil 且 renderingMode 不为 UIImageRenderingModeAlwaysOriginal,则将 NavBarShadowImage 设置为 NavBarShadowImageColor 的颜色然后设置上去。

QMUIKit.podspec

Lines changed: 3 additions & 14 deletions
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.2.3"
3+
s.version = "4.3.0"
44
s.summary = "致力于提高项目 UI 开发效率的解决方案"
55
s.description = <<-DESC
66
QMUI iOS 是一个致力于提高项目 UI 开发效率的解决方案,其设计目的是用于辅助快速搭建一个具备基本设计还原效果的 iOS 项目,同时利用自身提供的丰富控件及兼容处理, 让开发者能专注于业务需求而无需耗费精力在基础代码的设计上。不管是新项目的创建,或是已有项目的维护,均可使开发效率和项目质量得到大幅度提升。
@@ -89,11 +89,6 @@ Pod::Spec.new do |s|
8989
sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
9090
end
9191

92-
ss.subspec 'QMUILinkButton' do |sss|
93-
sss.source_files = 'QMUIKit/QMUIComponents/QMUIButton/QMUILinkButton.{h,m}'
94-
sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
95-
end
96-
9792
ss.subspec 'QMUINavigationButton' do |sss|
9893
sss.source_files = 'QMUIKit/QMUIComponents/QMUIButton/QMUINavigationButton.{h,m}'
9994
sss.dependency 'QMUIKit/QMUIMainFrame'
@@ -125,6 +120,7 @@ Pod::Spec.new do |s|
125120
ss.subspec 'QMUIKeyboardManager' do |sss|
126121
sss.source_files = 'QMUIKit/QMUIComponents/QMUIKeyboardManager.{h,m}'
127122
sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
123+
sss.dependency 'QMUIKit/QMUIComponents/QMUIMultipleDelegates'
128124
end
129125

130126
# 从这里开始就是非必须的组件
@@ -140,6 +136,7 @@ Pod::Spec.new do |s|
140136
sss.dependency 'QMUIKit/QMUIComponents/QMUITextField'
141137
sss.dependency 'QMUIKit/QMUIComponents/QMUIKeyboardManager'
142138
sss.dependency 'QMUIKit/QMUIComponents/QMUIAppearance'
139+
sss.dependency 'QMUIKit/QMUIComponents/QMUILabel'
143140
end
144141

145142
ss.subspec 'QMUIAppearance' do |sss|
@@ -314,7 +311,6 @@ Pod::Spec.new do |s|
314311
sss.dependency 'QMUIKit/QMUIComponents/QMUIButton'
315312
sss.dependency 'QMUIKit/QMUIComponents/QMUIFillButton'
316313
sss.dependency 'QMUIKit/QMUIComponents/QMUIGhostButton'
317-
sss.dependency 'QMUIKit/QMUIComponents/QMUILinkButton'
318314
sss.dependency 'QMUIKit/QMUIComponents/QMUIConsole'
319315
sss.dependency 'QMUIKit/QMUIComponents/QMUIEmotionView'
320316
sss.dependency 'QMUIKit/QMUIComponents/QMUIEmptyView'
@@ -326,7 +322,6 @@ Pod::Spec.new do |s|
326322
sss.dependency 'QMUIKit/QMUIComponents/QMUISlider'
327323
sss.dependency 'QMUIKit/QMUIComponents/QMUITextField'
328324
sss.dependency 'QMUIKit/QMUIComponents/QMUITextView'
329-
sss.dependency 'QMUIKit/QMUIComponents/QMUIVisualEffectView'
330325
sss.dependency 'QMUIKit/QMUIComponents/QMUIToastView'
331326
sss.dependency 'QMUIKit/QMUIComponents/QMUIModalPresentationViewController'
332327
sss.dependency 'QMUIKit/QMUIComponents/QMUIBadge'
@@ -338,11 +333,6 @@ Pod::Spec.new do |s|
338333
sss.dependency 'QMUIKit/QMUIComponents/QMUIToastView'
339334
end
340335

341-
ss.subspec 'QMUIVisualEffectView' do |sss|
342-
sss.source_files = 'QMUIKit/QMUIComponents/QMUIVisualEffectView.{h,m}'
343-
sss.dependency 'QMUIKit/QMUIComponents/QMUICALayerExtension'
344-
end
345-
346336
ss.subspec 'QMUIWindowSizeMonitor' do |sss|
347337
sss.source_files = 'QMUIKit/QMUIComponents/QMUIWindowSizeMonitor.{h,m}'
348338
end
@@ -406,7 +396,6 @@ Pod::Spec.new do |s|
406396
ss.subspec 'QMUIToastView' do |sss|
407397
sss.source_files = 'QMUIKit/QMUIComponents/ToastView/*.{h,m}'
408398
sss.dependency 'QMUIKit/QMUIComponents/QMUIKeyboardManager'
409-
sss.dependency 'QMUIKit/QMUIComponents/QMUIVisualEffectView'
410399
end
411400

412401
ss.subspec 'QMUIStaticTableView' do |sss|

QMUIKit/QMUIComponents/CALayer+QMUIViewAnimation.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ + (void)load {
8181

8282
static char kAssociatedObjectKey_qmuiviewAnimationEnabled;
8383
- (void)setQmui_viewAnimationEnabled:(BOOL)qmui_viewAnimationEnabled {
84-
NSAssert(!self.qmui_isRootLayerOfView, @"UIView 本身的 Layer 无须开启该属性");
84+
QMUIAssert(!self.qmui_isRootLayerOfView, @"CALayer (QMUIViewAnimation)", @"UIView 本身的 Layer 无须开启 %s", __func__);
8585
objc_setAssociatedObject(self, &kAssociatedObjectKey_qmuiviewAnimationEnabled, @(qmui_viewAnimationEnabled), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
8686
if (qmui_viewAnimationEnabled) {
8787
self.qmui_multipleDelegatesEnabled = YES;

QMUIKit/QMUIComponents/ImagePickerLibrary/QMUIAlbumViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ - (void)pickAlbumsGroup:(QMUIAssetsGroup *)assetsGroup animated:(BOOL)animated {
227227
if (!self.imagePickerViewController) {
228228
self.imagePickerViewController = [self.albumViewControllerDelegate imagePickerViewControllerForAlbumViewController:self];
229229
}
230-
NSAssert(self.imagePickerViewController, @"self.%@ 必须实现 %@ 并返回一个 %@ 对象", NSStringFromSelector(@selector(albumViewControllerDelegate)), NSStringFromSelector(@selector(imagePickerViewControllerForAlbumViewController:)), NSStringFromClass([QMUIImagePickerViewController class]));
230+
QMUIAssert(!!self.imagePickerViewController, NSStringFromClass(self.class), NSStringFromClass(self.class), @"self.%@ 必须实现 %@ 并返回一个 %@ 对象", NSStringFromSelector(@selector(albumViewControllerDelegate)), NSStringFromSelector(@selector(imagePickerViewControllerForAlbumViewController:)), NSStringFromClass([QMUIImagePickerViewController class]));
231231

232232
[self.imagePickerViewController refreshWithAssetsGroup:assetsGroup];
233233
self.imagePickerViewController.title = [assetsGroup name];

0 commit comments

Comments
 (0)