Skip to content

Commit e30ea11

Browse files
wanghenghengwanghengheng
committed
┏ (゜ω゜)
1 parent ef97336 commit e30ea11

File tree

163 files changed

+388
-432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+388
-432
lines changed

‎Coding_iOS/.DS_Store

0 Bytes
Binary file not shown.

‎Coding_iOS/Coding_iOS-Info.plist

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>4.0.201609221600</string>
39+
<string>4.0.201609221830</string>
4040
<key>ITSAppUsesNonExemptEncryption</key>
4141
<false/>
4242
<key>LSApplicationQueriesSchemes</key>
@@ -81,8 +81,14 @@
8181
<key>NSAllowsArbitraryLoads</key>
8282
<true/>
8383
</dict>
84+
<key>NSCameraUsageDescription</key>
85+
<string>我们需要您的同意才能使用相机</string>
8486
<key>NSLocationWhenInUseUsageDescription</key>
8587
<string>我们需要通过您的地理位置信息获取您周边的相关数据</string>
88+
<key>NSMicrophoneUsageDescription</key>
89+
<string>我们需要您的同意才能使用麦克风</string>
90+
<key>NSPhotoLibraryUsageDescription</key>
91+
<string>我们需要您的同意才能读取您的照片</string>
8692
<key>UIAppFonts</key>
8793
<array>
8894
<string>FontAwesome.ttf</string>
@@ -107,11 +113,5 @@
107113
</array>
108114
<key>UIViewControllerBasedStatusBarAppearance</key>
109115
<false/>
110-
<key>NSCameraUsageDescription</key>
111-
<string>我们需要您的同意才能使用相机</string>
112-
<key>NSPhotoLibraryUsageDescription</key>
113-
<string>我们需要您的同意才能读取您的照片</string>
114-
<key>NSMicrophoneUsageDescription</key>
115-
<string>我们需要您的同意才能使用麦克风</string>
116116
</dict>
117117
</plist>

‎Coding_iOS/Coding_iOS-Prefix.pch.example

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,15 @@
119119

120120
#define kDefaultLastId [NSNumber numberWithInteger:99999999]
121121

122+
#define kColor222 [UIColor colorWithHexString:@"0x222222"]
123+
#define kColor666 [UIColor colorWithHexString:@"0x666666"]
122124
#define kColor999 [UIColor colorWithHexString:@"0x999999"]
125+
#define kColorDDD [UIColor colorWithHexString:@"0xDDDDDD"]
123126
#define kColorTableBG [UIColor colorWithHexString:@"0xFFFFFF"]
124127
#define kColorTableSectionBg [UIColor colorWithHexString:@"0xF2F4F6"]
125-
#define kColorBrandGreen [UIColor colorWithHexString:@"0x3bbc79"]
126-
#define kColorDDD [UIColor colorWithHexString:@"0xDDDDDD"]
128+
#define kColorBrandGreen [UIColor colorWithHexString:@"0x3BBD79"]
127129
#define kColorNavBG [UIColor colorWithHexString:@"0xFAFAFA"]
128130
#define kColorNavTitle [UIColor colorWithHexString:@"0x323A45"]
129-
#define kImage999 [UIImage imageWithColor:kColor999]
130131

131132
#define kPlaceholderMonkeyRoundWidth(_width_) [UIImage imageNamed:[NSString stringWithFormat:@"placeholder_monkey_round_%.0f", _width_]]
132133
#define kPlaceholderMonkeyRoundView(_view_) [UIImage imageNamed:[NSString stringWithFormat:@"placeholder_monkey_round_%.0f", CGRectGetWidth(_view_.frame)]]

