ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-30 09:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '03c3d14e926e1252fadc7eca4189805c329a018c'

Browse Source
This commit is contained in:
Ali 2021-02-27 00:39:52 +04:00
commit c767cc94e0
3 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift
View File

@ -1059,6 +1059,7 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId,
|> deliverOnMainQueue
let previousHadNamesToRevoke = Atomic<Bool?>(value: nil)
let previousInvitation = Atomic<ExportedInvitation?>(value: nil)
let signal = combineLatest(context.sharedContext.presentationData, statePromise.get() |> deliverOnMainQueue, peerView, peersDisablingAddressNameAssignment.get() |> deliverOnMainQueue)
|> deliverOnMainQueue
@ -1253,6 +1254,15 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId,
}
var crossfade: Bool = false
if let cachedData = view.cachedData as? CachedChannelData {
let invitation = cachedData.exportedInvitation
let previousInvitation = previousInvitation.swap(invitation)
if invitation != previousInvitation {
crossfade = true
}
}
let hasNamesToRevoke = publicChannelsToRevoke != nil && !publicChannelsToRevoke!.isEmpty
let hadNamesToRevoke = previousHadNamesToRevoke.swap(hasNamesToRevoke)
if let peer = view.peers[view.peerId] as? TelegramChannel {
@ -1273,7 +1283,7 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId,
}
}
if selectedType == .publicChannel, let hadNamesToRevoke = hadNamesToRevoke {
if selectedType == .publicChannel, let hadNamesToRevoke = hadNamesToRevoke, !crossfade {
crossfade = hadNamesToRevoke != hasNamesToRevoke
}
}

2
submodules/TelegramUI/Sources/ChatEmptyNode.swift
View File

@ -833,7 +833,7 @@ final class ChatEmptyNode: ASDisplayNode {
contentType = .secret
} else if let group = peer as? TelegramGroup, case .creator = group.role {
contentType = .group
} else if let channel = peer as? TelegramChannel, case .group = channel.info, channel.flags.contains(.isCreator) {
} else if let channel = peer as? TelegramChannel, case .group = channel.info, channel.flags.contains(.isCreator) && !channel.flags.contains(.isGigagroup) {
contentType = .group
} else if let _ = interfaceState.peerNearbyData {
contentType = .peerNearby

36
submodules/TelegramUI/Sources/CreateChannelController.swift
View File

@ -26,6 +26,7 @@ private struct CreateChannelArguments {
let updateEditingDescriptionText: (String) -> Void
let done: () -> Void
let changeProfilePhoto: () -> Void
let focusOnDescription: () -> Void
}
private enum CreateChannelSection: Int32 {
@ -35,6 +36,7 @@ private enum CreateChannelSection: Int32 {
private enum CreateChannelEntryTag: ItemListItemTag {
case info
case description
func isEqual(to other: ItemListItemTag) -> Bool {
if let other = other as? CreateChannelEntryTag {
@ -45,6 +47,12 @@ private enum CreateChannelEntryTag: ItemListItemTag {
} else {
return false
}
case .description:
if case .description = other {
return true
} else {
return false
}
}
} else {
return false
@ -139,21 +147,23 @@ private enum CreateChannelEntry: ItemListNodeEntry {
func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
let arguments = arguments as! CreateChannelArguments
switch self {
case let .channelInfo(theme, strings, dateTimeFormat, peer, state, avatar):
case let .channelInfo(_, _, dateTimeFormat, peer, state, avatar):
return ItemListAvatarAndNameInfoItem(accountContext: arguments.context, presentationData: presentationData, dateTimeFormat: dateTimeFormat, mode: .editSettings, peer: peer, presence: nil, cachedData: nil, state: state, sectionId: ItemListSectionId(self.section), style: .blocks(withTopInset: false, withExtendedBottomInset: false), editingNameUpdated: { editingName in
arguments.updateEditingName(editingName)
}, editingNameCompleted: {
arguments.focusOnDescription()
}, avatarTapped: {
arguments.changeProfilePhoto()
}, updatingImage: avatar, tag: CreateChannelEntryTag.info)
case let .setProfilePhoto(theme, text):
case let .setProfilePhoto(_, text):
return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: ItemListSectionId(self.section), style: .blocks, action: {
arguments.changeProfilePhoto()
})
case let .descriptionSetup(theme, text, value):
case let .descriptionSetup(_, text, value):
return ItemListMultilineInputItem(presentationData: presentationData, text: value, placeholder: text, maxLength: ItemListMultilineInputItemTextLimit(value: 255, display: true), sectionId: self.section, style: .blocks, textUpdated: { updatedText in
arguments.updateEditingDescriptionText(updatedText)
})
case let .descriptionInfo(theme, text):
}, tag: CreateChannelEntryTag.description)
case let .descriptionInfo(_, text):
return ItemListTextItem(presentationData: presentationData, text: .plain(text), sectionId: self.section)
}
}
@ -209,6 +219,7 @@ public func createChannelController(context: AccountContext) -> ViewController {
var pushControllerImpl: ((ViewController) -> Void)?
var presentControllerImpl: ((ViewController, Any?) -> Void)?
var endEditingImpl: (() -> Void)?
var focusOnDescriptionImpl: (() -> Void)?
let actionsDisposable = DisposableSet()
@ -482,6 +493,8 @@ public func createChannelController(context: AccountContext) -> ViewController {
}
}
})
}, focusOnDescription: {
focusOnDescriptionImpl?()
})
let signal = combineLatest(context.sharedContext.presentationData, statePromise.get())
@ -517,9 +530,18 @@ public func createChannelController(context: AccountContext) -> ViewController {
controller.willDisappear = { _ in
endEditingImpl?()
}
endEditingImpl = {
[weak controller] in
endEditingImpl = { [weak controller] in
controller?.view.endEditing(true)
}
focusOnDescriptionImpl = { [weak controller] in
guard let controller = controller else {
return
}
controller.forEachItemNode { itemNode in
if let itemNode = itemNode as? ItemListMultilineInputItemNode, let itemTag = itemNode.tag, itemTag.isEqual(to: CreateChannelEntryTag.description) {
itemNode.focus()
}
}
}
return controller
}