diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index eb561d5c..0a2ad35c 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -245,6 +245,11 @@ 237700CD2BC697A100D661F1 /* pi_app_logo_new_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 237700CC2BC697A100D661F1 /* pi_app_logo_new_bg.png */; }; 237700CF2BC697D500D661F1 /* pi_login_new_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 237700CE2BC697D400D661F1 /* pi_login_new_logo.png */; }; 237700D32BC7CC7C00D661F1 /* NSObject+MJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700D22BC7CC7C00D661F1 /* NSObject+MJExtension.m */; }; + 237700D72BC7D51400D661F1 /* UIButton+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700D62BC7D51400D661F1 /* UIButton+MSRTL.m */; }; + 237700DA2BC7D5EC00D661F1 /* UILabel+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700D92BC7D5EC00D661F1 /* UILabel+MSRTL.m */; }; + 237700DD2BC7D70E00D661F1 /* UIImage+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700DC2BC7D70E00D661F1 /* UIImage+MSRTL.m */; }; + 237700E02BC7D78600D661F1 /* MSBaseRTLFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700DF2BC7D78600D661F1 /* MSBaseRTLFlowLayout.m */; }; + 237700E32BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700E22BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.m */; }; 237B94BC2A984DA7007853E3 /* XPTrumpetPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */; }; 237B94BD2A984DA7007853E3 /* XPNobleTrumpetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B32A984DA7007853E3 /* XPNobleTrumpetModel.m */; }; 237B94BE2A984DA7007853E3 /* XPRoomTrumpetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B72A984DA7007853E3 /* XPRoomTrumpetViewController.m */; }; @@ -1968,6 +1973,16 @@ 237700CE2BC697D400D661F1 /* pi_login_new_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_login_new_logo.png; sourceTree = ""; }; 237700D12BC7CC7C00D661F1 /* NSObject+MJExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+MJExtension.h"; sourceTree = ""; }; 237700D22BC7CC7C00D661F1 /* NSObject+MJExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+MJExtension.m"; sourceTree = ""; }; + 237700D52BC7D51400D661F1 /* UIButton+MSRTL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIButton+MSRTL.h"; sourceTree = ""; }; + 237700D62BC7D51400D661F1 /* UIButton+MSRTL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIButton+MSRTL.m"; sourceTree = ""; }; + 237700D82BC7D5EC00D661F1 /* UILabel+MSRTL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UILabel+MSRTL.h"; sourceTree = ""; }; + 237700D92BC7D5EC00D661F1 /* UILabel+MSRTL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UILabel+MSRTL.m"; sourceTree = ""; }; + 237700DB2BC7D70E00D661F1 /* UIImage+MSRTL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIImage+MSRTL.h"; sourceTree = ""; }; + 237700DC2BC7D70E00D661F1 /* UIImage+MSRTL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIImage+MSRTL.m"; sourceTree = ""; }; + 237700DE2BC7D78600D661F1 /* MSBaseRTLFlowLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSBaseRTLFlowLayout.h; sourceTree = ""; }; + 237700DF2BC7D78600D661F1 /* MSBaseRTLFlowLayout.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSBaseRTLFlowLayout.m; sourceTree = ""; }; + 237700E12BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSMutableAttributedString+MSRTL.h"; sourceTree = ""; }; + 237700E22BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSMutableAttributedString+MSRTL.m"; sourceTree = ""; }; 237B94AD2A984DA7007853E3 /* XPTrumpetPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPTrumpetPresenter.h; sourceTree = ""; }; 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPTrumpetPresenter.m; sourceTree = ""; }; 237B94B02A984DA7007853E3 /* XPRoomTrumpetProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomTrumpetProtocol.h; sourceTree = ""; }; @@ -4777,6 +4792,7 @@ 189DD56C26DF5B5400AB55B1 /* CustomUI */ = { isa = PBXGroup; children = ( + 237700D42BC7D3DC00D661F1 /* MSRTL */, E8FE3C292994D0CC0006C6C7 /* SwitchView */, E81E09C6290F719C00A1F410 /* Adbvertise */, E80EC74A28ACD84000D133C5 /* InputView */, @@ -5557,6 +5573,23 @@ path = MJExtension; sourceTree = ""; }; + 237700D42BC7D3DC00D661F1 /* MSRTL */ = { + isa = PBXGroup; + children = ( + 237700D52BC7D51400D661F1 /* UIButton+MSRTL.h */, + 237700D62BC7D51400D661F1 /* UIButton+MSRTL.m */, + 237700D82BC7D5EC00D661F1 /* UILabel+MSRTL.h */, + 237700D92BC7D5EC00D661F1 /* UILabel+MSRTL.m */, + 237700DB2BC7D70E00D661F1 /* UIImage+MSRTL.h */, + 237700DC2BC7D70E00D661F1 /* UIImage+MSRTL.m */, + 237700DE2BC7D78600D661F1 /* MSBaseRTLFlowLayout.h */, + 237700DF2BC7D78600D661F1 /* MSBaseRTLFlowLayout.m */, + 237700E12BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.h */, + 237700E22BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.m */, + ); + path = MSRTL; + sourceTree = ""; + }; 237B94AB2A984DA7007853E3 /* NobleTrumpet */ = { isa = PBXGroup; children = ( @@ -10919,6 +10952,7 @@ E801275827E347FD00BAC3F2 /* RoomPKRecordModel.m in Sources */, E8E0DAE0285C20E500566A2F /* MessageContentFindNewGreetView.m in Sources */, E8A3540128FEAC5E0014A784 /* XPWishGiftTableViewCell.m in Sources */, + 237700E32BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.m in Sources */, 234D821E2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.m in Sources */, 23B2AEC12A64E9C200543D17 /* LoginForgetEditView.m in Sources */, E8EEB90326FC31DC007C6EBA /* XPMineUserInfoProtocol.h in Sources */, @@ -11053,6 +11087,7 @@ E8B825C726EA0D9A009E8E9F /* LoginVerifCodeProtocol.h in Sources */, 23E9EAAE2A84C9B800B792F2 /* XPMineUserInfoTagView.m in Sources */, 236B2E4E2AA07D06003967A8 /* Api+LittleGame.m in Sources */, + 237700E02BC7D78600D661F1 /* MSBaseRTLFlowLayout.m in Sources */, 2331C1B32A60F32D00E1D940 /* XPCandyTreeMoreRuleCell.m in Sources */, 14A6034C29A35EE600D2A6A5 /* XPMineItemTableViewCell.m in Sources */, 9BAC92F528E6E63000147DD8 /* XPRoomInsideOperationCell.m in Sources */, @@ -11213,6 +11248,7 @@ 23194DCE2AD14BF000649F51 /* ContextFilterLogFormatter.m in Sources */, E8A88D3027E85EEA00CA8837 /* RoomPKInfoModel.m in Sources */, E85E7B022A4EB0D200B6D00A /* XPSuperAdminManagerRoomPresenter.m in Sources */, + 237700DD2BC7D70E00D661F1 /* UIImage+MSRTL.m in Sources */, E8AB633328AE51470023B0D2 /* XPSailingPrizeView.m in Sources */, 9B2F72D328E45C5A0000E4FA /* XPRoomQuidkMessageCell.m in Sources */, E85E7B402A4EB0D300B6D00A /* XPGuildPersonIncomeTableViewCell.m in Sources */, @@ -11502,6 +11538,7 @@ E85E7B082A4EB0D200B6D00A /* XPMineManagerSetPresenter.m in Sources */, 18E7B1B226E8AF980064BC9B /* MainPresenter.m in Sources */, E81366F626F0C0DF0076364C /* LoginFullInfoPresenter.m in Sources */, + 237700DA2BC7D5EC00D661F1 /* UILabel+MSRTL.m in Sources */, E8A30BEE28534AB1003B4873 /* XPSessionFindNewPresenter.m in Sources */, 9BDA3E7727FD41C200517FE6 /* XPAnchorFansTeamViewController.m in Sources */, 2323E0372ABDAE8F00CCAD2F /* FBSDKSettings+PISDKSettings.m in Sources */, @@ -11615,6 +11652,7 @@ 237B94BF2A984DA7007853E3 /* XPRoomTrumpetView.m in Sources */, 9B335B492925D8A00048A116 /* XPAnchorPKSelectTypeController.m in Sources */, E8098CAE282E07C00090B9F0 /* XPMonentsEmptyTableViewCell.m in Sources */, + 237700D72BC7D51400D661F1 /* UIButton+MSRTL.m in Sources */, E85E7B4F2A4EB0D300B6D00A /* XPMineExchangeAuthorityVC.m in Sources */, 23FE47DB2BB4171C00F09D23 /* PINobleCenterListView.m in Sources */, E84A2E932A527EC800D6AF8A /* XPIncomeRecordPresent.m in Sources */, diff --git a/YuMi/Appdelegate/AppDelegate+ThirdConfig.m b/YuMi/Appdelegate/AppDelegate+ThirdConfig.m index bcd4a1f1..8ca63fcf 100644 --- a/YuMi/Appdelegate/AppDelegate+ThirdConfig.m +++ b/YuMi/Appdelegate/AppDelegate+ThirdConfig.m @@ -48,7 +48,21 @@ UIKIT_EXTERN NSString * adImageName; [self configAdjust]; [self configBugly]; [self registerNot]; - + [self setLanguage]; +} +-(void)setLanguage{ + + if (isMSRTL()) { + [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft; + [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft; + [[UINavigationBar appearance] setSemanticContentAttribute:UISemanticContentAttributeForceRightToLeft]; + + } else { + [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + [[UINavigationBar appearance] setSemanticContentAttribute:UISemanticContentAttributeForceLeftToRight]; + + } } -(void)registerNot{ if (@available(iOS 10.0, *)) { diff --git a/YuMi/Assets.xcassets/yna/Mini/room_mini_background.imageset/Contents.json b/YuMi/Assets.xcassets/yna/Mini/room_mini_background.imageset/Contents.json deleted file mode 100644 index d734b0e3..00000000 --- a/YuMi/Assets.xcassets/yna/Mini/room_mini_background.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "room_mini_background@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "room_mini_background@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/yna/Mini/room_mini_background.imageset/room_mini_background@2x.png b/YuMi/Assets.xcassets/yna/Mini/room_mini_background.imageset/room_mini_background@2x.png deleted file mode 100644 index aabe66a0..00000000 Binary files a/YuMi/Assets.xcassets/yna/Mini/room_mini_background.imageset/room_mini_background@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/Mini/room_mini_background.imageset/room_mini_background@3x.png b/YuMi/Assets.xcassets/yna/Mini/room_mini_background.imageset/room_mini_background@3x.png deleted file mode 100644 index 401affa4..00000000 Binary files a/YuMi/Assets.xcassets/yna/Mini/room_mini_background.imageset/room_mini_background@3x.png and /dev/null differ diff --git a/YuMi/CustomUI/InputView/InputView/QInputPhototCell.m b/YuMi/CustomUI/InputView/InputView/QInputPhototCell.m index e1d419b4..d984de6e 100644 --- a/YuMi/CustomUI/InputView/InputView/QInputPhototCell.m +++ b/YuMi/CustomUI/InputView/InputView/QInputPhototCell.m @@ -51,7 +51,7 @@ [self.chooseButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(20, 20)); - make.right.top.mas_equalTo(self.contentView).inset(10); + make.trailing.top.mas_equalTo(self.contentView).inset(10); }]; [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/CustomUI/InputView/InputView/QinputPhotoView.m b/YuMi/CustomUI/InputView/InputView/QinputPhotoView.m index d1adc45b..60a91890 100644 --- a/YuMi/CustomUI/InputView/InputView/QinputPhotoView.m +++ b/YuMi/CustomUI/InputView/InputView/QinputPhotoView.m @@ -65,25 +65,25 @@ - (void)initSubViewConstraints { [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.equalTo(self).offset(0); + make.top.leading.trailing.equalTo(self).offset(0); make.height.mas_equalTo(138 + 16); }]; [self.photoButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(16); + make.leading.mas_equalTo(self).offset(16); make.top.mas_equalTo(self.collectionView.mas_bottom).offset(1); }]; [self.originButton mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(25); make.width.mas_equalTo(100); - make.left.mas_equalTo(self.photoButton.mas_right).offset(20); + make.leading.mas_equalTo(self.photoButton.mas_trailing).offset(20); make.centerY.mas_equalTo(self.photoButton); }]; [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(56, 22)); - make.right.mas_equalTo(self).offset(-16); + make.trailing.mas_equalTo(self).offset(-16); make.centerY.mas_equalTo(self.photoButton); }]; } diff --git a/YuMi/CustomUI/MSRTL/MSBaseRTLFlowLayout.h b/YuMi/CustomUI/MSRTL/MSBaseRTLFlowLayout.h new file mode 100644 index 00000000..929c5a43 --- /dev/null +++ b/YuMi/CustomUI/MSRTL/MSBaseRTLFlowLayout.h @@ -0,0 +1,16 @@ +// +// MSBaseRTLFlowLayout.h +// YuMi +// +// Created by duoban on 2024/4/11. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface MSBaseRTLFlowLayout : UICollectionViewFlowLayout + +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/MSRTL/MSBaseRTLFlowLayout.m b/YuMi/CustomUI/MSRTL/MSBaseRTLFlowLayout.m new file mode 100644 index 00000000..09df071e --- /dev/null +++ b/YuMi/CustomUI/MSRTL/MSBaseRTLFlowLayout.m @@ -0,0 +1,21 @@ +// +// MSBaseRTLFlowLayout.m +// YuMi +// +// Created by duoban on 2024/4/11. +// + +#import "MSBaseRTLFlowLayout.h" + +@implementation MSBaseRTLFlowLayout +- (UIUserInterfaceLayoutDirection)effectiveUserInterfaceLayoutDirection { + if (isMSRTL()) { + return UIUserInterfaceLayoutDirectionRightToLeft; + } + return UIUserInterfaceLayoutDirectionLeftToRight; +} + +- (BOOL)flipsHorizontallyInOppositeLayoutDirection{ + return YES; +} +@end diff --git a/YuMi/CustomUI/MSRTL/NSMutableAttributedString+MSRTL.h b/YuMi/CustomUI/MSRTL/NSMutableAttributedString+MSRTL.h new file mode 100644 index 00000000..5208a7fb --- /dev/null +++ b/YuMi/CustomUI/MSRTL/NSMutableAttributedString+MSRTL.h @@ -0,0 +1,22 @@ +// +// MSRTL.h +// YuMi +// +// Created by duoban on 2024/4/11. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface NSMutableAttributedString (MSRTL) + +/// 用来改变布局方向,插入此空白字符串,则转化为RTL布局 ++ (NSMutableAttributedString *)createBlankAttributeToMSRTL; + +/// 用来解决YYText在RTL下的bug,如果昵称是阿语,整个富文本宽度计算会有误,在昵称前插入此空白字符串,可以修正布局。“i”可以是随意字母或中文 ++ (NSMutableAttributedString *)createBlankAttributeToMSLTR; + +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/MSRTL/NSMutableAttributedString+MSRTL.m b/YuMi/CustomUI/MSRTL/NSMutableAttributedString+MSRTL.m new file mode 100644 index 00000000..f5cffd9a --- /dev/null +++ b/YuMi/CustomUI/MSRTL/NSMutableAttributedString+MSRTL.m @@ -0,0 +1,27 @@ +// +// MSRTL.m +// YuMi +// +// Created by duoban on 2024/4/11. +// + +#import "NSMutableAttributedString+MSRTL.h" + + +@implementation NSMutableAttributedString (MSRTL) + +/// 用来改变布局方向,插入此空白字符串,则转化为RTL布局 ++ (NSMutableAttributedString *)createBlankAttributeToMSRTL { + NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] initWithString:@"\u202B"]; + [attribute addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:0], NSForegroundColorAttributeName: UIColor.clearColor} range:NSMakeRange(0, attribute.length)]; + return attribute; +} + +/// 用来解决YYText在RTL下的bug,如果昵称是阿语,整个富文本宽度计算会有误,在昵称前插入此空白字符串,可以修正布局。“i”可以是随意字母或中文 ++ (NSMutableAttributedString *)createBlankAttributeToMSLTR { + NSMutableAttributedString *attribute = [[NSMutableAttributedString alloc] initWithString:@"i"]; + [attribute addAttributes:@{NSFontAttributeName:[UIFont systemFontOfSize:0], NSForegroundColorAttributeName: UIColor.clearColor} range:NSMakeRange(0, attribute.length)]; + return attribute; +} + +@end diff --git a/YuMi/CustomUI/MSRTL/UIButton+MSRTL.h b/YuMi/CustomUI/MSRTL/UIButton+MSRTL.h new file mode 100644 index 00000000..28a1ae5b --- /dev/null +++ b/YuMi/CustomUI/MSRTL/UIButton+MSRTL.h @@ -0,0 +1,16 @@ +// +// MSRTL.h +// YuMi +// +// Created by duoban on 2024/4/11. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface UIButton (MSRTL) + +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/MSRTL/UIButton+MSRTL.m b/YuMi/CustomUI/MSRTL/UIButton+MSRTL.m new file mode 100644 index 00000000..e5f6e6d3 --- /dev/null +++ b/YuMi/CustomUI/MSRTL/UIButton+MSRTL.m @@ -0,0 +1,52 @@ +// +// MSRTL.m +// YuMi +// +// Created by duoban on 2024/4/11. +// + +#import "UIButton+MSRTL.h" + +@implementation UIButton (MSRTL) + +UIEdgeInsets RSRTLEdgeInsetsWithInsets(UIEdgeInsets insets) { + if (insets.left != insets.right && isMSRTL()) { + CGFloat temp = insets.left; + insets.left = insets.right; + insets.right = temp; + } + return insets; +} ++ (void)load{ + if (isMSRTL()) { + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + Method oldMethod = class_getInstanceMethod(self, @selector(setContentEdgeInsets:)); + Method newMethod = class_getInstanceMethod(self, @selector(msrtl_setContentEdgeInsets:)); + method_exchangeImplementations(oldMethod, newMethod); + + Method oldImageMethod = class_getInstanceMethod(self, @selector(setImageEdgeInsets:)); + Method newImageMethod = class_getInstanceMethod(self, @selector(msrtl_setImageEdgeInsets:)); + method_exchangeImplementations(oldImageMethod,newImageMethod); + + Method oldTitleMethod = class_getInstanceMethod(self, @selector(setTitleEdgeInsets:)); + Method newTitleMethod = class_getInstanceMethod(self, @selector(msrtl_setTitleEdgeInsets:)); + method_exchangeImplementations(oldTitleMethod,newTitleMethod); + }); + } +} + +- (void)msrtl_setContentEdgeInsets:(UIEdgeInsets)contentEdgeInsets { + [self msrtl_setContentEdgeInsets:RSRTLEdgeInsetsWithInsets(contentEdgeInsets)]; +} + +- (void)msrtl_setImageEdgeInsets:(UIEdgeInsets)imageEdgeInsets { + [self msrtl_setImageEdgeInsets:RSRTLEdgeInsetsWithInsets(imageEdgeInsets)]; +} + +- (void)msrtl_setTitleEdgeInsets:(UIEdgeInsets)titleEdgeInsets { + [self msrtl_setTitleEdgeInsets:RSRTLEdgeInsetsWithInsets(titleEdgeInsets)]; +} + + +@end diff --git a/YuMi/CustomUI/MSRTL/UIImage+MSRTL.h b/YuMi/CustomUI/MSRTL/UIImage+MSRTL.h new file mode 100644 index 00000000..942c6ec4 --- /dev/null +++ b/YuMi/CustomUI/MSRTL/UIImage+MSRTL.h @@ -0,0 +1,20 @@ +// +// MSRTL.h +// YuMi +// +// Created by duoban on 2024/4/11. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface UIImage (MSRTL) + +/// 需要阿语翻转的图片 +/// [[UIImage imageNamed:@"xxx"] mssetImageForRTL]; +- (UIImage *)ms_SetImageForRTL; + +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/MSRTL/UIImage+MSRTL.m b/YuMi/CustomUI/MSRTL/UIImage+MSRTL.m new file mode 100644 index 00000000..d41b89ad --- /dev/null +++ b/YuMi/CustomUI/MSRTL/UIImage+MSRTL.m @@ -0,0 +1,22 @@ +// +// MSRTL.m +// YuMi +// +// Created by duoban on 2024/4/11. +// + +#import "UIImage+MSRTL.h" + +@implementation UIImage (MSRTL) + + +- (UIImage *)ms_SetImageForRTL { + if (isMSRTL()) { + return [UIImage imageWithCGImage:self.CGImage + scale:self.scale + orientation:UIImageOrientationUpMirrored]; + } + return self; +} + +@end diff --git a/YuMi/CustomUI/MSRTL/UILabel+MSRTL.h b/YuMi/CustomUI/MSRTL/UILabel+MSRTL.h new file mode 100644 index 00000000..932751c0 --- /dev/null +++ b/YuMi/CustomUI/MSRTL/UILabel+MSRTL.h @@ -0,0 +1,16 @@ +// +// MSRTL.h +// YuMi +// +// Created by duoban on 2024/4/11. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface UILabel (MSRTL) + +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/MSRTL/UILabel+MSRTL.m b/YuMi/CustomUI/MSRTL/UILabel+MSRTL.m new file mode 100644 index 00000000..16c39b4c --- /dev/null +++ b/YuMi/CustomUI/MSRTL/UILabel+MSRTL.m @@ -0,0 +1,43 @@ +// +// MSRTL.m +// YuMi +// +// Created by duoban on 2024/4/11. +// + +#import "UILabel+MSRTL.h" + +@implementation UILabel (MSRTL) + ++ (void)load { + + Method oldInitMethod = class_getInstanceMethod(self,@selector(initWithFrame:)); + Method newInitMethod = class_getInstanceMethod(self, @selector(msrtl_initWithFrame:)); + method_exchangeImplementations(oldInitMethod, newInitMethod); //交换成功 + + Method oldTextMethod = class_getInstanceMethod(self,@selector(setTextAlignment:)); + Method newTextMethod = class_getInstanceMethod(self, @selector(msrtl_setTextAlignment:)); + method_exchangeImplementations(oldTextMethod, newTextMethod); //交换成功 +} + +- (instancetype)msrtl_initWithFrame:(CGRect)frame { + if ([self msrtl_initWithFrame:frame]) { + self.textAlignment = NSTextAlignmentNatural; + } + return self; +} + +- (void)msrtl_setTextAlignment:(NSTextAlignment)textAlignment { + if (isMSRTL()) { + if (textAlignment == NSTextAlignmentNatural || textAlignment == NSTextAlignmentLeft) { + textAlignment = NSTextAlignmentRight; + } else if (textAlignment == NSTextAlignmentRight) { + textAlignment = NSTextAlignmentLeft; + } + } + [self msrtl_setTextAlignment:textAlignment]; +} + + + +@end diff --git a/YuMi/CustomUI/ShareView/XPShareView.m b/YuMi/CustomUI/ShareView/XPShareView.m index bb493776..305f9634 100644 --- a/YuMi/CustomUI/ShareView/XPShareView.m +++ b/YuMi/CustomUI/ShareView/XPShareView.m @@ -82,12 +82,12 @@ [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self); make.height.mas_equalTo(collectionHeight); - make.left.right.mas_equalTo(self).inset(15); + make.leading.trailing.mas_equalTo(self).inset(15); }]; [self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(45); - make.left.right.mas_equalTo(self.collectionView); + make.leading.trailing.mas_equalTo(self.collectionView); make.top.mas_equalTo(self.collectionView.mas_bottom).offset(15); }]; diff --git a/YuMi/CustomUI/TTPopup/View/TTActionSheetView.m b/YuMi/CustomUI/TTPopup/View/TTActionSheetView.m index d97eab2e..7dd295bb 100644 --- a/YuMi/CustomUI/TTPopup/View/TTActionSheetView.m +++ b/YuMi/CustomUI/TTPopup/View/TTActionSheetView.m @@ -51,7 +51,7 @@ static NSString *const kSheetViewCellConst = @"kSheetViewCellConst"; - (void)initConstraints { [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.height.mas_equalTo(self.items.count * kSheetViewCellHeight); }]; @@ -59,7 +59,7 @@ static NSString *const kSheetViewCellConst = @"kSheetViewCellConst"; // 显示 cancel view self.cancelButton.hidden = NO; [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.height.mas_equalTo(kSheetViewCellHeight); make.top.mas_equalTo(self.tableView.mas_bottom).offset(15); }]; diff --git a/YuMi/CustomUI/TTPopup/View/TTAlertView.m b/YuMi/CustomUI/TTPopup/View/TTAlertView.m index fb316648..e77d9803 100644 --- a/YuMi/CustomUI/TTPopup/View/TTAlertView.m +++ b/YuMi/CustomUI/TTPopup/View/TTAlertView.m @@ -49,12 +49,12 @@ static CGFloat const kBtnHeight = 38.f; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self); make.top.mas_equalTo(kPadding); - make.left.right.mas_equalTo(self).inset(kPadding); + make.leading.trailing.mas_equalTo(self).inset(kPadding); }]; [self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(kMargin); - make.left.right.mas_equalTo(self).inset(kPadding); + make.leading.trailing.mas_equalTo(self).inset(kPadding); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/CustomUI/TTPopup/View/TTNewAlertView.m b/YuMi/CustomUI/TTPopup/View/TTNewAlertView.m index 532ec03b..894d1d91 100644 --- a/YuMi/CustomUI/TTPopup/View/TTNewAlertView.m +++ b/YuMi/CustomUI/TTPopup/View/TTNewAlertView.m @@ -42,19 +42,19 @@ [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(110)); make.height.mas_equalTo(kGetScaleWidth(37)); - make.left.mas_equalTo(kGetScaleWidth(31)); + make.leading.mas_equalTo(kGetScaleWidth(31)); make.bottom.mas_equalTo(-kGetScaleWidth(31)); }]; [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.centerY.equalTo(self.confirmBtn); - make.right.mas_equalTo(-kGetScaleWidth(31)); + make.trailing.mas_equalTo(-kGetScaleWidth(31)); }]; [self.messageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(25)); make.centerX.equalTo(self); - make.left.right.equalTo(self).inset(kGetScaleWidth(10)); + make.leading.trailing.equalTo(self).inset(kGetScaleWidth(10)); }]; diff --git a/YuMi/Global/YUMIMacroUitls.h b/YuMi/Global/YUMIMacroUitls.h index 6d171d36..582e74ec 100644 --- a/YuMi/Global/YUMIMacroUitls.h +++ b/YuMi/Global/YUMIMacroUitls.h @@ -62,4 +62,13 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns #define YMLocalizedString(key) \ [NSBundle ymLocalizedStringForKey:(key)] +#define isMSRTL() [[NSBundle getLanguageText] hasPrefix:@"ar"] +///是否是中文 +#define isMSZH() [[NSBundle getLanguageText] hasPrefix:@"zh"] +///是否是英文 +#define isMSEN() [[NSBundle getLanguageText] hasPrefix:@"en"] + + + + #endif /* YUMIMacroUitls_h */ diff --git a/YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.m b/YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.m index 1d7c199a..c6a9420d 100644 --- a/YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.m +++ b/YuMi/Modules/YMLogin/View/CustomView/LoginVerifCodeView.m @@ -94,7 +94,7 @@ [label mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemHeight)); make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self).offset((itemWidth + itemSpace)* i); + make.leading.mas_equalTo(self).offset((itemWidth + itemSpace)* i); }]; [self.lableArray addObject:label]; } @@ -102,7 +102,7 @@ UILabel * label = [self.lableArray lastObject]; if (label) { [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(label.mas_right); + make.trailing.mas_equalTo(label.mas_trailing); make.height.mas_equalTo(itemHeight); }]; } @@ -125,7 +125,7 @@ [label mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemHeight)); make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self).offset((itemWidth + itemSpace)* i); + make.leading.mas_equalTo(self).offset((itemWidth + itemSpace)* i); }]; [self.lableArray addObject:label]; } diff --git a/YuMi/Modules/YMLogin/View/CustomView/UserPrivacyView.m b/YuMi/Modules/YMLogin/View/CustomView/UserPrivacyView.m index d0f59296..8c2367a0 100644 --- a/YuMi/Modules/YMLogin/View/CustomView/UserPrivacyView.m +++ b/YuMi/Modules/YMLogin/View/CustomView/UserPrivacyView.m @@ -84,14 +84,14 @@ NSString * const kYouMiNumberCountKey = @"kYouMinumbernnagna"; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(55); - make.left.mas_equalTo(28); - make.right.mas_equalTo(-28); + make.leading.mas_equalTo(28); + make.trailing.mas_equalTo(-28); make.bottom.mas_equalTo(-68); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(-20); - make.left.right.mas_equalTo(self).inset(15); + make.leading.trailing.mas_equalTo(self).inset(15); make.height.mas_equalTo(36); }]; diff --git a/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m b/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m index 385a7c0b..62fda487 100644 --- a/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m +++ b/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m @@ -77,13 +77,13 @@ make.height.mas_equalTo(45); }]; [self.countryLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(10); + make.leading.mas_equalTo(10); make.top.mas_equalTo(self.bgView).offset(5); make.width.mas_equalTo(60); make.height.mas_equalTo(35); }]; [self.phoneTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(70); + make.leading.mas_equalTo(70); make.top.mas_equalTo(self.bgView).offset(5); make.width.mas_equalTo(200); make.height.mas_equalTo(35); @@ -98,7 +98,7 @@ [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(15, 15)); - make.left.mas_equalTo(self.view).offset(14); + make.leading.mas_equalTo(self.view).offset(14); make.top.mas_equalTo(self.view).offset(36 + kSafeAreaTopHeight); }]; } diff --git a/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m b/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m index 1ec09c0d..e2cc0eeb 100644 --- a/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m +++ b/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m @@ -134,7 +134,7 @@ - (void)initSubViewConstraints { [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self.view); + make.leading.trailing.top.equalTo(self.view); make.height.mas_equalTo(kGetScaleWidth(418)); }]; @@ -145,19 +145,19 @@ make.height.mas_equalTo(kGetScaleWidth(40)); }]; [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self.view); + make.leading.trailing.bottom.equalTo(self.view); make.top.mas_equalTo(kGetScaleWidth(192)); }]; [self.remindLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.bgView).inset(kGetScaleWidth(10)); + make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(10)); make.top.mas_equalTo(kGetScaleWidth(48)); }]; [self.sexStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(38)); - make.right.mas_equalTo(-kGetScaleWidth(38)); + make.leading.mas_equalTo(kGetScaleWidth(38)); + make.trailing.mas_equalTo(-kGetScaleWidth(38)); make.top.mas_equalTo(kGetScaleWidth(86)); }]; @@ -170,19 +170,19 @@ }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(18)); + make.trailing.mas_equalTo(-kGetScaleWidth(18)); make.centerY.equalTo(self.backView); }]; [self.refreshButton mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(18)); make.centerY.equalTo(self.backView); - make.right.equalTo(self.nameLabel.mas_left).mas_offset(-kGetScaleWidth(4)); + make.trailing.equalTo(self.nameLabel.mas_leading).mas_offset(-kGetScaleWidth(4)); }]; [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(24)); + make.leading.mas_equalTo(kGetScaleWidth(24)); make.top.bottom.equalTo(self.backView); - make.right.equalTo(self.refreshButton.mas_left).mas_offset(-kGetScaleWidth(4)); + make.trailing.equalTo(self.refreshButton.mas_leading).mas_offset(-kGetScaleWidth(4)); }]; [self.maleView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(132)); @@ -195,14 +195,14 @@ [self.codeContainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.height.mas_equalTo(self.backView); + make.leading.trailing.height.mas_equalTo(self.backView); make.top.mas_equalTo(self.backView.mas_bottom).offset(kGetScaleWidth(20)); }]; [self.codeTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.codeContainView).offset(kGetScaleWidth(24)); + make.leading.mas_equalTo(self.codeContainView).offset(kGetScaleWidth(24)); make.top.bottom.mas_equalTo(self.codeContainView); - make.right.mas_equalTo(self.codeContainView).offset(-kGetScaleWidth(18)); + make.trailing.mas_equalTo(self.codeContainView).offset(-kGetScaleWidth(18)); }]; diff --git a/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m b/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m index 8334f866..3bdeef27 100644 --- a/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m +++ b/YuMi/Modules/YMLogin/View/LoginVerifCodeViewController.m @@ -121,38 +121,38 @@ - (void)initSubViewConstraints { [self.topBackImgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kGetScaleWidth(333)); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.equalTo(self.topBackImgView.mas_bottom).mas_offset(-kGetScaleWidth(30)); }]; if(self.type != VerifCodeType_AreaCode){ [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.topBackImgView.mas_top).offset(kSafeAreaTopHeight + kGetScaleWidth(52)); make.width.height.mas_equalTo(kGetScaleWidth(20)); - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); }]; } [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.topBackImgView).offset(kGetScaleWidth(30)); + make.leading.mas_equalTo(self.topBackImgView).offset(kGetScaleWidth(30)); make.top.mas_equalTo(self.topBackImgView.mas_top).offset(kSafeAreaTopHeight + kGetScaleWidth(96)); }]; [self.bgCodeView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(30)); - make.right.mas_equalTo(-kGetScaleWidth(33)); - make.left.mas_equalTo(kGetScaleWidth(33)); + make.trailing.mas_equalTo(-kGetScaleWidth(33)); + make.leading.mas_equalTo(kGetScaleWidth(33)); make.height.mas_equalTo(kGetScaleWidth(63)); }]; [self.codeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(20)); - make.right.mas_equalTo(-kGetScaleWidth(20)); + make.leading.mas_equalTo(kGetScaleWidth(20)); + make.trailing.mas_equalTo(-kGetScaleWidth(20)); make.top.bottom.equalTo(self.bgCodeView); }]; [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMLogin/View/NewLogin/PIUserSexView.m b/YuMi/Modules/YMLogin/View/NewLogin/PIUserSexView.m index d3a381dd..3347d93c 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/PIUserSexView.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/PIUserSexView.m @@ -47,12 +47,12 @@ [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(16), kGetScaleWidth(16))); - make.right.mas_equalTo(self.backImageView.mas_centerX).offset(-1.5); + make.trailing.mas_equalTo(self.backImageView.mas_centerX).offset(-1.5); make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(kGetScaleWidth(8)); }]; [self.sexLb mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backImageView.mas_centerX).offset(1.5); + make.leading.mas_equalTo(self.backImageView.mas_centerX).offset(1.5); make.centerY.mas_equalTo(self.sexImageView); }]; } diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m index d1dda184..0775f2b9 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m @@ -72,7 +72,7 @@ [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self.view); + make.leading.trailing.top.equalTo(self.view); make.height.mas_equalTo(kGetScaleWidth(418)); }]; [self.backBnt mas_makeConstraints:^(MASConstraintMaker *make) { @@ -89,7 +89,7 @@ make.height.mas_equalTo(kGetScaleWidth(40)); }]; [bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self.view); + make.leading.trailing.bottom.equalTo(self.view); make.top.mas_equalTo(kGetScaleWidth(257)); }]; [self.phoneInputView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.m index 5d00b822..097a0239 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.m @@ -35,16 +35,16 @@ } - (void)initSubViewConstraints { [self.areaVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); make.centerY.equalTo(self.contentView); }]; [self.codeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.centerY.equalTo(self.contentView); }]; [self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.bottom.equalTo(self.contentView); - make.right.mas_equalTo(-kGetScaleWidth(20)); + make.top.leading.bottom.equalTo(self.contentView); + make.trailing.mas_equalTo(-kGetScaleWidth(20)); }]; } -(void)didClickBtnAction{ diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAuthCodeVC.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAuthCodeVC.m index 8227ce28..23cdfdb8 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAuthCodeVC.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAuthCodeVC.m @@ -51,7 +51,7 @@ [self.view addSubview:self.codeInputView]; [self.view addSubview:self.loginBtn]; [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self.view); + make.leading.trailing.top.equalTo(self.view); make.height.mas_equalTo(kGetScaleWidth(418)); }]; @@ -62,7 +62,7 @@ make.height.mas_equalTo(kGetScaleWidth(40)); }]; [bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self.view); + make.leading.trailing.bottom.equalTo(self.view); make.top.mas_equalTo(kGetScaleWidth(192)); }]; [self.codeInputView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m index 7f120229..d7a2ae2a 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m @@ -97,8 +97,8 @@ self.smsCodeBtn = smsCodeBtn; [stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(24)); - make.right.mas_equalTo(-kGetScaleWidth(24)); + make.leading.mas_equalTo(kGetScaleWidth(24)); + make.trailing.mas_equalTo(-kGetScaleWidth(24)); make.top.bottom.mas_equalTo(0); }]; diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m index 6a0e16b6..27053db0 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPhoneViewController.m @@ -94,7 +94,7 @@ [self.view addSubview:self.loginBtn]; [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self.view); + make.leading.trailing.top.equalTo(self.view); make.height.mas_equalTo(kGetScaleWidth(418)); }]; [self.backBnt mas_makeConstraints:^(MASConstraintMaker *make) { @@ -112,7 +112,7 @@ [self.chooseTypeView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(24)); - make.left.right.equalTo(self.view); + make.leading.trailing.equalTo(self.view); make.height.mas_equalTo(kGetScaleWidth(65)); }]; @@ -120,16 +120,16 @@ make.top.mas_equalTo(kGetScaleWidth(16)); make.height.mas_equalTo(kGetScaleWidth(22)); make.width.mas_equalTo(KScreenWidth/2); - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); }]; [self.choosePhoneBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(16)); make.height.mas_equalTo(kGetScaleWidth(22)); make.width.mas_equalTo(KScreenWidth/2); - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); }]; [bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self.view); + make.leading.trailing.bottom.equalTo(self.view); make.top.equalTo(self.chooseTypeView.mas_bottom); }]; [self.phoneInputView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -152,7 +152,7 @@ make.edges.equalTo(self.codeInputView); }]; [self.forgetBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(52)); + make.trailing.mas_equalTo(-kGetScaleWidth(52)); make.height.mas_equalTo(kGetScaleWidth(17)); make.top.equalTo(self.accountPwdView.mas_bottom).mas_offset(kGetScaleWidth(8)); }]; diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPwdViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPwdViewController.m index a24e568e..91ebf04b 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPwdViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginPwdViewController.m @@ -61,14 +61,14 @@ make.top.mas_equalTo(146.0/812.0*KScreenHeight); }]; [self.phoneInputView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(38); - make.right.mas_equalTo(-38); + make.leading.mas_equalTo(38); + make.trailing.mas_equalTo(-38); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(41); make.height.mas_equalTo(66); }]; [self.pwdInputView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.phoneInputView); - make.right.mas_equalTo(self.phoneInputView); + make.leading.mas_equalTo(self.phoneInputView); + make.trailing.mas_equalTo(self.phoneInputView); make.top.mas_equalTo(self.phoneInputView.mas_bottom).offset(16); make.height.mas_equalTo(self.phoneInputView); }]; @@ -82,7 +82,7 @@ make.centerX.mas_equalTo(self.view); }]; [self.forgetBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.pwdInputView); + make.trailing.mas_equalTo(self.pwdInputView); make.top.mas_equalTo(self.pwdInputView.mas_bottom).offset(10); }]; diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m index 5a624c36..395e2e5b 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m @@ -178,7 +178,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self.view); + make.leading.trailing.top.equalTo(self.view); make.height.mas_equalTo(kGetScaleWidth(91)); }]; [self.logoView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -257,25 +257,25 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; [self.protocolLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self.view).offset(10); - make.right.mas_lessThanOrEqualTo(-10); + make.trailing.mas_lessThanOrEqualTo(-10); make.height.mas_greaterThanOrEqualTo(22); make.bottom.mas_equalTo(-kGetScaleWidth(35)); }]; [self.agreeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.protocolLabel.mas_left).offset(0); + make.trailing.mas_equalTo(self.protocolLabel.mas_leading).offset(0); make.top.mas_equalTo(self.protocolLabel.mas_top); make.width.height.mas_equalTo(22); }]; [self.authBubbleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.agreeBtn).mas_offset((-16)); + make.leading.mas_equalTo(self.agreeBtn).mas_offset((-16)); make.top.mas_equalTo(self.agreeBtn.mas_bottom); make.width.mas_equalTo(235); make.height.mas_equalTo(29); }]; [self.authBubbleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(8); + make.leading.mas_equalTo(8); make.bottom.mas_equalTo(self.authBubbleView).mas_offset(-6); }]; if (@available(iOS 13.0, *)) { diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.m b/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.m index 7ff6f7f6..3f02677a 100644 --- a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.m +++ b/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewEmptyTableViewCell.m @@ -44,7 +44,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewGreetTableViewCell.m b/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewGreetTableViewCell.m index ac4e37ce..f895a62a 100644 --- a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewGreetTableViewCell.m +++ b/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewGreetTableViewCell.m @@ -40,14 +40,14 @@ - (void)initSubViewConstraints { [self.chooseButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.titleLabel.mas_centerY); - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.height.width.mas_equalTo(18); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(10); - make.left.mas_equalTo(self.chooseButton.mas_right).offset(15); - make.right.mas_lessThanOrEqualTo(-15); + make.leading.mas_equalTo(self.chooseButton.mas_trailing).offset(15); + make.trailing.mas_lessThanOrEqualTo(-15); }]; } diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.m b/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.m index 0c1f63f2..4231b5a8 100644 --- a/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.m +++ b/YuMi/Modules/YMMessage/View/FindNew/View/Cell/XPSessionFindNewTableViewCell.m @@ -64,19 +64,19 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(45, 45)); make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); - make.right.mas_lessThanOrEqualTo(self.greetButton.mas_left).mas_offset(-4); + make.trailing.mas_lessThanOrEqualTo(self.greetButton.mas_leading).mas_offset(-4); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.stackView); + make.leading.mas_equalTo(self.stackView); make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); - make.right.mas_equalTo(self.greetButton.mas_left).mas_offset(-4); + make.trailing.mas_equalTo(self.greetButton.mas_leading).mas_offset(-4); }]; [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(28); @@ -87,7 +87,7 @@ make.width.mas_equalTo(64); make.height.mas_equalTo(25); make.centerY.mas_equalTo(self.contentView); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); }]; } diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.m b/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.m index 310aab1c..6d74093c 100644 --- a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.m +++ b/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.m @@ -76,24 +76,24 @@ }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(10); + make.leading.trailing.mas_equalTo(self).inset(10); make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(15); }]; [self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(40); + make.leading.trailing.mas_equalTo(self).inset(40); make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(10); }]; [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(120, 40)); - make.right.mas_equalTo(self.mas_centerX).offset(-10); + make.trailing.mas_equalTo(self.mas_centerX).offset(-10); make.top.mas_equalTo(self.messageLabel.mas_bottom).offset(30); }]; [self.findButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.cancelButton); - make.left.mas_equalTo(self.mas_centerX).offset(10); + make.leading.mas_equalTo(self.mas_centerX).offset(10); }]; } diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewFiltrateView.m b/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewFiltrateView.m index a46a8025..2ae2bf5d 100644 --- a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewFiltrateView.m +++ b/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewFiltrateView.m @@ -96,31 +96,31 @@ }]; [self.sexLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(15); + make.leading.mas_equalTo(self).offset(15); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(12); }]; [self.sexStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.sexLabel); + make.leading.mas_equalTo(self.sexLabel); make.top.mas_equalTo(self.sexLabel.mas_bottom).offset(12); make.height.mas_equalTo(26); make.width.mas_equalTo(72 * 3 + 20 * 2); }]; [self.helloLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(15); + make.leading.mas_equalTo(self).offset(15); make.top.mas_equalTo(self.sexStackView.mas_bottom).offset(24); }]; [self.helloStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.sexLabel); + make.leading.mas_equalTo(self.sexLabel); make.top.mas_equalTo(self.helloLabel.mas_bottom).offset(12); make.height.mas_equalTo(26); make.width.mas_equalTo(72 * 3 + 20 * 2); }]; [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(57); + make.leading.trailing.mas_equalTo(self).inset(57); make.height.mas_equalTo(38); make.bottom.mas_equalTo(self).offset(-45); }]; diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewGreetListView.m b/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewGreetListView.m index eb36b5a5..d259761b 100644 --- a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewGreetListView.m +++ b/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewGreetListView.m @@ -94,11 +94,11 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self).offset(17); - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); }]; [self.refreshStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self).offset(-15); + make.trailing.mas_equalTo(self).offset(-15); make.centerY.mas_equalTo(self.titleLabel); make.height.mas_equalTo(30); }]; @@ -108,14 +108,14 @@ }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.bottom.mas_equalTo(self.sendButton.mas_top); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(10); }]; [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.mas_bottom).offset(-20); - make.left.right.mas_equalTo(self).inset(57); + make.leading.trailing.mas_equalTo(self).inset(57); make.height.mas_equalTo(44); }]; } diff --git a/YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.m b/YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.m index 26085b98..305d6070 100644 --- a/YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.m +++ b/YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.m @@ -72,12 +72,12 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.navView); + make.leading.trailing.mas_equalTo(self.navView); make.bottom.mas_equalTo(self.navView.mas_centerY).offset(-1); }]; [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.navView); + make.leading.trailing.mas_equalTo(self.navView); make.top.mas_equalTo(self.navView.mas_centerY).offset(1); }]; } diff --git a/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloEmptyTableViewCell.m b/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloEmptyTableViewCell.m index f7944275..da089640 100644 --- a/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloEmptyTableViewCell.m +++ b/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloEmptyTableViewCell.m @@ -44,7 +44,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloTableViewCell.m b/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloTableViewCell.m index 8797dd24..add9ac07 100644 --- a/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloTableViewCell.m +++ b/YuMi/Modules/YMMessage/View/SayHello/View/Cell/XPSessionSayHelloTableViewCell.m @@ -68,63 +68,63 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(54, 54)); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.top.mas_equalTo(self.contentView); }]; [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(28, 14)); make.bottom.mas_equalTo(self.avatarImageView); - make.right.mas_equalTo(self.avatarImageView); + make.trailing.mas_equalTo(self.avatarImageView); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(12); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); - make.right.mas_lessThanOrEqualTo(self.contentView).offset(-20); + make.trailing.mas_lessThanOrEqualTo(self.contentView).offset(-20); }]; [self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(20); make.height.mas_equalTo(20); - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); }]; [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(20); - make.left.mas_equalTo(self.levelImageView.mas_right).offset(2); + make.leading.mas_equalTo(self.levelImageView.mas_trailing).offset(2); make.centerY.mas_equalTo(self.levelImageView); }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.avatarImageView); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); }]; [self.onLineView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(8, 8)); make.centerY.mas_equalTo(self.timeLabel); - make.right.mas_equalTo(self.timeLabel.mas_left).offset(-2); + make.trailing.mas_equalTo(self.timeLabel.mas_leading).offset(-2); }]; [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(56); - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(3); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backView).offset(16); + make.leading.mas_equalTo(self.backView).offset(16); make.top.mas_equalTo(self.backView).offset(23); - make.right.mas_lessThanOrEqualTo(self.backView).offset(-25); + make.trailing.mas_lessThanOrEqualTo(self.backView).offset(-25); }]; [self.helloButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(56,24)); make.centerY.mas_equalTo(self.titleLabel); - make.right.mas_equalTo(self.backView).offset(-16); + make.trailing.mas_equalTo(self.backView).offset(-16); }]; } diff --git a/YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.m b/YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.m index aa4dd18c..fd2daf23 100644 --- a/YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.m +++ b/YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.m @@ -58,7 +58,7 @@ - (void)initSubViewConstraints { [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).mas_offset(10); + make.leading.mas_equalTo(self).mas_offset(10); make.top.mas_equalTo(statusbarHeight); make.height.width.mas_equalTo(44); }]; @@ -75,18 +75,18 @@ }]; [self.currentRateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(15); + make.leading.mas_equalTo(self).offset(15); make.top.mas_equalTo(self.backButton.mas_bottom).offset(40); }]; [self.helloLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.currentRateLabel); + make.leading.mas_equalTo(self.currentRateLabel); make.top.mas_equalTo(self.currentRateLabel.mas_bottom).offset(10); }]; [self.nextLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.helloLabel.mas_bottom); - make.left.mas_equalTo(self.helloLabel); + make.leading.mas_equalTo(self.helloLabel); }]; [self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMMessage/View/SayHello/View/XPSessionSayHelloViewController.m b/YuMi/Modules/YMMessage/View/SayHello/View/XPSessionSayHelloViewController.m index ca3ece2f..ee0b351d 100644 --- a/YuMi/Modules/YMMessage/View/SayHello/View/XPSessionSayHelloViewController.m +++ b/YuMi/Modules/YMMessage/View/SayHello/View/XPSessionSayHelloViewController.m @@ -107,17 +107,17 @@ }]; [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(220 + kSafeAreaTopHeight); }]; [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.headerView.mas_bottom); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.backView); + make.leading.trailing.bottom.mas_equalTo(self.backView); make.top.mas_equalTo(self.backView.mas_top).offset(15); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/MessageCell.m b/YuMi/Modules/YMMessage/View/Session/Cell/MessageCell.m index 01b5a3f7..36c0b047 100644 --- a/YuMi/Modules/YMMessage/View/Session/Cell/MessageCell.m +++ b/YuMi/Modules/YMMessage/View/Session/Cell/MessageCell.m @@ -97,26 +97,26 @@ - (void)initLayout { [self.leftAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.mas_equalTo(self).offset(15); + make.leading.top.mas_equalTo(self).offset(15); make.width.height.mas_equalTo(45); }]; [self.rightAvatar mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self).offset(15); - make.right.mas_equalTo(self).offset(-15); + make.trailing.mas_equalTo(self).offset(-15); make.width.height.mas_equalTo(45); }]; [self.messageBackground mas_makeConstraints:^(MASConstraintMaker *make) { - self.messageBackgroundLeft = make.left.mas_equalTo(self.leftAvatar.mas_right).offset(15); - self.messageBackgroundRight = make.right.mas_equalTo(self.rightAvatar.mas_left).offset(-15); + self.messageBackgroundLeft = make.leading.mas_equalTo(self.leftAvatar.mas_trailing).offset(15); + self.messageBackgroundRight = make.trailing.mas_equalTo(self.rightAvatar.mas_leading).offset(-15); make.top.mas_equalTo(self).offset(20); }]; [self.failButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(20, 20)); make.centerY.mas_equalTo(self.messageBackground); - make.left.mas_equalTo(self.messageBackground.mas_right).offset(10); + make.leading.mas_equalTo(self.messageBackground.mas_trailing).offset(10); }]; } @@ -244,7 +244,7 @@ } [self.messageBackground addSubview:self.messageContent]; [self.messageContent mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.right.bottom.mas_equalTo(self.messageBackground); + make.leading.top.trailing.bottom.mas_equalTo(self.messageBackground); }]; if (model.isHiddenAvatar) { @@ -279,13 +279,13 @@ [self.failButton mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(20, 20)); make.centerY.mas_equalTo(self.messageBackground); - make.left.mas_equalTo(self.messageBackground.mas_right).offset(10); + make.leading.mas_equalTo(self.messageBackground.mas_trailing).offset(10); }]; } else { [self.failButton mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(20, 20)); make.centerY.mas_equalTo(self.messageBackground); - make.right.mas_equalTo(self.messageBackground.mas_left).offset(-10); + make.trailing.mas_equalTo(self.messageBackground.mas_leading).offset(-10); }]; } } diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/SessionSettingTableViewCell.m b/YuMi/Modules/YMMessage/View/Session/Cell/SessionSettingTableViewCell.m index 6de6eab3..15e35f53 100644 --- a/YuMi/Modules/YMMessage/View/Session/Cell/SessionSettingTableViewCell.m +++ b/YuMi/Modules/YMMessage/View/Session/Cell/SessionSettingTableViewCell.m @@ -52,18 +52,18 @@ - (void)initSubViewConstraints { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.centerY.mas_equalTo(self.contentView); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.contentView); make.height.mas_equalTo(0.5); - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.centerY.mas_equalTo(self.contentView); }]; diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m b/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m index e58f3101..c042c7eb 100644 --- a/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m +++ b/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m @@ -131,19 +131,19 @@ - (void)initSubViewConstraints { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.contentView).offset(10); }]; [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.bottom.mas_equalTo(self.stackView.mas_bottom).offset(16); make.top.mas_equalTo(self.contentView).offset(10); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(56, 56)); - make.left.mas_equalTo(self.userView).offset(22); + make.leading.mas_equalTo(self.userView).offset(22); make.top.mas_equalTo(self.backView).offset(22); }]; @@ -154,7 +154,7 @@ }]; [self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.headWearImageView.mas_right).offset(0); + make.leading.mas_equalTo(self.headWearImageView.mas_trailing).offset(0); make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(100)); make.bottom.mas_equalTo(self.headWearImageView.mas_centerY).offset(-3); }]; @@ -172,8 +172,8 @@ }]; [self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.tagStackView); - make.right.mas_lessThanOrEqualTo(self.userView).offset(-5); + make.leading.mas_equalTo(self.tagStackView); + make.trailing.mas_lessThanOrEqualTo(self.userView).offset(-5); make.top.mas_equalTo(self.headWearImageView.mas_centerY).offset(3); }]; diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageConentAudioView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageConentAudioView.m index 5eb46037..f6f18536 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageConentAudioView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageConentAudioView.m @@ -57,13 +57,13 @@ }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backView).offset(10); + make.leading.mas_equalTo(self.backView).offset(10); make.centerY.mas_equalTo(self.backView); }]; [self.audioImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(20, 20)); - make.right.mas_equalTo(self.backView).offset(-10); + make.trailing.mas_equalTo(self.backView).offset(-10); make.centerY.mas_equalTo(self.backView); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentApplicationShareView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentApplicationShareView.m index b9b19ccb..47c56719 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentApplicationShareView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentApplicationShareView.m @@ -65,25 +65,25 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backView).offset(10); - make.right.mas_equalTo(self.avatarImageView.mas_left).offset(-10); + make.leading.mas_equalTo(self.backView).offset(10); + make.trailing.mas_equalTo(self.avatarImageView.mas_leading).offset(-10); make.top.mas_equalTo(self.backView); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(50, 50)); make.top.mas_equalTo(self.backView); - make.right.mas_equalTo(self.backView); + make.trailing.mas_equalTo(self.backView); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView).inset(12); + make.leading.trailing.mas_equalTo(self.backView).inset(12); make.height.mas_equalTo(1); make.bottom.mas_equalTo(self.enterButton.mas_top); }]; [self.enterButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.backView); + make.leading.trailing.bottom.mas_equalTo(self.backView); make.height.mas_equalTo(40); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGiftView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGiftView.m index 69320a4c..edbb60d2 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGiftView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGiftView.m @@ -43,17 +43,17 @@ [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(60, 60)); - make.left.mas_equalTo(self.backView); + make.leading.mas_equalTo(self.backView); make.centerY.mas_equalTo(self.backView); }]; [self.giftNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.giftImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.giftImageView.mas_trailing).offset(10); make.bottom.mas_equalTo(self.giftImageView.mas_centerY).offset(-3); }]; [self.giftNumLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.giftNameLabel); + make.leading.mas_equalTo(self.giftNameLabel); make.top.mas_equalTo(self.giftImageView.mas_centerY).offset(3); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.m index 5128847c..d345ed02 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.m @@ -72,7 +72,7 @@ }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.backView); + make.leading.trailing.top.mas_equalTo(self.backView); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -85,12 +85,12 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); make.top.mas_equalTo(self.contentView).offset(20); }]; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.left.mas_equalTo(self.contentView).inset(MESSAGE_TEXT_PADDING); + make.trailing.leading.mas_equalTo(self.contentView).inset(MESSAGE_TEXT_PADDING); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(MESSAGE_TEXT_PADDING); make.bottom.mas_equalTo(self.contentView); }]; diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentLevelUpgradeView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentLevelUpgradeView.m index 2eb6684f..ea3f4835 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentLevelUpgradeView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentLevelUpgradeView.m @@ -61,31 +61,31 @@ [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(64,64)); - make.left.mas_equalTo(self.backView); + make.leading.mas_equalTo(self.backView); make.top.mas_equalTo(self.backView); }]; [self.levelLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.logoImageView.mas_right).offset(10); - make.right.mas_equalTo(self.backView); + make.leading.mas_equalTo(self.logoImageView.mas_trailing).offset(10); + make.trailing.mas_equalTo(self.backView); make.top.mas_equalTo(self.logoImageView).offset(10); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView); + make.leading.trailing.mas_equalTo(self.backView); make.height.mas_equalTo(0.5); make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(10); }]; [self.checkButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView); + make.leading.trailing.mas_equalTo(self.backView); make.height.mas_equalTo(40); make.top.mas_equalTo(self.lineView.mas_bottom); }]; [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(6.5, 11)); - make.right.mas_equalTo(self.backView); + make.trailing.mas_equalTo(self.backView); make.centerY.mas_equalTo(self.checkButton); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsAutoView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsAutoView.m index 29da3b57..3aa8f96f 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsAutoView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsAutoView.m @@ -38,17 +38,17 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(14.5); + make.leading.mas_equalTo(14.5); make.top.mas_equalTo(10); }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-14.5); + make.trailing.mas_equalTo(-14.5); make.centerY.mas_equalTo(self.titleLabel); }]; [self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(14.5); + make.leading.trailing.mas_equalTo(self).inset(14.5); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(12.5); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m index 3c7aa25e..5f1099d7 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m @@ -55,20 +55,20 @@ [self.monentsView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(50, 50)); - make.left.mas_equalTo(self.backView); + make.leading.mas_equalTo(self.backView); make.centerY.mas_equalTo(self.backView); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.monentsView.mas_right).offset(10); + make.leading.mas_equalTo(self.monentsView.mas_trailing).offset(10); make.bottom.mas_equalTo(self.monentsView.mas_centerY).offset(-3); - make.right.mas_lessThanOrEqualTo(self.backView).offset(-10); + make.trailing.mas_lessThanOrEqualTo(self.backView).offset(-10); }]; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel); + make.leading.mas_equalTo(self.titleLabel); make.top.mas_equalTo(self.monentsView.mas_centerY).offset(3); - make.right.mas_lessThanOrEqualTo(self.backView).offset(-10); + make.trailing.mas_lessThanOrEqualTo(self.backView).offset(-10); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.m index a58fe6e3..08264348 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.m @@ -76,17 +76,17 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(47, 47)); make.centerY.mas_equalTo(self.backView); - make.left.mas_equalTo(self.backView).offset(10); + make.leading.mas_equalTo(self.backView).offset(10); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); - make.right.mas_lessThanOrEqualTo(self.backView); + make.trailing.mas_lessThanOrEqualTo(self.backView); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.titleLabel); + make.leading.trailing.mas_equalTo(self.titleLabel); make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.m index ab17c7a2..f2b95438 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.m @@ -66,34 +66,34 @@ make.width.mas_equalTo(MESSAGE_MAX_WIDTH); make.top.mas_equalTo(self.backView); make.height.mas_equalTo(95); - make.left.mas_equalTo(self.backView); + make.leading.mas_equalTo(self.backView); }]; [self.redPacketImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backView).mas_offset(16); + make.leading.mas_equalTo(self.backView).mas_offset(16); make.width.mas_equalTo(31); make.height.mas_equalTo(40); make.top.mas_equalTo(self.backView).mas_offset(13); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.redPacketImageView.mas_right).mas_offset(6); + make.leading.mas_equalTo(self.redPacketImageView.mas_trailing).mas_offset(6); make.height.mas_equalTo(16); make.top.mas_equalTo(self.redPacketImageView).mas_offset(12); }]; [self.subLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel); + make.leading.mas_equalTo(self.titleLabel); make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(8); make.height.mas_equalTo(13); }]; [self.devideView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); - make.right.mas_equalTo(-8); + make.leading.mas_equalTo(16); + make.trailing.mas_equalTo(-8); make.top.mas_equalTo(self.redPacketImageView.mas_bottom).offset(11); make.height.mas_equalTo(0.5); }]; [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); + make.leading.mas_equalTo(16); make.top.mas_equalTo(self.devideView.mas_bottom).offset(9); make.height.mas_equalTo(13); }]; diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentSkillCardView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentSkillCardView.m index 42730553..50b09881 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentSkillCardView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentSkillCardView.m @@ -45,12 +45,12 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView); + make.leading.trailing.mas_equalTo(self.backView); make.top.mas_equalTo(self.backView).offset(MESSAGE_PADDING); }]; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.left.mas_equalTo(self.backView); + make.trailing.leading.mas_equalTo(self.backView); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(MESSAGE_PADDING); make.height.mas_equalTo(15); }]; diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m index 4cb21cde..0cbbc8df 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m @@ -67,17 +67,17 @@ make.bottom.mas_equalTo(self.checkButton); }]; [self.messageText mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.equalTo(self.backView); + make.top.leading.trailing.equalTo(self.backView); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView); + make.leading.trailing.mas_equalTo(self.backView); make.height.mas_equalTo(0.5); make.top.mas_equalTo(self.messageText.mas_bottom).offset(5); }]; [self.checkButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView); + make.leading.trailing.mas_equalTo(self.backView); make.top.mas_equalTo(self.lineView.mas_bottom).offset(10); make.height.mas_equalTo(20); }]; diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTreasureFairyView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTreasureFairyView.m index b883061e..7746409e 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTreasureFairyView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTreasureFairyView.m @@ -50,22 +50,22 @@ - (void)initSubViewConstraints { [super initSubViewConstraints]; [self.backView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.right.equalTo(self); - make.left.mas_equalTo(self).offset(10); + make.top.bottom.trailing.equalTo(self); + make.leading.mas_equalTo(self).offset(10); make.height.mas_equalTo(78); make.width.mas_equalTo(235); }]; [self.ballImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(62, 62)); - make.left.mas_equalTo(self.backView); + make.leading.mas_equalTo(self.backView); make.centerY.mas_equalTo(self.backView); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.ballImageView.mas_right).offset(12); + make.leading.mas_equalTo(self.ballImageView.mas_trailing).offset(12); make.centerY.mas_equalTo(self.ballImageView); - make.right.mas_equalTo(self.backView).offset(-10); + make.trailing.mas_equalTo(self.backView).offset(-10); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.m index d024cc3f..32b735be 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTweetView.m @@ -80,14 +80,14 @@ if ( [redPacketHistory containsObject: model1.message.messageId]) { self.isNewImageView.hidden = YES; [self.isNewImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backView); + make.trailing.mas_equalTo(self.backView); make.centerY.equalTo(self.titleLabel); make.size.mas_equalTo(CGSizeMake(0, 10)); }]; } else { self.isNewImageView.hidden = NO; [self.isNewImageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backView); + make.trailing.mas_equalTo(self.backView); make.centerY.equalTo(self.titleLabel); make.size.mas_equalTo(CGSizeMake(24, 10)); }]; @@ -121,37 +121,37 @@ make.bottom.mas_equalTo(self.checkButton); }]; [self.isNewImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backView); + make.trailing.mas_equalTo(self.backView); make.centerY.equalTo(self.titleLabel); make.size.mas_equalTo(CGSizeMake(24, 10)); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backView); - make.right.equalTo(self.isNewImageView.mas_left); + make.leading.mas_equalTo(self.backView); + make.trailing.equalTo(self.isNewImageView.mas_leading); make.top.mas_equalTo(self.backView); make.height.mas_equalTo(18); }]; [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView); + make.leading.trailing.mas_equalTo(self.backView); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(10); make.height.mas_equalTo(87); }]; [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView); + make.leading.trailing.mas_equalTo(self.backView); make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(10); make.height.mas_equalTo(18); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView); + make.leading.trailing.mas_equalTo(self.backView); make.height.mas_equalTo(0.5); make.top.mas_equalTo(self.subTitleLabel.mas_bottom).offset(5); }]; [self.checkButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView); + make.leading.trailing.mas_equalTo(self.backView); make.top.mas_equalTo(self.lineView.mas_bottom).offset(10); make.height.mas_equalTo(20); }]; diff --git a/YuMi/Modules/YMMessage/View/Session/Content/PIMessageContentServiceReplyView.m b/YuMi/Modules/YMMessage/View/Session/Content/PIMessageContentServiceReplyView.m index 1d4cc4f7..3c968c11 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/PIMessageContentServiceReplyView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/PIMessageContentServiceReplyView.m @@ -45,33 +45,33 @@ make.edges.equalTo(self.backView); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); + make.leading.mas_equalTo(16); make.top.mas_equalTo(58); make.height.mas_equalTo(20); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); - make.right.mas_equalTo(14); + make.leading.mas_equalTo(16); + make.trailing.mas_equalTo(14); make.top.equalTo(self.titleView.mas_bottom).mas_offset(6); }]; [self.contentView1 mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); - make.right.mas_equalTo(14); + make.leading.mas_equalTo(16); + make.trailing.mas_equalTo(14); make.top.equalTo(self.contentView.mas_bottom).mas_offset(6); }]; [self.contentView2 mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); - make.right.mas_equalTo(14); + make.leading.mas_equalTo(16); + make.trailing.mas_equalTo(14); make.top.equalTo(self.contentView1.mas_bottom).mas_offset(4); }]; [self.contentView3 mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); - make.right.mas_equalTo(14); + make.leading.mas_equalTo(16); + make.trailing.mas_equalTo(14); make.top.equalTo(self.contentView2.mas_bottom).mas_offset(4); }]; [self.contentView4 mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); - make.right.mas_equalTo(14); + make.leading.mas_equalTo(16); + make.trailing.mas_equalTo(14); make.top.equalTo(self.contentView3.mas_bottom).mas_offset(6); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.m b/YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.m index f302bf15..78907386 100644 --- a/YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.m +++ b/YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.m @@ -57,7 +57,7 @@ - (void)initSubViewConstraints { [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(15); + make.leading.trailing.mas_equalTo(self.view).inset(15); make.top.mas_equalTo(self.view).offset(12); make.height.mas_equalTo(50 * 3 + 70); }]; diff --git a/YuMi/Modules/YMMessage/View/Session/SessionViewController.m b/YuMi/Modules/YMMessage/View/Session/SessionViewController.m index 7215d8fa..229ce113 100644 --- a/YuMi/Modules/YMMessage/View/Session/SessionViewController.m +++ b/YuMi/Modules/YMMessage/View/Session/SessionViewController.m @@ -363,7 +363,7 @@ - (void)initLayout { [self.sessionNavView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(self.openType == SessionListOpenTypeRoom ? 44 : kNavigationHeight); - make.left.top.right.mas_equalTo(self.view); + make.leading.top.trailing.mas_equalTo(self.view); }]; } @@ -446,7 +446,7 @@ if (!self.riskAlertView.superview) { [self.view addSubview:self.riskAlertView]; [self.riskAlertView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.sessionNavView.mas_bottom); make.height.mas_equalTo(30); }]; @@ -465,7 +465,7 @@ if (!self.riskAlertView.superview) { [self.view addSubview:self.riskAlertView]; [self.riskAlertView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.sessionNavView.mas_bottom); make.height.mas_equalTo(30); }]; @@ -1004,7 +1004,7 @@ [UIView animateWithDuration:0.2 animations:^{ [self.sessionTableView nim_scrollToBottom:NO]; [self.sessionTableView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.sessionNavView.mas_bottom); make.bottom.mas_equalTo(self.view).offset(-wholeInputViewHeight - kSafeAreaBottomHeight); }]; diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionAudioRecordView.m b/YuMi/Modules/YMMessage/View/Session/View/SessionAudioRecordView.m index c861f05e..8b7ec8ef 100644 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionAudioRecordView.m +++ b/YuMi/Modules/YMMessage/View/Session/View/SessionAudioRecordView.m @@ -78,7 +78,7 @@ }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView); + make.leading.trailing.mas_equalTo(self.backView); make.top.mas_equalTo(self.backView).offset(15); }]; @@ -93,7 +93,7 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView); + make.leading.trailing.mas_equalTo(self.backView); make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(25); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.m b/YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.m index e60e3011..21f0c2c3 100644 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.m +++ b/YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.m @@ -33,7 +33,7 @@ }]; [self.textLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.bottom.mas_equalTo(self.bgView).insets(UIEdgeInsetsMake(10, 10, 10, 10)); + make.top.leading.trailing.bottom.mas_equalTo(self.bgView).insets(UIEdgeInsetsMake(10, 10, 10, 10)); }]; [self initLabel:chatLimit.charmLevel.integerValue wealthLevel:chatLimit.wealthLevel.integerValue]; diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.m b/YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.m index 0a0308fe..b46bb875 100644 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.m +++ b/YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.m @@ -41,17 +41,17 @@ [self mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(15); - make.right.mas_equalTo(self.liveLabel.mas_right); + make.trailing.mas_equalTo(self.liveLabel.mas_trailing); }]; [self.liveView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(6, 6)); make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self); + make.leading.mas_equalTo(self); }]; [self.liveLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.liveView.mas_right).offset(4); + make.leading.mas_equalTo(self.liveView.mas_trailing).offset(4); make.centerY.mas_equalTo(self.liveView); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionNavView.m b/YuMi/Modules/YMMessage/View/Session/View/SessionNavView.m index 0a5a7d50..5d53ed6f 100644 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionNavView.m +++ b/YuMi/Modules/YMMessage/View/Session/View/SessionNavView.m @@ -70,7 +70,7 @@ - (void)initSubViewConstraints { [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(22, 22)); - make.left.mas_equalTo(self).offset(8); + make.leading.mas_equalTo(self).offset(8); make.top.mas_equalTo(statusbarHeight + 14); }]; @@ -81,13 +81,13 @@ [self.likeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.reportButton); - make.right.mas_equalTo(self.reportButton.mas_left).offset(-12); + make.trailing.mas_equalTo(self.reportButton.mas_leading).offset(-12); make.size.mas_equalTo(CGSizeMake(48, 20)); }]; [self.reportButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(30, 30)); - make.right.mas_equalTo(self).offset(-15); + make.trailing.mas_equalTo(self).offset(-15); make.centerY.mas_equalTo(self.backButton); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionSettingUserView.m b/YuMi/Modules/YMMessage/View/Session/View/SessionSettingUserView.m index e85c9679..a535267f 100644 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionSettingUserView.m +++ b/YuMi/Modules/YMMessage/View/Session/View/SessionSettingUserView.m @@ -56,7 +56,7 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(43, 43)); - make.left.mas_equalTo(self).offset(22); + make.leading.mas_equalTo(self).offset(22); make.top.mas_equalTo(self).offset(22); }]; @@ -67,19 +67,19 @@ }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(12); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); }]; [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(6.5, 11)); make.centerY.mas_equalTo(self.avatarImageView); - make.right.mas_equalTo(self).offset(-15); + make.trailing.mas_equalTo(self).offset(-15); }]; } diff --git a/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m b/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m index 58f72c53..e7713294 100644 --- a/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m +++ b/YuMi/Modules/YMMessage/View/Session/XPSessionMainViewController.m @@ -62,24 +62,24 @@ } - (void)initSubViewConstraints { [self.headBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.right.equalTo(self.view); + make.leading.top.trailing.equalTo(self.view); make.height.mas_equalTo(196); }]; [self.pagingView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.equalTo(self.view); + make.top.leading.trailing.equalTo(self.view); make.bottom.mas_equalTo(-1); }]; [self.allCleanBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(30); make.top.mas_equalTo(67); - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); }]; UIView *lineView = [UIView new]; lineView.backgroundColor = UIColorFromRGB(0xF5F6FA); [self.view addSubview:lineView]; [lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.left.right.equalTo(self.view); + make.bottom.leading.trailing.equalTo(self.view); make.height.mas_equalTo(1); }]; } diff --git a/YuMi/Modules/YMMessage/View/SessionList/SessionDiscoverNewTableViewCell.m b/YuMi/Modules/YMMessage/View/SessionList/SessionDiscoverNewTableViewCell.m index 6076848a..2089a3ba 100644 --- a/YuMi/Modules/YMMessage/View/SessionList/SessionDiscoverNewTableViewCell.m +++ b/YuMi/Modules/YMMessage/View/SessionList/SessionDiscoverNewTableViewCell.m @@ -47,19 +47,19 @@ - (void)initSubViewConstraints { [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.height.width.mas_equalTo(45); make.centerY.mas_equalTo(self.contentView); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.logoImageView.mas_centerY); - make.left.mas_equalTo(self.logoImageView.mas_right).offset(15); + make.leading.mas_equalTo(self.logoImageView.mas_trailing).offset(15); }]; [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(6.5, 11)); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.centerY.mas_equalTo(self.contentView); }]; @@ -68,7 +68,7 @@ [self.dotView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(8, 8)); make.centerY.mas_equalTo(self.contentView); - make.right.mas_equalTo(self.arrowImageView.mas_left).offset(-3); + make.trailing.mas_equalTo(self.arrowImageView.mas_leading).offset(-3); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m b/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m index dcde0d1f..cd9be3b4 100644 --- a/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m +++ b/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m @@ -106,29 +106,29 @@ - (void)initLayout { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.height.width.mas_equalTo(45); }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(15); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(15); }]; [self.messageLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nameLabel); + make.leading.mas_equalTo(self.nameLabel); make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); - make.right.mas_equalTo(self.timeLabel.mas_left).offset(-15); + make.trailing.mas_equalTo(self.timeLabel.mas_leading).offset(-15); }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self).offset(-15); - make.right.mas_equalTo(self).offset(-15); + make.trailing.mas_equalTo(self).offset(-15); }]; [self.divider mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo (-15); - make.left.mas_equalTo(self.nameLabel); + make.trailing.mas_equalTo (-15); + make.leading.mas_equalTo(self.nameLabel); make.bottom.mas_equalTo(self); make.height.mas_equalTo(0.5f); }]; diff --git a/YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.m b/YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.m index 70e64dd5..81eb84f4 100644 --- a/YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.m +++ b/YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.m @@ -115,14 +115,14 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey"; // make.center.mas_equalTo(self.customNavigationBar); // }]; // [self.allReadButton mas_makeConstraints:^(MASConstraintMaker *make) { -// make.right.mas_equalTo(-16); +// make.trailing.mas_equalTo(-16); // make.width.height.mas_equalTo(30); // make.centerY.mas_equalTo(self.customNavigationBar); // }]; } [self.sessionListView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); if (self.openType == SessionListOpenTypeDefault) { make.top.mas_equalTo(self.view); } else { diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionHelloEnterView.m b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionHelloEnterView.m index 3aed247a..a7d024d9 100644 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionHelloEnterView.m +++ b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionHelloEnterView.m @@ -55,14 +55,14 @@ [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(0); - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(1); make.height.mas_equalTo(28); make.top.mas_equalTo(self.logoImageView).offset(20); - make.right.mas_equalTo(self); + make.trailing.mas_equalTo(self); }]; } diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadFriendCell.m b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadFriendCell.m index a59b51fd..d52305f5 100644 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadFriendCell.m +++ b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadFriendCell.m @@ -63,22 +63,22 @@ make.centerX.mas_equalTo(self); make.top.mas_equalTo(self.dotView.mas_bottom).mas_offset(2); make.height.mas_equalTo(17); - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); }]; [self.noteBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.imageView); + make.leading.trailing.bottom.mas_equalTo(self.imageView); make.height.mas_equalTo(14); }]; [self.noteImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.noteBgImageView).mas_offset(15); + make.leading.mas_equalTo(self.noteBgImageView).mas_offset(15); make.centerY.mas_equalTo(self.noteBgImageView).mas_offset(-1); make.height.mas_equalTo(10); make.width.mas_equalTo(10); }]; [self.liveLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.noteImageView.mas_right).mas_offset(2); + make.leading.mas_equalTo(self.noteImageView.mas_trailing).mas_offset(2); make.centerY.mas_equalTo(self.noteImageView); }]; } diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItemView.m b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItemView.m index 7e5691c3..aabd9aeb 100644 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItemView.m +++ b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItemView.m @@ -61,7 +61,7 @@ make.height.mas_equalTo(17); }]; [self.dotView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.mas_equalTo(self.imageView); + make.top.trailing.mas_equalTo(self.imageView); make.width.height.mas_equalTo(12); }]; } diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadView.m b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadView.m index 32ac3bea..523c95d1 100644 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadView.m +++ b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadView.m @@ -94,7 +94,7 @@ NSString * const kMengXinShowReadDotKey = @"kMengXinShowReadDotKey"; - (void)initContraints { [self.mainStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self); + make.leading.trailing.top.equalTo(self); }]; [self.toolStackView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMMine/View/Cell/AnchorFansTeam/XPMineAnchorFansTeamTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/AnchorFansTeam/XPMineAnchorFansTeamTableViewCell.m index ef8c48ae..7c164a9e 100644 --- a/YuMi/Modules/YMMine/View/Cell/AnchorFansTeam/XPMineAnchorFansTeamTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/AnchorFansTeam/XPMineAnchorFansTeamTableViewCell.m @@ -45,21 +45,21 @@ #pragma mark - Constraints - (void)setUpConstraints { [self.avaterImgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.width.height.mas_equalTo(40); make.centerY.mas_equalTo(self.contentView.mas_centerY); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avaterImgView.mas_right).mas_offset(10); + make.leading.mas_equalTo(self.avaterImgView.mas_trailing).mas_offset(10); make.centerY.mas_equalTo(self.contentView.mas_centerY); - make.right.mas_equalTo(self.iconImageView.mas_left); + make.trailing.mas_equalTo(self.iconImageView.mas_leading); }]; [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.nickLabel.mas_centerY); make.width.mas_equalTo(95); make.height.mas_equalTo(27); - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); }]; } diff --git a/YuMi/Modules/YMMine/View/Cell/FootPrint/XPMineFootPrintTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/FootPrint/XPMineFootPrintTableViewCell.m index 27ea0989..90cec7b3 100644 --- a/YuMi/Modules/YMMine/View/Cell/FootPrint/XPMineFootPrintTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/FootPrint/XPMineFootPrintTableViewCell.m @@ -47,32 +47,32 @@ #pragma mark - Constraints - (void)setUpConstraints { [self.avaterImgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.width.height.mas_equalTo(40); make.centerY.mas_equalTo(self.contentView.mas_centerY); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avaterImgView.mas_right).mas_offset(8); + make.leading.mas_equalTo(self.avaterImgView.mas_trailing).mas_offset(8); make.bottom.mas_equalTo(self.avaterImgView.mas_centerY).mas_offset(-4); make.height.mas_equalTo(14); }]; [self.memberIdLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avaterImgView.mas_centerY).mas_offset(4); - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.height.mas_equalTo(14); }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.centerY.mas_equalTo(self.nickLabel.mas_centerY); make.height.mas_equalTo(14); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(0); - make.left.mas_equalTo(self.avaterImgView); - make.right.mas_equalTo(-15); + make.leading.mas_equalTo(self.avaterImgView); + make.trailing.mas_equalTo(-15); make.height.mas_equalTo(0.5); }]; } diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m index 334501d0..a0841750 100644 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m @@ -67,12 +67,12 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake((50), (50))); make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.contentView).offset((15)); + make.leading.mas_equalTo(self.contentView).offset((15)); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset((10)); - make.right.mas_lessThanOrEqualTo(self.findButton.mas_left).mas_offset(-0); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset((10)); + make.trailing.mas_lessThanOrEqualTo(self.findButton.mas_leading).mas_offset(-0); make.height.mas_equalTo(((20))); make.top.equalTo(self.avatarImageView.mas_top).mas_offset((3)); }]; @@ -84,16 +84,16 @@ // make.width.mas_lessThanOrEqualTo((100)); // }]; [self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.stackView); + make.leading.mas_equalTo(self.stackView); make.top.equalTo(self.stackView.mas_bottom).mas_offset((7)); - make.right.mas_equalTo(self.findButton.mas_left).mas_offset(-(10)); + make.trailing.mas_equalTo(self.findButton.mas_leading).mas_offset(-(10)); }]; [self.findButton mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo((68)); make.height.mas_equalTo((30)); make.centerY.mas_equalTo(self.contentView); - make.right.mas_equalTo(self.contentView).offset(-(15)); + make.trailing.mas_equalTo(self.contentView).offset(-(15)); }]; CGFloat width = 28 * 20 / 14; diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m index ce6db809..1b962c5f 100644 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m @@ -68,12 +68,12 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake((50), (50))); make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.contentView).offset((15)); + make.leading.mas_equalTo(self.contentView).offset((15)); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset((10)); - make.right.mas_lessThanOrEqualTo(self.attentionButton.mas_left).mas_offset(-0); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset((10)); + make.trailing.mas_lessThanOrEqualTo(self.attentionButton.mas_leading).mas_offset(-0); make.height.mas_equalTo(20); make.top.equalTo(self.avatarImageView.mas_top).mas_offset((3)); }]; @@ -85,16 +85,16 @@ // make.width.mas_lessThanOrEqualTo((100)); // }]; [self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.stackView); + make.leading.mas_equalTo(self.stackView); make.top.equalTo(self.stackView.mas_bottom).mas_offset((7)); - make.right.mas_equalTo(self.attentionButton.mas_left).mas_offset(-(10)); + make.trailing.mas_equalTo(self.attentionButton.mas_leading).mas_offset(-(10)); }]; [self.attentionButton mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo((68)); make.height.mas_equalTo((30)); make.centerY.mas_equalTo(self.contentView); - make.right.mas_equalTo(self.contentView).offset(-(15)); + make.trailing.mas_equalTo(self.contentView).offset(-(15)); }]; CGFloat width = 28 * 20 / 14; diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendEmptyTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendEmptyTableViewCell.m index 8e8817c7..a7bd9d00 100644 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendEmptyTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendEmptyTableViewCell.m @@ -45,7 +45,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.m index c335423f..0938d88d 100644 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFriendTableViewCell.m @@ -61,11 +61,11 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(50, 50)); make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); }]; [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -73,7 +73,7 @@ make.height.mas_equalTo(14); }]; [self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.stackView); + make.leading.mas_equalTo(self.stackView); make.top.mas_equalTo(self.stackView.mas_bottom).offset(7); }]; CGFloat width = 28 * 20 / 14; diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m index e61210d0..bc81056d 100644 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m @@ -83,19 +83,19 @@ - (void)initSubViewConstraints { [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(kGetScaleWidth(15)); + make.leading.trailing.mas_equalTo(self.contentView).inset(kGetScaleWidth(15)); make.top.mas_equalTo(self.contentView); make.bottom.mas_equalTo(self.contentView).mas_offset(-kGetScaleWidth(12)); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backView).offset(kGetScaleWidth(12)); + make.leading.mas_equalTo(self.backView).offset(kGetScaleWidth(12)); make.top.mas_equalTo(self.backView).offset(kGetScaleWidth(10)); make.height.mas_equalTo(kGetScaleWidth(17)); }]; // [self.starView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.left.height.equalTo(self.titleLabel); +// make.leading.height.equalTo(self.titleLabel); // make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(12)); // // }]; @@ -103,31 +103,31 @@ // make.height.mas_equalTo(18); // make.width.mas_equalTo(46); // make.centerY.equalTo(self.starView); -// make.left.equalTo(self.starView.mas_right).mas_offset(kGetScaleWidth(10)); +// make.leading.equalTo(self.starView.mas_trailing).mas_offset(kGetScaleWidth(10)); // }]; [self.birthdayHeadView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.height.equalTo(self.titleLabel); + make.leading.height.equalTo(self.titleLabel); make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(12)); }]; [self.birthdayView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.birthdayHeadView); - make.left.equalTo(self.birthdayHeadView.mas_right).mas_offset(kGetScaleWidth(10)); + make.leading.equalTo(self.birthdayHeadView.mas_trailing).mas_offset(kGetScaleWidth(10)); }]; [self.areaHeadView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.height.equalTo(self.titleLabel); + make.leading.height.equalTo(self.titleLabel); make.top.mas_equalTo(kGetScaleWidth(62)); }]; [self.areaView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.centerY.equalTo(self.areaHeadView); - make.left.equalTo(self.birthdayView); + make.leading.equalTo(self.birthdayView); }]; [self.areaMornBnt mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(25)); make.height.mas_equalTo(kGetScaleWidth(17)); - make.left.equalTo(self.areaView.mas_right).mas_offset(kGetScaleWidth(8)); + make.leading.equalTo(self.areaView.mas_trailing).mas_offset(kGetScaleWidth(8)); make.centerY.equalTo(self.areaView); }]; @@ -135,35 +135,35 @@ [self.areaIconView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(20)); make.centerY.equalTo(self.areaView); - make.left.equalTo(self.areaMornBnt.mas_right); + make.leading.equalTo(self.areaMornBnt.mas_trailing); }]; [self.roomHeadView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.height.equalTo(self.titleLabel); + make.leading.height.equalTo(self.titleLabel); make.top.mas_equalTo(kGetScaleWidth(84)); }]; [self.roomView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.centerY.equalTo(self.roomHeadView); - make.left.equalTo(self.birthdayView); + make.leading.equalTo(self.birthdayView); }]; [self.roomIconView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(20)); make.centerY.equalTo(self.roomHeadView); - make.left.equalTo(self.roomView.mas_right); + make.leading.equalTo(self.roomView.mas_trailing); }]; [self.clanHeadView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.height.equalTo(self.titleLabel); + make.leading.height.equalTo(self.titleLabel); make.top.mas_equalTo(kGetScaleWidth(108)); }]; [self.clanView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.clanHeadView); - make.left.equalTo(self.birthdayView); + make.leading.equalTo(self.birthdayView); }]; [self.clanIconView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(20)); make.centerY.equalTo(self.clanHeadView); - make.left.equalTo(self.clanView.mas_right); + make.leading.equalTo(self.clanView.mas_trailing); }]; } diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.m index 7f088030..ff0449e9 100644 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftCollectionViewCell.m @@ -65,7 +65,7 @@ make.height.mas_equalTo(kGetScaleWidth(14)); }]; [self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.mas_equalTo(kGetScaleWidth(3)); + make.leading.top.mas_equalTo(kGetScaleWidth(3)); make.width.height.mas_equalTo(kGetScaleWidth(19)); }]; } diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.m index 19720811..239ae578 100644 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.m @@ -61,20 +61,20 @@ - (void)initSubViewConstraints { [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.contentView); make.bottom.mas_equalTo(self.contentView).offset(-15); }]; // [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// make.left.mas_equalTo(self.backImageView).offset(12); +// make.leading.mas_equalTo(self.backImageView).offset(12); // make.top.mas_equalTo(self.backImageView).offset(12); // }]; // [self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(13, 22)); make.centerY.equalTo(self.titleView); - make.right.mas_equalTo(self.backImageView).offset(-15); + make.trailing.mas_equalTo(self.backImageView).offset(-15); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -85,7 +85,7 @@ }]; [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.backImageView); + make.leading.trailing.bottom.mas_equalTo(self.backImageView); make.top.mas_equalTo(self.titleView.mas_bottom).offset(kGetScaleWidth(20)); }]; diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoAlbumCollectionViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoAlbumCollectionViewCell.m index 9e2046ba..6f843065 100644 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoAlbumCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoAlbumCollectionViewCell.m @@ -51,7 +51,7 @@ [self.deleteButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(25, 25)); - make.top.right.mas_equalTo(self.contentView).inset(0); + make.top.trailing.mas_equalTo(self.contentView).inset(0); }]; } diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditMainTagView.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditMainTagView.m index bbc7abb9..c732943e 100644 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditMainTagView.m +++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditMainTagView.m @@ -31,7 +31,7 @@ XPMineUserInfoEditTagView *tagView = [[XPMineUserInfoEditTagView alloc]initWithFrame:CGRectZero]; [self addSubview:tagView]; [tagView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(x); + make.leading.mas_equalTo(x); make.centerY.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(18)); make.width.mas_equalTo(model.width); diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.m index 7264b6ec..101c2116 100644 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.m @@ -109,24 +109,24 @@ [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.contentView); make.bottom.mas_equalTo(self.partLineView.mas_top); - make.left.right.mas_equalTo(self.contentView).inset(kGetScaleWidth(16)); + make.leading.trailing.mas_equalTo(self.contentView).inset(kGetScaleWidth(16)); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(65)); }]; [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.equalTo(self.arrowImageView.mas_left).mas_offset(-kGetScaleWidth(2)); + make.trailing.equalTo(self.arrowImageView.mas_leading).mas_offset(-kGetScaleWidth(2)); }]; [self.partLineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(kGetScaleWidth(16)); + make.leading.trailing.mas_equalTo(self.contentView).inset(kGetScaleWidth(16)); make.bottom.mas_equalTo(self.contentView); make.height.mas_equalTo(kGetScaleWidth(0.5)); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(50), kGetScaleWidth(50))); - make.right.equalTo(self.arrowImageView.mas_left).mas_offset(-kGetScaleWidth(2)); + make.trailing.equalTo(self.arrowImageView.mas_leading).mas_offset(-kGetScaleWidth(2)); }]; [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -135,11 +135,11 @@ [self.soundView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(85)); make.height.mas_equalTo(kGetScaleWidth(28)); - make.right.equalTo(self.arrowImageView.mas_left).mas_offset(-kGetScaleWidth(2)); + make.trailing.equalTo(self.arrowImageView.mas_leading).mas_offset(-kGetScaleWidth(2)); }]; [self.soundTimeView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.soundView); - make.left.mas_equalTo(kGetScaleWidth(44)); + make.leading.mas_equalTo(kGetScaleWidth(44)); }]; [self.firstPhotoImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(40)); @@ -153,13 +153,13 @@ make.width.height.mas_equalTo(self.firstPhotoImageView); }]; [self.reviewView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self.avatarImageView); + make.leading.trailing.bottom.equalTo(self.avatarImageView); make.height.mas_equalTo(kGetScaleWidth(15)); }]; [self.editTagView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(220)); - make.right.equalTo(self.arrowImageView.mas_left).mas_offset(kGetScaleWidth(3)); + make.trailing.equalTo(self.arrowImageView.mas_leading).mas_offset(kGetScaleWidth(3)); make.centerY.equalTo(self.contentView); make.height.mas_equalTo(kGetScaleWidth(18)); }]; diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEmptyCollectionViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEmptyCollectionViewCell.m index 15cd1389..829db78b 100644 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEmptyCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEmptyCollectionViewCell.m @@ -44,7 +44,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.m index 36d979ac..431e77ed 100644 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoGiftWallCollectionViewCell.m @@ -70,10 +70,10 @@ [self.priceView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.equalTo(self.bgView); make.top.equalTo(self.giftNumberLabel.mas_bottom).mas_offset(kGetScaleWidth(5)); - make.left.right.equalTo(self.bgView).inset(kGetScaleWidth(0)); + make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(0)); }]; [self.levelImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.mas_equalTo(kGetScaleWidth(3)); + make.leading.top.mas_equalTo(kGetScaleWidth(3)); make.width.height.mas_equalTo(kGetScaleWidth(19)); }]; } diff --git a/YuMi/Modules/YMMine/View/Cell/Recharge/XPMineRechargeTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Recharge/XPMineRechargeTableViewCell.m index cabfbe90..4b8d0d33 100644 --- a/YuMi/Modules/YMMine/View/Cell/Recharge/XPMineRechargeTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/Recharge/XPMineRechargeTableViewCell.m @@ -54,7 +54,7 @@ - (void)initSubViewConstraints { [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.contentView).offset(15); make.bottom.mas_equalTo(self.contentView); }]; @@ -62,23 +62,23 @@ [self.coinImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(21, 21)); make.centerY.mas_equalTo(self.backView); - make.left.mas_equalTo(self.backView).offset(19); + make.leading.mas_equalTo(self.backView).offset(19); }]; [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.coinImageView); - make.left.mas_equalTo(self.coinImageView.mas_right).offset(6); + make.leading.mas_equalTo(self.coinImageView.mas_trailing).offset(6); }]; [self.unitLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.numberLabel); - make.left.mas_equalTo(self.numberLabel.mas_right).offset(6); + make.leading.mas_equalTo(self.numberLabel.mas_trailing).offset(6); }]; [self.rechargeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(54, 24)); make.centerY.mas_equalTo(self.backView); - make.right.mas_equalTo(self.backView).offset(-15); + make.trailing.mas_equalTo(self.backView).offset(-15); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorEmptyTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorEmptyTableViewCell.m index 6854acd5..2d0f2b3f 100644 --- a/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorEmptyTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorEmptyTableViewCell.m @@ -45,7 +45,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorTableViewCell.m index 1a5cb651..7af5ba29 100644 --- a/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/Visitor/XPMineVisitorTableViewCell.m @@ -86,49 +86,49 @@ - (void)setUpConstraints { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(0); - make.right.mas_equalTo(-15); - make.left.mas_equalTo(15); + make.trailing.mas_equalTo(-15); + make.leading.mas_equalTo(15); make.height.mas_equalTo(70); make.bottom.mas_equalTo(0); }]; [self.avaterImgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.width.height.mas_equalTo(40); make.centerY.mas_equalTo(self.bgView.mas_centerY); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avaterImgView.mas_right).mas_offset(10); + make.leading.mas_equalTo(self.avaterImgView.mas_trailing).mas_offset(10); make.bottom.mas_equalTo(self.avaterImgView.mas_centerY).mas_offset(-4); }]; [self.genderImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.nickLabel.mas_centerY); make.height.mas_equalTo(14); make.width.mas_equalTo(28); - make.left.mas_equalTo(self.nickLabel.mas_right).mas_offset(5); - make.right.mas_lessThanOrEqualTo(self.tagPic.mas_left).mas_offset(-5); + make.leading.mas_equalTo(self.nickLabel.mas_trailing).mas_offset(5); + make.trailing.mas_lessThanOrEqualTo(self.tagPic.mas_leading).mas_offset(-5); }]; [self.tagPic mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.timeLabel.mas_top).mas_offset((-1)); - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.width.height.mas_equalTo(22); }]; [self.memberIdLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avaterImgView.mas_centerY).mas_offset(4); - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.centerY.mas_equalTo(self.memberIdLabel.mas_centerY); make.height.mas_equalTo(11); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(0); - make.left.mas_equalTo(self.avaterImgView); - make.right.mas_equalTo(-15); + make.leading.mas_equalTo(self.avaterImgView); + make.trailing.mas_equalTo(-15); make.height.mas_equalTo(0.5); }]; } @@ -137,16 +137,16 @@ if (self.isFirstItem) { [self.bgView mas_updateConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(10); - make.right.mas_equalTo(-15); - make.left.mas_equalTo(15); + make.trailing.mas_equalTo(-15); + make.leading.mas_equalTo(15); make.height.mas_equalTo(70); make.bottom.mas_equalTo(0); }]; } else { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(0); - make.right.mas_equalTo(-15); - make.left.mas_equalTo(15); + make.trailing.mas_equalTo(-15); + make.leading.mas_equalTo(15); make.height.mas_equalTo(70); make.bottom.mas_equalTo(0); }]; diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineBlackListTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineBlackListTableViewCell.m index da362ff1..f3f78589 100644 --- a/YuMi/Modules/YMMine/View/Cell/XPMineBlackListTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/XPMineBlackListTableViewCell.m @@ -42,12 +42,12 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(40, 40)); make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10); - make.right.mas_lessThanOrEqualTo(self.contentView).offset(-5); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); + make.trailing.mas_lessThanOrEqualTo(self.contentView).offset(-5); make.centerY.mas_equalTo(self.contentView); }]; } diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineGameTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineGameTableViewCell.m index c98e4c8b..4c906e76 100644 --- a/YuMi/Modules/YMMine/View/Cell/XPMineGameTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/XPMineGameTableViewCell.m @@ -48,20 +48,20 @@ - (void)initSubViewConstraints { [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.mas_equalTo(0); - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.mas_equalTo(12); + make.top.leading.mas_equalTo(12); make.height.mas_equalTo(18); }]; [self.titleBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.titleLabel); + make.trailing.mas_equalTo(self.titleLabel); make.bottom.mas_equalTo(self.titleLabel).mas_offset(1); make.size.mas_equalTo(CGSizeMake(41, 10)); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(14); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(63); }]; } @@ -120,7 +120,7 @@ }]; [self.sliderView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(12, 4)); - make.top.left.bottom.mas_equalTo(self.slideBackView); + make.top.leading.bottom.mas_equalTo(self.slideBackView); }]; } else { [self.sliderView removeFromSuperview]; diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemCollectionViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemCollectionViewCell.m index 07fe83c2..6ee86387 100644 --- a/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemCollectionViewCell.m @@ -52,7 +52,7 @@ [self.badgeImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.contentView); make.size.mas_equalTo(CGSizeMake(24, 10)); - make.centerX.mas_equalTo(self.logoImageView.mas_right); + make.centerX.mas_equalTo(self.logoImageView.mas_trailing); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemTableViewCell.m index a765d6b8..39f16d0d 100644 --- a/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/XPMineHeadItemTableViewCell.m @@ -45,12 +45,12 @@ - (void)initSubViewConstraints { [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.bottom.mas_equalTo(self.contentView); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(14); - make.left.right.mas_equalTo(self.mainView); + make.leading.trailing.mas_equalTo(self.mainView); make.height.mas_equalTo(77+32+17+6); }]; } @@ -109,7 +109,7 @@ }]; [self.sliderView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(12, 4)); - make.top.left.bottom.mas_equalTo(self.slideBackView); + make.top.leading.bottom.mas_equalTo(self.slideBackView); }]; } else { [self.sliderView removeFromSuperview]; diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineListCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineListCell.m index 073b9a07..b91276e4 100644 --- a/YuMi/Modules/YMMine/View/Cell/XPMineListCell.m +++ b/YuMi/Modules/YMMine/View/Cell/XPMineListCell.m @@ -45,37 +45,37 @@ } - (void)initSubViewConstraints { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); - make.right.mas_equalTo(-15); + make.leading.mas_equalTo(15); + make.trailing.mas_equalTo(-15); make.top.bottom.equalTo(self.contentView); }]; [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(11); + make.leading.mas_equalTo(11); make.width.height.mas_equalTo(25); make.centerY.equalTo(self.bgView); }]; [self.badgeImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.iconView.mas_top); make.size.mas_equalTo(CGSizeMake(24, 10)); - make.left.mas_equalTo(self.iconView.mas_centerX); + make.leading.mas_equalTo(self.iconView.mas_centerX); }]; [self.titleVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(42); + make.leading.mas_equalTo(42); make.centerY.equalTo(self.bgView); }]; [self.arrowView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_offset(20); make.height.mas_offset(20); make.centerY.equalTo(self.bgView); - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(0.5); make.bottom.equalTo(self.bgView); - make.left.mas_equalTo(15); - make.right.mas_equalTo(-15); + make.leading.mas_equalTo(15); + make.trailing.mas_equalTo(-15); }]; diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.m index b8c02b9a..e7c4ca4a 100644 --- a/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.m @@ -48,7 +48,7 @@ - (void)makeConstriants { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.top.mas_equalTo(14); }]; [self.subtitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -57,7 +57,7 @@ make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(8); }]; [self.selectSwitch mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.centerY.mas_equalTo(self.contentView); }]; } diff --git a/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.m b/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.m index 5bd396cc..7a9e7fe5 100644 --- a/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.m +++ b/YuMi/Modules/YMMine/View/Cell/XPMinePersonalCenterCell.m @@ -46,28 +46,28 @@ } - (void)initSubViewConstraints { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); - make.right.mas_offset(-15); + make.leading.mas_equalTo(15); + make.trailing.mas_offset(-15); make.top.bottom.equalTo(self.contentView); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(12); + make.leading.mas_equalTo(12); make.top.mas_equalTo(14); }]; [self.myRoomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(35); + make.leading.mas_equalTo(35); make.width.mas_greaterThanOrEqualTo(104); make.height.equalTo(@38); make.top.mas_equalTo(44); }]; [self.earningsRecordView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.height.width.equalTo(self.myRoomView); - make.right.mas_equalTo(-35); + make.trailing.mas_equalTo(-35); }]; [self.giveDiamondView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.height.width.equalTo(self.myRoomView); - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); }]; } -(void)setIsHaveGiveDiamond:(BOOL)isHaveGiveDiamond{ @@ -79,23 +79,23 @@ if(_isHaveGiveDiamond == YES){ self.giveDiamondView.hidden = NO; [self.myRoomView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.width.mas_greaterThanOrEqualTo(width); make.height.equalTo(@68); }]; [self.earningsRecordView mas_updateConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-width); + make.trailing.mas_equalTo(-width); }]; return; } self.giveDiamondView.hidden = YES; [self.myRoomView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(35); + make.leading.mas_equalTo(35); make.width.mas_greaterThanOrEqualTo(104); make.height.equalTo(@38); }]; [self.earningsRecordView mas_updateConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-35); + make.trailing.mas_equalTo(-35); }]; } @@ -209,13 +209,13 @@ - (void)initSubViewConstraints { [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(38); - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.top.equalTo(self); }]; [self.titleVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(48); + make.leading.mas_equalTo(48); make.top.equalTo(self.iconView.mas_top).mas_offset(9); - make.right.equalTo(self); + make.trailing.equalTo(self); }]; } -(void)setTitle:(NSString *)title{ @@ -227,22 +227,22 @@ if(_isHaveGiveDiamond){ [self.titleVeiw mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.top.equalTo(self.iconView.mas_top).mas_offset(48); }]; CGFloat left = (((KScreenWidth - 30) / 3) - 38) / 2; [self.iconView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(left); + make.leading.mas_equalTo(left); }]; _titleVeiw.textAlignment = NSTextAlignmentCenter; return; } [self.titleVeiw mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(48); + make.leading.mas_equalTo(48); make.top.equalTo(self.iconView.mas_top).mas_offset(9); }]; [self.iconView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); }]; _titleVeiw.textAlignment = NSTextAlignmentLeft; diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.m index c92c9f36..4cbd21f3 100644 --- a/YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/XPMineSettingTableViewCell.m @@ -48,7 +48,7 @@ - (void)initSubViewConstraints { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.bottom.mas_equalTo(self.contentView); }]; diff --git a/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomCell.m b/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomCell.m index 5d9fc65e..4f08849e 100644 --- a/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomCell.m +++ b/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomCell.m @@ -51,25 +51,25 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(44, 44)); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.centerY.mas_equalTo(self.contentView); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(7); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(7); make.top.mas_equalTo(self.avatarImageView).offset(2); - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.height.mas_equalTo(14); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.nickLabel.mas_bottom).mas_offset(8); - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.height.mas_equalTo(14); }]; [self.devideView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.height.mas_equalTo(0.5); - make.right.bottom.mas_equalTo(0); + make.trailing.bottom.mas_equalTo(0); }]; } diff --git a/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomEditCell.m b/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomEditCell.m index de8c1dd1..6061debe 100644 --- a/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomEditCell.m +++ b/YuMi/Modules/YMMine/View/CollectRoom/Cell/XPMineCollectRoomEditCell.m @@ -54,30 +54,30 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(44, 44)); - make.left.mas_equalTo(self.selectBtn.mas_right).offset(15); + make.leading.mas_equalTo(self.selectBtn.mas_trailing).offset(15); make.centerY.mas_equalTo(self.contentView); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(7); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(7); make.top.mas_equalTo(self.avatarImageView).offset(2); - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.height.mas_equalTo(14); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.nickLabel.mas_bottom).mas_offset(8); - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.height.mas_equalTo(14); }]; [self.devideView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.height.mas_equalTo(0.5); - make.right.bottom.mas_equalTo(0); + make.trailing.bottom.mas_equalTo(0); }]; [self.selectBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(20, 20)); - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.centerY.mas_equalTo(self.contentView); }]; } diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.m index 06d8be7f..9c4b9596 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.m @@ -75,18 +75,18 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(45, 45)); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.centerY.mas_equalTo(self.contentView); }]; [self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(13); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(13); make.height.mas_equalTo(20); make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-1.5); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nameStackView); + make.leading.mas_equalTo(self.nameStackView); make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(1.5); }]; [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -94,14 +94,14 @@ make.height.mas_equalTo(14); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nameStackView); - make.right.mas_equalTo(self.contentView).offset(-15); + make.leading.mas_equalTo(self.nameStackView); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.bottom.mas_equalTo(self.contentView); make.height.mas_equalTo(1); }]; [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.centerY.mas_equalTo(self.contentView); make.size.mas_equalTo(CGSizeMake(72, 24)); }]; diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m index bf4683cd..2413455c 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m @@ -73,11 +73,11 @@ - (void)initSubViewConstraints { [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(268); - make.left.right.mas_equalTo(self).inset(15); + make.leading.trailing.mas_equalTo(self).inset(15); make.top.mas_equalTo(12); }]; [self.userCardBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(0); + make.leading.trailing.top.mas_equalTo(0); make.height.mas_equalTo(180); }]; [self.userCardBackImageView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -93,33 +93,33 @@ make.centerX.mas_equalTo(self.mainView); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(12); + make.leading.mas_equalTo(12); make.top.mas_equalTo(self.userCardBackView.mas_bottom).mas_offset(14); make.height.mas_equalTo(14); }]; [self.diamondImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.diamondLabel.mas_left).mas_offset(-4); + make.trailing.mas_equalTo(self.diamondLabel.mas_leading).mas_offset(-4); make.size.mas_equalTo(CGSizeMake(11, 11)); make.centerY.mas_equalTo(self.titleLabel); }]; [self.diamondLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.titleLabel); - make.right.mas_equalTo(-12); + make.trailing.mas_equalTo(-12); make.height.mas_equalTo(20); }]; CGFloat width = (KScreenWidth - 30-20-12) *0.5; [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(width, 32)); make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(16); - make.right.mas_equalTo(self.mas_centerX).mas_offset(-6); + make.trailing.mas_equalTo(self.mas_centerX).mas_offset(-6); }]; [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.mas_centerX).mas_offset(6); + make.leading.mas_equalTo(self.mas_centerX).mas_offset(6); make.size.mas_equalTo(self.sendButton); make.centerY.mas_equalTo(self.sendButton); }]; [self.limitTimeBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.mas_equalTo(self.userCardBackView); + make.top.trailing.mas_equalTo(self.userCardBackView); make.height.mas_equalTo(20); make.width.mas_greaterThanOrEqualTo(36); }]; diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m index 9147231c..9787d281 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m @@ -72,7 +72,7 @@ }]; [self.userCardBackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(92); - make.left.top.right.mas_equalTo(0); + make.leading.top.trailing.mas_equalTo(0); }]; CGFloat dressImageW = (KScreenWidth - 42) *0.5; [self.dressUpImageView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -81,34 +81,34 @@ make.centerX.mas_equalTo(self.userCardBackView); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(8); + make.leading.mas_equalTo(8); make.top.mas_equalTo(self.userCardBackView.mas_bottom).mas_offset(8); make.height.mas_equalTo(14); }]; [self.diamondImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel); + make.leading.mas_equalTo(self.titleLabel); make.size.mas_equalTo(CGSizeMake(11, 11)); make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(12); }]; [self.diamondLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.diamondImageView); - make.left.mas_equalTo(self.diamondImageView.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.diamondImageView.mas_trailing).mas_offset(4); make.height.mas_equalTo(17); }]; CGFloat width = ((KScreenWidth - 42) *0.5 - 16-6) *0.5; [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(width, 24)); make.top.mas_equalTo(self.diamondImageView.mas_bottom).mas_offset(17); - make.right.mas_equalTo(self.mas_centerX).mas_offset(-3); + make.trailing.mas_equalTo(self.mas_centerX).mas_offset(-3); }]; [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.mas_centerX).mas_offset(3); + make.leading.mas_equalTo(self.mas_centerX).mas_offset(3); make.size.mas_equalTo(self.sendButton); make.centerY.mas_equalTo(self.sendButton); }]; [self.limitTimeBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.mas_equalTo(self.userCardBackView); + make.top.trailing.mas_equalTo(self.userCardBackView); make.height.mas_equalTo(20); make.width.mas_greaterThanOrEqualTo(36); }]; diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.m index 906abf61..f8d89e7b 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.m @@ -69,12 +69,12 @@ make.height.mas_equalTo(68); make.width.mas_equalTo(102); make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.contentView).offset(20); + make.leading.mas_equalTo(self.contentView).offset(20); }]; [self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.carImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.carImageView.mas_trailing).offset(10); make.bottom.mas_equalTo(self.carImageView.mas_centerY).offset(-3); }]; @@ -83,27 +83,27 @@ }]; [self.timeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nameStackView); + make.leading.mas_equalTo(self.nameStackView); make.top.mas_equalTo(self.carImageView.mas_centerY).offset(3); make.height.mas_equalTo(13); }]; [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.height.mas_equalTo(33); make.width.mas_equalTo(85); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(105); + make.leading.mas_equalTo(self.contentView).offset(105); make.height.mas_equalTo(0.5); make.bottom.mas_equalTo(self.contentView); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); }]; [self.limitImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.mas_equalTo(self.contentView).offset(20); + make.top.leading.mas_equalTo(self.contentView).offset(20); make.width.height.mas_equalTo(20); }]; } diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.m index 90dfc199..1eb602a5 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.m @@ -60,13 +60,13 @@ make.edges.mas_equalTo(0); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.mainView).mas_offset(8); + make.leading.mas_equalTo(self.mainView).mas_offset(8); make.top.mas_equalTo(self.mainView).mas_offset(12); make.width.mas_equalTo(3); make.height.mas_equalTo(16); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.lineView.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.lineView.mas_trailing).mas_offset(4); make.centerY.mas_equalTo(self.lineView); make.height.mas_equalTo(14); }]; @@ -88,7 +88,7 @@ [self.userCardBackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(92); make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(0); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); }]; CGFloat dressImageW = (KScreenWidth - 42) *0.5; [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyCollectionViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyCollectionViewCell.m index 179a1b2d..757167f1 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyCollectionViewCell.m @@ -43,7 +43,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyTableViewCell.m index 16d49ccd..ff8c793f 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyTableViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressEmptyTableViewCell.m @@ -44,7 +44,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineHeadwearTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineHeadwearTableViewCell.m index cb5c013a..de8e7486 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineHeadwearTableViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineHeadwearTableViewCell.m @@ -74,11 +74,11 @@ [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.width.mas_equalTo(80); make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.contentView).offset(20); + make.leading.mas_equalTo(self.contentView).offset(20); }]; [self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.headWearImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.headWearImageView.mas_trailing).offset(10); make.bottom.mas_equalTo(self.headWearImageView.mas_centerY).offset(-3); }]; @@ -87,27 +87,27 @@ }]; [self.timeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nameStackView); + make.leading.mas_equalTo(self.nameStackView); make.top.mas_equalTo(self.headWearImageView.mas_centerY).offset(3); make.height.mas_equalTo(13); }]; [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.height.mas_equalTo(33); make.width.mas_equalTo(85); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(105); + make.leading.mas_equalTo(self.contentView).offset(105); make.height.mas_equalTo(0.5); make.bottom.mas_equalTo(self.contentView); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); }]; [self.limitImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.mas_equalTo(self.contentView).offset(20); + make.top.leading.mas_equalTo(self.contentView).offset(20); make.width.height.mas_equalTo(20); }]; } diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNameplateTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNameplateTableViewCell.m index 21187632..653a9e65 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNameplateTableViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNameplateTableViewCell.m @@ -58,7 +58,7 @@ make.height.mas_equalTo(64); make.width.mas_equalTo(136); make.bottom.mas_equalTo(self); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); }]; [self.namePlateImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(30); @@ -67,17 +67,17 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.namePlateBgView.mas_right).offset(10); + make.leading.mas_equalTo(self.namePlateBgView.mas_trailing).offset(10); make.bottom.mas_equalTo(self.namePlateBgView.mas_centerY).offset(-3); }]; [self.timeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel); + make.leading.mas_equalTo(self.titleLabel); make.top.mas_equalTo(self.namePlateBgView.mas_centerY).offset(3); }]; [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.namePlateBgView); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.height.mas_equalTo(33); make.width.mas_equalTo(85); }]; diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.m index 48e6cd33..64b2d57d 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.m @@ -60,27 +60,27 @@ - (void)initSubViewConstraints { [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(224); - make.left.right.mas_equalTo(self).inset(15); + make.leading.trailing.mas_equalTo(self).inset(15); make.top.mas_equalTo(0); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.mainView).mas_offset(8); + make.leading.mas_equalTo(self.mainView).mas_offset(8); make.top.mas_equalTo(self.mainView).mas_offset(16); make.width.mas_equalTo(3); make.height.mas_equalTo(16); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.lineView.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.lineView.mas_trailing).mas_offset(4); make.centerY.mas_equalTo(self.lineView); }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.titleLabel.mas_trailing).mas_offset(4); make.centerY.mas_equalTo(self.lineView); }]; [self.useButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.lineView); - make.right.mas_equalTo(self.mainView).offset(-9); + make.trailing.mas_equalTo(self.mainView).offset(-9); make.height.mas_equalTo(24); make.width.mas_equalTo(89); }]; diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPDressSearchViewController.m b/YuMi/Modules/YMMine/View/DressUp/View/XPDressSearchViewController.m index 6a720945..20cafd8f 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPDressSearchViewController.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/XPDressSearchViewController.m @@ -69,11 +69,11 @@ - (void)initSubViewConstraints { [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.bottom.right.mas_equalTo(self.view); + make.leading.bottom.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.searchView.mas_bottom); }]; } diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m b/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m index 6a4421c0..800ddf12 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m @@ -98,45 +98,45 @@ - (void)initSubViewConstraints { [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.view); - make.left.mas_equalTo(15); - make.right.mas_equalTo(-15); + make.leading.mas_equalTo(15); + make.trailing.mas_equalTo(-15); make.height.mas_equalTo(100); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.height.mas_equalTo(50); make.top.mas_equalTo(self.pi_BannerView.mas_bottom); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.bottom.mas_equalTo(self.mainView.mas_top); make.top.mas_equalTo(self.titleView.mas_bottom); }]; [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.height.mas_equalTo(iPhoneXSeries ? 48+34 : 48); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.diamondImageView.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.diamondImageView.mas_trailing).mas_offset(4); make.centerY.mas_equalTo(self.diamondImageView); make.height.mas_equalTo(17); }]; [self.diamondImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.size.mas_equalTo(CGSizeMake(15, 15)); make.top.mas_equalTo(18); }]; [self.diamondLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.titleLabel); - make.left.mas_equalTo(self.titleLabel.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.titleLabel.mas_trailing).mas_offset(4); make.height.mas_equalTo(22); }]; [self.sendButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(72, 24)); - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.centerY.mas_equalTo(self.titleLabel); }]; } diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m b/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m index b07a9f0d..5015111e 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m @@ -66,19 +66,19 @@ - (void)initSubViewConstraints { [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.view); - make.left.mas_equalTo(15); - make.right.mas_equalTo(-15); + make.leading.mas_equalTo(15); + make.trailing.mas_equalTo(-15); make.height.mas_equalTo(100); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.height.mas_equalTo(50); make.top.mas_equalTo(self.pi_BannerView.mas_bottom); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.titleView.mas_bottom); }]; } diff --git a/YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.m b/YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.m index a78a2f7b..2b96ad14 100644 --- a/YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.m +++ b/YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.m @@ -57,12 +57,12 @@ - (void)initSubViewConstraints { [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(50); }]; [self.listContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.titleView.mas_bottom); }]; } diff --git a/YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.m b/YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.m index 76be48cf..1abc11fb 100644 --- a/YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.m +++ b/YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.m @@ -60,12 +60,12 @@ - (void)initSubViewConstraints { [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(50); }]; [self.listContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.titleView.mas_bottom); }]; } diff --git a/YuMi/Modules/YMMine/View/Friend/XPRoomMessageBubbleView.m b/YuMi/Modules/YMMine/View/Friend/XPRoomMessageBubbleView.m index 582379be..f4190338 100644 --- a/YuMi/Modules/YMMine/View/Friend/XPRoomMessageBubbleView.m +++ b/YuMi/Modules/YMMine/View/Friend/XPRoomMessageBubbleView.m @@ -49,17 +49,17 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(4); - make.left.mas_equalTo(4); + make.leading.mas_equalTo(4); make.width.height.mas_equalTo(25); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).mas_offset(4); - make.right.mas_equalTo(-4); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(4); + make.trailing.mas_equalTo(-4); make.centerY.mas_equalTo(self.avatarImageView.mas_centerY); }]; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-4); - make.left.mas_equalTo(4); + make.trailing.mas_equalTo(-4); + make.leading.mas_equalTo(4); make.top.mas_equalTo(self.avatarImageView.mas_bottom).mas_offset(4); }]; } @@ -153,7 +153,7 @@ }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.bottom.mas_equalTo(self).offset(-5); }]; } diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPIncomeRecordGoldDetailsCell.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPIncomeRecordGoldDetailsCell.m index 837f8cf0..c21ad245 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPIncomeRecordGoldDetailsCell.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPIncomeRecordGoldDetailsCell.m @@ -59,12 +59,12 @@ [self.userImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(12)); make.width.height.mas_equalTo(kGetScaleWidth(34)); - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); }]; [self.userNameView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.userImageView.mas_bottom).mas_offset(kGetScaleWidth(6)); - make.right.equalTo(self.diamondsNumView.mas_left).mas_offset(-kGetScaleWidth(4)); - make.left.mas_equalTo(kGetScaleWidth(3)); + make.trailing.equalTo(self.diamondsNumView.mas_leading).mas_offset(-kGetScaleWidth(4)); + make.leading.mas_equalTo(kGetScaleWidth(3)); make.height.mas_equalTo(kGetScaleWidth(14)); }]; CGFloat width = kGetScaleWidth(247/3); @@ -72,22 +72,22 @@ make.width.mas_equalTo(width); make.centerY.equalTo(self.userImageView); make.height.mas_equalTo(kGetScaleWidth(17)); - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); }]; [self.exchangeNumView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.width.centerY.equalTo(self.settlementNumView); - make.right.equalTo(self.settlementNumView.mas_left); + make.trailing.equalTo(self.settlementNumView.mas_leading); }]; [self.convertedView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(kGetScaleWidth(14)); - make.width.left.equalTo(self.exchangeNumView); + make.width.leading.equalTo(self.exchangeNumView); make.top.equalTo(self.exchangeNumView.mas_bottom).mas_offset(3); }]; [self.diamondsNumView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.width.centerY.equalTo(self.exchangeNumView); - make.right.equalTo(self.exchangeNumView.mas_left); + make.trailing.equalTo(self.exchangeNumView.mas_leading); }]; @@ -106,13 +106,13 @@ } - (void)initSubViewConstraintsWithClan{ [self.rankView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.bottom.equalTo(self.contentView); + make.leading.top.bottom.equalTo(self.contentView); make.width.mas_equalTo(kGetScaleWidth(50)); }]; [self.userImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(12)); make.width.height.mas_equalTo(kGetScaleWidth(35)); - make.left.mas_equalTo(kGetScaleWidth(57)); + make.leading.mas_equalTo(kGetScaleWidth(57)); }]; [self.userNameView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.userImageView.mas_bottom).mas_offset(kGetScaleWidth(6)); @@ -122,24 +122,24 @@ }]; CGFloat width = kGetScaleWidth(277/3); [self.diamondsNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.userNameView.mas_right).mas_offset(1); + make.leading.equalTo(self.userNameView.mas_trailing).mas_offset(1); make.width.mas_equalTo(width); make.centerY.equalTo(self.userImageView); make.height.mas_equalTo(kGetScaleWidth(17)); }]; [self.exchangeNumView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.width.centerY.equalTo(self.diamondsNumView); - make.left.equalTo(self.diamondsNumView.mas_right); + make.leading.equalTo(self.diamondsNumView.mas_trailing); }]; [self.convertedView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(kGetScaleWidth(14)); - make.width.left.equalTo(self.exchangeNumView); + make.width.leading.equalTo(self.exchangeNumView); make.top.equalTo(self.exchangeNumView.mas_bottom).mas_offset(3); }]; [self.settlementNumView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.width.centerY.equalTo(self.exchangeNumView); - make.left.equalTo(self.exchangeNumView.mas_right); + make.leading.equalTo(self.exchangeNumView.mas_trailing); }]; diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.m index 8e3b92b0..42e2c9d8 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveDiamondView.m @@ -93,16 +93,16 @@ [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(50)); make.top.mas_equalTo(kGetScaleWidth(16)); - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.headView.mas_right).mas_offset(kGetScaleWidth(10)); + make.leading.equalTo(self.headView.mas_trailing).mas_offset(kGetScaleWidth(10)); make.top.equalTo(self.headView.mas_top).mas_offset(kGetScaleWidth(8)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.height.mas_equalTo(kGetScaleWidth(17)); }]; [self.idTitleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.titleView); + make.leading.trailing.equalTo(self.titleView); make.height.mas_equalTo(kGetScaleWidth(14)); make.top.equalTo(self.titleView.mas_bottom).mas_offset(kGetScaleWidth(4)); }]; @@ -110,7 +110,7 @@ if(self.isHaveGiveGift == YES && self.isHaveGiveDiamond == YES){ [self.typeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); make.width.mas_equalTo(kGetScaleWidth(178)); make.height.mas_equalTo(kGetScaleWidth(31)); make.top.equalTo(self.headView.mas_bottom).mas_offset(kGetScaleWidth(25)); @@ -121,7 +121,7 @@ self.typeStackView.spacing = kGetScaleWidth(18); }else if (self.isHaveGiveDiamond == YES && self.isHaveGiveGift == NO){ [self.typeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); make.width.mas_equalTo(kGetScaleWidth(80)); make.height.mas_equalTo(kGetScaleWidth(31)); make.top.equalTo(self.headView.mas_bottom).mas_offset(kGetScaleWidth(25)); @@ -132,7 +132,7 @@ self.typeStackView.spacing = kGetScaleWidth(0); }else if (self.isHaveGiveDiamond == NO && self.isHaveGiveGift == YES){ [self.typeStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); make.width.mas_equalTo(kGetScaleWidth(80)); make.height.mas_equalTo(kGetScaleWidth(31)); make.top.equalTo(self.headView.mas_bottom).mas_offset(kGetScaleWidth(25)); @@ -145,7 +145,7 @@ } [self.numIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.headView); + make.leading.equalTo(self.headView); make.width.height.mas_equalTo(kGetScaleWidth(24)); make.top.equalTo(self.typeStackView.mas_bottom).mas_offset(kGetScaleWidth(35)); @@ -159,38 +159,38 @@ }]; [self.diamondNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.equalTo(self.titleView); + make.trailing.equalTo(self.titleView); make.height.mas_equalTo(kGetScaleWidth(24)); - make.left.equalTo(self.numIcon.mas_right).mas_offset(kGetScaleWidth(10)); + make.leading.equalTo(self.numIcon.mas_trailing).mas_offset(kGetScaleWidth(10)); make.centerY.equalTo(self.numIcon); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(1); - make.left.equalTo(self.headView); - make.right.equalTo(self.titleView); + make.leading.equalTo(self.headView); + make.trailing.equalTo(self.titleView); make.top.equalTo(self.numIcon.mas_bottom).mas_offset(kGetScaleWidth(6)); }]; [self.myDiamondIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.equalTo(self.titleView); + make.trailing.equalTo(self.titleView); make.width.height.equalTo(self.numIcon); make.top.equalTo(self.numIcon.mas_bottom).mas_offset(kGetScaleWidth(9)); }]; [self.myDiamondNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.equalTo(self.myDiamondIcon.mas_left).mas_offset(-kGetScaleWidth(8)); + make.trailing.equalTo(self.myDiamondIcon.mas_leading).mas_offset(-kGetScaleWidth(8)); make.height.equalTo(self.titleView); - make.left.equalTo(self.headView); + make.leading.equalTo(self.headView); make.centerY.equalTo(self.myDiamondIcon); }]; [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.headView); - make.right.equalTo(self.titleView); + make.leading.equalTo(self.headView); + make.trailing.equalTo(self.titleView); make.top.equalTo(self.typeStackView.mas_bottom).mas_offset(kGetScaleWidth(162)); make.height.mas_equalTo(kGetScaleWidth(46)); }]; [self.giveGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); - make.right.mas_equalTo(0); + make.leading.mas_equalTo(0); + make.trailing.mas_equalTo(0); make.top.equalTo(self.typeStackView.mas_bottom).mas_offset(kGetScaleWidth(20)); make.height.mas_equalTo(kGetScaleWidth(370)); }]; diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.m index 9ce95574..da20797f 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftView.m @@ -45,14 +45,14 @@ - (void)initSubViewConstraints { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.top.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(290)); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.top.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(248)); }]; @@ -63,25 +63,25 @@ make.width.mas_equalTo(0); }]; [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.height.mas_equalTo(kGetScaleWidth(17)); make.width.mas_equalTo(kGetScaleWidth(156)); make.top.equalTo(self.bgView.mas_bottom).mas_offset(kGetScaleWidth(23)); }]; [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.textField); - make.right.equalTo(self.textField.mas_left).mas_offset(-kGetScaleWidth(10)); + make.trailing.equalTo(self.textField.mas_leading).mas_offset(-kGetScaleWidth(10)); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.equalTo(self.textField); - make.left.equalTo(self.numView); + make.trailing.equalTo(self.textField); + make.leading.equalTo(self.numView); make.height.mas_equalTo(1); make.top.equalTo(self.textField.mas_bottom).mas_offset(kGetScaleWidth(11)); }]; [self.allBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(36)); make.height.mas_equalTo(kGetScaleWidth(19)); - make.right.equalTo(self.textField); + make.trailing.equalTo(self.textField); make.top.equalTo(self.lineView.mas_bottom).mas_offset(kGetScaleWidth(10)); }]; } diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftViewCell.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftViewCell.m index edad1b2a..b7f6d856 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftViewCell.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineChooseGiveGiftViewCell.m @@ -41,12 +41,12 @@ }]; [self.giftNameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.contentView); + make.leading.trailing.equalTo(self.contentView); make.height.mas_equalTo(kGetScaleWidth(12)); make.top.equalTo(self.giftImageView.mas_bottom).mas_offset(kGetScaleWidth(6)); }]; [self.giftNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.left.equalTo(self.contentView); + make.trailing.leading.equalTo(self.contentView); make.height.equalTo(self.giftNameView); make.top.equalTo(self.giftNameView.mas_bottom).mas_offset(kGetScaleWidth(5)); }]; diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.m index a9c9f1b2..48d7a2a7 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.m @@ -58,35 +58,35 @@ [self.backVeiw mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(22)); make.top.mas_equalTo(kGetScaleWidth(10)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(20)); - make.right.mas_equalTo(-kGetScaleWidth(20)); + make.leading.mas_equalTo(kGetScaleWidth(20)); + make.trailing.mas_equalTo(-kGetScaleWidth(20)); make.top.mas_equalTo(kGetScaleWidth(36)); make.height.mas_equalTo(kGetScaleWidth(21)); }]; [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.titleView); + make.leading.trailing.equalTo(self.titleView); make.height.mas_equalTo(kGetScaleWidth(24)); make.top.mas_equalTo(kGetScaleWidth(78)); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.titleView); + make.leading.trailing.equalTo(self.titleView); make.height.mas_equalTo(1); make.top.mas_equalTo(kGetScaleWidth(113)); }]; [self.poundageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self); + make.leading.trailing.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(17)); make.top.mas_equalTo(kGetScaleWidth(125)); }]; [self.totalNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self); + make.leading.trailing.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(17)); make.top.mas_equalTo(kGetScaleWidth(150)); }]; @@ -313,11 +313,11 @@ } - (void)initSubViewConstraints { [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(20)); + make.leading.mas_equalTo(kGetScaleWidth(20)); make.top.bottom.equalTo(self); }]; [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(20)); + make.trailing.mas_equalTo(-kGetScaleWidth(20)); make.top.bottom.equalTo(self); }]; diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondCell.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondCell.m index b10ae644..113b1a8b 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondCell.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondCell.m @@ -50,24 +50,24 @@ [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(50)); make.centerY.equalTo(self); - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.headView.mas_right).mas_offset( kGetScaleWidth(10)); + make.leading.equalTo(self.headView.mas_trailing).mas_offset( kGetScaleWidth(10)); make.height.mas_equalTo(kGetScaleWidth(17)); make.top.equalTo(self.headView.mas_top).mas_offset(kGetScaleWidth(8)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); }]; [self.IdTitleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.titleView); + make.leading.trailing.equalTo(self.titleView); make.height.mas_equalTo(kGetScaleWidth(14)); make.top.equalTo(self.titleView.mas_bottom).mas_offset(kGetScaleWidth(4)); }]; [self.arrowView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(20)); make.centerY.equalTo(self); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); }]; } #pragma mark - 懒加载 diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsCell.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsCell.m index a8ab3789..b9f445eb 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsCell.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondDetailsCell.m @@ -46,25 +46,25 @@ [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(40)); make.centerY.equalTo(self.contentView); - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); }]; [self.timeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.centerY.equalTo(self.contentView); }]; [self.giftTitleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(65)); + make.leading.mas_equalTo(kGetScaleWidth(65)); make.centerY.equalTo(self.contentView); - make.right.equalTo(self.timeView.mas_left).mas_offset(-kGetScaleWidth(10)); + make.trailing.equalTo(self.timeView.mas_leading).mas_offset(-kGetScaleWidth(10)); }]; [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.pi_iconView.mas_top).mas_offset(kGetScaleWidth(3)); - make.left.mas_equalTo(kGetScaleWidth(65)); + make.leading.mas_equalTo(kGetScaleWidth(65)); make.height.mas_equalTo(kGetScaleWidth(17)); - make.right.equalTo(self.timeView.mas_left).mas_offset(-kGetScaleWidth(10)); + make.trailing.equalTo(self.timeView.mas_leading).mas_offset(-kGetScaleWidth(10)); }]; [self.spendingView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.numView); + make.leading.trailing.equalTo(self.numView); make.top.equalTo(self.numView.mas_bottom).mas_offset(kGetScaleWidth(4)); make.height.mas_equalTo(kGetScaleWidth(14)); }]; diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPasswordView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPasswordView.m index 2e0f7a7e..d7121fdf 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPasswordView.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPasswordView.m @@ -45,18 +45,18 @@ }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(25)); - make.right.left.equalTo(self); + make.trailing.leading.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(21)); }]; [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(31)); + make.leading.mas_equalTo(kGetScaleWidth(31)); make.width.mas_equalTo(kGetScaleWidth(110)); make.height.mas_equalTo(kGetScaleWidth(37)); make.top.mas_equalTo(kGetScaleWidth(81)); }]; [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.top.width.height.equalTo(self.cancelBtn); - make.right.mas_equalTo(-kGetScaleWidth(31)); + make.trailing.mas_equalTo(-kGetScaleWidth(31)); }]; } diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPwdView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPwdView.m index d6f8724b..964cbcc3 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPwdView.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondPwdView.m @@ -87,7 +87,7 @@ self.bgView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, kGetScaleWidth(162)); [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.top.mas_equalTo(kGetScaleWidth(15)); make.height.width.mas_equalTo(kGetScaleWidth(22)); }]; @@ -101,8 +101,8 @@ [self.codeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.height.mas_equalTo(kGetScaleWidth(50)); make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(40)); }]; diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondSearchView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondSearchView.m index 0544a3c3..b9e9f28d 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondSearchView.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineGiveDiamondSearchView.m @@ -37,18 +37,18 @@ } - (void)initSubViewConstraints { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.top.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(32)); }]; [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.equalTo(self.bgView); - make.left.mas_equalTo(kGetScaleWidth(10)); - make.right.mas_equalTo(-kGetScaleWidth(76)); + make.leading.mas_equalTo(kGetScaleWidth(10)); + make.trailing.mas_equalTo(-kGetScaleWidth(76)); }]; [self.searchBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(3)); + make.trailing.mas_equalTo(-kGetScaleWidth(3)); make.centerY.equalTo(self.bgView); make.width.mas_equalTo(kGetScaleWidth(66)); make.height.mas_equalTo(kGetScaleWidth(26)); diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.m index 1804e719..b6fd89e2 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.m @@ -74,87 +74,87 @@ } - (void)initSubViewConstraints { [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self).inset(kGetScaleWidth(15)); + make.leading.trailing.equalTo(self).inset(kGetScaleWidth(15)); make.height.mas_equalTo(kGetScaleWidth(90)); make.top.mas_equalTo(kGetScaleWidth(0)); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(14)); + make.leading.mas_equalTo(kGetScaleWidth(14)); make.top.mas_equalTo(kGetScaleWidth(12)); make.height.mas_equalTo(kGetScaleWidth(21)); }]; [self.baseNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(14)); + make.leading.mas_equalTo(kGetScaleWidth(14)); make.height.mas_equalTo(kGetScaleWidth(32)); make.top.mas_equalTo(kGetScaleWidth(41)); make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(70)); }]; [self.equalSignView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.baseNumView.mas_right).mas_offset(kGetScaleWidth(4)); + make.leading.equalTo(self.baseNumView.mas_trailing).mas_offset(kGetScaleWidth(4)); make.top.equalTo(self.baseNumView); make.height.width.mas_equalTo(kGetScaleWidth(14)); }]; [self.guildNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.equalSignView.mas_right).mas_offset(kGetScaleWidth(4)); + make.leading.equalTo(self.equalSignView.mas_trailing).mas_offset(kGetScaleWidth(4)); make.height.top.equalTo(self.baseNumView); make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(40)); }]; [self.addView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.top.equalTo(self.equalSignView); - make.left.equalTo(self.guildNumView.mas_right).mas_offset(kGetScaleWidth(10)); + make.leading.equalTo(self.guildNumView.mas_trailing).mas_offset(kGetScaleWidth(10)); }]; [self.numberGoldView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.top.equalTo(self.baseNumView); make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(50)); - make.left.equalTo(self.addView.mas_right).mas_offset(kGetScaleWidth(10)); + make.leading.equalTo(self.addView.mas_trailing).mas_offset(kGetScaleWidth(10)); }]; [self.minusSignView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.top.equalTo(self.equalSignView); - make.left.equalTo(self.numberGoldView.mas_right).mas_offset(kGetScaleWidth(10)); + make.leading.equalTo(self.numberGoldView.mas_trailing).mas_offset(kGetScaleWidth(10)); }]; [self.numberExchangeView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.top.equalTo(self.baseNumView); make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(50)); - make.left.equalTo(self.minusSignView.mas_right).mas_offset(kGetScaleWidth(10)); - make.right.mas_equalTo(-kGetScaleWidth(14)); + make.leading.equalTo(self.minusSignView.mas_trailing).mas_offset(kGetScaleWidth(10)); + make.trailing.mas_equalTo(-kGetScaleWidth(14)); }]; [self.bgItemView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(47)); - make.left.right.equalTo(self).inset(kGetScaleWidth(0)); + make.leading.trailing.equalTo(self).inset(kGetScaleWidth(0)); }]; [self.roomView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(64)); - make.left.mas_equalTo(kGetScaleWidth(0)); + make.leading.mas_equalTo(kGetScaleWidth(0)); make.height.mas_equalTo(kGetScaleWidth(17)); make.centerY.equalTo(self.bgItemView); }]; [self.memberView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.roomView.mas_right); + make.leading.equalTo(self.roomView.mas_trailing); make.centerY.width.height.equalTo(self.roomView); }]; CGFloat width = kGetScaleWidth(247/3); [self.settlementView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(width); - make.right.equalTo(self.bgItemView); + make.trailing.equalTo(self.bgItemView); make.centerY.height.equalTo(self.roomView); }]; [self.exchangeGoldView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.width.height.equalTo(self.settlementView); - make.right.equalTo(self.settlementView.mas_left); + make.trailing.equalTo(self.settlementView.mas_leading); }]; [self.diamondView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.width.height.equalTo(self.exchangeGoldView); - make.right.equalTo(self.exchangeGoldView.mas_left); + make.trailing.equalTo(self.exchangeGoldView.mas_leading); }]; @@ -393,7 +393,7 @@ make.height.mas_equalTo(kGetScaleWidth(17)); }]; [self.downBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.titleView.mas_right).mas_offset(kGetScaleWidth(3)); + make.leading.equalTo(self.titleView.mas_trailing).mas_offset(kGetScaleWidth(3)); make.top.equalTo(self.titleView.mas_top).mas_offset(kGetScaleWidth(4)); make.width.mas_equalTo(kGetScaleWidth(8)); make.height.mas_equalTo(kGetScaleWidth(4)); @@ -490,12 +490,12 @@ } - (void)initSubViewConstraints { [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.equalTo(self); + make.top.leading.trailing.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(14)); }]; [self.numberView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.left.right.equalTo(self); + make.bottom.leading.trailing.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(14)); }]; diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineChooseGiveDiamondVC.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineChooseGiveDiamondVC.m index af1e1497..8826d6ca 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineChooseGiveDiamondVC.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineChooseGiveDiamondVC.m @@ -235,7 +235,7 @@ UIKIT_EXTERN NSString * const kGiveDiamondDailyNum; - (void)initSubViewConstraints { [self.giveDiamondView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self.view); + make.leading.trailing.bottom.equalTo(self.view); make.top.mas_equalTo(0); }]; } diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondDetailsVC.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondDetailsVC.m index e959661d..c0ea45c3 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondDetailsVC.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondDetailsVC.m @@ -108,7 +108,7 @@ }]; [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.titleView.mas_bottom).offset(10); }]; } diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.m index 1548dc87..2593eb8d 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.m @@ -58,11 +58,11 @@ - (void)initSubViewConstraints { [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.equalTo(self.view); + make.top.leading.trailing.equalTo(self.view); make.height.mas_equalTo(kGetScaleWidth(32)); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.bottom.mas_equalTo(-kGetScaleWidth(148)); make.top.mas_equalTo(kGetScaleWidth(32)); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityCell.m index 9e1a3174..1f489742 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityCell.m @@ -71,19 +71,19 @@ } - (void)initSubViewConstraints { [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(12)); + make.leading.mas_equalTo(kGetScaleWidth(12)); make.width.height.mas_equalTo(kGetScaleWidth(50)); make.centerY.equalTo(self.contentView); }]; [self.exchangeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(12)); + make.trailing.mas_equalTo(-kGetScaleWidth(12)); make.width.mas_equalTo(kGetScaleWidth(68)); make.height.mas_equalTo(kGetScaleWidth(24)); make.centerY.equalTo(self.contentView); }]; [self.nickStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(70)); + make.leading.mas_equalTo(kGetScaleWidth(70)); make.top.mas_equalTo(kGetScaleWidth(21)); make.height.mas_equalTo(kGetScaleWidth(17)); make.width.mas_lessThanOrEqualTo(kGetScaleWidth(215)); @@ -101,8 +101,8 @@ make.width.mas_equalTo(kGetScaleWidth(22)); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.nameView); - make.right.mas_equalTo(-kGetScaleWidth(90)); + make.leading.equalTo(self.nameView); + make.trailing.mas_equalTo(-kGetScaleWidth(90)); make.top.mas_equalTo(kGetScaleWidth(45)); make.height.mas_equalTo(kGetScaleWidth(14)); }]; @@ -110,20 +110,20 @@ make.width.mas_greaterThanOrEqualTo(10); }]; [self.firstLineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.idView.mas_right).mas_offset(kGetScaleWidth(3)); + make.leading.equalTo(self.idView.mas_trailing).mas_offset(kGetScaleWidth(3)); make.centerY.equalTo(self.idView); make.width.mas_equalTo(kGetScaleWidth(1)); make.height.mas_equalTo(kGetScaleWidth(8)); }]; [self.secondLineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.roomView.mas_right).mas_offset(kGetScaleWidth(3)); + make.leading.equalTo(self.roomView.mas_trailing).mas_offset(kGetScaleWidth(3)); make.centerY.equalTo(self.roomView); make.width.mas_equalTo(kGetScaleWidth(1)); make.height.mas_equalTo(kGetScaleWidth(8)); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self.contentView); + make.leading.trailing.bottom.equalTo(self.contentView); make.height.mas_equalTo(kGetScaleWidth(1)); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityHeadView.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityHeadView.m index 42740b9f..e4db0d65 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityHeadView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMineExchangeAuthorityHeadView.m @@ -31,7 +31,7 @@ } - (void)initSubViewConstraints { [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); make.centerY.equalTo(self.contentView); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.m index 46a8ecae..aee1437f 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/ExchangeAuthority/XPMinePromptWindow.m @@ -77,7 +77,7 @@ [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(22)); make.top.mas_equalTo(kGetScaleWidth(10)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(25)); @@ -86,20 +86,20 @@ [self.messageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(67)); - make.right.mas_equalTo(-kGetScaleWidth(20)); - make.left.mas_equalTo(kGetScaleWidth(20)); + make.trailing.mas_equalTo(-kGetScaleWidth(20)); + make.leading.mas_equalTo(kGetScaleWidth(20)); }]; [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(110)); make.height.mas_equalTo(kGetScaleWidth(37)); - make.left.mas_equalTo(kGetScaleWidth(31)); + make.leading.mas_equalTo(kGetScaleWidth(31)); make.top.mas_equalTo(kGetScaleWidth(129)); }]; [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.top.equalTo(self.cancelBtn); - make.right.mas_equalTo(-kGetScaleWidth(31)); + make.trailing.mas_equalTo(-kGetScaleWidth(31)); }]; } #pragma mark -懒加载 diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/GuildList/XPMineGuildListCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/GuildList/XPMineGuildListCell.m index 9dd4f7fc..39741847 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/GuildList/XPMineGuildListCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/GuildList/XPMineGuildListCell.m @@ -54,12 +54,12 @@ - (void)initSubViewConstraints { [self.rankingIcon mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(22)); - make.left.mas_equalTo(kGetScaleWidth(12)); + make.leading.mas_equalTo(kGetScaleWidth(12)); make.centerY.equalTo(self.contentView); }]; [self.headIcon mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(40)); - make.left.equalTo(self.rankingIcon.mas_right).mas_offset(kGetScaleWidth(10)); + make.leading.equalTo(self.rankingIcon.mas_trailing).mas_offset(kGetScaleWidth(10)); make.centerY.equalTo(self.contentView); }]; [self.rankingTilte mas_makeConstraints:^(MASConstraintMaker *make) { @@ -69,14 +69,14 @@ [self.guildIcon mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(29)); - make.right.mas_equalTo(-kGetScaleWidth(91)); + make.trailing.mas_equalTo(-kGetScaleWidth(91)); make.centerY.equalTo(self.contentView); }]; [self.applyBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(70)); make.height.mas_equalTo(kGetScaleWidth(25)); make.centerY.equalTo(self.contentView); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); }]; } -(void)setApplyBtnType:(BOOL)is{ @@ -155,12 +155,12 @@ _roomIdLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineGuildListCell3"),_hallModel.ownerErbanNo]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.equalTo(self.headIcon.mas_centerY).mas_offset(-kGetScaleWidth(3.5)); - make.left.equalTo(self.headIcon.mas_right).mas_offset(kGetScaleWidth(8)); - make.right.mas_equalTo(-kGetScaleWidth(130)); + make.leading.equalTo(self.headIcon.mas_trailing).mas_offset(kGetScaleWidth(8)); + make.trailing.mas_equalTo(-kGetScaleWidth(130)); }]; [self.roomIdLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.nameLabel); + make.leading.trailing.equalTo(self.nameLabel); make.top.equalTo(self.nameLabel.mas_bottom).mas_offset(kGetScaleWidth(7)); make.height.mas_equalTo(kGetScaleWidth(14)); }]; @@ -215,15 +215,15 @@ _roomIdLabel.hidden = YES; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.headIcon); - make.left.equalTo(self.headIcon.mas_right).mas_offset(kGetScaleWidth(8)); - make.right.mas_equalTo(-kGetScaleWidth(130)); + make.leading.equalTo(self.headIcon.mas_trailing).mas_offset(kGetScaleWidth(8)); + make.trailing.mas_equalTo(-kGetScaleWidth(130)); }]; if(_guildModel.applyBtnStatus == 0){ self.applyBtn.hidden = YES; [_guildIcon mas_updateConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); }]; return; } @@ -234,7 +234,7 @@ if(_isFromHall == YES){ self.applyBtn.hidden = YES; [self.guildIcon mas_updateConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeDetailCollectionViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeDetailCollectionViewCell.m index 8b951494..6882d3e8 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeDetailCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeDetailCollectionViewCell.m @@ -56,7 +56,7 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(7); - make.left.right.mas_equalTo(self).inset(18); + make.leading.trailing.mas_equalTo(self).inset(18); make.height.mas_equalTo(self.avatarImageView.mas_width); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeRecordTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeRecordTableViewCell.m index ebe9a110..65fd9087 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeRecordTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildIncomeRecordTableViewCell.m @@ -121,7 +121,7 @@ - (void)initSubViewConstraints { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.bottom.mas_equalTo(self.contentView); + make.leading.trailing.top.bottom.mas_equalTo(self.contentView); }]; [self.rankLabel mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.m index 0e239721..bfe30ace 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildPersonIncomeTableViewCell.m @@ -65,18 +65,18 @@ [self.rankLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(54), kGetScaleWidth(17))); - make.left.mas_equalTo(kGetScaleWidth(0)); + make.leading.mas_equalTo(kGetScaleWidth(0)); make.centerY.equalTo(self.contentView); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(35)); make.centerY.equalTo(self.contentView); - make.left.equalTo(self.rankLabel.mas_right).mas_offset(kGetScaleWidth(6)); + make.leading.equalTo(self.rankLabel.mas_trailing).mas_offset(kGetScaleWidth(6)); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(101)); + make.leading.mas_equalTo(kGetScaleWidth(101)); make.top.equalTo(self.avatarImageView); make.width.mas_equalTo(kGetScaleWidth(120)); make.height.mas_equalTo(kGetScaleWidth(14)); @@ -90,11 +90,11 @@ }]; [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(20)); - make.right.mas_equalTo(-kGetScaleWidth(12)); + make.trailing.mas_equalTo(-kGetScaleWidth(12)); make.centerY.equalTo(self.contentView); }]; [self.incomeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(38)); + make.trailing.mas_equalTo(-kGetScaleWidth(38)); make.centerY.equalTo(self.contentView); make.width.height.mas_equalTo(kGetScaleWidth(116)); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildSingleRoomIncomeTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildSingleRoomIncomeTableViewCell.m index 02501202..32837b80 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildSingleRoomIncomeTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/Income/XPGuildSingleRoomIncomeTableViewCell.m @@ -60,14 +60,14 @@ - (void)initSubViewConstraints { [self.rankLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(0)); + make.leading.mas_equalTo(kGetScaleWidth(0)); make.width.mas_equalTo(kGetScaleWidth(48)); make.centerY.equalTo(self.contentView); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(35)); make.centerY.equalTo(self.contentView); - make.left.mas_equalTo(kGetScaleWidth(50)); + make.leading.mas_equalTo(kGetScaleWidth(50)); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.equalTo(self.avatarImageView); @@ -75,27 +75,27 @@ make.width.mas_equalTo(kGetScaleWidth(56)); }]; [self.hallNickView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(5)); + make.trailing.mas_equalTo(-kGetScaleWidth(5)); make.centerY.equalTo(self.contentView); - make.left.equalTo(self.hallAvatarImageView.mas_right).mas_offset(kGetScaleWidth(6)); + make.leading.equalTo(self.hallAvatarImageView.mas_trailing).mas_offset(kGetScaleWidth(6)); }]; [self.hallAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.width.mas_equalTo(kGetScaleWidth(35)); make.centerY.equalTo(self.contentView); -// make.right.equalTo(self.hallNickView.mas_left).mas_offset(-kGetScaleWidth(6)); - make.left.equalTo(self.contentView).mas_offset(kGetScaleWidth(260)); +// make.trailing.equalTo(self.hallNickView.mas_leading).mas_offset(-kGetScaleWidth(6)); + make.leading.equalTo(self.contentView).mas_offset(kGetScaleWidth(260)); }]; [self.roomIncomeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(97)); + make.leading.mas_equalTo(kGetScaleWidth(97)); make.centerY.equalTo(self.contentView); - make.right.equalTo(self.hallAvatarImageView.mas_left).mas_offset(-kGetScaleWidth(5)); + make.trailing.equalTo(self.hallAvatarImageView.mas_leading).mas_offset(-kGetScaleWidth(5)); make.width.mas_greaterThanOrEqualTo(10); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.equalTo(self.contentView); - make.left.equalTo(self.rankLabel); - make.right.equalTo(self.hallNickView); + make.leading.equalTo(self.rankLabel); + make.trailing.equalTo(self.hallNickView); make.height.mas_equalTo(kGetScaleWidth(1)); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMaskManagerCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMaskManagerCell.m index 3f1d69cd..eb599880 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMaskManagerCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMaskManagerCell.m @@ -44,31 +44,31 @@ } - (void)initSubViewConstraints { [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); make.width.height.mas_equalTo(kGetScaleWidth(74)); make.top.mas_equalTo(kGetScaleWidth(20)); }]; [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(36)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(36)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.top.mas_equalTo(kGetScaleWidth(15)); make.height.mas_equalTo(kGetScaleWidth(84)); }]; [self.unmaskingBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(12)); + make.trailing.mas_equalTo(-kGetScaleWidth(12)); make.height.mas_equalTo(kGetScaleWidth(30)); make.width.mas_equalTo(kGetScaleWidth(83)); make.centerY.equalTo(self.bgView); }]; [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(65)); + make.leading.mas_equalTo(kGetScaleWidth(65)); make.top.mas_equalTo(kGetScaleWidth(15)); make.height.mas_equalTo(kGetScaleWidth(21)); - make.right.equalTo(self.unmaskingBtn.mas_left).mas_offset(-kGetScaleWidth(10)); + make.trailing.equalTo(self.unmaskingBtn.mas_leading).mas_offset(-kGetScaleWidth(10)); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.left.equalTo(self.nameView); + make.trailing.leading.equalTo(self.nameView); make.top.equalTo(self.nameView.mas_bottom).mas_offset(kGetScaleWidth(16)); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMineGuildManagerPerTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMineGuildManagerPerTableViewCell.m index 8d29b9bd..b46fcd4a 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMineGuildManagerPerTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/Setting/XPMineGuildManagerPerTableViewCell.m @@ -47,12 +47,12 @@ - (void)initSubViewConstraints { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.centerY.mas_equalTo(self.contentView); }]; [self.onswitch mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.centerY.mas_equalTo(self.contentView); make.width.mas_equalTo(44); make.height.mas_equalTo(24); diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildChooseManagerRoomTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildChooseManagerRoomTableViewCell.m index 831389ce..f95bc283 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildChooseManagerRoomTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildChooseManagerRoomTableViewCell.m @@ -51,32 +51,32 @@ - (void)initSubViewConstraints { [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.contentView); make.bottom.mas_equalTo(self.contentView).offset(-15); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backView).offset(10); + make.leading.mas_equalTo(self.backView).offset(10); make.centerY.mas_equalTo(self.backView); make.size.mas_equalTo(CGSizeMake(53, 53)); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.backView.mas_centerY).offset(-2); - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(8); - make.right.mas_lessThanOrEqualTo(self.chooseButton.mas_left).offset(-5); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(8); + make.trailing.mas_lessThanOrEqualTo(self.chooseButton.mas_leading).offset(-5); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); }]; [self.chooseButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(30, 30)); make.centerY.mas_equalTo(self.backView); - make.right.mas_equalTo(self.backView).offset(-10); + make.trailing.mas_equalTo(self.backView).offset(-10); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.m index dc1e54a5..50867157 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.m @@ -52,29 +52,29 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.width.height.mas_equalTo(50); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-3); - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(6); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(6); }]; [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.nickLabel.mas_centerY); - make.left.mas_equalTo(self.nickLabel.mas_right).mas_offset(3); + make.leading.mas_equalTo(self.nickLabel.mas_trailing).mas_offset(3); make.height.mas_equalTo(14); make.width.mas_equalTo(28); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); - make.left.mas_equalTo(self.nickLabel.mas_left); + make.leading.mas_equalTo(self.nickLabel.mas_leading); }]; [self.superAdminButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.width.mas_equalTo(90); make.height.mas_equalTo(30); make.centerY.mas_equalTo(self.contentView); diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminRoomCollectionViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminRoomCollectionViewCell.m index 3639daf1..7e66f02f 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminRoomCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminRoomCollectionViewCell.m @@ -48,7 +48,7 @@ [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(6); - make.right.left.mas_equalTo(self.contentView); + make.trailing.leading.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminSetTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminSetTableViewCell.m index b50fea86..edc19559 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminSetTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSuperAdminSetTableViewCell.m @@ -68,50 +68,50 @@ - (void)initSubViewConstraints { [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.contentView); make.bottom.mas_equalTo(self.contentView).offset(-15); }]; [self.managerInfoView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.backView); + make.leading.trailing.top.mas_equalTo(self.backView); make.height.mas_equalTo(74); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(64, 64)); - make.left.top.mas_equalTo(self.managerInfoView).offset(10); + make.leading.top.mas_equalTo(self.managerInfoView).offset(10); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avatarImageView); - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(6); - make.right.mas_lessThanOrEqualTo(self.moreButton.mas_left).offset(-5); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(6); + make.trailing.mas_lessThanOrEqualTo(self.moreButton.mas_leading).offset(-5); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(6); }]; [self.moreButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backView).offset(-5); + make.trailing.mas_equalTo(self.backView).offset(-5); make.top.mas_equalTo(self.backView).offset(10); make.width.height.mas_equalTo(30); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backView).offset(10); + make.leading.mas_equalTo(self.backView).offset(10); make.top.mas_equalTo(self.managerInfoView.mas_bottom).offset(15); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.backView); + make.leading.trailing.bottom.mas_equalTo(self.backView); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(6); }]; [self.menuView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backView).offset(-5); + make.trailing.mas_equalTo(self.backView).offset(-5); make.top.mas_equalTo(self.moreButton.mas_bottom).offset(0); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.m index f6fcb0c1..9de5e0aa 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.m @@ -76,14 +76,14 @@ - (void)initSubViewConstraints { [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.bottom.mas_equalTo(self.contentView); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(54, 54)); make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.backView).offset(9); + make.leading.mas_equalTo(self.backView).offset(9); }]; [self.avatarBorderView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -115,25 +115,25 @@ }]; [self.nickStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(6); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(6); make.height.mas_equalTo(20); make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-3); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(3); }]; [self.guildNickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backView).offset(-15); + make.trailing.mas_equalTo(self.backView).offset(-15); make.centerY.mas_equalTo(self.idLabel); }]; [self.rightButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(20, 20)); make.centerY.mas_equalTo(self.backView); - make.right.mas_equalTo(self.backView).offset(-15); + make.trailing.mas_equalTo(self.backView).offset(-15); }]; } @@ -269,7 +269,7 @@ - (void)setPi_IsClan:(BOOL)pi_IsClan{ _pi_IsClan = pi_IsClan; [self.backView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(0); + make.leading.trailing.mas_equalTo(self.contentView).inset(0); }]; } - (void)setCellType:(ClanMemberTableViewCellType)cellType { @@ -278,7 +278,7 @@ case ClanMemberTableViewCellType_Normal: { [self.backView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); }]; self.rightButton.hidden = YES; } @@ -286,7 +286,7 @@ case ClanMemberTableViewCellType_Remove_Member: { [self.backView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(0); + make.leading.trailing.mas_equalTo(self.contentView).inset(0); }]; self.rightButton.hidden = NO; [self.rightButton setImage:[UIImage imageNamed:@"mine_guild_guild_remove_member"] forState:UIControlStateNormal]; @@ -296,7 +296,7 @@ case ClanMemberTableViewCellType_Manager_Set: { [self.backView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(0); + make.leading.trailing.mas_equalTo(self.contentView).inset(0); }]; self.rightButton.hidden = NO; [self.rightButton setImage:[UIImage imageNamed:@"room_setting_arrow"] forState:UIControlStateNormal]; @@ -306,7 +306,7 @@ case ClanMemberTableViewCellType_Manager_Add_Remove: { [self.backView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(0); + make.leading.trailing.mas_equalTo(self.contentView).inset(0); }]; self.rightButton.hidden = NO; self.backView.backgroundColor = [DJDKMIMOMColor appBackgroundColor]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanRoomCollectionViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanRoomCollectionViewCell.m index 0b54b652..86580286 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanRoomCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanRoomCollectionViewCell.m @@ -41,13 +41,13 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.mas_equalTo(self.contentView); + make.leading.top.mas_equalTo(self.contentView); make.height.mas_equalTo(60); make.width.mas_equalTo(60); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(6); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPGuildEmptyCollectionViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPGuildEmptyCollectionViewCell.m index 0b609481..152ffe35 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPGuildEmptyCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPGuildEmptyCollectionViewCell.m @@ -50,7 +50,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildEmptyTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildEmptyTableViewCell.m index 88aa3020..c56f3a87 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildEmptyTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildEmptyTableViewCell.m @@ -43,7 +43,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildSearchMemberTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildSearchMemberTableViewCell.m index 9d2d45ab..558c5401 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildSearchMemberTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPMineGuildSearchMemberTableViewCell.m @@ -66,23 +66,23 @@ UIKIT_EXTERN NSString *kInviteMemeberSuccess; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(50, 50)); make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.contentView).offset(12); + make.leading.mas_equalTo(self.contentView).offset(12); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(8); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(8); make.height.mas_equalTo(17); make.top.mas_equalTo(21); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.top.mas_equalTo(45); make.height.mas_equalTo(14); }]; [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel.mas_right).offset(6); + make.leading.mas_equalTo(self.nickLabel.mas_trailing).offset(6); make.centerY.mas_equalTo(self.nickLabel); make.size.mas_equalTo(CGSizeMake(28, 14)); }]; @@ -90,7 +90,7 @@ UIKIT_EXTERN NSString *kInviteMemeberSuccess; [self.inviteButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(83, 30)); make.centerY.mas_equalTo(self.contentView); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineClanIncomeStatisViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineClanIncomeStatisViewController.m index 86d52906..8f039b16 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineClanIncomeStatisViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineClanIncomeStatisViewController.m @@ -50,13 +50,13 @@ - (void)initSubViewConstraints { [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.view).offset(10); - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.height.mas_equalTo(30); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleView.mas_bottom); - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGoldIncomeRecordVC.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGoldIncomeRecordVC.m index 98d3aa2d..a46ab330 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGoldIncomeRecordVC.m +++ b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGoldIncomeRecordVC.m @@ -136,14 +136,14 @@ } - (void)initSubViewConstraints { [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.view); - make.right.mas_equalTo(self.view); + make.leading.mas_equalTo(self.view); + make.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.view); make.height.mas_equalTo(kGetScaleWidth(124)); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.sectionView.mas_bottom); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeDetailViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeDetailViewController.m index df6f89bb..ce25b4a7 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeDetailViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeDetailViewController.m @@ -76,17 +76,17 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(40, 40)); - make.left.mas_equalTo(self.view).offset(15); + make.leading.mas_equalTo(self.view).offset(15); make.top.mas_equalTo(self.view).offset(18); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.avatarImageView); - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(2); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeRecordViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeRecordViewController.m index 792fb888..d7062c4a 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeRecordViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeRecordViewController.m @@ -105,14 +105,14 @@ - (void)initSubViewConstraints { [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.view); - make.right.mas_equalTo(self.view); + make.leading.mas_equalTo(self.view); + make.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.view); make.height.mas_equalTo(kGetScaleWidth(124)); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.headerView.mas_bottom); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeStatisViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeStatisViewController.m index 1919e8cf..d5fe036e 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeStatisViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildIncomeStatisViewController.m @@ -53,13 +53,13 @@ - (void)initSubViewConstraints { [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.view).offset(10); - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.height.mas_equalTo(30); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleView.mas_bottom); - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillStatisVC.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillStatisVC.m index cd5770bf..913feef6 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillStatisVC.m +++ b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineGuildPersonalBillStatisVC.m @@ -60,14 +60,14 @@ }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.navView.mas_bottom).mas_equalTo(10); - make.left.mas_equalTo(self.view); - make.right.mas_equalTo(-kGetScaleWidth(0)); + make.leading.mas_equalTo(self.view); + make.trailing.mas_equalTo(-kGetScaleWidth(0)); make.height.mas_equalTo(kGetScaleWidth(50)); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleView.mas_bottom); - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineHallAnchorIncomeStatisViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineHallAnchorIncomeStatisViewController.m index f311e81e..8f46154d 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineHallAnchorIncomeStatisViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineHallAnchorIncomeStatisViewController.m @@ -48,13 +48,13 @@ - (void)initSubViewConstraints { [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.view).offset(10); - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.height.mas_equalTo(30); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleView.mas_bottom); - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineMainIncomeStatisViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineMainIncomeStatisViewController.m index cae3dc77..3025d56a 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineMainIncomeStatisViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPMineMainIncomeStatisViewController.m @@ -57,13 +57,13 @@ }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.navView.mas_bottom).offset(0); - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.height.mas_equalTo(30); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleView.mas_bottom); - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineGuildIncomeRecordViewController.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineGuildIncomeRecordViewController.m index b0bcc80e..db549ac5 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineGuildIncomeRecordViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineGuildIncomeRecordViewController.m @@ -107,14 +107,14 @@ - (void)initSubViewConstraints { [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.view); - make.right.mas_equalTo(self.view); + make.leading.mas_equalTo(self.view); + make.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.view).offset(10); make.height.mas_equalTo(100); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.headerView.mas_bottom); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineHallIncomeVC.m b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineHallIncomeVC.m index 9a968add..ec37eb1e 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineHallIncomeVC.m +++ b/YuMi/Modules/YMMine/View/Guild/View/IncomeStatis/XPNewMineHallIncomeVC.m @@ -100,14 +100,14 @@ - (void)initSubViewConstraints { [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.view); - make.right.mas_equalTo(self.view); + make.leading.mas_equalTo(self.view); + make.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.view).offset(0); make.height.mas_equalTo(kGetScaleWidth(148)); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.headerView.mas_bottom); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerPerViewController.m b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerPerViewController.m index 5f235fcd..b03ebebf 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerPerViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerPerViewController.m @@ -80,43 +80,43 @@ - (void)initSubViewConstraints { [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.view).mas_offset(10); + make.leading.mas_equalTo(self.view).mas_offset(10); make.top.mas_equalTo(statusbarHeight); make.height.width.mas_equalTo(44); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.navView); + make.leading.trailing.mas_equalTo(self.navView); make.centerY.mas_equalTo(self.backButton); }]; [self.completionButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.navView).offset(-15); + make.trailing.mas_equalTo(self.navView).offset(-15); make.centerY.mas_equalTo(self.backButton); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.navView.mas_bottom); - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.height.mas_equalTo(50); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(40, 40)); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.top.mas_equalTo(self.contentView).offset(10); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.avatarImageView); - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.contentView.mas_bottom); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerSetViewController.m b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerSetViewController.m index 41a77f27..29d1a538 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerSetViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildManagerSetViewController.m @@ -103,16 +103,16 @@ - (void)initSubViewConstraints { [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(20); - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.topView.mas_bottom); - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); }]; [self.chooseLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.topView).offset(15); + make.leading.mas_equalTo(self.topView).offset(15); make.centerY.mas_equalTo(self.topView); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.m b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.m index 86c9cdd7..3225d8b7 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Setting/XPMineGuildSetNameViewController.m @@ -52,19 +52,19 @@ - (void)initSubViewConstraints { [self.containView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(20); - make.left.mas_equalTo(self.view).offset(15); - make.right.mas_equalTo(self.view).offset(-15); + make.leading.mas_equalTo(self.view).offset(15); + make.trailing.mas_equalTo(self.view).offset(-15); make.height.mas_equalTo(40); }]; [self.nameTextField mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.containView); - make.left.mas_equalTo(self.containView).offset(5); - make.right.mas_equalTo(self.containView); + make.leading.mas_equalTo(self.containView).offset(5); + make.trailing.mas_equalTo(self.containView); make.height.mas_equalTo(40); }]; [self.descriptionLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.containView); + make.leading.mas_equalTo(self.containView); make.top.mas_equalTo(self.containView.mas_bottom).offset(5); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanSectionView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanSectionView.m index c9f38ce1..431071e2 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanSectionView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanSectionView.m @@ -53,17 +53,17 @@ - (void)initSubViewConstraints { [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(15); + make.leading.trailing.mas_equalTo(self).inset(15); make.top.bottom.mas_equalTo(self); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backView).offset(15); + make.leading.mas_equalTo(self.backView).offset(15); make.top.mas_equalTo(self.backView).offset(10); }]; [self.moreStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backView).offset(-15); + make.trailing.mas_equalTo(self.backView).offset(-15); make.centerY.mas_equalTo(self.titleLabel); }]; @@ -90,7 +90,7 @@ - (void)setPi_IsClan:(BOOL)pi_IsClan{ _pi_IsClan = pi_IsClan; [self.backView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(0); + make.leading.trailing.mas_equalTo(self).inset(0); make.top.bottom.mas_equalTo(self); }]; self.managerView.hidden = NO; diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.m index 34e67894..16f2e784 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.m @@ -49,33 +49,33 @@ [self.bgItemView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(47)); - make.left.right.equalTo(self).inset(kGetScaleWidth(0)); + make.leading.trailing.equalTo(self).inset(kGetScaleWidth(0)); }]; [self.roomView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(50)); - make.left.mas_equalTo(kGetScaleWidth(0)); + make.leading.mas_equalTo(kGetScaleWidth(0)); make.height.mas_equalTo(kGetScaleWidth(17)); make.centerY.equalTo(self.bgItemView); }]; [self.memberView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(50)); + make.leading.mas_equalTo(kGetScaleWidth(50)); make.width.mas_equalTo(kGetScaleWidth(48)); make.centerY.height.equalTo(self.roomView); }]; CGFloat width = kGetScaleWidth(277/3); [self.settlementView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(width); - make.right.equalTo(self.bgItemView); + make.trailing.equalTo(self.bgItemView); make.centerY.height.equalTo(self.roomView); }]; [self.exchangeGoldView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.width.height.equalTo(self.settlementView); - make.right.equalTo(self.settlementView.mas_left); + make.trailing.equalTo(self.settlementView.mas_leading); }]; [self.diamondView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.width.height.equalTo(self.exchangeGoldView); - make.right.equalTo(self.exchangeGoldView.mas_left); + make.trailing.equalTo(self.exchangeGoldView.mas_leading); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildAnchorIncomeSectionView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildAnchorIncomeSectionView.m index 97391ab2..71d41769 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildAnchorIncomeSectionView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildAnchorIncomeSectionView.m @@ -88,13 +88,13 @@ make.height.mas_equalTo(kGetScaleWidth(14)); make.centerY.equalTo(self); - make.left.mas_equalTo(kGetScaleWidth(97)); + make.leading.mas_equalTo(kGetScaleWidth(97)); }]; [self.hallLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(kGetScaleWidth(14)); make.centerY.equalTo(self); - make.left.mas_equalTo(kGetScaleWidth(260)); + make.leading.mas_equalTo(kGetScaleWidth(260)); }]; } -(void)setIsHost:(BOOL)isHost{ diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildHeaderView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildHeaderView.m index bb9df34f..5f56c24d 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildHeaderView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildHeaderView.m @@ -96,12 +96,12 @@ CGFloat kBackScale = 274.0 / 375.0; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.height.mas_equalTo(KScreenWidth * kBackScale); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(15); + make.leading.trailing.mas_equalTo(self).inset(15); make.top.mas_equalTo(self); }]; @@ -111,30 +111,30 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(64), kGetScaleWidth(64))); - make.left.mas_equalTo(self.userInfoView); + make.leading.mas_equalTo(self.userInfoView); make.top.mas_equalTo(self.userInfoView).offset(108 * kScreenScale); }]; [self.clanNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(6); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(6); make.top.mas_equalTo(self.avatarImageView); - make.right.mas_lessThanOrEqualTo(self.clanLevelImageView); + make.trailing.mas_lessThanOrEqualTo(self.clanLevelImageView); }]; [self.daeIdLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.clanNameLabel); + make.leading.mas_equalTo(self.clanNameLabel); make.top.mas_equalTo(self.clanNameLabel.mas_bottom).offset(6); }]; [self.roomNumberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.clanNameLabel); + make.leading.mas_equalTo(self.clanNameLabel); make.top.mas_equalTo(self.daeIdLabel.mas_bottom).offset(6); }]; [self.clanLevelImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(60, 60)); make.centerY.mas_equalTo(self.avatarImageView); - make.right.mas_equalTo(self).offset(-35); + make.trailing.mas_equalTo(self).offset(-35); }]; CGFloat kMenuScale = 52.0 / 112.0; @@ -148,12 +148,12 @@ }]; [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.clanRoomView).offset(9); + make.leading.mas_equalTo(self.clanRoomView).offset(9); make.top.mas_equalTo(self.clanRoomView).offset(10); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.clanRoomView).inset(9); + make.leading.trailing.mas_equalTo(self.clanRoomView).inset(9); make.top.mas_equalTo(self.numberLabel.mas_bottom).offset(3); make.bottom.mas_equalTo(self.clanRoomView); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeHeaderView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeHeaderView.m index 3f1fd2ac..5909552f 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeHeaderView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeHeaderView.m @@ -93,41 +93,41 @@ [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(15)); - make.left.right.equalTo(self).inset(kGetScaleWidth(15)); + make.leading.trailing.equalTo(self).inset(kGetScaleWidth(15)); make.height.mas_equalTo(kGetScaleWidth(90)); }]; [self.yearLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(18)); - make.left.mas_equalTo(kGetScaleWidth(20)); + make.leading.mas_equalTo(kGetScaleWidth(20)); make.height.mas_equalTo(kGetScaleWidth(12)); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(0.5)); make.height.mas_equalTo(kGetScaleWidth(49)); make.centerY.equalTo(self.backImageView); - make.left.mas_equalTo(kGetScaleWidth(119)); + make.leading.mas_equalTo(kGetScaleWidth(119)); }]; [self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(54)); make.width.height.mas_equalTo(kGetScaleWidth(20)); - make.right.equalTo(self.lineView.mas_left).mas_offset(-kGetScaleWidth(19)); + make.trailing.equalTo(self.lineView.mas_leading).mas_offset(-kGetScaleWidth(19)); }]; [self.dayLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.equalTo(self.arrowButton.mas_left).mas_offset(-kGetScaleWidth(1)); + make.trailing.equalTo(self.arrowButton.mas_leading).mas_offset(-kGetScaleWidth(1)); make.height.mas_equalTo(kGetScaleWidth(17)); make.top.mas_equalTo(kGetScaleWidth(56)); }]; [self.startLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.equalTo(self.arrowButton.mas_left).mas_offset(-kGetScaleWidth(1)); + make.trailing.equalTo(self.arrowButton.mas_leading).mas_offset(-kGetScaleWidth(1)); make.top.mas_equalTo(kGetScaleWidth(44)); make.height.mas_equalTo(kGetScaleWidth(17)); }]; [self.endLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.equalTo(self.arrowButton.mas_left).mas_offset(-kGetScaleWidth(1)); + make.trailing.equalTo(self.arrowButton.mas_leading).mas_offset(-kGetScaleWidth(1)); make.top.mas_equalTo(kGetScaleWidth(65)); make.height.mas_equalTo(kGetScaleWidth(17)); }]; @@ -135,13 +135,13 @@ [self.totalLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(18)); - make.left.mas_equalTo(kGetScaleWidth(140)); + make.leading.mas_equalTo(kGetScaleWidth(140)); make.height.mas_equalTo(kGetScaleWidth(12)); }]; [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.totalLabel); - make.right.equalTo(self.backImageView.mas_right).mas_offset(-kGetScaleWidth(5)); + make.leading.mas_equalTo(self.totalLabel); + make.trailing.equalTo(self.backImageView.mas_trailing).mas_offset(-kGetScaleWidth(5)); make.centerY.mas_equalTo(self.arrowButton); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeSectionView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeSectionView.m index e7d0c5a6..1a39de42 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeSectionView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildIncomeSectionView.m @@ -59,18 +59,18 @@ [self.rankLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(54)); - make.left.mas_equalTo(kGetScaleWidth(0)); + make.leading.mas_equalTo(kGetScaleWidth(0)); make.top.bottom.equalTo(self); }]; [self.roomLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(47)); - make.left.mas_equalTo(kGetScaleWidth(54)); + make.leading.mas_equalTo(kGetScaleWidth(54)); make.top.bottom.equalTo(self); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.roomLabel.mas_right); + make.leading.equalTo(self.roomLabel.mas_trailing); make.width.mas_equalTo(kGetScaleWidth(120)); make.top.bottom.equalTo(self); }]; @@ -78,9 +78,9 @@ [self.incomeLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.equalTo(self); if(self.right <= 0){ - make.left.equalTo(self.nickLabel.mas_right); + make.leading.equalTo(self.nickLabel.mas_trailing); } - make.right.mas_equalTo(-kGetScaleWidth(width)); + make.trailing.mas_equalTo(-kGetScaleWidth(width)); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSearchNavView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSearchNavView.m index 1368b24b..ade1062e 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSearchNavView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSearchNavView.m @@ -56,19 +56,19 @@ - (void)initSubViewConstraints { [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(22, 22)); - make.left.mas_equalTo(self).offset(8); + make.leading.mas_equalTo(self).offset(8); make.centerY.mas_equalTo(self.inputBackView); }]; [self.inputBackView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(-8); - make.left.mas_equalTo(self.backButton.mas_right).offset(5); - make.right.mas_equalTo(self.cancleButton.mas_left).offset(-13); + make.leading.mas_equalTo(self.backButton.mas_trailing).offset(5); + make.trailing.mas_equalTo(self.cancleButton.mas_leading).offset(-13); make.height.mas_equalTo(30); }]; [self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self).offset(-15); + make.trailing.mas_equalTo(self).offset(-15); make.centerY.mas_equalTo(self.inputBackView); make.height.mas_equalTo(30); }]; @@ -76,13 +76,13 @@ [self.searchImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(22, 22)); make.centerY.mas_equalTo(self.inputBackView); - make.left.mas_equalTo(self.inputBackView).offset(13); + make.leading.mas_equalTo(self.inputBackView).offset(13); }]; [self.searchTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.searchImageView.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.searchImageView.mas_trailing).mas_offset(4); make.top.bottom.mas_equalTo(self.inputBackView); - make.right.mas_equalTo(-13); + make.trailing.mas_equalTo(-13); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSuperAdminMenuView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSuperAdminMenuView.m index 6acaafb9..88d69010 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSuperAdminMenuView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildSuperAdminMenuView.m @@ -66,7 +66,7 @@ }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.top.mas_equalTo(self).offset(5); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m index 24911ffe..51eb303f 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m @@ -81,7 +81,7 @@ }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.top.mas_equalTo(8); }]; @@ -98,12 +98,12 @@ }]; [self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.toolView); - make.left.mas_equalTo(self.toolView).mas_offset(8); + make.leading.mas_equalTo(self.toolView).mas_offset(8); make.height.mas_equalTo(30); make.width.mas_equalTo(50); }]; [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.toolView).mas_offset(-8); + make.trailing.mas_equalTo(self.toolView).mas_offset(-8); make.width.height.centerY.mas_equalTo(self.cancleButton); }]; @@ -113,14 +113,14 @@ }]; [self.startButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.intervalView); - make.right.mas_equalTo(self.titleLabel.mas_left); + make.leading.mas_equalTo(self.intervalView); + make.trailing.mas_equalTo(self.titleLabel.mas_leading); make.top.bottom.mas_equalTo(self.intervalView); }]; [self.endButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.intervalView); - make.left.mas_equalTo(self.titleLabel.mas_right); + make.trailing.mas_equalTo(self.intervalView); + make.leading.mas_equalTo(self.titleLabel.mas_trailing); make.top.bottom.mas_equalTo(self.intervalView); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGiveDiamondSearchView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGiveDiamondSearchView.m index abc9b690..64bcc158 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGiveDiamondSearchView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGiveDiamondSearchView.m @@ -35,18 +35,18 @@ } - (void)initSubViewConstraints { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.top.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(32)); }]; [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.equalTo(self.bgView); - make.left.mas_equalTo(kGetScaleWidth(10)); - make.right.mas_equalTo(-kGetScaleWidth(76)); + make.leading.mas_equalTo(kGetScaleWidth(10)); + make.trailing.mas_equalTo(-kGetScaleWidth(76)); }]; [self.searchBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(3)); + make.trailing.mas_equalTo(-kGetScaleWidth(3)); make.centerY.equalTo(self.bgView); make.width.mas_equalTo(kGetScaleWidth(66)); make.height.mas_equalTo(kGetScaleWidth(26)); diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.m index a3dcffa0..64c12bd2 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.m @@ -88,31 +88,31 @@ [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.height.mas_equalTo(kGetScaleWidth(75)); make.top.mas_equalTo(self); }]; [self.yearLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(14)); + make.leading.mas_equalTo(kGetScaleWidth(14)); make.top.mas_equalTo(kGetScaleWidth(10)); make.height.mas_equalTo(kGetScaleWidth(12)); }]; [self.startLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.yearLabel); + make.leading.mas_equalTo(self.yearLabel); make.top.mas_equalTo(kGetScaleWidth(28)); make.height.mas_equalTo(kGetScaleWidth(17)); }]; [self.endLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.width.height.equalTo(self.startLabel); + make.leading.width.height.equalTo(self.startLabel); make.top.equalTo(self.startLabel.mas_bottom).mas_offset(kGetScaleWidth(2)); }]; [self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.startLabel.mas_right).offset(1); + make.leading.mas_equalTo(self.startLabel.mas_trailing).offset(1); make.centerY.mas_equalTo(self.lineView); make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(20), kGetScaleWidth(20))); }]; @@ -120,20 +120,20 @@ [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(1), kGetScaleWidth(49))); make.bottom.mas_equalTo(self.backImageView).offset(-kGetScaleWidth(13)); - make.left.equalTo(self.arrowButton.mas_right).mas_offset(kGetScaleWidth(9)); + make.leading.equalTo(self.arrowButton.mas_trailing).mas_offset(kGetScaleWidth(9)); }]; [self.totalLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backImageView.mas_left).offset(kGetScaleWidth(127)); + make.leading.mas_equalTo(self.backImageView.mas_leading).offset(kGetScaleWidth(127)); make.top.mas_equalTo(kGetScaleWidth(28)); make.height.mas_equalTo(kGetScaleWidth(12)); }]; [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.totalLabel); + make.leading.mas_equalTo(self.totalLabel); make.top.mas_equalTo(kGetScaleWidth(46)); make.height.mas_equalTo(kGetScaleWidth(17)); - make.right.mas_equalTo(-kGetScaleWidth(14)); + make.trailing.mas_equalTo(-kGetScaleWidth(14)); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m index 37f8f6cd..a89fed81 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m @@ -115,7 +115,7 @@ }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.top.mas_equalTo(8); }]; @@ -134,19 +134,19 @@ }]; [self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(20); - make.left.mas_equalTo(self.toolView).mas_offset(15); + make.leading.mas_equalTo(self.toolView).mas_offset(15); make.height.mas_equalTo(19); make.width.mas_equalTo(35); }]; [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.toolView).mas_offset(-15); + make.trailing.mas_equalTo(self.toolView).mas_offset(-15); make.width.height.centerY.mas_equalTo(self.cancleButton); }]; [self.dayBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(68); make.height.mas_equalTo(24); - make.left.mas_equalTo(32); + make.leading.mas_equalTo(32); make.top.mas_equalTo(59); }]; [self.weekBtn mas_makeConstraints:^(MASConstraintMaker *make) { @@ -155,7 +155,7 @@ }]; [self.monthBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.top.equalTo(self.dayBtn); - make.right.mas_equalTo(-32); + make.trailing.mas_equalTo(-32); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(40); @@ -164,13 +164,13 @@ [self.startButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.titleLabel.mas_left); + make.trailing.mas_equalTo(self.titleLabel.mas_leading); make.top.bottom.mas_equalTo(self.intervalView); }]; [self.endButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel.mas_right); + make.leading.mas_equalTo(self.titleLabel.mas_trailing); make.top.bottom.mas_equalTo(self.intervalView); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildChooseManagerViewController.m b/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildChooseManagerViewController.m index efbb7799..b5825edb 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildChooseManagerViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildChooseManagerViewController.m @@ -69,29 +69,29 @@ - (void)initSubViewConstraints { [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.view).mas_offset(10); + make.leading.mas_equalTo(self.view).mas_offset(10); make.top.mas_equalTo(statusbarHeight); make.height.width.mas_equalTo(44); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.navView); + make.leading.trailing.mas_equalTo(self.navView); make.centerY.mas_equalTo(self.backButton); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.navView.mas_bottom); }]; [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(47); + make.leading.trailing.mas_equalTo(self.view).inset(47); make.height.mas_equalTo(44); make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 20); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildSuperAdminSetViewController.m b/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildSuperAdminSetViewController.m index 79b136df..642fc9c6 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildSuperAdminSetViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SuperAdmin/XPMineGuildSuperAdminSetViewController.m @@ -59,12 +59,12 @@ - (void)initSubViewConstraints { [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.addManagerButton.mas_top); }]; [self.addManagerButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(47); + make.leading.trailing.mas_equalTo(self.view).inset(47); make.height.mas_equalTo(40); make.bottom.mas_equalTo(self.view.mas_safeAreaLayoutGuideBottom).offset(-20); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineClanViewController.m b/YuMi/Modules/YMMine/View/Guild/View/XPMineClanViewController.m index 2dc4b6f5..ab2993d2 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineClanViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/XPMineClanViewController.m @@ -122,17 +122,17 @@ - (void)initSubViewConstraints { [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.view); }]; [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.view).mas_offset(10); + make.leading.mas_equalTo(self.view).mas_offset(10); make.top.mas_equalTo(statusbarHeight); make.height.width.mas_equalTo(44); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildListVC.m b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildListVC.m index 3fe057b6..02ee4c66 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildListVC.m +++ b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildListVC.m @@ -84,13 +84,13 @@ if(self.type == 1){ [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); - make.right.mas_equalTo(0); + make.leading.mas_equalTo(0); + make.trailing.mas_equalTo(0); make.height.mas_equalTo(kGetScaleWidth(32)); make.top.mas_equalTo(kGetScaleWidth(10)); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self.view); + make.leading.trailing.bottom.equalTo(self.view); make.top.equalTo(self.searchView.mas_bottom).mas_offset(kGetScaleWidth(16)); }]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.m b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.m index a4de2dd1..0bf3a3f0 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.m @@ -64,12 +64,12 @@ - (void)initSubViewConstraints { [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.navView.mas_bottom); }]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m index 755b9bd9..b3ca6a86 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m @@ -179,7 +179,7 @@ UIKIT_EXTERN NSString *kInviteMemeberSuccess; view.backgroundColor = [UIColor whiteColor]; [self.view addSubview:view]; [view mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self.view); + make.leading.trailing.bottom.equalTo(self.view); make.height.mas_equalTo(KScreenHeight - 297); }]; [self.view addSubview:self.tableView]; @@ -247,34 +247,34 @@ UIKIT_EXTERN NSString *kInviteMemeberSuccess; - (void)initSubViewConstraints { [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.view); }]; [self.addRoomView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(kGetScaleWidth(98)); - make.left.right.bottom.equalTo(self.view); + make.leading.trailing.bottom.equalTo(self.view); }]; [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.view).mas_offset(10); + make.leading.mas_equalTo(self.view).mas_offset(10); make.top.mas_equalTo(statusbarHeight); make.height.width.mas_equalTo(44); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backButton.mas_right); - make.right.mas_equalTo(self.rightStackView.mas_left); + make.leading.mas_equalTo(self.backButton.mas_trailing); + make.trailing.mas_equalTo(self.rightStackView.mas_leading); make.centerY.mas_equalTo(self.backButton); }]; [self.rightStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.navView).offset(-15); + make.trailing.mas_equalTo(self.navView).offset(-15); make.centerY.mas_equalTo(self.backButton); }]; @@ -289,7 +289,7 @@ UIKIT_EXTERN NSString *kInviteMemeberSuccess; }]; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(390); }]; @@ -918,8 +918,8 @@ UIKIT_EXTERN NSString *kInviteMemeberSuccess; [addRoomBtn setAttributedTitle:textAtt forState:UIControlStateNormal]; [_addRoomView addSubview:addRoomBtn]; [addRoomBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(58)); - make.left.mas_equalTo(kGetScaleWidth(58)); + make.trailing.mas_equalTo(-kGetScaleWidth(58)); + make.leading.mas_equalTo(kGetScaleWidth(58)); make.top.mas_equalTo(kGetScaleWidth(9)); make.height.mas_equalTo(kGetScaleWidth(46)); }]; diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m index 21559396..11ca1100 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m @@ -78,12 +78,12 @@ [self.myGoldView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(15)); - make.left.mas_equalTo(kGetScaleWidth(15)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.height.mas_equalTo(kGetScaleWidth(116)); }]; [self.myDiamondsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.height.equalTo(self.myGoldView); + make.leading.trailing.height.equalTo(self.myGoldView); make.top.equalTo(self.myGoldView.mas_bottom); }]; [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { @@ -191,33 +191,33 @@ } - (void)initSubViewConstraints { [self.titleNumView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); make.top.mas_equalTo(kGetScaleWidth(16)); make.height.mas_equalTo(kGetScaleWidth(20)); - make.right.mas_equalTo(-kGetScaleWidth(73)); + make.trailing.mas_equalTo(-kGetScaleWidth(73)); }]; [self.arrowView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(30)); make.height.mas_equalTo(kGetScaleWidth(30)); - make.right.mas_equalTo(-kGetScaleWidth(38)); + make.trailing.mas_equalTo(-kGetScaleWidth(38)); make.centerY.equalTo(self.titleNumView); }]; [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(14)); - make.right.mas_equalTo(-kGetScaleWidth(14)); + make.leading.mas_equalTo(kGetScaleWidth(14)); + make.trailing.mas_equalTo(-kGetScaleWidth(14)); make.top.mas_equalTo(kGetScaleWidth(48)); make.height.mas_equalTo(kGetScaleWidth(52)); }]; [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(40)); make.height.mas_equalTo(kGetScaleWidth(40)); - make.left.mas_equalTo(kGetScaleWidth(10)); + make.leading.mas_equalTo(kGetScaleWidth(10)); make.centerY.equalTo(self.bgImageView); }]; [self.numberView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.equalTo(self.bgImageView); - make.right.mas_equalTo(-kGetScaleWidth(12)); - make.left.equalTo(self.iconView.mas_right).mas_offset(5); + make.trailing.mas_equalTo(-kGetScaleWidth(12)); + make.leading.equalTo(self.iconView.mas_trailing).mas_offset(5); }]; } #pragma mark - 赋值 diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomCell.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomCell.m index fd79710c..ba8e5fba 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomCell.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPGoldDetailsChooseRoomCell.m @@ -41,7 +41,7 @@ }]; [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(kGetScaleWidth(14)); - make.left.right.equalTo(self.contentView).inset(kGetScaleWidth(5)); + make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(5)); make.top.mas_equalTo(kGetScaleWidth(52)); }]; diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m index ed4f9b0e..5f61bfe6 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m @@ -59,11 +59,11 @@ } - (void)initSubViewConstraints { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self).inset(kGetScaleWidth(0)); + make.leading.trailing.bottom.equalTo(self).inset(kGetScaleWidth(0)); make.height.mas_equalTo(kGetScaleWidth(302)); }]; [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); make.top.mas_equalTo(kGetScaleWidth(20)); make.width.mas_equalTo(kGetScaleWidth(35)); make.height.mas_equalTo(kGetScaleWidth(20)); @@ -71,7 +71,7 @@ }]; [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(20)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(59)); @@ -80,7 +80,7 @@ }]; [self.pickerView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(80)); - make.left.right.bottom.equalTo(self.bgView).inset(kGetScaleWidth(0)); + make.leading.trailing.bottom.equalTo(self.bgView).inset(kGetScaleWidth(0)); }]; @@ -406,7 +406,7 @@ _leftWidth = leftWidth; [self.lineView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(@(leftWidth)); + make.leading.equalTo(@(leftWidth)); }]; } -(instancetype)initWithFrame:(CGRect)frame{ @@ -428,7 +428,7 @@ make.edges.equalTo(self); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.bottom.equalTo(self).inset(kGetScaleWidth(0)); + make.top.trailing.bottom.equalTo(self).inset(kGetScaleWidth(0)); make.width.mas_equalTo(kGetScaleWidth(1)); }]; } diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsTimeView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsTimeView.m index a2f7c10f..7c37a015 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsTimeView.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsTimeView.m @@ -42,11 +42,11 @@ [self.minusBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(24)); make.centerY.equalTo(self); - make.right.equalTo(self.timeView.mas_left).mas_offset(-kGetScaleWidth(20)); + make.trailing.equalTo(self.timeView.mas_leading).mas_offset(-kGetScaleWidth(20)); }]; [self.addBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.centerY.equalTo(self.minusBtn); - make.left.equalTo(self.timeView.mas_right).mas_offset(kGetScaleWidth(20)); + make.leading.equalTo(self.timeView.mas_trailing).mas_offset(kGetScaleWidth(20)); }]; } -(void)chooseTimeAction{ diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsVC.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsVC.m index 71020569..1ff20158 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsVC.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsVC.m @@ -131,7 +131,7 @@ } - (void)initSubViewConstraints { [self.goldDetailsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.bottom.equalTo(self.view); + make.top.leading.trailing.bottom.equalTo(self.view); }]; } diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsView.m index 75c033d1..ff231ba1 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsView.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsView.m @@ -88,31 +88,31 @@ [self.timeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self); + make.leading.trailing.top.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(47)); }]; [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(65)); - make.right.left.equalTo(self); + make.trailing.leading.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(153)); }]; [self.chooseView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(64)); - make.left.mas_equalTo(kGetScaleWidth(0)); + make.leading.mas_equalTo(kGetScaleWidth(0)); make.top.equalTo(self.headView.mas_bottom); make.bottom.equalTo(self); }]; [self.totalView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.chooseView.mas_right); - make.right.equalTo(self); + make.leading.equalTo(self.chooseView.mas_trailing); + make.trailing.equalTo(self); make.bottom.equalTo(self).mas_equalTo(- kGetScaleWidth(66)); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.equalTo(self); + make.trailing.equalTo(self); make.bottom.equalTo(self.totalView.mas_top).mas_offset(-kGetScaleWidth(10)); make.top.equalTo(self.headView.mas_bottom); - make.left.mas_equalTo(kGetScaleWidth(64)); + make.leading.mas_equalTo(kGetScaleWidth(64)); }]; diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m index 2cb75fe1..a5bc09d0 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m @@ -57,11 +57,11 @@ - (void)initSubViewConstraints { [self.diamondView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(18)); - make.left.right.equalTo(self.view).inset(kGetScaleWidth(15)); + make.leading.trailing.equalTo(self.view).inset(kGetScaleWidth(15)); make.height.mas_equalTo(kGetScaleWidth(144)); }]; [self.goldView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.diamondView); + make.leading.trailing.equalTo(self.diamondView); make.top.equalTo(self.diamondView.mas_bottom).mas_offset(kGetScaleWidth(20)); make.height.mas_equalTo( kGetScaleWidth(144)); }]; diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m index 18807ccb..316eb474 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m @@ -56,24 +56,24 @@ }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(17)); - make.left.mas_equalTo(kGetScaleWidth(20)); + make.leading.mas_equalTo(kGetScaleWidth(20)); make.height.mas_equalTo(kGetScaleWidth(20)); }]; [self.detailView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(20)); + make.trailing.mas_equalTo(-kGetScaleWidth(20)); make.height.mas_equalTo(kGetScaleWidth(18)); make.width.mas_equalTo(kGetScaleWidth(45)); make.centerY.equalTo(self.titleView); }]; [self.numberView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.titleView); + make.leading.equalTo(self.titleView); make.top.mas_equalTo(kGetScaleWidth(49)); make.height.mas_equalTo(kGetScaleWidth(20)); - make.right.mas_equalTo(-kGetScaleWidth(20)); + make.trailing.mas_equalTo(-kGetScaleWidth(20)); }]; [self.btnStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.bgImageView).inset(kGetScaleWidth(20)); + make.leading.trailing.equalTo(self.bgImageView).inset(kGetScaleWidth(20)); make.height.mas_equalTo(kGetScaleWidth(40)); make.top.mas_equalTo(kGetScaleWidth(86)); }]; diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.m index 4f258b73..900454a0 100644 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.m +++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.m @@ -97,7 +97,7 @@ [self addSubview:self.onlineBtn]; [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.mas_equalTo(0); + make.top.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(260); }]; [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -105,17 +105,17 @@ }]; [self.nicknameLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.avatarImageView).offset(-5); - make.left.mas_equalTo(16); - make.right.mas_equalTo(self.avatarImageView.mas_left).offset(-5); + make.leading.mas_equalTo(16); + make.trailing.mas_equalTo(self.avatarImageView.mas_leading).offset(-5); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.nicknameLabel.mas_bottom).offset(2); - make.left.mas_equalTo(self.nicknameLabel); - make.right.mas_equalTo(self.nicknameLabel); + make.leading.mas_equalTo(self.nicknameLabel); + make.trailing.mas_equalTo(self.nicknameLabel); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.bgImageView); - make.right.mas_equalTo(-16); + make.trailing.mas_equalTo(-16); make.width.height.mas_equalTo(86); }]; [self.fansLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -124,12 +124,12 @@ make.width.mas_equalTo(self.avatarImageView); }]; [self.introduceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nicknameLabel); + make.leading.mas_equalTo(self.nicknameLabel); make.top.mas_equalTo(self.fansLabel); - make.right.mas_equalTo(self.avatarImageView.mas_left).offset(-10); + make.trailing.mas_equalTo(self.avatarImageView.mas_leading).offset(-10); }]; [self.onlineBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.bottom.mas_equalTo(self.nicknameLabel.mas_top).offset(-12); make.width.mas_equalTo(56); make.height.mas_equalTo(24); @@ -151,27 +151,27 @@ CGFloat giftHeight = itemHeight * 3 + 10 * 3 + topHeight + bottomHeight; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.top.mas_equalTo(self.bgImageView.mas_bottom).offset(-20); make.height.mas_equalTo(giftHeight); }]; [self.giftBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); - make.right.mas_equalTo(-16); + make.leading.mas_equalTo(16); + make.trailing.mas_equalTo(-16); make.top.mas_equalTo(47); make.height.mas_equalTo(281); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backImageView).offset(16); + make.leading.mas_equalTo(self.backImageView).offset(16); make.top.mas_equalTo(self.backImageView).offset(16); }]; [self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(13, 22)); make.centerY.mas_equalTo(self.titleLabel); - make.right.mas_equalTo(self.backImageView).offset(-15); + make.trailing.mas_equalTo(self.backImageView).offset(-15); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -182,13 +182,13 @@ }]; [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.top.mas_equalTo(self.titleView.mas_bottom).offset(8); make.bottom.mas_equalTo(0); }]; [self.dynamicLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel); + make.leading.mas_equalTo(self.titleLabel); make.top.mas_equalTo(self.giftBgView.mas_bottom).offset(20); }]; diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoViewController.m index d8e1ad3a..91bab037 100644 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoViewController.m +++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoViewController.m @@ -97,13 +97,13 @@ [self.collectionView addSubview:self.headerView]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(0); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.bottom.mas_equalTo(0); }]; [self.view addSubview:self.navView]; [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m index 43a7da72..690cce79 100644 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m +++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m @@ -440,7 +440,7 @@ [bgView addSubview:titleView]; [titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(12); - make.left.mas_equalTo(12); + make.leading.mas_equalTo(12); }]; } return _headView; diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.m index 00e419de..ac7aa808 100644 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.m +++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.m @@ -66,22 +66,22 @@ static NSInteger maxCount = 60; - (void)initSubViewConstraints { [self.containView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(20); - make.left.mas_equalTo(self.view).offset(15); - make.right.mas_equalTo(self.view).offset(-15); + make.leading.mas_equalTo(self.view).offset(15); + make.trailing.mas_equalTo(self.view).offset(-15); make.height.mas_equalTo(137); }]; [self.useDescTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.mas_equalTo(self.containView).offset(10); + make.leading.top.mas_equalTo(self.containView).offset(10); make.bottom.mas_equalTo(self.containView).offset(-10); - make.right.mas_equalTo(self.clearBtn.mas_left).offset(-5); + make.trailing.mas_equalTo(self.clearBtn.mas_leading).offset(-5); }]; [self.clearBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.containView).offset(10); - make.right.mas_equalTo(self.containView).offset(-10); + make.trailing.mas_equalTo(self.containView).offset(-10); }]; [self.limitLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.containView.mas_bottom).offset(5); - make.right.mas_equalTo(self.containView); + make.trailing.mas_equalTo(self.containView); }]; } diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.m index c95f4938..a904f5c8 100644 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.m +++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.m @@ -54,7 +54,7 @@ }]; [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.titleView.mas_bottom).offset(10); }]; } diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoNickViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoNickViewController.m index 0a5304e8..4ad37ecf 100644 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoNickViewController.m +++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoNickViewController.m @@ -48,19 +48,19 @@ static NSInteger maxCount = 15; - (void)initSubViewConstraints { [self.containView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(20); - make.left.mas_equalTo(self.view).offset(15); - make.right.mas_equalTo(self.view).offset(-15); + make.leading.mas_equalTo(self.view).offset(15); + make.trailing.mas_equalTo(self.view).offset(-15); make.height.mas_equalTo(35); }]; [self.nickTextField mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.containView); - make.left.mas_equalTo(self.containView).offset(5); - make.right.mas_equalTo(self.containView); + make.leading.mas_equalTo(self.containView).offset(5); + make.trailing.mas_equalTo(self.containView); make.height.mas_equalTo(35); }]; [self.limitLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.nickTextField.mas_bottom).offset(8); - make.right.mas_equalTo(self.nickTextField); + make.trailing.mas_equalTo(self.nickTextField); }]; } diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m index a28dd372..3a7bc2c5 100644 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m +++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoViewController.m @@ -165,7 +165,7 @@ UIKIT_EXTERN NSString * kUpdateSoundInfo; [self.bottomStackView addArrangedSubview:self.attentionButton]; [self.bottomStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(15); + make.leading.trailing.mas_equalTo(self.view).inset(15); make.height.mas_equalTo(45); make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 15); }]; @@ -175,12 +175,12 @@ UIKIT_EXTERN NSString * kUpdateSoundInfo; - (void)initSubViewConstraints { [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.voiceView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.view); + make.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.view.mas_safeAreaLayoutGuideTop).offset(176); make.size.mas_equalTo(CGSizeMake(65, 25)); }]; diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINoblePrivilegeEmptyCell.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINoblePrivilegeEmptyCell.m index e7c3ca09..3e30643b 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINoblePrivilegeEmptyCell.m +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINoblePrivilegeEmptyCell.m @@ -34,7 +34,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - 懒加载 diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m index 8582fbc4..ac3cb0d9 100644 --- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m +++ b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m @@ -175,7 +175,7 @@ [self.stackView addArrangedSubview:self.protcoloButton]; CGFloat height = kGetScaleWidth(123)+kNavigationHeight; [self.headerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(0); + make.leading.trailing.top.mas_equalTo(0); make.height.mas_equalTo(height); }]; @@ -197,7 +197,7 @@ [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.headerView.mas_bottom).mas_offset(-kGetScaleWidth(22)); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.bottom.equalTo(self.rechargeBtn.mas_top).mas_offset(-kGetScaleWidth(10)); }]; @@ -211,7 +211,7 @@ make.centerX.mas_equalTo(self.view); }]; [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.top.mas_equalTo(kStatusBarHeight); make.width.height.mas_equalTo(44); }]; diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.m index b7d43bd5..3e0294a3 100644 --- a/YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.m +++ b/YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.m @@ -57,23 +57,23 @@ - (void)makeConstriants { [self.pointView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.view).offset(15); + make.leading.mas_equalTo(self.view).offset(15); make.top.mas_equalTo(17); make.height.width.mas_equalTo(7); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.pointView.mas_right).offset(4); + make.leading.mas_equalTo(self.pointView.mas_trailing).offset(4); make.centerY.mas_equalTo(self.pointView); }]; [self.contentTextView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.pointView.mas_bottom).offset(20); - make.left.mas_equalTo(self.view).offset(15); - make.right.mas_equalTo(self.view).offset(-15); + make.leading.mas_equalTo(self.view).offset(15); + make.trailing.mas_equalTo(self.view).offset(-15); make.height.mas_equalTo(154); }]; [self.contactField mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.contentTextView.mas_bottom).offset(10); - make.left.right.mas_equalTo(self.contentTextView); + make.leading.trailing.mas_equalTo(self.contentTextView); make.height.mas_equalTo(35); }]; [self.submitBtn mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.m index a7d36885..86847cc4 100644 --- a/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.m +++ b/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.m @@ -54,7 +54,7 @@ - (void)initSubViewConstraints { [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(0); }]; } diff --git a/YuMi/Modules/YMMine/View/Setting/XPMinePayPwdViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMinePayPwdViewController.m index c99373a1..92e21cf2 100644 --- a/YuMi/Modules/YMMine/View/Setting/XPMinePayPwdViewController.m +++ b/YuMi/Modules/YMMine/View/Setting/XPMinePayPwdViewController.m @@ -71,14 +71,14 @@ [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(30); - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); }]; [self.submitButton mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(275); - make.right.mas_equalTo(self.view).offset(-15); - make.left.mas_equalTo(self.view).offset(15); + make.trailing.mas_equalTo(self.view).offset(-15); + make.leading.mas_equalTo(self.view).offset(15); make.height.mas_equalTo(46); }]; diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.m index 49386227..ecab3645 100644 --- a/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.m +++ b/YuMi/Modules/YMMine/View/Setting/XPMineResetPayPwdViewController.m @@ -56,12 +56,12 @@ - (void)initSubViewConstraints { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); }]; [self.submitButton mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.stackView.mas_bottom).offset(45); - make.right.left.mas_equalTo(self.view).inset(32); + make.trailing.leading.mas_equalTo(self.view).inset(32); make.height.mas_equalTo(45); }]; } diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m index cb4b6f51..38123b6f 100644 --- a/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m +++ b/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m @@ -104,7 +104,7 @@ - (void)initSubViewConstraints { [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(0); }]; } diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineSwitchLanguageVC.m b/YuMi/Modules/YMMine/View/Setting/XPMineSwitchLanguageVC.m index 4240605d..eed1b50e 100644 --- a/YuMi/Modules/YMMine/View/Setting/XPMineSwitchLanguageVC.m +++ b/YuMi/Modules/YMMine/View/Setting/XPMineSwitchLanguageVC.m @@ -35,6 +35,7 @@ make.top.mas_equalTo(kGetScaleWidth(20)); make.leading.trailing.equalTo(self.view).inset(kGetScaleWidth(16)); make.height.mas_equalTo(kGetScaleWidth(153)); + }]; } -(void)saveBtnAction{ @@ -46,6 +47,17 @@ }else{ language = @"ar"; } + if ([language isEqualToString:@"ar"]) { + [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft; + [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceRightToLeft; + [[UINavigationBar appearance] setSemanticContentAttribute:UISemanticContentAttributeForceRightToLeft]; + + } else { + [UIView appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + [UISearchBar appearance].semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + [[UINavigationBar appearance] setSemanticContentAttribute:UISemanticContentAttributeForceLeftToRight]; + + } [NSBundle setLanguageText:language]; [[NSNotificationCenter defaultCenter]postNotificationName:@"kSwitchLanguage" object:language]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5* NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.m index d3c7b877..1f2fac8d 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.m @@ -54,12 +54,12 @@ - (void)initSubViewConstraints { [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.centerY.equalTo(self.mas_bottom).mas_offset(-22); }]; [self.editButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.centerY.equalTo(self.mas_bottom).mas_offset(-22); }]; diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m index 2ad84fd2..071feaab 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m @@ -82,7 +82,7 @@ make.height.mas_equalTo(kGetScaleWidth(48)); }]; [self.pickerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.bottom.equalTo(self.sureButton.mas_top); make.top.equalTo(self.ageView.mas_bottom).mas_offset(kGetScaleWidth(10)); diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m index d2452eaf..7b5397ce 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m @@ -104,22 +104,22 @@ } - (void)initSubViewConstraints { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self).inset(kGetScaleWidth(0)); + make.leading.trailing.bottom.equalTo(self).inset(kGetScaleWidth(0)); make.height.mas_equalTo(kGetScaleWidth(272)); }]; [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); make.top.mas_equalTo(kGetScaleWidth(20)); make.height.mas_equalTo(kGetScaleWidth(20)); }]; [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(20)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); }]; [self.pickerView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(74)); - make.left.right.bottom.equalTo(self.bgView).inset(kGetScaleWidth(0)); + make.leading.trailing.bottom.equalTo(self.bgView).inset(kGetScaleWidth(0)); }]; } diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagView.m index be533f86..8dc020b8 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderTagView.m @@ -36,17 +36,17 @@ } - (void)initSubViewConstraints { [self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); make.centerY.equalTo(self); make.width.height.mas_equalTo(20); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.centerY.equalTo(self); + make.leading.centerY.equalTo(self); make.height.mas_equalTo(18); - make.right.equalTo(self.clickBtn.mas_left); + make.trailing.equalTo(self.clickBtn.mas_leading); }]; [self.editView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.equalTo(self); + make.leading.top.equalTo(self); make.height.equalTo(self.clickBtn); make.width.mas_greaterThanOrEqualTo(128); }]; @@ -138,15 +138,15 @@ [_editView addSubview:imageView]; [imageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(14); - make.left.mas_equalTo(9); + make.leading.mas_equalTo(9); make.top.mas_equalTo(4); }]; UILabel *label = [UILabel labelInitWithText:YMLocalizedString(@"XPMineUserInfoHeaderTagView0") font:[UIFont systemFontOfSize:10 weight:UIFontWeightMedium] textColor:UIColorFromRGB(0x00C4EA)]; [_editView addSubview:label]; label.userInteractionEnabled = YES; [label mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(33); - make.right.mas_equalTo(-15); + make.leading.mas_equalTo(33); + make.trailing.mas_equalTo(-15); make.top.mas_equalTo(3); make.bottom.mas_equalTo(-3); }]; diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m index 65ad5896..0b06b425 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m @@ -221,7 +221,7 @@ - (void)initSubViewConstraints { [self.pi_cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.height.mas_equalTo(245); }]; @@ -229,48 +229,48 @@ make.edges.mas_equalTo(self.pi_cycleScrollView); }]; [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.left.right.equalTo(self.pi_cycleScrollView); + make.bottom.leading.trailing.equalTo(self.pi_cycleScrollView); make.height.mas_equalTo(25); }]; [self.reviewIcon mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.mas_equalTo(self); + make.top.trailing.mas_equalTo(self); make.width.mas_equalTo(85); make.height.mas_equalTo(50); }]; [self.userInfoView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.bottom.mas_equalTo(self); make.height.mas_greaterThanOrEqualTo(133); }]; [self.usershadowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); - make.right.mas_equalTo(-15); + make.leading.mas_equalTo(15); + make.trailing.mas_equalTo(-15); make.top.height.mas_equalTo(self.userInfoView); }]; [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(88); - make.left.mas_equalTo(30); + make.leading.mas_equalTo(30); make.top.equalTo(self.userInfoView.mas_top).mas_offset(-28); }]; [self.onlineView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.equalTo(self.avatarView); make.width.mas_equalTo(84); - make.left.mas_equalTo(4); + make.leading.mas_equalTo(4); make.height.mas_equalTo(22); }]; [self.onlineIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(18); + make.leading.mas_equalTo(18); make.top.mas_equalTo(3); make.width.mas_equalTo(12); make.height.mas_equalTo(12); }]; [self.onlineTitleView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.onlineIconView); - make.left.mas_equalTo(32); + make.leading.mas_equalTo(32); make.height.mas_equalTo(14); }]; [self.onlineButton mas_makeConstraints:^(MASConstraintMaker *make) { @@ -278,7 +278,7 @@ }]; [self.pageButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.width.mas_equalTo(42); make.height.mas_equalTo(22); make.bottom.mas_equalTo(self.userInfoView.mas_top).offset(-8); @@ -287,15 +287,15 @@ // [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.left.right.mas_equalTo(self.userInfoView).inset(15); +// make.leading.trailing.mas_equalTo(self.userInfoView).inset(15); // make.bottom.mas_equalTo(self.userInfoView); // make.height.mas_equalTo(1); // }]; [self.nickStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.usershadowImageView).offset(115); + make.leading.mas_equalTo(self.usershadowImageView).offset(115); make.top.mas_equalTo(self.usershadowImageView).offset(11); - make.right.lessThanOrEqualTo(@(-15)); + make.trailing.lessThanOrEqualTo(@(-15)); }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -311,9 +311,9 @@ [self.idStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickStackView); + make.leading.mas_equalTo(self.nickStackView); make.top.mas_equalTo(self.nickStackView.mas_bottom).offset(4); - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); }]; [self.beautifulImageViw mas_makeConstraints:^(MASConstraintMaker *make) { @@ -329,10 +329,10 @@ [self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.usershadowImageView).offset(15); + make.leading.mas_equalTo(self.usershadowImageView).offset(15); make.top.mas_equalTo(self.userInfoView).offset(68); - make.right.lessThanOrEqualTo(@70); + make.trailing.lessThanOrEqualTo(@70); }]; @@ -371,22 +371,22 @@ [self.nameplateLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.mas_equalTo(self.nameplateImageView); - make.right.mas_equalTo(self.namePlateView).offset(-2); + make.trailing.mas_equalTo(self.namePlateView).offset(-2); }]; [self.singStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.top.mas_equalTo(103); - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); }]; [self.tagView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.singStackView); + make.leading.trailing.equalTo(self.singStackView); make.height.mas_equalTo(20); }]; [self.signBackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_greaterThanOrEqualTo(10); - make.left.right.equalTo(self.singStackView); + make.leading.trailing.equalTo(self.singStackView); make.bottom.equalTo(self.userInfoView.mas_bottom).mas_offset(-17); }]; [self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -395,7 +395,7 @@ [self.soundView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.width.mas_equalTo(98); make.height.mas_equalTo(28); make.bottom.equalTo(self.userInfoView.mas_top).mas_offset(-5); @@ -404,22 +404,22 @@ [self.palySoundBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(18); make.top.mas_equalTo(5); - make.left.mas_equalTo(4); + make.leading.mas_equalTo(4); }]; [self.soundSVGAView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(27); + make.leading.mas_equalTo(27); make.width.mas_equalTo(35); make.height.mas_equalTo(19); make.centerY.equalTo(self.soundView); }]; [self.soundTimeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(67); + make.leading.mas_equalTo(67); make.centerY.equalTo(self.soundView); }]; [self.soundPromptView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-8); + make.trailing.mas_equalTo(-8); make.centerY.equalTo(self.soundView); }]; [self.toSoundBtn mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoIndividualTagView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoIndividualTagView.m index ec541de5..6848c463 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoIndividualTagView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoIndividualTagView.m @@ -59,7 +59,7 @@ [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(22)); make.top.mas_equalTo(kGetScaleWidth(10)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(18)); @@ -67,12 +67,12 @@ }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.bgView); + make.leading.trailing.equalTo(self.bgView); make.bottom.mas_equalTo(-kGetScaleWidth(20)); make.top.equalTo(self.titleView.mas_bottom); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.equalTo(self.stackView); + make.top.leading.trailing.equalTo(self.stackView); }]; [self.editBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(130)); diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoNavView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoNavView.m index 12d70fe9..31012eba 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoNavView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoNavView.m @@ -34,7 +34,7 @@ - (void)initSubViewConstraints { [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(28)); - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.bottom.mas_equalTo(-kGetScaleWidth(8)); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -42,7 +42,7 @@ make.centerX.equalTo(self); }]; [self.completeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.width.mas_equalTo(kGetScaleWidth(40)); make.height.mas_equalTo(kGetScaleWidth(24)); make.centerY.equalTo(self.backButton); diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagHeadView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagHeadView.m index 69f06a0c..d3f5ade8 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagHeadView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagHeadView.m @@ -71,7 +71,7 @@ UIKIT_EXTERN NSString * kMineInfoDelTag; } - (void)initSubViewConstraints { [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self); + make.leading.trailing.bottom.equalTo(self); make.top.mas_equalTo(kNavigationHeight); }]; [self.emptyView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagItemView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagItemView.m index 537196f8..27b6bf4f 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagItemView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagItemView.m @@ -32,7 +32,7 @@ } - (void)initSubViewConstraints { [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self); + make.leading.trailing.top.equalTo(self); make.bottom.mas_equalTo(0); }]; } diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagView.m index ea24870f..1f31d51a 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagView.m @@ -44,12 +44,12 @@ } - (void)initSubViewConstraints { [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self); + make.leading.trailing.top.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(40)); }]; [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self); + make.leading.trailing.bottom.equalTo(self); make.top.mas_equalTo(self.titleView.mas_bottom); }]; } diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagViewCell.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagViewCell.m index ab23d0d7..c8b20221 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagViewCell.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoTagViewCell.m @@ -53,8 +53,8 @@ UIKIT_EXTERN NSString * kMineInfoDelTag; - (void)initSubViewConstraints { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(8)); - make.left.mas_equalTo(kGetScaleWidth(16)); - make.right.mas_equalTo(-kGetScaleWidth(12)); + make.leading.mas_equalTo(kGetScaleWidth(16)); + make.trailing.mas_equalTo(-kGetScaleWidth(12)); make.bottom.mas_equalTo(-kGetScaleWidth(8)); }]; [self.delBtn mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoVoiceCardView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoVoiceCardView.m index 554065ac..6fc85117 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoVoiceCardView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoVoiceCardView.m @@ -54,20 +54,20 @@ - (void)initSubViewConstraints { [self.backImaegView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.bottom.mas_equalTo(self); - make.right.mas_equalTo(self).offset(13); + make.leading.top.bottom.mas_equalTo(self); + make.trailing.mas_equalTo(self).offset(13); }]; [self.playButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(15, 15)); - make.left.mas_equalTo(self.backImaegView).offset(6); + make.leading.mas_equalTo(self.backImaegView).offset(6); make.centerY.mas_equalTo(self.backImaegView); }]; [self.noteImaegView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(60, 20)); make.centerY.mas_equalTo(self.backImaegView); - make.left.mas_equalTo(self.playButton.mas_right).offset(7); + make.leading.mas_equalTo(self.playButton.mas_trailing).offset(7); }]; } diff --git a/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechageHeadView.m b/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechageHeadView.m index 91366a61..c53c9ba7 100644 --- a/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechageHeadView.m +++ b/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechageHeadView.m @@ -55,14 +55,14 @@ }]; [self.bottomBackImg mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.backImageView); + make.leading.trailing.bottom.mas_equalTo(self.backImageView); make.height.mas_equalTo(110); }]; [self.coinImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(21, 21)); make.top.mas_equalTo(self.bottomBackImg).offset(23); - make.right.mas_equalTo(self.coinLabel.mas_left).offset(-4); + make.trailing.mas_equalTo(self.coinLabel.mas_leading).offset(-4); }]; [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechargeNavView.m b/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechargeNavView.m index 8d900d5d..0d076283 100644 --- a/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechargeNavView.m +++ b/YuMi/Modules/YMMine/View/SubViews/Recharge/XPMineRechargeNavView.m @@ -45,7 +45,7 @@ - (void)initSubViewConstraints { [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.centerY.equalTo(self.mas_bottom).mas_offset(-22); }]; diff --git a/YuMi/Modules/YMMine/View/SubViews/XPFootPrintNavView.m b/YuMi/Modules/YMMine/View/SubViews/XPFootPrintNavView.m index 5d307247..42ac4b84 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPFootPrintNavView.m +++ b/YuMi/Modules/YMMine/View/SubViews/XPFootPrintNavView.m @@ -57,11 +57,11 @@ - (void)initSubViewConstraints { [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.centerY.equalTo(self.mas_bottom).mas_offset(-22); }]; [self.settingButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.centerY.equalTo(self.mas_bottom).mas_offset(-22); }]; diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m index 2c51fe05..d97436ee 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m +++ b/YuMi/Modules/YMMine/View/SubViews/XPMineAccountView.m @@ -43,12 +43,12 @@ [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(13); - make.left.mas_equalTo(14); - make.right.mas_equalTo(0); + make.leading.mas_equalTo(14); + make.trailing.mas_equalTo(0); make.height.mas_equalTo(24); }]; [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.coinLabel); + make.leading.mas_equalTo(self.coinLabel); make.top.mas_equalTo(self.coinLabel.mas_bottom); make.height.mas_equalTo(14); }]; diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineDataSkillDataCollectionViewCell.m b/YuMi/Modules/YMMine/View/SubViews/XPMineDataSkillDataCollectionViewCell.m index cdae336e..4b2be3be 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineDataSkillDataCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/SubViews/XPMineDataSkillDataCollectionViewCell.m @@ -53,18 +53,18 @@ [self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.mas_equalTo(self.backView).inset(8); - make.left.mas_equalTo(self.backView).offset(4); + make.leading.mas_equalTo(self.backView).offset(4); make.height.mas_equalTo(self.logoImageView.mas_width); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.logoImageView.mas_centerY).offset(-2); - make.left.mas_equalTo(self.logoImageView.mas_right).offset(4); - make.right.mas_lessThanOrEqualTo(self.backView); + make.leading.mas_equalTo(self.logoImageView.mas_trailing).offset(4); + make.trailing.mas_lessThanOrEqualTo(self.backView); }]; [self.skillLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.titleLabel); + make.leading.trailing.mas_equalTo(self.titleLabel); make.top.mas_equalTo(self.logoImageView.mas_centerY).offset(2); }]; } diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineFriendNumberView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineFriendNumberView.m index 30d779e7..d24383dc 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineFriendNumberView.m +++ b/YuMi/Modules/YMMine/View/SubViews/XPMineFriendNumberView.m @@ -52,7 +52,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.numberLabel.mas_bottom).offset(4); - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); }]; } @@ -86,7 +86,7 @@ if (isVisitor) { [self addSubview:self.unReadLabel]; [self.unReadLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.numberLabel.mas_right).mas_offset(5); + make.leading.mas_equalTo(self.numberLabel.mas_trailing).mas_offset(5); make.height.mas_equalTo(15); make.width.mas_equalTo(15); make.top.mas_equalTo(self.numberLabel); @@ -103,7 +103,7 @@ width = 7; } [self.unReadLabel mas_remakeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.numberLabel.mas_right).mas_offset(5); + make.leading.mas_equalTo(self.numberLabel.mas_trailing).mas_offset(5); make.width.mas_equalTo(width + 8); make.top.mas_equalTo(self.numberLabel); make.height.mas_equalTo(15); diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m index e3e7c9d0..5491cacb 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m +++ b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m @@ -101,14 +101,14 @@ [self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(12); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); make.top.mas_equalTo(self.avatarImageView).mas_offset(4); make.height.mas_equalTo(16); - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); }]; [self.idStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nameStackView); + make.leading.mas_equalTo(self.nameStackView); make.top.mas_equalTo(self.nameStackView.mas_bottom).offset(13); make.height.mas_equalTo(18); }]; @@ -122,7 +122,7 @@ make.height.mas_equalTo(14); }]; [self.levelLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nameStackView); + make.leading.mas_equalTo(self.nameStackView); make.top.mas_equalTo(self.idStackView.mas_bottom).offset(5); }]; @@ -131,7 +131,7 @@ make.height.mas_equalTo(40); make.width.mas_equalTo(108); - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); }]; CGFloat width = (KScreenWidth - 30) / 4; CGFloat height = 45; @@ -149,7 +149,7 @@ [self.accountView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.avatarImageView.mas_bottom).mas_offset(23); make.size.mas_equalTo(CGSizeMake(width, height)); - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); }]; [self.nobleEntranceView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.accountView); @@ -157,7 +157,7 @@ make.trailing.mas_equalTo(-15); }]; [self.reviewView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self.avatarImageView); + make.leading.trailing.bottom.equalTo(self.avatarImageView); make.height.mas_equalTo(20); }]; } @@ -305,8 +305,8 @@ label.text = tagName; [imageView addSubview:label]; [label mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(27); - make.right.mas_equalTo(-8); + make.leading.mas_equalTo(27); + make.trailing.mas_equalTo(-8); make.centerY.mas_equalTo(0); }]; NSMutableAttributedString *string = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeScaleAspectFit attachmentSize:imageView.bounds.size alignToFont:[UIFont boldSystemFontOfSize:12] alignment:YYTextVerticalAlignmentCenter]; diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineNewUserRechargeView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineNewUserRechargeView.m index 464b34a0..8413bfef 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineNewUserRechargeView.m +++ b/YuMi/Modules/YMMine/View/SubViews/XPMineNewUserRechargeView.m @@ -45,8 +45,8 @@ make.edges.mas_equalTo(self); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); - make.right.mas_equalTo(-6); + make.leading.mas_equalTo(0); + make.trailing.mas_equalTo(-6); make.bottom.mas_equalTo(-2); make.height.mas_equalTo(14); }]; diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMinePayPwdInputView.m b/YuMi/Modules/YMMine/View/SubViews/XPMinePayPwdInputView.m index b90657ea..d27285a7 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMinePayPwdInputView.m +++ b/YuMi/Modules/YMMine/View/SubViews/XPMinePayPwdInputView.m @@ -50,20 +50,20 @@ - (void)makeConstriants { [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(25); + make.leading.trailing.mas_equalTo(self).inset(25); make.bottom.mas_equalTo(0); make.height.mas_equalTo(0.5); }]; [self.statusButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.lineView); + make.trailing.mas_equalTo(self.lineView); make.bottom.mas_equalTo(-10); }]; [self.contentTextField mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.statusButton); - make.left.mas_equalTo(self.lineView); - make.right.mas_equalTo(self.statusButton.mas_left).offset(-10); + make.leading.mas_equalTo(self.lineView); + make.trailing.mas_equalTo(self.statusButton.mas_leading).offset(-10); make.height.mas_equalTo(44); }]; } diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineUserInfoRecordedSoundView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineUserInfoRecordedSoundView.m index 9820c040..9f23f54a 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineUserInfoRecordedSoundView.m +++ b/YuMi/Modules/YMMine/View/SubViews/XPMineUserInfoRecordedSoundView.m @@ -111,7 +111,7 @@ make.edges.equalTo(self); }]; [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self); + make.leading.trailing.top.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(216)); }]; [self.recordView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -156,7 +156,7 @@ [self.bgRerecordView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(42)); make.centerY.equalTo(self.recordBtn); - make.right.equalTo(self.recordBtn.mas_left).mas_offset(-kGetScaleWidth(56)); + make.trailing.equalTo(self.recordBtn.mas_leading).mas_offset(-kGetScaleWidth(56)); }]; [self.rerecordBtn mas_makeConstraints:^(MASConstraintMaker *make) { @@ -173,7 +173,7 @@ [self.bgDeleteView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(42)); make.centerY.equalTo(self.recordBtn); - make.left.equalTo(self.recordBtn.mas_right).mas_offset(kGetScaleWidth(56)); + make.leading.equalTo(self.recordBtn.mas_trailing).mas_offset(kGetScaleWidth(56)); }]; [self.deleteBtn mas_makeConstraints:^(MASConstraintMaker *make) { @@ -184,7 +184,7 @@ [self.saveBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(42)); make.centerY.equalTo(self.recordBtn); - make.left.equalTo(self.recordBtn.mas_right).mas_offset(kGetScaleWidth(56)); + make.leading.equalTo(self.recordBtn.mas_trailing).mas_offset(kGetScaleWidth(56)); }]; [self.saveTitleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.rerecordTitleView); diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineVerifIdentityView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineVerifIdentityView.m index 458f47a5..148961ba 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineVerifIdentityView.m +++ b/YuMi/Modules/YMMine/View/SubViews/XPMineVerifIdentityView.m @@ -57,14 +57,14 @@ }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(15); - make.right.mas_equalTo(self).offset(-32); + make.leading.mas_equalTo(self).offset(15); + make.trailing.mas_equalTo(self).offset(-32); make.top.bottom.mas_equalTo(self); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(5); - make.right.mas_equalTo(self).offset(-5); + make.leading.mas_equalTo(self).offset(5); + make.trailing.mas_equalTo(self).offset(-5); make.bottom.mas_equalTo(self); make.height.mas_equalTo(1); }]; diff --git a/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m b/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m index e60646e5..b96346ec 100644 --- a/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m +++ b/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m @@ -145,21 +145,21 @@ static NSString *lastSelectTab = @"lastSelectTab"; make.height.mas_equalTo(44); }]; [self.listContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.titleView.mas_bottom); }]; [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(64+kSafeAreaBottomHeight); - make.left.bottom.right.mas_equalTo(0); + make.leading.bottom.trailing.mas_equalTo(0); }]; [self.allSelectBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(22); - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.top.mas_equalTo(18); }]; [self.deleteBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.centerY.mas_equalTo(self.allSelectBtn); make.size.mas_equalTo(CGSizeMake(72, 24)); }]; diff --git a/YuMi/Modules/YMMine/View/XPMineFootPrintViewController.m b/YuMi/Modules/YMMine/View/XPMineFootPrintViewController.m index 8dec0243..3bf37dad 100644 --- a/YuMi/Modules/YMMine/View/XPMineFootPrintViewController.m +++ b/YuMi/Modules/YMMine/View/XPMineFootPrintViewController.m @@ -96,11 +96,11 @@ - (void)initSubViewConstraints { [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.navView.mas_bottom); }]; } diff --git a/YuMi/Modules/YMMine/View/XPMineItemTableViewCell.m b/YuMi/Modules/YMMine/View/XPMineItemTableViewCell.m index a1c9c065..49c2ca61 100644 --- a/YuMi/Modules/YMMine/View/XPMineItemTableViewCell.m +++ b/YuMi/Modules/YMMine/View/XPMineItemTableViewCell.m @@ -62,29 +62,29 @@ [self.containerView addSubview:self.dashLineView]; [self.containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); - make.right.mas_equalTo(-16); + make.leading.mas_equalTo(16); + make.trailing.mas_equalTo(-16); make.top.bottom.mas_equalTo(0); }]; [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(12); + make.leading.mas_equalTo(12); make.centerY.mas_equalTo(self.containerView); make.width.height.mas_equalTo(40); }]; [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); make.width.mas_equalTo(40); make.height.mas_equalTo(12); make.centerY.mas_equalTo(self.containerView); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.iconImageView.mas_right).offset(2); - make.right.mas_equalTo(self.arrowImageView.mas_left).offset(-2); + make.leading.mas_equalTo(self.iconImageView.mas_trailing).offset(2); + make.trailing.mas_equalTo(self.arrowImageView.mas_leading).offset(-2); make.centerY.mas_equalTo(self.containerView); }]; [self.dashLineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(22); - make.right.mas_equalTo(-8); + make.leading.mas_equalTo(22); + make.trailing.mas_equalTo(-8); make.height.mas_equalTo(1); make.bottom.mas_equalTo(0); }]; diff --git a/YuMi/Modules/YMMine/View/XPMineUserInfoRecordedSoundVC.m b/YuMi/Modules/YMMine/View/XPMineUserInfoRecordedSoundVC.m index c24e1148..a007a9e1 100644 --- a/YuMi/Modules/YMMine/View/XPMineUserInfoRecordedSoundVC.m +++ b/YuMi/Modules/YMMine/View/XPMineUserInfoRecordedSoundVC.m @@ -125,7 +125,7 @@ UIKIT_EXTERN NSString * kUpdateSoundInfo; [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(28)); make.centerY.equalTo(self.titleView); - make.left.mas_equalTo(kGetScaleWidth(20)); + make.leading.mas_equalTo(kGetScaleWidth(20)); }]; } #pragma mark -XPMineUserInfoProtocol diff --git a/YuMi/Modules/YMMine/View/XPMineUserInfoTagVC.m b/YuMi/Modules/YMMine/View/XPMineUserInfoTagVC.m index 6775ca4f..4422c2e1 100644 --- a/YuMi/Modules/YMMine/View/XPMineUserInfoTagVC.m +++ b/YuMi/Modules/YMMine/View/XPMineUserInfoTagVC.m @@ -102,15 +102,15 @@ } - (void)initSubViewConstraints { [self.headView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self.view); + make.leading.trailing.top.equalTo(self.view); make.height.mas_equalTo(kGetScaleWidth(304)); }]; [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self.view); + make.leading.trailing.top.equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.tagVeiw mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.bottom.right.equalTo(self.view); + make.leading.bottom.trailing.equalTo(self.view); make.top.equalTo(self.headView.mas_bottom); }]; diff --git a/YuMi/Modules/YMMine/View/XPMineViewController.m b/YuMi/Modules/YMMine/View/XPMineViewController.m index 09672dca..e8feaf1d 100644 --- a/YuMi/Modules/YMMine/View/XPMineViewController.m +++ b/YuMi/Modules/YMMine/View/XPMineViewController.m @@ -214,12 +214,12 @@ UIKIT_EXTERN NSString *kRequestRicket; - (void)initSubViewConstraints { [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(0); + make.leading.trailing.top.mas_equalTo(0); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.view); - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); }]; } diff --git a/YuMi/Modules/YMMine/View/XPPermissionsViewController.m b/YuMi/Modules/YMMine/View/XPPermissionsViewController.m index 29584773..82e0ddc3 100644 --- a/YuMi/Modules/YMMine/View/XPPermissionsViewController.m +++ b/YuMi/Modules/YMMine/View/XPPermissionsViewController.m @@ -35,14 +35,14 @@ self.contentView.layer.cornerRadius = 8; [self.icon mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); }]; [self.name mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.icon.mas_right).offset(8); + make.leading.mas_equalTo(self.icon.mas_trailing).offset(8); make.top.mas_equalTo(self.contentView).offset(16); }]; [self.tip mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.icon.mas_right).offset(8); + make.leading.mas_equalTo(self.icon.mas_trailing).offset(8); make.bottom.mas_equalTo(self.contentView).offset(-16); }]; } @@ -110,7 +110,7 @@ - (void)viewDidLayoutSubviews { [super viewDidLayoutSubviews]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.right.bottom.mas_equalTo(self.view).insets(UIEdgeInsetsMake(16, 16, 16, 16)); + make.leading.top.trailing.bottom.mas_equalTo(self.view).insets(UIEdgeInsetsMake(16, 16, 16, 16)); }]; [self.emptyImage mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self.empty); @@ -122,7 +122,7 @@ make.top.mas_equalTo(self.emptyImage.mas_bottom).offset(16); }]; [self.footer mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight); make.height.mas_equalTo(100); }]; diff --git a/YuMi/Modules/YMMine/View/XPPrivacyViewController.m b/YuMi/Modules/YMMine/View/XPPrivacyViewController.m index e8f224bb..bc6754f3 100644 --- a/YuMi/Modules/YMMine/View/XPPrivacyViewController.m +++ b/YuMi/Modules/YMMine/View/XPPrivacyViewController.m @@ -29,7 +29,7 @@ self.title = YMLocalizedString(@"XPPrivacyViewController0"); [self.view addSubview:self.tableView]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(0); }]; } diff --git a/YuMi/Modules/YMMine/View/XPSimpleMineHeaderView.m b/YuMi/Modules/YMMine/View/XPSimpleMineHeaderView.m index 51cd56db..fdc17877 100644 --- a/YuMi/Modules/YMMine/View/XPSimpleMineHeaderView.m +++ b/YuMi/Modules/YMMine/View/XPSimpleMineHeaderView.m @@ -69,7 +69,7 @@ [self.funcStackView addArrangedSubview:self.gradeBtn]; [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.mas_equalTo(0); + make.top.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(260); }]; [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -77,28 +77,28 @@ }]; [self.nicknameLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.avatarImageView).offset(-5); - make.left.mas_equalTo(16); - make.right.mas_equalTo(self.avatarImageView.mas_left).offset(-5); + make.leading.mas_equalTo(16); + make.trailing.mas_equalTo(self.avatarImageView.mas_leading).offset(-5); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.nicknameLabel.mas_bottom).offset(2); - make.left.mas_equalTo(self.nicknameLabel); - make.right.mas_equalTo(self.nicknameLabel); + make.leading.mas_equalTo(self.nicknameLabel); + make.trailing.mas_equalTo(self.nicknameLabel); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.bgImageView); - make.right.mas_equalTo(-16); + make.trailing.mas_equalTo(-16); make.width.height.mas_equalTo(86); }]; [self.numStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); - make.right.mas_equalTo(-16); + make.leading.mas_equalTo(16); + make.trailing.mas_equalTo(-16); make.bottom.mas_equalTo(self.funcStackView.mas_top).offset(-10); make.height.mas_equalTo(30); }]; [self.funcStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); - make.right.mas_equalTo(-16); + make.leading.mas_equalTo(16); + make.trailing.mas_equalTo(-16); make.centerY.mas_equalTo(self.bgImageView.mas_bottom); make.height.mas_equalTo(70); }]; diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.m index f2656cd8..9f240777 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMomentListCollectionViewCell.m @@ -60,23 +60,23 @@ make.edges.mas_equalTo(self.contentView); }]; [self.likeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(8); + make.leading.mas_equalTo(8); make.bottom.mas_equalTo(-12); make.width.mas_equalTo(14); make.height.mas_equalTo(14); }]; [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.likeBtn.mas_right).offset(2); + make.leading.mas_equalTo(self.likeBtn.mas_trailing).offset(2); make.centerY.mas_equalTo(self.likeBtn); - make.right.mas_lessThanOrEqualTo(-8); + make.trailing.mas_lessThanOrEqualTo(-8); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(8); + make.leading.mas_equalTo(8); make.bottom.mas_equalTo(self.likeBtn.mas_top).offset(-2); - make.right.mas_equalTo(-8); + make.trailing.mas_equalTo(-8); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-4); + make.trailing.mas_equalTo(-4); make.bottom.mas_equalTo(-4); make.width.height.mas_equalTo(24); }]; diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.m index 85faa570..c4c2bb17 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMonentsCommentTableViewCell.m @@ -81,7 +81,7 @@ if ([self.reuseIdentifier isEqualToString:NSStringFromClass([XPMonentsCommentTableViewCell class])]) { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.left.mas_equalTo(self.contentView).inset(15); + make.trailing.leading.mas_equalTo(self.contentView).inset(15); make.top.bottom.mas_equalTo(self.contentView); }]; @@ -91,18 +91,18 @@ [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.commentNickLabel); - make.top.bottom.right.mas_equalTo(self.lineContainerView); + make.leading.mas_equalTo(self.commentNickLabel); + make.top.bottom.trailing.mas_equalTo(self.lineContainerView); }]; [self.commentAvatarView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(KMONENTS_COMMENT_AVATAR_WIDTH, KMONENTS_COMMENT_AVATAR_WIDTH)); - make.left.mas_equalTo(self.commentUserView); + make.leading.mas_equalTo(self.commentUserView); make.top.mas_equalTo(self.commentUserView).offset(10); }]; [self.commentNickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.commentAvatarView.mas_right).offset(10); + make.leading.mas_equalTo(self.commentAvatarView.mas_trailing).offset(10); make.top.mas_equalTo(self.commentUserView).offset(10); make.height.mas_equalTo(15); }]; @@ -110,23 +110,23 @@ [self.ownerImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(32, 15)); make.centerY.mas_equalTo(self.commentNickLabel); - make.left.mas_equalTo(self.commentNickLabel.mas_right).offset(5); + make.leading.mas_equalTo(self.commentNickLabel.mas_trailing).offset(5); }]; [self.commentDateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.commentUserView); + make.trailing.mas_equalTo(self.commentUserView); make.centerY.mas_equalTo(self.commentNickLabel); }]; [self.commentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.commentNickLabel); + make.leading.mas_equalTo(self.commentNickLabel); make.top.mas_equalTo(self.commentNickLabel.mas_bottom).offset(10); - make.right.mas_equalTo(self.commentUserView).offset(-kMONENTS_COMMENT_RIGHT_PADDING); + make.trailing.mas_equalTo(self.commentUserView).offset(-kMONENTS_COMMENT_RIGHT_PADDING); }]; }else{ [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.left.mas_equalTo(self.contentView).inset(15); + make.trailing.leading.mas_equalTo(self.contentView).inset(15); make.top.bottom.mas_equalTo(self.contentView); }]; @@ -135,18 +135,18 @@ }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.commentNickLabel); - make.top.bottom.right.mas_equalTo(self.lineContainerView); + make.leading.mas_equalTo(self.commentNickLabel); + make.top.bottom.trailing.mas_equalTo(self.lineContainerView); }]; [self.commentAvatarView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(KMONENTS_COMMENT_AVATAR_WIDTH, KMONENTS_COMMENT_AVATAR_WIDTH)); - make.left.mas_equalTo(self.commentUserView); + make.leading.mas_equalTo(self.commentUserView); make.top.mas_equalTo(self.commentUserView).offset(10); }]; [self.commentNickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.commentAvatarView.mas_right).offset(10); + make.leading.mas_equalTo(self.commentAvatarView.mas_trailing).offset(10); make.top.mas_equalTo(self.commentUserView).offset(10); make.height.mas_equalTo(15); }]; @@ -154,18 +154,18 @@ [self.ownerImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(32, 15)); make.centerY.mas_equalTo(self.commentNickLabel); - make.left.mas_equalTo(self.commentNickLabel.mas_right).offset(5); + make.leading.mas_equalTo(self.commentNickLabel.mas_trailing).offset(5); }]; [self.commentDateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.commentUserView); + make.trailing.mas_equalTo(self.commentUserView); make.centerY.mas_equalTo(self.commentNickLabel); }]; [self.commentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.commentNickLabel); + make.leading.mas_equalTo(self.commentNickLabel); make.top.mas_equalTo(self.commentNickLabel.mas_bottom).offset(10); - make.right.mas_equalTo(self.commentUserView).offset(-kMONENTS_COMMENT_RIGHT_PADDING); + make.trailing.mas_equalTo(self.commentUserView).offset(-kMONENTS_COMMENT_RIGHT_PADDING); }]; } } diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsEmptyTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsEmptyTableViewCell.m index 36f5a68e..49f5d031 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsEmptyTableViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMonentsEmptyTableViewCell.m @@ -43,7 +43,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsInteractiveTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsInteractiveTableViewCell.m index 18ce3139..0bd2af6e 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsInteractiveTableViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMonentsInteractiveTableViewCell.m @@ -77,7 +77,7 @@ - (void)initSubViewConstraints { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.contentView).offset(10); make.bottom.mas_equalTo(self.contentView); }]; @@ -93,50 +93,50 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(44, 44)); - make.left.top.mas_equalTo(self.infoView); + make.leading.top.mas_equalTo(self.infoView); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); make.top.mas_equalTo(self.avatarImageView); }]; [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(28, 14)); make.centerY.mas_equalTo(self.nickLabel); - make.left.mas_equalTo(self.nickLabel.mas_right).offset(2); + make.leading.mas_equalTo(self.nickLabel.mas_trailing).offset(2); }]; [self.commentLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.nickLabel); - make.left.mas_equalTo(self.sexImageView.mas_right).offset(2); + make.leading.mas_equalTo(self.sexImageView.mas_trailing).offset(2); }]; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(10); - make.left.mas_equalTo(self.nickLabel); - make.right.mas_lessThanOrEqualTo(self.dynamicImageView.mas_left).offset(-5); + make.leading.mas_equalTo(self.nickLabel); + make.trailing.mas_lessThanOrEqualTo(self.dynamicImageView.mas_leading).offset(-5); }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.top.mas_equalTo(self.contentLabel.mas_bottom).offset(10); }]; [self.dynamicImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(60, 60)); - make.right.mas_equalTo(self.infoView); + make.trailing.mas_equalTo(self.infoView); make.centerY.mas_equalTo(self.infoView); }]; [self.dynamicLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.right.mas_equalTo(self.dynamicImageView); + make.centerY.trailing.mas_equalTo(self.dynamicImageView); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); - make.right.mas_equalTo(self.infoView); + make.leading.mas_equalTo(self.nickLabel); + make.trailing.mas_equalTo(self.infoView); make.height.mas_equalTo(1); make.bottom.mas_equalTo(self.infoView); }]; diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsPublishCollectionViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsPublishCollectionViewCell.m index 7ca5553a..b7dd6925 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsPublishCollectionViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMonentsPublishCollectionViewCell.m @@ -43,7 +43,7 @@ [self.deleteButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(20, 20)); - make.right.top.mas_equalTo(self.contentView); + make.trailing.top.mas_equalTo(self.contentView); }]; } diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.m index 0ee4b828..2aa93095 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyMoreTableViewCell.m @@ -36,8 +36,8 @@ - (void)initSubViewConstraints { [self.moreLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.top.bottom.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.contentView).offset(kMONENTS_COMMENT_REPLY_LEFT_PADDING + KMONENTS_COMMENT_REPLY_AVATAR_WIDTH + kMONENTS_COMMENT_AVATAR_NICK_PADDING); + make.trailing.top.bottom.mas_equalTo(self.contentView); + make.leading.mas_equalTo(self.contentView).offset(kMONENTS_COMMENT_REPLY_LEFT_PADDING + KMONENTS_COMMENT_REPLY_AVATAR_WIDTH + kMONENTS_COMMENT_AVATAR_NICK_PADDING); }]; } #pragma mark - Event Response diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.m index 849b1cd7..f11ab575 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMonentsReplyTableViewCell.m @@ -62,11 +62,11 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(KMONENTS_COMMENT_REPLY_AVATAR_WIDTH, KMONENTS_COMMENT_REPLY_AVATAR_WIDTH)); make.top.mas_equalTo(self.contentView).offset(10); - make.left.mas_equalTo(self.contentView).offset(kMONENTS_COMMENT_REPLY_LEFT_PADDING); + make.leading.mas_equalTo(self.contentView).offset(kMONENTS_COMMENT_REPLY_LEFT_PADDING); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(kMONENTS_COMMENT_AVATAR_NICK_PADDING); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(kMONENTS_COMMENT_AVATAR_NICK_PADDING); make.top.mas_equalTo(self.contentView).offset(10); make.height.mas_equalTo(15); }]; @@ -74,23 +74,23 @@ [self.ownerImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(30, 15)); make.centerY.mas_equalTo(self.nickLabel); - make.left.mas_equalTo(self.nickLabel.mas_right).offset(5); + make.leading.mas_equalTo(self.nickLabel.mas_trailing).offset(5); }]; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(10); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); }]; [self.dateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.contentView).offset(-10); + make.trailing.mas_equalTo(self.contentView).offset(-10); make.centerY.mas_equalTo(self.nickLabel); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); - make.right.mas_equalTo(self.contentView).offset(-10); + make.leading.mas_equalTo(self.nickLabel); + make.trailing.mas_equalTo(self.contentView).offset(-10); make.height.mas_equalTo(0.5); make.bottom.mas_equalTo(self.contentView); }]; diff --git a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.m b/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.m index e2b87837..d0d969e5 100644 --- a/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.m +++ b/YuMi/Modules/YMMonents/View/Cell/XPMonentsTopicCollectionViewCell.m @@ -49,14 +49,14 @@ - (void)initSubViewConstraints { [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.contentView); - make.left.mas_equalTo(14); + make.leading.mas_equalTo(14); make.width.height.mas_equalTo(10); }]; [self.topicLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerY.right.equalTo(self.contentView); - make.left.equalTo(self.iconImageView.mas_right).mas_offset(5); - make.right.mas_equalTo(-5.5); + make.centerY.trailing.equalTo(self.contentView); + make.leading.equalTo(self.iconImageView.mas_trailing).mas_offset(5); + make.trailing.mas_equalTo(-5.5); }]; // [self.topicImageView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -64,13 +64,13 @@ // }]; // // [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.left.mas_equalTo(self.topicImageView).offset(7); +// make.leading.mas_equalTo(self.topicImageView).offset(7); // make.size.mas_equalTo(CGSizeMake(16, 16)); // make.centerY.mas_equalTo(self.topicImageView); // }]; // // [self.topicLabel mas_makeConstraints:^(MASConstraintMaker *make) { -// make.left.mas_equalTo(self.iconImageView.mas_right).offset(2); +// make.leading.mas_equalTo(self.iconImageView.mas_trailing).offset(2); // make.centerY.mas_equalTo(self.topicImageView); // }]; } diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.m index 407263ac..5daf4a4a 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicListView.m @@ -49,7 +49,7 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(10); + make.leading.mas_equalTo(10); make.centerY.mas_equalTo(self.contentView); make.width.mas_equalTo(100); make.height.mas_equalTo(60); @@ -57,13 +57,13 @@ [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10); - make.right.mas_equalTo(-20); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); + make.trailing.mas_equalTo(-20); }]; [self.desLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); - make.left.right.mas_equalTo(self.nameLabel); + make.leading.trailing.mas_equalTo(self.nameLabel); }]; } @@ -200,7 +200,7 @@ }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.top.mas_equalTo(self).offset(10); }]; } diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicView.m index 468aabfd..ab263e74 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMoentsTopicView.m @@ -47,21 +47,21 @@ - (void)initSubViewConstraints { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.bottom.mas_equalTo(self); + make.leading.top.bottom.mas_equalTo(self); }]; [self.topicImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.topicLabel.mas_right).offset(9); + make.trailing.mas_equalTo(self.topicLabel.mas_trailing).offset(9); }]; [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.topicImageView); + make.leading.mas_equalTo(self.topicImageView); make.size.mas_equalTo(CGSizeMake(10, 10)); make.centerY.mas_equalTo(self.topicImageView); }]; [self.topicLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.iconImageView.mas_right).offset(4); + make.leading.mas_equalTo(self.iconImageView.mas_trailing).offset(4); make.centerY.mas_equalTo(self.topicImageView); }]; } diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentPublishSuccessView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentPublishSuccessView.m index b38e0376..7c563b31 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentPublishSuccessView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMonentPublishSuccessView.m @@ -55,7 +55,7 @@ }]; [self.tipsLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(15); + make.leading.trailing.mas_equalTo(self).inset(15); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(20); }]; } diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPhotoView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPhotoView.m index b06fc652..a4bd1716 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPhotoView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPhotoView.m @@ -85,7 +85,7 @@ self.firstImageView.hidden = NO; [self.firstImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(KScreenWidth-27*2, KScreenWidth-27*2)); - make.left.top.mas_equalTo(self); + make.leading.top.mas_equalTo(self); }]; MonentsPicInfoModel * picInfo = [ _mineDynamicResList safeObjectAtIndex1:0]; if(picInfo != nil){ @@ -96,7 +96,7 @@ CGFloat itemWidth = (KScreenWidth-27*2 - kMONENTS_PIC_SPACE) / 2; [self.firstImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); - make.left.top.mas_equalTo(self); + make.leading.top.mas_equalTo(self); }]; MonentsPicInfoModel * picInfo = [ _mineDynamicResList safeObjectAtIndex1:0]; @@ -107,7 +107,7 @@ [self.secondImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); make.top.mas_equalTo(self); - make.left.mas_equalTo(self.firstImageView.mas_right).offset(kMONENTS_PIC_SPACE); + make.leading.mas_equalTo(self.firstImageView.mas_trailing).offset(kMONENTS_PIC_SPACE); }]; } MonentsPicInfoModel * secondPicInfo = [ _mineDynamicResList safeObjectAtIndex1:1]; @@ -134,7 +134,7 @@ if(imageView == nil)return; [imageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); - make.left.mas_equalTo(page * (itemWidth + kMONENTS_PIC_SPACE)); + make.leading.mas_equalTo(page * (itemWidth + kMONENTS_PIC_SPACE)); make.top.mas_equalTo(line * (itemWidth + kMONENTS_PIC_SPACE)); }]; } @@ -153,7 +153,7 @@ self.firstImageView.hidden = NO; [self.firstImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(kMONENTS_PIC_ONE_WIDTH, kMONENTS_PIC_ONE_WIDTH)); - make.left.top.mas_equalTo(self); + make.leading.top.mas_equalTo(self); }]; MonentsPicInfoModel * picInfo = [_dynamicResList safeObjectAtIndex1:0]; self.firstImageView.imageUrl = picInfo.resUrl; @@ -162,7 +162,7 @@ CGFloat itemWidth = (kMONENTS_CONTENT_MAX_WIDTH - kMONENTS_PIC_SPACE) / 2; [self.firstImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); - make.left.top.mas_equalTo(self); + make.leading.top.mas_equalTo(self); }]; MonentsPicInfoModel * picInfo = [_dynamicResList safeObjectAtIndex1:0]; @@ -172,7 +172,7 @@ [self.secondImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); make.top.mas_equalTo(self); - make.left.mas_equalTo(self.firstImageView.mas_right).offset(kMONENTS_PIC_SPACE); + make.leading.mas_equalTo(self.firstImageView.mas_trailing).offset(kMONENTS_PIC_SPACE); }]; MonentsPicInfoModel * secondPicInfo = [_dynamicResList safeObjectAtIndex1:1]; @@ -196,7 +196,7 @@ if(imageView == nil)return; [imageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); - make.left.mas_equalTo(page * (itemWidth + kMONENTS_PIC_SPACE)); + make.leading.mas_equalTo(page * (itemWidth + kMONENTS_PIC_SPACE)); make.top.mas_equalTo(line * (itemWidth + kMONENTS_PIC_SPACE)); }]; } diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.m index 37e39b82..3e73c648 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsPublishTopicView.m @@ -56,7 +56,7 @@ - (void)initSubViewConstraints { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.height.mas_equalTo(20); make.centerY.mas_equalTo(self); }]; @@ -74,12 +74,12 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.topicView).offset(5); + make.leading.mas_equalTo(self.topicView).offset(5); make.centerY.mas_equalTo(self.topicView); }]; [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.topicView).offset(-7); + make.trailing.mas_equalTo(self.topicView).offset(-7); make.size.mas_equalTo(CGSizeMake(18, 18)); make.centerY.mas_equalTo(self.topicView); }]; diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsRecommendHeaderView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsRecommendHeaderView.m index bb1a2cf0..e732a529 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsRecommendHeaderView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsRecommendHeaderView.m @@ -58,23 +58,23 @@ [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(16); - make.right.mas_offset(-15); - make.left.mas_offset(15); + make.trailing.mas_offset(-15); + make.leading.mas_offset(15); make.bottom.mas_equalTo(-20); }]; // [self.collectionBgView mas_makeConstraints:^(MASConstraintMaker *make) { // make.top.mas_equalTo(10); -// make.left.mas_equalTo(10); -// make.right.mas_equalTo(-10); +// make.leading.mas_equalTo(10); +// make.trailing.mas_equalTo(-10); // make.bottom.mas_equalTo(-10); // }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(15); - make.left.right.equalTo(self.collectionBgView); + make.leading.trailing.equalTo(self.collectionBgView); make.height.mas_equalTo(69); }]; [self.titleBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.equalTo(self.bgView); + make.top.leading.equalTo(self.bgView); make.width.mas_equalTo(74); make.height.mas_equalTo(21); }]; @@ -85,7 +85,7 @@ // [self.arrowButton mas_makeConstraints:^(MASConstraintMaker *make) { // make.size.mas_equalTo(CGSizeMake(11, 20)); // make.centerY.mas_equalTo(self.titleLabel); -// make.right.mas_equalTo(self).offset(-15); +// make.trailing.mas_equalTo(self).offset(-15); // }]; diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTooBarView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTooBarView.m index 4196aa6b..3e78c1d1 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTooBarView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTooBarView.m @@ -83,7 +83,7 @@ - (void)initSubViewConstraints { if (self.isMyMonents) { [self.likeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(12); + make.leading.mas_equalTo(12); make.height.mas_equalTo(18); make.top.mas_equalTo(self).offset(0); make.width.greaterThanOrEqualTo(@62); @@ -91,48 +91,48 @@ [self.likeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(18, 18)); make.centerY.mas_equalTo(self.likeView); - make.left.mas_equalTo(self.likeView); + make.leading.mas_equalTo(self.likeView); }]; [self.likeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.likeButton.mas_right).mas_offset(4); - make.right.equalTo(self.likeView); + make.leading.equalTo(self.likeButton.mas_trailing).mas_offset(4); + make.trailing.equalTo(self.likeView); make.centerY.mas_equalTo(self.likeView); }]; [self.commentView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.height.mas_equalTo(self.likeView); make.width.greaterThanOrEqualTo(@62); - make.left.mas_equalTo(self.likeView.mas_right).offset(5); + make.leading.mas_equalTo(self.likeView.mas_trailing).offset(5); }]; [self.commentButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(18, 18)); make.centerY.mas_equalTo(self.commentView); - make.left.mas_equalTo(self.commentView); + make.leading.mas_equalTo(self.commentView); }]; [self.commentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.commentButton.mas_right).offset(4); + make.leading.mas_equalTo(self.commentButton.mas_trailing).offset(4); make.centerY.mas_equalTo(self.commentView); - make.right.equalTo(self.commentView); + make.trailing.equalTo(self.commentView); }]; [self.shareButton mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.centerY.equalTo(self.likeView); - make.left.mas_equalTo(self.commentView.mas_right).mas_offset(5); + make.leading.mas_equalTo(self.commentView.mas_trailing).mas_offset(5); }]; [self.reportButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self).offset(-12); + make.trailing.mas_equalTo(self).offset(-12); make.centerY.mas_equalTo(self.commentView); make.size.mas_equalTo(CGSizeMake(22, 22)); }]; } else { self.lineView.hidden = YES; [self.likeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(18); + make.leading.mas_equalTo(18); make.height.mas_equalTo(18); make.top.mas_equalTo(self).offset(10); make.width.greaterThanOrEqualTo(@62); @@ -140,40 +140,40 @@ [self.likeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(18, 18)); make.centerY.mas_equalTo(self.likeView); - make.left.mas_equalTo(self.likeView); + make.leading.mas_equalTo(self.likeView); }]; [self.likeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.equalTo(self.likeButton.mas_right).mas_offset(4); - make.right.equalTo(self.likeView); + make.leading.equalTo(self.likeButton.mas_trailing).mas_offset(4); + make.trailing.equalTo(self.likeView); make.centerY.mas_equalTo(self.likeView); }]; [self.commentView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.height.mas_equalTo(self.likeView); make.width.greaterThanOrEqualTo(@62); - make.left.mas_equalTo(self.likeView.mas_right).offset(5); + make.leading.mas_equalTo(self.likeView.mas_trailing).offset(5); }]; [self.commentButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(18, 18)); make.centerY.mas_equalTo(self.commentView); - make.left.mas_equalTo(self.commentView); + make.leading.mas_equalTo(self.commentView); }]; [self.commentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.commentButton.mas_right).offset(4); + make.leading.mas_equalTo(self.commentButton.mas_trailing).offset(4); make.centerY.mas_equalTo(self.commentView); - make.right.equalTo(self.commentView); + make.trailing.equalTo(self.commentView); }]; [self.shareButton mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.centerY.equalTo(self.likeView); - make.left.mas_equalTo(self.commentView.mas_right).mas_offset(5); + make.leading.mas_equalTo(self.commentView.mas_trailing).mas_offset(5); }]; [self.reportButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self).offset(-18); + make.trailing.mas_equalTo(self).offset(-18); make.centerY.mas_equalTo(self.commentView); make.size.mas_equalTo(CGSizeMake(22, 22)); }]; diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.m index b44b4448..fac1a1ea 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsTopicHeaderView.m @@ -55,12 +55,12 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self).offset(kNavigationHeight + 10); - make.left.mas_equalTo(self).offset(30); + make.leading.mas_equalTo(self).offset(30); }]; [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel); - make.right.mas_equalTo(self).offset(-10); + make.leading.mas_equalTo(self.titleLabel); + make.trailing.mas_equalTo(self).offset(-10); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(20); }]; } diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m index 961d81d2..d4eea1f6 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m @@ -104,7 +104,7 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(50, 50)); - make.left.mas_equalTo(self).offset(15); + make.leading.mas_equalTo(self).offset(15); make.centerY.mas_equalTo(self); }]; @@ -116,18 +116,18 @@ [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(12); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(12); make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-2); }]; [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(28, 14)); - make.left.mas_equalTo(self.nickLabel.mas_right).offset(4); + make.leading.mas_equalTo(self.nickLabel.mas_trailing).offset(4); make.centerY.mas_equalTo(self.nickLabel); }]; [self.levelStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(2); make.height.mas_equalTo(20); }]; @@ -159,23 +159,23 @@ [self.nameplateImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(20); make.width.mas_equalTo(60); - make.left.top.mas_equalTo(self.namePlateView); + make.leading.top.mas_equalTo(self.namePlateView); }]; [self.nameplateLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.mas_equalTo(self.nameplateImageView); - make.right.mas_equalTo(self.namePlateView).offset(-2); + make.trailing.mas_equalTo(self.namePlateView).offset(-2); }]; [self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self).offset(-15); + make.trailing.mas_equalTo(self).offset(-15); make.centerY.mas_equalTo(self.nickLabel); make.height.mas_equalTo(14); }]; [self.onlineButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(55, 18)); - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.top.equalTo(self.tagStackView.mas_bottom).mas_offset(8); }]; diff --git a/YuMi/Modules/YMMonents/View/XPMomentListViewController.m b/YuMi/Modules/YMMonents/View/XPMomentListViewController.m index b3dd9296..80af32e7 100644 --- a/YuMi/Modules/YMMonents/View/XPMomentListViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMomentListViewController.m @@ -71,7 +71,7 @@ [self.customNav mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kStatusBarHeight); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(44); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -79,12 +79,12 @@ }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.customNav.mas_bottom); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.bottom.mas_equalTo(0); }]; [self.publishBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(-108); - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); make.width.height.mas_equalTo(70); }]; } diff --git a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.m b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.m index 8c608bf4..7c04b89a 100644 --- a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.m +++ b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailNav.m @@ -44,27 +44,27 @@ [self addSubview:self.moreBtn]; [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.centerY.mas_equalTo(self); make.width.height.mas_equalTo(44); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backBtn.mas_right); + make.leading.mas_equalTo(self.backBtn.mas_trailing); make.centerY.mas_equalTo(self); make.width.height.mas_equalTo(30); }]; [self.nicknameLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avatarImageView); - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(7); - make.right.lessThanOrEqualTo(self.moreBtn.mas_left).offset(-10); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(7); + make.trailing.lessThanOrEqualTo(self.moreBtn.mas_leading).offset(-10); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.avatarImageView); - make.left.mas_equalTo(self.nicknameLabel); - make.right.lessThanOrEqualTo(self.moreBtn.mas_left).offset(-10); + make.leading.mas_equalTo(self.nicknameLabel); + make.trailing.lessThanOrEqualTo(self.moreBtn.mas_leading).offset(-10); }]; [self.moreBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-8); + make.trailing.mas_equalTo(-8); make.centerY.mas_equalTo(self); make.width.height.mas_equalTo(44); }]; diff --git a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m index c9cc2a6b..d5d8c40c 100644 --- a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m @@ -164,17 +164,17 @@ - (void)initSubViewConstraints { [self.detailNav mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kStatusBarHeight); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(44); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.detailNav.mas_bottom); - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.bottom.mas_equalTo(self.inputBarView.mas_top); }]; [self.commentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.sectionView).offset(15); + make.leading.mas_equalTo(self.sectionView).offset(15); make.top.mas_equalTo(6); make.bottom.mas_equalTo(0); }]; diff --git a/YuMi/Modules/YMMonents/View/XPMonentTopicContainerViewController.m b/YuMi/Modules/YMMonents/View/XPMonentTopicContainerViewController.m index 8c4b8a25..bfb9fe0f 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentTopicContainerViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMonentTopicContainerViewController.m @@ -60,14 +60,14 @@ [self.view addSubview:self.enterTopicButton]; [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.view); + make.leading.mas_equalTo(self.view); make.top.mas_equalTo(statusbarHeight); make.height.width.mas_equalTo(44); }]; [self.enterTopicButton mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(50); - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); }]; } diff --git a/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m b/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m index 84813f61..ca8978c9 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m @@ -110,12 +110,12 @@ - (void)initSubViewConstraints { [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.view).mas_offset(10); + make.leading.mas_equalTo(self.view).mas_offset(10); make.top.mas_equalTo(statusbarHeight); make.height.width.mas_equalTo(44); }]; @@ -126,48 +126,48 @@ }]; [self.publishButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.view).offset(-15); + make.trailing.mas_equalTo(self.view).offset(-15); make.centerY.mas_equalTo(self.titleLabel); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.navView.mas_bottom); make.bottom.mas_equalTo(self.view); }]; [self.textView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.contentView).offset(10); make.height.mas_equalTo(150); }]; [self.limitLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.textView.mas_bottom).offset(5); - make.right.mas_equalTo(self.textView); + make.trailing.mas_equalTo(self.textView); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.limitLabel.mas_bottom).offset(10); - make.left.right.mas_equalTo(self.textView); + make.leading.trailing.mas_equalTo(self.textView); make.height.mas_equalTo(1); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.lineView.mas_bottom).offset(10); make.height.mas_equalTo(itemWidth); }]; [self.addTopicView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.collectionView.mas_bottom).offset(15); make.height.mas_equalTo(20); }]; [self.descriptionLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(20); + make.leading.trailing.mas_equalTo(self.view).inset(20); make.bottom.mas_equalTo(self.view).offset(-25); }]; } diff --git a/YuMi/Modules/YMMonents/View/XPMonentsViewController.m b/YuMi/Modules/YMMonents/View/XPMonentsViewController.m index 47059a24..9c92380b 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMonentsViewController.m @@ -77,37 +77,37 @@ - (void)initSubViewConstraints { [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.navView); + make.leading.trailing.mas_equalTo(self.navView); make.height.mas_equalTo(45); make.top.mas_equalTo(self.navView).offset(kSafeAreaTopHeight + 20); }]; [self.messageButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.titleView); - make.right.mas_equalTo(self.navView).offset(-15); + make.trailing.mas_equalTo(self.navView).offset(-15); make.size.mas_equalTo(CGSizeMake(22, 22)); }]; [self.dotView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(10, 10)); make.centerY.mas_equalTo(self.messageButton.mas_top); - make.centerX.mas_equalTo(self.messageButton.mas_right); + make.centerX.mas_equalTo(self.messageButton.mas_trailing); }]; [self.listContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.navView.mas_bottom); }]; [self.publishButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(45, 45)); make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 70); - make.right.mas_equalTo(self.view).offset(-15); + make.trailing.mas_equalTo(self.view).offset(-15); }]; } diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.m index 1a0c6797..8c68cd9f 100644 --- a/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.m @@ -38,7 +38,7 @@ [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.contentView).mas_offset(16); make.bottom.mas_equalTo(self.contentView); - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); }]; } diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m index fed55bf3..9ba37763 100644 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m @@ -87,7 +87,7 @@ }]; [self.rankImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.equalTo(self.contentView); + make.top.leading.equalTo(self.contentView); make.width.mas_equalTo(kGetScaleWidth(174)); make.height.mas_equalTo(kGetScaleWidth(178)); }]; diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayEmptyTableViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayEmptyTableViewCell.m index bc446b10..42e18139 100644 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayEmptyTableViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayEmptyTableViewCell.m @@ -45,20 +45,20 @@ - (void)initSubViewConstraints { [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.left.mas_equalTo(self.contentView).inset(kGetScaleWidth(12)); + make.trailing.leading.mas_equalTo(self.contentView).inset(kGetScaleWidth(12)); make.top.mas_equalTo(self.contentView); make.bottom.mas_equalTo(-kGetScaleWidth(10)); }]; [self.addImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(kGetScaleWidth(48), kGetScaleWidth(48))); - make.left.mas_equalTo(self.backImageView).offset(kGetScaleWidth(12)); + make.leading.mas_equalTo(self.backImageView).offset(kGetScaleWidth(12)); make.centerY.mas_equalTo(self.backImageView); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.addImageView.mas_right).offset(kGetScaleWidth(15)); - make.right.equalTo(self.backImageView.mas_right).mas_offset(-kGetScaleWidth(12)); + make.leading.mas_equalTo(self.addImageView.mas_trailing).offset(kGetScaleWidth(15)); + make.trailing.equalTo(self.backImageView.mas_trailing).mas_offset(-kGetScaleWidth(12)); make.centerY.mas_equalTo(self.backImageView); }]; [self.chooseGameBtn mas_makeConstraints:^(MASConstraintMaker *make) { @@ -76,13 +76,13 @@ // if(_isClan == NO){ // _chooseGameBtn.hidden = NO; // [self.backImageView mas_updateConstraints:^(MASConstraintMaker *make) { -// make.right.mas_equalTo(-kGetScaleWidth(141)); +// make.trailing.mas_equalTo(-kGetScaleWidth(141)); // }]; // return; // } // _chooseGameBtn.hidden = YES; // [self.backImageView mas_updateConstraints:^(MASConstraintMaker *make) { -// make.right.mas_equalTo(-kGetScaleWidth(12)); +// make.trailing.mas_equalTo(-kGetScaleWidth(12)); // }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomeRecommendTableViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomeRecommendTableViewCell.m index 5da0bd8b..7d21215f 100644 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomeRecommendTableViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomeRecommendTableViewCell.m @@ -65,16 +65,16 @@ [self.tagImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(18 * kScreenScale); make.width.mas_greaterThanOrEqualTo(10); - make.left.top.mas_equalTo(self.avatarImageView); + make.leading.top.mas_equalTo(self.avatarImageView); }]; [self.tagTitleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(7 * kScreenScale); - make.right.mas_equalTo(-7 * kScreenScale); + make.leading.mas_equalTo(7 * kScreenScale); + make.trailing.mas_equalTo(-7 * kScreenScale); make.top.bottom.equalTo(self.tagImageView); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.avatarImageView); + make.leading.trailing.mas_equalTo(self.avatarImageView); make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(10 * kScreenScale); }]; } @@ -196,7 +196,7 @@ - (void)initSubViewConstraints { [self.pi_scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15 * kScreenScale); + make.leading.trailing.mas_equalTo(self.contentView).inset(15 * kScreenScale); make.top.mas_equalTo(self.contentView); make.bottom.mas_equalTo(self.contentView); }]; diff --git a/YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.m b/YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.m index 8072a904..3242307b 100644 --- a/YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.m +++ b/YuMi/Modules/YMNewHome/View/CustomView/PIPageControl.m @@ -18,7 +18,7 @@ [dosView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(4)); make.top.equalTo(self); - make.left.mas_equalTo(left); + make.leading.mas_equalTo(left); }]; dosView.layer.cornerRadius = kGetScaleWidth(4)/2; dosView.layer.masksToBounds = YES; diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeGameView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPHomeGameView.m index 4d9db2b7..ae2e5cae 100644 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeGameView.m +++ b/YuMi/Modules/YMNewHome/View/CustomView/XPHomeGameView.m @@ -40,26 +40,26 @@ } - (void)initSubViewConstraints { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.right.left.equalTo(self); + make.bottom.trailing.leading.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(362)); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(14)); - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); make.height.mas_equalTo(kGetScaleWidth(22)); }]; [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(26)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.centerY.equalTo(self.titleView); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.left.mas_equalTo(self.bgView); + make.width.leading.mas_equalTo(self.bgView); make.height.mas_equalTo(kGetScaleWidth(118)); make.top.mas_equalTo(kGetScaleWidth(74)); }]; [self.confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.bgView).inset(kGetScaleWidth(15)); + make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(15)); make.height.mas_equalTo(kGetScaleWidth(46)); make.top.equalTo(self.collectionView.mas_bottom).mas_offset(kGetScaleWidth(70)); }]; diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeRecommendOtherRoomView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPHomeRecommendOtherRoomView.m index d0660ede..80f773bd 100644 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeRecommendOtherRoomView.m +++ b/YuMi/Modules/YMNewHome/View/CustomView/XPHomeRecommendOtherRoomView.m @@ -61,7 +61,7 @@ }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.mas_equalTo(self); + make.top.leading.trailing.mas_equalTo(self); make.height.mas_equalTo(299); }]; @@ -72,7 +72,7 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(19); + make.leading.trailing.mas_equalTo(self.contentView).inset(19); make.top.mas_equalTo(self).offset(12); }]; @@ -83,12 +83,12 @@ }]; [self.roomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(73); + make.leading.trailing.mas_equalTo(self.contentView).inset(73); make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(24); }]; [self.enterRoomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(60); + make.leading.trailing.mas_equalTo(self.contentView).inset(60); make.bottom.mas_equalTo(self.contentView).offset(-24); make.height.mas_equalTo(40); }]; diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeUserView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPHomeUserView.m index ddf68313..1adc187b 100644 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPHomeUserView.m +++ b/YuMi/Modules/YMNewHome/View/CustomView/XPHomeUserView.m @@ -58,17 +58,17 @@ [self.nicknameLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(15); make.centerX.mas_equalTo(self); - make.left.mas_greaterThanOrEqualTo(2); - make.right.mas_lessThanOrEqualTo(-2); + make.leading.mas_greaterThanOrEqualTo(2); + make.trailing.mas_lessThanOrEqualTo(-2); }]; [self.introduceLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.nicknameLabel.mas_bottom).offset(2); make.centerX.mas_equalTo(self); - make.left.mas_greaterThanOrEqualTo(2); - make.right.mas_lessThanOrEqualTo(-2); + make.leading.mas_greaterThanOrEqualTo(2); + make.trailing.mas_lessThanOrEqualTo(-2); }]; [self.circleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.top.mas_equalTo(self.avatarImageView); make.bottom.mas_equalTo(self.avatarImageView); }]; diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.m index 14177b43..f3e29c73 100644 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.m +++ b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.m @@ -46,21 +46,21 @@ - (void)initSubViewConstraints { [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(15); + make.leading.mas_equalTo(self).offset(15); make.height.mas_equalTo(34); make.top.mas_equalTo(self).offset(statusbarHeight + 5); - make.right.mas_equalTo(self.rankButton.mas_left).offset(-15); + make.trailing.mas_equalTo(self.rankButton.mas_leading).offset(-15); }]; [self.searchImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(16); make.height.mas_equalTo(16); - make.left.mas_equalTo(self.searchView).offset(15); + make.leading.mas_equalTo(self.searchView).offset(15); make.centerY.mas_equalTo(self.searchView); }]; [self.searchLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.searchImageView.mas_right).offset(7); + make.leading.mas_equalTo(self.searchImageView.mas_trailing).offset(7); make.centerY.mas_equalTo(self.searchView); }]; @@ -68,12 +68,12 @@ make.width.mas_equalTo(30); make.height.mas_equalTo(32); make.centerY.mas_equalTo(self.searchView); - make.right.mas_equalTo(self).offset(-15); + make.trailing.mas_equalTo(self).offset(-15); }]; [self.rankButton mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.centerY.mas_equalTo(self.opeRoomButton); - make.right.mas_equalTo(self.opeRoomButton.mas_left).offset(-12); + make.trailing.mas_equalTo(self.opeRoomButton.mas_leading).offset(-12); }]; } diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeAttentionCollectionViewCell.m b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeAttentionCollectionViewCell.m index e65a1dd8..65cbdad9 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeAttentionCollectionViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeAttentionCollectionViewCell.m @@ -61,22 +61,22 @@ }]; [self.noteBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.avatarImageView); + make.leading.trailing.bottom.mas_equalTo(self.avatarImageView); make.height.mas_equalTo(14); }]; [self.noteImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.noteBgImageView).mas_offset(15); + make.leading.mas_equalTo(self.noteBgImageView).mas_offset(15); make.centerY.mas_equalTo(self.noteBgImageView).mas_offset(-1); make.height.mas_equalTo(7); make.width.mas_equalTo(8); }]; [self.liveLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.noteImageView.mas_right).mas_offset(2); + make.leading.mas_equalTo(self.noteImageView.mas_trailing).mas_offset(2); make.centerY.mas_equalTo(self.noteImageView); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.avatarImageView); + make.leading.trailing.mas_equalTo(self.avatarImageView); make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(4); }]; } diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeCollectRoomTableViewCell.m b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeCollectRoomTableViewCell.m index 1b487c59..90718c15 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeCollectRoomTableViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeCollectRoomTableViewCell.m @@ -88,87 +88,87 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(74, 74)); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.top.mas_equalTo(self.contentView); }]; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.contentView).offset(8); make.height.mas_equalTo(66); }]; [self.pkButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(44, 16)); - make.left.top.mas_equalTo(self.avatarImageView); + make.leading.top.mas_equalTo(self.avatarImageView); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backImageView).offset(82); + make.leading.mas_equalTo(self.backImageView).offset(82); make.top.mas_equalTo(self.backImageView).offset(12); - make.right.mas_lessThanOrEqualTo(self.personContainerView.mas_left).offset(-5); + make.trailing.mas_lessThanOrEqualTo(self.personContainerView.mas_leading).offset(-5); }]; [self.tagImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(43, 18)); - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(13); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.tagImageView); - make.left.mas_equalTo(self.tagImageView.mas_right).offset(8); + make.leading.mas_equalTo(self.tagImageView.mas_trailing).offset(8); }]; [self.personContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.hotImageView.mas_left).offset(-14); + make.leading.mas_equalTo(self.hotImageView.mas_leading).offset(-14); make.height.mas_equalTo(21); make.top.mas_equalTo(self.backImageView); - make.right.mas_equalTo(self.backImageView); + make.trailing.mas_equalTo(self.backImageView); }]; [self.hotImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(13, 13)); - make.right.mas_equalTo(self.numberLabel.mas_left).offset(-2); + make.trailing.mas_equalTo(self.numberLabel.mas_leading).offset(-2); make.centerY.mas_equalTo(self.personContainerView); }]; [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.personContainerView.mas_right).offset(-5); + make.trailing.mas_equalTo(self.personContainerView.mas_trailing).offset(-5); make.centerY.mas_equalTo(self.personContainerView); }]; [self.micContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backImageView).offset(-13); + make.trailing.mas_equalTo(self.backImageView).offset(-13); make.height.mas_equalTo(16); make.centerY.mas_equalTo(self.tagImageView); - make.left.mas_equalTo(self.fifImageView.mas_left).offset(-5); + make.leading.mas_equalTo(self.fifImageView.mas_leading).offset(-5); }]; [self.firstImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(16, 16)); - make.right.mas_equalTo(self.micContainerView); + make.trailing.mas_equalTo(self.micContainerView); make.centerY.mas_equalTo(self.micContainerView); }]; [self.secondImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.firstImageView); - make.right.mas_equalTo(self.firstImageView.mas_left).offset(2); + make.trailing.mas_equalTo(self.firstImageView.mas_leading).offset(2); }]; [self.thirdImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.firstImageView); - make.right.mas_equalTo(self.secondImageView.mas_left).offset(2); + make.trailing.mas_equalTo(self.secondImageView.mas_leading).offset(2); }]; [self.fourImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.firstImageView); - make.right.mas_equalTo(self.thirdImageView.mas_left).offset(2); + make.trailing.mas_equalTo(self.thirdImageView.mas_leading).offset(2); }]; [self.fifImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.firstImageView); - make.right.mas_equalTo(self.fourImageView.mas_left).offset(2); + make.trailing.mas_equalTo(self.fourImageView.mas_leading).offset(2); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeRedommendCollectionViewCell.m b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeRedommendCollectionViewCell.m index 032f3a87..25c03110 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeRedommendCollectionViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPHomeRedommendCollectionViewCell.m @@ -71,36 +71,36 @@ [self.hotImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(13, 13)); - make.right.mas_equalTo(self.numberLabel.mas_left).offset(-2); + make.trailing.mas_equalTo(self.numberLabel.mas_leading).offset(-2); make.centerY.mas_equalTo(self.personContainerView); }]; [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.personContainerView.mas_right).offset(-4); + make.trailing.mas_equalTo(self.personContainerView.mas_trailing).offset(-4); make.centerY.mas_equalTo(self.personContainerView); }]; [self.shadowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView); + make.leading.trailing.mas_equalTo(self.backView); make.height.mas_equalTo(48); make.bottom.mas_equalTo(self.backView); }]; [self.tagButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.mas_equalTo(self.backView); + make.top.leading.mas_equalTo(self.backView); make.size.mas_equalTo(CGSizeMake(54, 20)); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backView).offset(6); - make.right.mas_equalTo(self.backView).offset(-6); + make.leading.mas_equalTo(self.backView).offset(6); + make.trailing.mas_equalTo(self.backView).offset(-6); make.centerY.mas_equalTo(self.shadowImageView); }]; [self.personContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.hotImageView.mas_left).offset(-4); + make.leading.mas_equalTo(self.hotImageView.mas_leading).offset(-4); make.height.mas_equalTo(16); make.top.mas_equalTo(self.backView).offset(4); - make.right.mas_equalTo(self.backView).offset(-4); + make.trailing.mas_equalTo(self.backView).offset(-4); }]; [self.shadowImageView mas_updateConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m index 906f1adb..fbbe3749 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m @@ -107,12 +107,12 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(45, 45)); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.centerY.mas_equalTo(self.contentView); }]; [self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(13); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(13); make.height.mas_equalTo(20); make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-1.5); }]; @@ -120,33 +120,33 @@ [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nameStackView); + make.leading.mas_equalTo(self.nameStackView); make.top.mas_equalTo(self.avatarImageView.mas_centerY).offset(1.5); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nameStackView); - make.right.mas_equalTo(self.contentView).offset(-15); + make.leading.mas_equalTo(self.nameStackView); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.bottom.mas_equalTo(self.contentView); make.height.mas_equalTo(1); }]; [self.numberView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(18); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.noteImageView.mas_left).offset(-8); + make.leading.mas_equalTo(self.noteImageView.mas_leading).offset(-8); }]; [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.numberView); - make.right.mas_equalTo(self.numberView.mas_right).offset(-5); + make.trailing.mas_equalTo(self.numberView.mas_trailing).offset(-5); }]; [self.noteImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.numberView); make.size.mas_equalTo(CGSizeMake(10, 9)); - make.right.mas_equalTo(self.numberLabel.mas_left).offset(-3); + make.trailing.mas_equalTo(self.numberLabel.mas_leading).offset(-3); }]; [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchNavView.m b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchNavView.m index 86827fe4..1c12f679 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchNavView.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchNavView.m @@ -59,19 +59,19 @@ - (void)initSubViewConstraints { [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(22, 22)); - make.left.mas_equalTo(self).offset(8); + make.leading.mas_equalTo(self).offset(8); make.centerY.mas_equalTo(self.inputBackView); }]; [self.inputBackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(30); - make.left.mas_equalTo(self.backButton.mas_right).offset(5); - make.right.mas_equalTo(self.cancleButton.mas_left).offset(-13); + make.leading.mas_equalTo(self.backButton.mas_trailing).offset(5); + make.trailing.mas_equalTo(self.cancleButton.mas_leading).offset(-13); make.top.mas_equalTo(self).offset(statusbarHeight + 10); }]; [self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self).offset(-15); + make.trailing.mas_equalTo(self).offset(-15); make.centerY.mas_equalTo(self.inputBackView); make.height.mas_equalTo(30); }]; @@ -79,12 +79,12 @@ [self.searchImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(18, 18)); make.centerY.mas_equalTo(self.inputBackView); - make.left.mas_equalTo(self.inputBackView).offset(9); + make.leading.mas_equalTo(self.inputBackView).offset(9); }]; [self.searchTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.searchImageView.mas_right); - make.right.top.bottom.mas_equalTo(self.inputBackView); + make.leading.mas_equalTo(self.searchImageView.mas_trailing); + make.trailing.top.bottom.mas_equalTo(self.inputBackView); }]; } diff --git a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchRelateView.m b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchRelateView.m index 6059c905..c637d524 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchRelateView.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPHomeSearchRelateView.m @@ -49,11 +49,11 @@ - (void)initContraints { [self.relateTitle mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(16); - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.height.mas_equalTo(20); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(0); + make.leading.trailing.bottom.mas_equalTo(0); make.top.mas_equalTo(self.relateTitle.mas_bottom).mas_offset(16); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.m b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.m index eaed0877..7421ae44 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.m @@ -40,7 +40,7 @@ }]; [self.recommentTitle mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self); - make.left.mas_equalTo(16); + make.leading.mas_equalTo(16); }]; } diff --git a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.m b/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.m index 01ccff71..3a18976b 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.m @@ -77,22 +77,22 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; - (void)initSubViewConstraints { [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.searchView.mas_bottom).offset(10); make.height.mas_equalTo(50); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleView.mas_bottom).offset(10); - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); }]; [self.recordVc.view mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.searchView.mas_bottom); make.bottom.mas_equalTo(self.view); }]; @@ -182,7 +182,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; if (list.count) {//有值,显示列表 [self.view addSubview:self.relateView]; [self.relateView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(0); + make.leading.trailing.bottom.mas_equalTo(0); make.top.mas_equalTo(self.searchView.mas_bottom); }]; self.relateView.relateArray = list; @@ -195,7 +195,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; if (data.count) {//有值,显示列表 [self.view addSubview:self.relateView]; [self.relateView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(0); + make.leading.trailing.bottom.mas_equalTo(0); make.top.mas_equalTo(self.searchView.mas_bottom); }]; self.relateView.recommendArray = data; diff --git a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m b/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m index a844c60e..dc4d355e 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m @@ -113,61 +113,61 @@ NSString * const XPConstSearchRecordStoreKey = @"XPConstSearchRecordStoreKey"; - (void)initSubViewConstraints { [self.contentStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.left.bottom.mas_equalTo(self.view); + make.top.trailing.leading.bottom.mas_equalTo(self.view); }]; [self.allSearchContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(0); + make.leading.trailing.top.mas_equalTo(0); make.bottom.mas_equalTo(self.everyOneCollectionView); }]; [self.everyOneTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.allSearchContentView).mas_offset(16); + make.leading.mas_equalTo(self.allSearchContentView).mas_offset(16); make.top.mas_equalTo(self.allSearchContentView).mas_offset(16); make.height.mas_equalTo(20); }]; [self.everyOneCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.allSearchContentView); + make.leading.trailing.mas_equalTo(self.allSearchContentView); make.top.mas_equalTo(self.everyOneTitle.mas_bottom).mas_offset(8); make.height.mas_equalTo(26); }]; [self.searchContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.bottom.mas_equalTo(self.searchCollectionView.mas_bottom); }]; [self.recordTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); + make.leading.mas_equalTo(16); make.top.mas_equalTo(self.searchContentView).mas_offset(20); make.height.mas_equalTo(20); }]; [self.clearRecordBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-16); + make.trailing.mas_equalTo(-16); make.centerY.mas_equalTo(self.recordTitle); make.width.height.mas_equalTo(30); }]; [self.searchCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.height.mas_equalTo(26); make.top.mas_equalTo(self.recordTitle.mas_bottom).mas_offset(8); }]; [self.roomContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.bottom.mas_equalTo(self.roomCollectionView.mas_bottom); }]; [self.roomTitle mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); + make.leading.mas_equalTo(16); make.top.mas_equalTo(self.roomContentView).mas_offset(20); make.height.mas_equalTo(20); }]; [self.clearRoomBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-16); + make.trailing.mas_equalTo(-16); make.centerY.mas_equalTo(self.roomTitle); make.width.height.mas_equalTo(30); }]; [self.roomCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.height.mas_equalTo(75); make.top.mas_equalTo(self.roomTitle.mas_bottom).mas_offset(8); }]; diff --git a/YuMi/Modules/YMNewHome/View/XPHomeSloganViewController.m b/YuMi/Modules/YMNewHome/View/XPHomeSloganViewController.m index cb59f2a8..5859b878 100644 --- a/YuMi/Modules/YMNewHome/View/XPHomeSloganViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPHomeSloganViewController.m @@ -94,7 +94,7 @@ }]; [self.nameImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kStatusBarHeight+20); - make.left.mas_equalTo(23); + make.leading.mas_equalTo(23); make.width.mas_equalTo(100); make.height.mas_equalTo(45); }]; @@ -103,7 +103,7 @@ make.width.mas_equalTo(30); make.height.mas_equalTo(40); make.centerY.mas_equalTo(self.nameImageView); - make.right.mas_equalTo(self.view).offset(-15); + make.trailing.mas_equalTo(self.view).offset(-15); }]; } diff --git a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m index 76688584..b7ecce29 100644 --- a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m @@ -267,12 +267,12 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; - (void)initSubViewConstraints { [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(170 + kSafeAreaTopHeight); }]; [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKEmptyTableViewCell.m index 106c924c..516ea779 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKEmptyTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKEmptyTableViewCell.m @@ -43,7 +43,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKTableViewCell.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKTableViewCell.m index 3ca2825f..741ab6f6 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/Cell/XPAcrossRoomPKTableViewCell.m @@ -51,23 +51,23 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(13); + make.leading.mas_equalTo(13); make.width.height.mas_equalTo(60); make.centerY.mas_equalTo(self.contentView); }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).mas_offset(6); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(6); make.bottom.mas_equalTo(self.avatarImageView.mas_centerY); make.height.mas_equalTo(14); - make.right.mas_equalTo(self.selectButton.mas_left).mas_offset(-5); + make.trailing.mas_equalTo(self.selectButton.mas_leading).mas_offset(-5); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nameLabel); + make.leading.mas_equalTo(self.nameLabel); make.top.mas_equalTo(self.nameLabel.mas_bottom).mas_offset(7); }]; [self.selectButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-12); + make.trailing.mas_equalTo(-12); make.centerY.mas_equalTo(self.avatarImageView); make.width.height.mas_equalTo(30); }]; diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKForceEndResultView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKForceEndResultView.m index 3885077e..d32a9162 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKForceEndResultView.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKForceEndResultView.m @@ -85,32 +85,32 @@ make.height.mas_equalTo(18); }]; [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-17); + make.trailing.mas_equalTo(-17); make.width.height.mas_equalTo(22); make.centerY.mas_equalTo(self.titleLabel); }]; [self.redBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(55); - make.left.mas_equalTo(17); + make.leading.mas_equalTo(17); make.width.mas_equalTo(133); make.height.mas_equalTo(119); }]; [self.redHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(75); - make.left.mas_equalTo(54); + make.leading.mas_equalTo(54); make.width.height.mas_equalTo(52); }]; [self.redRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.redHeadImageView.mas_bottom).mas_offset(8); make.centerX.mas_equalTo(self.redHeadImageView); make.height.mas_equalTo(12); - make.left.mas_equalTo(self.redBgImageView.mas_left).mas_offset(20); + make.leading.mas_equalTo(self.redBgImageView.mas_leading).mas_offset(20); }]; [self.redValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self.redHeadImageView); make.top.mas_equalTo(self.redRoomTitleLabel.mas_bottom).offset(6); make.height.mas_equalTo(12); - make.left.mas_equalTo(self.redBgImageView.mas_left).mas_offset(20); + make.leading.mas_equalTo(self.redBgImageView.mas_leading).mas_offset(20); }]; [self.middleImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(87); @@ -120,24 +120,24 @@ }]; [self.blueBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(61); - make.right.mas_equalTo(-17); + make.trailing.mas_equalTo(-17); make.width.mas_equalTo(133); make.height.mas_equalTo(119); }]; [self.blueHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(81); - make.right.mas_equalTo(-54); + make.trailing.mas_equalTo(-54); make.width.height.mas_equalTo(52); }]; [self.blueRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.blueHeadImageView.mas_bottom).mas_offset(8); make.centerX.mas_equalTo(self.blueHeadImageView); make.height.mas_equalTo(12); - make.left.mas_equalTo(self.blueBgImageView.mas_left).mas_offset(16); + make.leading.mas_equalTo(self.blueBgImageView.mas_leading).mas_offset(16); }]; [self.blueValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self.blueHeadImageView); - make.left.mas_equalTo(self.blueBgImageView.mas_left).mas_offset(16); + make.leading.mas_equalTo(self.blueBgImageView.mas_leading).mas_offset(16); make.top.mas_equalTo(self.blueRoomTitleLabel.mas_bottom).offset(6); make.height.mas_equalTo(12); }]; diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteResultView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteResultView.m index cc78eb12..67ff37ae 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteResultView.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteResultView.m @@ -43,11 +43,11 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); - make.left.mas_equalTo(12); + make.leading.mas_equalTo(12); }]; [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); - make.right.mas_equalTo(-12); + make.trailing.mas_equalTo(-12); make.width.height.mas_equalTo(16); }]; } diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteView.m index 78195232..334479c6 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteView.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKInviteView.m @@ -47,13 +47,13 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(50); - make.left.centerY.mas_equalTo(self); + make.leading.centerY.mas_equalTo(self); }]; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel.mas_right).offset(15); + make.leading.mas_equalTo(self.titleLabel.mas_trailing).offset(15); make.centerY.mas_equalTo(self); - make.right.mas_lessThanOrEqualTo(self).offset(-5); + make.trailing.mas_lessThanOrEqualTo(self).offset(-5); }]; } @@ -158,19 +158,19 @@ [self.countDownButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.titleLabel); - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.width.mas_equalTo(32); make.height.mas_equalTo(16); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backImageView).offset(16); + make.leading.mas_equalTo(self.backImageView).offset(16); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(18); - make.right.mas_equalTo(self.backImageView); + make.trailing.mas_equalTo(self.backImageView); }]; [self.operaStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(16); + make.leading.trailing.mas_equalTo(self.backImageView).inset(16); make.height.mas_equalTo(35); make.top.mas_equalTo(self.stackView.mas_bottom).offset(26); }]; diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelUserView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelUserView.m index f58bb57e..a5bf2558 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelUserView.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPanelUserView.m @@ -50,12 +50,12 @@ }]; [self.headwearImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.centerY.mas_equalTo(self); + make.leading.trailing.centerY.mas_equalTo(self); make.height.mas_equalTo(38); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.bottom.mas_equalTo(self.headwearImageView); make.height.mas_equalTo(self.avatarImageView.mas_width); }]; diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPrizeView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPrizeView.m index 6ba0302b..fed82d63 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPrizeView.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKPrizeView.m @@ -67,7 +67,7 @@ }]; [self.redHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(12); - make.left.mas_equalTo(22); + make.leading.mas_equalTo(22); make.width.height.mas_equalTo(44); }]; [self.redRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -80,11 +80,11 @@ make.centerY.mas_equalTo(self.redHeadImageView); make.width.mas_equalTo(60); make.height.mas_equalTo(40); - make.left.mas_equalTo(self.redHeadImageView.mas_right).mas_offset(9); + make.leading.mas_equalTo(self.redHeadImageView.mas_trailing).mas_offset(9); }]; [self.blueHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.redHeadImageView); - make.left.mas_equalTo(self.middleImageView.mas_right).mas_offset(9); + make.leading.mas_equalTo(self.middleImageView.mas_trailing).mas_offset(9); make.width.height.mas_equalTo(44); }]; [self.blueRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -96,14 +96,14 @@ [self.onLookBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(50); make.height.mas_equalTo(18); - make.right.mas_equalTo(-14); + make.trailing.mas_equalTo(-14); make.bottom.mas_equalTo(-14); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.redHeadImageView); - make.right.mas_equalTo(self.onLookBtn); + make.trailing.mas_equalTo(self.onLookBtn); make.height.mas_equalTo(14); - make.left.mas_equalTo(self.blueHeadImageView.mas_right).mas_offset(20); + make.leading.mas_equalTo(self.blueHeadImageView.mas_trailing).mas_offset(20); }]; } @@ -129,7 +129,7 @@ [self.onLookBtn mas_remakeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(58); make.height.mas_equalTo(20); - make.right.mas_equalTo(-70); + make.trailing.mas_equalTo(-70); make.bottom.mas_equalTo(-14); }]; [self.titleLabel mas_remakeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.m index fa76de96..10e84455 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.m @@ -117,42 +117,42 @@ make.edges.mas_equalTo(0); }]; [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.mas_equalTo(0); + make.top.trailing.mas_equalTo(0); make.width.height.mas_equalTo(22); }]; [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(120); - make.left.mas_equalTo(15); - make.right.mas_equalTo(-15); + make.leading.mas_equalTo(15); + make.trailing.mas_equalTo(-15); make.bottom.mas_equalTo(-23); }]; [self.redBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(12); - make.left.mas_equalTo(6); + make.leading.mas_equalTo(6); make.width.mas_equalTo(151); make.height.mas_equalTo(135); }]; [self.redWinIconView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(_redBgImageView); - make.left.mas_equalTo(18); + make.leading.mas_equalTo(18); make.width.mas_equalTo(49); make.height.mas_equalTo(27); }]; [self.redHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(34); - make.left.mas_equalTo(47); + make.leading.mas_equalTo(47); make.width.height.mas_equalTo(60); }]; [self.redRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.redHeadImageView.mas_bottom).mas_offset(8); make.centerX.mas_equalTo(self.redHeadImageView); make.height.mas_equalTo(12); - make.left.mas_equalTo(self.redBgImageView.mas_left).mas_offset(20); + make.leading.mas_equalTo(self.redBgImageView.mas_leading).mas_offset(20); }]; [self.redValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self.redHeadImageView); make.top.mas_equalTo(self.redRoomTitleLabel.mas_bottom).offset(8); - make.left.mas_equalTo(self.redBgImageView.mas_left).mas_offset(20); + make.leading.mas_equalTo(self.redBgImageView.mas_leading).mas_offset(20); }]; [self.middleImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(60); @@ -162,88 +162,88 @@ }]; [self.blueBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(18); - make.right.mas_equalTo(-6); + make.trailing.mas_equalTo(-6); make.width.mas_equalTo(151); make.height.mas_equalTo(135); }]; [self.blueWinIconView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.blueBgImageView); - make.right.mas_equalTo(-16); + make.trailing.mas_equalTo(-16); make.width.mas_equalTo(49); make.height.mas_equalTo(27); }]; [self.blueHeadImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(41); - make.right.mas_equalTo(-47); + make.trailing.mas_equalTo(-47); make.width.height.mas_equalTo(60); }]; [self.blueRoomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.blueHeadImageView.mas_bottom).mas_offset(8); make.centerX.mas_equalTo(self.blueHeadImageView); make.height.mas_equalTo(12); - make.left.mas_equalTo(self.blueBgImageView.mas_left).mas_offset(16); + make.leading.mas_equalTo(self.blueBgImageView.mas_leading).mas_offset(16); }]; [self.blueValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self.blueHeadImageView); make.top.mas_equalTo(self.blueRoomTitleLabel.mas_bottom).offset(8); - make.left.mas_equalTo(self.blueBgImageView.mas_left).mas_offset(16); + make.leading.mas_equalTo(self.blueBgImageView.mas_leading).mas_offset(16); }]; [self.contributeBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.top.mas_equalTo(self.blueBgImageView.mas_bottom).mas_offset(10); make.height.mas_equalTo(64); }]; [self.contributeAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(70); + make.leading.mas_equalTo(70); make.bottom.mas_equalTo(self.contributeBgImageView.mas_bottom).mas_offset(-6); make.width.height.mas_equalTo(44); }]; [self.contributeHeadWear mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contributeAvatar); + make.leading.mas_equalTo(self.contributeAvatar); make.bottom.mas_equalTo(self.contributeAvatar); make.width.mas_equalTo(44); make.height.mas_equalTo(53); }]; [self.contributeNick mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contributeHeadWear.mas_right).mas_offset(7); + make.leading.mas_equalTo(self.contributeHeadWear.mas_trailing).mas_offset(7); make.bottom.mas_equalTo(self.contributeAvatar.mas_centerY).mas_offset(-3); make.height.mas_equalTo(14); - make.right.mas_equalTo(-20); + make.trailing.mas_equalTo(-20); }]; [self.contributeValue mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contributeNick); + make.leading.mas_equalTo(self.contributeNick); make.top.mas_equalTo(self.contributeNick.mas_bottom).mas_offset(6); make.height.mas_equalTo(13); - make.right.mas_equalTo(-20); + make.trailing.mas_equalTo(-20); }]; [self.charmBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.top.mas_equalTo(self.contributeBgImageView.mas_bottom).mas_offset(6); make.height.mas_equalTo(64); }]; [self.charmAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(70); + make.leading.mas_equalTo(70); make.bottom.mas_equalTo(self.charmBgImageView.mas_bottom).mas_offset(-6); make.width.height.mas_equalTo(44); }]; [self.charmHeadWear mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.charmAvatar); + make.leading.mas_equalTo(self.charmAvatar); make.bottom.mas_equalTo(self.charmAvatar); make.width.mas_equalTo(44); make.height.mas_equalTo(53); }]; [self.charmNick mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.charmHeadWear.mas_right).mas_offset(7); + make.leading.mas_equalTo(self.charmHeadWear.mas_trailing).mas_offset(7); make.bottom.mas_equalTo(self.charmAvatar.mas_centerY).mas_offset(-3); make.height.mas_equalTo(14); - make.right.mas_equalTo(-20); + make.trailing.mas_equalTo(-20); }]; [self.charmValue mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.charmNick); + make.leading.mas_equalTo(self.charmNick); make.top.mas_equalTo(self.charmNick.mas_bottom).mas_offset(6); make.height.mas_equalTo(13); - make.right.mas_equalTo(-20); + make.trailing.mas_equalTo(-20); }]; } diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.m index 7307a8bc..b44d4d8d 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.m @@ -54,8 +54,8 @@ }]; [self.ruleTextView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(23); - make.left.mas_equalTo(17); - make.right.mas_equalTo(-18); + make.leading.mas_equalTo(17); + make.trailing.mas_equalTo(-18); make.bottom.mas_equalTo(-17); }]; } diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrpssRoomPKPanelView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrpssRoomPKPanelView.m index c3609f85..b9d74e06 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrpssRoomPKPanelView.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrpssRoomPKPanelView.m @@ -224,35 +224,35 @@ }]; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.bottom.mas_equalTo(self.stackView).offset(17); }]; [self.helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(145); + make.leading.mas_equalTo(145); make.top.mas_equalTo(8); make.width.height.mas_equalTo(16); }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.helpButton); - make.centerX.mas_equalTo(self.helpButton.mas_right).offset(66); + make.centerX.mas_equalTo(self.helpButton.mas_trailing).offset(66); }]; [self.ruleBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(71); + make.leading.mas_equalTo(71); make.top.mas_equalTo(33); make.width.mas_equalTo(244); make.height.mas_equalTo(177); }]; [self.ruleTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(10); - make.right.mas_equalTo(-14); + make.leading.mas_equalTo(10); + make.trailing.mas_equalTo(-14); make.top.mas_equalTo(24); make.bottom.mas_equalTo(-15); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.backImageView).offset(28); - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); }]; [self.teamContainerView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -266,23 +266,23 @@ [self.userStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(38 * 2 + 8); - make.left.right.mas_equalTo(self.stackView).inset(12); + make.leading.trailing.mas_equalTo(self.stackView).inset(12); }]; [self.redTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.teamContainerView).offset(12); + make.leading.mas_equalTo(self.teamContainerView).offset(12); make.top.mas_equalTo(self.teamContainerView).offset(12); - make.right.mas_lessThanOrEqualTo(self.teamContainerView.mas_centerX); + make.trailing.mas_lessThanOrEqualTo(self.teamContainerView.mas_centerX); }]; [self.redAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.teamContainerView).offset(30); + make.leading.mas_equalTo(self.teamContainerView).offset(30); make.top.mas_equalTo(self.redTitleLabel.mas_bottom).offset(11); make.width.height.mas_equalTo(44); }]; [self.assistButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.redAvatarImageView.mas_right).offset(8); + make.leading.mas_equalTo(self.redAvatarImageView.mas_trailing).offset(8); make.top.mas_equalTo(self.redAvatarImageView); make.width.mas_equalTo(50); make.height.mas_equalTo(18); @@ -290,18 +290,18 @@ [self.blueTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.redTitleLabel); - make.right.mas_equalTo(-12); - make.left.mas_lessThanOrEqualTo(self.teamContainerView.mas_centerX); + make.trailing.mas_equalTo(-12); + make.leading.mas_lessThanOrEqualTo(self.teamContainerView.mas_centerX); }]; [self.blueAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.teamContainerView).offset(-30); + make.trailing.mas_equalTo(self.teamContainerView).offset(-30); make.centerY.mas_equalTo(self.redAvatarImageView); make.width.height.mas_equalTo(44); }]; [self.onlookButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.blueAvatarImageView.mas_left).offset(-8); + make.trailing.mas_equalTo(self.blueAvatarImageView.mas_leading).offset(-8); make.centerY.mas_equalTo(self.assistButton); make.width.mas_equalTo(50); make.height.mas_equalTo(18); @@ -320,33 +320,33 @@ }]; [self.redCountImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.height.mas_equalTo(12); make.top.mas_equalTo(0); - make.right.mas_equalTo(self.buleCountImageView.mas_left); + make.trailing.mas_equalTo(self.buleCountImageView.mas_leading); }]; [self.redCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.progressContentView.mas_left).offset(6); + make.leading.mas_equalTo(self.progressContentView.mas_leading).offset(6); make.centerY.mas_equalTo(self.progressContentView); }]; [self.svgDisplayView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.buleCountImageView.mas_left); + make.centerX.mas_equalTo(self.buleCountImageView.mas_leading); make.bottom.mas_equalTo(self.progressView.mas_bottom); make.height.mas_equalTo(27); make.width.mas_equalTo(18); }]; [self.buleCountImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); make.height.mas_equalTo(12); make.centerY.mas_equalTo(self.redCountImageView); make.width.mas_equalTo(174 * 0.5); }]; [self.buleCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.progressContentView.mas_right).offset(-6); + make.trailing.mas_equalTo(self.progressContentView.mas_trailing).offset(-6); make.centerY.mas_equalTo(self.progressContentView); }]; diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.m index bee41949..883403cd 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.m @@ -74,7 +74,7 @@ - (void)initSubViewConstraints { [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(12); + make.leading.mas_equalTo(12); make.width.mas_equalTo(22); make.height.mas_equalTo(22); make.top.mas_equalTo(27); @@ -83,7 +83,7 @@ [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.inputBackView.mas_bottom).mas_offset(5); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.bottom.mas_equalTo(self.mas_bottom); }]; [self.doneButton mas_makeConstraints:^(MASConstraintMaker *make) { @@ -95,21 +95,21 @@ [self.inputBackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(30); - make.left.mas_equalTo(self.backButton.mas_right).offset(5); - make.right.mas_equalTo(self.mas_right).offset(-15); + make.leading.mas_equalTo(self.backButton.mas_trailing).offset(5); + make.trailing.mas_equalTo(self.mas_trailing).offset(-15); make.centerY.mas_equalTo(self.backButton); }]; [self.searchButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(18, 18)); make.centerY.mas_equalTo(self.inputBackView); - make.right.mas_equalTo(self.inputBackView).offset(-12); + make.trailing.mas_equalTo(self.inputBackView).offset(-12); }]; [self.searchTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.inputBackView).offset(25); + make.leading.mas_equalTo(self.inputBackView).offset(25); make.top.bottom.mas_equalTo(self.inputBackView); - make.right.mas_equalTo(self.searchButton.mas_left).offset(-5); + make.trailing.mas_equalTo(self.searchButton.mas_leading).offset(-5); }]; } diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m index f2271650..f0d34b45 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m @@ -148,12 +148,12 @@ - (void)initSubViewConstraints { [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.contentView.mas_top); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.height.mas_equalTo(kContentHeight); }]; @@ -163,14 +163,14 @@ }]; [self.helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-12); + make.trailing.mas_equalTo(-12); make.width.height.mas_equalTo(22); make.centerY.mas_equalTo(self.titleLabel); }]; [self.userStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(32); - make.left.mas_equalTo(self.contentView).offset(22); + make.leading.mas_equalTo(self.contentView).offset(22); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(20); }]; @@ -188,7 +188,7 @@ [self.timeStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(32); - make.left.right.mas_equalTo(self.contentView).inset(22); + make.leading.trailing.mas_equalTo(self.contentView).inset(22); make.top.mas_equalTo(self.userStackView.mas_bottom).offset(30); }]; @@ -200,11 +200,11 @@ make.height.mas_equalTo(32); make.width.mas_equalTo(170); make.top.mas_equalTo(self.timeStackView.mas_bottom).offset(16); - make.left.mas_equalTo(self.tenMinuteButton); + make.leading.mas_equalTo(self.tenMinuteButton); }]; [self.playStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.height.mas_equalTo(self.timeStackView); + make.leading.trailing.height.mas_equalTo(self.timeStackView); make.top.mas_equalTo(self.customTimeTextField.mas_bottom).offset(30); }]; @@ -214,28 +214,28 @@ [self.doneButton mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(40); - make.left.right.mas_equalTo(self.contentView).inset(40); + make.leading.trailing.mas_equalTo(self.contentView).inset(40); make.bottom.mas_equalTo(self.contentView.mas_bottom).offset(-34 - kSafeAreaBottomHeight); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.selectRoomContentView); - make.left.mas_equalTo(self.selectRoomContentView); + make.leading.mas_equalTo(self.selectRoomContentView); make.height.width.mas_equalTo(60); }]; [self.roomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-3); - make.left.mas_equalTo(self.avatarImageView.mas_right).mas_offset(6); - make.right.mas_lessThanOrEqualTo(self.cancelButon.mas_left); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(6); + make.trailing.mas_lessThanOrEqualTo(self.cancelButon.mas_leading); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avatarImageView.mas_centerY).mas_offset(3); - make.left.right.mas_equalTo(self.roomTitleLabel); + make.leading.trailing.mas_equalTo(self.roomTitleLabel); }]; [self.cancelButon mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.avatarImageView); - make.right.mas_equalTo(self.selectRoomContentView).offset(-12); + make.trailing.mas_equalTo(self.selectRoomContentView).offset(-12); make.height.width.mas_equalTo(22); }]; } diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m b/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m index c7a84e89..b0a7c02b 100644 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m +++ b/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m @@ -109,7 +109,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView; [self.clickPlayView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.size.mas_equalTo(CGSizeMake(81, 66)); }]; diff --git a/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.m b/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.m index 0fb74655..e6b3e196 100644 --- a/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.m +++ b/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.m @@ -63,7 +63,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self); make.top.mas_equalTo(self.tipImageView.mas_bottom).mas_offset(46); - make.left.right.equalTo(self).inset(10); + make.leading.trailing.equalTo(self).inset(10); }]; } diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/Cell/XPAnchorPKTableViewCell.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/Cell/XPAnchorPKTableViewCell.m index 98f4646a..1fe1279e 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/Cell/XPAnchorPKTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/Cell/XPAnchorPKTableViewCell.m @@ -53,23 +53,23 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(13); + make.leading.mas_equalTo(13); make.width.height.mas_equalTo(60); make.centerY.mas_equalTo(self.contentView); }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).mas_offset(6); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(6); make.bottom.mas_equalTo(self.avatarImageView.mas_centerY); make.height.mas_equalTo(14); - make.right.mas_equalTo(self.selectButton.mas_left).mas_offset(-5); + make.trailing.mas_equalTo(self.selectButton.mas_leading).mas_offset(-5); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nameLabel); + make.leading.mas_equalTo(self.nameLabel); make.top.mas_equalTo(self.nameLabel.mas_bottom).mas_offset(7); }]; [self.selectButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.centerY.mas_equalTo(self.avatarImageView); make.width.mas_equalTo(64); make.height.mas_equalTo(24); diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKFinishView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKFinishView.m index a311653b..aceeaf6d 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKFinishView.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKFinishView.m @@ -84,7 +84,7 @@ [self.redAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(52); make.width.height.mas_equalTo(80); - make.left.mas_equalTo(24); + make.leading.mas_equalTo(24); }]; [self.vsImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self); @@ -95,7 +95,7 @@ [self.blueAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.redAvatarImageView); make.width.height.mas_equalTo(80); - make.right.mas_equalTo(-24); + make.trailing.mas_equalTo(-24); }]; [self.redValueBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.redAvatarImageView.mas_bottom).mas_offset(6); @@ -116,7 +116,7 @@ make.centerX.centerY.mas_equalTo(self.blueValueBgImageView); }]; [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.top.mas_equalTo(self.backgroundImageView); + make.trailing.top.mas_equalTo(self.backgroundImageView); make.width.height.mas_equalTo(32); }]; } diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKInviteView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKInviteView.m index 857b11d4..c96ecbc6 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKInviteView.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKInviteView.m @@ -48,13 +48,13 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(55); - make.left.centerY.mas_equalTo(self); + make.leading.centerY.mas_equalTo(self); }]; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel.mas_right).offset(15); + make.leading.mas_equalTo(self.titleLabel.mas_trailing).offset(15); make.centerY.mas_equalTo(self); - make.right.mas_lessThanOrEqualTo(self).offset(-5); + make.trailing.mas_lessThanOrEqualTo(self).offset(-5); }]; } @@ -159,19 +159,19 @@ }]; [self.countDownButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.top.mas_equalTo(0); + make.trailing.top.mas_equalTo(0); make.width.mas_equalTo(36); make.height.mas_equalTo(26); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backImageView).offset(26); + make.leading.mas_equalTo(self.backImageView).offset(26); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(32); - make.right.mas_equalTo(self.backImageView); + make.trailing.mas_equalTo(self.backImageView); }]; [self.operaStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(20); + make.leading.trailing.mas_equalTo(self.backImageView).inset(20); make.height.mas_equalTo(40); make.bottom.mas_equalTo(-25); }]; diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKPanelUserView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKPanelUserView.m index 32385429..2c431421 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKPanelUserView.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKPanelUserView.m @@ -51,7 +51,7 @@ }]; [self.mvpImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.bottom.right.mas_equalTo(self.avatarImageView); + make.leading.bottom.trailing.mas_equalTo(self.avatarImageView); make.height.mas_equalTo(11); }]; diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKResultView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKResultView.m index 41be765e..6e480174 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKResultView.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKResultView.m @@ -66,7 +66,7 @@ [self.headImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); - make.left.mas_equalTo(16); + make.leading.mas_equalTo(16); make.width.height.mas_equalTo(34); }]; [self.mvpIconView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -77,13 +77,13 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.headImageView).mas_offset(2); - make.left.mas_equalTo(self.headImageView.mas_right).mas_offset(8); + make.leading.mas_equalTo(self.headImageView.mas_trailing).mas_offset(8); make.height.mas_equalTo(13); - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); }]; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel); + make.leading.mas_equalTo(self.titleLabel); make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(4); make.height.mas_equalTo(11); }]; @@ -212,7 +212,7 @@ - (void)initConstrations { [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.top.mas_equalTo(47); make.height.mas_equalTo(370); }]; diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKRuleView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKRuleView.m index 7b95e3a7..9865f098 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKRuleView.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKRuleView.m @@ -60,12 +60,12 @@ }]; [self.ruleTextView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(30); - make.left.mas_equalTo(18); - make.right.mas_equalTo(-18); + make.leading.mas_equalTo(18); + make.trailing.mas_equalTo(-18); make.bottom.mas_equalTo(-20); }]; [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.top.mas_equalTo(self.backgroundImageView); + make.trailing.top.mas_equalTo(self.backgroundImageView); make.width.height.mas_equalTo(32); }]; } diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m index 28898446..c0fdff40 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m @@ -224,12 +224,12 @@ [self.redStarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.backImageView).mas_offset(15); - make.left.mas_equalTo(self.backImageView.mas_left).mas_offset(-30); + make.leading.mas_equalTo(self.backImageView.mas_leading).mas_offset(-30); make.width.height.mas_equalTo(26); }]; [self.blueStarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.redStarImageView); - make.left.mas_equalTo(self.backImageView.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.backImageView.mas_trailing).mas_offset(4); make.width.height.mas_equalTo(26); }]; @@ -246,31 +246,31 @@ }]; [self.redCountImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.height.mas_equalTo(16); make.top.mas_equalTo(0); - make.right.mas_equalTo(self.blueCountImageView.mas_left); + make.trailing.mas_equalTo(self.blueCountImageView.mas_leading); }]; [self.redCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.progressContentView.mas_left).offset(17); + make.leading.mas_equalTo(self.progressContentView.mas_leading).offset(17); make.centerY.mas_equalTo(self.progressContentView); }]; [self.blueCountImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); make.height.mas_equalTo(self.redCountImageView); make.centerY.mas_equalTo(self.redCountImageView); make.width.mas_equalTo(305 * 0.5); }]; [self.blueCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.progressContentView.mas_right).offset(-17); + make.trailing.mas_equalTo(self.progressContentView.mas_trailing).offset(-17); make.centerY.mas_equalTo(self.progressContentView); }]; [self.svgDisplayView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.blueCountImageView.mas_left); + make.centerX.mas_equalTo(self.blueCountImageView.mas_leading); make.centerY.mas_equalTo(self.redCountImageView); make.height.mas_equalTo(26); make.width.mas_equalTo(25); @@ -278,17 +278,17 @@ [self.redContributeStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.backImageView); - make.left.mas_equalTo(self.backImageView).mas_offset(12); + make.leading.mas_equalTo(self.backImageView).mas_offset(12); make.height.mas_equalTo(42); }]; [self.blueContributeStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(self.redContributeStackView); - make.right.mas_equalTo(self.backImageView).mas_offset(-12); + make.trailing.mas_equalTo(self.backImageView).mas_offset(-12); make.bottom.mas_equalTo(self.redContributeStackView); }]; [self.redResultImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo((KScreenWidth - 64) * 0.5 - 26 - 85 * 0.5 - 66 * 0.5); + make.leading.mas_equalTo((KScreenWidth - 64) * 0.5 - 26 - 85 * 0.5 - 66 * 0.5); make.bottom.mas_equalTo(self.otherResultImageView); make.width.mas_equalTo(66); make.height.mas_equalTo(48); @@ -296,7 +296,7 @@ ///对方信息 [self.otherAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo((KScreenWidth + 64) * 0.5 + 26 - 2.5); + make.leading.mas_equalTo((KScreenWidth + 64) * 0.5 + 26 - 2.5); make.top.mas_equalTo(0); make.width.height.mas_equalTo(90); }]; @@ -307,7 +307,7 @@ make.height.mas_equalTo(48); }]; [self.otherMicButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.right.mas_equalTo(self.otherAvatarImageView); + make.bottom.trailing.mas_equalTo(self.otherAvatarImageView); make.width.height.mas_equalTo(24); }]; [self.redNickStackView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.m index 6a470a08..4958ce50 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.m @@ -90,13 +90,13 @@ [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.backgroundImageView).offset(120); - make.left.right.mas_equalTo(self.backgroundImageView).inset(18); + make.leading.trailing.mas_equalTo(self.backgroundImageView).inset(18); make.bottom.mas_equalTo(self.backgroundImageView).offset(-15); }]; [self.ruleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.scrollView); - make.left.right.mas_equalTo(self.backgroundImageView).inset(18); + make.leading.trailing.mas_equalTo(self.backgroundImageView).inset(18); }]; // [self.randomLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -111,7 +111,7 @@ // }]; // // [self.randomContentLb mas_makeConstraints:^(MASConstraintMaker *make) { -// make.left.right.mas_equalTo(self.backgroundImageView).inset(18); +// make.leading.trailing.mas_equalTo(self.backgroundImageView).inset(18); // make.top.mas_equalTo(self.randomImageView.mas_bottom).offset(8); // }]; // @@ -127,12 +127,12 @@ // }]; // // [self.inviteContentLb mas_makeConstraints:^(MASConstraintMaker *make) { -// make.left.right.mas_equalTo(self.backgroundImageView).inset(18); +// make.leading.trailing.mas_equalTo(self.backgroundImageView).inset(18); // make.top.mas_equalTo(self.inviteImageView.mas_bottom).offset(8); // }]; [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.top.mas_equalTo(self.backgroundImageView); + make.trailing.top.mas_equalTo(self.backgroundImageView); make.width.height.mas_equalTo(32); }]; } diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.m index 7d182497..8476bc3d 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.m @@ -71,7 +71,7 @@ - (void)initSubViewConstraints { [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(12); + make.leading.mas_equalTo(12); make.width.mas_equalTo(22); make.height.mas_equalTo(22); make.top.mas_equalTo(27); @@ -80,26 +80,26 @@ [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.inputBackView.mas_bottom).mas_offset(5); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.bottom.mas_equalTo(self.mas_bottom); }]; [self.inputBackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(30); - make.left.mas_equalTo(self.backButton.mas_right).offset(5); - make.right.mas_equalTo(self.mas_right).offset(-15); + make.leading.mas_equalTo(self.backButton.mas_trailing).offset(5); + make.trailing.mas_equalTo(self.mas_trailing).offset(-15); make.centerY.mas_equalTo(self.backButton); }]; [self.searchButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(18, 18)); make.centerY.mas_equalTo(self.inputBackView); - make.right.mas_equalTo(self.inputBackView).offset(-12); + make.trailing.mas_equalTo(self.inputBackView).offset(-12); }]; [self.searchTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.inputBackView).offset(25); + make.leading.mas_equalTo(self.inputBackView).offset(25); make.top.bottom.mas_equalTo(self.inputBackView); - make.right.mas_equalTo(self.searchButton.mas_left).offset(-5); + make.trailing.mas_equalTo(self.searchButton.mas_leading).offset(-5); }]; } diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.m index 576a3917..fe92b5be 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.m @@ -67,11 +67,11 @@ - (void)setupContraints { [self.gesView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(0); + make.leading.trailing.top.mas_equalTo(0); make.bottom.mas_equalTo(self.bgView.mas_top); }]; [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(0); + make.leading.trailing.bottom.mas_equalTo(0); make.height.mas_equalTo(250); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -80,22 +80,22 @@ make.height.mas_equalTo(18); }]; [self.ruleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-16); + make.trailing.mas_equalTo(-16); make.centerY.mas_equalTo(self.titleLabel); make.width.height.mas_equalTo(21); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(8); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(0.5); }]; [self.randomPKButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.bgView.mas_centerX).mas_offset(-22); + make.trailing.mas_equalTo(self.bgView.mas_centerX).mas_offset(-22); make.size.mas_equalTo(CGSizeMake(100, 135)); make.top.mas_equalTo(self.lineView.mas_bottom).mas_offset(16); }]; [self.invitePKButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.randomPKButton.mas_right).mas_offset(44); + make.leading.mas_equalTo(self.randomPKButton.mas_trailing).mas_offset(44); make.size.mas_equalTo(CGSizeMake(100, 135)); make.top.mas_equalTo(self.randomPKButton); }]; diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m index 9172909a..fa164645 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m @@ -143,12 +143,12 @@ - (void)initSubViewConstraints { [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.contentView.mas_top); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.height.mas_equalTo(kContentHeight); }]; @@ -158,7 +158,7 @@ }]; [self.userStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(32); - make.left.mas_equalTo(self.contentView).offset(22); + make.leading.mas_equalTo(self.contentView).offset(22); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(20); }]; @@ -176,7 +176,7 @@ [self.timeStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(32); - make.left.right.mas_equalTo(self.contentView).inset(22); + make.leading.trailing.mas_equalTo(self.contentView).inset(22); make.top.mas_equalTo(self.userStackView.mas_bottom).offset(30); }]; @@ -188,11 +188,11 @@ make.height.mas_equalTo(32); make.width.mas_equalTo(170); make.top.mas_equalTo(self.timeStackView.mas_bottom).offset(16); - make.left.mas_equalTo(self.tenMinuteButton); + make.leading.mas_equalTo(self.tenMinuteButton); }]; [self.playStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.height.mas_equalTo(self.timeStackView); + make.leading.trailing.height.mas_equalTo(self.timeStackView); make.top.mas_equalTo(self.customTimeTextField.mas_bottom).offset(30); }]; @@ -202,28 +202,28 @@ [self.doneButton mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(40); - make.left.right.mas_equalTo(self.contentView).inset(40); + make.leading.trailing.mas_equalTo(self.contentView).inset(40); make.bottom.mas_equalTo(self.contentView.mas_bottom).offset(-34 - kSafeAreaBottomHeight); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.selectRoomContentView); - make.left.mas_equalTo(self.selectRoomContentView); + make.leading.mas_equalTo(self.selectRoomContentView); make.height.width.mas_equalTo(60); }]; [self.roomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-3); - make.left.mas_equalTo(self.avatarImageView.mas_right).mas_offset(6); - make.right.mas_lessThanOrEqualTo(self.cancelButon.mas_left); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(6); + make.trailing.mas_lessThanOrEqualTo(self.cancelButon.mas_leading); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avatarImageView.mas_centerY).mas_offset(3); - make.left.right.mas_equalTo(self.roomTitleLabel); + make.leading.trailing.mas_equalTo(self.roomTitleLabel); }]; [self.cancelButon mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.avatarImageView); - make.right.mas_equalTo(self.selectRoomContentView).offset(-12); + make.trailing.mas_equalTo(self.selectRoomContentView).offset(-12); make.height.width.mas_equalTo(22); }]; } diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskTableViewCell.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskTableViewCell.m index ef1c1757..edabd6a4 100644 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskTableViewCell.m @@ -55,29 +55,29 @@ [self.nameplateBgView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.contentView); make.bottom.mas_equalTo(self.contentView).offset(-8); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); }]; [self.nameplateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(10); + make.leading.mas_equalTo(10); make.centerY.mas_equalTo(self.nameplateBgView); make.width.height.mas_equalTo(38); }]; [self.nameplateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nameplateImageView.mas_right).mas_offset(8); + make.leading.mas_equalTo(self.nameplateImageView.mas_trailing).mas_offset(8); make.top.mas_equalTo(self.nameplateImageView).mas_offset(1); make.height.mas_equalTo(21); }]; [self.nameplateDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.nameplateLabel.mas_bottom); - make.left.mas_equalTo(self.nameplateLabel); + make.leading.mas_equalTo(self.nameplateLabel); make.height.mas_equalTo(15); }]; [self.doneButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.nameplateBgView); make.height.mas_equalTo(20); - make.right.mas_equalTo(-10); + make.trailing.mas_equalTo(-10); make.width.mas_equalTo(48); }]; } diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskViewController.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskViewController.m index 618451bb..040065c9 100644 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskViewController.m +++ b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskViewController.m @@ -132,48 +132,48 @@ - (void)initSubViewConstraints { [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.contentView.mas_top); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.height.mas_equalTo(454); }]; [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make){ - make.top.right.left.bottom.mas_equalTo(0); + make.top.trailing.leading.bottom.mas_equalTo(0); }]; [self.helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-10); + make.trailing.mas_equalTo(-10); make.top.mas_equalTo(10); make.width.height.mas_equalTo(30); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.width.height.mas_equalTo(64); make.top.mas_equalTo(36); }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(21); - make.left.mas_equalTo(self.avatarImageView.mas_right).mas_offset(8); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(8); make.top.mas_equalTo(self.avatarImageView).offset(6); - make.right.mas_equalTo(self.countContentView.mas_left).mas_offset(-4); + make.trailing.mas_equalTo(self.countContentView.mas_leading).mas_offset(-4); }]; [self.countContentView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.nameLabel); - make.right.mas_lessThanOrEqualTo(-26); + make.trailing.mas_lessThanOrEqualTo(-26); make.height.mas_equalTo(15); - make.left.mas_equalTo(self.nameLabel.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.nameLabel.mas_trailing).mas_offset(4); }]; [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.mas_equalTo(self.countContentView); - make.left.mas_equalTo(self.countContentView).mas_offset(5); - make.right.mas_equalTo(self.countContentView).mas_offset(-5); + make.leading.mas_equalTo(self.countContentView).mas_offset(5); + make.trailing.mas_equalTo(self.countContentView).mas_offset(-5); }]; [self.countLabel setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; @@ -181,7 +181,7 @@ [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).mas_offset(8); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(8); make.bottom.mas_equalTo(self.avatarImageView).mas_offset(-3); make.height.mas_equalTo(28); make.width.mas_equalTo(3 * (20 + 8) + 34); @@ -189,7 +189,7 @@ [self.rankImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.stackView); - make.left.mas_equalTo(9); + make.leading.mas_equalTo(9); make.width.mas_equalTo(16); make.height.mas_equalTo(18); }]; @@ -202,36 +202,36 @@ }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(25); + make.leading.trailing.mas_equalTo(self.contentView).inset(25); make.top.mas_equalTo(self.privilegeTitleImageView.mas_bottom).offset(12); make.height.mas_equalTo(200); }]; [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(0); + make.leading.trailing.bottom.mas_equalTo(0); make.height.mas_equalTo(88); }]; [self.myAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(24); + make.leading.mas_equalTo(24); make.top.mas_equalTo(10); make.width.height.mas_equalTo(40); }]; [self.intimateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.myAvatarImageView.mas_right).mas_offset(8); + make.leading.mas_equalTo(self.myAvatarImageView.mas_trailing).mas_offset(8); make.top.mas_equalTo(self.myAvatarImageView).mas_offset(4); make.height.mas_equalTo(15); }]; [self.progressBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.intimateLabel); - make.right.mas_equalTo(-24); + make.leading.mas_equalTo(self.intimateLabel); + make.trailing.mas_equalTo(-24); make.height.mas_equalTo(16); make.top.mas_equalTo(self.intimateLabel.mas_bottom).mas_offset(2); }]; [self.progressView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.bottom.mas_equalTo(self.progressBgView); + make.top.leading.bottom.mas_equalTo(self.progressBgView); make.width.mas_equalTo(0); }]; [self.progressLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -239,25 +239,25 @@ }]; [self.explainBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-13); + make.trailing.mas_equalTo(-13); make.top.mas_equalTo(29); make.width.mas_equalTo(111); make.height.mas_equalTo(98); }]; [self.explainButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(43); make.top.mas_equalTo(12); }]; [self.devideView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(7); - make.right.mas_equalTo(-12); + make.leading.mas_equalTo(7); + make.trailing.mas_equalTo(-12); make.height.mas_equalTo(1); make.top.mas_equalTo(self.explainButton.mas_bottom); }]; [self.exitButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(43); make.top.mas_equalTo(self.devideView.mas_bottom); }]; @@ -313,14 +313,14 @@ [imageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.stackView); make.width.height.mas_equalTo(20); - make.left.mas_equalTo(i * 27 + 25 + margin); + make.leading.mas_equalTo(i * 27 + 25 + margin); }]; } float progress = self.model.levelExper * 1.0 / self.model.nextLevelExper; [self.progressView mas_remakeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(self.progressBgView.mas_width).multipliedBy(progress); - make.top.left.bottom.mas_equalTo(self.progressBgView); + make.top.leading.bottom.mas_equalTo(self.progressBgView); }]; self.myAvatarImageView.imageUrl = self.model.memberAvatar; diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.m index dc4645c6..68e81a64 100644 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.m +++ b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.m @@ -41,13 +41,13 @@ - (void)initSubViewConstraints { [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.iconImageView); + make.trailing.mas_equalTo(self.iconImageView); }]; [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self); - make.left.mas_equalTo(-11); - make.right.mas_equalTo(self.iconImageView.mas_right).mas_offset(-8); + make.leading.mas_equalTo(-11); + make.trailing.mas_equalTo(self.iconImageView.mas_trailing).mas_offset(-8); make.height.mas_equalTo(22); }]; [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -56,8 +56,8 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.bgImageView); - make.right.mas_equalTo(self.iconImageView.mas_left); - make.left.mas_equalTo(8); + make.trailing.mas_equalTo(self.iconImageView.mas_leading); + make.leading.mas_equalTo(8); }]; } @@ -76,7 +76,7 @@ make.centerY.mas_equalTo(self.bgImageView); }]; [self.bgImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.iconImageView).mas_offset(8); + make.trailing.mas_equalTo(self.iconImageView).mas_offset(8); }]; if (model.hasFansTeamCurrentRoom) {//已开通粉丝团 self.titleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorFansTeamEntranceView0"), model.anchorFansNum]; @@ -94,7 +94,7 @@ make.centerY.mas_equalTo(self.titleLabel); }]; [self.bgImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.iconImageView).mas_offset(8); + make.trailing.mas_equalTo(self.iconImageView).mas_offset(8); make.height.mas_equalTo(22); }]; } else { @@ -105,7 +105,7 @@ make.width.height.mas_equalTo(25); }]; [self.bgImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.iconImageView.mas_right).mas_offset(8); + make.trailing.mas_equalTo(self.iconImageView.mas_trailing).mas_offset(8); }]; } } else { @@ -114,7 +114,7 @@ make.width.height.mas_equalTo(0); }]; [self.bgImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.titleLabel).mas_offset(8); + make.trailing.mas_equalTo(self.titleLabel).mas_offset(8); }]; } } diff --git a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamViewController.m b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamViewController.m index 4e3d73cc..f40ff9c1 100644 --- a/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamViewController.m +++ b/YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamViewController.m @@ -134,12 +134,12 @@ - (void)initSubViewConstraints { [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.contentView.mas_top); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.height.mas_equalTo(416); }]; @@ -148,41 +148,41 @@ }]; [self.helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-10); + make.trailing.mas_equalTo(-10); make.top.mas_equalTo(10); make.width.height.mas_equalTo(30); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.width.height.mas_equalTo(64); make.top.mas_equalTo(36); }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(21); - make.left.mas_equalTo(self.avatarImageView.mas_right).mas_offset(8); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(8); make.top.mas_equalTo(self.avatarImageView).offset(6); - make.right.mas_equalTo(self.countContentView.mas_left).mas_offset(-4); + make.trailing.mas_equalTo(self.countContentView.mas_leading).mas_offset(-4); }]; [self.countContentView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.nameLabel); - make.right.mas_lessThanOrEqualTo(-26); + make.trailing.mas_lessThanOrEqualTo(-26); make.height.mas_equalTo(15); - make.left.mas_equalTo(self.nameLabel.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.nameLabel.mas_trailing).mas_offset(4); }]; [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.mas_equalTo(self.countContentView); - make.left.mas_equalTo(self.countContentView).mas_offset(5); - make.right.mas_equalTo(self.countContentView).mas_offset(-5); + make.leading.mas_equalTo(self.countContentView).mas_offset(5); + make.trailing.mas_equalTo(self.countContentView).mas_offset(-5); }]; [self.countLabel setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; [self.nameLabel setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).mas_offset(8); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(8); make.bottom.mas_equalTo(self.avatarImageView).mas_offset(-3); make.height.mas_equalTo(28); make.width.mas_equalTo(3 * (20 + 8) + 34); @@ -190,7 +190,7 @@ [self.rankImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.stackView); - make.left.mas_equalTo(9); + make.leading.mas_equalTo(9); make.width.mas_equalTo(16); make.height.mas_equalTo(18); }]; @@ -202,63 +202,63 @@ }]; [self.nameplateBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.privilegeTitleImageView.mas_bottom).offset(7); make.height.mas_equalTo(58); }]; [self.nameplateImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(10); + make.leading.mas_equalTo(10); make.centerY.mas_equalTo(self.nameplateBgView); make.width.height.mas_equalTo(38); }]; [self.nameplateLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nameplateImageView.mas_right).mas_offset(8); + make.leading.mas_equalTo(self.nameplateImageView.mas_trailing).mas_offset(8); make.top.mas_equalTo(self.nameplateImageView).mas_offset(1); make.height.mas_equalTo(21); }]; [self.nameplateDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.nameplateLabel.mas_bottom); - make.left.mas_equalTo(self.nameplateLabel); + make.leading.mas_equalTo(self.nameplateLabel); make.height.mas_equalTo(15); }]; [self.giftBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.nameplateBgView.mas_bottom).offset(12); make.height.mas_equalTo(58); }]; [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(10); + make.leading.mas_equalTo(10); make.centerY.mas_equalTo(self.giftBgView); make.width.height.mas_equalTo(38); }]; [self.giftLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.giftImageView.mas_right).mas_offset(8); + make.leading.mas_equalTo(self.giftImageView.mas_trailing).mas_offset(8); make.top.mas_equalTo(self.giftImageView).mas_offset(1); make.height.mas_equalTo(21); }]; [self.giftDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.giftLabel.mas_bottom); - make.left.mas_equalTo(self.giftLabel); + make.leading.mas_equalTo(self.giftLabel); make.height.mas_equalTo(15); }]; [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.joinButton); - make.left.mas_equalTo(self.joinButton).mas_offset(15); + make.leading.mas_equalTo(self.joinButton).mas_offset(15); make.width.height.mas_equalTo(75); }]; [self.joinButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.height.mas_equalTo(48); make.bottom.mas_equalTo(-kSafeAreaBottomHeight - 14); }]; [self.joinLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.iconImageView.mas_right); + make.leading.mas_equalTo(self.iconImageView.mas_trailing); make.centerY.mas_equalTo(self.joinButton); }]; } @@ -310,7 +310,7 @@ [imageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.stackView); make.width.height.mas_equalTo(20); - make.left.mas_equalTo(i * 27 + 25 + margin); + make.leading.mas_equalTo(i * 27 + 25 + margin); }]; } } diff --git a/YuMi/Modules/YMRoom/View/AnchorView/XPAnchorAudienceUpMicView.m b/YuMi/Modules/YMRoom/View/AnchorView/XPAnchorAudienceUpMicView.m index 046dccfb..abbf846d 100644 --- a/YuMi/Modules/YMRoom/View/AnchorView/XPAnchorAudienceUpMicView.m +++ b/YuMi/Modules/YMRoom/View/AnchorView/XPAnchorAudienceUpMicView.m @@ -78,18 +78,18 @@ make.centerX.mas_equalTo(self.mas_centerX); make.height.mas_equalTo(40); make.top.mas_equalTo(self.nickLabel.mas_bottom).mas_offset(6); - make.left.mas_equalTo(20); + make.leading.mas_equalTo(20); }]; [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.descripLabel.mas_bottom).offset(12); make.width.mas_equalTo(126); - make.right.mas_equalTo(self.mas_centerX).mas_offset(-8); + make.trailing.mas_equalTo(self.mas_centerX).mas_offset(-8); make.height.mas_equalTo(38); }]; [self.confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.cancelButton); make.width.mas_equalTo(126); - make.left.mas_equalTo(self.cancelButton.mas_right).mas_offset(16); + make.leading.mas_equalTo(self.cancelButton.mas_trailing).mas_offset(16); make.height.mas_equalTo(38); }]; } diff --git a/YuMi/Modules/YMRoom/View/AnchorView/XPRoomAnchorInfoCardView.m b/YuMi/Modules/YMRoom/View/AnchorView/XPRoomAnchorInfoCardView.m index 602e6a64..f6fc7ec2 100644 --- a/YuMi/Modules/YMRoom/View/AnchorView/XPRoomAnchorInfoCardView.m +++ b/YuMi/Modules/YMRoom/View/AnchorView/XPRoomAnchorInfoCardView.m @@ -57,7 +57,7 @@ - (void)initConstraint { CGFloat margin = 16; [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(margin); + make.leading.mas_equalTo(margin); make.top.mas_equalTo(margin); make.width.height.mas_equalTo(30); }]; @@ -69,7 +69,7 @@ [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avatarImageView.mas_bottom).mas_offset(10); make.centerX.mas_equalTo(self.mas_centerX); - make.left.mas_equalTo(margin); + make.leading.mas_equalTo(margin); }]; [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.nameLabel.mas_bottom).mas_offset(30); diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m index 0cbf11d9..4decb571 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m @@ -2342,7 +2342,7 @@ [self.lowLevelView addSubview:self.wishGiftEffectView]; [self.wishGiftEffectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(x); + make.leading.mas_equalTo(x); make.top.mas_equalTo(y); make.width.mas_equalTo(200); make.height.mas_equalTo(167); @@ -2351,7 +2351,7 @@ [self.wishGiftEffectView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(x); + make.leading.mas_equalTo(x); make.top.mas_equalTo(y); }]; NSString * anatomiser1Name = [NSString stringWithFormat:@"%@/room_wish_gift_sendCelebrate.svga", API_Image_URL]; diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomDatingAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomDatingAnimationView.m index 4724c405..8031b0a1 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomDatingAnimationView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomDatingAnimationView.m @@ -80,12 +80,12 @@ [self.cutTimeBackView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(70, 25)); - make.right.mas_equalTo(self).offset(-12); + make.trailing.mas_equalTo(self).offset(-12); make.top.mas_equalTo(self).offset(41 + kSafeAreaTopHeight); }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.cutTimeBackView).offset(13); + make.leading.mas_equalTo(self.cutTimeBackView).offset(13); make.centerY.mas_equalTo(self.cutTimeBackView); }]; @@ -97,7 +97,7 @@ [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(14, 14)); make.centerY.mas_equalTo(self.cutTimeBackView); - make.left.mas_equalTo(self.lineView.mas_right).offset(8); + make.leading.mas_equalTo(self.lineView.mas_trailing).offset(8); }]; } diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomEnterHideTipView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomEnterHideTipView.m index 0cf23363..e703f59a 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomEnterHideTipView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomEnterHideTipView.m @@ -51,12 +51,12 @@ make.height.mas_equalTo(48); }]; [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.bgView).mas_offset(12); + make.leading.mas_equalTo(self.bgView).mas_offset(12); make.centerY.mas_equalTo(self.bgView); make.width.height.mas_equalTo(32); }]; [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.iconImageView.mas_right).mas_offset(8); + make.leading.mas_equalTo(self.iconImageView.mas_trailing).mas_offset(8); make.centerY.mas_equalTo(self.bgView); }]; } diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftCompoundView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftCompoundView.m index 0bbb8d0f..a307f7e3 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftCompoundView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftCompoundView.m @@ -43,7 +43,7 @@ - (void)initSubViewConstraints { [self.compoundGiftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.height.mas_equalTo(45); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.m index 0b2b646d..d7d106f9 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.m @@ -53,14 +53,14 @@ - (void)initSubViewConstraints { [self.nobleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.height.mas_equalTo(90); }]; [self.pi_contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(33)); - make.left.mas_equalTo(kGetScaleWidth(40)); - make.right.mas_equalTo(-kGetScaleWidth(40)); + make.leading.mas_equalTo(kGetScaleWidth(40)); + make.trailing.mas_equalTo(-kGetScaleWidth(40)); }]; } diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomStarKitchenBannerView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomStarKitchenBannerView.m index 7228a0ec..90442da6 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomStarKitchenBannerView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomStarKitchenBannerView.m @@ -47,9 +47,9 @@ }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(21)); - make.left.mas_equalTo(kGetScaleWidth(85)); + make.leading.mas_equalTo(kGetScaleWidth(85)); make.bottom.equalTo(self.mas_bottom).mas_offset(-kGetScaleWidth(13.5)); - make.right.mas_equalTo(-kGetScaleWidth(53.5)); + make.trailing.mas_equalTo(-kGetScaleWidth(53.5)); }]; [self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.m index de611596..d01c3fdd 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.m @@ -69,33 +69,33 @@ make.edges.mas_equalTo(0); }]; [self.sendNick mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(35*KScreenWidth/375); + make.leading.mas_equalTo(35*KScreenWidth/375); make.centerY.mas_equalTo(self.bgImageView); }]; [self.sendAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.sendNick.mas_right).mas_offset(3); + make.leading.mas_equalTo(self.sendNick.mas_trailing).mas_offset(3); make.centerY.mas_equalTo(self); make.width.height.mas_equalTo(20); }]; [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.sendAvatar.mas_right).mas_offset(3); + make.leading.mas_equalTo(self.sendAvatar.mas_trailing).mas_offset(3); make.centerY.mas_equalTo(self); }]; [self.receiveNick mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.descLabel.mas_right).mas_offset(3); + make.leading.mas_equalTo(self.descLabel.mas_trailing).mas_offset(3); make.centerY.mas_equalTo(self); }]; [self.receiveAvatar mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.receiveNick.mas_right).mas_offset(3); + make.leading.mas_equalTo(self.receiveNick.mas_trailing).mas_offset(3); make.centerY.mas_equalTo(self); make.width.height.mas_equalTo(20); }]; [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.receiveAvatar.mas_right).mas_offset(3); + make.leading.mas_equalTo(self.receiveAvatar.mas_trailing).mas_offset(3); make.centerY.mas_equalTo(self); }]; [self.gotoButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-31*KScreenWidth / 375); + make.trailing.mas_equalTo(-31*KScreenWidth / 375); make.centerY.mas_equalTo(self); make.size.mas_equalTo(CGSizeMake(40, 18)); }]; diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPTreasureFairyGiftView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPTreasureFairyGiftView.m index 37f1291d..36f5466c 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPTreasureFairyGiftView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPTreasureFairyGiftView.m @@ -58,13 +58,13 @@ }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(20); + make.leading.trailing.mas_equalTo(self.backImageView).inset(20); make.height.mas_equalTo(28); make.top.mas_equalTo(self.backImageView).offset(23); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.titleView); + make.leading.trailing.mas_equalTo(self.titleView); make.centerY.mas_equalTo(self.titleView); }]; } diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicEmptyTableViewCell.m index 49f942e9..7660e554 100644 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicEmptyTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicEmptyTableViewCell.m @@ -44,7 +44,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.m b/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.m index 69ae391c..832351ac 100644 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.m @@ -51,31 +51,31 @@ - (void)initConstrations{ [self.rankLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.width.height.mas_equalTo(20); }]; [self.avaratImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.width.mas_equalTo(46); make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.rankLabel.mas_right).offset(13); + make.leading.mas_equalTo(self.rankLabel.mas_trailing).offset(13); }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avaratImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.avaratImageView.mas_trailing).offset(10); make.centerY.mas_equalTo(self.contentView); }]; [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(28, 14)); - make.left.mas_equalTo(self.nameLabel.mas_right).offset(2); + make.leading.mas_equalTo(self.nameLabel.mas_trailing).offset(2); make.centerY.mas_equalTo(self.nameLabel); }]; [self.arrangeMicButton mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(75); make.height.mas_equalTo(25); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.centerY.mas_equalTo(self.contentView); }]; } diff --git a/YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.m b/YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.m index 52bf284c..d092e3ec 100644 --- a/YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.m +++ b/YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.m @@ -175,33 +175,33 @@ - (void)initSubViewConstraints { [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.contentView.mas_top); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.height.mas_equalTo(450); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.contentView); + make.leading.trailing.top.mas_equalTo(self.contentView); make.height.mas_equalTo(44); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.titleLabel.mas_bottom); make.height.mas_equalTo(1); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.contentView); + make.leading.trailing.bottom.mas_equalTo(self.contentView); make.top.mas_equalTo(self.lineView.mas_bottom); }]; [self.applyStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(45); + make.leading.trailing.mas_equalTo(self.view).inset(45); make.height.mas_equalTo(38); make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 20); }]; diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.m index 6e2fff18..8f265225 100644 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryEmptyTableViewCell.m @@ -45,7 +45,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; [self.addButton mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryTableViewCell.m b/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryTableViewCell.m index 165abef7..97a8b878 100644 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryTableViewCell.m @@ -50,18 +50,18 @@ }]; [self.musicAlbumImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backView).offset(15); + make.leading.mas_equalTo(self.backView).offset(15); make.centerY.mas_equalTo(self.backView); make.size.mas_equalTo(CGSizeMake(45, 45)); }]; [self.songNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.musicAlbumImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.musicAlbumImageView.mas_trailing).offset(10); make.bottom.mas_equalTo(self.musicAlbumImageView.mas_centerY).offset(-3); }]; [self.authorLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.songNameLabel); + make.leading.mas_equalTo(self.songNameLabel); make.top.mas_equalTo(self.musicAlbumImageView.mas_centerY).offset(3); }]; } diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPMusicLibraryPlayView.m b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPMusicLibraryPlayView.m index 1c2d67ce..9c35d9b4 100644 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPMusicLibraryPlayView.m +++ b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPMusicLibraryPlayView.m @@ -46,18 +46,18 @@ [self.playButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(44, 44)); make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self).offset(15); + make.leading.mas_equalTo(self).offset(15); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.playButton.mas_right).offset(5); + make.leading.mas_equalTo(self.playButton.mas_trailing).offset(5); make.centerY.mas_equalTo(self.playButton); }]; [self.settingButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(22, 22)); make.centerY.mas_equalTo(self); - make.right.mas_equalTo(self).offset(-15); + make.trailing.mas_equalTo(self).offset(-15); }]; } #pragma mark - Event Response diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m index 928411cb..868f1004 100644 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m +++ b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m @@ -91,41 +91,41 @@ UIKIT_EXTERN NSString * kRoomBackMusicPlayMusicOrderKey; - (void)initSubViewConstraints { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(30); + make.leading.trailing.mas_equalTo(self).inset(30); make.top.mas_equalTo(self).offset(17); }]; [self.voiceImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(12, 15)); - make.left.mas_equalTo(self.titleLabel); + make.leading.mas_equalTo(self.titleLabel); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(18); }]; [self.voiceSliderView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.voiceImageView.mas_right).offset(5); - make.right.mas_equalTo(self.playButton.mas_left).offset(-10); + make.leading.mas_equalTo(self.voiceImageView.mas_trailing).offset(5); + make.trailing.mas_equalTo(self.playButton.mas_leading).offset(-10); make.centerY.mas_equalTo(self.voiceImageView); }]; [self.playButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(22, 22)); make.centerY.mas_equalTo(self.voiceImageView); - make.right.mas_equalTo(self.nextButton.mas_left).offset(-15); + make.trailing.mas_equalTo(self.nextButton.mas_leading).offset(-15); }]; [self.nextButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.playButton); - make.right.mas_equalTo(self.playOrderButton.mas_left).offset(-15); + make.trailing.mas_equalTo(self.playOrderButton.mas_leading).offset(-15); }]; [self.playOrderButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.playButton);; - make.right.mas_equalTo(self.moreButton.mas_left).offset(-15); + make.trailing.mas_equalTo(self.moreButton.mas_leading).offset(-15); }]; [self.moreButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.playButton); - make.right.mas_equalTo(self).offset(-30); + make.trailing.mas_equalTo(self).offset(-30); }]; } diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.m b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.m index 0c68e03c..8bee0951 100644 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.m +++ b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.m @@ -67,7 +67,7 @@ }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(15); + make.leading.trailing.mas_equalTo(self).inset(15); make.top.bottom.mas_equalTo(self); }]; diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.m b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.m index e05a9797..5fc1b8dc 100644 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.m +++ b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomMusicLibraryViewController.m @@ -88,18 +88,18 @@ UIKIT_EXTERN NSString * kRoomBackMusicCaptureVolumeKey; - (void)initSubViewConstraints { [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.right.mas_equalTo(self.view); + make.leading.top.trailing.mas_equalTo(self.view); make.bottom.mas_equalTo(self.playView.mas_top); }]; [self.playView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(55); - make.bottom.left.right.mas_equalTo(self.view); + make.bottom.leading.trailing.mas_equalTo(self.view); }]; [self.voiceSettingView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.playView.mas_top); - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); }]; } #pragma mark - UITableViewDelegate And UITableViewDataSource @@ -161,7 +161,7 @@ UIKIT_EXTERN NSString * kRoomBackMusicCaptureVolumeKey; if (!self.numberMusicLabel.superview) { [self.headerView addSubview:self.numberMusicLabel]; [self.numberMusicLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.headerView).offset(15); + make.leading.mas_equalTo(self.headerView).offset(15); make.centerY.mas_equalTo(self.headerView); }]; } diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m index 568911a3..b5d0283f 100644 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m +++ b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m @@ -80,7 +80,7 @@ - (void)initSubViewConstraints { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.view).offset(15); }]; @@ -90,7 +90,7 @@ }]; [self.wifiImaegView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.wifiLabel.mas_left).offset(-5); + make.trailing.mas_equalTo(self.wifiLabel.mas_leading).offset(-5); make.centerY.mas_equalTo(self.wifiView); make.width.mas_equalTo(22); make.height.mas_equalTo(22); diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m index 36dbcbe4..8a61b19e 100644 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m +++ b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m @@ -52,7 +52,7 @@ - (void)initSubViewConstraints { [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.left.right.mas_equalTo(0); + make.top.bottom.leading.trailing.mas_equalTo(0); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); @@ -62,7 +62,7 @@ [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(22); make.centerY.mas_equalTo(self); - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); }]; } diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.m index 56cbf989..480d1005 100644 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.m +++ b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.m @@ -45,13 +45,13 @@ }]; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.right.mas_equalTo(self); + make.leading.top.trailing.mas_equalTo(self); make.height.mas_equalTo(325); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(44); - make.left.mas_equalTo(16); + make.leading.mas_equalTo(16); make.centerX.mas_equalTo(self.backImageView); make.height.mas_equalTo(271); }]; diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingWebAlertView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingWebAlertView.m index 9a9280a6..0ea9a18e 100644 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingWebAlertView.m +++ b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingWebAlertView.m @@ -54,12 +54,12 @@ static CGFloat const kContentAspectRatio = 2/3.f; }]; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.height.mas_equalTo(height); }]; [self.webVC.view mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(30); + make.leading.trailing.mas_equalTo(self.backImageView).inset(30); make.bottom.mas_equalTo(self.backImageView).offset(-20); make.top.mas_equalTo(self.backImageView).offset(45); }]; diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m index 39436ae4..ee841535 100644 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m +++ b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m @@ -259,7 +259,7 @@ - (void)initSubViewConstraints { [self.contributeEnterView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(12); + make.trailing.mas_equalTo(12); make.top.mas_equalTo(kNavigationHeight+4); make.width.mas_equalTo(99); make.height.mas_equalTo(24); @@ -277,7 +277,7 @@ if (!self.littleGameMiniView.superview) { [self addSubview:self.littleGameMiniView]; [self.littleGameMiniView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); make.top.mas_equalTo(kNavigationHeight); make.height.mas_equalTo(23); }]; @@ -305,7 +305,7 @@ if (!self.gameListView.superview) { [self addSubview:self.gameListView]; [self.gameListView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self).offset(-85); + make.trailing.mas_equalTo(self).offset(-85); make.top.mas_equalTo(self).offset(kNavigationHeight - 14 - 11 - 19.0 / 2.0); }]; } @@ -437,7 +437,7 @@ if (!self.roompkPanelView.superview) { [self addSubview:self.roompkPanelView]; [self.roompkPanelView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(15); + make.leading.mas_equalTo(self).offset(15); make.top.mas_equalTo(self).offset(35 + (58 + 5 + 6 + 12) + 38 + (55 + 10 + 12 + 5+16) * 2 + 15 * 2 + kNavigationHeight + 5); }]; } @@ -474,7 +474,7 @@ self.anchorPKMatchView.roomUid = [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].uid]; [self.anchorPKMatchView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.contributeEnterView.mas_bottom).mas_offset(5+37+5); - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.width.height.mas_equalTo(52); }]; NSDictionary *dict = noti.object; @@ -499,14 +499,14 @@ -(void)updateRankViewConstraintsWityType:(RoomType)type{ if(type == RoomType_MiniGame){ [self.contributeEnterView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(-12); + make.leading.mas_equalTo(-12); make.top.mas_equalTo(kNavigationHeight+4); make.width.mas_equalTo(99); make.height.mas_equalTo(24); }]; }else{ [self.contributeEnterView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(12); + make.trailing.mas_equalTo(12); make.top.mas_equalTo(kNavigationHeight+4); make.width.mas_equalTo(99); make.height.mas_equalTo(24); @@ -1437,7 +1437,7 @@ [self insertSubview:self.fansTeamEntranceView atIndex:0]; [self.fansTeamEntranceView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.contributeEnterView.mas_bottom).mas_offset(5); - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.height.mas_equalTo(37); }]; } @@ -1520,8 +1520,8 @@ [self addSubview:self.trumpetView]; [self.trumpetView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.delegate.getRoomInfo.type == RoomType_MiniGame ? kNavigationHeight: kNavigationHeight + 110); - make.left.mas_equalTo(0); - make.right.mas_equalTo(0); + make.leading.mas_equalTo(0); + make.trailing.mas_equalTo(0); make.height.mas_equalTo(153); }]; } @@ -1595,7 +1595,7 @@ if (!self.hourRankEntranceView.superview) { [self insertSubview:self.hourRankEntranceView atIndex:0]; [self.hourRankEntranceView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.centerY.mas_equalTo(self.contributeEnterView); make.width.mas_equalTo(66); make.height.mas_equalTo(22); @@ -1703,14 +1703,14 @@ -(void)setViewConstraints{ if (self.hourRankEntranceView.superview) { [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.hourRankEntranceView.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.hourRankEntranceView.mas_trailing).mas_offset(4); make.centerY.mas_equalTo(self.contributeEnterView); make.width.mas_equalTo(22); make.height.mas_equalTo(22); }]; } else { [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); + make.leading.mas_equalTo(16); make.centerY.mas_equalTo(self.contributeEnterView); make.width.mas_equalTo(22); make.height.mas_equalTo(22); @@ -1740,7 +1740,7 @@ self.acrossPKCountView.backImageView.image = [UIImage imageNamed:@"acrossPK_countDown_left_bg"]; [self.acrossPKCountView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kNavigationHeight+4+24+4); - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.width.height.mas_equalTo(52); }]; } @@ -1774,7 +1774,7 @@ [self addSubview:self.wishGiftView]; [self.wishGiftView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self).offset(kNavigationHeight + 47); - make.right.mas_equalTo(self.mas_right).offset(0); + make.trailing.mas_equalTo(self.mas_trailing).offset(0); make.size.mas_equalTo(CGSizeMake(81, 30)); }]; } @@ -1821,7 +1821,7 @@ self.anchorPKMatchView.roomUid = [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].uid]; [self.anchorPKMatchView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.contributeEnterView.mas_bottom).mas_offset(5+37+5); - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.width.height.mas_equalTo(52); }]; [self.anchorPKMatchView openCountdownWithTime:self.delegate.getRoomInfo.pkMatchStartTime]; diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.m index 2a15f081..e8145e33 100644 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.m +++ b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.m @@ -52,7 +52,7 @@ [imageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.rankContentView); make.width.height.mas_equalTo(20); - make.left.mas_equalTo(i*8); + make.leading.mas_equalTo(i*8); }]; } } @@ -64,7 +64,7 @@ [imageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.rankContentView); make.width.height.mas_equalTo(20); - make.left.mas_equalTo(i*8+10); + make.leading.mas_equalTo(i*8+10); }]; } @@ -76,7 +76,7 @@ [self.iconImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(9); make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self.titleLabel.mas_right).mas_offset(2); + make.leading.mas_equalTo(self.titleLabel.mas_trailing).mas_offset(2); }]; return; } @@ -85,7 +85,7 @@ [imageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.rankContentView); make.width.height.mas_equalTo(20); - make.left.mas_equalTo(i*8); + make.leading.mas_equalTo(i*8); }]; } [self.titleLabel mas_remakeConstraints:^(MASConstraintMaker *make) { @@ -96,19 +96,19 @@ [self.iconImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(9); make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self.titleLabel.mas_right).mas_offset(2); + make.leading.mas_equalTo(self.titleLabel.mas_trailing).mas_offset(2); }]; } - (void)initSubViewConstraints { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.right.left.mas_equalTo(0); + make.top.bottom.trailing.leading.mas_equalTo(0); }]; [self.rankContentView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); make.width.mas_equalTo(36); make.height.mas_equalTo(20); - make.left.mas_equalTo(4); + make.leading.mas_equalTo(4); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); @@ -118,7 +118,7 @@ [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(9); make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self.titleLabel.mas_right).mas_offset(2); + make.leading.mas_equalTo(self.titleLabel.mas_trailing).mas_offset(2); }]; } diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeInsufficientBalanceView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeInsufficientBalanceView.m index b44b6777..da9b2c77 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeInsufficientBalanceView.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeInsufficientBalanceView.m @@ -63,7 +63,7 @@ [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(108)); - make.left.right.equalTo(self.bgView).inset(kGetScaleWidth(10)); + make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(10)); }]; [self.payBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(152)); diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m b/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m index c15f3883..5c9921c8 100644 --- a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m +++ b/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m @@ -61,17 +61,17 @@ [self.nobleTypeImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(12 * 1.4); make.height.mas_equalTo(10 * 1.4); - make.left.top.mas_equalTo(self.contentView); + make.leading.top.mas_equalTo(self.contentView); }]; [self.faceTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); make.top.mas_equalTo(self.faceImageView.mas_bottom).offset(4); }]; [self.nobleLockImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(11, 11)); - make.bottom.right.mas_equalTo(self.faceImageView); + make.bottom.trailing.mas_equalTo(self.faceImageView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m b/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m index d930ba5f..d474764d 100644 --- a/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m +++ b/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m @@ -110,18 +110,18 @@ - (void)initSubViewConstraints { [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.contentView.mas_bottom); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.left.mas_equalTo(self.view); + make.trailing.leading.mas_equalTo(self.view); make.bottom.mas_equalTo(self.view); make.height.mas_equalTo(self.stackView).offset(42 + kSafeAreaBottomHeight); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.contentView); }]; diff --git a/YuMi/Modules/YMRoom/View/FirstRecharge/View/Cell/XPFirstRechargeCollectionViewCell.m b/YuMi/Modules/YMRoom/View/FirstRecharge/View/Cell/XPFirstRechargeCollectionViewCell.m index a5a14a0d..02efbe39 100644 --- a/YuMi/Modules/YMRoom/View/FirstRecharge/View/Cell/XPFirstRechargeCollectionViewCell.m +++ b/YuMi/Modules/YMRoom/View/FirstRecharge/View/Cell/XPFirstRechargeCollectionViewCell.m @@ -53,11 +53,11 @@ make.centerX.mas_equalTo(self); make.height.mas_equalTo(10); make.bottom.mas_equalTo(0); - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); }]; [self.timeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.mas_equalTo(self.iconImageView); + make.top.trailing.mas_equalTo(self.iconImageView); make.height.mas_equalTo(12); make.width.mas_equalTo(30); }]; diff --git a/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeCollectionView.m b/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeCollectionView.m index d61110f3..cbe655f2 100644 --- a/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeCollectionView.m +++ b/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeCollectionView.m @@ -62,13 +62,13 @@ CGFloat top = self.isFirst == YES ? kGetScaleWidth(8):kGetScaleWidth(4); [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(titleWidth); - make.left.right.equalTo(self); + make.leading.trailing.equalTo(self); make.top.equalTo(self.bgImageView.mas_bottom).mas_offset(top); }]; CGSize size = self.isFirst == YES ? CGSizeMake(kGetScaleWidth(40), kGetScaleWidth(12)):CGSizeMake(kGetScaleWidth(29), kGetScaleWidth(11)); CGFloat timeTop = _isFirst == YES ? kGetScaleWidth(3) :kGetScaleWidth(2); [self.timeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.mas_equalTo(self.bgImageView).mas_offset(timeTop); + make.top.leading.mas_equalTo(self.bgImageView).mas_offset(timeTop); make.size.mas_equalTo(size); }]; diff --git a/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeSuccessView.m b/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeSuccessView.m index dc0b4330..e7258405 100644 --- a/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeSuccessView.m +++ b/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeSuccessView.m @@ -78,12 +78,12 @@ }]; [self.descriptionLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.top.mas_equalTo(self.collectionView.mas_bottom).offset(21); }]; [self.rewardBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(20); + make.leading.trailing.mas_equalTo(self.backImageView).inset(20); make.top.mas_equalTo(self.backImageView).offset(70); make.height.mas_equalTo(235); }]; @@ -96,7 +96,7 @@ [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.extraButton.mas_bottom); - make.left.right.mas_equalTo(self.rewardBackView); + make.leading.trailing.mas_equalTo(self.rewardBackView); make.bottom.mas_equalTo(self.rewardBackView); }]; } diff --git a/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeView.m b/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeView.m index cc132cb8..c89be12e 100644 --- a/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeView.m +++ b/YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeView.m @@ -149,23 +149,23 @@ make.width.mas_equalTo(kGetScaleWidth(306)); }]; [self.rewardHelpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-kGetScaleWidth(11)); + make.trailing.mas_equalTo(-kGetScaleWidth(11)); make.top.mas_equalTo(kGetScaleWidth(121)); make.width.height.mas_equalTo(kGetScaleWidth(20)); }]; [self.segmentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.rewardHelpButton.mas_bottom).mas_offset(kGetScaleWidth(12)); make.height.mas_equalTo(kGetScaleWidth(30)); - make.right.mas_equalTo(-kGetScaleWidth(15)); - make.left.mas_equalTo(kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); }]; [self.rewardBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.segmentView); + make.leading.trailing.equalTo(self.segmentView); make.top.mas_equalTo(self.segmentView.mas_bottom).offset(kGetScaleWidth(12)); make.height.mas_equalTo(kGetScaleWidth(230)); }]; [self.typeArrowView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(15)); + make.leading.mas_equalTo(kGetScaleWidth(15)); make.width.mas_equalTo(kGetScaleWidth(13)); make.height.mas_equalTo(kGetScaleWidth(7)); make.bottom.equalTo(self.rewardBackView.mas_top); @@ -184,7 +184,7 @@ [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.extraButton.mas_bottom); - make.left.right.mas_equalTo(self.rewardBackView); + make.leading.trailing.mas_equalTo(self.rewardBackView); make.bottom.mas_equalTo(self.rewardBackView); }]; [self.rechargeView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -194,14 +194,14 @@ }]; [self.descripBgView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.rewardHelpButton.mas_bottom).mas_offset(-2); - make.right.equalTo(self.backImageView.mas_right).mas_offset(4); + make.trailing.equalTo(self.backImageView.mas_trailing).mas_offset(4); make.width.mas_equalTo(152); make.height.mas_equalTo(81); }]; [self.descripTextView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.descripBgView).offset(10); - make.right.mas_equalTo(self.descripBgView).inset(5); - make.left.mas_equalTo(self.descripBgView).inset(10); + make.trailing.mas_equalTo(self.descripBgView).inset(5); + make.leading.mas_equalTo(self.descripBgView).inset(10); make.bottom.mas_equalTo(self.descripBgView).mas_offset(-10); }]; } @@ -261,7 +261,7 @@ [self.segmentView layoutIfNeeded]; CGFloat x = kGetScaleWidth(15) + self.segmentView.arrangedSubviews.firstObject.frame.origin.x + self.segmentView.arrangedSubviews.firstObject.frame.size.width / 2 - kGetScaleWidth(7)/2; [self.typeArrowView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(x); + make.leading.mas_equalTo(x); }]; self.collectionView.hidden = self.rewardArray.count < 2; self.rechargeView.hidden = self.rewardArray.count != 1; @@ -526,7 +526,7 @@ } CGFloat x = kGetScaleWidth(15) + sender.frame.origin.x + sender.frame.size.width / 2 - kGetScaleWidth(7)/2; [self.typeArrowView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(x); + make.leading.mas_equalTo(x); }]; [[self.segmentView arrangedSubviews] enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { UIButton * button = obj; diff --git a/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.m b/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.m index 0b39308a..6092b4f2 100644 --- a/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.m +++ b/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.m @@ -45,18 +45,18 @@ - (void)initSubViewConstraints { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(kGetScaleWidth(349)); - make.left.right.equalTo(self); + make.leading.trailing.equalTo(self); make.bottom.equalTo(self); }]; [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(26)); make.top.mas_equalTo(kGetScaleWidth(10)); - make.right.mas_equalTo(-kGetScaleWidth(15)); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(41)); make.height.mas_equalTo(kGetScaleWidth(21)); - make.left.right.equalTo(self.bgView).inset(kGetScaleWidth(0)); + make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(0)); }]; [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(78)); @@ -66,7 +66,7 @@ }]; [self.instructionsView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(206)); - make.left.right.equalTo(self.bgView).inset(kGetScaleWidth(23)); + make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(23)); }]; [self.knowBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.instructionsView.mas_bottom).mas_offset(kGetScaleWidth(14)); diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPLittleGameTableViewCell.m b/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPLittleGameTableViewCell.m index 623d86d8..162e5d61 100644 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPLittleGameTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/LittleGame/View/Cell/XPLittleGameTableViewCell.m @@ -39,11 +39,11 @@ - (void)initConstraints { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); - make.left.mas_equalTo(8); + make.leading.mas_equalTo(8); }]; [self.devideView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(8); + make.leading.trailing.mas_equalTo(self).inset(8); make.top.mas_equalTo(0); make.height.mas_equalTo(1); }]; diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameMiniStageView.m b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameMiniStageView.m index 1602a8e8..530d0385 100644 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameMiniStageView.m +++ b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameMiniStageView.m @@ -62,11 +62,11 @@ UIKIT_EXTERN NSString * const kRoomRoomLittleGameMiniStageNotificationKey; - (void)initSubViewConstraints { [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.stackView).offset(6); + make.trailing.mas_equalTo(self.stackView).offset(6); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(6); + make.leading.mas_equalTo(self).offset(6); make.top.bottom.mas_equalTo(self); }]; diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomListView.m b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomListView.m index e095fb6e..1d754a4a 100644 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomListView.m +++ b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomListView.m @@ -61,7 +61,7 @@ }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); }]; [self.gamePlayButton mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.m b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.m index 4be0b072..f0d499eb 100644 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.m +++ b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.m @@ -101,33 +101,33 @@ }]; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.bottom.mas_equalTo(0); + make.trailing.bottom.mas_equalTo(0); make.size.mas_equalTo(CGSizeMake(141, 123)); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.mas_equalTo(16); + make.top.leading.mas_equalTo(16); make.height.mas_equalTo(22); }]; [self.playModeLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(24); - make.left.mas_equalTo(self.titleLabel); + make.leading.mas_equalTo(self.titleLabel); make.height.mas_equalTo(17); }]; [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(16); - make.right.mas_equalTo(-11); + make.trailing.mas_equalTo(-11); make.width.height.mas_equalTo(22); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.playModeLabel.mas_bottom).mas_offset(3); - make.left.mas_equalTo(16); - make.right.mas_equalTo(self).offset(-16); + make.leading.mas_equalTo(16); + make.trailing.mas_equalTo(self).offset(-16); }]; [self.createRoomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(68); + make.leading.trailing.mas_equalTo(self).inset(68); make.height.mas_equalTo(40); make.top.mas_equalTo(self.stackView.mas_bottom).mas_offset(51); }]; diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m index a16b7d4f..9d3b9483 100644 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m +++ b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m @@ -238,8 +238,8 @@ - (void)initSubViewConstraints { [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(15); - make.right.mas_equalTo(self.giftButton.mas_left).offset(-10); + make.leading.mas_equalTo(self).offset(15); + make.trailing.mas_equalTo(self.giftButton.mas_leading).offset(-10); make.top.mas_equalTo(self).offset(8); make.bottom.mas_equalTo(self).offset(-12 - kSafeAreaBottomHeight); }]; @@ -254,7 +254,7 @@ [self.giftButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.scrollView); - make.right.mas_equalTo(self).offset(-20); + make.trailing.mas_equalTo(self).offset(-20); make.size.mas_equalTo(CGSizeMake(35, 35)); }]; diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m index 1cf0b323..43ef9f2e 100644 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m +++ b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m @@ -131,7 +131,7 @@ [UIView animateWithDuration:duration animations:^{ if(self.superview){ [self mas_remakeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.superview); + make.leading.trailing.equalTo(self.superview); make.height.equalTo(@40); make.bottom.equalTo(self.superview).offset(-h); }]; @@ -148,7 +148,7 @@ CGFloat duration = [[info objectForKey:UIKeyboardAnimationDurationUserInfoKey] floatValue]; [UIView animateWithDuration:duration animations:^{ [self mas_remakeConstraints:^(MASConstraintMaker *make) { - make.bottom.left.right.equalTo(self.superview); + make.bottom.leading.trailing.equalTo(self.superview); make.height.equalTo(@40); }]; self.hidden = YES; @@ -214,7 +214,7 @@ [textView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(view); + make.leading.trailing.bottom.mas_equalTo(view); make.height.mas_equalTo(40); }]; [textView.editTextFiled becomeFirstResponder]; @@ -238,8 +238,8 @@ - (void)initSubViewConstraints { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(8); - make.right.mas_equalTo(self).offset(-5); + make.leading.mas_equalTo(self).offset(8); + make.trailing.mas_equalTo(self).offset(-5); make.top.bottom.mas_equalTo(self); }]; diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m index 93eeedff..c753b14a 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m @@ -1321,8 +1321,8 @@ label.text = tagName; [imageView addSubview:label]; [label mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(27); - make.right.mas_equalTo(-8); + make.leading.mas_equalTo(27); + make.trailing.mas_equalTo(-8); make.centerY.mas_equalTo(0); }]; NSMutableAttributedString *string = [NSMutableAttributedString yy_attachmentStringWithContent:imageView contentMode:UIViewContentModeScaleAspectFit attachmentSize:imageView.bounds.size alignToFont:[UIFont boldSystemFontOfSize:12] alignment:YYTextVerticalAlignmentCenter]; diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.m index 26c6f021..b35685ed 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumCell.m @@ -83,7 +83,7 @@ } -(void)installConstraints{ [self.bubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.mas_equalTo(self.contentView); + make.leading.top.mas_equalTo(self.contentView); make.bottom.mas_equalTo(self.contentView).offset(-6); make.width.mas_equalTo(162); make.height.mas_equalTo(180); @@ -92,27 +92,27 @@ make.width.mas_equalTo(36); make.height.mas_equalTo(18); make.top.mas_equalTo(6); - make.left.mas_equalTo(self.bubbleImageView).offset(12); + make.leading.mas_equalTo(self.bubbleImageView).offset(12); }]; [self.charmView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(36); make.height.mas_equalTo(18); make.top.mas_equalTo(6); - make.left.mas_equalTo(self.bubbleImageView).offset(49); + make.leading.mas_equalTo(self.bubbleImageView).offset(49); }]; [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.bubbleImageView).offset(89); - make.right.mas_equalTo(self.bubbleImageView.mas_right).offset(-12); + make.leading.mas_equalTo(self.bubbleImageView).offset(89); + make.trailing.mas_equalTo(self.bubbleImageView.mas_trailing).offset(-12); make.height.mas_equalTo(17); make.centerY.equalTo(self.wealthView); }]; [self.loopUserCardBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.bottom.equalTo(self.charmView); - make.right.equalTo(self.nameView.mas_right); + make.leading.top.bottom.equalTo(self.charmView); + make.trailing.equalTo(self.nameView.mas_trailing); }]; [self.unlockPhotoView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.nameView.mas_bottom).mas_offset(5); - make.left.equalTo(self.bubbleImageView).inset(12); + make.leading.equalTo(self.bubbleImageView).inset(12); make.width.mas_equalTo(138); make.height.mas_equalTo(140); }]; diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumView.m index ea6f73d5..7e5f1a54 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumView.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/View/PIRoomMessagePhotoAlbumView.m @@ -67,7 +67,7 @@ }]; [self.diamondView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(14); - make.left.mas_equalTo(28); + make.leading.mas_equalTo(28); make.centerY.equalTo(self.pi_maskView); }]; [self.unlockView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.m index 884e6849..c65d5d51 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.m @@ -48,12 +48,12 @@ }]; [self.bubbleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.right.mas_equalTo(self); + make.leading.top.trailing.mas_equalTo(self); make.bottom.mas_equalTo(self).offset(-10); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(10); + make.leading.trailing.mas_equalTo(self).inset(10); make.centerY.mas_equalTo(self.bubbleView); }]; } diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m index e8548a9f..05744fca 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m @@ -51,13 +51,13 @@ - (void)initSubViewConstraints { [self.bubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.mas_equalTo(self.contentView); + make.leading.top.mas_equalTo(self.contentView); make.bottom.mas_equalTo(self.contentView).offset(-6); - make.right.mas_equalTo(self.contentLabel).offset(12); + make.trailing.mas_equalTo(self.contentLabel).offset(12); }]; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.bubbleImageView).offset(12); + make.leading.mas_equalTo(self.bubbleImageView).offset(12); make.bottom.mas_equalTo(self.bubbleImageView).offset(-10); make.top.mas_equalTo(self.bubbleImageView).mas_offset(10); }]; @@ -103,7 +103,7 @@ _bubbleImageView.image = [UIImage imageWithColor:[DJDKMIMOMColor messageBubbleColor]]; } [self.contentLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.bubbleImageView).offset(_messageInfo.contentLeftMargin); + make.leading.mas_equalTo(self.bubbleImageView).offset(_messageInfo.contentLeftMargin); make.top.mas_equalTo(self.bubbleImageView).offset(_messageInfo.contentTopMargin); make.bottom.mas_equalTo(self.bubbleImageView).offset(-_messageInfo.contentBottomMargin); }]; diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m index bd0d2a94..e246aad7 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m @@ -254,8 +254,8 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey"; - (void)initSubViewConstraints { [self.messageTableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(15); - make.bottom.right.mas_equalTo(self); + make.leading.mas_equalTo(self).offset(15); + make.bottom.trailing.mas_equalTo(self); make.top.mas_equalTo(self); }]; @@ -263,13 +263,13 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey"; make.width.mas_equalTo(100); make.height.mas_equalTo(30); make.bottom.mas_equalTo(self.mas_bottom).offset(-5); - make.left.mas_equalTo(self); + make.leading.mas_equalTo(self); }]; [self.atTipBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(100); make.height.mas_equalTo(30); make.bottom.mas_equalTo(self.mas_bottom).offset(-5); - make.left.mas_equalTo(self); + make.leading.mas_equalTo(self); }]; } diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.m b/YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.m index 72a43915..089734a8 100644 --- a/YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.m +++ b/YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.m @@ -44,7 +44,7 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(4); }]; } diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomInviteFansView.m b/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomInviteFansView.m index 343f096a..b92bfc85 100644 --- a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomInviteFansView.m +++ b/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomInviteFansView.m @@ -44,16 +44,16 @@ - (void)initSubViewConstraints { [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.titleLabel.mas_right); + make.trailing.mas_equalTo(self.titleLabel.mas_trailing); }]; [self.circleView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(4, 4)); - make.centerY.left.mas_equalTo(self); + make.centerY.leading.mas_equalTo(self); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.circleView.mas_right).offset(8); + make.leading.mas_equalTo(self.circleView.mas_trailing).offset(8); make.centerY.mas_equalTo(self); }]; } @@ -136,22 +136,22 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(20); - make.right.left.mas_equalTo(self); + make.trailing.leading.mas_equalTo(self); }]; [self.firstView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(16); - make.left.mas_equalTo(self).offset(30); + make.leading.mas_equalTo(self).offset(30); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(23); }]; [self.secondView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.left.mas_equalTo(self.firstView); + make.height.leading.mas_equalTo(self.firstView); make.top.mas_equalTo(self.firstView.mas_bottom).offset(15); }]; [self.thirdView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.left.mas_equalTo(self.firstView); + make.height.leading.mas_equalTo(self.firstView); make.top.mas_equalTo(self.secondView.mas_bottom).offset(15); }]; @@ -162,7 +162,7 @@ }]; [self.residueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.left.mas_equalTo(self); + make.trailing.leading.mas_equalTo(self); make.top.mas_equalTo(self.inviteButton.mas_bottom).offset(16); }]; } diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m b/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m index 5f4faea0..604ea113 100644 --- a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m +++ b/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m @@ -104,23 +104,23 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey; - (void)initSubViewConstraints { [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.collectionView.mas_top); }]; [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.top.mas_equalTo(self.collectionView); make.bottom.mas_equalTo(self.bottomView); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.height.mas_equalTo(0); make.bottom.mas_equalTo(self.bottomView.mas_top); }]; [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.height.mas_equalTo(kSafeAreaBottomHeight); }]; } diff --git a/YuMi/Modules/YMRoom/View/NewUserGift/XPNewUserRoomGiftView.m b/YuMi/Modules/YMRoom/View/NewUserGift/XPNewUserRoomGiftView.m index 233e7f6b..7841a18c 100644 --- a/YuMi/Modules/YMRoom/View/NewUserGift/XPNewUserRoomGiftView.m +++ b/YuMi/Modules/YMRoom/View/NewUserGift/XPNewUserRoomGiftView.m @@ -59,12 +59,12 @@ make.height.mas_equalTo(376); }]; [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.mas_equalTo(0); + make.top.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(320); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(130); - make.left.right.mas_equalTo(self).inset(15); + make.leading.trailing.mas_equalTo(self).inset(15); make.height.mas_equalTo(17); }]; @@ -77,7 +77,7 @@ [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.iconImageView.mas_bottom).mas_offset(19); make.height.mas_equalTo(17); - make.left.right.mas_equalTo(self).inset(15); + make.leading.trailing.mas_equalTo(self).inset(15); }]; [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(32, 32)); diff --git a/YuMi/Modules/YMRoom/View/NewUserGreet/XPRoomNewUserGreetView.m b/YuMi/Modules/YMRoom/View/NewUserGreet/XPRoomNewUserGreetView.m index db48b425..d7efca2b 100644 --- a/YuMi/Modules/YMRoom/View/NewUserGreet/XPRoomNewUserGreetView.m +++ b/YuMi/Modules/YMRoom/View/NewUserGreet/XPRoomNewUserGreetView.m @@ -58,11 +58,11 @@ [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.centerY.mas_equalTo(self.backImageView); make.height.mas_equalTo(55); - make.left.mas_equalTo(self.titleLabel.mas_left).offset(-12); + make.leading.mas_equalTo(self.titleLabel.mas_leading).offset(-12); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.contentView); + make.trailing.mas_equalTo(self.contentView); make.bottom.mas_equalTo(self.contentView.mas_centerY).offset(-3); }]; @@ -74,7 +74,7 @@ [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(22, 22)); - make.top.right.mas_equalTo(self.backImageView); + make.top.trailing.mas_equalTo(self.backImageView); }]; } @@ -129,13 +129,13 @@ [self.contentView sendSubviewToBack:avatarImageView]; [avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(44, 44)); - make.right.mas_equalTo(self.titleLabel.mas_left).offset(-12 - 44 * i + 12 * i); + make.trailing.mas_equalTo(self.titleLabel.mas_leading).offset(-12 - 44 * i + 12 * i); make.centerY.mas_equalTo(self.contentView); }]; if (i == (sayHelloUserAvatarList.count -1)) { [self.contentView mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel.mas_left).offset(-12 - 44 * (i + 1) + 12 * (i + 1)); + make.leading.mas_equalTo(self.titleLabel.mas_leading).offset(-12 - 44 * (i + 1) + 12 * (i + 1)); }]; } } diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.m b/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.m index 2b1ca1bd..555b71dd 100644 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.m +++ b/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.m @@ -56,8 +56,8 @@ - (void)initContraints { [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self); - make.right.mas_equalTo(self.backView); + make.leading.mas_equalTo(self); + make.trailing.mas_equalTo(self.backView); make.height.mas_equalTo(28); make.bottom.mas_equalTo(self.backView).mas_offset(-34); }]; @@ -68,28 +68,28 @@ }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backView).mas_offset(58); + make.leading.mas_equalTo(self.backView).mas_offset(58); make.width.height.mas_equalTo(28); make.centerY.mas_equalTo(self.mainView); }]; [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(4); make.width.mas_equalTo(25); make.height.mas_equalTo(22); make.centerY.mas_equalTo(self.mainView); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nobleImageView.mas_right).mas_offset(5); + make.leading.mas_equalTo(self.nobleImageView.mas_trailing).mas_offset(5); make.centerY.mas_equalTo(self.mainView); make.width.mas_greaterThanOrEqualTo(40).priority(500); }]; // 水平方向别扯我 [self.nickLabel setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel.mas_right).mas_offset(2); - make.right.mas_equalTo(0); + make.leading.mas_equalTo(self.nickLabel.mas_trailing).mas_offset(2); + make.trailing.mas_equalTo(0); make.centerY.mas_equalTo(self.mainView); }]; [self.contentLabel setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal]; diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetViewController.m b/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetViewController.m index 11277529..6f400f87 100644 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetViewController.m +++ b/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetViewController.m @@ -155,7 +155,7 @@ - (void)initSubViewConstraints { [self.topTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.mas_equalTo(self.view); + make.top.leading.trailing.mas_equalTo(self.view); make.bottom.mas_equalTo(self.backView.mas_top); }]; @@ -166,7 +166,7 @@ }]; [self.bottomTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.backView.mas_bottom); make.bottom.mas_equalTo(self.view); }]; @@ -180,23 +180,23 @@ [self.radioTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.headLabel.mas_bottom).offset(16); make.height.mas_equalTo(16); - make.left.mas_equalTo(self.backView).mas_offset(16); + make.leading.mas_equalTo(self.backView).mas_offset(16); }]; [self.releaseNumView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.radioTitleLabel); - make.left.mas_equalTo(self.radioTitleLabel.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.radioTitleLabel.mas_trailing).mas_offset(4); make.height.mas_equalTo(20); }]; [self.trumpetTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView).inset(16); + make.leading.trailing.mas_equalTo(self.backView).inset(16); make.top.mas_equalTo(self.radioTitleLabel.mas_bottom).mas_offset(8); make.height.mas_equalTo(82); }]; [self.maxCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.bottom.mas_equalTo(self.trumpetTextView).inset(3); + make.trailing.bottom.mas_equalTo(self.trumpetTextView).inset(3); make.height.mas_equalTo(12); }]; @@ -220,11 +220,11 @@ make.top.mas_equalTo(self.releaseButton.mas_bottom).mas_offset(10); }]; [self.countDownLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.bottom.mas_equalTo(self.countDownStackView); - make.right.mas_equalTo(self.countDownDescLabel.mas_left); + make.leading.top.bottom.mas_equalTo(self.countDownStackView); + make.trailing.mas_equalTo(self.countDownDescLabel.mas_leading); }]; [self.countDownDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.bottom.mas_equalTo(self.countDownStackView); + make.top.trailing.bottom.mas_equalTo(self.countDownStackView); }]; } diff --git a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m b/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m index f3a10335..b6d9801f 100644 --- a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m +++ b/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m @@ -53,13 +53,13 @@ - (void)initSubViewConstraints { [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(15); - make.right.mas_equalTo(self.closeButton.mas_left).offset(-8); + make.leading.mas_equalTo(self).offset(15); + make.trailing.mas_equalTo(self.closeButton.mas_leading).offset(-8); make.top.bottom.mas_equalTo(self); }]; [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-8); + make.trailing.mas_equalTo(-8); make.width.height.mas_equalTo(30); make.centerY.mas_equalTo(self); }]; diff --git a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuidkMessageCell.m b/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuidkMessageCell.m index 5167591a..170b6ced 100644 --- a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuidkMessageCell.m +++ b/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuidkMessageCell.m @@ -30,7 +30,7 @@ [self addSubview:self.tagLabel]; [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(22); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); make.centerY.mas_equalTo(self.contentView); }]; [self.tagLabel mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/Cell/XPReleaseRadioTableViewCell.m b/YuMi/Modules/YMRoom/View/ReleaseRadio/View/Cell/XPReleaseRadioTableViewCell.m index c9a116cb..4bafb41d 100644 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/Cell/XPReleaseRadioTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/ReleaseRadio/View/Cell/XPReleaseRadioTableViewCell.m @@ -38,14 +38,14 @@ - (void)initSubViewConstraints { [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView); + make.leading.mas_equalTo(self.contentView); make.centerY.mas_equalTo(self.contentView); make.height.mas_equalTo(24); - make.right.mas_equalTo(self.titleLabel).mas_offset(8); + make.trailing.mas_equalTo(self.titleLabel).mas_offset(8); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.bgView).mas_offset(8); + make.leading.mas_equalTo(self.bgView).mas_offset(8); make.centerY.mas_equalTo(self.contentView); make.height.mas_equalTo(18); }]; diff --git a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioViewController.m b/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioViewController.m index 2eabc331..a88427bc 100644 --- a/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioViewController.m +++ b/YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioViewController.m @@ -181,7 +181,7 @@ static NSString *const KXPReleaseRadioTableViewCellIdentifier = @"KXPReleaseRadi - (void)initSubViewConstraints { [self.topTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.mas_equalTo(self.view); + make.top.leading.trailing.mas_equalTo(self.view); make.bottom.mas_equalTo(self.backView.mas_top); }]; @@ -192,7 +192,7 @@ static NSString *const KXPReleaseRadioTableViewCellIdentifier = @"KXPReleaseRadi }]; [self.bottomTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.backView.mas_bottom); make.bottom.mas_equalTo(self.view); }]; @@ -200,7 +200,7 @@ static NSString *const KXPReleaseRadioTableViewCellIdentifier = @"KXPReleaseRadi [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(22); make.top.mas_equalTo(self.backView).mas_offset(11); - make.right.mas_equalTo(self.backView).mas_offset(-15); + make.trailing.mas_equalTo(self.backView).mas_offset(-15); }]; [self.headLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -218,28 +218,28 @@ static NSString *const KXPReleaseRadioTableViewCellIdentifier = @"KXPReleaseRadi [self.radioTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.headDescLabel.mas_bottom).offset(16); make.height.mas_equalTo(16); - make.left.mas_equalTo(self.backView).mas_offset(16); + make.leading.mas_equalTo(self.backView).mas_offset(16); }]; [self.releaseNumView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.radioTitleLabel); - make.left.mas_equalTo(self.radioTitleLabel.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.radioTitleLabel.mas_trailing).mas_offset(4); make.height.mas_equalTo(20); }]; [self.radioTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView).inset(16); + make.leading.trailing.mas_equalTo(self.backView).inset(16); make.top.mas_equalTo(self.radioTitleLabel.mas_bottom).mas_offset(8); make.height.mas_equalTo(65); }]; [self.maxCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.bottom.mas_equalTo(self.radioTextView).inset(3); + make.trailing.bottom.mas_equalTo(self.radioTextView).inset(3); make.height.mas_equalTo(12); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.radioTextView); + make.leading.trailing.mas_equalTo(self.radioTextView); make.top.mas_equalTo(self.radioTextView.mas_bottom).mas_offset(8); make.height.mas_equalTo(115); }]; @@ -263,11 +263,11 @@ static NSString *const KXPReleaseRadioTableViewCellIdentifier = @"KXPReleaseRadi make.top.mas_equalTo(self.releaseButton.mas_bottom).mas_offset(10); }]; [self.countDownLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.bottom.mas_equalTo(self.countDownStackView); - make.right.mas_equalTo(self.countDownDescLabel.mas_left); + make.leading.top.bottom.mas_equalTo(self.countDownStackView); + make.trailing.mas_equalTo(self.countDownDescLabel.mas_leading); }]; [self.countDownDescLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.bottom.mas_equalTo(self.countDownStackView); + make.top.trailing.bottom.mas_equalTo(self.countDownStackView); }]; } diff --git a/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m b/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m index 3ecc93b1..2318b228 100644 --- a/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m +++ b/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m @@ -144,20 +144,20 @@ - (void)initSubViewConstraints { // 设置 [self.settingButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.bottom.mas_equalTo(-11); make.width.height.mas_equalTo(22); }]; [self.shareButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.equalTo(self.settingButton.mas_left).offset(-15); + make.trailing.equalTo(self.settingButton.mas_leading).offset(-15); make.centerY.mas_equalTo(self.settingButton); make.width.height.mas_equalTo(22); }]; [self.collectButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.settingButton); - make.left.equalTo(self.nickStackView.mas_right).offset(6); + make.leading.equalTo(self.nickStackView.mas_trailing).offset(6); make.size.mas_equalTo(CGSizeMake(52, 23)); }]; [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) { @@ -165,7 +165,7 @@ }]; [self.nickStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.settingButton); - make.left.mas_equalTo(self).offset(35); + make.leading.mas_equalTo(self).offset(35); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -188,7 +188,7 @@ }]; [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.height.width.mas_equalTo(20); make.centerY.mas_equalTo(self.settingButton); }]; diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKEmptyTableViewCell.m index 56d8b34f..2b8dfb90 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKEmptyTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKEmptyTableViewCell.m @@ -44,7 +44,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKRecordTableViewCell.m b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKRecordTableViewCell.m index 71f25b73..5ae3c68d 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKRecordTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKRecordTableViewCell.m @@ -66,9 +66,9 @@ - (void)initSubViewConstraints { [self.winerUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.top.mas_equalTo(self.contentView).offset(31); - make.right.mas_equalTo(self.vsImageView.mas_left).offset(-20); + make.trailing.mas_equalTo(self.vsImageView.mas_leading).offset(-20); }]; [self.vsImageView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -79,9 +79,9 @@ }]; [self.loseUserView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.vsImageView.mas_right).offset(20); + make.leading.mas_equalTo(self.vsImageView.mas_trailing).offset(20); make.width.centerY.mas_equalTo(self.winerUserView); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); }]; [self.winerScoreLabel mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTimeTableViewCell.m b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTimeTableViewCell.m index 608840de..d8b3b0e2 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTimeTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTimeTableViewCell.m @@ -40,18 +40,18 @@ - (void)initSubViewConstraints { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.centerY.mas_equalTo(self.contentView); }]; [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.size.mas_equalTo(CGSizeMake(6.5, 11)); make.centerY.mas_equalTo(self.contentView); }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.arrowImageView.mas_left).offset(-3); + make.trailing.mas_equalTo(self.arrowImageView.mas_leading).offset(-3); make.centerY.mas_equalTo(self.contentView); }]; } diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTypeTableViewCell.m b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTypeTableViewCell.m index 22839584..5120c6d3 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTypeTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTypeTableViewCell.m @@ -40,19 +40,19 @@ - (void)initSubViewConstraints { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.centerY.mas_equalTo(self.contentView); }]; [self.typeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel.mas_right).offset(20); + make.leading.mas_equalTo(self.titleLabel.mas_trailing).offset(20); make.centerY.mas_equalTo(self.contentView); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.contentView); - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.height.mas_equalTo(1); }]; } diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKUserCollectionViewCell.m b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKUserCollectionViewCell.m index c2823014..0c699441 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKUserCollectionViewCell.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKUserCollectionViewCell.m @@ -43,18 +43,18 @@ - (void)initSubViewConstraints { [self.ownerAvatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.contentView); + make.leading.trailing.top.mas_equalTo(self.contentView); make.height.mas_equalTo(self.ownerAvatarImageView.mas_width); }]; [self.ownerLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); make.top.mas_equalTo(self.ownerAvatarImageView.mas_bottom).offset(5); make.height.mas_equalTo(14); }]; [self.chooseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.bottom.mas_equalTo(self.ownerAvatarImageView); + make.trailing.bottom.mas_equalTo(self.ownerAvatarImageView); make.width.height.mas_equalTo(16); }]; } diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKVoteTableViewCell.m b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKVoteTableViewCell.m index 2cce195e..141d5ce2 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKVoteTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKVoteTableViewCell.m @@ -59,13 +59,13 @@ - (void)initSubViewConstraints { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.centerY.mas_equalTo(self.contentView); }]; [self.giftValueStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(92); + make.leading.mas_equalTo(self.contentView).offset(92); make.top.bottom.mas_equalTo(self.contentView); }]; @@ -74,7 +74,7 @@ }]; [self.giftNumStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.giftValueStackView.mas_right).offset(15); + make.leading.mas_equalTo(self.giftValueStackView.mas_trailing).offset(15); make.top.bottom.mas_equalTo(self.contentView); }]; @@ -84,7 +84,7 @@ [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.contentView); - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.height.mas_equalTo(1); }]; } diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRomPKResultTitleLabel.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRomPKResultTitleLabel.m index d4aee6f0..95a7ab24 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRomPKResultTitleLabel.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRomPKResultTitleLabel.m @@ -37,12 +37,12 @@ - (void)initSubViewConstraints { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self); + make.leading.mas_equalTo(self); make.centerY.mas_equalTo(self); }]; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel.mas_right).offset(10); + make.leading.mas_equalTo(self.titleLabel.mas_trailing).offset(10); make.centerY.mas_equalTo(self.titleLabel); }]; } diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPanelUserView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPanelUserView.m index 5d24d17d..26bc7d19 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPanelUserView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKPanelUserView.m @@ -73,11 +73,11 @@ - (void)initSubViewConstraints { [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.stackView.mas_left); + make.leading.mas_equalTo(self.stackView.mas_leading); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.top.bottom.mas_equalTo(self); + make.trailing.top.bottom.mas_equalTo(self); }]; [self.addButton mas_makeConstraints:^(MASConstraintMaker *make) { @@ -140,27 +140,27 @@ [self.addButton setImage:[UIImage imageNamed:@"room_pk_progrss_red_add"] forState:UIControlStateNormal]; [self.firstUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(self.mas_height); - make.right.centerY.mas_equalTo(self.userView); + make.trailing.centerY.mas_equalTo(self.userView); }]; [self.secondUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.firstUserView); - make.left.mas_equalTo(self.firstUserView.mas_left).offset(-5); + make.leading.mas_equalTo(self.firstUserView.mas_leading).offset(-5); }]; [self.thirdUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.firstUserView); - make.left.mas_equalTo(self.secondUserView.mas_left).offset(-5); + make.leading.mas_equalTo(self.secondUserView.mas_leading).offset(-5); }]; [self.fourthUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.firstUserView); - make.left.mas_equalTo(self.thirdUserView.mas_left).offset(-5); + make.leading.mas_equalTo(self.thirdUserView.mas_leading).offset(-5); }]; [self.fifthUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.firstUserView); - make.left.mas_equalTo(self.fourthUserView.mas_left).offset(-5); + make.leading.mas_equalTo(self.fourthUserView.mas_leading).offset(-5); }]; self.viewArray = @[self.firstUserView, self.secondUserView, self.thirdUserView, self.fourthUserView, self.fifthUserView]; } else { @@ -173,28 +173,28 @@ [self.addButton setImage:[UIImage imageNamed:@"room_pk_progrss_blue_add"] forState:UIControlStateNormal]; [self.fifthUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(self.mas_height); - make.left.centerY.mas_equalTo(self.userView); + make.leading.centerY.mas_equalTo(self.userView); }]; [self.fourthUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.fifthUserView); - make.left.mas_equalTo(self.fifthUserView.mas_left).offset(5); + make.leading.mas_equalTo(self.fifthUserView.mas_leading).offset(5); }]; [self.thirdUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.fifthUserView); - make.left.mas_equalTo(self.fourthUserView.mas_left).offset(5); + make.leading.mas_equalTo(self.fourthUserView.mas_leading).offset(5); }]; [self.secondUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.fifthUserView); - make.left.mas_equalTo(self.thirdUserView.mas_left).offset(5); + make.leading.mas_equalTo(self.thirdUserView.mas_leading).offset(5); }]; [self.firstUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.fifthUserView); - make.left.mas_equalTo(self.secondUserView.mas_left).offset(5); + make.leading.mas_equalTo(self.secondUserView.mas_leading).offset(5); }]; self.viewArray = @[self.fifthUserView, self.fourthUserView, self.thirdUserView, self.secondUserView, self.firstUserView]; } diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKRecordNickView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKRecordNickView.m index f822b197..9728e65a 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKRecordNickView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKRecordNickView.m @@ -70,7 +70,7 @@ [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self).offset(10); - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); }]; [self.firstNickLabel mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.m index 51e3410f..6b234125 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKSelectUserView.m @@ -73,18 +73,18 @@ }]; [self.ownerLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.ownerAvatarImageView); + make.leading.trailing.mas_equalTo(self.ownerAvatarImageView); make.top.mas_equalTo(self.ownerAvatarImageView.mas_bottom).offset(5); make.height.mas_equalTo(14); }]; [self.chooseButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.bottom.mas_equalTo(self.ownerAvatarImageView); + make.trailing.bottom.mas_equalTo(self.ownerAvatarImageView); make.width.height.mas_equalTo(16); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.top.mas_equalTo(self.ownerLabel.mas_bottom).offset(10); make.height.mas_equalTo(65 * 2 + 10); }]; diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m index 06bf5f9e..45d6ef15 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m @@ -86,14 +86,14 @@ }]; [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(10); + make.leading.mas_equalTo(10); make.top.mas_equalTo(10); make.width.mas_equalTo(40); make.height.mas_equalTo(25); }]; [self.confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-10); + make.trailing.mas_equalTo(-10); make.top.mas_equalTo(10); make.width.mas_equalTo(40); make.height.mas_equalTo(25); @@ -101,7 +101,7 @@ [self.pickView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(45); - make.left.right.mas_equalTo(10); + make.leading.trailing.mas_equalTo(10); make.bottom.mas_equalTo(-kSafeAreaBottomHeight); }]; } diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKUserView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKUserView.m index 6429ac49..5496c022 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKUserView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKUserView.m @@ -49,7 +49,7 @@ }]; [self.nickButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(3); make.height.mas_equalTo(14); }]; diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPlayingView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPlayingView.m index c7fed33d..150b0f86 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPlayingView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPlayingView.m @@ -111,7 +111,7 @@ }]; [self.redTeamView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backImageView.mas_centerX).offset(-56); + make.trailing.mas_equalTo(self.backImageView.mas_centerX).offset(-56); make.top.mas_equalTo(self.backImageView).offset(25); make.height.mas_equalTo(45); }]; @@ -127,7 +127,7 @@ }]; [self.blueTeamView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backImageView.mas_centerX).offset(56); + make.leading.mas_equalTo(self.backImageView.mas_centerX).offset(56); make.centerY.mas_equalTo(self.redTeamView); make.height.mas_equalTo(45); }]; @@ -140,29 +140,29 @@ }]; [self.redProgressView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.bottom.mas_equalTo(self.progressView); + make.leading.top.bottom.mas_equalTo(self.progressView); make.width.mas_equalTo(56 + 45); }]; [self.blueProgressView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.top.bottom.mas_equalTo(self.progressView); - make.left.mas_equalTo(self.redProgressView.mas_right); + make.trailing.top.bottom.mas_equalTo(self.progressView); + make.leading.mas_equalTo(self.redProgressView.mas_trailing); }]; [self.progressLineView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(2.5, 12.5)); - make.centerX.mas_equalTo(self.blueProgressView.mas_left).offset(-1.2); + make.centerX.mas_equalTo(self.blueProgressView.mas_leading).offset(-1.2); make.centerY.mas_equalTo(self.progressView); }]; [self.redScoreLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.progressView); + make.leading.mas_equalTo(self.progressView); make.top.mas_equalTo(self.progressView.mas_bottom).offset(3); }]; [self.blueScoreLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.redScoreLabel); - make.right.mas_equalTo(self.progressView); + make.trailing.mas_equalTo(self.progressView); }]; [self.beginButton mas_makeConstraints:^(MASConstraintMaker *make) { @@ -173,7 +173,7 @@ [self.foldButton mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(0); - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); make.width.mas_equalTo(30.5); make.height.mas_equalTo(17.5); }]; diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKProgressView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKProgressView.m index 4a15f13b..e340990a 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKProgressView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKProgressView.m @@ -371,7 +371,7 @@ [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(260, 60)); - make.top.left.mas_equalTo(self); + make.top.leading.mas_equalTo(self); }]; [self.beginButton mas_makeConstraints:^(MASConstraintMaker *make) { @@ -393,32 +393,32 @@ }]; [self.redTeamView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.progressView.mas_left); + make.trailing.mas_equalTo(self.progressView.mas_leading); make.centerY.mas_equalTo(self.progressView); make.height.mas_equalTo(25); - make.left.mas_greaterThanOrEqualTo(15); + make.leading.mas_greaterThanOrEqualTo(15); }]; [self.blueTeamView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.progressView.mas_right); + make.leading.mas_equalTo(self.progressView.mas_trailing); make.centerY.mas_equalTo(self.progressView); make.height.mas_equalTo(25); - make.right.mas_lessThanOrEqualTo(-15); + make.trailing.mas_lessThanOrEqualTo(-15); }]; [self.redProgressView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.bottom.mas_equalTo(self.progressView); + make.leading.top.bottom.mas_equalTo(self.progressView); make.width.mas_equalTo(85); }]; [self.blueProgressView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.top.bottom.mas_equalTo(self.progressView); - make.left.mas_equalTo(self.redProgressView.mas_right); + make.trailing.top.bottom.mas_equalTo(self.progressView); + make.leading.mas_equalTo(self.redProgressView.mas_trailing); }]; [self.progressLineView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(2.5, 12.5)); - make.centerX.mas_equalTo(self.blueProgressView.mas_left).offset(-1.2); + make.centerX.mas_equalTo(self.blueProgressView.mas_leading).offset(-1.2); make.centerY.mas_equalTo(self.progressView); }]; @@ -426,13 +426,13 @@ [self.redScoreLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self.redTeamView); make.top.mas_equalTo(self.redTeamView.mas_bottom).offset(5); - make.left.mas_lessThanOrEqualTo(self.backImageView); + make.leading.mas_lessThanOrEqualTo(self.backImageView); }]; [self.blueScoreLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self.blueTeamView); make.centerY.mas_equalTo(self.redScoreLabel); - make.right.mas_lessThanOrEqualTo(self.backImageView); + make.trailing.mas_lessThanOrEqualTo(self.backImageView); }]; } diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m index e685dfb4..7bc39d30 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m @@ -117,7 +117,7 @@ [self.contentImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.topImageView).offset(97); - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.height.mas_equalTo(170); // 根据类型变化 }]; @@ -130,8 +130,8 @@ [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.contentImageView).offset(48); - make.left.mas_equalTo(self.contentImageView).offset(20); - make.right.mas_equalTo(self.contentImageView); + make.leading.mas_equalTo(self.contentImageView).offset(20); + make.trailing.mas_equalTo(self.contentImageView); }]; [self.pkUserContaierView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -159,43 +159,43 @@ [self.failDesLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.checkButton.mas_top).offset(-10); - make.left.right.mas_equalTo(self.contentImageView); + make.leading.trailing.mas_equalTo(self.contentImageView); }]; [self.checkButton mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(16); - make.left.right.mas_equalTo(self.contentImageView); + make.leading.trailing.mas_equalTo(self.contentImageView); make.bottom.mas_equalTo(self.contentImageView.mas_bottom).offset(-15); }]; [self.pkUserLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.centerY.mas_equalTo(self.pkUserContaierView); + make.leading.centerY.mas_equalTo(self.pkUserContaierView); }]; [self.firstUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(35, 35)); - make.left.mas_equalTo(self.pkUserLabel.mas_right).offset(10); + make.leading.mas_equalTo(self.pkUserLabel.mas_trailing).offset(10); make.centerY.mas_equalTo(self.pkUserContaierView); }]; [self.secondUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.firstUserView); - make.left.mas_equalTo(self.firstUserView.mas_right).offset(5); + make.leading.mas_equalTo(self.firstUserView.mas_trailing).offset(5); }]; [self.thirdUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.firstUserView); - make.left.mas_equalTo(self.secondUserView.mas_right).offset(5); + make.leading.mas_equalTo(self.secondUserView.mas_trailing).offset(5); }]; [self.fourthUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.firstUserView); - make.left.mas_equalTo(self.thirdUserView.mas_right).offset(5); + make.leading.mas_equalTo(self.thirdUserView.mas_trailing).offset(5); }]; [self.fifthUserView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.firstUserView); - make.left.mas_equalTo(self.fourthUserView.mas_right).offset(5); + make.leading.mas_equalTo(self.fourthUserView.mas_trailing).offset(5); }]; [self.mvpImageView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m index 6d560659..51ec4e8d 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m @@ -123,7 +123,7 @@ - (void)initSubViewConstraints { XPRoomPKUserView * userView = [self.redTeamViews lastObject]; [self.userContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.view).offset(10); make.bottom.mas_equalTo(userView.mas_bottom).offset(20); }]; @@ -135,12 +135,12 @@ }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.userContainerView.mas_bottom); }]; [self.createPKStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(47); + make.leading.trailing.mas_equalTo(self.view).inset(47); make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 20); }]; @@ -173,7 +173,7 @@ [self.userContainerView addSubview:redView]; [redView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemHeight)); - make.left.mas_equalTo(self.userContainerView).offset(13+ i % 2 * (itemWidth + itemSpace)); + make.leading.mas_equalTo(self.userContainerView).offset(13+ i % 2 * (itemWidth + itemSpace)); make.top.mas_equalTo(self.userContainerView).offset(i / 2 *(itemHeight + pkItemMargeHeight)); }]; } @@ -189,7 +189,7 @@ [self.userContainerView addSubview:blueView]; [blueView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemHeight)); - make.left.mas_equalTo(self.userContainerView).offset(13 + itemWidth * 2 + itemSpace + pkItemWidth + i % 2 * (itemWidth + itemSpace)); + make.leading.mas_equalTo(self.userContainerView).offset(13 + itemWidth * 2 + itemSpace + pkItemWidth + i % 2 * (itemWidth + itemSpace)); make.top.mas_equalTo(self.userContainerView).offset(i / 2 *(itemHeight + pkItemMargeHeight)); }]; } diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.m index 545242b6..dfa110f8 100644 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.m +++ b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/PIRoomPhotoAlbumVC.m @@ -34,13 +34,13 @@ -(void)installConstraints{ [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.view); - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.height.mas_equalTo(kGetScaleWidth(44)); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleView.mas_bottom); - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); }]; } #pragma mark - JXCategoryViewDelegate diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumOperateView.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumOperateView.m index 08a612f6..643c984a 100644 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumOperateView.m +++ b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumOperateView.m @@ -30,7 +30,7 @@ make.edges.equalTo(self); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.trailing.bottom.equalTo(self); + make.leading.trailing.bottom.equalTo(self); make.height.mas_equalTo(kGetScaleWidth(191)); }]; } diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendCell.m b/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendCell.m index 600af1da..76988d20 100644 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendCell.m +++ b/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendCell.m @@ -52,30 +52,30 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(12); - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.width.height.mas_equalTo(72); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avatarImageView).mas_offset(12); - make.left.mas_equalTo(self.avatarImageView.mas_right).mas_offset(7); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(7); make.height.mas_equalTo(14); - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); }]; [self.tagImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); + make.leading.mas_equalTo(self.nickLabel); make.width.mas_equalTo(43); make.height.mas_equalTo(18); make.top.mas_equalTo(self.nickLabel.mas_bottom).mas_offset(12); }]; [self.hotImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.tagImageView.mas_right).mas_offset(12); + make.leading.mas_equalTo(self.tagImageView.mas_trailing).mas_offset(12); make.width.height.mas_equalTo(13); make.centerY.mas_equalTo(self.tagImageView); }]; [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.hotImageView.mas_right).mas_offset(3); + make.leading.mas_equalTo(self.hotImageView.mas_trailing).mas_offset(3); make.centerY.mas_equalTo(self.tagImageView); - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); make.height.mas_equalTo(12); }]; } diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.m b/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.m index a5b81bbd..5f99d6f7 100644 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.m +++ b/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.m @@ -36,7 +36,7 @@ - (void)initSubViewConstraints { [self.emptyLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(10); + make.leading.trailing.mas_equalTo(self.contentView).inset(10); make.centerY.mas_equalTo(self.contentView); }]; } diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.m b/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.m index 0c600e88..8bf412dd 100644 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.m +++ b/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.m @@ -68,16 +68,16 @@ #pragma mark - Constraints - (void)setUpConstraints { [self.toolBar mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.bottom.mas_equalTo(self); + make.top.leading.trailing.bottom.mas_equalTo(self); }]; [self.miniStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kStatusBarHeight + 8); - make.left.mas_equalTo(self).mas_offset(36); + make.leading.mas_equalTo(self).mas_offset(36); }]; [self.exitStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kStatusBarHeight + 8); - make.left.mas_equalTo(self.miniStackView.mas_right).mas_offset(72); + make.leading.mas_equalTo(self.miniStackView.mas_trailing).mas_offset(72); }]; @@ -89,10 +89,10 @@ }]; [self.recommentLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.miniStackView.mas_bottom).mas_offset(16); - make.left.mas_equalTo(11); + make.leading.mas_equalTo(11); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(0); + make.leading.trailing.bottom.mas_equalTo(0); make.top.mas_equalTo(self.recommentLabel.mas_bottom); }]; } diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingEmptyTableViewCell.m index 242dda0d..032c0fde 100644 --- a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingEmptyTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingEmptyTableViewCell.m @@ -44,7 +44,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingPrizeCollectionViewCell.m b/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingPrizeCollectionViewCell.m index 296d64dd..4a15237a 100644 --- a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingPrizeCollectionViewCell.m +++ b/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingPrizeCollectionViewCell.m @@ -44,7 +44,7 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.logoImageView); + make.leading.trailing.mas_equalTo(self.logoImageView); make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(5); }]; } diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingRankTableViewCell.m b/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingRankTableViewCell.m index 4a31df1c..50b5bc8f 100644 --- a/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingRankTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/Sailing/View/Cell/XPSailingRankTableViewCell.m @@ -54,38 +54,38 @@ - (void)initSubViewConstraints { [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.contentView); make.height.mas_equalTo(60); }]; [self.rankButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(29, 20)); - make.left.mas_equalTo(self.backView).offset(15); + make.leading.mas_equalTo(self.backView).offset(15); make.centerY.mas_equalTo(self.backView); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(50, 50)); make.centerY.mas_equalTo(self.backView); - make.left.mas_equalTo(self.rankButton.mas_right).offset(24); + make.leading.mas_equalTo(self.rankButton.mas_trailing).offset(24); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(5); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(5); make.centerY.mas_equalTo(self.avatarImageView); - make.right.mas_lessThanOrEqualTo(self.diamondImageView.mas_left).offset(-5); + make.trailing.mas_lessThanOrEqualTo(self.diamondImageView.mas_leading).offset(-5); }]; [self.diamondImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(14, 12)); make.centerY.mas_equalTo(self.backView); - make.right.mas_equalTo(self.coinLabel.mas_left).offset(-2); + make.trailing.mas_equalTo(self.coinLabel.mas_leading).offset(-2); }]; [self.coinLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backView).offset(-10); + make.trailing.mas_equalTo(self.backView).offset(-10); make.centerY.mas_equalTo(self.backView); make.width.mas_equalTo(80); }]; diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingAnimationView.m b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingAnimationView.m index dacc2e87..37c8591a 100644 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingAnimationView.m +++ b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingAnimationView.m @@ -44,9 +44,9 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backImageView).offset(89 * kScreenScale); + make.leading.mas_equalTo(self.backImageView).offset(89 * kScreenScale); make.top.mas_equalTo(self.backImageView).offset(29 * kScreenScale); - make.right.mas_lessThanOrEqualTo(self.backImageView); + make.trailing.mas_lessThanOrEqualTo(self.backImageView); }]; } diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingBuyFuelView.m b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingBuyFuelView.m index 18034d2f..286f88ae 100644 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingBuyFuelView.m +++ b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingBuyFuelView.m @@ -59,13 +59,13 @@ [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(85, 24)); - make.right.mas_equalTo(self.backImageView.mas_centerX).offset(-10); + make.trailing.mas_equalTo(self.backImageView.mas_centerX).offset(-10); make.bottom.mas_equalTo(self.backImageView).offset(-24); }]; [self.buyButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.cancelButton); - make.left.mas_equalTo(self.backImageView.mas_centerX).offset(10); + make.leading.mas_equalTo(self.backImageView.mas_centerX).offset(10); }]; } diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingGiftView.m b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingGiftView.m index fa106dab..9e52a484 100644 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingGiftView.m +++ b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingGiftView.m @@ -38,12 +38,12 @@ - (void)initSubViewConstraints { [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.height.mas_equalTo(19); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backImageView.mas_left).offset(3); + make.leading.mas_equalTo(self.backImageView.mas_leading).offset(3); make.centerY.mas_equalTo(self.backImageView); }]; } diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingPrizeView.m b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingPrizeView.m index 8a7a6ab8..2239cf12 100644 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingPrizeView.m +++ b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingPrizeView.m @@ -50,7 +50,7 @@ [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.backImageView).offset(75); - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); make.bottom.mas_equalTo(self).offset(-10); }]; } diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankView.m b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankView.m index eda77686..c7223e47 100644 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankView.m +++ b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankView.m @@ -61,13 +61,13 @@ }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.top.mas_equalTo(self).offset(98); make.height.mas_equalTo(30); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.top.mas_equalTo(self.titleView.mas_bottom); }]; } diff --git a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingViewController.m b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingViewController.m index f5d1984e..69ab384e 100644 --- a/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingViewController.m +++ b/YuMi/Modules/YMRoom/View/Sailing/View/XPSailingViewController.m @@ -152,12 +152,12 @@ NSString * const kSailingPrizeAlertKey = @"kSailingPrizeAlertKey"; - (void)initSubViewConstraints { [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.backImageView.mas_top); }]; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.height.mas_equalTo(515); }]; @@ -176,33 +176,33 @@ NSString * const kSailingPrizeAlertKey = @"kSailingPrizeAlertKey"; [self.rankButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(41, 32)); make.top.mas_equalTo(self.backImageView).offset(129); - make.right.mas_equalTo(self.backImageView).offset(-12); + make.trailing.mas_equalTo(self.backImageView).offset(-12); }]; [self.getFuleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.right.mas_equalTo(self.rankButton); + make.size.trailing.mas_equalTo(self.rankButton); make.top.mas_equalTo(self.rankButton.mas_bottom).offset(8); }]; [self.recordButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.right.mas_equalTo(self.rankButton); + make.size.trailing.mas_equalTo(self.rankButton); make.top.mas_equalTo(self.getFuleButton.mas_bottom).offset(8); }]; CGFloat kscale = 199.0f / 356.0f; [self.contentImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(9); + make.leading.trailing.mas_equalTo(self.backImageView).inset(9); make.bottom.mas_equalTo(self.backImageView).offset(-34); make.height.mas_equalTo((KScreenWidth - 18) * kscale); }]; [self.descriptionButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(65, 22)); - make.right.mas_equalTo(self.contentImageView); + make.trailing.mas_equalTo(self.contentImageView); make.top.mas_equalTo(self.contentImageView).offset(42); }]; [self.fuleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.right.mas_equalTo(self.descriptionButton); + make.size.trailing.mas_equalTo(self.descriptionButton); make.top.mas_equalTo(self.descriptionButton.mas_bottom).offset(4); }]; @@ -236,7 +236,7 @@ NSString * const kSailingPrizeAlertKey = @"kSailingPrizeAlertKey"; }]; [self.animationView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentImageView).offset(10); + make.leading.mas_equalTo(self.contentImageView).offset(10); make.bottom.mas_equalTo(self.contentImageView).offset(-50); make.width.mas_equalTo(150); make.height.mas_equalTo(KitemHeight * 5); diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCountCollectionViewCell.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCountCollectionViewCell.m index 33510784..abe2d179 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCountCollectionViewCell.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftCountCollectionViewCell.m @@ -42,17 +42,17 @@ - (void)initSubViewConstraints { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(20); + make.leading.mas_equalTo(20); make.centerY.mas_equalTo(self.contentView); }]; [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-20); + make.trailing.mas_equalTo(-20); make.centerY.mas_equalTo(0); - make.left.mas_greaterThanOrEqualTo(self.titleLabel.mas_right).offset(5); + make.leading.mas_greaterThanOrEqualTo(self.titleLabel.mas_trailing).offset(5); }]; [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-20); + make.trailing.mas_equalTo(-20); make.centerY.mas_equalTo(0); make.width.height.mas_equalTo(10); }]; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftFreeItemCell.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftFreeItemCell.m index f324970f..40d6a2d5 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftFreeItemCell.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftFreeItemCell.m @@ -98,14 +98,14 @@ UIKIT_EXTERN NSString * const kFreeGiftCountdownNotification; }]; [self.timeView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(4); - make.right.mas_equalTo(-6); + make.trailing.mas_equalTo(-6); make.width.mas_equalTo(37); make.height.mas_equalTo(11); }]; [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(6); + make.leading.mas_equalTo(6); make.centerY.equalTo(self.timeView); - make.right.equalTo(self.timeView.mas_left).mas_offset(-5); + make.trailing.equalTo(self.timeView.mas_leading).mas_offset(-5); }]; [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(17); @@ -116,11 +116,11 @@ UIKIT_EXTERN NSString * const kFreeGiftCountdownNotification; [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.pi_iconView.mas_bottom).mas_offset(5); make.height.mas_equalTo(14); - make.left.right.equalTo(self.bgView); + make.leading.trailing.equalTo(self.bgView); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.nameView.mas_bottom).mas_offset(1); - make.right.left.equalTo(self.bgView); + make.trailing.leading.equalTo(self.bgView); }]; } -(void)setGiftInfo:(GiftInfoModel *)giftInfo{ diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m index cca7f57b..70aaff30 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m @@ -83,7 +83,7 @@ - (void)initSubViewConstraints { [self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.top.mas_equalTo(self.contentView).inset(3); + make.trailing.top.mas_equalTo(self.contentView).inset(3); make.height.mas_equalTo(14); }]; [self.giftNewImageView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -126,7 +126,7 @@ [self.giftNumLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.contentView).offset(4.5); - make.left.equalTo(self.contentView).offset(6); + make.leading.equalTo(self.contentView).offset(6); }]; [self.nobleIconImageView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -134,13 +134,13 @@ }]; [self.lockImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.bottom.mas_equalTo(self.contentView).mas_offset(-4); + make.trailing.bottom.mas_equalTo(self.contentView).mas_offset(-4); make.width.height.mas_equalTo(16); }]; [self.superGiftView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(46); make.height.mas_equalTo(12); - make.left.mas_equalTo(10); + make.leading.mas_equalTo(10); make.bottom.equalTo(self.giftImageView.mas_bottom); }]; } diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.m index d852d343..9f661f86 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.m @@ -47,13 +47,13 @@ - (void)initSubViewConstraints { [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.contentView); + make.leading.trailing.top.mas_equalTo(self.contentView); make.height.mas_equalTo(108 * 2); }]; [self.pageController mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.collectionView.mas_bottom).offset(5); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); make.height.mas_equalTo(10); }]; } diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m index acf11175..2adbc8c6 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m @@ -69,7 +69,7 @@ make.height.mas_equalTo(44+108 * 2 + 10 + 10 + 15); }]; [self.segmentBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self); + make.leading.trailing.top.equalTo(self); make.height.mas_equalTo(44); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -84,8 +84,8 @@ make.width.mas_equalTo(35); }]; [self.totalValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.packGiftButton.mas_left).mas_offset(-3); - make.left.equalTo(self.titleView.mas_right).mas_offset(5); + make.trailing.mas_equalTo(self.packGiftButton.mas_leading).mas_offset(-3); + make.leading.equalTo(self.titleView.mas_trailing).mas_offset(5); make.centerY.mas_equalTo(self.packGiftButton); }]; [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m index ff32d036..cd4a1a40 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m @@ -87,7 +87,7 @@ [self.superview.superview addSubview:self.giftCountView]; [self.giftCountView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.bottom.mas_equalTo(self.superview.superview.mas_bottom).offset(-45 -kSafeAreaBottomHeight); make.width.mas_equalTo(160); }]; @@ -138,23 +138,23 @@ [self.balanceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.centerY.mas_equalTo(self.sendOperationView); }]; [self.rechargeStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.sendOperationView); - make.left.mas_equalTo(self.balanceLabel.mas_right).offset(12); + make.leading.mas_equalTo(self.balanceLabel.mas_trailing).offset(12); }]; [self.firstRechargeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(17, 8)); - make.left.mas_equalTo(self.rechargeStackView.mas_right).offset(4); + make.leading.mas_equalTo(self.rechargeStackView.mas_trailing).offset(4); make.centerY.mas_equalTo(self.rechargeStackView); }]; [self.sendOperationView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self).offset(-15); + make.trailing.mas_equalTo(self).offset(-15); make.bottom.mas_equalTo(-11); make.height.mas_equalTo(30); }]; @@ -175,8 +175,8 @@ [self.editTextFiled mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.customCountView).offset(15); - make.right.mas_equalTo(self.sureButton.mas_left).offset(-10); + make.leading.mas_equalTo(self.customCountView).offset(15); + make.trailing.mas_equalTo(self.sureButton.mas_leading).offset(-10); make.top.bottom.mas_equalTo(self.customCountView); }]; @@ -184,7 +184,7 @@ make.height.mas_equalTo(30); make.width.mas_equalTo(@50); make.centerY.mas_equalTo(self.customCountView); - make.right.mas_equalTo(self.customCountView).offset(-15); + make.trailing.mas_equalTo(self.customCountView).offset(-15); }]; } @@ -236,7 +236,7 @@ [self.superview.superview addSubview:self.customCountView]; [self.customCountView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.superview.superview); + make.leading.trailing.bottom.mas_equalTo(self.superview.superview); make.height.mas_equalTo(40); }]; } diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m index 04d5f9f6..d9223f5a 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m @@ -65,7 +65,7 @@ static NSString *kHideGiftViewInteractDot = @"kHideGiftViewInteractDot";//是否 }]; [self.giftButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); + make.leading.mas_equalTo(16); make.centerY.mas_equalTo(self); make.width.mas_equalTo(40); }]; @@ -76,7 +76,7 @@ static NSString *kHideGiftViewInteractDot = @"kHideGiftViewInteractDot";//是否 }]; // [self.interactButton mas_makeConstraints:^(MASConstraintMaker *make) { // make.centerY.mas_equalTo(self); -// make.left.mas_equalTo(self.devideView.mas_right).mas_offset(8); +// make.leading.mas_equalTo(self.devideView.mas_trailing).mas_offset(8); // make.width.mas_equalTo(40); // }]; @@ -84,19 +84,19 @@ static NSString *kHideGiftViewInteractDot = @"kHideGiftViewInteractDot";//是否 // [self.devideView mas_makeConstraints:^(MASConstraintMaker *make) { // make.centerY.mas_equalTo(self); -// make.left.mas_equalTo(self.giftButton.mas_right).mas_offset(8); +// make.leading.mas_equalTo(self.giftButton.mas_trailing).mas_offset(8); // make.width.mas_equalTo(1); // make.height.mas_equalTo(10); // }]; [self.bottomDevideView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(1); }]; [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-16); + make.trailing.mas_equalTo(-16); make.centerY.mas_equalTo(self); make.width.mas_equalTo(70); make.height.mas_equalTo(30); diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m index d51fcb0c..70bd3f06 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m @@ -115,7 +115,7 @@ - (void)initSubViewConstraints { [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(0); - make.left.right.mas_equalTo(self).inset(kGetScaleWidth(6)); + make.leading.trailing.mas_equalTo(self).inset(kGetScaleWidth(6)); make.height.mas_equalTo(kGetScaleWidth(56)); }]; @@ -124,8 +124,8 @@ make.centerY.equalTo(self.bgImageView); }]; [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(60)); - make.right.mas_equalTo(-kGetScaleWidth(70)); + make.leading.mas_equalTo(kGetScaleWidth(60)); + make.trailing.mas_equalTo(-kGetScaleWidth(70)); make.top.bottom.mas_equalTo(self.bgImageView); }]; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m index c3c69c62..a4a1ee98 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m @@ -44,8 +44,8 @@ - (void)initSubViewConstraints { [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(kGetScaleWidth(10)); - make.right.mas_equalTo(-kGetScaleWidth(10)); + make.leading.mas_equalTo(kGetScaleWidth(10)); + make.trailing.mas_equalTo(-kGetScaleWidth(10)); make.top.bottom.mas_equalTo(self); }]; } diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m index 2a7e39ab..12be5a0a 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m @@ -93,12 +93,12 @@ }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(15); + make.leading.trailing.mas_equalTo(self).inset(15); make.top.bottom.mas_equalTo(self); }]; [self.oneStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(15); + make.leading.trailing.mas_equalTo(self).inset(15); make.top.bottom.mas_equalTo(self); }]; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGraffitiGiftView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGraffitiGiftView.m index 1b427e30..6cbffdfe 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGraffitiGiftView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGraffitiGiftView.m @@ -107,7 +107,7 @@ [self.drawView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.contentView).offset(kSafeAreaTopHeight); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); make.bottom.mas_equalTo(self.toolView.mas_top); }]; @@ -117,17 +117,17 @@ [self.toolView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.left.right.mas_equalTo(self.contentView); + make.bottom.leading.trailing.mas_equalTo(self.contentView); make.height.mas_equalTo(56); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.toolView).offset(15); + make.leading.mas_equalTo(self.toolView).offset(15); make.centerY.mas_equalTo(self.toolView); }]; [self.toolStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.toolView).offset(-15); + make.trailing.mas_equalTo(self.toolView).offset(-15); make.height.mas_equalTo(22); make.centerY.mas_equalTo(self.toolView); }]; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m index 03b739ba..10b5e7bd 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m @@ -146,20 +146,20 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView; } - (void)initSubViewConstraints { [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.contentView.mas_top);; }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.stackView.mas_top); - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); }]; [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) { make.edges.mas_equalTo(self.contentView); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.contentView); + make.leading.trailing.bottom.mas_equalTo(self.contentView); }]; [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -546,7 +546,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView; [self.view addSubview:self.superGiftView]; [self.superGiftView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.contentView.mas_top); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(kGetScaleWidth(90)); }]; } @@ -556,7 +556,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView; [self.view addSubview:self.luckyBroadcastView]; [self.luckyBroadcastView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.contentView.mas_top); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(kGetScaleWidth(56)); }]; } @@ -569,7 +569,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView; [self.view addSubview:self.constellationBanner]; [self.constellationBanner mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.contentView.mas_top); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(kGetScaleWidth(56)); }]; } @@ -591,7 +591,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView; [self.view addSubview:self.superGiftView]; [self.superGiftView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.contentView.mas_top); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(kGetScaleWidth(90)); }]; } @@ -601,7 +601,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView; [self.view addSubview:self.luckyBroadcastView]; [self.luckyBroadcastView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.contentView.mas_top); - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.height.mas_equalTo(kGetScaleWidth(56)); }]; } diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/XPOpenRedPacketCell.m b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/XPOpenRedPacketCell.m index ecf96d61..85bdd409 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/XPOpenRedPacketCell.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/Cell/XPOpenRedPacketCell.m @@ -87,7 +87,7 @@ [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make){ make.height.width.mas_equalTo(kGetScaleWidth(28)); make.centerY.mas_equalTo(self.mas_centerY); - make.left.mas_equalTo(self.contentView.mas_left).offset(kGetScaleWidth(16)); + make.leading.mas_equalTo(self.contentView.mas_leading).offset(kGetScaleWidth(16)); }]; [self.userNameLabel mas_makeConstraints:^(MASConstraintMaker *make){ diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m index 9bca7a57..afada148 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m @@ -154,7 +154,7 @@ [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.bgView.mas_top).mas_offset(kGetScaleWidth(52)); - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); }]; } -(void)hiddenViewBntAction{ diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomRedPacketPwdView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomRedPacketPwdView.m index 4f5b769f..851f8994 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomRedPacketPwdView.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomRedPacketPwdView.m @@ -55,7 +55,7 @@ make.height.mas_equalTo(200); }]; [self.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(16); + make.leading.mas_equalTo(16); make.top.mas_equalTo(16); make.height.width.mas_equalTo(30); }]; @@ -71,21 +71,21 @@ make.height.mas_equalTo(30); }]; [self.diamondImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.centerY.mas_equalTo(self.diamondContentView); make.width.height.mas_equalTo(24); }]; [self.diamondLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.diamondImage.mas_right).mas_offset(7.5); + make.leading.mas_equalTo(self.diamondImage.mas_trailing).mas_offset(7.5); make.centerY.mas_equalTo(self.diamondContentView); - make.right.mas_equalTo(0); + make.trailing.mas_equalTo(0); }]; [self.codeView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self); make.top.mas_equalTo(self.diamondContentView.mas_bottom).mas_offset(16); }]; [self.forgetBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-12); + make.trailing.mas_equalTo(-12); make.top.mas_equalTo(self.codeView.mas_bottom).mas_offset(8); }]; diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.m b/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.m index 374e0604..4c6d2469 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.m @@ -160,7 +160,7 @@ - (void)initSubViewConstraints { [self.topTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.mas_equalTo(self.view); + make.top.leading.trailing.mas_equalTo(self.view); make.bottom.mas_equalTo(self.backView.mas_top); }]; @@ -171,13 +171,13 @@ }]; [self.bottomTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.backView.mas_bottom); make.bottom.mas_equalTo(self.view); }]; [self.roomButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backView.mas_centerX).mas_offset(-17); + make.trailing.mas_equalTo(self.backView.mas_centerX).mas_offset(-17); make.top.mas_equalTo(self.backView).offset(65); make.height.mas_equalTo(18); make.width.mas_equalTo(80); @@ -187,7 +187,7 @@ make.top.mas_equalTo(self.roomButton); make.height.mas_equalTo(18); make.width.mas_equalTo(80); - make.left.mas_equalTo(self.backView.mas_centerX).mas_offset(17); + make.leading.mas_equalTo(self.backView.mas_centerX).mas_offset(17); }]; [self.typeView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self.roomButton); @@ -199,44 +199,44 @@ [self.packetContentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.roomButton.mas_bottom).mas_offset(32); make.centerX.mas_equalTo(self.backView); - make.left.mas_equalTo(self.backView).mas_offset(30); + make.leading.mas_equalTo(self.backView).mas_offset(30); make.height.mas_equalTo(30); }]; [self.packetTitle mas_makeConstraints:^(MASConstraintMaker *make) { make.top.centerY.mas_equalTo(self.packetContentView); - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); }]; [self.packetTitle setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; [self.packetTextField mas_makeConstraints:^(MASConstraintMaker *make) { make.top.centerY.mas_equalTo(self.packetContentView); - make.left.mas_equalTo(self.packetTitle.mas_right).mas_offset(4); - make.right.mas_equalTo(self.packetUnit.mas_left).mas_offset(-5); + make.leading.mas_equalTo(self.packetTitle.mas_trailing).mas_offset(4); + make.trailing.mas_equalTo(self.packetUnit.mas_leading).mas_offset(-5); }]; [self.packetUnit mas_makeConstraints:^(MASConstraintMaker *make) { make.top.centerY.mas_equalTo(self.packetContentView); - make.right.mas_equalTo(self.packetContentView).mas_offset(-15); + make.trailing.mas_equalTo(self.packetContentView).mas_offset(-15); make.width.mas_equalTo(12); }]; [self.diamondContentView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.packetContentView.mas_bottom).mas_offset(20); make.centerX.mas_equalTo(self.backView); - make.left.mas_equalTo(self.packetContentView); + make.leading.mas_equalTo(self.packetContentView); make.height.mas_equalTo(30); }]; [self.diamondTitle mas_makeConstraints:^(MASConstraintMaker *make) { make.top.centerY.mas_equalTo(self.diamondContentView); - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); }]; [self.diamondTitle setContentHuggingPriority:UILayoutPriorityDefaultHigh forAxis:UILayoutConstraintAxisHorizontal]; [self.diamondTextField mas_makeConstraints:^(MASConstraintMaker *make) { make.top.centerY.mas_equalTo(self.diamondContentView); - make.left.mas_equalTo(self.diamondTitle.mas_right).mas_offset(4); - make.right.mas_equalTo(self.diamondUnit.mas_left).mas_offset(-5); + make.leading.mas_equalTo(self.diamondTitle.mas_trailing).mas_offset(4); + make.trailing.mas_equalTo(self.diamondUnit.mas_leading).mas_offset(-5); }]; [self.diamondUnit mas_makeConstraints:^(MASConstraintMaker *make) { make.top.centerY.mas_equalTo(self.diamondContentView); - make.right.mas_equalTo(self.diamondContentView).mas_offset(-12); + make.trailing.mas_equalTo(self.diamondContentView).mas_offset(-12); make.width.mas_equalTo(26); }]; @@ -246,12 +246,12 @@ make.height.mas_equalTo(11); }]; [self.descContentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView).inset(40); + make.leading.trailing.mas_equalTo(self.backView).inset(40); make.top.mas_equalTo(self.countDesc.mas_bottom).mas_offset(27); make.height.mas_equalTo(70); }]; [self.wishTextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView).inset(60); + make.leading.trailing.mas_equalTo(self.backView).inset(60); make.centerY.mas_equalTo(self.descContentView); make.height.mas_equalTo(17); }]; @@ -259,7 +259,7 @@ make.centerX.centerY.mas_equalTo(self.descContentView); }]; [self.wishCountLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.bottom.mas_equalTo(self.descContentView).inset(5); + make.trailing.bottom.mas_equalTo(self.descContentView).inset(5); make.height.mas_equalTo(10); }]; [self.wishDesc mas_makeConstraints:^(MASConstraintMaker *make) { @@ -276,20 +276,20 @@ [self.diamondImage mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.releaseButton.mas_bottom).mas_offset(16); - make.left.mas_equalTo(self.backView).mas_offset(42);; + make.leading.mas_equalTo(self.backView).mas_offset(42);; make.width.height.mas_equalTo(20); }]; [self.walletDiamondLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.diamondImage.mas_right).mas_offset(5); + make.leading.mas_equalTo(self.diamondImage.mas_trailing).mas_offset(5); make.centerY.mas_equalTo(self.diamondImage); }]; [self.rechargeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backView).mas_offset(-42); + make.trailing.mas_equalTo(self.backView).mas_offset(-42); make.centerY.mas_equalTo(self.diamondImage); }]; [self.ruleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backView).mas_offset(-23); + make.trailing.mas_equalTo(self.backView).mas_offset(-23); make.top.mas_equalTo(13); make.width.height.mas_equalTo(30); }]; @@ -437,14 +437,14 @@ if (self.wishTextView.text.length > 0) { self.wishPlaceHolderLabel.hidden = YES; [self.wishTextView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView).inset(60); + make.leading.trailing.mas_equalTo(self.backView).inset(60); make.centerY.mas_equalTo(self.descContentView); make.height.mas_equalTo(42); }]; } else { self.wishPlaceHolderLabel.hidden = NO; [self.wishTextView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView).inset(60); + make.leading.trailing.mas_equalTo(self.backView).inset(60); make.centerY.mas_equalTo(self.descContentView); make.height.mas_equalTo(17); }]; diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m index 0332bb2f..3cedd522 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m @@ -83,14 +83,14 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.width.height.mas_equalTo(40); make.centerY.mas_equalTo(self.contentView.mas_centerY); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); }]; [self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -120,24 +120,24 @@ [self.nameplateImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(25); make.width.mas_equalTo(60); - make.left.top.mas_equalTo(self.namePlateView); + make.leading.top.mas_equalTo(self.namePlateView); }]; [self.nameplateLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.mas_equalTo(self.nameplateImageView); - make.right.mas_equalTo(self.namePlateView).offset(-2); + make.trailing.mas_equalTo(self.namePlateView).offset(-2); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); - make.right.mas_equalTo(self.contentView).offset(-15); + make.leading.mas_equalTo(self.nickLabel); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.bottom.mas_equalTo(self.contentView); make.height.mas_equalTo(0.5); }]; [self.onMicroStatusLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.contentView); - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.width.mas_equalTo(40); make.height.mas_equalTo(14); }]; diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleEmptyTableViewCell.m index 447dd23a..07d5c446 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleEmptyTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleEmptyTableViewCell.m @@ -42,7 +42,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleTableViewCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleTableViewCell.m index ba25be4b..e392ac09 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomRoleTableViewCell.m @@ -51,31 +51,31 @@ - (void)initSubViewConstraints { [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.width.height.mas_equalTo(40); make.centerY.mas_equalTo(self.contentView.mas_centerY); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(10); }]; [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self.nickLabel.mas_right).offset(10); + make.leading.mas_equalTo(self.nickLabel.mas_trailing).offset(10); }]; [self.removeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.contentView.mas_centerY); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.width.mas_equalTo(65); make.height.mas_equalTo(30); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel); - make.right.mas_equalTo(self.removeButton); + make.leading.mas_equalTo(self.nickLabel); + make.trailing.mas_equalTo(self.removeButton); make.bottom.mas_equalTo(self.contentView); make.height.mas_equalTo(1); }]; diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.m index cfbdfc98..392d586c 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.m @@ -58,17 +58,17 @@ - (void)initSubViewConstraints { [self.titleStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); make.centerY.mas_equalTo(self.contentView); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.centerY.mas_equalTo(self.contentView); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.bottom.mas_equalTo(0); make.height.mas_equalTo(0.5); }]; diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m index be47a736..21e32e57 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m @@ -98,18 +98,18 @@ }]; [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.navView.mas_bottom); }]; [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(22, 22)); - make.left.mas_equalTo(self.navView).offset(8); + make.leading.mas_equalTo(self.navView).offset(8); make.centerY.mas_equalTo(self.titleLabel); }]; diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.m index 0f6ee289..cd372615 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingInputView.m @@ -76,22 +76,22 @@ [self.contentTextField mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(15); - make.left.right.mas_equalTo(self).inset(15); + make.leading.trailing.mas_equalTo(self).inset(15); make.height.mas_equalTo(40); }]; [self.failLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentTextField); + make.leading.trailing.mas_equalTo(self.contentTextField); make.top.mas_equalTo(self.contentTextField.mas_bottom).offset(10); }]; [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.contentTextField.mas_bottom).offset(4); - make.right.mas_equalTo(self.contentTextField).offset(-10); + make.trailing.mas_equalTo(self.contentTextField).offset(-10); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(20); + make.leading.trailing.mas_equalTo(self).inset(20); make.height.mas_equalTo(43); make.bottom.mas_equalTo(self.mas_bottom).offset(-20); }]; diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListView.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListView.m index 6fe5c560..194802c9 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListView.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListView.m @@ -100,7 +100,7 @@ }]; [self.confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(38); - make.left.right.mas_equalTo(self).inset(30); + make.leading.trailing.mas_equalTo(self).inset(30); make.bottom.mas_equalTo(-15); }]; @@ -112,7 +112,7 @@ [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(26); - make.left.right.mas_equalTo(self).inset(32); + make.leading.trailing.mas_equalTo(self).inset(32); make.bottom.mas_equalTo(self.confirmButton.mas_top).offset(-30); }]; } diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListViewController.m index 41270939..86533249 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListViewController.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListViewController.m @@ -69,25 +69,25 @@ - (void)initSubViewConstraints { [self.confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(44); - make.left.right.mas_equalTo(self.view).inset(90); + make.leading.trailing.mas_equalTo(self.view).inset(90); make.bottom.mas_equalTo(-100); }]; [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(32); make.top.mas_equalTo(kStatusBarHeight + 6); - make.right.mas_equalTo(-23+5); + make.trailing.mas_equalTo(-23+5); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(135); - make.left.mas_equalTo(44); + make.leading.mas_equalTo(44); make.height.mas_equalTo(24); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(30); - make.left.right.mas_equalTo(self.view).inset(44); + make.leading.trailing.mas_equalTo(self.view).inset(44); make.bottom.mas_equalTo(self.confirmButton.mas_top).offset(-30); }]; } diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicAlertView.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicAlertView.m index bb8f03b1..71231771 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicAlertView.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicAlertView.m @@ -54,11 +54,11 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self).inset(20); + make.leading.trailing.top.mas_equalTo(self).inset(20); }]; [self.textView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self).inset(20); + make.leading.trailing.mas_equalTo(self).inset(20); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(15); make.height.mas_equalTo(200); }]; diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m index b7304046..be0216a4 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m @@ -66,18 +66,18 @@ - (void)initSubViewConstraints { [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(15); + make.leading.trailing.mas_equalTo(self.view).inset(15); make.height.mas_equalTo(44); make.top.mas_equalTo(self.view).offset(15); }]; [self.titleNumberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.view).offset(-15); + make.trailing.mas_equalTo(self.view).offset(-15); make.top.mas_equalTo(self.textField.mas_bottom).offset(5); }]; [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(15); + make.leading.trailing.mas_equalTo(self.view).inset(15); make.top.mas_equalTo(self.titleNumberLabel.mas_bottom).offset(15); make.height.mas_equalTo(210); }]; @@ -87,16 +87,16 @@ }]; [self.placeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.mas_equalTo(self.contentTextView); + make.leading.top.mas_equalTo(self.contentTextView); }]; [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.contentView);; + make.trailing.mas_equalTo(self.contentView);; make.top.mas_equalTo(self.contentView.mas_bottom).offset(15); }]; [self.confirmButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(47); + make.leading.trailing.mas_equalTo(self.view).inset(47); make.height.mas_equalTo(44); make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 20); }]; diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.m index 25c773d3..678a661c 100644 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.m +++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorMicroView.m @@ -86,7 +86,7 @@ self.micStateImageView.image = [UIImage imageNamed:@"room_position_mute_Anchor"]; [self.micStateImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.avatarImageView).mas_offset(-2); - make.right.mas_equalTo(self.avatarImageView).mas_offset(-(120 / 4) +11); + make.trailing.mas_equalTo(self.avatarImageView).mas_offset(-(120 / 4) +11); make.width.height.mas_equalTo(22); }]; ///主播添加光圈动画 diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.m index b4c0ef78..2fc1de99 100644 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.m +++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/Anchor/AnchorPKMicroView.m @@ -92,7 +92,7 @@ self.micStateImageView.image = [UIImage imageNamed:@"room_position_mute_Anchor"]; [self.micStateImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.avatarImageView).mas_offset(-2); - make.right.mas_equalTo(self.avatarImageView).mas_offset(-(120 / 4) +11); + make.trailing.mas_equalTo(self.avatarImageView).mas_offset(-(120 / 4) +11); make.width.height.mas_equalTo(22); }]; } diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.m index 11fc83bc..c5954ac6 100644 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.m +++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.m @@ -39,21 +39,21 @@ - (void)initSubViewConstraints { [self mas_makeConstraints:^(MASConstraintMaker *make) { -// make.right.mas_equalTo(self.valueLabel.mas_right).offset(3); +// make.trailing.mas_equalTo(self.valueLabel.mas_trailing).offset(3); make.edges.mas_equalTo(self.bgView); }]; [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) { // make.edges.mas_equalTo(self); - make.right.mas_equalTo(self.valueLabel).mas_offset(4); + make.trailing.mas_equalTo(self.valueLabel).mas_offset(4); }]; [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.bgView).offset(4); + make.leading.mas_equalTo(self.bgView).offset(4); make.centerY.mas_equalTo(self.bgView); make.width.height.mas_equalTo(11); }]; [self.valueLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.iconImageView.mas_right).offset(3); + make.leading.mas_equalTo(self.iconImageView.mas_trailing).offset(3); make.centerY.mas_equalTo(self.bgView); }]; diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m index 7a7d216c..1f528048 100644 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m +++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m @@ -137,7 +137,7 @@ }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.height.mas_equalTo(self.mas_width); }]; @@ -145,7 +145,7 @@ make.edges.mas_equalTo(self.avatarImageView); }]; [self.forbidKickView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.bottom.mas_equalTo(self.avatarImageView); + make.leading.bottom.mas_equalTo(self.avatarImageView); make.width.height.mas_equalTo(18); }]; diff --git a/YuMi/Modules/YMRoom/View/TaskTip/XPTaskCompleteTipView.m b/YuMi/Modules/YMRoom/View/TaskTip/XPTaskCompleteTipView.m index 589fbe80..79a2e913 100644 --- a/YuMi/Modules/YMRoom/View/TaskTip/XPTaskCompleteTipView.m +++ b/YuMi/Modules/YMRoom/View/TaskTip/XPTaskCompleteTipView.m @@ -49,10 +49,10 @@ }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self.mainView).mas_offset(15); + make.leading.mas_equalTo(self.mainView).mas_offset(15); }]; [self.gotoLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickLabel.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.nickLabel.mas_trailing).mas_offset(4); make.centerY.mas_equalTo(self.mainView); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFailyResultGiftCell.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFailyResultGiftCell.m index c2392819..2382976e 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFailyResultGiftCell.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFailyResultGiftCell.m @@ -47,7 +47,7 @@ - (void)initSubViewConstraints { [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.height.mas_equalTo(self.backImageView.mas_width); }]; @@ -58,11 +58,11 @@ [self.countButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(29.5, 30.5)); - make.bottom.right.mas_equalTo(self.backImageView); + make.bottom.trailing.mas_equalTo(self.backImageView); }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.top.mas_equalTo(self.backImageView.mas_bottom).offset(7); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyFriendCell.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyFriendCell.m index 0b42c407..276729a9 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyFriendCell.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyFriendCell.m @@ -47,25 +47,25 @@ - (void)initSubViewConstraints { [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(15); + make.leading.trailing.mas_equalTo(self.contentView).inset(15); make.top.mas_equalTo(self.contentView); make.height.mas_equalTo(55); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(49, 49)); - make.left.mas_equalTo(self.backView).offset(12); + make.leading.mas_equalTo(self.backView).offset(12); make.centerY.mas_equalTo(self.backView); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(8); - make.right.mas_lessThanOrEqualTo(self.backView).offset(-5); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(8); + make.trailing.mas_lessThanOrEqualTo(self.backView).offset(-5); make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-3); }]; [self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.nickLabel); + make.leading.trailing.mas_equalTo(self.nickLabel); make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(3); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyNewSummonCell.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyNewSummonCell.m index eac43ffa..3e41a1d4 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyNewSummonCell.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyNewSummonCell.m @@ -69,8 +69,8 @@ }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(8); - make.right.mas_equalTo(-8); + make.leading.mas_equalTo(8); + make.trailing.mas_equalTo(-8); make.height.mas_equalTo(12); make.top.mas_equalTo(137.0); }]; @@ -283,7 +283,7 @@ }]; [self.priceView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.iconView.mas_bottom).mas_offset(1); - make.left.right.equalTo(self); + make.leading.trailing.equalTo(self); make.height.mas_equalTo(8); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyPrizePoolCell.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyPrizePoolCell.m index 58c2ef47..0b7057f7 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyPrizePoolCell.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyPrizePoolCell.m @@ -59,7 +59,7 @@ }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); make.bottom.mas_equalTo(self.backImageView).offset(-8); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairySendRecordCell.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairySendRecordCell.m index 3d4cf7f8..3bb2878f 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairySendRecordCell.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairySendRecordCell.m @@ -48,26 +48,26 @@ - (void)initSubViewConstraints { [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.contentView).offset(20); + make.leading.mas_equalTo(self.contentView).offset(20); make.top.mas_equalTo(self.contentView); }]; [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(20); + make.leading.trailing.mas_equalTo(self.contentView).inset(20); make.height.mas_equalTo(58); make.top.mas_equalTo(self.timeLabel.mas_bottom).offset(8); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(42, 42)); - make.left.mas_equalTo(self.backView).offset(12); + make.leading.mas_equalTo(self.backView).offset(12); make.centerY.mas_equalTo(self.backView); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(9); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(9); make.centerY.mas_equalTo(self.avatarImageView); - make.right.mas_lessThanOrEqualTo(self.backView).offset(-5); + make.trailing.mas_lessThanOrEqualTo(self.backView).offset(-5); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyShopingExchangeCell.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyShopingExchangeCell.m index fc7e2294..062b7f91 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyShopingExchangeCell.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyShopingExchangeCell.m @@ -76,8 +76,8 @@ }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(8); - make.right.mas_equalTo(-8); + make.leading.mas_equalTo(8); + make.trailing.mas_equalTo(-8); make.bottom.mas_equalTo(self.stackView.mas_top).offset(-4); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyStoreResultCell.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyStoreResultCell.m index c34f7ee5..e7c169e5 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyStoreResultCell.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyStoreResultCell.m @@ -47,7 +47,7 @@ - (void)initSubViewConstraints { [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.height.mas_equalTo(self.backImageView.mas_width); }]; @@ -56,7 +56,7 @@ }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.top.mas_equalTo(self.backImageView.mas_bottom).offset(7); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyTrialsRecordCell.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyTrialsRecordCell.m index bf2d1bbe..dee04132 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyTrialsRecordCell.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/Cell/XPTreasureFairyTrialsRecordCell.m @@ -52,8 +52,8 @@ - (void)initSubViewConstraints { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.bottom.equalTo(self.contentView); - make.right.mas_equalTo(-5); + make.top.leading.bottom.equalTo(self.contentView); + make.trailing.mas_equalTo(-5); }]; } - (NSString *)getDateWithHHMMSS:(NSString *)time { diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFailrySummonBallView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFailrySummonBallView.m index d81a459e..2fab20c0 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFailrySummonBallView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFailrySummonBallView.m @@ -56,12 +56,12 @@ [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.backImageView).offset(-3); - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); }]; [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(18, 18)); - make.left.mas_equalTo(self.backImageView).offset(61); + make.leading.mas_equalTo(self.backImageView).offset(61); make.top.mas_equalTo(self.backImageView).offset(51); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFailyPrizeGiftView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFailyPrizeGiftView.m index 9fdfd88a..3eb84d07 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFailyPrizeGiftView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFailyPrizeGiftView.m @@ -36,7 +36,7 @@ - (void)initSubViewConstraints { [self.prizeButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.top.mas_equalTo(self).offset(6); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFailyResultView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFailyResultView.m index 18dd9b0a..8a5de41c 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFailyResultView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFailyResultView.m @@ -52,19 +52,19 @@ CGFloat kscale = 364.0 / 375.0; self.frame = CGRectMake(0, 0, KScreenWidth, KScreenWidth * kscale + 89 * kScreenScale); [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.top.mas_equalTo(self.backImageView.mas_bottom); }]; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.height.mas_equalTo(KScreenWidth * kscale); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.backImageView).offset(87 * kScreenScale); make.bottom.mas_equalTo(self.backImageView).offset((-182 + 89) * kScreenScale); - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); }]; [self.oneGiftView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyBallContentView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyBallContentView.m index aebe8e83..871babbf 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyBallContentView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyBallContentView.m @@ -67,7 +67,7 @@ [self.thirdView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.secondView); - make.left.mas_equalTo(self.secondView.mas_right).offset(37); + make.leading.mas_equalTo(self.secondView.mas_trailing).offset(37); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyBallView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyBallView.m index c379e408..dd3a142d 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyBallView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyBallView.m @@ -72,12 +72,12 @@ }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); make.top.mas_equalTo(self.backImageView).offset(30); }]; [self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); make.top.mas_equalTo(self.nameLabel.mas_bottom).offset(8); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyDrawSubView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyDrawSubView.m index dd52ef41..83ab6afb 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyDrawSubView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyDrawSubView.m @@ -52,7 +52,7 @@ }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); make.top.mas_equalTo(self.fairyView.mas_bottom).offset(2); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyDrawView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyDrawView.m index 9b4b71e7..0cc04781 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyDrawView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyDrawView.m @@ -179,7 +179,7 @@ [self.firstView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(75 * kScreenScale, 75 * kScreenScale)); - make.left.mas_equalTo(self).offset(0); + make.leading.mas_equalTo(self).offset(0); make.top.mas_equalTo(self).offset(0); }]; @@ -188,22 +188,22 @@ [self.secondView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.equalTo(self.firstView); - make.left.mas_equalTo(self.firstView.mas_right).offset(margin); + make.leading.mas_equalTo(self.firstView.mas_trailing).offset(margin); }]; [self.thirdView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.equalTo(self.firstView); - make.left.mas_equalTo(self.secondView.mas_right).offset(margin); + make.leading.mas_equalTo(self.secondView.mas_trailing).offset(margin); }]; [self.fourthView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.equalTo(self.firstView); - make.left.mas_equalTo(self.thirdView.mas_right).offset(margin); + make.leading.mas_equalTo(self.thirdView.mas_trailing).offset(margin); }]; [self.fifView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.equalTo(self.firstView); - make.left.mas_equalTo(self.fourthView); + make.leading.mas_equalTo(self.fourthView); make.top.mas_equalTo(self.fourthView.mas_bottom).offset(topMargin); }]; @@ -219,17 +219,17 @@ [self.eightView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.equalTo(self.sevenView); - make.right.mas_equalTo(self.sevenView.mas_left).offset(-margin); + make.trailing.mas_equalTo(self.sevenView.mas_leading).offset(-margin); }]; [self.nineView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.equalTo(self.sevenView); - make.right.mas_equalTo(self.eightView.mas_left).offset(-margin); + make.trailing.mas_equalTo(self.eightView.mas_leading).offset(-margin); }]; [self.tenView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.equalTo(self.sevenView); - make.right.mas_equalTo(self.nineView.mas_left).offset(-margin); + make.trailing.mas_equalTo(self.nineView.mas_leading).offset(-margin); }]; [self.elevenView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -254,7 +254,7 @@ [self.rebrushBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(20); make.centerY.equalTo(self.currentValueButton); - make.left.equalTo(self.currentValueButton.mas_right).mas_offset(4); + make.leading.equalTo(self.currentValueButton.mas_trailing).mas_offset(4); }]; [self.diamondBGView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(120, 125)); @@ -268,7 +268,7 @@ }]; [self.diamondImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.coverDiamondView); + make.leading.trailing.bottom.mas_equalTo(self.coverDiamondView); make.top.mas_equalTo(self.coverDiamondView).offset(108); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyExchangeView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyExchangeView.m index 20fd2df1..4f9b5b13 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyExchangeView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyExchangeView.m @@ -86,28 +86,28 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(44, 44)); - make.left.mas_equalTo(self.userImageView).offset(15); + make.leading.mas_equalTo(self.userImageView).offset(15); make.top.mas_equalTo(self.userImageView).offset(11 * kScreenScale); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(2); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(2); make.centerY.mas_equalTo(self.avatarImageView); }]; [self.fragmentNumLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(-15); + make.trailing.mas_equalTo(-15); make.centerY.mas_equalTo(self.avatarImageView); }]; [self.fragmentImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.fragmentNumLabel.mas_left).offset(-4); + make.trailing.mas_equalTo(self.fragmentNumLabel.mas_leading).offset(-4); make.centerY.mas_equalTo(self.avatarImageView); make.size.mas_equalTo(CGSizeMake(24, 24)); }]; [self.fragmentTextLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.fragmentImageView.mas_left).offset(-2); + make.trailing.mas_equalTo(self.fragmentImageView.mas_leading).offset(-2); make.centerY.mas_equalTo(self.avatarImageView); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyFriendView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyFriendView.m index 17eb2d6a..36f38359 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyFriendView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyFriendView.m @@ -89,12 +89,12 @@ - (void)initSubViewConstraints { CGFloat kscale = 580.0 / 375.0; [self.dismissView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.bottom.mas_equalTo(self.backImageView.mas_top); }]; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.height.mas_equalTo(KScreenWidth * kscale); }]; @@ -106,31 +106,31 @@ [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(28, 28)); - make.left.mas_equalTo(self.backImageView).offset(15); + make.leading.mas_equalTo(self.backImageView).offset(15); make.top.mas_equalTo(self.backImageView).offset(40 * kScreenScale); }]; [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(15); + make.leading.trailing.mas_equalTo(self.backImageView).inset(15); make.height.mas_equalTo(32); make.top.mas_equalTo(self.backImageView).offset(103 * kScreenScale); }]; [self.searchTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.searchView).offset(15); - make.right.mas_equalTo(self.searchView).offset(-15); + make.leading.mas_equalTo(self.searchView).offset(15); + make.trailing.mas_equalTo(self.searchView).offset(-15); make.top.bottom.mas_equalTo(self.searchView); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); make.top.mas_equalTo(self.searchView.mas_bottom).offset(13); make.bottom.mas_equalTo(self.backImageView).offset(-10); }]; [self.actionButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backImageView).offset(40); - make.top.right.mas_equalTo(self.backImageView); + make.leading.mas_equalTo(self.backImageView).offset(40); + make.top.trailing.mas_equalTo(self.backImageView); make.bottom.mas_equalTo(self.searchView.mas_top); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyMessageSendView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyMessageSendView.m index 6cdbc89d..41562717 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyMessageSendView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyMessageSendView.m @@ -62,7 +62,7 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(30); + make.leading.trailing.mas_equalTo(self.backImageView).inset(30); make.top.mas_equalTo(self.backImageView).offset(45); }]; @@ -75,12 +75,12 @@ [self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(104, 32)); make.top.mas_equalTo(self.ballView.mas_bottom).offset(15); - make.right.mas_equalTo(self.backImageView.mas_centerX).offset(-12); + make.trailing.mas_equalTo(self.backImageView.mas_centerX).offset(-12); }]; [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.cancleButton); - make.left.mas_equalTo(self.backImageView.mas_centerX).offset(12); + make.leading.mas_equalTo(self.backImageView.mas_centerX).offset(12); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyMoreView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyMoreView.m index d8490ee4..eedcbba7 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyMoreView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyMoreView.m @@ -50,19 +50,19 @@ }]; [self.ruleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); make.height.mas_equalTo(30); make.top.mas_equalTo(self.backImageView).offset(25); }]; [self.recordButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); make.height.mas_equalTo(self.recordButton); make.top.mas_equalTo(self.ruleButton.mas_bottom).offset(3); }]; [self.expetButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); make.height.mas_equalTo(self.recordButton); make.top.mas_equalTo(self.recordButton.mas_bottom).offset(3); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyMyView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyMyView.m index 1285ca9a..570796ea 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyMyView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyMyView.m @@ -105,18 +105,18 @@ CGFloat kscale = 580.0 / 375.0; [self.dismissView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.bottom.mas_equalTo(self.backImageView.mas_top); }]; CGFloat height = KScreenWidth * kscale ; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.height.mas_equalTo(height); }]; [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(28, 28)); - make.left.mas_equalTo(self.backImageView).offset(15); + make.leading.mas_equalTo(self.backImageView).offset(15); make.top.mas_equalTo(self.backImageView).offset(40 * kScreenScale); }]; @@ -135,10 +135,10 @@ [self.recordButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(50, 42)); make.centerY.mas_equalTo(self.tipsImageView); - make.right.mas_equalTo(self.backImageView).offset(-15); + make.trailing.mas_equalTo(self.backImageView).offset(-15); }]; [self.fairyExPerButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(15); + make.leading.mas_equalTo(15); make.size.mas_equalTo(CGSizeMake(50, 45)); make.centerY.mas_equalTo(self.tipsImageView); @@ -151,7 +151,7 @@ [self.lowButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(163, 46)); - make.left.mas_equalTo(self.segmentView.mas_left).offset(5); + make.leading.mas_equalTo(self.segmentView.mas_leading).offset(5); make.centerY.mas_equalTo(self.segmentView).offset(1.5); }]; @@ -159,11 +159,11 @@ [self.highButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.lowButton); - make.left.mas_equalTo(self.lowButton.mas_right).offset(7); + make.leading.mas_equalTo(self.lowButton.mas_trailing).offset(7); }]; [self.lowView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); make.top.mas_equalTo(self.segmentView.mas_bottom).offset(16 * kScreenScale); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyNewSummonView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyNewSummonView.m index 4d91f0ac..3f6f2734 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyNewSummonView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyNewSummonView.m @@ -70,12 +70,12 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(44, 44)); - make.left.mas_equalTo(self.userImageView).offset(15); + make.leading.mas_equalTo(self.userImageView).offset(15); make.top.mas_equalTo(self.userImageView).offset(11 * kScreenScale); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(2); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(2); make.centerY.mas_equalTo(self.avatarImageView); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyPoolRecordView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyPoolRecordView.m index 618490fa..c9e2f99c 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyPoolRecordView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyPoolRecordView.m @@ -59,30 +59,30 @@ }]; [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.top.mas_equalTo(self.backImageView.mas_bottom); }]; [self.prizePoolButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(120, 39)); - make.right.mas_equalTo(self.backImageView.mas_centerX).offset(-18); + make.trailing.mas_equalTo(self.backImageView.mas_centerX).offset(-18); make.top.mas_equalTo(self.backImageView); }]; [self.recordButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(120, 39)); - make.left.mas_equalTo(self.backImageView.mas_centerX).offset(18); + make.leading.mas_equalTo(self.backImageView.mas_centerX).offset(18); make.top.mas_equalTo(self.backImageView); }]; [self.recordView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(5); + make.leading.trailing.mas_equalTo(self.backImageView).inset(5); make.bottom.mas_equalTo(self.backImageView).offset(-30); make.top.mas_equalTo(self.prizePoolButton.mas_bottom).offset(24); }]; [self.poolView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(5); + make.leading.trailing.mas_equalTo(self.backImageView).inset(5); make.bottom.mas_equalTo(self.backImageView).offset(-30); make.top.mas_equalTo(self.prizePoolButton.mas_bottom).offset(24); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyPrizePoolView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyPrizePoolView.m index 610e1936..c1692300 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyPrizePoolView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyPrizePoolView.m @@ -65,7 +65,7 @@ }]; [self.pi_containerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.top.mas_equalTo(self.titleView.mas_bottom).offset(13); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyPrizeRecordView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyPrizeRecordView.m index 76341d74..a24934d3 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyPrizeRecordView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyPrizeRecordView.m @@ -104,7 +104,7 @@ - (void)initSubViewConstraints { [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.bottom.mas_equalTo(self).offset(-20); }]; [self.emptyView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySendRecordView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySendRecordView.m index 4af950fd..b8313de0 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySendRecordView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySendRecordView.m @@ -107,7 +107,7 @@ CGFloat kscale = 388.0 / 318.0; self.frame = CGRectMake(0, 0, KScreenWidth, KScreenWidth * kscale + 134 * kScreenScale); [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.top.mas_equalTo(self.backImageView.mas_bottom); }]; @@ -123,7 +123,7 @@ }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(3); + make.leading.trailing.mas_equalTo(self.backImageView).inset(3); make.top.mas_equalTo(self.backImageView).offset(82); make.bottom.mas_equalTo(self.backImageView).offset(-42); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySendView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySendView.m index 86c3c775..6a793e39 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySendView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySendView.m @@ -65,12 +65,12 @@ }]; [self.dismissView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.top.mas_equalTo(self.backImageView.mas_bottom); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(30); + make.leading.trailing.mas_equalTo(self.backImageView).inset(30); make.top.mas_equalTo(self.backImageView).offset(45); }]; @@ -83,12 +83,12 @@ [self.cancleButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(104, 32)); make.top.mas_equalTo(self.ballView.mas_bottom).offset(15); - make.right.mas_equalTo(self.backImageView.mas_centerX).offset(-12); + make.trailing.mas_equalTo(self.backImageView.mas_centerX).offset(-12); }]; [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.cancleButton); - make.left.mas_equalTo(self.backImageView.mas_centerX).offset(12); + make.leading.mas_equalTo(self.backImageView.mas_centerX).offset(12); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyShopingRecordSubView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyShopingRecordSubView.m index 919d5e9d..24a961ca 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyShopingRecordSubView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyShopingRecordSubView.m @@ -100,7 +100,7 @@ - (void)initSubViewConstraints { [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.bottom.mas_equalTo(self).offset(-20); }]; [self.emptyView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyShopingRecordView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyShopingRecordView.m index 5c33cab7..cceb3c30 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyShopingRecordView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyShopingRecordView.m @@ -58,30 +58,30 @@ }]; [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.top.mas_equalTo(self.backImageView.mas_bottom); }]; [self.summonButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(120, 39)); - make.right.mas_equalTo(self.backImageView.mas_centerX).offset(-18); + make.trailing.mas_equalTo(self.backImageView.mas_centerX).offset(-18); make.top.mas_equalTo(self.backImageView); }]; [self.exchangeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(120, 39)); - make.left.mas_equalTo(self.backImageView.mas_centerX).offset(18); + make.leading.mas_equalTo(self.backImageView.mas_centerX).offset(18); make.top.mas_equalTo(self.backImageView); }]; [self.summonView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(5); + make.leading.trailing.mas_equalTo(self.backImageView).inset(5); make.bottom.mas_equalTo(self.backImageView).offset(-30); make.top.mas_equalTo(self.summonButton.mas_bottom).offset(24); }]; [self.exchangeView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(5); + make.leading.trailing.mas_equalTo(self.backImageView).inset(5); make.bottom.mas_equalTo(self.backImageView).offset(-30); make.top.mas_equalTo(self.exchangeButton.mas_bottom).offset(24); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyShopingView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyShopingView.m index 76309489..cfe54b1d 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyShopingView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyShopingView.m @@ -68,12 +68,12 @@ - (void)initSubViewConstraints { CGFloat kscale = 580.0 / 375.0; [self.dismissView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.bottom.mas_equalTo(self); }]; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.height.mas_equalTo(KScreenWidth * kscale); }]; @@ -85,7 +85,7 @@ [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(28, 28)); - make.left.mas_equalTo(self.backImageView).offset(15); + make.leading.mas_equalTo(self.backImageView).offset(15); make.top.mas_equalTo(self.backImageView).offset(40 * kScreenScale); }]; @@ -97,18 +97,18 @@ [self.summondButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(162, 51)); - make.left.mas_equalTo(self.segmentView.mas_left).offset(5); + make.leading.mas_equalTo(self.segmentView.mas_leading).offset(5); make.centerY.mas_equalTo(self.segmentView).offset(1.5); }]; [self.exchangeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.summondButton); - make.left.mas_equalTo(self.summondButton.mas_right).offset(1); + make.leading.mas_equalTo(self.summondButton.mas_trailing).offset(1); }]; [self.summonView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.segmentView.mas_bottom).offset(15); - make.left.right.bottom.mas_equalTo(self.backImageView); + make.leading.trailing.bottom.mas_equalTo(self.backImageView); }]; [self.exchangeView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -118,7 +118,7 @@ [self.recordButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(23, 65)); make.top.mas_equalTo(self.backButton); - make.right.mas_equalTo(self.backImageView).offset(0); + make.trailing.mas_equalTo(self.backImageView).offset(0); }]; } #pragma mark - Event Response diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyStoreResultSmallView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyStoreResultSmallView.m index 3f4c7d57..4932817b 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyStoreResultSmallView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyStoreResultSmallView.m @@ -56,7 +56,7 @@ - (void)initSubViewConstraints { self.frame = CGRectMake(0, 0, KScreenWidth, 281 + 183); [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.top.mas_equalTo(self.backImageView.mas_bottom); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyStoreResultView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyStoreResultView.m index e43da457..f87fc0cf 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyStoreResultView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyStoreResultView.m @@ -60,7 +60,7 @@ CGFloat kscale = 364.0 / 375.0; self.frame = CGRectMake(0, 0, KScreenWidth, KScreenWidth * kscale + 89 * kScreenScale); [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.top.mas_equalTo(self.backImageView.mas_bottom); }]; @@ -84,7 +84,7 @@ [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.backImageView).offset(87); make.height.mas_equalTo(110 * 2 + 10); - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); }]; [self.oneGiftView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyStoreView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyStoreView.m index ddc9f28c..2b853f97 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyStoreView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyStoreView.m @@ -201,12 +201,12 @@ CGFloat kscale = 580.0 / 375.0; [self.dismissView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.bottom.mas_equalTo(self.backImageView.mas_top); }]; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.height.mas_equalTo(KScreenWidth * kscale); }]; @@ -218,12 +218,12 @@ [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(28, 28)); - make.left.mas_equalTo(self.backImageView).offset(15); + make.leading.mas_equalTo(self.backImageView).offset(15); make.top.mas_equalTo(self.backImageView).offset(40 * kScreenScale); }]; [self.toolStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.backImageView).offset(-15); + make.trailing.mas_equalTo(self.backImageView).offset(-15); make.top.mas_equalTo(self.backImageView).offset(88 * kScreenScale); }]; @@ -257,12 +257,12 @@ [self.leftButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(32, 32)); - make.left.mas_equalTo(self.coverImageView).offset(26 * kScreenScale); + make.leading.mas_equalTo(self.coverImageView).offset(26 * kScreenScale); make.centerY.mas_equalTo(self.forestImageView); }]; [self.rightButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.coverImageView).offset(-26* kScreenScale); + make.trailing.mas_equalTo(self.coverImageView).offset(-26* kScreenScale); make.size.centerY.mas_equalTo(self.leftButton); }]; @@ -274,12 +274,12 @@ [self.oneButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(140, 40)); make.top.mas_equalTo(self.coverImageView.mas_bottom).offset(22); - make.right.mas_equalTo(self.coverImageView.mas_centerX).offset(-13); + make.trailing.mas_equalTo(self.coverImageView.mas_centerX).offset(-13); }]; [self.tenButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.oneButton); - make.left.mas_equalTo(self.coverImageView.mas_centerX).offset(13); + make.leading.mas_equalTo(self.coverImageView.mas_centerX).offset(13); }]; CGFloat kuserScale = 91.0 / 375.0; @@ -291,44 +291,44 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(44, 44)); - make.left.mas_equalTo(self.userImageView).offset(15); + make.leading.mas_equalTo(self.userImageView).offset(15); make.top.mas_equalTo(self.userImageView).offset(15 * kScreenScale); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.avatarImageView.mas_right).offset(2); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(2); make.centerY.mas_equalTo(self.avatarImageView); }]; [self.highLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.userImageView).offset(-15); + make.trailing.mas_equalTo(self.userImageView).offset(-15); make.centerY.mas_equalTo(self.avatarImageView); }]; [self.highImaegView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(24, 24)); make.centerY.mas_equalTo(self.highLabel); - make.right.mas_equalTo(self.highLabel.mas_left).offset(-4); + make.trailing.mas_equalTo(self.highLabel.mas_leading).offset(-4); }]; [self.middlelLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.highImaegView.mas_left).offset(-5); + make.trailing.mas_equalTo(self.highImaegView.mas_leading).offset(-5); make.centerY.mas_equalTo(self.highLabel); }]; [self.middleImaegView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.highImaegView); - make.right.mas_equalTo(self.middlelLabel.mas_left).offset(-4); + make.trailing.mas_equalTo(self.middlelLabel.mas_leading).offset(-4); }]; [self.normalLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.mas_equalTo(self.middleImaegView.mas_left).offset(-5); + make.trailing.mas_equalTo(self.middleImaegView.mas_leading).offset(-5); make.centerY.mas_equalTo(self.highLabel); }]; [self.normalImaegView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.highImaegView); - make.right.mas_equalTo(self.normalLabel.mas_left).offset(-4); + make.trailing.mas_equalTo(self.normalLabel.mas_leading).offset(-4); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySummonGiftView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySummonGiftView.m index 2b4218f9..7ad9dd12 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySummonGiftView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySummonGiftView.m @@ -54,14 +54,14 @@ [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(82, 82)); - make.left.mas_equalTo(self.backImageView).offset(37); + make.leading.mas_equalTo(self.backImageView).offset(37); make.centerY.mas_equalTo(self.backImageView); }]; [self.sepImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(84, 3)); make.centerY.mas_equalTo(self.giftImageView); - make.left.mas_equalTo(self.giftImageView.mas_right).offset(10); + make.leading.mas_equalTo(self.giftImageView.mas_trailing).offset(10); }]; [self.giftLabel mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySummonView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySummonView.m index b40198da..f6e014bc 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySummonView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairySummonView.m @@ -169,13 +169,13 @@ [self.leftButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(24, 24)); - make.left.mas_equalTo(self.lowGiftView).offset(4); + make.leading.mas_equalTo(self.lowGiftView).offset(4); make.centerY.mas_equalTo(self.lowGiftView); }]; [self.rightButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(24, 24)); - make.right.mas_equalTo(self.lowGiftView).offset(-4); + make.trailing.mas_equalTo(self.lowGiftView).offset(-4); make.centerY.mas_equalTo(self.lowGiftView); }]; @@ -200,25 +200,25 @@ [self.secondBallView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(self.firstBallView); make.top.mas_equalTo(self.firstBallView.mas_bottom).offset(7); - make.left.mas_equalTo(self.summonButton.mas_right).offset(16); + make.leading.mas_equalTo(self.summonButton.mas_trailing).offset(16); }]; [self.thirdBallView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(self.firstBallView); make.top.mas_equalTo(self.summonButton.mas_bottom).offset(7); - make.left.mas_equalTo(self.backImageView.mas_centerX).offset(39); + make.leading.mas_equalTo(self.backImageView.mas_centerX).offset(39); }]; [self.fourthBallView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.top.mas_equalTo(self.thirdBallView); - make.right.mas_equalTo(self.backImageView.mas_centerX).offset(-39); + make.trailing.mas_equalTo(self.backImageView.mas_centerX).offset(-39); }]; [self.fifthBallView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(self.firstBallView); make.top.mas_equalTo(self.secondBallView); - make.right.mas_equalTo(self.summonButton.mas_left).offset(-14); + make.trailing.mas_equalTo(self.summonButton.mas_leading).offset(-14); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsBallView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsBallView.m index b980e086..910be3da 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsBallView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsBallView.m @@ -62,23 +62,23 @@ [self.ballImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.backImageView).offset(1); - make.left.right.mas_equalTo(self.backImageView).inset(6); + make.leading.trailing.mas_equalTo(self.backImageView).inset(6); make.bottom.mas_equalTo(self.bottomView.mas_top); }]; [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.backImageView); + make.leading.trailing.bottom.mas_equalTo(self.backImageView); make.height.mas_equalTo(30); }]; [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.bottomView); + make.leading.trailing.mas_equalTo(self.bottomView); make.height.mas_equalTo(11); make.bottom.mas_equalTo(self.bottomView.mas_bottom).offset(-16); }]; [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.bottomView); + make.leading.trailing.mas_equalTo(self.bottomView); make.height.mas_equalTo(11); make.bottom.mas_equalTo(self.bottomView.mas_bottom).offset(-4); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsContentView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsContentView.m index 532cf9c4..35315b54 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsContentView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsContentView.m @@ -126,7 +126,7 @@ - (void)initSubViewConstraints { CGFloat kscale = 292.0 / 375.0; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.height.mas_equalTo(KScreenWidth * kscale); }]; @@ -163,26 +163,26 @@ }]; [self.tipsLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(15); + make.leading.mas_equalTo(self).offset(15); make.centerY.mas_equalTo(self.ballBackView.mas_top); }]; [self.againButton mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(15); make.width.mas_equalTo(75); - make.right.mas_equalTo(self.backImageView).offset(-15); + make.trailing.mas_equalTo(self.backImageView).offset(-15); make.centerY.mas_equalTo(self.tipsLabel); }]; [self.fastButton mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(20); make.width.mas_equalTo(60); - make.right.mas_equalTo(self.againButton.mas_left).offset(-10); + make.trailing.mas_equalTo(self.againButton.mas_leading).offset(-10); make.centerY.mas_equalTo(self.tipsLabel); }]; [self.ballBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.height.mas_equalTo(KScreenWidth * (136.0 / 375.0)); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsRecordView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsRecordView.m index c3750b72..0ff30a41 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsRecordView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsRecordView.m @@ -115,7 +115,7 @@ CGFloat kscale = 387.0 / 318.0; self.frame = CGRectMake(0, 0, KScreenWidth, KScreenWidth * kscale + 134 * kScreenScale); [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.top.mas_equalTo(self.backImageView.mas_bottom); }]; @@ -131,7 +131,7 @@ }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(3); + make.leading.trailing.mas_equalTo(self.backImageView).inset(3); make.top.mas_equalTo(self.backImageView).offset(82); make.bottom.mas_equalTo(self.backImageView).offset(-42); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsView.m index 17d16bb9..fd3dfcb8 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsView.m @@ -99,18 +99,18 @@ CGFloat kscale = 580.0 / 375.0; [self.dismissView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self); + make.leading.trailing.top.mas_equalTo(self); make.bottom.mas_equalTo(self.backImageView.mas_top); }]; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self); + make.leading.trailing.bottom.mas_equalTo(self); make.height.mas_equalTo(KScreenWidth * kscale); }]; [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(28, 28)); - make.left.mas_equalTo(self.backImageView).offset(15); + make.leading.mas_equalTo(self.backImageView).offset(15); make.top.mas_equalTo(self.backImageView).offset(40 * kScreenScale); }]; @@ -123,7 +123,7 @@ [self.recordButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(24, 65)); make.top.mas_equalTo(self.segmentView.mas_bottom).offset(10); - make.right.mas_equalTo(self.backImageView); + make.trailing.mas_equalTo(self.backImageView); }]; [self.segmentView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -134,17 +134,17 @@ [self.middleButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(162, 51)); - make.left.mas_equalTo(self.segmentView.mas_left).offset(5); + make.leading.mas_equalTo(self.segmentView.mas_leading).offset(5); make.centerY.mas_equalTo(self.segmentView).offset(1.5); }]; [self.highButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.centerY.mas_equalTo(self.middleButton); - make.left.mas_equalTo(self.middleButton.mas_right).offset(1); + make.leading.mas_equalTo(self.middleButton.mas_trailing).offset(1); }]; [self.middleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.backImageView); + make.leading.trailing.bottom.mas_equalTo(self.backImageView); make.top.mas_equalTo(self.segmentView.mas_bottom).offset(5 *kScreenScale); }]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyWebView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyWebView.m index 7129c165..88f4c54e 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyWebView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyWebView.m @@ -54,7 +54,7 @@ [self.webVC.view mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.backImageView).offset(20 * kScreenScale); - make.left.right.bottom.mas_equalTo(self.backImageView); + make.leading.trailing.bottom.mas_equalTo(self.backImageView); }]; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/XPTreasureFairyViewController.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/XPTreasureFairyViewController.m index c1f7f18e..585ef590 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/XPTreasureFairyViewController.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/XPTreasureFairyViewController.m @@ -205,14 +205,14 @@ - (void)initSubViewConstraints { [self.dismissView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.backImageView.mas_top).offset(100); }]; CGFloat kscale = 580.0 / 375.0; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.bottom.mas_equalTo(-40); make.height.mas_equalTo(KScreenWidth * kscale); }]; @@ -228,14 +228,14 @@ [self.ticketView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(31); - make.left.mas_equalTo(self.backImageView).offset(15); - make.right.mas_equalTo(self.tickBgImageView.mas_right); + make.leading.mas_equalTo(self.backImageView).offset(15); + make.trailing.mas_equalTo(self.tickBgImageView.mas_trailing); make.top.mas_equalTo(self.backImageView).offset(97 * kScreenScale); }]; [self.ticketImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(39, 38)); - make.left.mas_equalTo(self.ticketView).offset(0); + make.leading.mas_equalTo(self.ticketView).offset(0); make.centerY.mas_equalTo(self.ticketView);; }]; @@ -243,13 +243,13 @@ make.height.mas_equalTo(24); make.width.mas_equalTo(77); make.bottom.mas_equalTo(self.ticketView); - make.left.mas_equalTo(self.ticketView).offset(15); + make.leading.mas_equalTo(self.ticketView).offset(15); }]; [self.ticketLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.ticketImageView.mas_right).offset(2); + make.leading.mas_equalTo(self.ticketImageView.mas_trailing).offset(2); make.centerY.mas_equalTo(self.tickBgImageView); - make.right.equalTo(self.tickBgImageView.mas_right).mas_offset(-3); + make.trailing.equalTo(self.tickBgImageView.mas_trailing).mas_offset(-3); }]; @@ -258,25 +258,25 @@ make.size.mas_equalTo(CGSizeMake(50, 42)); make.centerY.mas_equalTo(self.treasureButton); - make.right.mas_equalTo(self.moreButton.mas_left).offset(-4); + make.trailing.mas_equalTo(self.moreButton.mas_leading).offset(-4); }]; [self.treasureButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(50, 42)); make.top.mas_equalTo(self.backImageView).offset(90 * kScreenScale); - make.right.mas_equalTo(self.myFairyButton.mas_left).offset(-4); + make.trailing.mas_equalTo(self.myFairyButton.mas_leading).offset(-4); }]; [self.moreButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(50, 42)); make.centerY.mas_equalTo(self.myFairyButton); - make.right.mas_equalTo(self.backImageView).offset(-15); + make.trailing.mas_equalTo(self.backImageView).offset(-15); }]; [self.moreView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(111, 135)); make.top.mas_equalTo(self.moreButton.mas_bottom).offset(-2); - make.right.mas_equalTo(self.backImageView).offset(-5); + make.trailing.mas_equalTo(self.backImageView).offset(-5); }]; [self.fairyDrawView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -287,7 +287,7 @@ [self.oneButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(115, 45)); - make.right.mas_equalTo(self.tenButton.mas_left); + make.trailing.mas_equalTo(self.tenButton.mas_leading); make.bottom.mas_equalTo(self.backImageView).offset(-35); }]; @@ -299,22 +299,22 @@ [self.hundredButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(115, 45)); - make.left.mas_equalTo(self.tenButton.mas_right); + make.leading.mas_equalTo(self.tenButton.mas_trailing); make.centerY.mas_equalTo(self.oneButton); }]; [self.noPrizeBnt mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(16); - make.right.mas_equalTo(-20); + make.trailing.mas_equalTo(-20); make.bottom.equalTo(self.hundredButton.mas_top).mas_offset(-5); }]; [self.noPrizeView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.noPrizeBnt); - make.right.equalTo(self.noPrizeBnt.mas_left).mas_offset(-4); + make.trailing.equalTo(self.noPrizeBnt.mas_leading).mas_offset(-4); }]; [self.animationView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.backImageView).offset(15); + make.leading.mas_equalTo(self.backImageView).offset(15); make.bottom.mas_equalTo(self.backImageView).offset(-88); make.width.mas_equalTo(150); make.height.mas_equalTo(30 * 5); diff --git a/YuMi/Modules/YMRoom/View/WishGift/View/Cell/XPWishGiftEmptyTableViewCell.m b/YuMi/Modules/YMRoom/View/WishGift/View/Cell/XPWishGiftEmptyTableViewCell.m index 03aadc00..868a14ab 100644 --- a/YuMi/Modules/YMRoom/View/WishGift/View/Cell/XPWishGiftEmptyTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/WishGift/View/Cell/XPWishGiftEmptyTableViewCell.m @@ -44,7 +44,7 @@ [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.emptyImageView.mas_bottom).offset(20); - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); }]; } #pragma mark - Getters And Setters diff --git a/YuMi/Modules/YMRoom/View/WishGift/View/Cell/XPWishGiftHistoryTableViewCell.m b/YuMi/Modules/YMRoom/View/WishGift/View/Cell/XPWishGiftHistoryTableViewCell.m index 84a5cbaf..a51cbcfc 100644 --- a/YuMi/Modules/YMRoom/View/WishGift/View/Cell/XPWishGiftHistoryTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/WishGift/View/Cell/XPWishGiftHistoryTableViewCell.m @@ -57,34 +57,34 @@ - (void)initSubViewConstraints { [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.contentView).inset(15); + make.leading.trailing.equalTo(self.contentView).inset(15); make.top.bottom.mas_equalTo(self.contentView); }]; [self.levleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.backView); - make.left.mas_equalTo(self.backView).offset(15); + make.leading.mas_equalTo(self.backView).offset(15); }]; [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(24, 24)); make.centerY.mas_equalTo(self.backView); - make.left.mas_equalTo(self.levleLabel.mas_right).offset(20); + make.leading.mas_equalTo(self.levleLabel.mas_trailing).offset(20); }]; [self.giftLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.backView); - make.left.mas_equalTo(self.giftImageView.mas_right).offset(8); - make.right.lessThanOrEqualTo(self.targetNumLabel.mas_left).offset(-5); + make.leading.mas_equalTo(self.giftImageView.mas_trailing).offset(8); + make.trailing.lessThanOrEqualTo(self.targetNumLabel.mas_leading).offset(-5); }]; [self.targetNumLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.backView); - make.right.mas_equalTo(self.backView).offset(-15); + make.trailing.mas_equalTo(self.backView).offset(-15); }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView).inset(13); + make.leading.trailing.mas_equalTo(self.backView).inset(13); make.bottom.mas_equalTo(self.backView); make.height.mas_equalTo(1); }]; diff --git a/YuMi/Modules/YMRoom/View/WishGift/View/Cell/XPWishGiftTableViewCell.m b/YuMi/Modules/YMRoom/View/WishGift/View/Cell/XPWishGiftTableViewCell.m index 113db0ac..5298bd52 100644 --- a/YuMi/Modules/YMRoom/View/WishGift/View/Cell/XPWishGiftTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/WishGift/View/Cell/XPWishGiftTableViewCell.m @@ -67,24 +67,24 @@ - (void)initSubViewConstraints { [self.levleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.contentView).offset(15); + make.leading.mas_equalTo(self.contentView).offset(15); }]; [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(24, 24)); make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.levleLabel.mas_right).offset(20); + make.leading.mas_equalTo(self.levleLabel.mas_trailing).offset(20); }]; [self.giftLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.contentView); - make.left.mas_equalTo(self.giftImageView.mas_right).offset(8); - make.right.lessThanOrEqualTo(self.targetNumLabel.mas_left).offset(-5); + make.leading.mas_equalTo(self.giftImageView.mas_trailing).offset(8); + make.trailing.lessThanOrEqualTo(self.targetNumLabel.mas_leading).offset(-5); }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(18); - make.right.mas_equalTo(self.contentView).offset(-15); + make.trailing.mas_equalTo(self.contentView).offset(-15); make.centerY.mas_equalTo(self.contentView); }]; @@ -97,7 +97,7 @@ }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(13); + make.leading.trailing.mas_equalTo(self.contentView).inset(13); make.bottom.mas_equalTo(self.contentView); make.height.mas_equalTo(1); }]; diff --git a/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftEnterView.m b/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftEnterView.m index b7589c98..ad94c30d 100644 --- a/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftEnterView.m +++ b/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftEnterView.m @@ -53,27 +53,27 @@ - (void)initSubViewConstraints { [self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.bottom.mas_equalTo(self.contentView); + make.leading.top.bottom.mas_equalTo(self.contentView); make.width.mas_equalTo(self.giftImageView.mas_height); }]; [self.giftLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.giftImageView.mas_right).offset(6); + make.leading.mas_equalTo(self.giftImageView.mas_trailing).offset(6); make.top.mas_equalTo(self.contentView).offset(0); - make.right.mas_equalTo(self.contentView).offset(-2); + make.trailing.mas_equalTo(self.contentView).offset(-2); }]; [self.progressLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.giftLabel); - make.right.mas_equalTo(self.contentView); + make.leading.mas_equalTo(self.giftLabel); + make.trailing.mas_equalTo(self.contentView); make.top.mas_equalTo(self.giftLabel.mas_bottom).offset(1); }]; [self.progressView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(3); make.bottom.mas_equalTo(self.contentView.mas_bottom).offset(-2); - make.left.mas_equalTo(self.giftImageView.mas_right).offset(2); - make.right.mas_equalTo(self.contentView).offset(-5); + make.leading.mas_equalTo(self.giftImageView.mas_trailing).offset(2); + make.trailing.mas_equalTo(self.contentView).offset(-5); }]; } diff --git a/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftInfoView.m b/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftInfoView.m index ee26400d..96f0515c 100644 --- a/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftInfoView.m +++ b/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftInfoView.m @@ -69,23 +69,23 @@ }]; [self.giftLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.bgView).inset(2); + make.leading.trailing.mas_equalTo(self.bgView).inset(2); make.top.mas_equalTo(self.giftImageView.mas_bottom).offset(4); }]; [self.priceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.bgView).inset(2); + make.leading.trailing.mas_equalTo(self.bgView).inset(2); make.top.mas_equalTo(self.giftLabel.mas_bottom).offset(4); }]; [self.progressView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.bgView).inset(10); + make.leading.trailing.mas_equalTo(self.bgView).inset(10); make.top.mas_equalTo(self.priceLabel.mas_bottom).offset(10); make.height.mas_equalTo(5); }]; [self.progressLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.bgView); + make.leading.trailing.mas_equalTo(self.bgView); make.top.mas_equalTo(self.progressView.mas_bottom).offset(4); }]; diff --git a/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftListView.m b/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftListView.m index 4b30d713..08fcd7a7 100644 --- a/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftListView.m +++ b/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftListView.m @@ -38,7 +38,7 @@ - (void)initSubViewConstraints { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView).inset(13); + make.leading.trailing.mas_equalTo(self.contentView).inset(13); make.centerY.mas_equalTo(self.contentView); }]; } @@ -115,7 +115,7 @@ }]; [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self); + make.leading.trailing.mas_equalTo(self); make.top.mas_equalTo(self); }]; @@ -129,13 +129,13 @@ [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(22, 22)); - make.right.mas_equalTo(self.selectView.mas_right).offset(-11); + make.trailing.mas_equalTo(self.selectView.mas_trailing).offset(-11); make.centerY.mas_equalTo(self.selectView); }]; [self.titlelable mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.selectView); - make.left.mas_equalTo(self.selectView).offset(13); + make.leading.mas_equalTo(self.selectView).offset(13); }]; } diff --git a/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftSectionView.m b/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftSectionView.m index 9612c6e6..f732a38b 100644 --- a/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftSectionView.m +++ b/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftSectionView.m @@ -32,7 +32,7 @@ - (void)initSubViewConstraints { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self).offset(24); + make.leading.mas_equalTo(self).offset(24); make.centerY.mas_equalTo(self); }]; } diff --git a/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateItemViewController.m b/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateItemViewController.m index efae5760..3a1c0d8d 100644 --- a/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateItemViewController.m +++ b/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateItemViewController.m @@ -108,34 +108,34 @@ - (void)initSubViewConstraints { [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.right.top.left.mas_equalTo(self.view); + make.trailing.top.leading.mas_equalTo(self.view); make.bottom.mas_equalTo(self.backView.mas_top); }]; [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(38); + make.leading.trailing.mas_equalTo(self.view).inset(38); make.height.mas_equalTo(245); make.centerY.mas_equalTo(self.view); }]; [self.bottomView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.top.mas_equalTo(self.backView.mas_bottom); }]; [self.levelView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView).inset(30); + make.leading.trailing.mas_equalTo(self.backView).inset(30); make.top.mas_equalTo(self.backView).offset(36); }]; [self.giftView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backView).inset(30); + make.leading.trailing.mas_equalTo(self.backView).inset(30); make.top.mas_equalTo(self.backView).offset(84); }]; [self.numberStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.levelView); + make.leading.trailing.mas_equalTo(self.levelView); make.height.mas_equalTo(36); make.bottom.mas_equalTo(self.sureButton.mas_top).offset(-20); }]; diff --git a/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateViewController.m b/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateViewController.m index 07ec2295..7f7a71da 100644 --- a/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateViewController.m +++ b/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateViewController.m @@ -100,30 +100,30 @@ - (void)initSubViewConstraints { [self.configLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.view).offset(24); + make.leading.mas_equalTo(self.view).offset(24); make.top.mas_equalTo(self.view).offset(14); }]; [self.clearWishButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(60, 20)); make.centerY.mas_equalTo(self.configLabel); - make.right.mas_equalTo(self.addWishButton.mas_left).offset(-10); + make.trailing.mas_equalTo(self.addWishButton.mas_leading).offset(-10); }]; [self.addWishButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.configLabel); - make.right.mas_equalTo(self.view).offset(-18); + make.trailing.mas_equalTo(self.view).offset(-18); make.size.mas_equalTo(CGSizeMake(60, 20)); }]; [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(15); + make.leading.trailing.mas_equalTo(self.view).inset(15); make.height.mas_equalTo(135); make.top.mas_equalTo(self.configLabel.mas_bottom).offset(13); }]; [self.createButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(80); + make.leading.trailing.mas_equalTo(self.view).inset(80); make.height.mas_equalTo(37); make.top.mas_equalTo(self.tableView.mas_bottom).offset(48); }]; diff --git a/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftViewController.m b/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftViewController.m index 964bd881..e105f640 100644 --- a/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftViewController.m +++ b/YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftViewController.m @@ -106,12 +106,12 @@ - (void)initSubViewConstraints { [self.topView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.right.equalTo(self.view); + make.leading.top.trailing.equalTo(self.view); make.bottom.mas_equalTo(self.backImageView.mas_top); }]; [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.height.mas_equalTo(283 + kSafeAreaBottomHeight); }]; @@ -126,14 +126,14 @@ }]; [self.lineView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView); + make.leading.trailing.mas_equalTo(self.backImageView); make.top.mas_equalTo(self.tipsLbel.mas_bottom).offset(12); make.height.mas_equalTo(0.5); }]; [self.userStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(28); - make.left.mas_equalTo(self.backImageView).offset(16); + make.leading.mas_equalTo(self.backImageView).offset(16); make.top.mas_equalTo(self.lineView.mas_bottom).offset(10); }]; @@ -150,7 +150,7 @@ }]; [self.assistNumLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.backImageView).inset(15); + make.leading.trailing.mas_equalTo(self.backImageView).inset(15); make.centerY.mas_equalTo(self.userStackView); }]; diff --git a/YuMi/Modules/YMRoom/View/XPMiniRoomView.m b/YuMi/Modules/YMRoom/View/XPMiniRoomView.m index 03c02f7d..fcb5547d 100644 --- a/YuMi/Modules/YMRoom/View/XPMiniRoomView.m +++ b/YuMi/Modules/YMRoom/View/XPMiniRoomView.m @@ -135,7 +135,7 @@ UIKIT_EXTERN NSString *kRoomKickoutTime; - (void)initSubViewConstraints { [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.bottom.equalTo(self); + make.leading.bottom.equalTo(self); make.width.height.mas_equalTo(57); }]; @@ -155,7 +155,7 @@ UIKIT_EXTERN NSString *kRoomKickoutTime; }]; [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(20); - make.left.equalTo(self.backImageView.mas_left).mas_offset(47); + make.leading.equalTo(self.backImageView.mas_leading).mas_offset(47); make.bottom.equalTo(self.backImageView.mas_bottom).mas_offset(-50); }]; } diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index 6bd6f2bd..802b739f 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m @@ -414,12 +414,12 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 make.edges.mas_equalTo(self.view); }]; [self.roomHeaderView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.view); + make.leading.trailing.top.mas_equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.stageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.roomHeaderView.mas_bottom); make.height.mas_equalTo(self.stageView.hightForStageView); }]; @@ -427,8 +427,8 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.messageContainerView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.stageView.mas_bottom); make.bottom.equalTo(self.quickMessageContainerView.mas_top).offset(-5); - make.left.equalTo(self.view); - make.right.equalTo(self.activityContainerView.mas_left).offset(-10); + make.leading.equalTo(self.view); + make.trailing.equalTo(self.activityContainerView.mas_leading).offset(-10); }]; CGFloat quickMsgHeight = 30; //记录最后关闭时间 @@ -442,16 +442,16 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.quickMessageContainerView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(self.menuContainerView.mas_top); make.height.mas_equalTo(quickMsgHeight); - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); }]; [self.menuContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.view); + make.leading.trailing.bottom.mas_equalTo(self.view); make.height.mas_equalTo(52 + kSafeAreaBottomHeight); }]; [self.activityContainerView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.messageContainerView); - make.right.mas_equalTo(self.view); + make.trailing.mas_equalTo(self.view); make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5); make.width.mas_equalTo(87); }]; @@ -477,33 +477,33 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 make.edges.mas_equalTo(self.anchorScrollView.middleImageView); }]; [self.roomHeaderView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.mas_equalTo(self.anchorScrollView.middleImageView); + make.leading.trailing.top.mas_equalTo(self.anchorScrollView.middleImageView); make.height.mas_equalTo(kNavigationHeight); }]; [self.stageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.anchorScrollView.middleImageView); + make.leading.trailing.mas_equalTo(self.anchorScrollView.middleImageView); make.top.mas_equalTo(self.roomHeaderView.mas_bottom); make.height.mas_equalTo(self.stageView.hightForStageView); }]; [self.messageContainerView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.stageView.mas_bottom); make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).mas_offset(-5); - make.left.equalTo(self.anchorScrollView.middleImageView); - make.right.equalTo(self.activityContainerView.mas_left).offset(-10); + make.leading.equalTo(self.anchorScrollView.middleImageView); + make.trailing.equalTo(self.activityContainerView.mas_leading).offset(-10); }]; [self.quickMessageContainerView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(30); make.bottom.mas_equalTo(self.backContainerView).mas_offset(-5-40-8-kSafeAreaBottomHeight); - make.left.equalTo(self.anchorScrollView.middleImageView); - make.right.equalTo(self.activityContainerView.mas_left).offset(-10); + make.leading.equalTo(self.anchorScrollView.middleImageView); + make.trailing.equalTo(self.activityContainerView.mas_leading).offset(-10); }]; [self.menuContainerView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.anchorScrollView.middleImageView); + make.leading.trailing.bottom.mas_equalTo(self.anchorScrollView.middleImageView); make.height.mas_equalTo(52 + kSafeAreaBottomHeight); }]; [self.activityContainerView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.messageContainerView); - make.right.mas_equalTo(self.anchorScrollView.middleImageView); + make.trailing.mas_equalTo(self.anchorScrollView.middleImageView); make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).mas_offset(-5); make.width.mas_equalTo(87); }]; @@ -602,7 +602,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.functionView updateRankViewConstraintsWityType:self.roomInfo.type]; if (self.roomInfo.type == RoomType_MiniGame) { [self.stageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.roomHeaderView.mas_bottom).offset(26 + 4); make.height.mas_equalTo(self.stageView.hightForStageView); }]; @@ -615,8 +615,8 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.messageContainerView mas_remakeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(height); make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5); - make.left.mas_equalTo(self.view); - make.right.mas_equalTo(self.activityContainerView.mas_left).offset(-10); + make.leading.mas_equalTo(self.view); + make.trailing.mas_equalTo(self.activityContainerView.mas_leading).offset(-10); }]; self.quickMessageContainerView.hidden = YES; [self.quickMessageContainerView mas_updateConstraints:^(MASConstraintMaker *make) { @@ -624,7 +624,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 }]; [self.activityContainerView mas_remakeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(65); - make.right.mas_equalTo(self.view); + make.trailing.mas_equalTo(self.view); make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5); make.width.mas_equalTo(87); }]; @@ -636,7 +636,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 make.height.mas_equalTo(30); }]; [self.stageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view); + make.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.roomHeaderView.mas_bottom); make.height.mas_equalTo(self.stageView.hightForStageView); }]; @@ -644,13 +644,13 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.messageContainerView mas_remakeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.stageView.mas_bottom); make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5); - make.left.mas_equalTo(self.view); - make.right.mas_equalTo(self.activityContainerView.mas_left).offset(-10); + make.leading.mas_equalTo(self.view); + make.trailing.mas_equalTo(self.activityContainerView.mas_leading).offset(-10); }]; [self.activityContainerView mas_remakeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.messageContainerView); - make.right.mas_equalTo(self.view); + make.trailing.mas_equalTo(self.view); make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).offset(-5); make.width.mas_equalTo(87); }]; @@ -673,15 +673,15 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 } [self.stageView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.anchorScrollView.middleImageView); + make.leading.trailing.mas_equalTo(self.anchorScrollView.middleImageView); make.top.mas_equalTo(self.roomHeaderView.mas_bottom); make.height.mas_equalTo(self.stageView.hightForStageView); }]; [self.messageContainerView mas_remakeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.stageView.mas_bottom); make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).mas_offset(-5); - make.left.mas_equalTo(self.anchorScrollView.middleImageView); - make.right.mas_equalTo(self.activityContainerView.mas_left).offset(-10); + make.leading.mas_equalTo(self.anchorScrollView.middleImageView); + make.trailing.mas_equalTo(self.activityContainerView.mas_leading).offset(-10); }]; CGFloat quickMsgHeight = 30; @@ -697,11 +697,11 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.quickMessageContainerView mas_remakeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(quickMsgHeight); make.bottom.mas_equalTo(self.backContainerView).mas_offset(-5-40-8-kSafeAreaBottomHeight); - make.left.right.mas_equalTo(self.anchorScrollView.middleImageView); + make.leading.trailing.mas_equalTo(self.anchorScrollView.middleImageView); }]; [self.activityContainerView mas_remakeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.messageContainerView); - make.right.mas_equalTo(self.anchorScrollView.middleImageView); + make.trailing.mas_equalTo(self.anchorScrollView.middleImageView); make.bottom.mas_equalTo(self.quickMessageContainerView.mas_top).mas_offset(-5); make.width.mas_equalTo(87); }]; diff --git a/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m b/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m index 14676a89..8999e08a 100644 --- a/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m +++ b/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m @@ -103,41 +103,41 @@ - (void)initSubViewConstraints { [self.backImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.mas_equalTo(0); - make.left.right.mas_equalTo(self).inset(10); + make.leading.trailing.mas_equalTo(self).inset(10); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(66, 66)); make.top.mas_equalTo(12); - make.left.mas_equalTo(20); + make.leading.mas_equalTo(20); }]; [self.nickButton mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.avatarImageView).mas_offset(13); - make.left.mas_equalTo(self.avatarImageView.mas_right).mas_offset(8); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).mas_offset(8); make.height.mas_equalTo(20); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.nickButton); - make.left.mas_equalTo(self.nickButton.mas_right).mas_offset(4); - make.right.mas_equalTo(-51); + make.leading.mas_equalTo(self.nickButton.mas_trailing).mas_offset(4); + make.trailing.mas_equalTo(-51); make.height.mas_equalTo(15); }]; [self.genderImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(28, 14)); - make.right.bottom.mas_equalTo(self.avatarImageView).mas_offset(-4); + make.trailing.bottom.mas_equalTo(self.avatarImageView).mas_offset(-4); }]; [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nickButton); + make.leading.mas_equalTo(self.nickButton); make.top.mas_equalTo(self.nickButton.mas_bottom).mas_offset(4); make.height.mas_equalTo(17); - make.right.mas_equalTo(self.enterRoomButton.mas_left).mas_offset(-15); + make.trailing.mas_equalTo(self.enterRoomButton.mas_leading).mas_offset(-15); }]; [self.enterRoomButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(79, 24)); make.top.mas_equalTo(51); - make.right.mas_equalTo(-20); + make.trailing.mas_equalTo(-20); }]; [self.countBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.right.mas_equalTo(self.backImageView); + make.top.trailing.mas_equalTo(self.backImageView); make.size.mas_equalTo(CGSizeMake(48, 20)); }]; [self.countLabel mas_makeConstraints:^(MASConstraintMaker *make) { @@ -146,7 +146,7 @@ [self.alphaImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.nickButton); make.size.mas_equalTo(CGSizeMake(44, 15)); - make.right.mas_equalTo(-51); + make.trailing.mas_equalTo(-51); }]; } @@ -352,14 +352,14 @@ }]; [self.playButton mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(18); - make.left.mas_equalTo(self.nickButton); + make.leading.mas_equalTo(self.nickButton); make.top.mas_equalTo(self.descLabel.mas_bottom).mas_offset(4); }]; [self.noteImaegView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(79, 12)); make.centerY.mas_equalTo(self.playButton); - make.left.mas_equalTo(self.playButton.mas_right).offset(5); + make.leading.mas_equalTo(self.playButton.mas_trailing).offset(5); }]; } } diff --git a/YuMi/Modules/YMTabbar/View/Cell/XPAnchorCardSkillCollectionViewCell.m b/YuMi/Modules/YMTabbar/View/Cell/XPAnchorCardSkillCollectionViewCell.m index 8f0d01d3..c4f66c3c 100644 --- a/YuMi/Modules/YMTabbar/View/Cell/XPAnchorCardSkillCollectionViewCell.m +++ b/YuMi/Modules/YMTabbar/View/Cell/XPAnchorCardSkillCollectionViewCell.m @@ -26,7 +26,7 @@ - (void)initSubViewConstraints { [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.top.bottom.mas_equalTo(self.contentView); }]; } diff --git a/YuMi/Modules/YMTabbar/View/Cell/XPNewUserRechargeCollectionViewCell.m b/YuMi/Modules/YMTabbar/View/Cell/XPNewUserRechargeCollectionViewCell.m index 19504c8e..cae6de2e 100644 --- a/YuMi/Modules/YMTabbar/View/Cell/XPNewUserRechargeCollectionViewCell.m +++ b/YuMi/Modules/YMTabbar/View/Cell/XPNewUserRechargeCollectionViewCell.m @@ -54,14 +54,14 @@ make.centerX.mas_equalTo(self); make.height.mas_equalTo(17); make.top.mas_equalTo(self.iconImageView.mas_bottom).mas_offset(2); - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); }]; [self.timeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(self.titleLabel.mas_bottom); make.height.mas_equalTo(14); make.centerX.mas_equalTo(self); - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); }]; } diff --git a/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m b/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m index ba4499e8..573c4586 100644 --- a/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m +++ b/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m @@ -71,12 +71,12 @@ }]; [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.mas_equalTo(self.contentView); + make.leading.trailing.bottom.mas_equalTo(self.contentView); make.top.mas_equalTo(self.topImageView.mas_bottom); }]; [self.versionLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.topImageView).offset(25); + make.leading.mas_equalTo(self.topImageView).offset(25); make.top.mas_equalTo(self.topImageView).offset(90 * kScreenScale); }]; @@ -95,8 +95,8 @@ [self.textView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.topImageView.mas_bottom).mas_offset(3); - make.left.mas_equalTo(17); - make.right.mas_equalTo(-17); + make.leading.mas_equalTo(17); + make.trailing.mas_equalTo(-17); make.bottom.equalTo(self.stackView.mas_top).offset(-5); }]; diff --git a/YuMi/Modules/YMWeb/XPWebViewController.m b/YuMi/Modules/YMWeb/XPWebViewController.m index b860a5ad..377317f8 100644 --- a/YuMi/Modules/YMWeb/XPWebViewController.m +++ b/YuMi/Modules/YMWeb/XPWebViewController.m @@ -204,15 +204,15 @@ NSString * const kJSSavePictureShare = @"savePictureShare"; [self.view addSubview:self.webview]; [self.view addSubview:self.progressView]; [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self.view); + make.leading.trailing.top.equalTo(self.view); make.height.mas_equalTo(kNavigationHeight); }]; [self.webview mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(self.view); + make.leading.trailing.bottom.equalTo(self.view); make.top.equalTo(self.navView.mas_bottom); }]; [self.progressView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.view); + make.leading.trailing.equalTo(self.view); make.height.mas_equalTo(1); make.top.equalTo(self.navView.mas_bottom); }]; @@ -220,7 +220,7 @@ NSString * const kJSSavePictureShare = @"savePictureShare"; [self.view addSubview:self.webview]; [self.view addSubview:self.progressView]; [self.webview mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.bottom.mas_equalTo(self.view); + make.leading.trailing.top.bottom.mas_equalTo(self.view); }]; } diff --git a/YuMi/Modules/YMWeb/XPWebViewNavView.m b/YuMi/Modules/YMWeb/XPWebViewNavView.m index e6417b73..6613aef0 100644 --- a/YuMi/Modules/YMWeb/XPWebViewNavView.m +++ b/YuMi/Modules/YMWeb/XPWebViewNavView.m @@ -37,7 +37,7 @@ - (void)initSubViewConstraints { [self.backButton mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(28)); - make.left.mas_equalTo(0); + make.leading.mas_equalTo(0); make.bottom.mas_equalTo(-kGetScaleWidth(8)); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Structure/PrefixHeader.pch b/YuMi/Structure/PrefixHeader.pch index 1cc7e276..2bd37264 100644 --- a/YuMi/Structure/PrefixHeader.pch +++ b/YuMi/Structure/PrefixHeader.pch @@ -58,4 +58,5 @@ isEnterprise = [bundleID isEqualToString:@"com.hflighting.yumi"];\ #import "PIBaseModel.h" #import "PLTimeUtil.h" #import "UIImage+ImageEffects.h" +#import "UIImage+MSRTL.h" #endif /* PrefixHeader_pch */ diff --git a/YuMi/Tools/Bundle/NSBundle+Localizable.m b/YuMi/Tools/Bundle/NSBundle+Localizable.m index 31435849..48fa5e34 100644 --- a/YuMi/Tools/Bundle/NSBundle+Localizable.m +++ b/YuMi/Tools/Bundle/NSBundle+Localizable.m @@ -6,10 +6,17 @@ // #import "NSBundle+Localizable.h" - +#import @implementation NSBundle (Localizable) - ++(void)load{ + Method oldMethod = class_getClassMethod(self, @selector(mj_localizedStringForKey:)); + Method newMethod = class_getClassMethod(self, @selector(ms_localizedStringForKey:)); + method_exchangeImplementations(oldMethod, newMethod); +} ++ (NSString *)ms_localizedStringForKey:(NSString *)key{ + return YMLocalizedString(key); +} +(NSString *)ymLocalizedStringForKey:(NSString *)key { return [self ymLocalizedStringForKey:key value:nil]; @@ -18,6 +25,7 @@ +(NSString *)ymLocalizedStringForKey:(NSString *)key value:(NSString *)value { + NSString *language = [NSBundle getLanguageText]; NSBundle * bundle = [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:language ofType:@"lproj"]]; value = [bundle localizedStringForKey:key value:value table:nil]; diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index 802cdd7b..1e30e5f3 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -3731,6 +3731,25 @@ ineHeadView12" = "الحمل"; "App_Common_Year" = "سنة yyyy"; "App_Common_hao" = "رقم"; +"MJRefreshHeaderIdleText" = "للتحديث اسحب للأسفل"; +"MJRefreshHeaderPullingText" = "حرر للتحديث الآن"; +"MJRefreshHeaderRefreshingText" = "جاري تحديث البيانات ..."; + +"MJRefreshTrailerIdleText" = "انتقد لعرض تفاصيل الرسم"; +"MJRefreshTrailerPullingText" = "حرر لعرض تفاصيل الرسم"; + +"MJRefreshAutoFooterIdleText" = "انقر أو اسحب لتحميل المزيد"; +"MJRefreshAutoFooterRefreshingText" = "تحميل المزيد من البيانات ..."; +"MJRefreshAutoFooterNoMoreDataText" = "كل تحميل"; + +"MJRefreshBackFooterIdleText" = "سحب ما يصل لتحميل المزيد"; +"MJRefreshBackFooterPullingText" = "حرر لتحميل المزيد الآن"; +"MJRefreshBackFooterRefreshingText" = "تحميل المزيد من البيانات ..."; +"MJRefreshBackFooterNoMoreDataText" = "كل تحميل"; + +"MJRefreshHeaderLastTimeText" = "اخر تحديث:"; +"MJRefreshHeaderDateTodayText" = "اليوم"; +"MJRefreshHeaderNoneLastDateText" = "لا سجلات"; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index 86dae1ce..0ab08e90 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -3577,3 +3577,22 @@ "XPMineSwitchLanguageVC0"="Language Settings"; "XPMineSwitchLanguageVC1"="Save"; +"MJRefreshHeaderIdleText" = "Pull down to refresh"; +"MJRefreshHeaderPullingText" = "Release to refresh now"; +"MJRefreshHeaderRefreshingText" = "Refreshing data..."; + +"MJRefreshTrailerIdleText" = "Swipe to view graphic details"; +"MJRefreshTrailerPullingText" = "Release to view graphic details"; + +"MJRefreshAutoFooterIdleText" = "Click or pull up to load more"; +"MJRefreshAutoFooterRefreshingText" = "Loading more data..."; +"MJRefreshAutoFooterNoMoreDataText" = "All loaded"; + +"MJRefreshBackFooterIdleText" = "Pull up to load more"; +"MJRefreshBackFooterPullingText" = "Release to load more now"; +"MJRefreshBackFooterRefreshingText" = "Loading more data..."; +"MJRefreshBackFooterNoMoreDataText" = "All loaded"; + +"MJRefreshHeaderLastTimeText" = "Latest update:"; +"MJRefreshHeaderDateTodayText" = "Today"; +"MJRefreshHeaderNoneLastDateText" = "No record";