‎Coding_iOS/Controllers/AddMDCommentViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ - (void)loadEditView{
103103
_editView = [[EaseMarkdownTextView alloc] initWithFrame:self.view.bounds];
104104
_editView.curProject = self.curProject;
105105
_editView.backgroundColor = [UIColor clearColor];
106-
_editView.textColor = [UIColor colorWithHexString:@"0x666666"];
106+
_editView.textColor = kColor666;
107107
_editView.font = [UIFont systemFontOfSize:16];
108108
_editView.textContainerInset = UIEdgeInsetsMake(15, kPaddingLeftWidth - 5, 8, kPaddingLeftWidth - 5);
109109
_editView.placeholder = @"添加评论";

‎Coding_iOS/Controllers/AddReviewerViewController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
132132
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
133133
ReviewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_ReviewCell forIndexPath:indexPath];
134134
User* cellReviewer = self.allUsers[indexPath.row];
135-
cell.tintColor = [UIColor colorWithHexString:@"0x3BBD79"];
135+
cell.tintColor = kColorBrandGreen;
136136
[cell initCellWithUsers:cellReviewer];
137137
[tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:60];
138138
NSInteger index = indexPath.row;
@@ -239,4 +239,4 @@ - (void)searchProjectWithStr:(NSString *)searchString{
239239
[self.myTableView reloadData];
240240
}
241241

242-
@end
242+
@end

‎Coding_iOS/Controllers/AllSearchDisplayVC.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ - (void)initSearchResultsTableView {
169169
self.headerLabel = ({
170170
UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 2, kScreen_Width, 44)];
171171
label.backgroundColor = [UIColor clearColor];
172-
label.textColor = [UIColor colorWithHexString:@"0x999999"];
172+
label.textColor = kColor999;
173173
label.textAlignment = NSTextAlignmentCenter;
174174
label.font = [UIFont systemFontOfSize:12];
175175
label;
@@ -207,7 +207,7 @@ - (void)initSearchHistoryView {
207207

208208
{
209209
UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreen_Width, 0.5)];
210-
view.backgroundColor = [UIColor colorWithHexString:@"0xdddddd"];
210+
view.backgroundColor = kColorDDD;
211211
[_searchHistoryView addSubview:view];
212212
}
213213
NSArray *array = [CSSearchModel getSearchHistory];
@@ -231,7 +231,7 @@ - (void)initSearchHistoryView {
231231
UILabel *lblHistory = [[UILabel alloc] initWithFrame:CGRectMake(textLeft, i * height, kScreen_Width - textLeft, height)];
232232
lblHistory.userInteractionEnabled = YES;
233233
lblHistory.font = [UIFont systemFontOfSize:14];
234-
lblHistory.textColor = [UIColor colorWithHexString:@"0x222222"];
234+
lblHistory.textColor = kColor222;
235235
lblHistory.text = array[i];
236236

237237
UIImageView *leftView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 15, 15)];
@@ -245,7 +245,7 @@ - (void)initSearchHistoryView {
245245
rightImageView.image = [UIImage imageNamed:@"icon_arrow_searchHistory"];
246246

247247
UIView *view = [[UIView alloc] initWithFrame:CGRectMake(imageLeft, (i + 1) * height, kScreen_Width - imageLeft, 0.5)];
248-
view.backgroundColor = [UIColor colorWithHexString:@"0xdddddd"];
248+
view.backgroundColor = kColorDDD;
249249

250250
UITapGestureRecognizer *tapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didClickedHistory:)];
251251
[lblHistory addGestureRecognizer:tapGestureRecognizer];
@@ -267,7 +267,7 @@ - (void)initSearchHistoryView {
267267
[btnClean addTarget:self action:@selector(didCLickedCleanSearchHistory:) forControlEvents:UIControlEventTouchUpInside];
268268
{
269269
UIView *view = [[UIView alloc] initWithFrame:CGRectMake(imageLeft, (array.count + 1) * height, kScreen_Width - imageLeft, 0.5)];
270-
view.backgroundColor = [UIColor colorWithHexString:@"0xdddddd"];
270+
view.backgroundColor = kColorDDD;
271271
[_searchHistoryView addSubview:view];
272272
}
273273
}

