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

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Browse Source
This commit is contained in:
Ilya Laktyushin 2024-02-12 17:23:37 -04:00
commit ca5e6781fb
4 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -616,12 +616,12 @@ private func chatListFilterPresetControllerEntries(context: AccountContext, pres
entries.append(.excludePeerInfo(presentationData.strings.ChatListFolder_ExcludeSectionInfo))
}
let tagColor = state.color ?? .blue
/*let tagColor = state.color ?? .blue
let resolvedColor = context.peerNameColors.getProfile(tagColor, dark: presentationData.theme.overallDarkAppearance, subject: .palette)
entries.append(.tagColorHeader(name: state.name, color: resolvedColor))
entries.append(.tagColor(colors: context.peerNameColors, currentColor: tagColor))
entries.append(.tagColorFooter)
entries.append(.tagColorFooter)*/
var hasLinks = false
if let inviteLinks, !inviteLinks.isEmpty {

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

@ -274,8 +274,8 @@ private func chatListFilterPresetListControllerEntries(presentationData: Present
}
}
entries.append(.displayTags(displayTags))
entries.append(.displayTagsFooter)
/*entries.append(.displayTags(displayTags))
entries.append(.displayTagsFooter)*/
return entries
}

18
submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift
View File

@ -927,28 +927,14 @@ private func settingsItems(data: PeerInfoScreenData?, context: AccountContext, p
interaction.openSettings(.premium)
}))
//TODO:localize
/*items[.payment]!.append(PeerInfoScreenDisclosureItem(id: 101, label: .text(""), additionalBadgeLabel: presentationData.strings.Settings_New, text: "Telegram Business", icon: PresentationResourcesSettings.chatFolders, action: {
items[.payment]!.append(PeerInfoScreenDisclosureItem(id: 101, label: .text(""), additionalBadgeLabel: presentationData.strings.Settings_New, text: "Telegram Business", icon: PresentationResourcesSettings.chatFolders, action: {
interaction.openSettings(.businessSetup)
}))*/
}))
items[.payment]!.append(PeerInfoScreenDisclosureItem(id: 102, label: .text(""), additionalBadgeLabel: presentationData.strings.Settings_New, text: presentationData.strings.Settings_PremiumGift, icon: PresentationResourcesSettings.premiumGift, action: {
interaction.openSettings(.premiumGift)
}))
}
/*items[.payment]!.append(PeerInfoScreenDisclosureItem(id: 100, label: .text(""), text: "Payment Method", icon: PresentationResourcesSettings.language, action: {
interaction.openPaymentMethod()
}))*/
/*let stickersLabel: String
if let settings = data.globalSettings {
stickersLabel = settings.unreadTrendingStickerPacks > 0 ? "\(settings.unreadTrendingStickerPacks)" : ""
} else {
stickersLabel = ""
}
items[.advanced]!.append(PeerInfoScreenDisclosureItem(id: 5, label: .badge(stickersLabel, presentationData.theme.list.itemAccentColor), text: presentationData.strings.ChatSettings_StickersAndReactions, icon: PresentationResourcesSettings.stickers, action: {
interaction.openSettings(.stickers)
}))*/
if let settings = data.globalSettings {
if settings.hasPassport {
items[.extra]!.append(PeerInfoScreenDisclosureItem(id: 0, text: presentationData.strings.Settings_Passport, icon: PresentationResourcesSettings.passport, action: {

2
submodules/TgVoipWebrtc/tgcalls

@ -1 +1 @@
Subproject commit 564c632f9368409870631d3cef75a7fc4070d45b
Subproject commit 6b73742cdc140c46a1ab1b8e3390354a9738e429