Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3a92911

Browse files
fix
1 parent 3f1e33d commit 3a92911

File tree

13 files changed

+200
-13
lines changed

13 files changed

+200
-13
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Coding_iOS/Coding_Enterprise_iOS-Prefix.pch
2626
# you should judge for yourself, the pros and cons are mentioned at:
2727
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
2828
#
29+
Carthage/
2930
Pods/
3031
.idea/
3132
*.xcbkptlist

‎Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "libgit2/objective-git" "0.13.0"
1+
github "libgit2/objective-git" "0.14.1"
Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1000"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "B1D5EBF120BC06CB00983FB6"
18+
BuildableName = "Coding_Enterprise_iOS.app"
19+
BlueprintName = "Coding_Enterprise_iOS"
20+
ReferencedContainer = "container:Coding_iOS.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "B1D5EBF120BC06CB00983FB6"
36+
BuildableName = "Coding_Enterprise_iOS.app"
37+
BlueprintName = "Coding_Enterprise_iOS"
38+
ReferencedContainer = "container:Coding_iOS.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
41+
<AdditionalOptions>
42+
</AdditionalOptions>
43+
</TestAction>
44+
<LaunchAction
45+
buildConfiguration = "Debug"
46+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
47+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
48+
launchStyle = "0"
49+
useCustomWorkingDirectory = "NO"
50+
ignoresPersistentStateOnLaunch = "NO"
51+
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
53+
allowLocationSimulation = "YES">
54+
<BuildableProductRunnable
55+
runnableDebuggingMode = "0">
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "B1D5EBF120BC06CB00983FB6"
59+
BuildableName = "Coding_Enterprise_iOS.app"
60+
BlueprintName = "Coding_Enterprise_iOS"
61+
ReferencedContainer = "container:Coding_iOS.xcodeproj">
62+
</BuildableReference>
63+
</BuildableProductRunnable>
64+
<AdditionalOptions>
65+
</AdditionalOptions>
66+
</LaunchAction>
67+
<ProfileAction
68+
buildConfiguration = "Release"
69+
shouldUseLaunchSchemeArgsEnv = "YES"
70+
savedToolIdentifier = ""
71+
useCustomWorkingDirectory = "NO"
72+
debugDocumentVersioning = "YES">
73+
<BuildableProductRunnable
74+
runnableDebuggingMode = "0">
75+
<BuildableReference
76+
BuildableIdentifier = "primary"
77+
BlueprintIdentifier = "B1D5EBF120BC06CB00983FB6"
78+
BuildableName = "Coding_Enterprise_iOS.app"
79+
BlueprintName = "Coding_Enterprise_iOS"
80+
ReferencedContainer = "container:Coding_iOS.xcodeproj">
81+
</BuildableReference>
82+
</BuildableProductRunnable>
83+
</ProfileAction>
84+
<AnalyzeAction
85+
buildConfiguration = "Debug">
86+
</AnalyzeAction>
87+
<ArchiveAction
88+
buildConfiguration = "Release"
89+
revealArchiveInOrganizer = "YES">
90+
</ArchiveAction>
91+
</Scheme>
Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1000"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "8E47700F198770E700997D05"
18+
BuildableName = "Coding_iOS.app"
19+
BlueprintName = "Coding_iOS"
20+
ReferencedContainer = "container:Coding_iOS.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "8E47700F198770E700997D05"
36+
BuildableName = "Coding_iOS.app"
37+
BlueprintName = "Coding_iOS"
38+
ReferencedContainer = "container:Coding_iOS.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
41+
<AdditionalOptions>
42+
</AdditionalOptions>
43+
</TestAction>
44+
<LaunchAction
45+
buildConfiguration = "Debug"
46+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
47+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
48+
launchStyle = "0"
49+
useCustomWorkingDirectory = "NO"
50+
ignoresPersistentStateOnLaunch = "NO"
51+
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
53+
allowLocationSimulation = "YES">
54+
<BuildableProductRunnable
55+
runnableDebuggingMode = "0">
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "8E47700F198770E700997D05"
59+
BuildableName = "Coding_iOS.app"
60+
BlueprintName = "Coding_iOS"
61+
ReferencedContainer = "container:Coding_iOS.xcodeproj">
62+
</BuildableReference>
63+
</BuildableProductRunnable>
64+
<AdditionalOptions>
65+
</AdditionalOptions>
66+
</LaunchAction>
67+
<ProfileAction
68+
buildConfiguration = "Release"
69+
shouldUseLaunchSchemeArgsEnv = "YES"
70+
savedToolIdentifier = ""
71+
useCustomWorkingDirectory = "NO"
72+
debugDocumentVersioning = "YES">
73+
<BuildableProductRunnable
74+
runnableDebuggingMode = "0">
75+
<BuildableReference
76+
BuildableIdentifier = "primary"
77+
BlueprintIdentifier = "8E47700F198770E700997D05"
78+
BuildableName = "Coding_iOS.app"
79+
BlueprintName = "Coding_iOS"
80+
ReferencedContainer = "container:Coding_iOS.xcodeproj">
81+
</BuildableReference>
82+
</BuildableProductRunnable>
83+
</ProfileAction>
84+
<AnalyzeAction
85+
buildConfiguration = "Debug">
86+
</AnalyzeAction>
87+
<ArchiveAction
88+
buildConfiguration = "Release"
89+
revealArchiveInOrganizer = "YES">
90+
</ArchiveAction>
91+
</Scheme>

‎Coding_iOS/.DS_Store

0 Bytes
Binary file not shown.

