Skip to content

1
1weather
Commit 9943cb79 by Dmitriy Stepanets
Options

Merge branch 'bugfix/settings-text-overlap' into release/5.2

parents 61382dc4 942b4f2d
Showing with 6 additions and 2 deletions
1Weather/UI/View controllers/Settings/Cells/SettingsCell.swift
...@@ -81,10 +81,13 @@ private extension SettingsCell { ...@@ -81,10 +81,13 @@ private extension SettingsCell {
func prepareLabels() { func prepareLabels() {
settingsNameLabel.font = AppFont.SFPro.bold(size: 16) settingsNameLabel.font = AppFont.SFPro.bold(size: 16)
settingsNameLabel.textAlignment = .left settingsNameLabel.textAlignment = .left
settingsNameLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
container.addSubview(settingsNameLabel) container.addSubview(settingsNameLabel)
selectedValueLabel.font = AppFont.SFPro.regular(size: 16) selectedValueLabel.font = AppFont.SFPro.regular(size: 16)
selectedValueLabel.textAlignment = .right selectedValueLabel.textAlignment = .right
selectedValueLabel.lineBreakMode = .byTruncatingMiddle
selectedValueLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
container.addSubview(selectedValueLabel) container.addSubview(selectedValueLabel)
arrowLabel.font = AppFont.SFPro.regular(size: 18) arrowLabel.font = AppFont.SFPro.regular(size: 18)
...@@ -106,6 +109,7 @@ private extension SettingsCell { ...@@ -106,6 +109,7 @@ private extension SettingsCell {
selectedValueLabel.snp.makeConstraints { (make) in selectedValueLabel.snp.makeConstraints { (make) in
make.right.equalTo(arrowLabel.snp.left).inset(-8) make.right.equalTo(arrowLabel.snp.left).inset(-8)
make.left.equalTo(settingsNameLabel.snp.right).offset(8)
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
} }
} }
......
1Weather/UI/View controllers/Settings/Cells/SettingsThemeCell.swift
...@@ -157,7 +157,7 @@ private extension SettingsThemeCell { ...@@ -157,7 +157,7 @@ private extension SettingsThemeCell {
lightThemeImageView.snp.makeConstraints { (make) in lightThemeImageView.snp.makeConstraints { (make) in
make.size.equalTo(CGSize(width: 85, height: 154)) make.size.equalTo(CGSize(width: 85, height: 154))
make.top.equalToSuperview().inset(24) make.top.equalToSuperview().inset(24)
make.left.equalToSuperview().inset(57) make.centerX.equalToSuperview().offset(-85)
} }
lightThemeLabel.snp.makeConstraints { (make) in lightThemeLabel.snp.makeConstraints { (make) in
...@@ -197,7 +197,7 @@ private extension SettingsThemeCell { ...@@ -197,7 +197,7 @@ private extension SettingsThemeCell {
darkThemeImageView.snp.makeConstraints { (make) in darkThemeImageView.snp.makeConstraints { (make) in
make.size.equalTo(CGSize(width: 85, height: 154)) make.size.equalTo(CGSize(width: 85, height: 154))
make.top.equalToSuperview().inset(24) make.top.equalToSuperview().inset(24)
make.right.equalToSuperview().inset(57) make.centerX.equalToSuperview().offset(85)
} }
darkThemeLabel.snp.makeConstraints { (make) in darkThemeLabel.snp.makeConstraints { (make) in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment