Merge commit '3cb29347d1da13c0ef115e15a274cff3ae694aa7'

This commit is contained in:
Peter
2018-11-02 22:43:35 +04:00
61 changed files with 5310 additions and 2715 deletions

View File

@@ -781,8 +781,11 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa
if let editingState = state.editingState {
if canEditGroupInfo {
entries.append(GroupInfoEntry.setGroupPhoto(presentationData.theme, presentationData.strings.GroupInfo_SetGroupPhoto))
entries.append(GroupInfoEntry.groupDescriptionSetup(presentationData.theme, presentationData.strings.Channel_Edit_AboutItem, editingState.editingDescriptionText))
entries.append(GroupInfoEntry.groupDescriptionSetupInfo(presentationData.theme, isGroup ? presentationData.strings.Group_About_Help : presentationData.strings.Channel_About_Help))
if view.peers[view.peerId] is TelegramChannel {
entries.append(GroupInfoEntry.groupDescriptionSetup(presentationData.theme, presentationData.strings.Channel_Edit_AboutItem, editingState.editingDescriptionText))
entries.append(GroupInfoEntry.groupDescriptionSetupInfo(presentationData.theme, isGroup ? presentationData.strings.Group_About_Help : presentationData.strings.Channel_About_Help))
}
}
if let group = view.peers[view.peerId] as? TelegramGroup {