From 6f19a4610260c1852ff5f5775f7862aa099bb77c Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Tue, 19 Mar 2019 19:04:03 +0400 Subject: [PATCH] Update submodules --- Telegram-iOS/ApplicationContext.swift | 8 ++++---- Telegram-iOS/en.lproj/Localizable.strings | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Telegram-iOS/ApplicationContext.swift b/Telegram-iOS/ApplicationContext.swift index cc59a2f164..2edd30eac3 100644 --- a/Telegram-iOS/ApplicationContext.swift +++ b/Telegram-iOS/ApplicationContext.swift @@ -649,7 +649,7 @@ final class AuthorizedApplicationContext { if !didAppear { Queue.mainQueue().after(0.15, { - (strongSelf.rootController.viewControllers.last as? ViewController)?.present(controller, in: .window(.root), with: ViewControllerPresentationArguments.init(presentationAnimation: .modalSheet)) + (strongSelf.rootController.viewControllers.last as? ViewController)?.present(controller, in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) }) } } else { @@ -698,7 +698,7 @@ final class AuthorizedApplicationContext { if let strongSelf = self{ for text in alerts { let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } - let controller = standardTextAlertController(theme: AlertControllerTheme(presentationTheme: presentationData.theme), title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]) + let controller = textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]) (strongSelf.rootController.viewControllers.last as? ViewController)?.present(controller, in: .window(.root)) } } @@ -783,7 +783,7 @@ final class AuthorizedApplicationContext { navigateToMessage() } else { let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } - let controller = standardTextAlertController(theme: AlertControllerTheme(presentationTheme: presentationData.theme), title: presentationData.strings.WatchRemote_AlertTitle, text: presentationData.strings.WatchRemote_AlertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: presentationData.strings.WatchRemote_AlertOpen, action:navigateToMessage)]) + let controller = textAlertController(context: strongSelf.context, title: presentationData.strings.WatchRemote_AlertTitle, text: presentationData.strings.WatchRemote_AlertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: presentationData.strings.WatchRemote_AlertOpen, action:navigateToMessage)]) (strongSelf.rootController.viewControllers.last as? ViewController)?.present(controller, in: .window(.root)) } } else { @@ -840,7 +840,7 @@ final class AuthorizedApplicationContext { } func openRootSearch() { - self.rootController.openChatsSearch() + self.rootController.openChatsController(activateSearch: true) } func openRootCompose() { diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index a6135702fe..96cf32c67d 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -4133,7 +4133,7 @@ Unused sets are archived when you add more."; "SettingsSearch.Synonyms.Notifications.ContactJoined" = ""; "SettingsSearch.Synonyms.Notifications.ResetAllNotifications" = ""; -"SettingsSearch.Synonyms.Privacy.Title" = ""; +"SettingsSearch.Synonyms.Privacy.Title" = " "; "SettingsSearch.Synonyms.Privacy.BlockedUsers" = ""; "SettingsSearch.Synonyms.Privacy.LastSeen" = ""; "SettingsSearch.Synonyms.Privacy.ProfilePhoto" = ""; @@ -4176,7 +4176,7 @@ Unused sets are archived when you add more."; "SettingsSearch.Synonyms.Appearance.Title" = ""; "SettingsSearch.Synonyms.Appearance.TextSize" = ""; -"SettingsSearch.Synonyms.Appearance.ChatBackground" = ""; +"SettingsSearch.Synonyms.Appearance.ChatBackground" = "Wallpaper"; "SettingsSearch.Synonyms.Appearance.ChatBackground.SetColor" = ""; "SettingsSearch.Synonyms.Appearance.ChatBackground.Custom" = ""; "SettingsSearch.Synonyms.Appearance.AutoNightTheme" = "";