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
Appearance settings

Commit e7e7f74

Browse filesBrowse files
cjddnycjddny
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # Coding_iOS/.DS_Store # Coding_iOS/Images/.DS_Store # Coding_iOS/Util/Manager/SendRewardManager.m # Coding_iOS/Views/Cell/PRMRSearchCell.m
2 parents 2f9f09c + a2646a3 commit e7e7f74
Copy full SHA for e7e7f74

File tree

Expand file treeCollapse file tree

18 files changed

+166
-93
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

18 files changed

+166
-93
lines changed
Open diff view settings
Collapse file

‎Coding_iOS.xcodeproj/project.pbxproj‎

Copy file name to clipboardExpand all lines: Coding_iOS.xcodeproj/project.pbxproj
+16Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@
7474
4E095A831B6B24DE008DC439 /* task_description_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A801B6B24DE008DC439 /* task_description_icon@2x.png */; };
7575
4E095A841B6B24DE008DC439 /* time_clock_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A811B6B24DE008DC439 /* time_clock_icon@2x.png */; };
7676
4E095A851B6B24DE008DC439 /* topic_comment_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A821B6B24DE008DC439 /* topic_comment_icon@2x.png */; };
77+
4E09DCA51C156387001C9392 /* hot_topic_Nav@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E09DCA31C156387001C9392 /* hot_topic_Nav@2x.png */; };
78+
4E09DCA61C156387001C9392 /* hot_topic_Nav@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E09DCA41C156387001C9392 /* hot_topic_Nav@3x.png */; };
79+
4E09DCA91C15662E001C9392 /* share_Nav@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E09DCA71C15662E001C9392 /* share_Nav@2x.png */; };
80+
4E09DCAA1C15662E001C9392 /* share_Nav@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E09DCA81C15662E001C9392 /* share_Nav@3x.png */; };
7781
4E0B9A341BAC1CD100D57D54 /* ForkTreeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0B9A331BAC1CD100D57D54 /* ForkTreeViewController.m */; };
7882
4E0B9A371BAD377600D57D54 /* ForkTreeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0B9A361BAD377600D57D54 /* ForkTreeCell.m */; };
7983
4E0BD8561B6C7DFD0061CAA6 /* UIView+Frame.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E0BD8551B6C7DFD0061CAA6 /* UIView+Frame.m */; };
@@ -1118,6 +1122,10 @@
11181122
4E095A801B6B24DE008DC439 /* task_description_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "task_description_icon@2x.png"; sourceTree = "<group>"; };
11191123
4E095A811B6B24DE008DC439 /* time_clock_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "time_clock_icon@2x.png"; sourceTree = "<group>"; };
11201124
4E095A821B6B24DE008DC439 /* topic_comment_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "topic_comment_icon@2x.png"; sourceTree = "<group>"; };
1125+
4E09DCA31C156387001C9392 /* hot_topic_Nav@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "hot_topic_Nav@2x.png"; sourceTree = "<group>"; };
1126+
4E09DCA41C156387001C9392 /* hot_topic_Nav@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "hot_topic_Nav@3x.png"; sourceTree = "<group>"; };
1127+
4E09DCA71C15662E001C9392 /* share_Nav@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "share_Nav@2x.png"; sourceTree = "<group>"; };
1128+
4E09DCA81C15662E001C9392 /* share_Nav@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "share_Nav@3x.png"; sourceTree = "<group>"; };
11211129
4E0B9A321BAC1CD100D57D54 /* ForkTreeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ForkTreeViewController.h; sourceTree = "<group>"; };
11221130
4E0B9A331BAC1CD100D57D54 /* ForkTreeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ForkTreeViewController.m; sourceTree = "<group>"; };
11231131
4E0B9A351BAD377600D57D54 /* ForkTreeCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ForkTreeCell.h; sourceTree = "<group>"; };
@@ -3939,6 +3947,10 @@
39393947
8E97CE4B1A0A3410006F9AD7 /* nav_button */ = {
39403948
isa = PBXGroup;
39413949
children = (
3950+
4E09DCA71C15662E001C9392 /* share_Nav@2x.png */,
3951+
4E09DCA81C15662E001C9392 /* share_Nav@3x.png */,
3952+
4E09DCA31C156387001C9392 /* hot_topic_Nav@2x.png */,
3953+
4E09DCA41C156387001C9392 /* hot_topic_Nav@3x.png */,
39423954
D0C447FE1C02DCAC00DC1C4B /* addBtn_Nav@3x.png */,
39433955
D0C447FF1C02DCAC00DC1C4B /* addUserBtn_Nav@3x.png */,
39443956
D0C448001C02DCAC00DC1C4B /* filterBtn_selected_Nav@3x.png */,
@@ -5170,6 +5182,7 @@
51705182
isa = PBXResourcesBuildPhase;
51715183
buildActionMask = 2147483647;
51725184
files = (
5185+
4E09DCA51C156387001C9392 /* hot_topic_Nav@2x.png in Resources */,
51735186
8E97CE6C1A0B243B006F9AD7 /* keyboard_add@2x.png in Resources */,
51745187
4E6383FD1B33C18700D98648 /* task_activity_icon_restore@2x.png in Resources */,
51755188
4E9F5D201C03051D007CCDCC /* tipIcon_tweetReward@2x.png in Resources */,
@@ -5238,7 +5251,9 @@
52385251
4E996C071ABBF56A00C704F1 /* user_info_detail@2x.png in Resources */,
52395252
4E8C51B01AC1081500B4C51F /* icon_recommended@2x.png in Resources */,
52405253
4E96E7DA1A1B537E0037C098 /* icon_file_doc@2x.png in Resources */,
5254+
4E09DCA61C156387001C9392 /* hot_topic_Nav@3x.png in Resources */,
52415255
4E4972DF1BB535B400F3AC15 /* tipIcon_ProjectTweet@2x.png in Resources */,
5256+
4E09DCA91C15662E001C9392 /* share_Nav@2x.png in Resources */,
52425257
8E62ADDA19E28DA800963870 /* tipIcon_User@2x.png in Resources */,
52435258
4E6383A71B3262D300D98648 /* taskPriority0_small@2x.png in Resources */,
52445259
8E8F7B3519EF6306006BA8BD /* btn_project_quit@2x.png in Resources */,
@@ -5524,6 +5539,7 @@
55245539
8E97CE611A0A3424006F9AD7 /* keyboard_add_photo@2x.png in Resources */,
55255540
4E93F23B1B84356500017916 /* file_menu_icon_edit@2x.png in Resources */,
55265541
8E1C3DF619E7F4CA00EF3032 /* address.json in Resources */,
5542+
4E09DCAA1C15662E001C9392 /* share_Nav@3x.png in Resources */,
55275543
4E2BF3D01B96CDF800A5A0A8 /* share_btn_copylink@2x.png in Resources */,
55285544
4EF17ED41B3C3112003CDD2D /* intro_icon_2@3x.png in Resources */,
55295545
8EA6D18D19E240C40076D59C /* tabbar_background@2x.png in Resources */,
Collapse file

‎Coding_iOS/.DS_Store‎

Copy file name to clipboard
-10 KB
Binary file not shown.
Collapse file

‎Coding_iOS/Controllers/LocalFileViewController.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/LocalFileViewController.m
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ - (void)viewDidLoad {
4646
[super viewDidLoad];
4747
// Do any additional setup after loading the view.
4848
self.title = self.fileName;
49-
[self.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"moreBtn_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)] animated:NO];
49+
[self.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"share_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)] animated:NO];
5050

5151
if ([self.fileType isEqualToString:@"md"]
5252
|| [self.fileType isEqualToString:@"html"]
@@ -94,6 +94,7 @@ - (void)loadWebView:(NSURL *)fileUrl{
9494
NSString *mdStr = [NSString stringWithContentsOfURL:fileUrl encoding:NSUTF8StringEncoding error:nil];
9595
[self.activityIndicator startAnimating];
9696
[[Coding_NetAPIManager sharedManager] request_MDHtmlStr_WithMDStr:mdStr inProject:nil andBlock:^(id data, NSError *error) {
97+
[self.activityIndicator stopAnimating];
9798
NSString *htmlStr;
9899
htmlStr = data? data: @"加载失败";
99100
NSString *contentStr = [WebContentManager markdownPatternedWithContent:htmlStr];
Collapse file

‎Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m
+10-2Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#import "CSSearchVC.h"
2929
#import "CSSearchDisplayVC.h"
3030
#import "FunctionTipsManager.h"
31+
#import "CSHotTopicPagesVC.h"
3132

3233
@interface Tweet_RootViewController () <UISearchBarDelegate, UISearchDisplayDelegate>
3334
{
@@ -103,7 +104,9 @@ - (void)viewDidLoad
103104
// [self refreshFirst];
104105
// }];
105106

106-
UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"search_Nav" showBadge:NO target:self action:@selector(searchItemClicked:)];
107+
// UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"search_Nav" showBadge:NO target:self action:@selector(searchItemClicked:)];
108+
UIBarButtonItem *leftBarItem =[UIBarButtonItem itemWithIcon:@"hot_topic_Nav" showBadge:NO target:self action:@selector(hotTopicBtnClicked:)];
109+
107110
[self.parentViewController.navigationItem setLeftBarButtonItem:leftBarItem animated:NO];
108111

109112
_tweetsDict = [[NSMutableDictionary alloc] initWithCapacity:4];
@@ -287,7 +290,12 @@ - (void)deleteComment:(Comment *)comment ofTweet:(Tweet *)tweet{
287290
}];
288291
}
289292

290-
#pragma mark - search
293+
#pragma mark - nav_LeftBtn
294+
295+
- (void)hotTopicBtnClicked:(id)sender{
296+
CSHotTopicPagesVC *vc = [CSHotTopicPagesVC new];
297+
[self.navigationController pushViewController:vc animated:YES];
298+
}
291299

292300
- (void)searchItemClicked:(id)sender{
293301
if ([[FunctionTipsManager shareManager] needToTip:kFunctionTipStr_Search]) {
Collapse file

‎Coding_iOS/Controllers/Topic/CSHotTopicPagesVC.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/Topic/CSHotTopicPagesVC.m
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,13 @@ - (void)setupUI {
160160
UILabel *la1 = [[UILabel alloc] initWithFrame:CGRectMake((kScreen_Width/2 - titleWidth/2) + 0*distance, 8, titleWidth, 16)];
161161
la1.text = @"热门话题";
162162
la1.textAlignment = NSTextAlignmentCenter;
163-
la1.font = [UIFont systemFontOfSize:16];
163+
la1.font = [UIFont boldSystemFontOfSize:18];
164164
la1.textColor = [UIColor whiteColor];
165165

166166
UILabel *la2 = [[UILabel alloc] initWithFrame:CGRectMake((kScreen_Width/2 - titleWidth/2) + 1*distance, 8, titleWidth, 16)];
167167
la2.text = @"我的话题";
168168
la2.textAlignment = NSTextAlignmentCenter;
169-
la2.font = [UIFont systemFontOfSize:16];
169+
la2.font = [UIFont boldSystemFontOfSize:18];
170170
la2.textColor = [UIColor whiteColor];
171171

172172

Collapse file

‎Coding_iOS/Controllers/TweetDetailViewController.m‎

Copy file name to clipboardExpand all lines: Coding_iOS/Controllers/TweetDetailViewController.m
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ - (void)viewDidLoad
5252
[super viewDidLoad];
5353
// Do any additional setup after loading the view.
5454
self.title = @"冒泡详情";
55-
[self.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"moreBtn_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)] animated:NO];
55+
[self.navigationItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"share_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)] animated:NO];
5656

5757
// 添加myTableView
5858
_myTableView = ({
Collapse file

‎Coding_iOS/Images/.DS_Store‎

Copy file name to clipboard
-18 KB
Binary file not shown.
Collapse file

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

Copy file name to clipboard
450 Bytes
  • Display the source diff
  • Display the rich diff
Loading
Collapse file

‎Coding_iOS/Images/nav_button/hot_topic_Nav@3x.png‎

Copy file name to clipboard
597 Bytes
  • Display the source diff
  • Display the rich diff
Loading
Collapse file

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

Copy file name to clipboard
668 Bytes
  • Display the source diff
  • Display the rich diff
Loading

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.