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

Fix build

Browse Source
This commit is contained in:
Ilya Laktyushin 2019-08-28 00:30:05 +03:00
parent 23814898ba
commit b61e442d06
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
submodules/ChatListUI/Sources/Node/ChatListItem.swift
View File

@ -1329,7 +1329,6 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
if let currentMutedIconImage = currentMutedIconImage { if let currentMutedIconImage = currentMutedIconImage {
strongSelf.mutedIconNode.image = currentMutedIconImage strongSelf.mutedIconNode.image = currentMutedIconImage
strongSelf.mutedIconNode.isHidden = false strongSelf.mutedIconNode.isHidden = false
transition.updateFrame(node: strongSelf.mutedIconNode, frame: CGRect(origin: CGPoint(x: nextTitleIconOrigin - 4.0, y: contentRect.origin.y - 2.0), size: currentMutedIconImage.size)) transition.updateFrame(node: strongSelf.mutedIconNode, frame: CGRect(origin: CGPoint(x: nextTitleIconOrigin - 4.0, y: contentRect.origin.y - 2.0), size: currentMutedIconImage.size))
nextTitleIconOrigin += currentMutedIconImage.size.width + 1.0 nextTitleIconOrigin += currentMutedIconImage.size.width + 1.0
} else { } else {
@ -1568,7 +1567,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
} }
let mutedIconFrame = self.mutedIconNode.frame let mutedIconFrame = self.mutedIconNode.frame
transition.updateFrame(node: self.mutedIconNode, frame: CGRect(origin: CGPoint(x: nextTitleIconOrigin - 6.0, y: contentRect.origin.y - 1.0), size: mutedIconFrame.size)) transition.updateFrame(node: self.mutedIconNode, frame: CGRect(origin: CGPoint(x: nextTitleIconOrigin - 4.0, y: contentRect.origin.y - 2.0), size: mutedIconFrame.size))
nextTitleIconOrigin += mutedIconFrame.size.width + 3.0 nextTitleIconOrigin += mutedIconFrame.size.width + 3.0
let badgeFrame = self.badgeNode.frame let badgeFrame = self.badgeNode.frame

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

@ -144,6 +144,10 @@ private enum DebugControllerEntry: ItemListNodeEntry {
return ItemListDisclosureItem(theme: theme, title: "Send Logs", label: "", sectionId: self.section, style: .blocks, action: { return ItemListDisclosureItem(theme: theme, title: "Send Logs", label: "", sectionId: self.section, style: .blocks, action: {
let _ = (Logger.shared.collectLogs() let _ = (Logger.shared.collectLogs()
|> deliverOnMainQueue).start(next: { logs in |> deliverOnMainQueue).start(next: { logs in
guard let context = arguments.context else {
return
}
let presentationData = arguments.sharedContext.currentPresentationData.with { $0 } let presentationData = arguments.sharedContext.currentPresentationData.with { $0 }
let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) let actionSheet = ActionSheetController(presentationTheme: presentationData.theme)
@ -153,7 +157,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
items.append(ActionSheetButtonItem(title: "Via Telegram", color: .accent, action: { [weak actionSheet] in items.append(ActionSheetButtonItem(title: "Via Telegram", color: .accent, action: { [weak actionSheet] in
actionSheet?.dismissAnimated() actionSheet?.dismissAnimated()
let controller = PeerSelectionController(context: context, filter: [.onlyWriteable, .excludeDisabled]) let controller = context.sharedContext.makePeerSelectionController(PeerSelectionControllerParams(context: context, filter: [.onlyWriteable, .excludeDisabled]))
controller.peerSelected = { [weak controller] peerId in controller.peerSelected = { [weak controller] peerId in
if let strongController = controller { if let strongController = controller {
strongController.dismiss() strongController.dismiss()
@ -253,7 +257,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
guard let context = arguments.context else { guard let context = arguments.context else {
return return
} }
let controller = PeerSelectionController(context: context, filter: [.onlyWriteable, .excludeDisabled]) let controller = context.sharedContext.makePeerSelectionController(PeerSelectionControllerParams(context: context, filter: [.onlyWriteable, .excludeDisabled]))
controller.peerSelected = { [weak controller] peerId in controller.peerSelected = { [weak controller] peerId in
if let strongController = controller { if let strongController = controller {
strongController.dismiss() strongController.dismiss()
@ -282,7 +286,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
items.append(ActionSheetButtonItem(title: "Via Telegram", color: .accent, action: { [weak actionSheet] in items.append(ActionSheetButtonItem(title: "Via Telegram", color: .accent, action: { [weak actionSheet] in
actionSheet?.dismissAnimated() actionSheet?.dismissAnimated()
let controller = PeerSelectionController(context: context, filter: [.onlyWriteable, .excludeDisabled]) let controller = context.sharedContext.makePeerSelectionController(PeerSelectionControllerParams(context: context, filter: [.onlyWriteable, .excludeDisabled]))
controller.peerSelected = { [weak controller] peerId in controller.peerSelected = { [weak controller] peerId in
if let strongController = controller { if let strongController = controller {
strongController.dismiss() strongController.dismiss()
@ -522,6 +526,7 @@ private func debugControllerEntries(presentationData: PresentationData, loggingS
entries.append(.resetHoles(presentationData.theme)) entries.append(.resetHoles(presentationData.theme))
entries.append(.optimizeDatabase(presentationData.theme)) entries.append(.optimizeDatabase(presentationData.theme))
entries.append(.photoPreview(presentationData.theme, experimentalSettings.chatListPhotos)) entries.append(.photoPreview(presentationData.theme, experimentalSettings.chatListPhotos))
entries.append(.knockoutWallpaper(presentationData.theme, experimentalSettings.knockoutWallpaper))
entries.append(.versionInfo(presentationData.theme)) entries.append(.versionInfo(presentationData.theme))