Skip to content

Commit d7d2bf4

Browse files
wanghenghengwanghengheng
committed
换图
1 parent 191a43d commit d7d2bf4

8 files changed

Lines changed: 5 additions & 25 deletions

File tree

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,6 @@
211211
4E87656A1A22E5B40090CFB9 /* SWUtilityButtonView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E8765641A22E5B40090CFB9 /* SWUtilityButtonView.m */; };
212212
4E8AF7861A53D69F00CDC3AE /* StartImagesManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E8AF7851A53D69F00CDC3AE /* StartImagesManager.m */; };
213213
4E8C51B01AC1081500B4C51F /* icon_recommended@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E8C51AF1AC1081500B4C51F /* icon_recommended@2x.png */; };
214-
4E8D5D301B44E03600B70936 /* convenient_2FA@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E8D5D2C1B44E03600B70936 /* convenient_2FA@2x.png */; };
215-
4E8D5D311B44E03600B70936 /* convenient_Project@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E8D5D2D1B44E03600B70936 /* convenient_Project@2x.png */; };
216-
4E8D5D321B44E03600B70936 /* convenient_Task@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E8D5D2E1B44E03600B70936 /* convenient_Task@2x.png */; };
217-
4E8D5D331B44E03600B70936 /* convenient_Tweet@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E8D5D2F1B44E03600B70936 /* convenient_Tweet@2x.png */; };
218214
4E8D5D5A1B45295D00B70936 /* HOTPGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E8D5D431B45295D00B70936 /* HOTPGenerator.m */; };
219215
4E8D5D5B1B45295D00B70936 /* NSData+OTPBase32Encoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E8D5D451B45295D00B70936 /* NSData+OTPBase32Encoding.m */; };
220216
4E8D5D5C1B45295D00B70936 /* NSString+OTPURLArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E8D5D471B45295D00B70936 /* NSString+OTPURLArguments.m */; };
@@ -399,6 +395,7 @@
399395
4EE548291AE9166B00A92306 /* icon_project_cell_pin@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EE548271AE9166B00A92306 /* icon_project_cell_pin@2x.png */; };
400396
4EED9DCC1B539366000E5827 /* taskOwner@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EED9DCA1B539366000E5827 /* taskOwner@2x.png */; };
401397
4EED9DCD1B539366000E5827 /* taskProject@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EED9DCB1B539366000E5827 /* taskProject@2x.png */; };
398+
4EED9DD11B53BBCF000E5827 /* twoFABtn_Nav@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EED9DD01B53BBCF000E5827 /* twoFABtn_Nav@2x.png */; };
402399
4EF17E5F1B3AB10F003CDD2D /* IntroductionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EF17E5E1B3AB10F003CDD2D /* IntroductionViewController.m */; };
403400
4EF17ECB1B3C3112003CDD2D /* intro_dot_selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EF17EAD1B3C3112003CDD2D /* intro_dot_selected@2x.png */; };
404401
4EF17ECC1B3C3112003CDD2D /* intro_dot_selected@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EF17EAE1B3C3112003CDD2D /* intro_dot_selected@3x.png */; };
@@ -1089,10 +1086,6 @@
10891086
4E8AF7891A5406AE00CDC3AE /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
10901087
4E8C51AE1AC0177600B4C51F /* Coding_iOS-Prefix.pch.example */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Coding_iOS-Prefix.pch.example"; sourceTree = "<group>"; };
10911088
4E8C51AF1AC1081500B4C51F /* icon_recommended@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_recommended@2x.png"; sourceTree = "<group>"; };
1092-
4E8D5D2C1B44E03600B70936 /* convenient_2FA@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "convenient_2FA@2x.png"; sourceTree = "<group>"; };
1093-
4E8D5D2D1B44E03600B70936 /* convenient_Project@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "convenient_Project@2x.png"; sourceTree = "<group>"; };
1094-
4E8D5D2E1B44E03600B70936 /* convenient_Task@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "convenient_Task@2x.png"; sourceTree = "<group>"; };
1095-
4E8D5D2F1B44E03600B70936 /* convenient_Tweet@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "convenient_Tweet@2x.png"; sourceTree = "<group>"; };
10961089
4E8D5D421B45295D00B70936 /* HOTPGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HOTPGenerator.h; sourceTree = "<group>"; };
10971090
4E8D5D431B45295D00B70936 /* HOTPGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HOTPGenerator.m; sourceTree = "<group>"; };
10981091
4E8D5D441B45295D00B70936 /* NSData+OTPBase32Encoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+OTPBase32Encoding.h"; sourceTree = "<group>"; };
@@ -1391,6 +1384,7 @@
13911384
4EE548271AE9166B00A92306 /* icon_project_cell_pin@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_project_cell_pin@2x.png"; sourceTree = "<group>"; };
13921385
4EED9DCA1B539366000E5827 /* taskOwner@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "taskOwner@2x.png"; sourceTree = "<group>"; };
13931386
4EED9DCB1B539366000E5827 /* taskProject@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "taskProject@2x.png"; sourceTree = "<group>"; };
1387+
4EED9DD01B53BBCF000E5827 /* twoFABtn_Nav@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "twoFABtn_Nav@2x.png"; sourceTree = "<group>"; };
13941388
4EF17E5D1B3AB10F003CDD2D /* IntroductionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntroductionViewController.h; sourceTree = "<group>"; };
13951389
4EF17E5E1B3AB10F003CDD2D /* IntroductionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IntroductionViewController.m; sourceTree = "<group>"; };
13961390
4EF17EAD1B3C3112003CDD2D /* intro_dot_selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "intro_dot_selected@2x.png"; sourceTree = "<group>"; };
@@ -2282,17 +2276,6 @@
22822276
path = SWTableViewCell;
22832277
sourceTree = "<group>";
22842278
};
2285-
4E8D5D2B1B44E03600B70936 /* convenient_btn */ = {
2286-
isa = PBXGroup;
2287-
children = (
2288-
4E8D5D2C1B44E03600B70936 /* convenient_2FA@2x.png */,
2289-
4E8D5D2D1B44E03600B70936 /* convenient_Project@2x.png */,
2290-
4E8D5D2E1B44E03600B70936 /* convenient_Task@2x.png */,
2291-
4E8D5D2F1B44E03600B70936 /* convenient_Tweet@2x.png */,
2292-
);
2293-
path = convenient_btn;
2294-
sourceTree = "<group>";
2295-
};
22962279
4E8D5D3D1B451E9100B70936 /* Ease_2FA */ = {
22972280
isa = PBXGroup;
22982281
children = (
@@ -2953,6 +2936,7 @@
29532936
8E97CE4B1A0A3410006F9AD7 /* nav_button */ = {
29542937
isa = PBXGroup;
29552938
children = (
2939+
4EED9DD01B53BBCF000E5827 /* twoFABtn_Nav@2x.png */,
29562940
4ED558311B4FA68400FC10CB /* dismissBtn_Nav@2x.png */,
29572941
4E6383E31B3272CF00D98648 /* info_Nav@2x.png */,
29582942
4E6383E41B3272CF00D98648 /* search_Nav@2x.png */,
@@ -3210,7 +3194,6 @@
32103194
isa = PBXGroup;
32113195
children = (
32123196
4E94C5021B4D334B00EB668A /* pop_icon */,
3213-
4E8D5D2B1B44E03600B70936 /* convenient_btn */,
32143197
4EF17E761B3BF320003CDD2D /* introduction */,
32153198
4EC461AE1B39360F00D08970 /* file_changeType */,
32163199
4E6383F31B33C18700D98648 /* task_activity_icon */,
@@ -4150,9 +4133,7 @@
41504133
4E217F101A70EDC700F6DF88 /* SVWebViewControllerActivityChrome-iPad@2x.png in Resources */,
41514134
4E6383EC1B32A2C300D98648 /* project_item_file@2x.png in Resources */,
41524135
8EA6D16819E240C40076D59C /* nav_project_member@2x.png in Resources */,
4153-
4E8D5D321B44E03600B70936 /* convenient_Task@2x.png in Resources */,
41544136
4E9113A91A1CB19900AC9431 /* icon_file_state_download@2x.png in Resources */,
4155-
4E8D5D311B44E03600B70936 /* convenient_Project@2x.png in Resources */,
41564137
4E9113AB1A1CB19900AC9431 /* icon_file_state_look@2x.png in Resources */,
41574138
4E63840B1B33F9B400D98648 /* comment_bg@2x.png in Resources */,
41584139
8E97CEA31A0C7E26006F9AD7 /* coding_emoji_12@2x.png in Resources */,
@@ -4176,7 +4157,6 @@
41764157
8EA6D1A119E240C40076D59C /* tipIcon_UserFollow@2x.png in Resources */,
41774158
8EA6D18319E240C40076D59C /* me_normal@2x.png in Resources */,
41784159
4EF17EDC1B3C3112003CDD2D /* intro_tip_0@2x.png in Resources */,
4179-
4E8D5D301B44E03600B70936 /* convenient_2FA@2x.png in Resources */,
41804160
8EA6D19719E240C40076D59C /* tipIcon_Project@2x.png in Resources */,
41814161
4EF17ED31B3C3112003CDD2D /* intro_icon_2@2x.png in Resources */,
41824162
4E4D6AC11B252CD400FD2E49 /* icon_code_file@2x.png in Resources */,
@@ -4290,7 +4270,6 @@
42904270
4E217F141A70EDC700F6DF88 /* SVWebViewControllerActivitySafari-iPad@2x.png in Resources */,
42914271
4E5A66991B26EB210007A0AD /* diff.html in Resources */,
42924272
4EF91F641B00B62B0021C951 /* icon_not_locationed@2x.png in Resources */,
4293-
4E8D5D331B44E03600B70936 /* convenient_Tweet@2x.png in Resources */,
42944273
4E6383EA1B32791600D98648 /* checkbox_unchecked@2x.png in Resources */,
42954274
8EA6D19119E240C40076D59C /* timeline_icon_read@2x.png in Resources */,
42964275
8E97CEB21A0C7E26006F9AD7 /* coding_emoji_27@2x.png in Resources */,
@@ -4329,6 +4308,7 @@
43294308
8E97CE521A0A3410006F9AD7 /* addUserBtn_Nav@2x.png in Resources */,
43304309
8EC911291A027A54009EAE99 /* nav_project_code@2x.png in Resources */,
43314310
4E6383C41B3265DC00D98648 /* mrpr_icon_arrow@2x.png in Resources */,
4311+
4EED9DD11B53BBCF000E5827 /* twoFABtn_Nav@2x.png in Resources */,
43324312
4E6383AC1B3262D300D98648 /* taskPriority3@2x.png in Resources */,
43334313
4E53EB5A1AFB090E0034FE1C /* nav_page_unselected@2x.png in Resources */,
43344314
);

‎Coding_iOS/Controllers/Login/LoginViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ - (UIButton *)buttonFor2FA{
9393
[button setTitleColor:[UIColor colorWithWhite:1.0 alpha:0.5] forState:UIControlStateHighlighted];
9494

9595
[button setTitle:@" 2FA" forState:UIControlStateNormal];
96-
[button setImage:[UIImage imageNamed:@"convenient_2FA"] forState:UIControlStateNormal];
96+
[button setImage:[UIImage imageNamed:@"twoFABtn_Nav"] forState:UIControlStateNormal];
9797
button;
9898
});
9999
[_buttonFor2FA addTarget:self action:@selector(goTo2FAVC) forControlEvents:UIControlEventTouchUpInside];

‎Coding_iOS/Images/convenient_btn/convenient_2FA@2x.png‎

-429 Bytes
Binary file not shown.

‎Coding_iOS/Images/convenient_btn/convenient_Project@2x.png‎

-693 Bytes
Binary file not shown.

‎Coding_iOS/Images/convenient_btn/convenient_Task@2x.png‎

-493 Bytes
Binary file not shown.

‎Coding_iOS/Images/convenient_btn/convenient_Tweet@2x.png‎

-526 Bytes
Binary file not shown.

‎Coding_iOS/Images/nav_button/dismissBtn_Nav@2x.png‎

29 Bytes
Loading

‎Coding_iOS/Images/nav_button/twoFABtn_Nav@2x.png‎

1.5 KB
Loading

0 commit comments

Comments
 (0)