ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 22:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rebrand to folders

Browse Source
This commit is contained in:
Ali
2020-03-06 18:04:34 +04:00
parent a29dc35c68
commit ba7c2c599a
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/ChatListUI/Sources/ChatListController.swift
View File

@@ -2253,7 +2253,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
let (_, filterItems) = filterItemsAndTotalCount let (_, filterItems) = filterItemsAndTotalCount
var items: [ContextMenuItem] = [] var items: [ContextMenuItem] = []
items.append(.action(ContextMenuActionItem(text: presetList.isEmpty ? "Add Filter" : "Edit Filters", icon: { theme in items.append(.action(ContextMenuActionItem(text: presetList.isEmpty ? "Add Folder" : "Edit Folders", icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Add"), color: theme.contextMenu.primaryColor) return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Add"), color: theme.contextMenu.primaryColor)
}, action: { c, f in }, action: { c, f in
c.dismiss(completion: { c.dismiss(completion: {

4
submodules/ChatListUI/Sources/ChatListFilterPresetController.swift
View File

@@ -688,7 +688,7 @@ func chatListFilterPresetController(context: AccountContext, currentPreset: Chat
if let currentPreset = currentPreset { if let currentPreset = currentPreset {
initialName = currentPreset.title initialName = currentPreset.title
} else { } else {
initialName = "New Filter" initialName = "New Folder"
} }
let initialState = ChatListFilterPresetControllerState(name: initialName, includeCategories: currentPreset?.data.categories ?? [], excludeMuted: currentPreset?.data.excludeMuted ?? false, excludeRead: currentPreset?.data.excludeRead ?? false, excludeArchived: currentPreset?.data.excludeArchived ?? false, additionallyIncludePeers: currentPreset?.data.includePeers ?? [], additionallyExcludePeers: currentPreset?.data.excludePeers ?? []) let initialState = ChatListFilterPresetControllerState(name: initialName, includeCategories: currentPreset?.data.categories ?? [], excludeMuted: currentPreset?.data.excludeMuted ?? false, excludeRead: currentPreset?.data.excludeRead ?? false, excludeArchived: currentPreset?.data.excludeArchived ?? false, additionallyIncludePeers: currentPreset?.data.includePeers ?? [], additionallyExcludePeers: currentPreset?.data.excludePeers ?? [])
let stateValue = Atomic(value: initialState) let stateValue = Atomic(value: initialState)
@@ -900,7 +900,7 @@ func chatListFilterPresetController(context: AccountContext, currentPreset: Chat
}) })
}) })
let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(currentPreset != nil ? "Filter" : "Create Filter"), leftNavigationButton: leftNavigationButton, rightNavigationButton: rightNavigationButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false) let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(currentPreset != nil ? "Folder" : "Create Folder"), leftNavigationButton: leftNavigationButton, rightNavigationButton: rightNavigationButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false)
let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: chatListFilterPresetControllerEntries(presentationData: presentationData, isNewFilter: currentPreset == nil, state: state, includePeers: includePeers, excludePeers: excludePeers), style: .blocks, emptyStateItem: nil, animateChanges: !skipStateAnimation) let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: chatListFilterPresetControllerEntries(presentationData: presentationData, isNewFilter: currentPreset == nil, state: state, includePeers: includePeers, excludePeers: excludePeers), style: .blocks, emptyStateItem: nil, animateChanges: !skipStateAnimation)
skipStateAnimation = false skipStateAnimation = false

10
submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift
View File

@@ -159,7 +159,7 @@ private struct ChatListFilterPresetListControllerState: Equatable {
private func chatListFilterPresetListControllerEntries(presentationData: PresentationData, state: ChatListFilterPresetListControllerState, filters: [(ChatListFilter, Int)], suggestedFilters: [(String, String, ChatListFilterData)], settings: ChatListFilterSettings) -> [ChatListFilterPresetListEntry] { private func chatListFilterPresetListControllerEntries(presentationData: PresentationData, state: ChatListFilterPresetListControllerState, filters: [(ChatListFilter, Int)], suggestedFilters: [(String, String, ChatListFilterData)], settings: ChatListFilterSettings) -> [ChatListFilterPresetListEntry] {
var entries: [ChatListFilterPresetListEntry] = [] var entries: [ChatListFilterPresetListEntry] = []
entries.append(.screenHeader("Create filters for different groups of chats and\nquickly switch between them.")) entries.append(.screenHeader("Create folders for different groups of chats and\nquickly switch between them."))
let filteredSuggestedFilters = suggestedFilters.filter { _, _, data in let filteredSuggestedFilters = suggestedFilters.filter { _, _, data in
for (filter, _) in filters { for (filter, _) in filters {
@@ -170,17 +170,17 @@ private func chatListFilterPresetListControllerEntries(presentationData: Present
return true return true
} }
entries.append(.listHeader("FILTERS")) entries.append(.listHeader("FOLDERS"))
for (filter, chatCount) in filters { for (filter, chatCount) in filters {
entries.append(.preset(index: entries.count, title: filter.title, label: chatCount == 0 ? "" : "\(chatCount)", preset: filter, canBeReordered: filters.count > 1, canBeDeleted: true, isEditing: state.isEditing)) entries.append(.preset(index: entries.count, title: filter.title, label: chatCount == 0 ? "" : "\(chatCount)", preset: filter, canBeReordered: filters.count > 1, canBeDeleted: true, isEditing: state.isEditing))
} }
if filters.count < 10 { if filters.count < 10 {
entries.append(.addItem(text: "Create New Filter", isEditing: state.isEditing)) entries.append(.addItem(text: "Create New Folder", isEditing: state.isEditing))
} }
entries.append(.listFooter("Tap \"Edit\" to change the order or delete filters.")) entries.append(.listFooter("Tap \"Edit\" to change the order or delete folders."))
if !filteredSuggestedFilters.isEmpty { if !filteredSuggestedFilters.isEmpty {
entries.append(.suggestedListHeader("RECOMMENDED FILTERS")) entries.append(.suggestedListHeader("RECOMMENDED FOLDERS"))
for (title, label, data) in filteredSuggestedFilters { for (title, label, data) in filteredSuggestedFilters {
entries.append(.suggestedPreset(index: entries.count, title: title, label: label, preset: data)) entries.append(.suggestedPreset(index: entries.count, title: title, label: label, preset: data))
} }