‎Coding_iOS/Controllers/CountryCodeListViewController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ - (void)viewDidLoad{
2929
[tableView registerClass:[CountryCodeCell class] forCellReuseIdentifier:kCellIdentifier_CountryCodeCell];
3030
tableView.sectionIndexBackgroundColor = [UIColor clearColor];
3131
tableView.sectionIndexTrackingBackgroundColor = [UIColor clearColor];
32-
tableView.sectionIndexColor = [UIColor colorWithHexString:@"0x666666"];
32+
tableView.sectionIndexColor = kColor666;
3333
[self.view addSubview:tableView];
3434
[tableView mas_makeConstraints:^(MASConstraintMaker *make) {
3535
make.edges.equalTo(self.view);
@@ -103,7 +103,7 @@ - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger
103103
headerV.backgroundColor = self.myTableView.backgroundColor;
104104
UILabel *titleL = [UILabel new];
105105
titleL.font = [UIFont systemFontOfSize:12];
106-
titleL.textColor = [UIColor colorWithHexString:@"0x999999"];
106+
titleL.textColor = kColor999;
107107
titleL.text = [_keyList[section+ 1] isEqualToString:@"#"]? @"常用": _keyList[section+ 1];
108108
[headerV addSubview:titleL];
109109
[titleL mas_makeConstraints:^(MASConstraintMaker *make) {

‎Coding_iOS/Controllers/DynamicCommentCell.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
6363
}
6464
if (!_contentLabel) {
6565
_contentLabel = [[UITTTAttributedLabel alloc] initWithFrame:CGRectMake(kTaskCommentCell_LeftContentPading, curBottomY, kTaskCommentCell_ContentWidth, 30)];
66-
_contentLabel.textColor = [UIColor colorWithHexString:@"0x222222"];
66+
_contentLabel.textColor = kColor222;
6767
_contentLabel.font = kTaskCommentCell_FontContent;
6868
_contentLabel.linkAttributes = kLinkAttributes;
6969
_contentLabel.activeLinkAttributes = kLinkAttributesActive;
@@ -72,7 +72,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
7272
}
7373
if (!_timeLabel) {
7474
_timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(kTaskCommentCell_LeftContentPading, 0, kTaskCommentCell_ContentWidth, 20)];
75-
_timeLabel.textColor = [UIColor colorWithHexString:@"0x999999"];
75+
_timeLabel.textColor = kColor999;
7676
_timeLabel.font = [UIFont systemFontOfSize:12];
7777
[self.contentView addSubview:_timeLabel];
7878
}

‎Coding_iOS/Controllers/EditCodeViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ - (void)loadEditView{
100100
_editView = [[EaseMarkdownTextView alloc] initWithFrame:self.view.bounds];
101101
_editView.curProject = self.myProject;
102102
_editView.backgroundColor = [UIColor clearColor];
103-
_editView.textColor = [UIColor colorWithHexString:@"0x666666"];
103+
_editView.textColor = kColor666;
104104
_editView.font = [UIFont systemFontOfSize:16];
105105
_editView.textContainerInset = UIEdgeInsetsMake(15, kPaddingLeftWidth - 5, 8, kPaddingLeftWidth - 5);
106106
_editView.placeholder = @"编辑代码";

‎Coding_iOS/Controllers/EditTaskViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
511511

512512
UIBarButtonItem *barButton = [[UIBarButtonItem alloc] initWithTitle:@"移除" style:UIBarButtonItemStylePlain target:nil action:nil];
513513
[barButton setTitleTextAttributes:@{NSFontAttributeName: [UIFont boldSystemFontOfSize:17],
514-
NSForegroundColorAttributeName: [UIColor colorWithHexString:@"0x666666"]} forState:UIControlStateNormal];
514+
NSForegroundColorAttributeName: kColor666} forState:UIControlStateNormal];
515515
[picker setCancelButton:barButton];
516516
[picker showActionSheetPicker];
517517
}else if (cellType == LeftImage_LRTextCellTypeTaskStatus){

0 commit comments

Comments
 (0)