github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various fixes

Browse source
This commit is contained in:
Ilya Laktyushin 2025-12-17 15:54:44 +04:00
parent c367c8eb8a
commit ef5b8537e0
2 changed files with 10 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

5
submodules/AttachmentUI/Sources/AttachmentPanel.swift
View file

@ -1489,6 +1489,8 @@ final class AttachmentPanel: ASDisplayNode, ASScrollViewDelegate {
}
private func item(at point: CGPoint) -> AnyHashable? {
let contentOffset = self.scrollNode.view.contentOffset.x
let point = point.offsetBy(dx: contentOffset, dy: 0.0)
var closestItem: (AnyHashable, CGFloat)?
for (id, itemView) in self.itemViews {
if itemView.frame.contains(point) {
@ -2037,7 +2039,8 @@ final class AttachmentPanel: ASDisplayNode, ASScrollViewDelegate {
var selectionFrame = CGRect()
if self.selectedIndex >= 0 && self.selectedIndex < self.buttons.count, let itemView = self.itemViews[self.buttons[self.selectedIndex].key], let itemSize = self.itemSizes[self.buttons[self.selectedIndex].key] {
selectionFrame = CGRect(origin: CGPoint(x: itemView.center.x - itemSize.width / 2.0, y: itemView.frame.minY), size: itemSize).insetBy(dx: -3.0, dy: 0.0)
let contentOffset = self.scrollNode.view.contentOffset.x
selectionFrame = CGRect(origin: CGPoint(x: itemView.center.x - itemSize.width / 2.0 - contentOffset, y: itemView.frame.minY), size: itemSize).insetBy(dx: -3.0, dy: 0.0)
}
let lensSelection: (x: CGFloat, width: CGFloat)

55
submodules/TelegramUI/Components/EntityKeyboard/Sources/EntityKeyboardBottomPanelComponent.swift
View file

@ -158,10 +158,7 @@ final class EntityKeyboardBottomPanelComponent: Component {
private var tabSelectionRecognizer: TabSelectionRecognizer?
private var selectionGestureState: (startX: CGFloat, currentX: CGFloat, itemId: AnyHashable)?
private var highlightedIconBackgroundView: UIView
private var highlightedTintIconBackgroundView: UIView
let tintContentMask: UIView
private var component: EntityKeyboardBottomPanelComponent?
@ -183,18 +180,7 @@ final class EntityKeyboardBottomPanelComponent: Component {
self.backgroundContainer = GlassBackgroundContainerView()
self.liquidLensView = LiquidLensView(useBackgroundContainer: false)
self.highlightedIconBackgroundView = UIView()
self.highlightedIconBackgroundView.isUserInteractionEnabled = false
self.highlightedIconBackgroundView.layer.cornerRadius = 10.0
self.highlightedIconBackgroundView.clipsToBounds = true
self.highlightedTintIconBackgroundView = UIView()
self.highlightedTintIconBackgroundView.isUserInteractionEnabled = false
self.highlightedTintIconBackgroundView.layer.cornerRadius = 10.0
self.highlightedTintIconBackgroundView.clipsToBounds = true
self.highlightedTintIconBackgroundView.backgroundColor = UIColor(white: 0.0, alpha: 0.1)
super.init(frame: frame)
self.addSubview(self.edgeEffectView)
@ -272,11 +258,8 @@ final class EntityKeyboardBottomPanelComponent: Component {
self.separatorView.backgroundColor = component.theme.list.itemPlainSeparatorColor.withMultipliedAlpha(0.5)
self.backgroundView.updateColor(color: component.theme.chat.inputPanel.panelBackgroundColor.withMultipliedAlpha(1.0), transition: .immediate)
// self.highlightedIconBackgroundView.backgroundColor = component.theme.chat.inputMediaPanel.panelHighlightedIconBackgroundColor
}
let intrinsicHeight: CGFloat = 34.0
let height = intrinsicHeight + component.containerInsets.bottom + 20.0
@ -442,11 +425,6 @@ final class EntityKeyboardBottomPanelComponent: Component {
let navigateToContentId = panelEnvironment.navigateToContentId
//TODO:correctSize
let tabsSize = CGSize(width: 176.0, height: 40.0)
var lensSelection: (x: CGFloat, width: CGFloat) = (0.0, 0.0)
if panelEnvironment.contentIcons.count > 1 {
@ -508,7 +486,8 @@ final class EntityKeyboardBottomPanelComponent: Component {
iconTotalSize.height = max(iconTotalSize.height, iconSize.height)
}
}
let tabsSize = CGSize(width: iconTotalSize.width, height: 40.0)
var nextIconOrigin = CGPoint(x: floor((tabsSize.width - iconTotalSize.width) / 2.0), y: floor((tabsSize.height - iconTotalSize.height) / 2.0))
transition.setFrame(view: self.backgroundContainer, frame: CGRect(origin: .zero, size: availableSize))
@ -524,23 +503,6 @@ final class EntityKeyboardBottomPanelComponent: Component {
iconInfo.transition.setFrame(view: iconView, frame: iconFrame, completion: nil)
iconInfo.transition.setFrame(view: selectedIconView, frame: iconFrame, completion: nil)
// if let iconView = iconView.componentView as? BottomPanelIconComponent.View {
// if iconView.tintMaskContainer.superview == nil {
// self.tintContentMask.addSubview(iconView.tintMaskContainer)
// }
// iconInfo.transition.setFrame(view: iconView.tintMaskContainer, frame: iconFrame, completion: nil)
// }
// if let activeContentId = activeContentId, activeContentId == icon.id {
// self.highlightedIconBackgroundView.isHidden = false
// self.highlightedTintIconBackgroundView.isHidden = false
// transition.setFrame(view: self.highlightedIconBackgroundView, frame: iconFrame)
// transition.setFrame(view: self.highlightedTintIconBackgroundView, frame: iconFrame)
//
// let cornerRadius: CGFloat = min(iconFrame.width, iconFrame.height) / 2.0
// transition.setCornerRadius(layer: self.highlightedIconBackgroundView.layer, cornerRadius: cornerRadius)
// transition.setCornerRadius(layer: self.highlightedTintIconBackgroundView.layer, cornerRadius: cornerRadius)
// }
if let activeContentId = activeContentId, activeContentId == icon.id {
lensSelection = (iconFrame.origin.x, iconFrame.width)
}
@ -553,11 +515,7 @@ final class EntityKeyboardBottomPanelComponent: Component {
}
transition.setFrame(view: self.liquidLensView, frame: CGRect(origin: CGPoint(x: floor((availableSize.width - tabsSize.width) / 2.0), y: 0.0), size: tabsSize))
self.liquidLensView.update(size: tabsSize, selectionOrigin: CGPoint(x: lensSelection.x, y: 0.0), selectionSize: CGSize(width: lensSelection.width, height: tabsSize.height), isDark: component.theme.overallDarkAppearance, isLifted: self.selectionGestureState != nil, isCollapsed: false, transition: transition)
if activeContentId == nil {
self.highlightedIconBackgroundView.isHidden = true
}
self.liquidLensView.update(size: tabsSize, selectionOrigin: CGPoint(x: lensSelection.x, y: 0.0), selectionSize: CGSize(width: lensSelection.width, height: tabsSize.height), isDark: component.theme.overallDarkAppearance, isLifted: self.selectionGestureState != nil, isCollapsed: activeContentId == nil, transition: transition)
var removedIconViewIds: [AnyHashable] = []
for (id, iconView) in self.itemViews {
@ -577,11 +535,10 @@ final class EntityKeyboardBottomPanelComponent: Component {
transition.setFrame(view: self.backgroundView, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: availableSize.width, height: height)))
//self.backgroundView.update(size: CGSize(width: availableSize.width, height: height), transition: transition.containedViewLayoutTransition)
let edgeEffectHeight: CGFloat = 80.0
let edgeEffectFrame = CGRect(origin: CGPoint(x: 0.0, y: height - edgeEffectHeight), size: CGSize(width: availableSize.width, height: edgeEffectHeight))
transition.setFrame(view: self.edgeEffectView, frame: edgeEffectFrame)
self.edgeEffectView.update(content: component.theme.chat.inputPanel.panelBackgroundColor.withMultipliedAlpha(1.0), rect: edgeEffectFrame, edge: .bottom, edgeSize: min(edgeEffectHeight, 50.0), transition: transition)
self.edgeEffectView.update(content: component.theme.chat.inputMediaPanel.backgroundColor.withMultipliedAlpha(0.8), rect: edgeEffectFrame, edge: .bottom, edgeSize: min(edgeEffectHeight, 50.0), transition: transition)
return CGSize(width: availableSize.width, height: height)
}