diff --git a/NotificationContent/NotificationViewController.swift b/NotificationContent/NotificationViewController.swift index 18ea5ad7d6..8789860340 100644 --- a/NotificationContent/NotificationViewController.swift +++ b/NotificationContent/NotificationViewController.swift @@ -118,6 +118,10 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi return nil }, presentNativeController: { _ in }, dismissNativeController: { + }, getAlternateIconName: { + return nil + }, requestSetAlternateIconName: { _, f in + f(false) }) let appVersion = (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String) ?? "unknown" diff --git a/Share/ShareRootController.swift b/Share/ShareRootController.swift index e0201f96ad..f2487a5f33 100644 --- a/Share/ShareRootController.swift +++ b/Share/ShareRootController.swift @@ -142,6 +142,10 @@ class ShareRootController: UIViewController { return nil }, presentNativeController: { _ in }, dismissNativeController: { + }, getAlternateIconName: { + return nil + }, requestSetAlternateIconName: { _, f in + f(false) }) let sharedExtensionContext: SharedExtensionContext diff --git a/Telegram-iOS.xcodeproj/project.pbxproj b/Telegram-iOS.xcodeproj/project.pbxproj index 5ddc307c8a..b21490350b 100644 --- a/Telegram-iOS.xcodeproj/project.pbxproj +++ b/Telegram-iOS.xcodeproj/project.pbxproj @@ -425,6 +425,8 @@ D0E8B8AF2044496C00605593 /* voip_fail.caf in Resources */ = {isa = PBXBuildFile; fileRef = D0E8B8AA2044496C00605593 /* voip_fail.caf */; }; D0E8B8B02044496C00605593 /* voip_ringback.caf in Resources */ = {isa = PBXBuildFile; fileRef = D0E8B8AB2044496C00605593 /* voip_ringback.caf */; }; D0E8B8B12044496C00605593 /* voip_busy.caf in Resources */ = {isa = PBXBuildFile; fileRef = D0E8B8AC2044496C00605593 /* voip_busy.caf */; }; + D0E8C2DE2285EA55009F26E8 /* BlackIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E8C2DD2285EA55009F26E8 /* BlackIcon@2x.png */; }; + D0E8C2E02285EA6A009F26E8 /* BlackIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E8C2DF2285EA6A009F26E8 /* BlackIcon@3x.png */; }; D0EA97941FE84F2D00792DD6 /* BuildConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = D09250011FE52D2A003F693F /* BuildConfig.m */; }; D0EA97951FE84F2E00792DD6 /* BuildConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = D09250011FE52D2A003F693F /* BuildConfig.m */; }; D0EB243B201B77C400F6CC13 /* ClearNotificationsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0EB243A201B77C400F6CC13 /* ClearNotificationsManager.swift */; }; @@ -1174,6 +1176,8 @@ D0E8B8AA2044496C00605593 /* voip_fail.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = voip_fail.caf; path = "Telegram-iOS/Resources/voip_fail.caf"; sourceTree = ""; }; D0E8B8AB2044496C00605593 /* voip_ringback.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = voip_ringback.caf; path = "Telegram-iOS/Resources/voip_ringback.caf"; sourceTree = ""; }; D0E8B8AC2044496C00605593 /* voip_busy.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = voip_busy.caf; path = "Telegram-iOS/Resources/voip_busy.caf"; sourceTree = ""; }; + D0E8C2DD2285EA55009F26E8 /* BlackIcon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BlackIcon@2x.png"; sourceTree = ""; }; + D0E8C2DF2285EA6A009F26E8 /* BlackIcon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BlackIcon@3x.png"; sourceTree = ""; }; D0EA97961FE8536900792DD6 /* SiriIntents-Hockeyapp.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "SiriIntents-Hockeyapp.entitlements"; sourceTree = ""; }; D0EA97971FE8537000792DD6 /* Share-HockeyApp.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "Share-HockeyApp.entitlements"; sourceTree = ""; }; D0EA97981FE8537000792DD6 /* Share-AppStore.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "Share-AppStore.entitlements"; sourceTree = ""; }; @@ -1955,6 +1959,8 @@ D008599E1B28189D00EAF753 /* Telegram-iOS */ = { isa = PBXGroup; children = ( + D0E8C2DD2285EA55009F26E8 /* BlackIcon@2x.png */, + D0E8C2DF2285EA6A009F26E8 /* BlackIcon@3x.png */, D0338729223A8347007A2CE4 /* Config */, 09C50E7821738150009E676F /* Watch */, D021D4D8219CAEDD0064BEBA /* Config-Fork.xcconfig */, @@ -2898,6 +2904,7 @@ D0E8B8AE2044496C00605593 /* voip_end.caf in Resources */, D0CE6F68213EDA4400BCD44B /* InfoPlist.strings in Resources */, D0CE6F6A213EDA4400BCD44B /* Localizable.strings in Resources */, + D0E8C2DE2285EA55009F26E8 /* BlackIcon@2x.png in Resources */, D09DCBB71D0C856B00F51FFE /* Localizable.strings in Resources */, D0CE6F66213EDA4400BCD44B /* AppIntentVocabulary.plist in Resources */, D08DB0B8213F4D1D00F2ADBF /* powerful_mask@2x.png in Resources */, @@ -2966,6 +2973,7 @@ D0E8B8B02044496C00605593 /* voip_ringback.caf in Resources */, D00ED75A1FE94630001F38BD /* AppIntentVocabulary.plist in Resources */, D04DCC221F71C80000B021D7 /* 1.m4a in Resources */, + D0E8C2E02285EA6A009F26E8 /* BlackIcon@3x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Telegram-iOS/AppDelegate.swift b/Telegram-iOS/AppDelegate.swift index a89e6be07c..ec44e4b4ad 100644 --- a/Telegram-iOS/AppDelegate.swift +++ b/Telegram-iOS/AppDelegate.swift @@ -580,6 +580,20 @@ final class SharedApplicationContext { self.window?.rootViewController?.present(controller, animated: true, completion: nil) }, dismissNativeController: { self.window?.rootViewController?.dismiss(animated: true, completion: nil) + }, getAlternateIconName: { + if #available(iOS 10.3, *) { + return application.alternateIconName + } else { + return nil + } + }, requestSetAlternateIconName: { name, completion in + if #available(iOS 10.3, *) { + application.setAlternateIconName(name, completionHandler: { error in + completion(error == nil) + }) + } else { + completion(false) + } }) let accountManagerSignal = Signal { subscriber in diff --git a/Telegram-iOS/BlackIcon@2x.png b/Telegram-iOS/BlackIcon@2x.png new file mode 100644 index 0000000000..5e863192c3 Binary files /dev/null and b/Telegram-iOS/BlackIcon@2x.png differ diff --git a/Telegram-iOS/BlackIcon@3x.png b/Telegram-iOS/BlackIcon@3x.png new file mode 100644 index 0000000000..715eb5d04a Binary files /dev/null and b/Telegram-iOS/BlackIcon@3x.png differ diff --git a/Telegram-iOS/Info.plist b/Telegram-iOS/Info.plist index 4c1866e524..aa4f79826b 100644 --- a/Telegram-iOS/Info.plist +++ b/Telegram-iOS/Info.plist @@ -10,6 +10,28 @@ ${APP_NAME} CFBundleExecutable $(EXECUTABLE_NAME) + CFBundleIcons + + CFBundleAlternateIcons + + Black + + CFBundleIconFiles + + BlackIcon + + UIPrerenderedIcon + + + + CFBundlePrimaryIcon + + CFBundleIconName + AppIconLLC + UIPrerenderedIcon + + + CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/submodules/Display b/submodules/Display index df839bd80b..d2592223e0 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit df839bd80bc5e7cf3bf3d5cf201075c68f18d4e4 +Subproject commit d2592223e0e82ddb4de5b94a2b40bbb6e91e0c7d diff --git a/submodules/Postbox b/submodules/Postbox index 8f7e113805..7d2a5bb3fb 160000 --- a/submodules/Postbox +++ b/submodules/Postbox @@ -1 +1 @@ -Subproject commit 8f7e113805bf66c1ffde067c3832c983b58ec06e +Subproject commit 7d2a5bb3fbf6353850833c178c09060798900b8e diff --git a/submodules/TelegramCore b/submodules/TelegramCore index 60bfc46be8..f20d6bcc1e 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit 60bfc46be88a7d08d57cf6cefd630364a18505d9 +Subproject commit f20d6bcc1e5d2736fed1239e47ec973c666dbac4 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 1b5ea5f685..f02d98f2c1 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 1b5ea5f68508ac8e5fc201c62877e4f6b545e327 +Subproject commit f02d98f2c17550c131a9571e684a2441f92a5474