Skip to content

Commit 2c462ca

Browse files
committed
2.1.6:更新demo
1 parent 21d324c commit 2c462ca

8 files changed

Lines changed: 48 additions & 9 deletions

File tree

FWSegmentedControl/FWSegmentedControl.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
#
1717

1818
s.name = "FWSegmentedControl"
19-
s.version = "2.1.5"
19+
s.version = "2.1.6"
2020
s.summary = "滑动分段控制,多样式、灵活、便利是其最大的优势。"
2121

2222
# This description is used to generate tags and improve search results.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "hm_hot_city@2x.png",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"filename" : "hm_hot_city@3x.png",
15+
"scale" : "3x"
16+
}
17+
],
18+
"info" : {
19+
"version" : 1,
20+
"author" : "xcode"
21+
}
22+
}
3.29 KB
Loading
3.56 KB
Loading
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "hm_hot_city_selected@2x.png",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"filename" : "hm_hot_city_selected@3x.png",
15+
"scale" : "3x"
16+
}
17+
],
18+
"info" : {
19+
"version" : 1,
20+
"author" : "xcode"
21+
}
22+
}
2.88 KB
Loading
2.99 KB
Loading

FWSegmentedControl/FWSegmentedControl/ViewController.swift

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,13 @@ class ViewController: UIViewController, UIScrollViewDelegate {
130130

131131
private lazy var segmentedControl5: FWSegmentedControl = {
132132

133-
let imageTitles5 = ["叶子", "", "叶紫"]
133+
let imageTitles5 = ["福建", "直播", "小视频", "附近"]
134134

135135
let sectionSelectedImageDict = [
136-
0 : FWSectionImageItem(itemImage: UIImage(named: "a")!, itemSelectedImage: UIImage(named: "a-selected")),
137-
1 : FWSectionImageItem(itemImage: UIImage(named: "b")!, itemSelectedImage: UIImage(named: "b-selected")),
136+
0 : FWSectionImageItem(itemImage: UIImage(named: "hm_hot_city")!, itemSelectedImage: UIImage(named: "hm_hot_city_selected")),
138137
]
139138

140-
let segmentedControl = FWSegmentedControl.segmentedWith(scType: SCType.textImages, scWidthStyle: SCWidthStyle.dynamicFixedSuper, sectionTitleArray: imageTitles5, sectionSelectedImageDict: sectionSelectedImageDict, frame: CGRect(x: 0, y: Int(self.segmentedControl4.frame.maxY) + 10, width: Int(UIScreen.main.bounds.width), height: 40))
139+
let segmentedControl = FWSegmentedControl.segmentedWith(scType: SCType.textImages, scWidthStyle: SCWidthStyle.dynamic, sectionTitleArray: imageTitles5, sectionSelectedImageDict: sectionSelectedImageDict, frame: CGRect(x: 0, y: Int(self.segmentedControl4.frame.maxY) + 10, width: Int(UIScreen.main.bounds.width), height: 40))
141140

142141
segmentedControl.scSelectionIndicatorStyle = .contentWidthStripe
143142
segmentedControl.scSelectionIndicatorLocation = .down
@@ -148,10 +147,6 @@ class ViewController: UIViewController, UIScrollViewDelegate {
148147
segmentedControl.selectionIndicatorHeight = 3
149148
segmentedControl.selectionIndicatorEdgeInsets = UIEdgeInsetsMake(0, 5, 0, 5);
150149

151-
segmentedControl.verticalDividerEnabled = true
152-
segmentedControl.verticalDividerColor = UIColor.lightGray
153-
segmentedControl.verticalDividerWidth = 1.0
154-
155150
segmentedControl.textImageSpacing = 4
156151

157152
segmentedControl.titleTextAttributes = [NSAttributedStringKey.foregroundColor: UIColor.gray, NSAttributedStringKey.font : UIFont.systemFont(ofSize: CGFloat(kSegmentTitleFont))]

0 commit comments

Comments
 (0)