ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various Fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-10-28 22:01:41 +04:00
parent 83032ce48a
commit 93a0e16d98
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift
View File

@ -236,7 +236,6 @@ public class ItemListSwitchItemNode: ListViewItemNode, ItemListItemNode {
if !item.enabled { if !item.enabled {
if currentDisabledOverlayNode == nil { if currentDisabledOverlayNode == nil {
currentDisabledOverlayNode = ASDisplayNode() currentDisabledOverlayNode = ASDisplayNode()
currentDisabledOverlayNode?.backgroundColor = itemBackgroundColor.withAlphaComponent(0.6)
} }
} else { } else {
currentDisabledOverlayNode = nil currentDisabledOverlayNode = nil
@ -278,6 +277,7 @@ public class ItemListSwitchItemNode: ListViewItemNode, ItemListItemNode {
} else { } else {
transition.updateFrame(node: currentDisabledOverlayNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: layout.contentSize.width, height: layout.contentSize.height - separatorHeight))) transition.updateFrame(node: currentDisabledOverlayNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: layout.contentSize.width, height: layout.contentSize.height - separatorHeight)))
} }
currentDisabledOverlayNode.backgroundColor = itemBackgroundColor.withAlphaComponent(0.6)
} else if let disabledOverlayNode = strongSelf.disabledOverlayNode { } else if let disabledOverlayNode = strongSelf.disabledOverlayNode {
transition.updateAlpha(node: disabledOverlayNode, alpha: 0.0, completion: { [weak disabledOverlayNode] _ in transition.updateAlpha(node: disabledOverlayNode, alpha: 0.0, completion: { [weak disabledOverlayNode] _ in
disabledOverlayNode?.removeFromSupernode() disabledOverlayNode?.removeFromSupernode()

1
submodules/SettingsUI/Sources/Text Size/TextSizeSelectionItem.swift
View File

@ -133,6 +133,7 @@ class BubbleSettingsRadiusItemNode: ListViewItemNode, ItemListItemNode {
sliderView.maximumValue = 4.0 sliderView.maximumValue = 4.0
sliderView.startValue = 0.0 sliderView.startValue = 0.0
sliderView.positionsCount = 5 sliderView.positionsCount = 5
sliderView.useLinesForPositions = true
sliderView.disablesInteractiveTransitionGestureRecognizer = true sliderView.disablesInteractiveTransitionGestureRecognizer = true
if let item = self.item, let params = self.layoutParams { if let item = self.item, let params = self.layoutParams {
sliderView.isUserInteractionEnabled = item.enabled sliderView.isUserInteractionEnabled = item.enabled

1
submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift
View File

@ -131,6 +131,7 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode {
sliderView.maximumValue = 6.0 sliderView.maximumValue = 6.0
sliderView.startValue = 0.0 sliderView.startValue = 0.0
sliderView.positionsCount = 7 sliderView.positionsCount = 7
sliderView.useLinesForPositions = true
sliderView.disablesInteractiveTransitionGestureRecognizer = true sliderView.disablesInteractiveTransitionGestureRecognizer = true
if let item = self.item, let params = self.layoutParams { if let item = self.item, let params = self.layoutParams {
sliderView.isUserInteractionEnabled = item.enabled sliderView.isUserInteractionEnabled = item.enabled

8
submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift
View File

@ -2089,7 +2089,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
} }
} }
if self.isSettings { if self.isSettings {
titleString = NSAttributedString(string: title, font: Font.semibold(26.0), textColor: presentationData.theme.list.itemPrimaryTextColor) titleString = NSAttributedString(string: title, font: Font.medium(29.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
smallTitleString = NSAttributedString(string: title, font: Font.semibold(28.0), textColor: .white) smallTitleString = NSAttributedString(string: title, font: Font.semibold(28.0), textColor: .white)
} else { } else {
titleString = NSAttributedString(string: title, font: Font.semibold(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor) titleString = NSAttributedString(string: title, font: Font.semibold(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
@ -2200,7 +2200,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
let minTitleSize = CGSize(width: titleSize.width * 0.7, height: titleSize.height * 0.7) let minTitleSize = CGSize(width: titleSize.width * 0.7, height: titleSize.height * 0.7)
let minTitleFrame: CGRect let minTitleFrame: CGRect
if self.isSettings { if self.isSettings {
minTitleFrame = CGRect(origin: CGPoint(x: 16.0, y: expandedAvatarHeight - 58.0 + (subtitleSize.height.isZero ? 10.0 : 0.0)), size: minTitleSize) minTitleFrame = CGRect(origin: CGPoint(x: 16.0, y: expandedAvatarHeight - 58.0 - UIScreenPixel + (subtitleSize.height.isZero ? 10.0 : 0.0)), size: minTitleSize)
} else { } else {
minTitleFrame = CGRect(origin: CGPoint(x: 16.0, y: expandedAvatarHeight - expandedAvatarControlsHeight + 9.0 + (subtitleSize.height.isZero ? 10.0 : 0.0)), size: minTitleSize) minTitleFrame = CGRect(origin: CGPoint(x: 16.0, y: expandedAvatarHeight - expandedAvatarControlsHeight + 9.0 + (subtitleSize.height.isZero ? 10.0 : 0.0)), size: minTitleSize)
} }
@ -2214,7 +2214,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
} else { } else {
titleFrame = CGRect(origin: CGPoint(x: floor((width - titleSize.width) / 2.0), y: avatarFrame.maxY + 7.0 + (subtitleSize.height.isZero ? 11.0 : 0.0)), size: titleSize) titleFrame = CGRect(origin: CGPoint(x: floor((width - titleSize.width) / 2.0), y: avatarFrame.maxY + 7.0 + (subtitleSize.height.isZero ? 11.0 : 0.0)), size: titleSize)
if self.isSettings { if self.isSettings {
titleFrame = titleFrame.offsetBy(dx: 0.0, dy: 13.0) titleFrame = titleFrame.offsetBy(dx: 0.0, dy: 11.0)
} }
let totalSubtitleWidth = subtitleSize.width + usernameSpacing + usernameSize.width let totalSubtitleWidth = subtitleSize.width + usernameSpacing + usernameSize.width
twoLineInfo = false twoLineInfo = false
@ -2236,7 +2236,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
let titleOffset = -min(titleCollapseOffset, contentOffset) let titleOffset = -min(titleCollapseOffset, contentOffset)
let titleCollapseFraction = max(0.0, min(1.0, contentOffset / titleCollapseOffset)) let titleCollapseFraction = max(0.0, min(1.0, contentOffset / titleCollapseOffset))
let titleMinScale: CGFloat = 0.7 let titleMinScale: CGFloat = self.isSettings ? 0.6 : 0.7
let subtitleMinScale: CGFloat = 0.8 let subtitleMinScale: CGFloat = 0.8
let avatarMinScale: CGFloat = 0.7 let avatarMinScale: CGFloat = 0.7