Skip to content

Commit 3c4c17f

Browse files
isacedisaced
committed
修复项目设置页面共有项目也显示私有图标问题和名称过长点点点问题
1 parent 6672766 commit 3c4c17f

3 files changed

Lines changed: 30 additions & 21 deletions

File tree

‎Coding_iOS/Controllers/ProjectSetting/ProjectSetting.storyboard‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6751" systemVersion="14C1514" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6751" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="iOS"/>
55
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6736"/>
@@ -29,18 +29,6 @@
2929
<constraint firstAttribute="width" constant="55" id="CIb-cN-IRf"/>
3030
</constraints>
3131
</imageView>
32-
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="项目名称" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="1wU-rL-E1K">
33-
<rect key="frame" x="103" y="29" width="179" height="21"/>
34-
<constraints>
35-
<constraint firstAttribute="height" constant="21" id="apB-Ie-eRA"/>
36-
</constraints>
37-
<color key="textColor" red="0.1333333333" green="0.1333333333" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/>
38-
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
39-
<textInputTraits key="textInputTraits"/>
40-
<connections>
41-
<outlet property="delegate" destination="aBN-lC-vWq" id="KWl-P0-uvq"/>
42-
</connections>
43-
</textField>
4432
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_project_private.png" translatesAutoresizingMaskIntoConstraints="NO" id="Q1S-eW-kft">
4533
<rect key="frame" x="82" y="33" width="13" height="13"/>
4634
<constraints>
@@ -55,18 +43,27 @@
5543
<constraint firstAttribute="height" constant="1" id="mRc-s2-OL3"/>
5644
</constraints>
5745
</view>
46+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="项目名称" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SyM-aU-EMa">
47+
<rect key="frame" x="103" y="30" width="68" height="21"/>
48+
<constraints>
49+
<constraint firstAttribute="height" constant="21" id="sh8-vb-Oei"/>
50+
</constraints>
51+
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
52+
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
53+
<nil key="highlightedColor"/>
54+
</label>
5855
</subviews>
5956
<constraints>
60-
<constraint firstItem="1wU-rL-E1K" firstAttribute="leading" secondItem="Q1S-eW-kft" secondAttribute="trailing" constant="8" id="0oi-S5-x4x"/>
6157
<constraint firstItem="DwG-SB-LhI" firstAttribute="top" secondItem="Fqp-oM-cmM" secondAttribute="top" id="1yA-31-v1y"/>
6258
<constraint firstAttribute="trailing" secondItem="DwG-SB-LhI" secondAttribute="trailing" id="2EY-jo-xkV"/>
63-
<constraint firstAttribute="trailingMargin" relation="lessThanOrEqual" secondItem="1wU-rL-E1K" secondAttribute="trailing" constant="30" id="9lE-Bw-eeC"/>
6459
<constraint firstItem="Q1S-eW-kft" firstAttribute="leading" secondItem="wnT-zR-nIE" secondAttribute="trailing" constant="12" id="Dj5-ft-vvh"/>
60+
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="SyM-aU-EMa" secondAttribute="trailing" constant="15" id="QZd-Ow-0jd"/>
6561
<constraint firstItem="DwG-SB-LhI" firstAttribute="leading" secondItem="Fqp-oM-cmM" secondAttribute="leading" id="U7B-R0-4bL"/>
66-
<constraint firstItem="1wU-rL-E1K" firstAttribute="top" secondItem="Fqp-oM-cmM" secondAttribute="topMargin" constant="21" id="eeX-Iw-Lf0"/>
6762
<constraint firstItem="Q1S-eW-kft" firstAttribute="top" secondItem="Fqp-oM-cmM" secondAttribute="topMargin" constant="25" id="gMb-gl-p5f"/>
6863
<constraint firstItem="wnT-zR-nIE" firstAttribute="leading" secondItem="Fqp-oM-cmM" secondAttribute="leading" constant="15" id="jeQ-le-K6x"/>
64+
<constraint firstItem="SyM-aU-EMa" firstAttribute="leading" secondItem="Q1S-eW-kft" secondAttribute="trailing" constant="8" id="kXp-Cb-c2D"/>
6965
<constraint firstItem="wnT-zR-nIE" firstAttribute="top" secondItem="Fqp-oM-cmM" secondAttribute="topMargin" constant="4" id="pf3-27-iaQ"/>
66+
<constraint firstItem="SyM-aU-EMa" firstAttribute="top" secondItem="Fqp-oM-cmM" secondAttribute="top" constant="30" id="v68-bF-4QZ"/>
7067
</constraints>
7168
</tableViewCellContentView>
7269
</tableViewCell>
@@ -162,8 +159,10 @@
162159
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
163160
<connections>
164161
<outlet property="descTextView" destination="sis-TG-0f8" id="aTT-Mv-rPy"/>
162+
<outlet property="privateIconLeftConstraint" destination="Dj5-ft-vvh" id="h3A-uJ-sib"/>
163+
<outlet property="privateImageView" destination="Q1S-eW-kft" id="9Xk-p1-Ldy"/>
165164
<outlet property="projectImageView" destination="wnT-zR-nIE" id="4JP-FP-d6b"/>
166-
<outlet property="projectNameTextField" destination="1wU-rL-E1K" id="CGZ-z5-mw4"/>
165+
<outlet property="projectNameLabel" destination="SyM-aU-EMa" id="0Qz-12-NVA"/>
167166
<outletCollection property="lines" destination="81D-Ss-W9I" id="knO-fi-sN1"/>
168167
<outletCollection property="lines" destination="aJc-kT-Rp8" id="8m6-ON-K1l"/>
169168
<outletCollection property="lines" destination="tbw-AN-t3X" id="JUv-MK-2Uc"/>
@@ -172,7 +171,7 @@
172171
</tableViewController>
173172
<placeholder placeholderIdentifier="IBFirstResponder" id="XTZ-Sc-Qlw" userLabel="First Responder" sceneMemberID="firstResponder"/>
174173
</objects>
175-
<point key="canvasLocation" x="172" y="300"/>
174+
<point key="canvasLocation" x="172" y="299"/>
176175
</scene>
177176
<!--高级设置-->
178177
<scene sceneID="aKh-1D-3YA">