‎Coding_iOS/Controllers/Login/CannotLoginViewController.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ - (void)setupBackBtn{
6363
if (!_backBtn) {
6464
_backBtn = ({
6565
UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(0, kSafeArea_Top, 44, 44)];
66-
[button setImage:[UIImage imageNamed:@"back_green_Nav"] forState:UIControlStateNormal];
66+
button.tintColor = kColorLightBlue;
67+
[button setImage:[[UIImage imageNamed:@"back_green_Nav"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateNormal];
6768
[button addTarget:self.navigationController action:@selector(popViewControllerAnimated:) forControlEvents:UIControlEventTouchUpInside];
6869
[self.view addSubview:button];
6970
button;

‎Coding_iOS/Controllers/Login/IntroductionViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ - (NSAttributedString *)attrTitle{
364364
NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc] initWithString:_curItem.title];
365365
NSString *colorStr = [_curItem.title componentsSeparatedByString:@"\n"].lastObject;
366366
[attrStr addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:(kDevice_Use_iPhone4_Layout || kDevice_Is_iPhone5)? 30: 34],
367-
NSForegroundColorAttributeName : [UIColor colorWithHexString:@"0x2AD37D"]}
367+
NSForegroundColorAttributeName : kColorLightBlue}
368368
range:[_curItem.title rangeOfString:colorStr]];
369369
NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
370370
paragraphStyle.minimumLineHeight = paragraphStyle.maximumLineHeight = 45;

‎Coding_iOS/Controllers/Login/LoginViewController.m

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ - (UIButton *)backBtn{
155155
_backBtn = ({
156156
UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(0, kSafeArea_Top, 44, 44)];
157157
[button setImage:[UIImage imageNamed:@"back_green_Nav"] forState:UIControlStateNormal];
158+
button.tintColor = kColorLightBlue;
159+
[button setImage:[[UIImage imageNamed:@"back_green_Nav"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateNormal];
158160
[button addTarget:self action:@selector(backBtnClicked) forControlEvents:UIControlEventTouchUpInside];
159161
[self.view addSubview:button];
160162
button;
@@ -170,8 +172,9 @@ - (UIButton *)rightNavBtn{
170172
UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(kScreen_Width - 130, kSafeArea_Top, 120, 50)];
171173
button.backgroundColor = [UIColor whiteColor];
172174
[button.titleLabel setFont:[UIFont systemFontOfSize:15]];
173-
[button setTitleColor:[UIColor colorWithHexString:@"0x32BE77"] forState:UIControlStateNormal];
174-
[button setTitleColor:[UIColor darkGrayColor] forState:UIControlStateHighlighted];
175+
[button setTitleColor:kColorLightBlue forState:UIControlStateNormal];
176+
[button setTitleColor:[UIColor colorWithHexString:@"0x0060FF" andAlpha:.5] forState:UIControlStateHighlighted];
177+
button.tintColor = kColorBrandBlue;
175178
[button addTarget:self action:@selector(rightNavBtnClicked) forControlEvents:UIControlEventTouchUpInside];
176179
[self.view addSubview:button];
177180
button;
@@ -183,7 +186,7 @@ - (UIButton *)rightNavBtn{
183186
_rightNavBtn.hidden = [NSObject isPrivateCloud].boolValue;
184187
}else{
185188
[_rightNavBtn setTitle:@" 两步验证" forState:UIControlStateNormal];
186-
[_rightNavBtn setImage:[UIImage imageNamed:@"twoFABtn_Nav"] forState:UIControlStateNormal];
189+
[_rightNavBtn setImage:[[UIImage imageNamed:@"twoFABtn_Nav"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateNormal];
187190
}
188191
}
189192
return _rightNavBtn;
@@ -248,7 +251,7 @@ - (UIView *)customFooterView{
248251
UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(kScreen_Width - 120, 10, 100, 30)];
249252
button.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
250253
[button.titleLabel setFont:[UIFont systemFontOfSize:14]];
251-
[button setTitleColor:kColorBrandGreen forState:UIControlStateNormal];
254+
[button setTitleColor:kColorLightBlue forState:UIControlStateNormal];
252255
[button setTitle:@"忘记密码?" forState:UIControlStateNormal];
253256
[button addTarget:self action:@selector(cannotLoginBtnClicked) forControlEvents:UIControlEventTouchUpInside];
254257
[footerV addSubview:button];

‎Coding_iOS/Views/Cell/MRPRTopCell.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ - (void)setCurMRPRInfo:(MRPRBaseInfo *)curMRPRInfo{
127127
_statusL.text = _curMRPRInfo.mrpr.statusDisplay;
128128
_statusL.textColor = [UIColor colorWithHexString:(_curMRPRInfo.mrpr.status == MRPRStatusCanMerge? @"0x666666":
129129
_curMRPRInfo.mrpr.status == MRPRStatusCannotMerge? @"0xB89FDA":
130-
_curMRPRInfo.mrpr.status == MRPRStatusAccepted? @"0x32BE77":
130+
_curMRPRInfo.mrpr.status == MRPRStatusAccepted? @"0x0060FF":
131131
_curMRPRInfo.mrpr.status == MRPRStatusRefused? @"0xF56061":
132132
@"0xF56061")];
133133
NSString *fromStr, *toStr;

‎Coding_iOS/Views/Cell/TeamPurchaseBillingCell.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSStr
100100

101101
_detailsL = @[].mutableCopy;
102102

103-
[_expandBtn setTitleColor:kColorActionGreen forState:UIControlStateNormal];
103+
[_expandBtn setTitleColor:kColorLightBlue forState:UIControlStateNormal];
104104
_expandBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
105105
_expandBtn.titleLabel.font = [UIFont systemFontOfSize:14];
106106
[_expandBtn setTitle:@"查看全部" forState:UIControlStateNormal];

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /