mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Merge commit '9a2253d7fd36f396b9d16b23a7727e06e59e49f0'
This commit is contained in:
Ali
commit
2c7c8155ab
@ -5914,6 +5914,12 @@ Sorry for the inconvenience.";
|
||||
"ReportPeer.ReasonFake" = "Fake Account";
|
||||
|
||||
"ChatList.HeaderImportIntoAnExistingGroup" = "OR IMPORT INTO AN EXISTING GROUP";
|
||||
|
||||
"Group.ErrorAdminsTooMuch" = "Sorry, too many administrators in this group.";
|
||||
"Channel.ErrorAdminsTooMuch" = "Sorry, too many administrators in this channel.";
|
||||
|
||||
"Conversation.AddMembers" = "Add Members";
|
||||
|
||||
"Conversation.ImportedMessageHint" = "The messages was imported from another app. We can't guarantee it's real.";
|
||||
|
||||
"CallList.DeleteAllForMe" = "Delete for me";
|
||||
|
||||
@ -10,6 +10,7 @@ swift_library(
|
||||
"//submodules/AsyncDisplayKit:AsyncDisplayKit",
|
||||
"//submodules/Display:Display",
|
||||
"//submodules/TelegramPresentationData:TelegramPresentationData",
|
||||
"//submodules/TelegramStringFormatting:TelegramStringFormatting",
|
||||
],
|
||||
visibility = [
|
||||
"//visibility:public",
|
||||
|
||||
@ -1,425 +1,388 @@
|
||||
//import Foundation
|
||||
//import Display
|
||||
//import UIKit
|
||||
//import AsyncDisplayKit
|
||||
//import TelegramPresentationData
|
||||
//
|
||||
//private let textFont = Font.regular(13.0)
|
||||
//private let selectedTextFont = Font.bold(13.0)
|
||||
//
|
||||
//public final class DatePickerTheme: Equatable {
|
||||
// public let backgroundColor: UIColor
|
||||
// public let textColor: UIColor
|
||||
// public let secondaryTextColor: UIColor
|
||||
// public let accentColor: UIColor
|
||||
// public let selectionColor: UIColor
|
||||
// public let selectedCurrentTextColor: UIColor
|
||||
// public let secondarySelectionColor: UIColor
|
||||
//
|
||||
// public init(backgroundColor: UIColor, textColor: UIColor, secondaryTextColor: UIColor, accentColor: UIColor, selectionColor: UIColor, selectedCurrentTextColor: UIColor, secondarySelectionColor: UIColor) {
|
||||
// self.backgroundColor = backgroundColor
|
||||
// self.textColor = textColor
|
||||
// self.secondaryTextColor = secondaryTextColor
|
||||
// self.accentColor = accentColor
|
||||
// self.selectionColor = selectionColor
|
||||
// self.selectedCurrentTextColor = selectedCurrentTextColor
|
||||
// self.secondarySelectionColor = secondarySelectionColor
|
||||
// }
|
||||
//
|
||||
// public static func ==(lhs: DatePickerTheme, rhs: DatePickerTheme) -> Bool {
|
||||
// if lhs.backgroundColor != rhs.backgroundColor {
|
||||
// return false
|
||||
// }
|
||||
// if lhs.textColor != rhs.textColor {
|
||||
// return false
|
||||
// }
|
||||
// if lhs.secondaryTextColor != rhs.secondaryTextColor {
|
||||
// return false
|
||||
// }
|
||||
// if lhs.accentColor != rhs.accentColor {
|
||||
// return false
|
||||
// }
|
||||
// if lhs.selectionColor != rhs.selectionColor {
|
||||
// return false
|
||||
// }
|
||||
// if lhs.selectedCurrentTextColor != rhs.selectedCurrentTextColor {
|
||||
// return false
|
||||
// }
|
||||
// if lhs.secondarySelectionColor != rhs.secondarySelectionColor {
|
||||
// return false
|
||||
// }
|
||||
// return true
|
||||
// }
|
||||
//}
|
||||
//
|
||||
import Foundation
|
||||
import Display
|
||||
import UIKit
|
||||
import AsyncDisplayKit
|
||||
import TelegramPresentationData
|
||||
import TelegramStringFormatting
|
||||
|
||||
private let textFont = Font.regular(13.0)
|
||||
private let selectedTextFont = Font.bold(13.0)
|
||||
|
||||
public final class DatePickerTheme: Equatable {
|
||||
public let backgroundColor: UIColor
|
||||
public let textColor: UIColor
|
||||
public let secondaryTextColor: UIColor
|
||||
public let accentColor: UIColor
|
||||
public let disabledColor: UIColor
|
||||
public let selectionColor: UIColor
|
||||
public let selectedCurrentTextColor: UIColor
|
||||
public let secondarySelectionColor: UIColor
|
||||
|
||||
public init(backgroundColor: UIColor, textColor: UIColor, secondaryTextColor: UIColor, accentColor: UIColor, disabledColor: UIColor, selectionColor: UIColor, selectedCurrentTextColor: UIColor, secondarySelectionColor: UIColor) {
|
||||
self.backgroundColor = backgroundColor
|
||||
self.textColor = textColor
|
||||
self.secondaryTextColor = secondaryTextColor
|
||||
self.accentColor = accentColor
|
||||
self.disabledColor = disabledColor
|
||||
self.selectionColor = selectionColor
|
||||
self.selectedCurrentTextColor = selectedCurrentTextColor
|
||||
self.secondarySelectionColor = secondarySelectionColor
|
||||
}
|
||||
|
||||
public static func ==(lhs: DatePickerTheme, rhs: DatePickerTheme) -> Bool {
|
||||
if lhs.backgroundColor != rhs.backgroundColor {
|
||||
return false
|
||||
}
|
||||
if lhs.textColor != rhs.textColor {
|
||||
return false
|
||||
}
|
||||
if lhs.secondaryTextColor != rhs.secondaryTextColor {
|
||||
return false
|
||||
}
|
||||
if lhs.accentColor != rhs.accentColor {
|
||||
return false
|
||||
}
|
||||
if lhs.selectionColor != rhs.selectionColor {
|
||||
return false
|
||||
}
|
||||
if lhs.selectedCurrentTextColor != rhs.selectedCurrentTextColor {
|
||||
return false
|
||||
}
|
||||
if lhs.secondarySelectionColor != rhs.secondarySelectionColor {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
//public extension DatePickerTheme {
|
||||
// convenience init(theme: PresentationTheme) {
|
||||
// self.init(backgroundColor: theme.rootController.navigationBar.segmentedBackgroundColor, foregroundColor: theme.rootController.navigationBar.segmentedForegroundColor, shadowColor: .black, textColor: theme.rootController.navigationBar.segmentedTextColor, dividerColor: theme.rootController.navigationBar.segmentedDividerColor)
|
||||
// }
|
||||
//}
|
||||
//
|
||||
//private class SegmentedControlItemNode: HighlightTrackingButtonNode {
|
||||
//}
|
||||
//
|
||||
//private let telegramReleaseDate = Date(timeIntervalSince1970: 1376438400.0)
|
||||
//
|
||||
//public final class DatePickerNode: ASDisplayNode, UIGestureRecognizerDelegate {
|
||||
// private var theme: DatePickerTheme
|
||||
// private var _items: [SegmentedControlItem]
|
||||
// private var _selectedIndex: Int = 0
|
||||
//
|
||||
// private var validLayout: SegmentedControlLayout?
|
||||
//
|
||||
// private let selectionNode: ASImageNode
|
||||
// private var itemNodes: [SegmentedControlItemNode]
|
||||
// private var dividerNodes: [ASDisplayNode]
|
||||
//
|
||||
// private var gestureRecognizer: UIPanGestureRecognizer?
|
||||
// private var gestureSelectedIndex: Int?
|
||||
//
|
||||
// public var maximumDate: Date? {
|
||||
// didSet {
|
||||
//
|
||||
// }
|
||||
// }
|
||||
// public var minimumDate: Date = telegramReleaseDate {
|
||||
// didSet {
|
||||
//
|
||||
// }
|
||||
// }
|
||||
// public var date: Date = Date() {
|
||||
// didSet {
|
||||
//
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
// public var items: [SegmentedControlItem] {
|
||||
// get {
|
||||
// return self._items
|
||||
// }
|
||||
// set {
|
||||
// let previousItems = self._items
|
||||
// self._items = newValue
|
||||
// guard previousItems != newValue else {
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// self.itemNodes.forEach { $0.removeFromSupernode() }
|
||||
// self.itemNodes = self._items.map { item in
|
||||
// let itemNode = SegmentedControlItemNode()
|
||||
// itemNode.contentEdgeInsets = UIEdgeInsets(top: 0.0, left: 8.0, bottom: 0.0, right: 8.0)
|
||||
// itemNode.titleNode.maximumNumberOfLines = 1
|
||||
// itemNode.titleNode.truncationMode = .byTruncatingTail
|
||||
// itemNode.setTitle(item.title, with: textFont, with: self.theme.textColor, for: .normal)
|
||||
// itemNode.setTitle(item.title, with: selectedTextFont, with: self.theme.textColor, for: .selected)
|
||||
// itemNode.setTitle(item.title, with: selectedTextFont, with: self.theme.textColor, for: [.selected, .highlighted])
|
||||
// return itemNode
|
||||
// }
|
||||
// self.setupButtons()
|
||||
// self.itemNodes.forEach(self.addSubnode(_:))
|
||||
//
|
||||
// let dividersCount = self._items.count > 2 ? self._items.count - 1 : 0
|
||||
// if self.dividerNodes.count != dividersCount {
|
||||
// self.dividerNodes.forEach { $0.removeFromSupernode() }
|
||||
// self.dividerNodes = (0 ..< dividersCount).map { _ in ASDisplayNode() }
|
||||
// }
|
||||
//
|
||||
// if let layout = self.validLayout {
|
||||
// let _ = self.updateLayout(layout, transition: .immediate)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// public var selectedIndex: Int {
|
||||
// get {
|
||||
// return self._selectedIndex
|
||||
// }
|
||||
// set {
|
||||
// guard newValue != self._selectedIndex else {
|
||||
// return
|
||||
// }
|
||||
// self._selectedIndex = newValue
|
||||
// if let layout = self.validLayout {
|
||||
// let _ = self.updateLayout(layout, transition: .immediate)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// public func setSelectedIndex(_ index: Int, animated: Bool) {
|
||||
// guard index != self._selectedIndex else {
|
||||
// return
|
||||
// }
|
||||
// self._selectedIndex = index
|
||||
// if let layout = self.validLayout {
|
||||
// let _ = self.updateLayout(layout, transition: .animated(duration: 0.2, curve: .easeInOut))
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// public var selectedIndexChanged: (Int) -> Void = { _ in }
|
||||
// public var selectedIndexShouldChange: (Int, @escaping (Bool) -> Void) -> Void = { _, f in
|
||||
// f(true)
|
||||
// }
|
||||
//
|
||||
// public init(theme: SegmentedControlTheme, items: [SegmentedControlItem], selectedIndex: Int) {
|
||||
// self.theme = theme
|
||||
// self._items = items
|
||||
// self._selectedIndex = selectedIndex
|
||||
//
|
||||
// self.selectionNode = ASImageNode()
|
||||
// self.selectionNode.displaysAsynchronously = false
|
||||
// self.selectionNode.displayWithoutProcessing = true
|
||||
//
|
||||
// self.itemNodes = items.map { item in
|
||||
// let itemNode = SegmentedControlItemNode()
|
||||
// itemNode.contentEdgeInsets = UIEdgeInsets(top: 0.0, left: 8.0, bottom: 0.0, right: 8.0)
|
||||
// itemNode.titleNode.maximumNumberOfLines = 1
|
||||
// itemNode.titleNode.truncationMode = .byTruncatingTail
|
||||
// itemNode.setTitle(item.title, with: textFont, with: theme.textColor, for: .normal)
|
||||
// itemNode.setTitle(item.title, with: selectedTextFont, with: theme.textColor, for: .selected)
|
||||
// itemNode.setTitle(item.title, with: selectedTextFont, with: theme.textColor, for: [.selected, .highlighted])
|
||||
// return itemNode
|
||||
// }
|
||||
//
|
||||
// let dividersCount = items.count > 2 ? items.count - 1 : 0
|
||||
// self.dividerNodes = (0 ..< dividersCount).map { _ in
|
||||
// let node = ASDisplayNode()
|
||||
// node.backgroundColor = theme.dividerColor
|
||||
// return node
|
||||
// }
|
||||
//
|
||||
// super.init()
|
||||
//
|
||||
// self.clipsToBounds = true
|
||||
// self.cornerRadius = 9.0
|
||||
//
|
||||
// self.addSubnode(self.selectionNode)
|
||||
// self.itemNodes.forEach(self.addSubnode(_:))
|
||||
// self.setupButtons()
|
||||
// self.dividerNodes.forEach(self.addSubnode(_:))
|
||||
//
|
||||
// self.backgroundColor = self.theme.backgroundColor
|
||||
// self.selectionNode.image = generateSelectionImage(theme: self.theme)
|
||||
// }
|
||||
//
|
||||
// override public func didLoad() {
|
||||
// super.didLoad()
|
||||
//
|
||||
// self.view.disablesInteractiveTransitionGestureRecognizer = true
|
||||
//
|
||||
// let gestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:)))
|
||||
// gestureRecognizer.delegate = self
|
||||
// self.view.addGestureRecognizer(gestureRecognizer)
|
||||
// self.gestureRecognizer = gestureRecognizer
|
||||
// }
|
||||
//
|
||||
// private func setupButtons() {
|
||||
// for i in 0 ..< self.itemNodes.count {
|
||||
// let itemNode = self.itemNodes[i]
|
||||
// itemNode.addTarget(self, action: #selector(self.buttonPressed(_:)), forControlEvents: .touchUpInside)
|
||||
// itemNode.highligthedChanged = { [weak self, weak itemNode] highlighted in
|
||||
// if let strongSelf = self, let itemNode = itemNode {
|
||||
// let transition = ContainedViewLayoutTransition.animated(duration: 0.25, curve: .easeInOut)
|
||||
// if strongSelf.selectedIndex == i {
|
||||
// if let gestureRecognizer = strongSelf.gestureRecognizer, case .began = gestureRecognizer.state {
|
||||
// } else {
|
||||
// strongSelf.updateButtonsHighlights(highlightedIndex: highlighted ? i : nil, gestureSelectedIndex: strongSelf.gestureSelectedIndex)
|
||||
// }
|
||||
// } else if highlighted {
|
||||
// transition.updateAlpha(node: itemNode, alpha: 0.4)
|
||||
// }
|
||||
// if !highlighted {
|
||||
// transition.updateAlpha(node: itemNode, alpha: 1.0)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private func updateButtonsHighlights(highlightedIndex: Int?, gestureSelectedIndex: Int?) {
|
||||
// let transition = ContainedViewLayoutTransition.animated(duration: 0.25, curve: .easeInOut)
|
||||
// if highlightedIndex == nil && gestureSelectedIndex == nil {
|
||||
// transition.updateTransformScale(node: self.selectionNode, scale: 1.0)
|
||||
// } else {
|
||||
// transition.updateTransformScale(node: self.selectionNode, scale: 0.92)
|
||||
// }
|
||||
// for i in 0 ..< self.itemNodes.count {
|
||||
// let itemNode = self.itemNodes[i]
|
||||
// if i == highlightedIndex || i == gestureSelectedIndex {
|
||||
// transition.updateTransformScale(node: itemNode, scale: 0.92)
|
||||
// } else {
|
||||
// transition.updateTransformScale(node: itemNode, scale: 1.0)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// private func updateButtonsHighlights() {
|
||||
// let transition = ContainedViewLayoutTransition.animated(duration: 0.25, curve: .easeInOut)
|
||||
// if let gestureSelectedIndex = self.gestureSelectedIndex {
|
||||
// for i in 0 ..< self.itemNodes.count {
|
||||
// let itemNode = self.itemNodes[i]
|
||||
// transition.updateTransformScale(node: itemNode, scale: i == gestureSelectedIndex ? 0.92 : 1.0)
|
||||
// }
|
||||
// } else {
|
||||
// for itemNode in self.itemNodes {
|
||||
// transition.updateTransformScale(node: itemNode, scale: 1.0)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// public func updateTheme(_ theme: SegmentedControlTheme) {
|
||||
// guard theme != self.theme else {
|
||||
// return
|
||||
// }
|
||||
// self.theme = theme
|
||||
//
|
||||
// self.backgroundColor = self.theme.backgroundColor
|
||||
// self.selectionNode.image = generateSelectionImage(theme: self.theme)
|
||||
//
|
||||
// for itemNode in self.itemNodes {
|
||||
// if let title = itemNode.attributedTitle(for: .normal)?.string {
|
||||
// itemNode.setTitle(title, with: textFont, with: self.theme.textColor, for: .normal)
|
||||
// itemNode.setTitle(title, with: selectedTextFont, with: self.theme.textColor, for: .selected)
|
||||
// itemNode.setTitle(title, with: selectedTextFont, with: self.theme.textColor, for: [.selected, .highlighted])
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// for dividerNode in self.dividerNodes {
|
||||
// dividerNode.backgroundColor = theme.dividerColor
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// public func updateLayout(_ layout: SegmentedControlLayout, transition: ContainedViewLayoutTransition) -> CGSize {
|
||||
// self.validLayout = layout
|
||||
//
|
||||
// let calculatedWidth: CGFloat = 0.0
|
||||
//
|
||||
// let width: CGFloat
|
||||
// switch layout {
|
||||
// case let .stretchToFill(targetWidth):
|
||||
// width = targetWidth
|
||||
// case let .sizeToFit(maximumWidth, minimumWidth):
|
||||
// width = max(minimumWidth, min(maximumWidth, calculatedWidth))
|
||||
// }
|
||||
//
|
||||
// let selectedIndex: Int
|
||||
// if let gestureSelectedIndex = self.gestureSelectedIndex {
|
||||
// selectedIndex = gestureSelectedIndex
|
||||
// } else {
|
||||
// selectedIndex = self.selectedIndex
|
||||
// }
|
||||
//
|
||||
// let size = CGSize(width: width, height: 32.0)
|
||||
// if !self.itemNodes.isEmpty {
|
||||
// let itemSize = CGSize(width: floorToScreenPixels(size.width / CGFloat(self.itemNodes.count)), height: size.height)
|
||||
//
|
||||
// transition.updateBounds(node: self.selectionNode, bounds: CGRect(origin: CGPoint(), size: itemSize))
|
||||
// transition.updatePosition(node: self.selectionNode, position: CGPoint(x: itemSize.width / 2.0 + itemSize.width * CGFloat(selectedIndex), y: size.height / 2.0))
|
||||
//
|
||||
// for i in 0 ..< self.itemNodes.count {
|
||||
// let itemNode = self.itemNodes[i]
|
||||
// let _ = itemNode.measure(itemSize)
|
||||
// transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(x: itemSize.width * CGFloat(i), y: (size.height - itemSize.height) / 2.0), size: itemSize))
|
||||
//
|
||||
// let isSelected = selectedIndex == i
|
||||
// if itemNode.isSelected != isSelected {
|
||||
// if case .animated = transition {
|
||||
// UIView.transition(with: itemNode.view, duration: 0.2, options: .transitionCrossDissolve, animations: {
|
||||
// itemNode.isSelected = isSelected
|
||||
// }, completion: nil)
|
||||
// } else {
|
||||
// itemNode.isSelected = isSelected
|
||||
// }
|
||||
// if isSelected {
|
||||
// itemNode.accessibilityTraits.insert(.selected)
|
||||
// } else {
|
||||
// itemNode.accessibilityTraits.remove(.selected)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// if !self.dividerNodes.isEmpty {
|
||||
// let dividerSize = CGSize(width: 1.0, height: 16.0)
|
||||
// let delta: CGFloat = size.width / CGFloat(self.dividerNodes.count + 1)
|
||||
// for i in 0 ..< self.dividerNodes.count {
|
||||
// let dividerNode = self.dividerNodes[i]
|
||||
// transition.updateFrame(node: dividerNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels(delta * CGFloat(i + 1) - dividerSize.width / 2.0), y: (size.height - dividerSize.height) / 2.0), size: dividerSize))
|
||||
//
|
||||
// let dividerAlpha: CGFloat
|
||||
// if (selectedIndex - 1 ... selectedIndex).contains(i) {
|
||||
// dividerAlpha = 0.0
|
||||
// } else {
|
||||
// dividerAlpha = 1.0
|
||||
// }
|
||||
// transition.updateAlpha(node: dividerNode, alpha: dividerAlpha)
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// return size
|
||||
// }
|
||||
//
|
||||
// @objc private func buttonPressed(_ button: SegmentedControlItemNode) {
|
||||
// guard let index = self.itemNodes.firstIndex(of: button) else {
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// self.selectedIndexShouldChange(index, { [weak self] commit in
|
||||
// if let strongSelf = self, commit {
|
||||
// strongSelf._selectedIndex = index
|
||||
// strongSelf.selectedIndexChanged(index)
|
||||
// if let layout = strongSelf.validLayout {
|
||||
// let _ = strongSelf.updateLayout(layout, transition: .animated(duration: 0.2, curve: .slide))
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
//
|
||||
// public override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
|
||||
// return self.selectionNode.frame.contains(gestureRecognizer.location(in: self.view))
|
||||
// }
|
||||
//
|
||||
// @objc private func panGesture(_ recognizer: UIPanGestureRecognizer) {
|
||||
// let location = recognizer.location(in: self.view)
|
||||
// switch recognizer.state {
|
||||
// case .changed:
|
||||
// if !self.selectionNode.frame.contains(location) {
|
||||
// let point = CGPoint(x: max(0.0, min(self.bounds.width, location.x)), y: 1.0)
|
||||
// for i in 0 ..< self.itemNodes.count {
|
||||
// let itemNode = self.itemNodes[i]
|
||||
// if itemNode.frame.contains(point) {
|
||||
// if i != self.gestureSelectedIndex {
|
||||
// self.gestureSelectedIndex = i
|
||||
// self.updateButtonsHighlights(highlightedIndex: nil, gestureSelectedIndex: i)
|
||||
// if let layout = self.validLayout {
|
||||
// let _ = self.updateLayout(layout, transition: .animated(duration: 0.35, curve: .slide))
|
||||
// }
|
||||
// }
|
||||
// break
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// case .ended:
|
||||
// if let gestureSelectedIndex = self.gestureSelectedIndex {
|
||||
// if gestureSelectedIndex != self.selectedIndex {
|
||||
// self.selectedIndexShouldChange(gestureSelectedIndex, { [weak self] commit in
|
||||
// if let strongSelf = self {
|
||||
// if commit {
|
||||
// strongSelf._selectedIndex = gestureSelectedIndex
|
||||
// strongSelf.selectedIndexChanged(gestureSelectedIndex)
|
||||
// } else {
|
||||
// if let layout = strongSelf.validLayout {
|
||||
// let _ = strongSelf.updateLayout(layout, transition: .animated(duration: 0.2, curve: .slide))
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// self.gestureSelectedIndex = nil
|
||||
// }
|
||||
// self.updateButtonsHighlights(highlightedIndex: nil, gestureSelectedIndex: nil)
|
||||
// default:
|
||||
// break
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
private class SegmentedControlItemNode: HighlightTrackingButtonNode {
|
||||
}
|
||||
|
||||
private let telegramReleaseDate = Date(timeIntervalSince1970: 1376438400.0)
|
||||
private let upperLimitDate = Date(timeIntervalSince1970: Double(Int32.max - 1))
|
||||
|
||||
private let dayFont = Font.regular(13.0)
|
||||
private let dateFont = Font.with(size: 13.0, design: .regular, traits: .monospacedNumbers)
|
||||
private let selectedDateFont = Font.bold(13.0)
|
||||
|
||||
private let calendar = Calendar(identifier: .gregorian)
|
||||
|
||||
private func monthForDate(_ date: Date) -> Date {
|
||||
var components = calendar.dateComponents([.year, .month], from: date)
|
||||
components.hour = 0
|
||||
components.minute = 0
|
||||
components.second = 0
|
||||
return calendar.date(from: components)!
|
||||
}
|
||||
|
||||
public final class DatePickerNode: ASDisplayNode, UIScrollViewDelegate {
|
||||
class MonthNode: ASDisplayNode {
|
||||
private let month: Date
|
||||
|
||||
var theme: DatePickerTheme {
|
||||
didSet {
|
||||
if let size = self.validSize {
|
||||
self.updateLayout(size: size)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var maximumDate: Date? {
|
||||
didSet {
|
||||
if let size = self.validSize {
|
||||
self.updateLayout(size: size)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var minimumDate: Date? {
|
||||
didSet {
|
||||
if let size = self.validSize {
|
||||
self.updateLayout(size: size)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var date: Date? {
|
||||
didSet {
|
||||
if let size = self.validSize {
|
||||
self.updateLayout(size: size)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var validSize: CGSize?
|
||||
|
||||
private let selectionNode: ASImageNode
|
||||
private let dateNodes: [ImmediateTextNode]
|
||||
|
||||
private let firstWeekday: Int
|
||||
private let startWeekday: Int
|
||||
private let numberOfDays: Int
|
||||
|
||||
init(theme: DatePickerTheme, month: Date, minimumDate: Date?, maximumDate: Date?, date: Date?) {
|
||||
self.theme = theme
|
||||
self.month = month
|
||||
self.minimumDate = minimumDate
|
||||
self.maximumDate = maximumDate
|
||||
self.date = date
|
||||
|
||||
self.selectionNode = ASImageNode()
|
||||
self.selectionNode.displaysAsynchronously = false
|
||||
self.selectionNode.displayWithoutProcessing = true
|
||||
|
||||
self.dateNodes = (0..<42).map { _ in ImmediateTextNode() }
|
||||
|
||||
let components = calendar.dateComponents([.year, .month], from: month)
|
||||
let startDayDate = calendar.date(from: components)!
|
||||
|
||||
self.firstWeekday = calendar.firstWeekday
|
||||
self.startWeekday = calendar.dateComponents([.weekday], from: startDayDate).weekday!
|
||||
self.numberOfDays = calendar.range(of: .day, in: .month, for: month)!.count
|
||||
|
||||
super.init()
|
||||
|
||||
self.addSubnode(self.selectionNode)
|
||||
self.dateNodes.forEach { self.addSubnode($0) }
|
||||
}
|
||||
|
||||
func updateLayout(size: CGSize) {
|
||||
var weekday = self.firstWeekday
|
||||
var started = false
|
||||
var count = 0
|
||||
|
||||
for i in 0 ..< 42 {
|
||||
let row: Int = Int(floor(Float(i) / 7.0))
|
||||
let col: Int = i % 7
|
||||
|
||||
if !started && weekday == self.startWeekday {
|
||||
started = true
|
||||
}
|
||||
if started {
|
||||
count += 1
|
||||
|
||||
var isAvailableDate = true
|
||||
if let minimumDate = self.minimumDate {
|
||||
var components = calendar.dateComponents([.year, .month], from: self.month)
|
||||
components.day = count
|
||||
components.hour = 0
|
||||
components.minute = 0
|
||||
let date = calendar.date(from: components)!
|
||||
if date < minimumDate {
|
||||
isAvailableDate = false
|
||||
}
|
||||
}
|
||||
if let maximumDate = self.maximumDate {
|
||||
var components = calendar.dateComponents([.year, .month], from: self.month)
|
||||
components.day = count
|
||||
components.hour = 0
|
||||
components.minute = 0
|
||||
let date = calendar.date(from: components)!
|
||||
if date > maximumDate {
|
||||
isAvailableDate = false
|
||||
}
|
||||
}
|
||||
var isSelectedDate = false
|
||||
var isSelectedAndCurrentDate = false
|
||||
|
||||
let color: UIColor
|
||||
if !isAvailableDate {
|
||||
color = self.theme.disabledColor
|
||||
} else if isSelectedAndCurrentDate {
|
||||
color = .white
|
||||
} else if isSelectedDate {
|
||||
color = self.theme.accentColor
|
||||
} else {
|
||||
color = self.theme.textColor
|
||||
}
|
||||
|
||||
let textNode = self.dateNodes[i]
|
||||
textNode.attributedText = NSAttributedString(string: "\(count)", font: dateFont, textColor: color)
|
||||
|
||||
let textSize = textNode.updateLayout(size)
|
||||
textNode.frame = CGRect(origin: CGPoint(x: CGFloat(col) * 20.0, y: CGFloat(row) * 20.0), size: textSize)
|
||||
|
||||
if count == self.numberOfDays {
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct State {
|
||||
let minDate: Date
|
||||
let maxDate: Date
|
||||
let date: Date
|
||||
|
||||
let displayingMonthSelection: Bool
|
||||
let selectedMonth: Date
|
||||
}
|
||||
|
||||
private var state: State
|
||||
|
||||
private var theme: DatePickerTheme
|
||||
private let strings: PresentationStrings
|
||||
|
||||
private let timeTitleNode: ImmediateTextNode
|
||||
private let timeFieldNode: ASImageNode
|
||||
|
||||
private let monthButtonNode: HighlightTrackingButtonNode
|
||||
private let monthTextNode: ImmediateTextNode
|
||||
private let monthArrowNode: ASImageNode
|
||||
|
||||
private let previousButtonNode: HighlightableButtonNode
|
||||
private let nextButtonNode: HighlightableButtonNode
|
||||
|
||||
private let dayNodes: [ImmediateTextNode]
|
||||
private var previousMonthNode: MonthNode?
|
||||
private var currentMonthNode: MonthNode?
|
||||
private var nextMonthNode: MonthNode?
|
||||
private let scrollNode: ASScrollNode
|
||||
|
||||
private var gestureRecognizer: UIPanGestureRecognizer?
|
||||
private var gestureSelectedIndex: Int?
|
||||
|
||||
private var validLayout: CGSize?
|
||||
|
||||
public var maximumDate: Date? {
|
||||
didSet {
|
||||
|
||||
}
|
||||
}
|
||||
public var minimumDate: Date = telegramReleaseDate {
|
||||
didSet {
|
||||
|
||||
}
|
||||
}
|
||||
public var date: Date = Date() {
|
||||
didSet {
|
||||
guard self.date != oldValue else {
|
||||
return
|
||||
}
|
||||
if let size = self.validLayout {
|
||||
let _ = self.updateLayout(size: size, transition: .immediate)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public init(theme: DatePickerTheme, strings: PresentationStrings) {
|
||||
self.theme = theme
|
||||
self.strings = strings
|
||||
self.state = State(minDate: telegramReleaseDate, maxDate: upperLimitDate, date: Date(), displayingMonthSelection: false, selectedMonth: monthForDate(Date()))
|
||||
|
||||
self.timeTitleNode = ImmediateTextNode()
|
||||
self.timeFieldNode = ASImageNode()
|
||||
self.timeFieldNode.displaysAsynchronously = false
|
||||
self.timeFieldNode.displayWithoutProcessing = true
|
||||
|
||||
self.monthButtonNode = HighlightTrackingButtonNode()
|
||||
|
||||
self.monthTextNode = ImmediateTextNode()
|
||||
|
||||
self.monthArrowNode = ASImageNode()
|
||||
self.monthArrowNode.displaysAsynchronously = false
|
||||
self.monthArrowNode.displayWithoutProcessing = true
|
||||
|
||||
self.previousButtonNode = HighlightableButtonNode()
|
||||
self.nextButtonNode = HighlightableButtonNode()
|
||||
|
||||
self.dayNodes = (0..<7).map { _ in ImmediateTextNode() }
|
||||
|
||||
self.scrollNode = ASScrollNode()
|
||||
|
||||
super.init()
|
||||
|
||||
self.backgroundColor = theme.backgroundColor
|
||||
|
||||
self.addSubnode(self.monthTextNode)
|
||||
self.addSubnode(self.monthArrowNode)
|
||||
self.addSubnode(self.monthButtonNode)
|
||||
|
||||
self.addSubnode(self.previousButtonNode)
|
||||
self.addSubnode(self.nextButtonNode)
|
||||
|
||||
self.addSubnode(self.scrollNode)
|
||||
}
|
||||
|
||||
override public func didLoad() {
|
||||
super.didLoad()
|
||||
|
||||
self.view.disablesInteractiveTransitionGestureRecognizer = true
|
||||
|
||||
self.scrollNode.view.isPagingEnabled = true
|
||||
self.scrollNode.view.delegate = self
|
||||
}
|
||||
|
||||
private func updateState(_ state: State, animated: Bool) {
|
||||
self.state = state
|
||||
if let size = self.validLayout {
|
||||
self.updateLayout(size: size, transition: animated ? .animated(duration: 0.3, curve: .easeInOut) : .immediate)
|
||||
}
|
||||
}
|
||||
|
||||
public func updateTheme(_ theme: DatePickerTheme) {
|
||||
guard theme != self.theme else {
|
||||
return
|
||||
}
|
||||
self.theme = theme
|
||||
|
||||
self.backgroundColor = self.theme.backgroundColor
|
||||
}
|
||||
|
||||
public func scrollViewDidScroll(_ scrollView: UIScrollView) {
|
||||
self.view.window?.endEditing(true)
|
||||
}
|
||||
|
||||
public func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
|
||||
if !decelerate {
|
||||
if let size = self.validLayout {
|
||||
self.updateLayout(size: size, transition: .immediate)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
|
||||
if let size = self.validLayout {
|
||||
self.updateLayout(size: size, transition: .immediate)
|
||||
}
|
||||
}
|
||||
|
||||
public func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) {
|
||||
self.validLayout = size
|
||||
|
||||
let topInset: CGFloat = 60.0
|
||||
|
||||
let scrollSize = CGSize(width: size.width, height: size.height - topInset)
|
||||
self.scrollNode.frame = CGRect(origin: CGPoint(x: 0.0, y: topInset), size: scrollSize)
|
||||
self.scrollNode.view.contentSize = CGSize(width: scrollSize.width * 3.0, height: scrollSize.height)
|
||||
self.scrollNode.view.contentOffset = CGPoint(x: scrollSize.width, y: 0.0)
|
||||
|
||||
for i in 0 ..< self.dayNodes.count {
|
||||
let dayNode = self.dayNodes[i]
|
||||
|
||||
let day = Int32(i)
|
||||
dayNode.attributedText = NSAttributedString(string: shortStringForDayOfWeek(strings: self.strings, day: day), font: dayFont, textColor: theme.secondaryTextColor)
|
||||
let size = dayNode.updateLayout(size)
|
||||
dayNode.frame = CGRect(origin: CGPoint(x: CGFloat(i) * 20.0, y: 0.0), size: size)
|
||||
}
|
||||
}
|
||||
|
||||
@objc private func monthButtonPressed(_ button: SegmentedControlItemNode) {
|
||||
|
||||
}
|
||||
|
||||
@objc private func previousButtonPressed(_ button: SegmentedControlItemNode) {
|
||||
|
||||
}
|
||||
|
||||
@objc private func nextButtonPressed(_ button: SegmentedControlItemNode) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -208,6 +208,25 @@ private func preparedTransition(from fromEntries: [InviteLinkViewEntry], to toEn
|
||||
return InviteLinkViewTransaction(deletions: deletions, insertions: insertions, updates: updates, isLoading: isLoading)
|
||||
}
|
||||
|
||||
private let titleFont = Font.bold(17.0)
|
||||
private let subtitleFont = Font.with(size: 13, design: .regular, weight: .regular, traits: .monospacedNumbers)
|
||||
|
||||
private func textForTimeout(value: Int32) -> String {
|
||||
if value < 3600 {
|
||||
let minutes = value / 60
|
||||
let seconds = value % 60
|
||||
let secondsPadding = seconds < 10 ? "0" : ""
|
||||
return "\(minutes):\(secondsPadding)\(seconds)"
|
||||
} else {
|
||||
let hours = value / 3600
|
||||
let minutes = (value % 3600) / 60
|
||||
let minutesPadding = minutes < 10 ? "0" : ""
|
||||
let seconds = value % 60
|
||||
let secondsPadding = seconds < 10 ? "0" : ""
|
||||
return "\(hours):\(minutesPadding)\(minutes):\(secondsPadding)\(seconds)"
|
||||
}
|
||||
}
|
||||
|
||||
public final class InviteLinkViewController: ViewController {
|
||||
private var controllerNode: Node {
|
||||
return self.displayNode as! Node
|
||||
@ -328,6 +347,8 @@ public final class InviteLinkViewController: ViewController {
|
||||
|
||||
private var enqueuedTransitions: [InviteLinkViewTransaction] = []
|
||||
|
||||
private var countdownTimer: SwiftSignalKit.Timer?
|
||||
|
||||
private var validLayout: ContainerViewLayout?
|
||||
|
||||
init(context: AccountContext, peerId: PeerId, invite: ExportedInvitation, importersContext: PeerInvitationImportersContext?, controller: InviteLinkViewController) {
|
||||
@ -566,11 +587,13 @@ public final class InviteLinkViewController: ViewController {
|
||||
self.controller?.dismiss()
|
||||
|
||||
let invitationsContext = self.controller?.invitationsContext
|
||||
let revokedInvitationsContext = self.controller?.revokedInvitationsContext
|
||||
if let navigationController = navigationController {
|
||||
let controller = inviteLinkEditController(context: self.context, peerId: self.peerId, invite: self.invite, completion: { [weak self] invite in
|
||||
let controller = inviteLinkEditController(context: self.context, peerId: self.peerId, invite: self.invite, completion: { invite in
|
||||
if let invite = invite {
|
||||
if invite.isRevoked {
|
||||
invitationsContext?.remove(invite)
|
||||
revokedInvitationsContext?.add(invite.withUpdated(isRevoked: true))
|
||||
} else {
|
||||
invitationsContext?.update(invite)
|
||||
}
|
||||
@ -591,7 +614,8 @@ public final class InviteLinkViewController: ViewController {
|
||||
|
||||
self.historyBackgroundContentNode.backgroundColor = self.presentationData.theme.list.plainBackgroundColor
|
||||
self.headerBackgroundNode.backgroundColor = self.presentationData.theme.list.plainBackgroundColor
|
||||
self.titleNode.attributedText = NSAttributedString(string: self.presentationData.strings.InviteLink_InviteLink, font: Font.bold(17.0), textColor: self.presentationData.theme.actionSheet.primaryTextColor)
|
||||
self.titleNode.attributedText = NSAttributedString(string: self.presentationData.strings.InviteLink_InviteLink, font: titleFont, textColor: self.presentationData.theme.actionSheet.primaryTextColor)
|
||||
self.subtitleNode.attributedText = NSAttributedString(string: self.subtitleNode.attributedText?.string ?? "", font: subtitleFont, textColor: self.presentationData.theme.list.itemSecondaryTextColor)
|
||||
|
||||
let buttonColor = color(for: invite) ?? self.presentationData.theme.actionSheet.controlAccentColor
|
||||
self.editButton.setTitle(self.presentationData.strings.Common_Edit, with: Font.regular(17.0), with: buttonColor, for: .normal)
|
||||
@ -679,8 +703,43 @@ public final class InviteLinkViewController: ViewController {
|
||||
|
||||
transition.updateFrame(node: self.headerBackgroundNode, frame: CGRect(x: 0.0, y: 0.0, width: layout.size.width, height: 68.0))
|
||||
|
||||
var subtitleText = ""
|
||||
if self.invite.isRevoked {
|
||||
subtitleText = self.presentationData.strings.InviteLink_Revoked
|
||||
} else if let usageLimit = self.invite.usageLimit, let count = self.invite.count, count >= usageLimit {
|
||||
subtitleText = self.presentationData.strings.InviteLink_UsageLimitReached
|
||||
} else if let expireDate = self.invite.expireDate {
|
||||
let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
|
||||
if currentTime >= expireDate {
|
||||
subtitleText = self.presentationData.strings.InviteLink_Expired
|
||||
self.countdownTimer?.invalidate()
|
||||
self.countdownTimer = nil
|
||||
} else {
|
||||
let elapsedTime = expireDate - currentTime
|
||||
if elapsedTime >= 86400 {
|
||||
subtitleText = self.presentationData.strings.InviteLink_ExpiresIn(timeIntervalString(strings: self.presentationData.strings, value: elapsedTime)).0
|
||||
} else {
|
||||
subtitleText = self.presentationData.strings.InviteLink_ExpiresIn(textForTimeout(value: elapsedTime)).0
|
||||
if self.countdownTimer == nil {
|
||||
let countdownTimer = SwiftSignalKit.Timer(timeout: 1.0, repeat: true, completion: { [weak self] in
|
||||
if let strongSelf = self, let layout = strongSelf.validLayout {
|
||||
strongSelf.containerLayoutUpdated(layout, transition: .immediate)
|
||||
}
|
||||
}, queue: Queue.mainQueue())
|
||||
self.countdownTimer = countdownTimer
|
||||
countdownTimer.start()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
self.subtitleNode.attributedText = NSAttributedString(string: subtitleText, font: subtitleFont, textColor: self.presentationData.theme.list.itemSecondaryTextColor)
|
||||
|
||||
let subtitleSize = self.subtitleNode.updateLayout(CGSize(width: layout.size.width, height: headerHeight))
|
||||
let subtitleFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - subtitleSize.width) / 2.0), y: 30.0 - UIScreenPixel), size: subtitleSize)
|
||||
transition.updateFrame(node: self.subtitleNode, frame: subtitleFrame)
|
||||
|
||||
let titleSize = self.titleNode.updateLayout(CGSize(width: layout.size.width, height: headerHeight))
|
||||
let titleFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - titleSize.width) / 2.0), y: 18.0), size: titleSize)
|
||||
let titleFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - titleSize.width) / 2.0), y: subtitleSize.height.isZero ? 18.0 : 10.0 + UIScreenPixel), size: titleSize)
|
||||
transition.updateFrame(node: self.titleNode, frame: titleFrame)
|
||||
|
||||
let editSize = self.editButton.measure(CGSize(width: layout.size.width, height: headerHeight))
|
||||
|
||||
@ -206,12 +206,6 @@ NSString *const kYUVVideoRangeConversionForLAFragmentShaderString = SHADER_STRIN
|
||||
#pragma mark -
|
||||
#pragma mark Movie processing
|
||||
|
||||
//- (void)enableSynchronizedEncodingUsingMovieWriter:(GPUImageMovieWriter *)movieWriter;
|
||||
//{
|
||||
// synchronizedMovieWriter = movieWriter;
|
||||
// movieWriter.encodingLiveVideo = NO;
|
||||
//}
|
||||
|
||||
- (void)startProcessing {
|
||||
dispatch_sync(dispatch_get_main_queue(), ^{
|
||||
displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(displayLinkCallback:)];
|
||||
|
||||
@ -1052,6 +1052,12 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
|
||||
default:
|
||||
break
|
||||
}
|
||||
case .adminsTooMuch:
|
||||
if case .broadcast = channel.info {
|
||||
text = presentationData.strings.Channel_ErrorAdminsTooMuch
|
||||
} else {
|
||||
text = presentationData.strings.Group_ErrorAdminsTooMuch
|
||||
}
|
||||
}
|
||||
presentControllerImpl?(textAlertController(context: context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
|
||||
}, completed: {
|
||||
@ -1119,6 +1125,14 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
|
||||
let text = presentationData.strings.Invite_ChannelsTooMuch
|
||||
presentControllerImpl?(textAlertController(context: context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
|
||||
}
|
||||
} else if case .adminsTooMuch = error {
|
||||
let text: String
|
||||
if case .broadcast = channel.info {
|
||||
text = presentationData.strings.Channel_ErrorAdminsTooMuch
|
||||
} else {
|
||||
text = presentationData.strings.Group_ErrorAdminsTooMuch
|
||||
}
|
||||
presentControllerImpl?(textAlertController(context: context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
|
||||
}
|
||||
dismissImpl?()
|
||||
}, completed: {
|
||||
@ -1164,6 +1178,8 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
|
||||
|> deliverOnMainQueue).start(error: { error in
|
||||
if case let .addMemberError(error) = error, case .privacy = error, let admin = adminView.peers[adminView.peerId] {
|
||||
presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(admin.compactDisplayTitle, admin.compactDisplayTitle).0, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
|
||||
} else if case .adminsTooMuch = error {
|
||||
presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.Group_ErrorAdminsTooMuch, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
|
||||
}
|
||||
|
||||
dismissImpl?()
|
||||
@ -1226,6 +1242,8 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
|
||||
text = presentationData.strings.Invite_ChannelsTooMuch
|
||||
}
|
||||
presentControllerImpl?(textAlertController(context: context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
|
||||
} else if case .adminsTooMuch = error {
|
||||
presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.Group_ErrorAdminsTooMuch, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
|
||||
}
|
||||
case .conversionFailed, .conversionTooManyChannels:
|
||||
pushControllerImpl?(oldChannelsController(context: context, intent: .upgrade))
|
||||
|
||||
@ -15,7 +15,7 @@ public struct PeerStatusSettings: PostboxCoding, Equatable {
|
||||
public static let addExceptionWhenAddingContact = Flags(rawValue: 1 << 5)
|
||||
public static let canReportIrrelevantGeoLocation = Flags(rawValue: 1 << 6)
|
||||
public static let autoArchived = Flags(rawValue: 1 << 7)
|
||||
public static let inviteMembers = Flags(rawValue: 1 << 8)
|
||||
public static let suggestAddMembers = Flags(rawValue: 1 << 8)
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -361,10 +361,10 @@ private final class PeerExportedInvitationsContextImpl {
|
||||
var lastResult = self.results.last
|
||||
|
||||
if self.forceUpdate {
|
||||
self.populateCache = true
|
||||
self.forceUpdate = false
|
||||
lastResult = nil
|
||||
}
|
||||
if !self.forceUpdate && self.loadedFromCache {
|
||||
} else if self.loadedFromCache {
|
||||
self.populateCache = false
|
||||
self.loadedFromCache = false
|
||||
}
|
||||
|
||||
@ -55,6 +55,7 @@ public func removeGroupAdmin(account: Account, peerId: PeerId, adminId: PeerId)
|
||||
public enum AddGroupAdminError {
|
||||
case generic
|
||||
case addMemberError(AddGroupMemberError)
|
||||
case adminsTooMuch
|
||||
}
|
||||
|
||||
public func addGroupAdmin(account: Account, peerId: PeerId, adminId: PeerId) -> Signal<Void, AddGroupAdminError> {
|
||||
@ -79,6 +80,8 @@ public func addGroupAdmin(account: Account, peerId: PeerId, adminId: PeerId) ->
|
||||
)
|
||||
} else if error.errorDescription == "USER_PRIVACY_RESTRICTED" {
|
||||
return .fail(.addMemberError(.privacy))
|
||||
} else if error.errorDescription == "ADMINS_TOO_MUCH" {
|
||||
return .fail(.adminsTooMuch)
|
||||
}
|
||||
return .fail(.generic)
|
||||
}
|
||||
@ -121,6 +124,7 @@ public func addGroupAdmin(account: Account, peerId: PeerId, adminId: PeerId) ->
|
||||
public enum UpdateChannelAdminRightsError {
|
||||
case generic
|
||||
case addMemberError(AddChannelMemberError)
|
||||
case adminsTooMuch
|
||||
}
|
||||
|
||||
public func fetchChannelParticipant(account: Account, peerId: PeerId, participantId: PeerId) -> Signal<ChannelParticipant?, NoError> {
|
||||
@ -203,6 +207,8 @@ public func updateChannelAdminRights(account: Account, peerId: PeerId, adminId:
|
||||
return .fail(.addMemberError(.restricted))
|
||||
} else if error.errorDescription == "USER_CHANNELS_TOO_MUCH" {
|
||||
return .fail(.addMemberError(.tooMuchJoined))
|
||||
} else if error.errorDescription == "ADMINS_TOO_MUCH" {
|
||||
return .fail(.adminsTooMuch)
|
||||
}
|
||||
return .fail(.generic)
|
||||
}
|
||||
|
||||
@ -31,7 +31,7 @@ extension PeerStatusSettings {
|
||||
result.insert(.autoArchived)
|
||||
}
|
||||
if (flags & (1 << 8)) != 0 {
|
||||
result.insert(.inviteMembers)
|
||||
result.insert(.suggestAddMembers)
|
||||
}
|
||||
self = PeerStatusSettings(flags: result, geoDistance: geoDistance)
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -216,6 +216,7 @@ swift_library(
|
||||
"//third-party/ZIPFoundation:ZIPFoundation",
|
||||
"//submodules/ChatImportUI:ChatImportUI",
|
||||
"//submodules/ChatHistoryImportTasks:ChatHistoryImportTasks",
|
||||
"//submodules/DatePickerNode:DatePickerNode",
|
||||
],
|
||||
visibility = [
|
||||
"//visibility:public",
|
||||
|
||||
Binary file not shown.
@ -59,6 +59,7 @@ import StatisticsUI
|
||||
import MediaResources
|
||||
import GalleryData
|
||||
import ChatInterfaceState
|
||||
import InviteLinksUI
|
||||
|
||||
extension ChatLocation {
|
||||
var peerId: PeerId {
|
||||
@ -2857,7 +2858,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
|
||||
didDisplayActionsPanel = true
|
||||
} else if contactStatus.canReportIrrelevantLocation && peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
|
||||
didDisplayActionsPanel = true
|
||||
} else if peerStatusSettings.contains(.inviteMembers) {
|
||||
} else if peerStatusSettings.contains(.suggestAddMembers) {
|
||||
didDisplayActionsPanel = true
|
||||
}
|
||||
}
|
||||
@ -2874,7 +2875,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
|
||||
displayActionsPanel = true
|
||||
} else if contactStatus.canReportIrrelevantLocation && peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
|
||||
displayActionsPanel = true
|
||||
} else if peerStatusSettings.contains(.inviteMembers) {
|
||||
} else if peerStatusSettings.contains(.suggestAddMembers) {
|
||||
displayActionsPanel = true
|
||||
}
|
||||
}
|
||||
@ -3065,7 +3066,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
|
||||
didDisplayActionsPanel = true
|
||||
} else if contactStatus.canReportIrrelevantLocation && peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
|
||||
didDisplayActionsPanel = true
|
||||
} else if peerStatusSettings.contains(.inviteMembers) {
|
||||
} else if peerStatusSettings.contains(.suggestAddMembers) {
|
||||
didDisplayActionsPanel = true
|
||||
}
|
||||
}
|
||||
@ -3082,7 +3083,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
|
||||
displayActionsPanel = true
|
||||
} else if contactStatus.canReportIrrelevantLocation && peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
|
||||
displayActionsPanel = true
|
||||
} else if peerStatusSettings.contains(.inviteMembers) {
|
||||
} else if peerStatusSettings.contains(.suggestAddMembers) {
|
||||
displayActionsPanel = true
|
||||
}
|
||||
}
|
||||
@ -10501,7 +10502,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
|
||||
} else {
|
||||
dismissPeerId = peerId
|
||||
}
|
||||
self.editMessageDisposable.set((TelegramCore.dismissPeerStatusOptions(account: self.context.account, peerId: dismissPeerId)
|
||||
self.editMessageDisposable.set((dismissPeerStatusOptions(account: self.context.account, peerId: dismissPeerId)
|
||||
|> afterDisposed({
|
||||
Queue.mainQueue().async {
|
||||
}
|
||||
|
||||
@ -50,7 +50,7 @@ func titlePanelForChatPresentationInterfaceState(_ chatPresentationInterfaceStat
|
||||
displayActionsPanel = true
|
||||
} else if contactStatus.canReportIrrelevantLocation && peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
|
||||
displayActionsPanel = true
|
||||
} else if peerStatusSettings.contains(.inviteMembers) {
|
||||
} else if peerStatusSettings.contains(.suggestAddMembers) {
|
||||
displayActionsPanel = true
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@ private enum ChatReportPeerTitleButton: Equatable {
|
||||
case reportUserSpam
|
||||
case reportIrrelevantGeoLocation
|
||||
case unarchive
|
||||
case inviteMembers
|
||||
case addMembers
|
||||
|
||||
func title(strings: PresentationStrings) -> String {
|
||||
switch self {
|
||||
@ -39,8 +39,8 @@ private enum ChatReportPeerTitleButton: Equatable {
|
||||
return strings.Conversation_ReportGroupLocation
|
||||
case .unarchive:
|
||||
return strings.Conversation_Unarchive
|
||||
case .inviteMembers:
|
||||
return strings.PeerInfo_ButtonAddMember
|
||||
case .addMembers:
|
||||
return strings.Conversation_AddMembers
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -88,13 +88,13 @@ private func peerButtons(_ state: ChatPresentationInterfaceState) -> [ChatReport
|
||||
}
|
||||
}
|
||||
} else if let _ = state.renderedPeer?.chatMainPeer {
|
||||
if let contactStatus = state.contactStatus, contactStatus.canReportIrrelevantLocation, let peerStatusSettings = contactStatus.peerStatusSettings, peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
|
||||
if let contactStatus = state.contactStatus, let peerStatusSettings = contactStatus.peerStatusSettings, peerStatusSettings.contains(.suggestAddMembers) {
|
||||
buttons.append(.addMembers)
|
||||
} else if let contactStatus = state.contactStatus, contactStatus.canReportIrrelevantLocation, let peerStatusSettings = contactStatus.peerStatusSettings, peerStatusSettings.contains(.canReportIrrelevantGeoLocation) {
|
||||
buttons.append(.reportIrrelevantGeoLocation)
|
||||
} else if let contactStatus = state.contactStatus, let peerStatusSettings = contactStatus.peerStatusSettings, peerStatusSettings.contains(.autoArchived) {
|
||||
buttons.append(.reportUserSpam)
|
||||
buttons.append(.unarchive)
|
||||
} else if let peerStatusSettings = state.contactStatus?.peerStatusSettings, peerStatusSettings.contains(.inviteMembers) {
|
||||
buttons.append(.inviteMembers)
|
||||
} else {
|
||||
buttons.append(.reportSpam)
|
||||
}
|
||||
@ -515,7 +515,7 @@ final class ChatReportPeerTitlePanelNode: ChatTitleAccessoryPanelNode {
|
||||
self.interfaceInteraction?.reportPeer()
|
||||
case .unarchive:
|
||||
self.interfaceInteraction?.unarchivePeer()
|
||||
case .inviteMembers:
|
||||
case .addMembers:
|
||||
self.interfaceInteraction?.presentInviteMembers()
|
||||
case .addContact:
|
||||
self.interfaceInteraction?.presentPeerContact()
|
||||
|
||||
@ -26,6 +26,7 @@ private struct ChatContextResultStableId: Hashable {
|
||||
|
||||
private struct HorizontalListContextResultsChatInputContextPanelEntry: Comparable, Identifiable {
|
||||
let index: Int
|
||||
let theme: PresentationTheme
|
||||
let result: ChatContextResult
|
||||
|
||||
var stableId: ChatContextResultStableId {
|
||||
@ -33,7 +34,7 @@ private struct HorizontalListContextResultsChatInputContextPanelEntry: Comparabl
|
||||
}
|
||||
|
||||
static func ==(lhs: HorizontalListContextResultsChatInputContextPanelEntry, rhs: HorizontalListContextResultsChatInputContextPanelEntry) -> Bool {
|
||||
return lhs.index == rhs.index && lhs.result == rhs.result
|
||||
return lhs.index == rhs.index && lhs.theme === rhs.theme && lhs.result == rhs.result
|
||||
}
|
||||
|
||||
static func <(lhs: HorizontalListContextResultsChatInputContextPanelEntry, rhs: HorizontalListContextResultsChatInputContextPanelEntry) -> Bool {
|
||||
@ -41,7 +42,7 @@ private struct HorizontalListContextResultsChatInputContextPanelEntry: Comparabl
|
||||
}
|
||||
|
||||
func item(account: Account, resultSelected: @escaping (ChatContextResult, ASDisplayNode, CGRect) -> Bool) -> ListViewItem {
|
||||
return HorizontalListContextResultsChatInputPanelItem(account: account, result: self.result, resultSelected: resultSelected)
|
||||
return HorizontalListContextResultsChatInputPanelItem(account: account, theme: self.theme, result: self.result, resultSelected: resultSelected)
|
||||
}
|
||||
}
|
||||
|
||||
@ -248,7 +249,7 @@ final class HorizontalListContextResultsChatInputContextPanelNode: ChatInputCont
|
||||
var index = 0
|
||||
var resultIds = Set<ChatContextResultStableId>()
|
||||
for result in results.results {
|
||||
let entry = HorizontalListContextResultsChatInputContextPanelEntry(index: index, result: result)
|
||||
let entry = HorizontalListContextResultsChatInputContextPanelEntry(index: index, theme: self.theme, result: result)
|
||||
if resultIds.contains(entry.stableId) {
|
||||
continue
|
||||
} else {
|
||||
|
||||
@ -12,17 +12,21 @@ import StickerResources
|
||||
import PhotoResources
|
||||
import AnimatedStickerNode
|
||||
import TelegramAnimatedStickerNode
|
||||
import TelegramPresentationData
|
||||
import AccountContext
|
||||
import ShimmerEffect
|
||||
|
||||
final class HorizontalListContextResultsChatInputPanelItem: ListViewItem {
|
||||
let account: Account
|
||||
let theme: PresentationTheme
|
||||
let result: ChatContextResult
|
||||
let resultSelected: (ChatContextResult, ASDisplayNode, CGRect) -> Bool
|
||||
|
||||
let selectable: Bool = true
|
||||
|
||||
public init(account: Account, result: ChatContextResult, resultSelected: @escaping (ChatContextResult, ASDisplayNode, CGRect) -> Bool) {
|
||||
public init(account: Account, theme: PresentationTheme, result: ChatContextResult, resultSelected: @escaping (ChatContextResult, ASDisplayNode, CGRect) -> Bool) {
|
||||
self.account = account
|
||||
self.theme = theme
|
||||
self.result = result
|
||||
self.resultSelected = resultSelected
|
||||
}
|
||||
@ -84,6 +88,7 @@ final class HorizontalListContextResultsChatInputPanelItemNode: ListViewItemNode
|
||||
private let imageNodeBackground: ASDisplayNode
|
||||
private let imageNode: TransformImageNode
|
||||
private var animationNode: AnimatedStickerNode?
|
||||
private var placeholderNode: StickerShimmerEffectNode?
|
||||
private var videoLayer: (SoftwareVideoThumbnailNode, SoftwareVideoLayerFrameManager, SampleBufferLayer)?
|
||||
private var currentImageResource: TelegramMediaResource?
|
||||
private var currentVideoFile: TelegramMediaFile?
|
||||
@ -153,6 +158,8 @@ final class HorizontalListContextResultsChatInputPanelItemNode: ListViewItemNode
|
||||
self.imageNodeBackground = ASDisplayNode()
|
||||
self.imageNodeBackground.isLayerBacked = true
|
||||
|
||||
self.placeholderNode = StickerShimmerEffectNode()
|
||||
|
||||
self.imageNode = TransformImageNode()
|
||||
self.imageNode.contentAnimations = [.subsequentUpdates]
|
||||
self.imageNode.isLayerBacked = !smartInvertColorsEnabled()
|
||||
@ -170,6 +177,22 @@ final class HorizontalListContextResultsChatInputPanelItemNode: ListViewItemNode
|
||||
self.imageNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
|
||||
self.imageNode.contentAnimations = [.firstUpdate, .subsequentUpdates]
|
||||
self.addSubnode(self.imageNode)
|
||||
|
||||
var firstTime = true
|
||||
self.imageNode.imageUpdated = { [weak self] image in
|
||||
guard let strongSelf = self else {
|
||||
return
|
||||
}
|
||||
if image != nil {
|
||||
strongSelf.removePlaceholder(animated: !firstTime)
|
||||
}
|
||||
firstTime = false
|
||||
}
|
||||
|
||||
if let placeholderNode = self.placeholderNode {
|
||||
placeholderNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
|
||||
self.addSubnode(placeholderNode)
|
||||
}
|
||||
}
|
||||
|
||||
deinit {
|
||||
@ -181,6 +204,22 @@ final class HorizontalListContextResultsChatInputPanelItemNode: ListViewItemNode
|
||||
self.fetchDisposable.dispose()
|
||||
}
|
||||
|
||||
private func removePlaceholder(animated: Bool) {
|
||||
if let placeholderNode = self.placeholderNode {
|
||||
self.placeholderNode = nil
|
||||
if !animated {
|
||||
placeholderNode.removeFromSupernode()
|
||||
} else {
|
||||
placeholderNode.allowsGroupOpacity = true
|
||||
placeholderNode.alpha = 0.0
|
||||
placeholderNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, completion: { [weak placeholderNode] _ in
|
||||
placeholderNode?.removeFromSupernode()
|
||||
placeholderNode?.allowsGroupOpacity = false
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override public func layoutForParams(_ params: ListViewItemLayoutParams, item: ListViewItem, previousItem: ListViewItem?, nextItem: ListViewItem?) {
|
||||
if let item = item as? HorizontalListContextResultsChatInputPanelItem {
|
||||
let doLayout = self.asyncLayout()
|
||||
@ -385,7 +424,11 @@ final class HorizontalListContextResultsChatInputPanelItemNode: ListViewItemNode
|
||||
animationNode = AnimatedStickerNode()
|
||||
animationNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
|
||||
animationNode.visibility = true
|
||||
strongSelf.addSubnode(animationNode)
|
||||
if let placeholderNode = strongSelf.placeholderNode {
|
||||
strongSelf.insertSubnode(animationNode, belowSubnode: placeholderNode)
|
||||
} else {
|
||||
strongSelf.addSubnode(animationNode)
|
||||
}
|
||||
strongSelf.animationNode = animationNode
|
||||
}
|
||||
animationNode.started = { [weak self] in
|
||||
@ -406,7 +449,6 @@ final class HorizontalListContextResultsChatInputPanelItemNode: ListViewItemNode
|
||||
|
||||
strongSelf.statusNode.frame = progressFrame
|
||||
|
||||
|
||||
if let updatedStatusSignal = updatedStatusSignal {
|
||||
strongSelf.statusDisposable.set((updatedStatusSignal |> deliverOnMainQueue).start(next: { [weak strongSelf] status in
|
||||
displayLinkDispatcher.dispatch {
|
||||
@ -446,6 +488,18 @@ final class HorizontalListContextResultsChatInputPanelItemNode: ListViewItemNode
|
||||
animationNode.position = CGPoint(x: height / 2.0, y: (nodeLayout.contentSize.height - sideInset) / 2.0 + sideInset)
|
||||
animationNode.updateLayout(size: croppedImageDimensions)
|
||||
}
|
||||
|
||||
var immediateThumbnailData: Data?
|
||||
if case let .internalReference(internalReference) = item.result, internalReference.file?.isSticker == true {
|
||||
immediateThumbnailData = internalReference.file?.immediateThumbnailData
|
||||
}
|
||||
|
||||
if let placeholderNode = strongSelf.placeholderNode {
|
||||
placeholderNode.bounds = CGRect(origin: CGPoint(), size: CGSize(width: croppedImageDimensions.width, height: croppedImageDimensions.height))
|
||||
placeholderNode.position = CGPoint(x: height / 2.0, y: (nodeLayout.contentSize.height - sideInset) / 2.0 + sideInset)
|
||||
|
||||
placeholderNode.update(backgroundColor: item.theme.list.plainBackgroundColor, foregroundColor: item.theme.list.mediaPlaceholderColor.mixedWith(item.theme.list.plainBackgroundColor, alpha: 0.4), shimmeringColor: item.theme.list.mediaPlaceholderColor.withAlphaComponent(0.3), data: immediateThumbnailData, size: CGSize(width: croppedImageDimensions.width, height: croppedImageDimensions.height))
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@ -187,7 +187,6 @@ final class HorizontalStickerGridItemNode: GridItemNode {
|
||||
let boundingSize = bounds.insetBy(dx: 2.0, dy: 2.0).size
|
||||
|
||||
if let placeholderNode = self.placeholderNode {
|
||||
let placeholderFrame = CGRect(origin: CGPoint(x: floor((bounds.width - boundingSize.width) / 2.0), y: floor((bounds.height - boundingSize.height) / 2.0)), size: boundingSize)
|
||||
placeholderNode.frame = bounds
|
||||
|
||||
if let theme = self.currentState?.1.theme, let file = self.currentState?.1.file {
|
||||
|
||||
@ -195,7 +195,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
|
||||
self.textNode.attributedText = attributedText
|
||||
self.textNode.maximumNumberOfLines = 2
|
||||
displayUndo = false
|
||||
self.originalRemainingSeconds = 5
|
||||
self.originalRemainingSeconds = 4
|
||||
case let .banned(text):
|
||||
self.avatarNode = nil
|
||||
self.iconNode = nil
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user