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

Merge branch 'master' into beta

Browse Source
This commit is contained in:
Ali
2020-02-12 00:49:48 +01:00
parent 7e4a7df596 bb872e8782
commit f711de7526
311 changed files with 29439 additions and 5371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
submodules/SettingsUI/Sources/SettingsController.swift
View File

@@ -17,7 +17,6 @@ import AccountContext
import OverlayStatusController
import AvatarNode
import AlertUI
import PresentationDataUtils
import TelegramNotices
import GalleryUI
import LegacyUI
@@ -1457,7 +1456,12 @@ public func settingsController(context: AccountContext, accountManager: AccountM
actionsDisposable.dispose()
}
let icon = UIImage(bundleImageName: "Chat List/Tabs/IconSettings")
let icon: UIImage?
if useSpecialTabBarIcons() {
icon = UIImage(bundleImageName: "Chat List/Tabs/Holiday/IconSettings")
} else {
icon = UIImage(bundleImageName: "Chat List/Tabs/IconSettings")
}
let notificationsFromAllAccounts = accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.inAppNotificationSettings])
|> map { sharedData -> Bool in
@@ -1497,7 +1501,8 @@ public func settingsController(context: AccountContext, accountManager: AccountM
let inset: CGFloat = 3.0
if let signal = peerAvatarImage(account: primary.0, peerReference: PeerReference(primary.1), authorOfMessage: nil, representation: primary.1.profileImageRepresentations.first, displayDimensions: size, inset: 3.0, emptyColor: nil, synchronousLoad: false) {
return signal
|> map { image -> (UIImage, UIImage)? in
|> map { imageVersions -> (UIImage, UIImage)? in
let image = imageVersions?.0
if let image = image, let selectedImage = generateImage(size, rotatedContext: { size, context in
context.clear(CGRect(origin: CGPoint(), size: size))
context.translateBy(x: size.width / 2.0, y: size.height / 2.0)