Skip to content

陈高翔 / DreamSleep-iOS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit f16cf4d5 由 cgx
选项

适配黑夜模式

1 个父辈 342a122f
内嵌 并排
正在显示 9 个修改的文件 包含 50 行增加 和 11 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
...@@ -2437,7 +2437,7 @@ ...@@ -2437,7 +2437,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 3;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4NDZ6UX8PW; DEVELOPMENT_TEAM = 4NDZ6UX8PW;
...@@ -2519,7 +2519,7 @@ ...@@ -2519,7 +2519,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 3;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4NDZ6UX8PW; DEVELOPMENT_TEAM = 4NDZ6UX8PW;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
...@@ -2660,7 +2660,7 @@ ...@@ -2660,7 +2660,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 3;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 4NDZ6UX8PW; DEVELOPMENT_TEAM = 4NDZ6UX8PW;
......
DreamSleep/DreamSleep/Class/ProfileModule/Account/Controller/NickNameController.m
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
[self.cameraIV mas_makeConstraints:^(MASConstraintMaker *make) { [self.cameraIV mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.portraitIV).offset(-6); make.right.equalTo(self.portraitIV).offset(-6);
make.bottom.equalTo(self.portraitIV).offset(-6); make.bottom.equalTo(self.portraitIV).offset(-6);
make.size.mas_equalTo(CGSizeMake(30, 30));
}]; }];
[self.nickTF mas_makeConstraints:^(MASConstraintMaker *make) { [self.nickTF mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.equalTo(self.mainView); make.centerX.equalTo(self.mainView);
...@@ -109,7 +110,9 @@ ...@@ -109,7 +110,9 @@
- (UIImageView *)cameraIV { - (UIImageView *)cameraIV {
if (!_cameraIV) { if (!_cameraIV) {
_cameraIV = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"cameraIcon"]]; _cameraIV = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"cameraIcon"]];
_cameraIV.dk_alphaPicker = DKAlphaPickerWithAlphas(1, .5, .5); if ([self.dk_manager.themeVersion isEqualToString:DKThemeVersionNight]) {
[_cameraIV addMaskWithType:MaskTypeAllCorner cornerRadius:15];
}
} }
return _cameraIV; return _cameraIV;
} }
......
DreamSleep/DreamSleep/Class/ProfileModule/Account/View/UserInfoTableView.m
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
[self.contentView addSubview:self.titleLab]; [self.contentView addSubview:self.titleLab];
self.detailLab = [UILabel labWithFont:SysFont(14.0)]; self.detailLab = [UILabel labWithFont:SysFont(14.0)];
self.detailLab.textAlignment = NSTextAlignmentRight;
self.detailLab.dk_textColorPicker = DKColorPickerWithColors(SubTitleColor, ColorFromHex(0x8C8F9D), DSWhite); self.detailLab.dk_textColorPicker = DKColorPickerWithColors(SubTitleColor, ColorFromHex(0x8C8F9D), DSWhite);
[self.contentView addSubview:self.detailLab]; [self.contentView addSubview:self.detailLab];
} }
...@@ -72,19 +73,20 @@ ...@@ -72,19 +73,20 @@
- (void)updateUIWithModel:(UserShowModel *)model { - (void)updateUIWithModel:(UserShowModel *)model {
self.titleLab.text = model.title; self.titleLab.text = model.title;
self.detailLab.text = model.detail; self.detailLab.text = model.detail;
[self.titleLab sizeToFit];
[self.detailLab sizeToFit];
[self.titleLab mas_makeConstraints:^(MASConstraintMaker *make) { [self.titleLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.contentView).offset(15); make.left.equalTo(self.contentView).offset(15);
make.centerY.equalTo(self.contentView); make.centerY.equalTo(self.contentView);
make.width.equalTo(@40);
}]; }];
[self.detailLab mas_makeConstraints:^(MASConstraintMaker *make) { [self.detailLab mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.titleLab.mas_right).offset(8);
make.right.equalTo(self.rightIcon.mas_left).offset(-8); make.right.equalTo(self.rightIcon.mas_left).offset(-8);
make.centerY.equalTo(self.contentView); make.centerY.equalTo(self.contentView);
}]; }];
[self.rightIcon mas_makeConstraints:^(MASConstraintMaker *make) { [self.rightIcon mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.equalTo(self.contentView); make.centerY.equalTo(self.contentView);
make.size.mas_equalTo(CGSizeMake(30, 30));
make.right.equalTo(self.contentView).offset(-8); make.right.equalTo(self.contentView).offset(-8);
}]; }];
} }
......
DreamSleep/DreamSleep/Class/ProfileModule/Account/View/UserInfoView.m
...@@ -101,12 +101,15 @@ ...@@ -101,12 +101,15 @@
[self addSubview:_portraitIV]; [self addSubview:_portraitIV];
UIImageView *cameraIV = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"cameraIcon"]]; UIImageView *cameraIV = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"cameraIcon"]];
cameraIV.dk_alphaPicker = DKAlphaPickerWithAlphas(1, .5, .5);
[self addSubview:cameraIV]; [self addSubview:cameraIV];
[cameraIV mas_makeConstraints:^(MASConstraintMaker *make) { [cameraIV mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(_portraitIV).offset(-6); make.right.equalTo(_portraitIV).offset(-6);
make.bottom.equalTo(_portraitIV).offset(-6); make.bottom.equalTo(_portraitIV).offset(-6);
make.size.mas_equalTo(CGSizeMake(30, 30));
}]; }];
if ([self.dk_manager.themeVersion isEqualToString:DKThemeVersionNight]) {
[cameraIV addMaskWithType:MaskTypeAllCorner cornerRadius:15];
}
} }
return _portraitIV; return _portraitIV;
} }
......
DreamSleep/DreamSleep/Class/ProfileModule/Me/ProfileHeaderView.m
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
[self.titleLab mas_remakeConstraints:^(MASConstraintMaker *make) { [self.titleLab mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.portraitIV.mas_right).offset(20); make.left.equalTo(self.portraitIV.mas_right).offset(20);
make.top.equalTo(self.portraitIV).offset(4); make.top.equalTo(self.portraitIV).offset(4);
make.right.equalTo(self.modifyBtn.mas_left).offset(-20);
}]; }];
[self.levelIV mas_makeConstraints:^(MASConstraintMaker *make) { [self.levelIV mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.titleLab).offset(-8); make.left.equalTo(self.titleLab).offset(-8);
......
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/View/ScoreDetailCell.m
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
- (UILabel *)taskDateLab { - (UILabel *)taskDateLab {
if (!_taskDateLab) { if (!_taskDateLab) {
_taskDateLab = [UILabel labWithFont:SysFont(12.0)]; _taskDateLab = [UILabel labWithFont:SysFont(12.0)];
_taskDateLab.dk_textColorPicker = DKColorPickerWithColors(SmallTextColor, ColorFromHexA(0xFFFFFF, .3)); _taskDateLab.dk_textColorPicker = DKColorPickerWithColors(SmallTextColor, ColorFromHexA(0xFFFFFF, .3), DSWhite);
} }
return _taskDateLab; return _taskDateLab;
} }
......
DreamSleep/DreamSleep/Class/ProfileModule/ScoreTaskAI/View/ScoreRulesView.m
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
- (UILabel *)ruleLab { - (UILabel *)ruleLab {
if (!_ruleLab) { if (!_ruleLab) {
_ruleLab = [UILabel labWithFont:SysFont(14.0)]; _ruleLab = [UILabel labWithFont:SysFont(14.0)];
_ruleLab.dk_textColorPicker = DKColorPickerWithColors(SubTitleColor, ColorFromHexA(0xFFFFFF, .5)); _ruleLab.dk_textColorPicker = DKColorPickerWithColors(SubTitleColor, ColorFromHexA(0xFFFFFF, .5), DSWhite);
_ruleLab.numberOfLines = 0; _ruleLab.numberOfLines = 0;
} }
return _ruleLab; return _ruleLab;
......
DreamSleep/Pods/Pods.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -8,76 +8,106 @@ ...@@ -8,76 +8,106 @@
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>4</integer>
</dict> </dict>
<key>DKNightVersion.xcscheme</key> <key>DKNightVersion.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>5</integer>
</dict> </dict>
<key>DOUAudioStreamer.xcscheme</key> <key>DOUAudioStreamer.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>6</integer>
</dict> </dict>
<key>FreeStreamer.xcscheme</key> <key>FreeStreamer.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>7</integer>
</dict> </dict>
<key>IQKeyboardManager.xcscheme</key> <key>IQKeyboardManager.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>8</integer>
</dict> </dict>
<key>MBProgressHUD.xcscheme</key> <key>MBProgressHUD.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>11</integer>
</dict> </dict>
<key>MJRefresh.xcscheme</key> <key>MJRefresh.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>12</integer>
</dict> </dict>
<key>Masonry.xcscheme</key> <key>Masonry.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>10</integer>
</dict> </dict>
<key>Pods-DreamSleep.xcscheme</key> <key>Pods-DreamSleep.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>13</integer>
</dict> </dict>
<key>Reachability.xcscheme</key> <key>Reachability.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>14</integer>
</dict> </dict>
<key>YYCache.xcscheme</key> <key>YYCache.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>15</integer>
</dict> </dict>
<key>YYImage.xcscheme</key> <key>YYImage.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>16</integer>
</dict> </dict>
<key>YYModel.xcscheme</key> <key>YYModel.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>17</integer>
</dict> </dict>
<key>YYWebImage.xcscheme</key> <key>YYWebImage.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>18</integer>
</dict> </dict>
<key>lottie-ios.xcscheme</key> <key>lottie-ios.xcscheme</key>
<dict> <dict>
<key>isShown</key> <key>isShown</key>
<false/> <false/>
<key>orderHint</key>
<integer>9</integer>
</dict> </dict>
</dict> </dict>
<key>SuppressBuildableAutocreation</key> <key>SuppressBuildableAutocreation</key>
......
DreamSleep/TapiOS/Unity-iPhone.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<key>UnityFramework.xcscheme_^#shared#^_</key> <key>UnityFramework.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>20</integer> <integer>19</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!