Commit ebb6ae98d0353fb7143110a70792f15cde9f345c
1 parent
45b9dc3a
feat:data page navigation UI
Showing
5 changed files
with
37 additions
and
70 deletions
HDFwear/Basic/View/DatePickerView.swift
... | ... | @@ -61,13 +61,13 @@ class DatePickerView: UIView { |
61 | 61 | return picker |
62 | 62 | }() |
63 | 63 | |
64 | - init(title: String, sureText: String = LocString("确定"), titleColor: UIColor = UIColor.rgbColorFromHex(0x333333)) { | |
64 | + init(title: String, sureText: String = LocString("确定")) { | |
65 | 65 | super.init(frame: CGRect(x: 0, y: 0, width: SCREEN_WIDTH, height: SCREEN_HEIGHT)) |
66 | - createView(title: title, sureText: sureText, titleColor: titleColor) | |
66 | + createView(title: title, sureText: sureText) | |
67 | 67 | } |
68 | 68 | |
69 | 69 | |
70 | - func createView(title: String, sureText: String, titleColor: UIColor) { | |
70 | + func createView(title: String, sureText: String) { | |
71 | 71 | self.backgroundColor = UIColor.black.withAlphaComponent(0.1) |
72 | 72 | |
73 | 73 | bgView.backgroundColor = .white | ... | ... |
HDFwear/Basic/View/ZCPickerView.swift
... | ... | @@ -66,17 +66,16 @@ class ZCPickerView: UIView, UIPickerViewDelegate, UIPickerViewDataSource { |
66 | 66 | // } |
67 | 67 | // } |
68 | 68 | |
69 | - init(title: String, values: [Int], suffix: String? = nil, titleColor: UIColor = UIColor.rgbColorFromHex(0x333333), sureText: String = LocString("确定")) { | |
69 | + init(title: String, values: [Int], suffix: String? = nil, sureText: String = LocString("确定")) { | |
70 | 70 | super.init(frame: CGRect(x: 0, y: 0, width: SCREEN_WIDTH, height: SCREEN_HEIGHT)) |
71 | - createView(title: title, values: values, suffix: suffix, titleColor: titleColor, sureText: sureText) | |
71 | + createView(title: title, values: values, suffix: suffix, sureText: sureText) | |
72 | 72 | } |
73 | 73 | |
74 | 74 | |
75 | - func createView(title: String, values: [Int], suffix: String? = nil, titleColor: UIColor, sureText: String) { | |
75 | + func createView(title: String, values: [Int], suffix: String? = nil, sureText: String) { | |
76 | 76 | self.backgroundColor = UIColor.black.withAlphaComponent(0.1) |
77 | 77 | |
78 | 78 | bgView.backgroundColor = .white |
79 | - self.titleColor = titleColor | |
80 | 79 | self.suffix = suffix |
81 | 80 | self.values = values |
82 | 81 | titleLabel.text = title | ... | ... |
HDFwear/Home/Base.lproj/Home.storyboard
... | ... | @@ -266,7 +266,7 @@ |
266 | 266 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Ey-ay-8OW"> |
267 | 267 | <rect key="frame" x="0.0" y="0.0" width="414" height="173"/> |
268 | 268 | <subviews> |
269 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_step" translatesAutoresizingMaskIntoConstraints="NO" id="ctN-LM-oer"> | |
269 | + <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_step" translatesAutoresizingMaskIntoConstraints="NO" id="ctN-LM-oer"> | |
270 | 270 | <rect key="frame" x="0.0" y="0.0" width="414" height="143"/> |
271 | 271 | </imageView> |
272 | 272 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mcl-Rp-0cg" customClass="DateSegmentView" customModule="HDFwear" customModuleProvider="target"> |
... | ... | @@ -721,7 +721,7 @@ |
721 | 721 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3ah-D3-RPp"> |
722 | 722 | <rect key="frame" x="0.0" y="0.0" width="414" height="173"/> |
723 | 723 | <subviews> |
724 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_bp" translatesAutoresizingMaskIntoConstraints="NO" id="bG4-I1-Sso"> | |
724 | + <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_bp" translatesAutoresizingMaskIntoConstraints="NO" id="bG4-I1-Sso"> | |
725 | 725 | <rect key="frame" x="0.0" y="0.0" width="414" height="143"/> |
726 | 726 | </imageView> |
727 | 727 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9Ak-0x-sbd" customClass="DateSegmentView" customModule="HDFwear" customModuleProvider="target"> |
... | ... | @@ -970,7 +970,7 @@ |
970 | 970 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iOA-s9-00C"> |
971 | 971 | <rect key="frame" x="0.0" y="0.0" width="414" height="173"/> |
972 | 972 | <subviews> |
973 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_bo" translatesAutoresizingMaskIntoConstraints="NO" id="BMI-6q-lGR"> | |
973 | + <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_bo" translatesAutoresizingMaskIntoConstraints="NO" id="BMI-6q-lGR"> | |
974 | 974 | <rect key="frame" x="0.0" y="0.0" width="414" height="143"/> |
975 | 975 | </imageView> |
976 | 976 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oBW-Ub-aSZ" customClass="DateSegmentView" customModule="HDFwear" customModuleProvider="target"> |
... | ... | @@ -1266,7 +1266,7 @@ |
1266 | 1266 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dnq-7K-Yxv"> |
1267 | 1267 | <rect key="frame" x="0.0" y="0.0" width="414" height="173"/> |
1268 | 1268 | <subviews> |
1269 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_hr" translatesAutoresizingMaskIntoConstraints="NO" id="DYo-nH-4qK"> | |
1269 | + <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_hr" translatesAutoresizingMaskIntoConstraints="NO" id="DYo-nH-4qK"> | |
1270 | 1270 | <rect key="frame" x="0.0" y="0.0" width="414" height="143"/> |
1271 | 1271 | </imageView> |
1272 | 1272 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HhG-7o-Pit" customClass="DateSegmentView" customModule="HDFwear" customModuleProvider="target"> |
... | ... | @@ -2865,7 +2865,7 @@ |
2865 | 2865 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XWn-8D-Osq"> |
2866 | 2866 | <rect key="frame" x="0.0" y="0.0" width="414" height="173"/> |
2867 | 2867 | <subviews> |
2868 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_sleep" translatesAutoresizingMaskIntoConstraints="NO" id="Cog-XW-Uqm"> | |
2868 | + <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_sleep" translatesAutoresizingMaskIntoConstraints="NO" id="Cog-XW-Uqm"> | |
2869 | 2869 | <rect key="frame" x="0.0" y="0.0" width="414" height="143"/> |
2870 | 2870 | </imageView> |
2871 | 2871 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d4r-ua-2Fn" customClass="DateSegmentView" customModule="HDFwear" customModuleProvider="target"> |
... | ... | @@ -3232,7 +3232,7 @@ |
3232 | 3232 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="26P-p7-cMW"> |
3233 | 3233 | <rect key="frame" x="0.0" y="0.0" width="414" height="128"/> |
3234 | 3234 | <subviews> |
3235 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_train" translatesAutoresizingMaskIntoConstraints="NO" id="zhu-yJ-Da6"> | |
3235 | + <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="nav_train" translatesAutoresizingMaskIntoConstraints="NO" id="zhu-yJ-Da6"> | |
3236 | 3236 | <rect key="frame" x="0.0" y="0.0" width="414" height="98"/> |
3237 | 3237 | </imageView> |
3238 | 3238 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OOz-UR-bNX" customClass="DateSegmentView" customModule="HDFwear" customModuleProvider="target"> |
... | ... | @@ -4014,20 +4014,11 @@ |
4014 | 4014 | <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" bouncesZoom="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oPv-tx-ukt"> |
4015 | 4015 | <rect key="frame" x="0.0" y="48" width="414" height="814"/> |
4016 | 4016 | <subviews> |
4017 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="women_health_bg" translatesAutoresizingMaskIntoConstraints="NO" id="jgC-Wd-5IC"> | |
4018 | - <rect key="frame" x="0.0" y="0.0" width="414" height="287"/> | |
4019 | - <constraints> | |
4020 | - <constraint firstAttribute="width" secondItem="jgC-Wd-5IC" secondAttribute="height" multiplier="375:260" id="cFe-Bu-qQQ"/> | |
4021 | - </constraints> | |
4022 | - </imageView> | |
4023 | 4017 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bGQ-U4-MDG"> |
4024 | - <rect key="frame" x="0.0" y="287" width="414" height="80"/> | |
4018 | + <rect key="frame" x="0.0" y="0.0" width="414" height="80"/> | |
4025 | 4019 | <subviews> |
4026 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="menstrual_days" translatesAutoresizingMaskIntoConstraints="NO" id="T2R-CR-Uoj"> | |
4027 | - <rect key="frame" x="12" y="47" width="16" height="16"/> | |
4028 | - </imageView> | |
4029 | 4020 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="经期天数" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eY7-O6-U5i"> |
4030 | - <rect key="frame" x="38" y="44.5" width="60" height="21"/> | |
4021 | + <rect key="frame" x="12" y="44.5" width="60" height="21"/> | |
4031 | 4022 | <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/> |
4032 | 4023 | <nil key="textColor"/> |
4033 | 4024 | <nil key="highlightedColor"/> |
... | ... | @@ -4068,32 +4059,27 @@ |
4068 | 4059 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
4069 | 4060 | <constraints> |
4070 | 4061 | <constraint firstItem="Uq2-56-dmL" firstAttribute="leading" secondItem="bGQ-U4-MDG" secondAttribute="leading" id="0AC-hH-tva"/> |
4062 | + <constraint firstItem="eY7-O6-U5i" firstAttribute="leading" secondItem="bGQ-U4-MDG" secondAttribute="leading" constant="12" id="3W7-W6-71a"/> | |
4071 | 4063 | <constraint firstAttribute="trailing" secondItem="qoN-q8-xo6" secondAttribute="trailing" constant="15" id="IQz-RX-e79"/> |
4072 | - <constraint firstItem="T2R-CR-Uoj" firstAttribute="leading" secondItem="bGQ-U4-MDG" secondAttribute="leading" constant="12" id="KIz-pk-bou"/> | |
4073 | - <constraint firstItem="qoN-q8-xo6" firstAttribute="centerY" secondItem="T2R-CR-Uoj" secondAttribute="centerY" id="P6T-lo-Aet"/> | |
4064 | + <constraint firstItem="qoN-q8-xo6" firstAttribute="centerY" secondItem="eY7-O6-U5i" secondAttribute="centerY" id="KDn-ms-Aab"/> | |
4074 | 4065 | <constraint firstItem="gFt-2u-8rB" firstAttribute="leading" secondItem="bGQ-U4-MDG" secondAttribute="leading" id="SMX-dF-tN5"/> |
4075 | 4066 | <constraint firstAttribute="trailing" secondItem="Uq2-56-dmL" secondAttribute="trailing" id="UB2-F2-gri"/> |
4067 | + <constraint firstItem="gFt-2u-8rB" firstAttribute="top" secondItem="eY7-O6-U5i" secondAttribute="bottom" constant="14" id="UR6-Dp-5I9"/> | |
4076 | 4068 | <constraint firstAttribute="bottom" secondItem="gFt-2u-8rB" secondAttribute="bottom" id="VQh-Z7-ww7"/> |
4077 | 4069 | <constraint firstAttribute="trailing" secondItem="gFt-2u-8rB" secondAttribute="trailing" id="VWM-q9-Tzz"/> |
4078 | - <constraint firstItem="eY7-O6-U5i" firstAttribute="leading" secondItem="T2R-CR-Uoj" secondAttribute="trailing" constant="10" id="aQB-ZM-1Mn"/> | |
4079 | - <constraint firstAttribute="bottom" secondItem="T2R-CR-Uoj" secondAttribute="bottom" constant="17" id="cW6-XB-OmU"/> | |
4080 | - <constraint firstItem="sUd-XD-50k" firstAttribute="centerY" secondItem="T2R-CR-Uoj" secondAttribute="centerY" id="g4Q-Gv-jny"/> | |
4070 | + <constraint firstItem="sUd-XD-50k" firstAttribute="centerY" secondItem="eY7-O6-U5i" secondAttribute="centerY" id="gMJ-dM-ZGv"/> | |
4081 | 4071 | <constraint firstItem="xEf-vJ-AYY" firstAttribute="top" secondItem="bGQ-U4-MDG" secondAttribute="top" constant="10" id="kHs-pi-Ybi"/> |
4082 | 4072 | <constraint firstItem="qoN-q8-xo6" firstAttribute="leading" secondItem="sUd-XD-50k" secondAttribute="trailing" constant="12" id="lhU-Jl-7Jd"/> |
4083 | 4073 | <constraint firstItem="xEf-vJ-AYY" firstAttribute="leading" secondItem="bGQ-U4-MDG" secondAttribute="leading" constant="12" id="n2f-5W-sUC"/> |
4084 | 4074 | <constraint firstAttribute="height" constant="80" id="qIY-Dk-sWg"/> |
4085 | - <constraint firstItem="T2R-CR-Uoj" firstAttribute="centerY" secondItem="eY7-O6-U5i" secondAttribute="centerY" id="xQd-yd-GHM"/> | |
4086 | 4075 | <constraint firstItem="gFt-2u-8rB" firstAttribute="top" secondItem="Uq2-56-dmL" secondAttribute="bottom" id="xkF-9p-upn"/> |
4087 | 4076 | </constraints> |
4088 | 4077 | </view> |
4089 | 4078 | <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="adQ-61-Ty0"> |
4090 | - <rect key="frame" x="0.0" y="367" width="414" height="80"/> | |
4079 | + <rect key="frame" x="0.0" y="80" width="414" height="80"/> | |
4091 | 4080 | <subviews> |
4092 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="menstrual_cycle" translatesAutoresizingMaskIntoConstraints="NO" id="o3Z-cM-2IH"> | |
4093 | - <rect key="frame" x="12" y="47" width="16" height="16"/> | |
4094 | - </imageView> | |
4095 | 4081 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="周期长度" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="utt-4S-mqf"> |
4096 | - <rect key="frame" x="38" y="44.5" width="60" height="21"/> | |
4082 | + <rect key="frame" x="12" y="44.5" width="60" height="21"/> | |
4097 | 4083 | <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/> |
4098 | 4084 | <nil key="textColor"/> |
4099 | 4085 | <nil key="highlightedColor"/> |
... | ... | @@ -4133,28 +4119,26 @@ |
4133 | 4119 | </subviews> |
4134 | 4120 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
4135 | 4121 | <constraints> |
4136 | - <constraint firstItem="utt-4S-mqf" firstAttribute="leading" secondItem="o3Z-cM-2IH" secondAttribute="trailing" constant="10" id="1cu-PR-ZY1"/> | |
4137 | - <constraint firstItem="o3Z-cM-2IH" firstAttribute="leading" secondItem="adQ-61-Ty0" secondAttribute="leading" constant="12" id="4lj-Qi-kag"/> | |
4122 | + <constraint firstItem="h1k-mO-lwO" firstAttribute="top" secondItem="utt-4S-mqf" secondAttribute="bottom" constant="14" id="01m-mv-ene"/> | |
4138 | 4123 | <constraint firstItem="Duw-Dg-rH2" firstAttribute="leading" secondItem="abe-Nr-F0a" secondAttribute="trailing" constant="12" id="6KC-6H-Wo2"/> |
4139 | - <constraint firstItem="abe-Nr-F0a" firstAttribute="centerY" secondItem="o3Z-cM-2IH" secondAttribute="centerY" id="CF3-jP-W3N"/> | |
4140 | 4124 | <constraint firstAttribute="trailing" secondItem="Duw-Dg-rH2" secondAttribute="trailing" constant="15" id="EZs-ku-B2n"/> |
4141 | 4125 | <constraint firstAttribute="trailing" secondItem="Xtm-ne-LuI" secondAttribute="trailing" id="LPA-zA-q0Z"/> |
4142 | 4126 | <constraint firstItem="Vnk-ll-oe9" firstAttribute="leading" secondItem="adQ-61-Ty0" secondAttribute="leading" constant="12" id="PaR-oW-fSV"/> |
4143 | 4127 | <constraint firstItem="h1k-mO-lwO" firstAttribute="top" secondItem="Xtm-ne-LuI" secondAttribute="bottom" id="RKX-IU-bwb"/> |
4144 | - <constraint firstAttribute="bottom" secondItem="o3Z-cM-2IH" secondAttribute="bottom" constant="17" id="T9z-T8-uD1"/> | |
4145 | - <constraint firstItem="o3Z-cM-2IH" firstAttribute="centerY" secondItem="utt-4S-mqf" secondAttribute="centerY" id="fPv-Cv-CAn"/> | |
4128 | + <constraint firstItem="Duw-Dg-rH2" firstAttribute="centerY" secondItem="utt-4S-mqf" secondAttribute="centerY" id="RnC-Et-I2m"/> | |
4129 | + <constraint firstItem="abe-Nr-F0a" firstAttribute="centerY" secondItem="utt-4S-mqf" secondAttribute="centerY" id="RwT-h7-eNd"/> | |
4146 | 4130 | <constraint firstItem="Xtm-ne-LuI" firstAttribute="leading" secondItem="adQ-61-Ty0" secondAttribute="leading" id="hl4-WR-Ido"/> |
4131 | + <constraint firstItem="utt-4S-mqf" firstAttribute="leading" secondItem="adQ-61-Ty0" secondAttribute="leading" constant="12" id="j2V-wR-UHb"/> | |
4147 | 4132 | <constraint firstAttribute="height" constant="80" id="lRy-Y8-tPT"/> |
4148 | 4133 | <constraint firstItem="h1k-mO-lwO" firstAttribute="leading" secondItem="adQ-61-Ty0" secondAttribute="leading" id="nGe-6y-XUc"/> |
4149 | 4134 | <constraint firstAttribute="trailing" secondItem="Vnk-ll-oe9" secondAttribute="trailing" constant="90" id="q69-Gf-6Tt"/> |
4150 | - <constraint firstItem="Duw-Dg-rH2" firstAttribute="centerY" secondItem="o3Z-cM-2IH" secondAttribute="centerY" id="qKD-hz-IdO"/> | |
4151 | 4135 | <constraint firstAttribute="trailing" secondItem="h1k-mO-lwO" secondAttribute="trailing" id="t5P-Rj-pK2"/> |
4152 | 4136 | <constraint firstAttribute="bottom" secondItem="h1k-mO-lwO" secondAttribute="bottom" id="xiz-K9-qBh"/> |
4153 | 4137 | <constraint firstItem="Vnk-ll-oe9" firstAttribute="centerY" secondItem="adQ-61-Ty0" secondAttribute="centerY" constant="-22" id="zHj-cB-aFh"/> |
4154 | 4138 | </constraints> |
4155 | 4139 | </view> |
4156 | 4140 | <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yJj-ME-aGj"> |
4157 | - <rect key="frame" x="0.0" y="447" width="414" height="80"/> | |
4141 | + <rect key="frame" x="0.0" y="160" width="414" height="80"/> | |
4158 | 4142 | <subviews> |
4159 | 4143 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="最近一次月经是什么时候?" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eca-uJ-Es0"> |
4160 | 4144 | <rect key="frame" x="12" y="10" width="132" height="16"/> |
... | ... | @@ -4162,15 +4146,8 @@ |
4162 | 4146 | <nil key="textColor"/> |
4163 | 4147 | <nil key="highlightedColor"/> |
4164 | 4148 | </label> |
4165 | - <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="menstrual_last" translatesAutoresizingMaskIntoConstraints="NO" id="P4g-9y-j8z"> | |
4166 | - <rect key="frame" x="12" y="47" width="16" height="16"/> | |
4167 | - <constraints> | |
4168 | - <constraint firstAttribute="width" constant="16" id="4sD-MR-IE3"/> | |
4169 | - <constraint firstAttribute="height" constant="16" id="rYB-6d-k8q"/> | |
4170 | - </constraints> | |
4171 | - </imageView> | |
4172 | 4149 | <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="最近一次月经" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LaM-YL-ghE"> |
4173 | - <rect key="frame" x="38" y="44.5" width="236" height="21"/> | |
4150 | + <rect key="frame" x="12" y="44.5" width="262" height="21"/> | |
4174 | 4151 | <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/> |
4175 | 4152 | <nil key="textColor"/> |
4176 | 4153 | <nil key="highlightedColor"/> |
... | ... | @@ -4213,19 +4190,17 @@ |
4213 | 4190 | <constraints> |
4214 | 4191 | <constraint firstItem="N9t-El-Klf" firstAttribute="leading" secondItem="73j-Rh-sX7" secondAttribute="trailing" constant="12" id="3aT-pI-px1"/> |
4215 | 4192 | <constraint firstItem="eca-uJ-Es0" firstAttribute="leading" secondItem="yJj-ME-aGj" secondAttribute="leading" constant="12" id="3tX-Fk-QkW"/> |
4193 | + <constraint firstItem="73j-Rh-sX7" firstAttribute="centerY" secondItem="LaM-YL-ghE" secondAttribute="centerY" id="4Rv-92-RLE"/> | |
4194 | + <constraint firstItem="UvI-KF-tbD" firstAttribute="top" secondItem="LaM-YL-ghE" secondAttribute="bottom" constant="14" id="6f1-VT-fzu"/> | |
4216 | 4195 | <constraint firstItem="UvI-KF-tbD" firstAttribute="top" secondItem="363-H6-0ML" secondAttribute="bottom" id="AUW-w8-zza"/> |
4217 | - <constraint firstItem="73j-Rh-sX7" firstAttribute="centerY" secondItem="P4g-9y-j8z" secondAttribute="centerY" id="Cr0-18-GSf"/> | |
4218 | 4196 | <constraint firstAttribute="trailing" secondItem="363-H6-0ML" secondAttribute="trailing" id="FCq-2y-kUT"/> |
4197 | + <constraint firstItem="N9t-El-Klf" firstAttribute="centerY" secondItem="LaM-YL-ghE" secondAttribute="centerY" id="MBm-2y-xOe"/> | |
4219 | 4198 | <constraint firstItem="UvI-KF-tbD" firstAttribute="leading" secondItem="yJj-ME-aGj" secondAttribute="leading" id="PFQ-nk-ZIW"/> |
4220 | 4199 | <constraint firstAttribute="bottom" secondItem="UvI-KF-tbD" secondAttribute="bottom" id="Z5O-dd-MhU"/> |
4221 | - <constraint firstItem="N9t-El-Klf" firstAttribute="centerY" secondItem="P4g-9y-j8z" secondAttribute="centerY" id="doG-7R-ZnJ"/> | |
4200 | + <constraint firstItem="LaM-YL-ghE" firstAttribute="leading" secondItem="yJj-ME-aGj" secondAttribute="leading" constant="12" id="ZV5-3v-9ET"/> | |
4222 | 4201 | <constraint firstItem="363-H6-0ML" firstAttribute="leading" secondItem="yJj-ME-aGj" secondAttribute="leading" id="f3Q-bw-Qzd"/> |
4223 | - <constraint firstAttribute="bottom" secondItem="P4g-9y-j8z" secondAttribute="bottom" constant="17" id="gO9-Op-JoI"/> | |
4224 | 4202 | <constraint firstItem="73j-Rh-sX7" firstAttribute="leading" secondItem="LaM-YL-ghE" secondAttribute="trailing" constant="10" id="gu3-Cx-ozv"/> |
4225 | - <constraint firstItem="P4g-9y-j8z" firstAttribute="centerY" secondItem="LaM-YL-ghE" secondAttribute="centerY" id="h4l-j5-4QD"/> | |
4226 | - <constraint firstItem="P4g-9y-j8z" firstAttribute="leading" secondItem="yJj-ME-aGj" secondAttribute="leading" constant="12" id="iDr-gD-yGq"/> | |
4227 | 4203 | <constraint firstAttribute="height" constant="80" id="k0U-J3-gzq"/> |
4228 | - <constraint firstItem="LaM-YL-ghE" firstAttribute="leading" secondItem="P4g-9y-j8z" secondAttribute="trailing" constant="10" id="kzf-oC-gsk"/> | |
4229 | 4204 | <constraint firstAttribute="trailing" secondItem="N9t-El-Klf" secondAttribute="trailing" constant="15" id="mye-BN-iSB"/> |
4230 | 4205 | <constraint firstAttribute="trailing" secondItem="UvI-KF-tbD" secondAttribute="trailing" id="qG2-fe-lm5"/> |
4231 | 4206 | <constraint firstItem="eca-uJ-Es0" firstAttribute="top" secondItem="yJj-ME-aGj" secondAttribute="top" constant="10" id="yMu-wQ-7iz"/> |
... | ... | @@ -4234,25 +4209,22 @@ |
4234 | 4209 | </subviews> |
4235 | 4210 | <constraints> |
4236 | 4211 | <constraint firstItem="adQ-61-Ty0" firstAttribute="leading" secondItem="oPv-tx-ukt" secondAttribute="leading" id="4KL-wm-n80"/> |
4237 | - <constraint firstItem="jgC-Wd-5IC" firstAttribute="leading" secondItem="oPv-tx-ukt" secondAttribute="leading" id="5wq-Wa-tVc"/> | |
4238 | 4212 | <constraint firstAttribute="bottom" secondItem="yJj-ME-aGj" secondAttribute="bottom" constant="10" id="7kH-MR-keq"/> |
4213 | + <constraint firstItem="bGQ-U4-MDG" firstAttribute="top" secondItem="oPv-tx-ukt" secondAttribute="top" id="EcY-RT-zjC"/> | |
4239 | 4214 | <constraint firstItem="adQ-61-Ty0" firstAttribute="top" secondItem="bGQ-U4-MDG" secondAttribute="bottom" id="GwL-uf-U9z"/> |
4240 | 4215 | <constraint firstItem="yJj-ME-aGj" firstAttribute="leading" secondItem="oPv-tx-ukt" secondAttribute="leading" id="Kh1-Jh-xl5"/> |
4241 | - <constraint firstItem="bGQ-U4-MDG" firstAttribute="top" secondItem="jgC-Wd-5IC" secondAttribute="bottom" id="O0N-VJ-WoU"/> | |
4242 | 4216 | <constraint firstItem="yJj-ME-aGj" firstAttribute="top" secondItem="adQ-61-Ty0" secondAttribute="bottom" id="OP9-8f-mVW"/> |
4243 | 4217 | <constraint firstItem="bGQ-U4-MDG" firstAttribute="leading" secondItem="oPv-tx-ukt" secondAttribute="leading" id="VWm-Ap-E8s"/> |
4244 | - <constraint firstAttribute="trailing" secondItem="jgC-Wd-5IC" secondAttribute="trailing" id="lst-tF-cfw"/> | |
4245 | 4218 | <constraint firstAttribute="trailing" secondItem="bGQ-U4-MDG" secondAttribute="trailing" id="m8f-v0-9Fc"/> |
4246 | 4219 | <constraint firstAttribute="trailing" secondItem="adQ-61-Ty0" secondAttribute="trailing" id="qAn-ND-GU9"/> |
4247 | - <constraint firstItem="jgC-Wd-5IC" firstAttribute="width" secondItem="oPv-tx-ukt" secondAttribute="width" id="wwu-WE-YI4"/> | |
4248 | 4220 | <constraint firstAttribute="trailing" secondItem="yJj-ME-aGj" secondAttribute="trailing" id="xlW-Cg-nWE"/> |
4249 | - <constraint firstItem="jgC-Wd-5IC" firstAttribute="top" secondItem="oPv-tx-ukt" secondAttribute="top" id="yG3-jf-K4V"/> | |
4250 | 4221 | </constraints> |
4251 | 4222 | </scrollView> |
4252 | 4223 | </subviews> |
4253 | 4224 | <viewLayoutGuide key="safeArea" id="E5p-md-Yc1"/> |
4254 | 4225 | <color key="backgroundColor" systemColor="systemBackgroundColor"/> |
4255 | 4226 | <constraints> |
4227 | + <constraint firstItem="bGQ-U4-MDG" firstAttribute="width" secondItem="RvZ-Od-QyS" secondAttribute="width" id="7s6-u4-vF2"/> | |
4256 | 4228 | <constraint firstItem="E5p-md-Yc1" firstAttribute="bottom" secondItem="oPv-tx-ukt" secondAttribute="bottom" id="CVi-lB-QXs"/> |
4257 | 4229 | <constraint firstItem="oPv-tx-ukt" firstAttribute="leading" secondItem="E5p-md-Yc1" secondAttribute="leading" id="GJw-B9-GXY"/> |
4258 | 4230 | <constraint firstItem="oPv-tx-ukt" firstAttribute="top" secondItem="E5p-md-Yc1" secondAttribute="top" id="sjJ-Bh-Ouf"/> |
... | ... | @@ -5099,10 +5071,7 @@ |
5099 | 5071 | <image name="date_left" width="13" height="13"/> |
5100 | 5072 | <image name="date_right" width="13" height="13"/> |
5101 | 5073 | <image name="detail_btn" width="22.5" height="22.5"/> |
5102 | - <image name="menstrual_cycle" width="16" height="16"/> | |
5103 | 5074 | <image name="menstrual_day" width="16" height="16"/> |
5104 | - <image name="menstrual_days" width="16" height="16"/> | |
5105 | - <image name="menstrual_last" width="16" height="16"/> | |
5106 | 5075 | <image name="menstrual_love" width="16" height="16"/> |
5107 | 5076 | <image name="menstrual_switch_false" width="80" height="32"/> |
5108 | 5077 | <image name="menstrual_temperature" width="16" height="16"/> |
... | ... | @@ -5119,7 +5088,6 @@ |
5119 | 5088 | <image name="reference_distance" width="18" height="18"/> |
5120 | 5089 | <image name="reference_step" width="18" height="18"/> |
5121 | 5090 | <image name="share_btn" width="22" height="22"/> |
5122 | - <image name="women_health_bg" width="375" height="260"/> | |
5123 | 5091 | <systemColor name="systemBackgroundColor"> |
5124 | 5092 | <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
5125 | 5093 | </systemColor> | ... | ... |
HDFwear/Home/WomenHealthVC.swift
... | ... | @@ -52,7 +52,7 @@ class WomenHealthVC: UIViewController { |
52 | 52 | let saveButton = UIButton(frame: CGRect(x: 0, y: 0, width: 40, height: 28)) |
53 | 53 | saveButton.setTitle(LocString("保存"), for: .normal) |
54 | 54 | saveButton.titleLabel?.font = RegularFont(14) |
55 | - saveButton.setTitleColor(UIColor.rgbColorFromHex(0xEF3257), for: .normal) | |
55 | + saveButton.setTitleColor(TintColor, for: .normal) | |
56 | 56 | saveButton.addTarget(self, action: #selector(save), for: .touchUpInside) |
57 | 57 | navigationItem.rightBarButtonItem = UIBarButtonItem(customView: saveButton) |
58 | 58 | |
... | ... | @@ -114,7 +114,7 @@ class WomenHealthVC: UIViewController { |
114 | 114 | let values = (3..<9).map { (i) -> Int in |
115 | 115 | return i |
116 | 116 | } |
117 | - let pickerView = ZCPickerView(title: LocString("选择经期天数"), values: values, suffix: LocString("天"), titleColor: UIColor.rgbColorFromHex(0xEF3257)) | |
117 | + let pickerView = ZCPickerView(title: LocString("选择经期天数"), values: values, suffix: LocString("天")) | |
118 | 118 | pickerView.selectedRow = values.firstIndex(of: menstrual.days) ?? 4 |
119 | 119 | pickerView.show() |
120 | 120 | pickerView.clickClosure = {[weak self] value in |
... | ... | @@ -129,7 +129,7 @@ class WomenHealthVC: UIViewController { |
129 | 129 | let values = (24..<41).map { (i) -> Int in |
130 | 130 | return i |
131 | 131 | } |
132 | - let pickerView = ZCPickerView(title: LocString("选择周期长度"), values: values, suffix: LocString("天"), titleColor: UIColor.rgbColorFromHex(0xEF3257)) | |
132 | + let pickerView = ZCPickerView(title: LocString("选择周期长度"), values: values, suffix: LocString("天")) | |
133 | 133 | pickerView.selectedRow = values.firstIndex(of: menstrual.cycle) ?? 6 |
134 | 134 | pickerView.show() |
135 | 135 | pickerView.clickClosure = {[weak self] value in |
... | ... | @@ -142,7 +142,7 @@ class WomenHealthVC: UIViewController { |
142 | 142 | |
143 | 143 | |
144 | 144 | @IBAction func setLastMenstrual(_ sender: Any) { |
145 | - let pickerView = DatePickerView(title: LocString("最近一次月经"), titleColor: UIColor.rgbColorFromHex(0xEF3257)) | |
145 | + let pickerView = DatePickerView(title: LocString("最近一次月经")) | |
146 | 146 | pickerView.datePicker.datePickerMode = .date |
147 | 147 | pickerView.datePicker.date = Date() |
148 | 148 | pickerView.datePicker.maximumDate = Date() | ... | ... |
HDFwear/LaunchSetting/LaunchMyInfoSettingVC.swift
... | ... | @@ -75,7 +75,7 @@ class LaunchMyInfoSettingVC: UIViewController { |
75 | 75 | } |
76 | 76 | |
77 | 77 | @IBAction func selectBirthday(_ sender: Any) { |
78 | - let pickerView = DatePickerView(title: LocString("选择您的生日"), titleColor: UIColor.rgbColorFromHex(0xEF3257)) | |
78 | + let pickerView = DatePickerView(title: LocString("选择您的生日")) | |
79 | 79 | pickerView.datePicker.datePickerMode = .date |
80 | 80 | pickerView.datePicker.date = Date() |
81 | 81 | pickerView.datePicker.maximumDate = Date() | ... | ... |