‎Coding_iOS/Controllers/ProjectSetting/ProjectSettingViewController.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515

1616
@property (nonatomic, strong) Project *project;
1717

18+
@property (strong, nonatomic) IBOutlet UILabel *projectNameLabel;
1819
@property (strong, nonatomic) IBOutlet UIImageView *projectImageView;
19-
@property (strong, nonatomic) IBOutlet UITextField *projectNameTextField;
2020
@property (strong, nonatomic) IBOutlet UIPlaceHolderTextView *descTextView;
2121

2222
@property (strong, nonatomic) IBOutletCollection(NSLayoutConstraint) NSArray *lines;
23+
@property (strong, nonatomic) IBOutlet UIImageView *privateImageView;
24+
@property (strong, nonatomic) IBOutlet NSLayoutConstraint *privateIconLeftConstraint;
2325

2426

2527
@end

‎Coding_iOS/Controllers/ProjectSetting/ProjectSettingViewController.m‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,23 @@ @implementation ProjectSettingViewController
2626
- (void)viewDidLoad {
2727
[super viewDidLoad];
2828

29+
// Private Icon
30+
if ([self.project.is_public isEqual:@YES]) {
31+
self.privateImageView.hidden = YES;
32+
self.privateIconLeftConstraint.constant = -5;
33+
}
34+
35+
// sep
2936
for (NSLayoutConstraint *cons in self.lines) {
3037
cons.constant = 0.5;
3138
}
3239

33-
//
40+
//tabview
3441
self.tableView.tableFooterView = [UIView new];
3542
[self.tableView setSeparatorColor:[UIColor colorWithRGBHex:0xe5e5e5]];
3643

37-
self.projectNameTextField.text = self.project.name;
44+
self.projectNameLabel.text = self.project.name;
45+
3846
//
3947
self.descTextView.placeholder = @"填写项目描述...";
4048
self.descTextView.text = self.project.description_mine;

0 commit comments

Comments
 (0)