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

Update avatar editor emoji categories

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-01-29 17:26:37 +04:00
parent 5800d72d2e
commit 8748ca5706
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/Telegram-iOS/en.lproj/Localizable.strings
View File

@ -8724,6 +8724,7 @@ Sorry for the inconvenience.";
"AvatarEditor.SetGroupPhoto" = "Set as Group Photo"; "AvatarEditor.SetGroupPhoto" = "Set as Group Photo";
"AvatarEditor.SetChannelPhoto" = "Set as Channel Photo"; "AvatarEditor.SetChannelPhoto" = "Set as Channel Photo";
"AvatarEditor.Set" = "Set"; "AvatarEditor.Set" = "Set";
"AvatarEditor.Suggest" = "Suggest";
"Premium.UpgradeDescription" = "Your current **Telegram Premium** plan can be upgraded at a **discount**."; "Premium.UpgradeDescription" = "Your current **Telegram Premium** plan can be upgraded at a **discount**.";
"Premium.CurrentPlan" = "your current plan"; "Premium.CurrentPlan" = "your current plan";

6
submodules/TelegramCore/Sources/State/EmojiSearchCategories.swift
View File

@ -7,6 +7,7 @@ public final class EmojiSearchCategories: Equatable, Codable {
public enum Kind: Int64 { public enum Kind: Int64 {
case emoji = 0 case emoji = 0
case status = 1 case status = 1
case avatar = 2
} }
public struct Group: Codable, Equatable { public struct Group: Codable, Equatable {
@ -122,6 +123,11 @@ func managedSynchronizeEmojiSearchCategories(postbox: Postbox, network: Network,
|> `catch` { _ -> Signal<Api.messages.EmojiGroups, NoError> in |> `catch` { _ -> Signal<Api.messages.EmojiGroups, NoError> in
return .single(.emojiGroupsNotModified) return .single(.emojiGroupsNotModified)
} }
case .avatar:
signal = network.request(Api.functions.messages.getEmojiProfilePhotoGroups(hash: current?.hash ?? 0))
|> `catch` { _ -> Signal<Api.messages.EmojiGroups, NoError> in
return .single(.emojiGroupsNotModified)
}
} }
return signal return signal

2
submodules/TelegramUI/Components/AvatarEditorScreen/Sources/AvatarEditorScreen.swift
View File

@ -867,7 +867,7 @@ final class AvatarEditorScreenComponent: Component {
let navigationDoneButtonSize = self.navigationDoneButton.update( let navigationDoneButtonSize = self.navigationDoneButton.update(
transition: transition, transition: transition,
component: AnyComponent(Button( component: AnyComponent(Button(
content: AnyComponent(Text(text: strings.AvatarEditor_Set, font: Font.semibold(17.0), color: state.expanded && !backgroundIsBright ? .white : environment.theme.rootController.navigationBar.accentTextColor)), content: AnyComponent(Text(text: component.peerType == .suggest ? strings.AvatarEditor_Suggest : strings.AvatarEditor_Set, font: Font.semibold(17.0), color: state.expanded && !backgroundIsBright ? .white : environment.theme.rootController.navigationBar.accentTextColor)),
action: { [weak self] in action: { [weak self] in
guard let self else { guard let self else {
return return

12
submodules/TelegramUI/Components/EntityKeyboard/Sources/EmojiPagerContentComponent.swift
View File

@ -6878,10 +6878,12 @@ public final class EmojiPagerContentComponent: Component {
} }
let searchCategories: Signal<EmojiSearchCategories?, NoError> let searchCategories: Signal<EmojiSearchCategories?, NoError>
if isEmojiSelection || isReactionSelection || isProfilePhotoEmojiSelection || isGroupPhotoEmojiSelection { if isEmojiSelection || isReactionSelection {
searchCategories = context.engine.stickers.emojiSearchCategories(kind: .emoji) searchCategories = context.engine.stickers.emojiSearchCategories(kind: .emoji)
} else if isStatusSelection { } else if isStatusSelection {
searchCategories = context.engine.stickers.emojiSearchCategories(kind: .status) searchCategories = context.engine.stickers.emojiSearchCategories(kind: .status)
} else if isProfilePhotoEmojiSelection || isGroupPhotoEmojiSelection {
searchCategories = context.engine.stickers.emojiSearchCategories(kind: .avatar)
} else { } else {
searchCategories = .single(nil) searchCategories = .single(nil)
} }
@ -7802,8 +7804,12 @@ public final class EmojiPagerContentComponent: Component {
let strings = context.sharedContext.currentPresentationData.with({ $0 }).strings let strings = context.sharedContext.currentPresentationData.with({ $0 }).strings
let searchCategories: Signal<EmojiSearchCategories?, NoError> = context.engine.stickers.emojiSearchCategories(kind: .emoji) let searchCategories: Signal<EmojiSearchCategories?, NoError>
if isProfilePhotoEmojiSelection || isGroupPhotoEmojiSelection {
searchCategories = context.engine.stickers.emojiSearchCategories(kind: .avatar)
} else {
searchCategories = context.engine.stickers.emojiSearchCategories(kind: .emoji)
}
return combineLatest( return combineLatest(
context.account.postbox.itemCollectionsView(orderedItemListCollectionIds: stickerOrderedItemListCollectionIds, namespaces: stickerNamespaces, aroundIndex: nil, count: 10000000), context.account.postbox.itemCollectionsView(orderedItemListCollectionIds: stickerOrderedItemListCollectionIds, namespaces: stickerNamespaces, aroundIndex: nil, count: 10000000),
hasPremium(context: context, chatPeerId: chatPeerId, premiumIfSavedMessages: false), hasPremium(context: context, chatPeerId: chatPeerId, premiumIfSavedMessages: false),