改来改去改 UI

Author: wanghengheng

Coding_iOS/Controllers/MRPRListViewController.m

@@ -68,11 +68,12 @@ - (void)viewDidLoad {
             weakSelf.selectedIndex = selectIndex;
         }
     };
+    
+    [self refresh];
 }
 
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
-    [self refresh];
 }
 
 - (void)viewWillDisappear:(BOOL)animated{
@@ -102,15 +103,15 @@ - (void)setSelectedIndex:(NSInteger)selectedIndex{
 }
 
 - (NSArray *)titleList{
-    NSArray *titleList = (_isMR? @[@"全部",
+    NSArray *titleList = (_isMR? @[@"默认",
                                    @"可合并",
                                    @"不可自动合并",
                                    @"已拒绝",
                                    @"已合并",
                                    ]:
-                          @[@"全部",
-                            @"未处理",
+                          @[@"未处理",
                             @"已处理",
+                            @"全部",
                             ]);
     return titleList;
 }
@@ -125,9 +126,6 @@ - (void)setupTitleBtn{
     }
 
     NSString *titleStr = [self titleList][_selectedIndex];
-    if ([titleStr isEqualToString:@"全部"]) {
-        titleStr = [titleStr stringByAppendingString:_isMR? @" MR": @"PR"];
-    }
     CGFloat titleWidth = [titleStr getWidthWithFont:_titleBtn.titleLabel.font constrainedToSize:CGSizeMake(kScreen_Width, 30)];
     CGFloat imageWidth = 12;
     CGFloat btnWidth = titleWidth +imageWidth;
@@ -153,7 +151,7 @@ - (MRPRS *)curMRPRS{
     MRPRS *curMRPRS = [_dataDict objectForKey:@(_selectedIndex)];
     if (!curMRPRS) {
 
-        curMRPRS = [[MRPRS alloc] initWithType:_isMR? _selectedIndex: _selectedIndex + MRPRSTypePRAll userGK:_curProject.owner_user_name projectName:_curProject.name];
+        curMRPRS = [[MRPRS alloc] initWithType:_isMR? _selectedIndex: _selectedIndex + MRPRSTypePROpen userGK:_curProject.owner_user_name projectName:_curProject.name];
         [_dataDict setObject:curMRPRS forKey:@(_selectedIndex)];
     }
     return curMRPRS;

Coding_iOS/Models/MRPRS.h

@@ -10,14 +10,14 @@
 #import "MRPR.h"
 
 typedef NS_ENUM(NSInteger, MRPRSType) {
-    MRPRSTypeMRAll = 0,
+    MRPRSTypeMRDefault = 0,
     MRPRSTypeMRCanMerge,
     MRPRSTypeMRCannotMerge,
     MRPRSTypeMRRefused,
     MRPRSTypeMRAccepted,
-    MRPRSTypePRAll,
     MRPRSTypePROpen,
-    MRPRSTypePRClosed
+    MRPRSTypePRClosed,
+    MRPRSTypePRAll,
 };
 
 @interface MRPRS : NSObject

Coding_iOS/Models/MRPRS.m

@@ -45,16 +45,12 @@ - (NSDictionary *)toParams{
 }
 - (NSString *)toPath{
     NSString *typeStr;
-    if (_type < MRPRSTypePRAll) {
-        if (_type == MRPRSTypeMRAll) {
-            typeStr = @"merges/all";
-        }else{
-            typeStr = @"merges/filter";
-        }
+    if (_type < MRPRSTypePROpen) {
+        typeStr = @"merges/filter";
     }else{
-        typeStr = (_type == MRPRSTypePRAll? @"pulls/all":
-                   _type == MRPRSTypePROpen? @"pulls/open":
+        typeStr = (_type == MRPRSTypePROpen? @"pulls/open":
                    _type == MRPRSTypePRClosed? @"pulls/closed":
+                   _type == MRPRSTypePRAll? @"pulls/all":
                    @"");
     }
     return [NSString stringWithFormat:@"api/user/%@/project/%@/git/%@", _user_gk, _project_name, typeStr];

Coding_iOS/Views/Cell/MRPRListCell.m

@@ -94,7 +94,7 @@ - (void)setCurMRPR:(MRPR *)curMRPR{
     _titleL.text = _curMRPR.title;
     _numL.text = [NSString stringWithFormat:@"#%@", _curMRPR.iid.stringValue ?: @""];
     _authorL.text = _curMRPR.author.name;
-    _timeL.text = [_curMRPR.created_at stringTimesAgo];
+    _timeL.text = [_curMRPR.created_at stringDisplay_HHmm];
     _commentCountL.text = _curMRPR.comment_count.stringValue;
     _commentCountL.hidden = _commentIcon.hidden = (_curMRPR.comment_count == nil);
 

Coding_iOS/Views/Cell/MRPRTopCell.m

@@ -133,7 +133,11 @@ - (void)setCurMRPRInfo:(MRPRBaseInfo *)curMRPRInfo{
 
     _timeL.attributedText = [self attributeTail];
     _statusL.text =  _curMRPRInfo.mrpr.statusDisplay;
-    
+    _statusL.textColor = [UIColor colorWithHexString:(_curMRPRInfo.mrpr.status == MRPRStatusCanMerge? @"0x666666":
+                                                      _curMRPRInfo.mrpr.status == MRPRStatusCannotMerge? @"0xB89FDA":
+                                                      _curMRPRInfo.mrpr.status == MRPRStatusAccepted? @"0x32BE77":
+                                                      _curMRPRInfo.mrpr.status == MRPRStatusRefused? @"0xF56061":
+                                                      @"0xF56061")];
     NSString *fromStr, *toStr;
     if (_curMRPRInfo.mrpr.isMR) {
         fromStr = [NSString stringWithFormat:@"  %@  ", _curMRPRInfo.mrpr.srcBranch];

Coding_iOS/Views/CodeBranchTagButton.m

@@ -90,9 +90,10 @@ - (UIView *)myContentView{
 - (UITableView *)myTableView{
     if (!_myTableView) {
         _myTableView = ({
-            UITableView *tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
+            UITableView *tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
+            tableView.backgroundColor = [UIColor whiteColor];
             [tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:kCellIdentifier_BranchTag];
-            tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine;
+            tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
             tableView.dataSource = self;
             tableView.delegate = self;
             tableView;
@@ -135,6 +136,11 @@ - (void)loadUIElement{
     [self.myContentView addSubview:self.mySegmentedControl];
 
     self.mySegmentedControl.frame = CGRectMake(12, (kCodeBranchTagButton_NavHeight - 30)/2, kScreen_Width - 2*12, 30);
+    {
+        UIView *lineV = [[UIView alloc] initWithFrame:CGRectMake(0, kCodeBranchTagButton_NavHeight, kScreen_Width, 1.0/[UIScreen mainScreen].scale)];
+        lineV.backgroundColor = kColorDDD;
+        [self.myContentView addSubview:lineV];
+    }
     self.myContentView.frame = CGRectMake(0, 0, kScreen_Width, 0);
     self.myTableView.frame = CGRectMake(0, kCodeBranchTagButton_NavHeight, kScreen_Width, 0);
 
@@ -151,7 +157,7 @@ - (void)changeShowing{
         [self loadUIElement];
     }
     CGPoint origin = [self convertPoint:CGPointMake(0, CGRectGetHeight(self.bounds)) toView:self.showingContainerView];
-    CGFloat contentHeight = self.isShowing? 0: kCodeBranchTagButton_ContentHeight;
+    CGFloat contentHeight = self.isShowing? 0: CGRectGetHeight(self.showingContainerView.bounds) - origin.y;
     if (self.isShowing) {//隐藏
         self.enabled = NO;
         [UIView animateWithDuration:0.3 animations:^{
@@ -255,26 +261,30 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
     return [self.dataList count];
 }
 
-- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
-    return 0.5;
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
-    return 0.5;
-}
-
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
     UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_BranchTag forIndexPath:indexPath];
-    cell.textLabel.textColor = [UIColor blackColor];
     cell.textLabel.font = [UIFont systemFontOfSize:15];
-    
+    cell.backgroundColor = [UIColor whiteColor];
+    cell.tintColor = kColorBrandGreen;
+
     CodeBranchOrTag *curBranchOrTag = [self.dataList objectAtIndex:indexPath.row];
     cell.textLabel.text = curBranchOrTag.name;
 
     if ([curBranchOrTag.name isEqualToString:self.titleStr]) {
-        cell.backgroundColor = [UIColor colorWithHexString:@"0xf3f3f3"];
+        cell.textLabel.textColor = kColorBrandGreen;
+        cell.accessoryType = UITableViewCellAccessoryCheckmark;
     }else{
-        cell.backgroundColor = [UIColor whiteColor];
+        cell.textLabel.textColor = [UIColor blackColor];
+        cell.accessoryType = UITableViewCellAccessoryNone;
+    }
+
+    static NSInteger lineTag = 11011;
+    if (![cell.contentView viewWithTag:lineTag]) {
+        CGFloat lineH = 1.0/[UIScreen mainScreen].scale;
+        UIView *lineV = [[UIView alloc] initWithFrame:CGRectMake(15, 44 - lineH, kScreen_Width, lineH)];
+        lineV.tag = lineTag;
+        lineV.backgroundColor = kColorDDD;
+        [cell.contentView addSubview:lineV];
     }
     return cell;
 }