From 0fa4e6239c47115fd9e72990a7f7fa2d77c6b625 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sat, 25 Nov 2023 22:09:11 +0400 Subject: [PATCH] Various fixes --- submodules/PremiumUI/Sources/PremiumDemoScreen.swift | 8 +++++--- .../Sources/Themes/WallpaperGalleryController.swift | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/submodules/PremiumUI/Sources/PremiumDemoScreen.swift b/submodules/PremiumUI/Sources/PremiumDemoScreen.swift index 488451bb51..339c8d4ef0 100644 --- a/submodules/PremiumUI/Sources/PremiumDemoScreen.swift +++ b/submodules/PremiumUI/Sources/PremiumDemoScreen.swift @@ -477,7 +477,7 @@ private final class DemoSheetContent: CombinedComponent { self.context = context self.subject = subject self.source = source - self.order = order ?? [.moreUpload, .fasterDownload, .voiceToText, .noAds, .uniqueReactions, .premiumStickers, .animatedEmoji, .advancedChatManagement, .profileBadge, .animatedUserpics, .appIcons, .translation, .stories] + self.order = order ?? [.moreUpload, .fasterDownload, .voiceToText, .noAds, .uniqueReactions, .premiumStickers, .animatedEmoji, .advancedChatManagement, .profileBadge, .animatedUserpics, .appIcons, .translation, .stories, .colors, .wallpapers] self.action = action self.dismiss = dismiss } @@ -946,7 +946,7 @@ private final class DemoSheetContent: CombinedComponent { ) availableItems[.colors] = DemoPagerComponent.Item( AnyComponentWithIdentity( - id: PremiumDemoScreen.Subject.animatedUserpics, + id: PremiumDemoScreen.Subject.colors, component: AnyComponent( PageComponent( content: AnyComponent(PhoneDemoComponent( @@ -964,7 +964,7 @@ private final class DemoSheetContent: CombinedComponent { ) availableItems[.wallpapers] = DemoPagerComponent.Item( AnyComponentWithIdentity( - id: PremiumDemoScreen.Subject.animatedUserpics, + id: PremiumDemoScreen.Subject.wallpapers, component: AnyComponent( PageComponent( content: AnyComponent(PhoneDemoComponent( @@ -1078,6 +1078,8 @@ private final class DemoSheetContent: CombinedComponent { buttonAnimationName = "premium_unlock" case .voiceToText: buttonText = strings.Premium_VoiceToText_Proceed + case .wallpapers: + buttonText = strings.Premium_Wallpaper_Proceed default: buttonText = strings.Common_OK } diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift index e3656a845b..1590928be9 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift @@ -520,7 +520,7 @@ public class WallpaperGalleryController: ViewController { if forBoth && !strongSelf.context.isPremium { let context = strongSelf.context var replaceImpl: ((ViewController) -> Void)? - let controller = context.sharedContext.makePremiumDemoController(context: context, subject: .voiceToText, action: { + let controller = context.sharedContext.makePremiumDemoController(context: context, subject: .wallpapers, action: { let controller = context.sharedContext.makePremiumIntroController(context: context, source: .settings, forceDark: false, dismissed: nil) replaceImpl?(controller) })