ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-02-18 16:56:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd027c6c214d6ce9583159bb5d356997821ac6836'

Browse Source
This commit is contained in:
Peter
2019-01-02 19:57:09 +04:00
parent 47877c5ad1 d027c6c214
commit 6cc7f4b8ef
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
TelegramUI/GroupInfoController.swift
View File

@@ -817,6 +817,11 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa
if let peer = view.peers[view.peerId] as? TelegramChannel, let username = peer.username, !username.isEmpty {
entries.append(.link(presentationData.theme, "t.me/" + username))
}
} else if let cachedGroupData = view.cachedData as? CachedGroupData {
if let about = cachedGroupData.about, !about.isEmpty {
entries.append(.aboutHeader(presentationData.theme, presentationData.strings.Channel_About_Title.uppercased()))
entries.append(.about(presentationData.theme, about))
}
}
entries.append(GroupInfoEntry.notifications(presentationData.theme, presentationData.strings.GroupInfo_Notifications, notificationsText))
@@ -1074,12 +1079,23 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa
private func valuesRequiringUpdate(state: GroupInfoState, view: PeerView) -> (title: String?, description: String?) {
if let peer = view.peers[view.peerId] as? TelegramGroup {
var titleValue: String?
var descriptionValue: String?
if let editingState = state.editingState {
if let title = editingState.editingName?.composedTitle, title != peer.title {
return (title, nil)
titleValue = title
}
if let cachedData = view.cachedData as? CachedGroupData {
if let about = cachedData.about {
if about != editingState.editingDescriptionText {
descriptionValue = editingState.editingDescriptionText
}
} else if !editingState.editingDescriptionText.isEmpty {
descriptionValue = editingState.editingDescriptionText
}
}
}
return (nil, nil)
return (titleValue, descriptionValue)
} else if let peer = view.peers[view.peerId] as? TelegramChannel {
var titleValue: String?
var descriptionValue: String?
@@ -1097,7 +1113,6 @@ private func valuesRequiringUpdate(state: GroupInfoState, view: PeerView) -> (ti
}
}
}
return (titleValue, descriptionValue)
} else {
return (nil, nil)
@@ -1754,8 +1769,12 @@ public func groupInfoController(account: Account, peerId: PeerId) -> ViewControl
} else {
rightNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Edit), style: .regular, enabled: true, action: {
if let peer = peer as? TelegramGroup {
var text = ""
if let cachedData = view.cachedData as? CachedGroupData, let about = cachedData.about {
text = about
}
updateState { state in
return state.withUpdatedEditingState(GroupInfoEditingState(editingName: ItemListAvatarAndNameInfoItemName(peer), editingDescriptionText: ""))
return state.withUpdatedEditingState(GroupInfoEditingState(editingName: ItemListAvatarAndNameInfoItemName(peer), editingDescriptionText: text))
}
} else if let channel = peer as? TelegramChannel, case .group = channel.info {
var text = ""