Skip to content

Commit 8608e6b

Browse files
committed
update: Example
1 parent 5197134 commit 8608e6b

3 files changed

Lines changed: 30 additions & 0 deletions

File tree

Example/Swift/SwiftyFitsize/LandscapeViewController.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ class LandscapeViewController: UIViewController {
7878
make.height.equalTo(20)
7979
make.left.equalTo(0).offset(leftMargin)
8080
make.width.equalTo(refWidth∥= * 0.5)
81+
// make.width.equalTo(SwiftyFitsize.fit(size: refWidth, fitType: .flexibleSafeAreaCenterHeight, referenceHeight: 667) * 0.5)
8182
}
8283
view2.snp.makeConstraints { make in
8384
make.width.height.equalTo(view1)
@@ -91,6 +92,7 @@ class LandscapeViewController: UIViewController {
9192
make.top.equalTo(view1.snp.bottom).offset(8)
9293
make.height.equalTo(view1)
9394
make.width.equalTo(refWidth * 0.5)
95+
// make.width.equalTo(SwiftyFitsize.fit(size: refWidth, fitType: .flexibleHeight, referenceHeight: 667) * 0.5)
9496
}
9597
view4.snp.makeConstraints { make in
9698
make.top.equalTo(view3).offset(2)
@@ -103,6 +105,7 @@ class LandscapeViewController: UIViewController {
103105
make.left.equalToSuperview().offset(leftBangMargin)
104106
make.height.equalTo(view1)
105107
make.width.equalTo(refWidth∥- * 0.5)
108+
// make.width.equalTo(SwiftyFitsize.fit(size: refWidth, fitType: .flexibleSafeAreaWithoutTopHeight, referenceHeight: 667) * 0.5)
106109
make.bottom.equalTo(view6.snp.bottom).offset(-2)
107110
}
108111
view6.snp.makeConstraints { make in

Example/Swift/SwiftyFitsize/PortraitViewController.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ class PortraitViewController: UIViewController {
6868
view1.snp.makeConstraints { make in
6969
make.top.equalToSuperview().offset(topMargin)
7070
make.height.equalTo(refHeight∥= * 0.5)
71+
// make.height.equalTo(SwiftyFitsize.fit(size: refHeight, fitType: .flexibleSafeAreaCenterHeight, referenceHeight: 667) * 0.5)
72+
// make.height.equalTo(SwiftyFitsize.fit(size: refHeight, fitType: .forceSafeAreaCenterHeight, referenceHeight: 667) * 0.5)
7173
make.width.equalTo(50)
7274
make.left.equalTo(5)
7375
}
@@ -83,6 +85,9 @@ class PortraitViewController: UIViewController {
8385
make.top.equalToSuperview()
8486
make.width.equalTo(view1)
8587
make.height.equalTo(refHeight * 0.5)
88+
// make.height.equalTo(SwiftyFitsize.fit(size: refHeight, fitType: .flexibleHeight, referenceHeight: 667) * 0.5)
89+
// make.height.equalTo(SwiftyFitsize.fit(size: refHeight, fitType: .forceHeight, referenceHeight: 667) * 0.5)
90+
// make.height.equalTo(SwiftyFitsize.fit(size: refHeight, fitType: .flexibleHeight, referenceHeight: 667) * 0.5)
8691
}
8792
view4.snp.makeConstraints { make in
8893
make.top.equalTo(view3.snp.bottom)
@@ -96,6 +101,8 @@ class PortraitViewController: UIViewController {
96101
make.right.equalToSuperview().offset(-5)
97102
make.width.equalTo(view1)
98103
make.height.equalTo(refHeight∥- * 0.5)
104+
// make.height.equalTo(SwiftyFitsize.fit(size: refHeight, fitType: .flexibleSafeAreaWithoutTopHeight, referenceHeight: 667) * 0.5)
105+
// make.height.equalTo(SwiftyFitsize.fit(size: refHeight, fitType: .forceSafeAreaWithoutTopHeight, referenceHeight: 667) * 0.5)
99106
}
100107
view6.snp.makeConstraints { make in
101108
make.top.equalTo(view5.snp.bottom)

Example/Swift/SwiftyFitsize/ViewController.swift

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,18 @@ struct Fit {
2828
@WrappedSwiftyFitsize(reduceValue: Metric.tableViewLeftRightMargin * 2) // fitType 默认值是 .flexibleWidth
2929
static var width: CGFloat = 375
3030
// 375是初始化值,没有特殊意义,只为调用 Fit.width 时可以取到值,如果用不到 Fit.width 的值可以不进行初始化
31+
32+
// @WrappedSwiftyFitsize(fitType: .flexibleWidth, referenceWidth: 375, calcResultType: .raw)
33+
// static var testW: CGFloat = 375
34+
//
35+
// @WrappedSwiftyFitsize(fitType: .flexibleHeight, referenceHeight: 667, calcResultType: .raw)
36+
// static var testH: CGFloat = 667
37+
38+
@WrappedSwiftyFitsize(fitType: .flexibleWidth, referenceWidth: 414, calcResultType: .raw)
39+
static var testW: CGFloat = 375
40+
41+
@WrappedSwiftyFitsize(fitType: .flexibleSafeAreaWithoutTopHeight, referenceHeight: 896, isIPhoneXSeriesHeight: true, calcResultType: .raw)
42+
static var testH: CGFloat = 896
3143
}
3244

3345
class ViewController: UIViewController {
@@ -197,6 +209,14 @@ extension ViewController {
197209
)
198210
print("适配后的值 eVal -- \(eVal)")
199211
print("============")
212+
213+
print("safeAreaInsets -- \(SwiftyFitsize.Config.Device.getSafeAreaInsets())")
214+
215+
Fit.testW = 414
216+
print("testW -- \(Fit.testW)")
217+
218+
Fit.testH = 896
219+
print("testH -- \(Fit.testH)")
200220
}
201221
}
202222

0 commit comments

Comments
 (0)