Bläddra i källkod

字体等比例

Chris 5 år sedan
förälder
incheckning
d0a720ad73

+ 1 - 0
RainbowPlanet/RainbowPlanet/Macro/FontMacro.swift

@@ -87,6 +87,7 @@ let kScaleMediumFont27 = UIFont(name: "PingFang-SC-Medium", size: kScaleValue(va
 let kScaleMediumFont30 = UIFont(name: "PingFang-SC-Medium", size: kScaleValue(value: 30))
 let kScaleMediumFont35 = UIFont(name: "PingFang-SC-Medium", size: kScaleValue(value: 35))
 
+let kScaleRegularFont9  = UIFont(name: "PingFang-SC-Regular", size: kScaleValue(value: 9))
 let kScaleRegularFont11 = UIFont(name: "PingFang-SC-Regular", size: kScaleValue(value: 11))
 let kScaleRegularFont12 = UIFont(name: "PingFang-SC-Regular", size: kScaleValue(value: 12))
 let kScaleRegularFont13 = UIFont(name: "PingFang-SC-Regular", size: kScaleValue(value: 13))

+ 3 - 3
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageComment/MessageCommentTableCell.swift

@@ -93,7 +93,7 @@ class MessageCommentTableCell: UITableViewCell {
         let titleLabel = UILabel()
         titleLabel.text = "xxx恢复了xxx"
         titleLabel.textColor = k333333Color
-        titleLabel.font = kBoldFont14
+        titleLabel.font = kScaleBoldFont14
         titleLabel.textAlignment = .left
         return titleLabel
     }()
@@ -102,7 +102,7 @@ class MessageCommentTableCell: UITableViewCell {
         let subLabel = UILabel()
         subLabel.text = "”大师果然厉害,不愧是牛逼之人“"
         subLabel.textColor = k999999Color
-        subLabel.font = kRegularFont13
+        subLabel.font = kScaleRegularFont13
         subLabel.textAlignment = .left
         subLabel.numberOfLines = 0
         return subLabel
@@ -112,7 +112,7 @@ class MessageCommentTableCell: UITableViewCell {
         let timeLabel = UILabel()
         timeLabel.text = "10分钟前"
         timeLabel.textColor = kbbbbbbColor
-        timeLabel.font = kRegularFont12
+        timeLabel.font = kScaleRegularFont12
         timeLabel.textAlignment = .left
         return timeLabel
     }()

+ 3 - 3
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageFollowNoti/MessageFollowNotiTableCell.swift

@@ -93,7 +93,7 @@ class MessageFollowNotiTableCell: UITableViewCell {
         let titleLabel = UILabel()
         titleLabel.text = "xxx关注了你"
         titleLabel.textColor = k333333Color
-        titleLabel.font = kBoldFont14
+        titleLabel.font = kScaleBoldFont14
         titleLabel.textAlignment = .left
         return titleLabel
     }()
@@ -102,7 +102,7 @@ class MessageFollowNotiTableCell: UITableViewCell {
         let subLabel = UILabel()
         subLabel.text = "你们的爱好相似度高于90%,快去回个粉吧!"
         subLabel.textColor = k999999Color
-        subLabel.font = kRegularFont13
+        subLabel.font = kScaleRegularFont13
         subLabel.textAlignment = .left
         subLabel.numberOfLines = 0
         return subLabel
@@ -112,7 +112,7 @@ class MessageFollowNotiTableCell: UITableViewCell {
         let timeLabel = UILabel()
         timeLabel.text = "5月20日"
         timeLabel.textColor = kbbbbbbColor
-        timeLabel.font = kRegularFont12
+        timeLabel.font = kScaleRegularFont12
         timeLabel.textAlignment = .left
         return timeLabel
     }()

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/View/MessageMainItemView.swift

@@ -70,7 +70,7 @@ class MessageMainItemView: BaseView {
     private lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
         titleLabel.textColor = k333333Color
-        titleLabel.font = kBoldFont14
+        titleLabel.font = kScaleBoldFont14
         return titleLabel
     }()
     

+ 2 - 2
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/View/MessagePlanetTableCell.swift

@@ -97,7 +97,7 @@ class MessagePlanetTableCell: UITableViewCell {
     private lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
         titleLabel.textColor = k333333Color
-        titleLabel.font = kRegularFont16
+        titleLabel.font = kScaleRegularFont16
         titleLabel.textAlignment = .left
         return titleLabel
     }()
@@ -106,7 +106,7 @@ class MessagePlanetTableCell: UITableViewCell {
         let subLabel = UILabel()
         subLabel.text = "我就是一个消息用来测一测"
         subLabel.textColor = k999999Color
-        subLabel.font = kRegularFont12
+        subLabel.font = kScaleRegularFont12
         subLabel.textAlignment = .left
         return subLabel
     }()

+ 3 - 3
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetActivity/View/MessageActivityTableCell.swift

@@ -92,7 +92,7 @@ class MessageActivityTableCell: UITableViewCell {
         timeLabel.backgroundColor = kRGBAColor(r: 0/255.0, g: 0/255.0, b: 0/255.0, a: 0.1)
         timeLabel.text = "05-16 20:03"
         timeLabel.textColor = kffffffColor
-        timeLabel.font = kRegularFont12
+        timeLabel.font = kScaleRegularFont12
         timeLabel.textAlignment = .center
         return timeLabel
     }()
@@ -112,7 +112,7 @@ class MessageActivityTableCell: UITableViewCell {
         let titleLabel = UILabel()
         titleLabel.text = "我就是一个用来测一测的Title"
         titleLabel.textColor = kffffffColor
-        titleLabel.font = kRegularFont15
+        titleLabel.font = kScaleRegularFont15
         titleLabel.textAlignment = .left
         return titleLabel
     }()
@@ -121,7 +121,7 @@ class MessageActivityTableCell: UITableViewCell {
         let subLabel = UILabel()
         subLabel.text = "活动时间:2019/5/19~2019/5/20"
         subLabel.textColor = kffffffColor
-        subLabel.font = kRegularFont12
+        subLabel.font = kScaleRegularFont12
         subLabel.textAlignment = .left
         return subLabel
     }()

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 4 - 4
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetNotification/View/MessagePlanetNotiTableCell.swift


+ 3 - 3
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetThumb/MessageThumbTableCell.swift

@@ -93,7 +93,7 @@ class MessageThumbTableCell: UITableViewCell {
         let titleLabel = UILabel()
         titleLabel.text = "xxx赞了你的内容"
         titleLabel.textColor = k333333Color
-        titleLabel.font = kBoldFont14
+        titleLabel.font = kScaleBoldFont14
         titleLabel.textAlignment = .left
         return titleLabel
     }()
@@ -102,7 +102,7 @@ class MessageThumbTableCell: UITableViewCell {
         let subLabel = UILabel()
         subLabel.text = "那是春的感觉,并非只在复苏的田野"
         subLabel.textColor = k999999Color
-        subLabel.font = kRegularFont13
+        subLabel.font = kScaleRegularFont13
         subLabel.textAlignment = .left
         subLabel.numberOfLines = 0
         return subLabel
@@ -112,7 +112,7 @@ class MessageThumbTableCell: UITableViewCell {
         let timeLabel = UILabel()
         timeLabel.text = "5月20日"
         timeLabel.textColor = kbbbbbbColor
-        timeLabel.font = kRegularFont12
+        timeLabel.font = kScaleRegularFont12
         timeLabel.textAlignment = .left
         return timeLabel
     }()