diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings index 26342d6b8f..8c235432b4 100644 --- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings @@ -6045,9 +6045,9 @@ Sorry for the inconvenience."; "Report.Report" = "Report"; "Report.Succeed" = "Telegram moderators will study your report. Thank you!"; -"Conversation.AutoremoveRemainingTime" = "auto-delete in %@"; -"Conversation.AutoremoveRemainingDays_1" = "auto-delete in %@ day"; -"Conversation.AutoremoveRemainingDays_any" = "auto-delete in %@ days"; +"Conversation.AutoremoveRemainingTime" = "auto-deletes in %@"; +"Conversation.AutoremoveRemainingDays_1" = "auto-deletes in %@ day"; +"Conversation.AutoremoveRemainingDays_any" = "auto-deletes in %@ days"; "PeerInfo.AutoremoveMessages" = "Auto-Delete Messages"; "PeerInfo.AutoremoveMessagesDisabled" = "Never"; diff --git a/Telegram/WidgetKitWidget/TodayViewController.swift b/Telegram/WidgetKitWidget/TodayViewController.swift index 4550059a49..4323da9c20 100644 --- a/Telegram/WidgetKitWidget/TodayViewController.swift +++ b/Telegram/WidgetKitWidget/TodayViewController.swift @@ -316,6 +316,7 @@ extension PeersWidgetData { struct AvatarItemView: View { var peer: ParsedPeer? var itemSize: CGFloat + var placeholderColor: Color var displayBadge: Bool = true var body: some View { @@ -324,11 +325,12 @@ struct AvatarItemView: View { Image(uiImage: avatarImage(accountPeerId: peer.accountPeerId, peer: peer.peer, size: CGSize(width: itemSize, height: itemSize))) .clipShape(Circle()) } else { - Image(uiImage: avatarImage(accountPeerId: nil, peer: nil, size: CGSize(width: itemSize, height: itemSize))) - //Rectangle() - .frame(width: itemSize, height: itemSize) - .clipShape(Circle()) - .redacted(reason: .placeholder) + Circle() + .fill(placeholderColor) + .frame(width: itemSize, height: itemSize) + //Image(uiImage: avatarImage(accountPeerId: nil, peer: nil, size: CGSize(width: itemSize, height: itemSize))) + //.clipShape(Circle()) + //.redacted(reason: .placeholder) } /*if let peer = peer, displayBadge, let badge = peer.badge, badge.count > 0 { Text("\(badge.count)") @@ -430,7 +432,8 @@ struct WidgetView: View { Link(destination: URL(string: linkForPeer(accountId: peers.peers[i].accountId, id: peers.peers[i].peer.id))!, label: { AvatarItemView( peer: peers.peers[i], - itemSize: itemSize + itemSize: itemSize, + placeholderColor: getPlaceholderColor() ).frame(width: itemSize, height: itemSize) }).frame(width: itemSize, height: itemSize) .position(x: floor(horizontalInsetFraction * geometry.size.width + itemSize / 2.0 + CGFloat(i % columnCount) * (itemSize + horizontalSpacingFraction * geometry.size.width)), y: floor(verticalInsetFraction * geometry.size.height + itemSize / 2.0 + CGFloat(i / columnCount) * (itemSize + verticalSpacingFraction * geometry.size.height))) @@ -461,7 +464,7 @@ struct WidgetView: View { func chatTopLine(_ peer: ParsedPeer?) -> some View { let dateText: String - let chatTitle: Text + let chatTitle: AnyView let date: Text if let peer = peer { @@ -470,26 +473,44 @@ struct WidgetView: View { } else { dateText = "" } - chatTitle = Text(peer.peer.name).font(Font.system(size: 16.0, weight: .medium, design: .default)).foregroundColor(.primary) + chatTitle = AnyView(Text(peer.peer.name) + .lineLimit(1) + .font(Font.system(size: 16.0, weight: .medium, design: .default)) + .foregroundColor(.primary)) date = Text(dateText) .font(Font.system(size: 14.0, weight: .regular, design: .default)).foregroundColor(.secondary) } else { - dateText = "10:00" - chatTitle = Text("Chat Title").font(Font.system(size: 16.0, weight: .medium, design: .default)).foregroundColor(.primary) + dateText = " " + chatTitle = AnyView(Text(" ").font(Font.system(size: 16.0, weight: .medium, design: .default)).foregroundColor(.primary)) date = Text(dateText) - .font(Font.system(size: 14.0, weight: .regular, design: .default)).foregroundColor(.secondary) + .font(Font.system(size: 16.0, weight: .regular, design: .default)).foregroundColor(.secondary) } return HStack(alignment: .center, spacing: 0.0, content: { if peer != nil { chatTitle } else { - chatTitle.redacted(reason: .placeholder) + chatTitle + .frame(minWidth: 48.0) + .background(GeometryReader { geometry in + RoundedRectangle(cornerRadius: 4.0) + .fill(getPlaceholderColor()) + .frame(width: geometry.size.width, height: 8.0, alignment: .center) + .offset(x: 0.0, y: (geometry.size.height - 8.0) / 2.0 + 1.0) + } + ) } Spacer() if peer != nil { date } else { - date.redacted(reason: .placeholder) + date + .background(GeometryReader { geometry in + RoundedRectangle(cornerRadius: 4.0) + .fill(getPlaceholderColor()) + .frame(width: geometry.size.width, height: 8.0, alignment: .center) + .offset(x: 0.0, y: (geometry.size.height - 8.0) / 2.0) + } + ) } }) .padding(0.0) @@ -580,15 +601,42 @@ struct WidgetView: View { .foregroundColor(.secondary) .multilineTextAlignment(.leading) .padding(0.0) - //.frame(maxHeight: .infinity, alignment: .topLeading) - //.background(Rectangle().foregroundColor(.gray)) if peer != nil { return AnyView(textView) } else { return AnyView( - textView - .redacted(reason: .placeholder) + VStack(alignment: .leading, spacing: 0.0, content: { + Text(" ") + .lineLimit(1) + .font(Font.system(size: 15.0, weight: .regular, design: .default)) + .foregroundColor(.secondary) + .multilineTextAlignment(.leading) + .padding(0.0) + .frame(minWidth: 182.0) + .background(GeometryReader { geometry in + RoundedRectangle(cornerRadius: 4.0) + .fill(getPlaceholderColor()) + .frame(width: geometry.size.width, height: 8.0, alignment: .center) + .offset(x: 0.0, y: (geometry.size.height - 8.0) / 2.0 - 1.0) + } + ) + Text(" ") + .lineLimit(1) + .font(Font.system(size: 15.0, weight: .regular, design: .default)) + .foregroundColor(.secondary) + .multilineTextAlignment(.leading) + .padding(0.0) + .frame(minWidth: 96.0) + .background(GeometryReader { geometry in + RoundedRectangle(cornerRadius: 4.0) + .fill(getPlaceholderColor()) + .frame(width: geometry.size.width, height: 8.0, alignment: .center) + .offset(x: 0.0, y: (geometry.size.height - 8.0) / 2.0 - 1.0) + } + ) + }) + //textView.redacted(reason: .placeholder) ) } @@ -658,7 +706,7 @@ struct WidgetView: View { return AnyView( Link(destination: url, label: { HStack(alignment: .center, spacing: 0.0, content: { - AvatarItemView(peer: peers?.peers[index], itemSize: 54.0, displayBadge: false).frame(width: 54.0, height: 54.0, alignment: .leading).padding(EdgeInsets(top: 0.0, leading: 10.0, bottom: 0.0, trailing: 10.0)) + AvatarItemView(peer: peers?.peers[index], itemSize: 54.0, placeholderColor: getPlaceholderColor(), displayBadge: false).frame(width: 54.0, height: 54.0, alignment: .leading).padding(EdgeInsets(top: 0.0, leading: 10.0, bottom: 0.0, trailing: 10.0)) chatContent(peers?.peers[index]).frame(maxWidth: .infinity).padding(EdgeInsets(top: 0.0, leading: 0.0, bottom: 0.0, trailing: 10.0)) }) }) @@ -718,7 +766,7 @@ struct WidgetView: View { } } default: - text = "" + text = "Long tap to edit widget" } return Text(text) @@ -765,6 +813,17 @@ struct WidgetView: View { } } + func getPlaceholderColor() -> Color { + switch colorScheme { + case .light: + return Color(.sRGB, red: 242.0 / 255.0, green: 242.0 / 255.0, blue: 247.0 / 255.0, opacity: 1.0) + case .dark: + return Color(.sRGB, red: 21.0 / 255.0, green: 21.0 / 255.0, blue: 21.0 / 255.0, opacity: 1.0) + @unknown default: + return .secondary + } + } + var body: some View { GeometryReader(content: { geometry in return VStack(alignment: .center, spacing: 0.0, content: { diff --git a/submodules/ContextUI/Sources/ContextActionNode.swift b/submodules/ContextUI/Sources/ContextActionNode.swift index 5bc51d8629..e3cf4f2abd 100644 --- a/submodules/ContextUI/Sources/ContextActionNode.swift +++ b/submodules/ContextUI/Sources/ContextActionNode.swift @@ -10,7 +10,12 @@ enum ContextActionSibling { case separator } -final class ContextActionNode: ASDisplayNode { +public protocol ContextActionNodeProtocol: ASDisplayNode { + func setIsHighlighted(_ value: Bool) + func performAction() +} + +final class ContextActionNode: ASDisplayNode, ContextActionNodeProtocol { private let action: ContextMenuActionItem private let getController: () -> ContextController? private let actionSelected: (ContextMenuActionResult) -> Void diff --git a/submodules/ContextUI/Sources/ContextActionsContainerNode.swift b/submodules/ContextUI/Sources/ContextActionsContainerNode.swift index 8081676ee5..dbf88830bc 100644 --- a/submodules/ContextUI/Sources/ContextActionsContainerNode.swift +++ b/submodules/ContextUI/Sources/ContextActionsContainerNode.swift @@ -50,7 +50,7 @@ private final class InnerActionsContainerNode: ASDisplayNode { private let feedbackTap: () -> Void private(set) var gesture: UIGestureRecognizer? - private var currentHighlightedActionNode: ContextActionNode? + private var currentHighlightedActionNode: ContextActionNodeProtocol? var panSelectionGestureEnabled: Bool = true { didSet { @@ -291,13 +291,17 @@ private final class InnerActionsContainerNode: ASDisplayNode { self.containerNode.backgroundColor = presentationData.theme.contextMenu.backgroundColor } - func actionNode(at point: CGPoint) -> ContextActionNode? { + func actionNode(at point: CGPoint) -> ContextActionNodeProtocol? { for itemNode in self.itemNodes { switch itemNode { case let .action(actionNode): if actionNode.frame.contains(point) { return actionNode } + case let .custom(node): + if let node = node as? ContextActionNodeProtocol, node.frame.contains(point) { + return node + } default: break } @@ -536,7 +540,7 @@ final class ContextActionsContainerNode: ASDisplayNode { self.scrollNode.frame = CGRect(origin: CGPoint(), size: containerSize) } - func actionNode(at point: CGPoint) -> ContextActionNode? { + func actionNode(at point: CGPoint) -> ContextActionNodeProtocol? { return self.actionsNode.actionNode(at: self.view.convert(point, to: self.actionsNode.view)) } diff --git a/submodules/ContextUI/Sources/ContextController.swift b/submodules/ContextUI/Sources/ContextController.swift index ead64484c7..1dfd5c0906 100644 --- a/submodules/ContextUI/Sources/ContextController.swift +++ b/submodules/ContextUI/Sources/ContextController.swift @@ -138,7 +138,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi private var didCompleteAnimationIn = false private var initialContinueGesturePoint: CGPoint? private var didMoveFromInitialGesturePoint = false - private var highlightedActionNode: ContextActionNode? + private var highlightedActionNode: ContextActionNodeProtocol? private var highlightedReaction: ReactionContextItem.Reaction? private let hapticFeedback = HapticFeedback() diff --git a/submodules/PeerInfoUI/Sources/PeerAutoremoveSetupScreen.swift b/submodules/PeerInfoUI/Sources/PeerAutoremoveSetupScreen.swift index 6ca28ef27c..a466790cda 100644 --- a/submodules/PeerInfoUI/Sources/PeerAutoremoveSetupScreen.swift +++ b/submodules/PeerInfoUI/Sources/PeerAutoremoveSetupScreen.swift @@ -268,19 +268,20 @@ public func peerAutoremoveSetupScreen(context: AccountContext, peerId: PeerId, c if let globalValue = globalValue, globalValue != defaultGlobalValue { updated = true } + + var resolvedValue: Int32? = changedValue ?? resolvedDefaultValue + if resolvedValue == Int32.max { + resolvedValue = nil + } + + let resolvedMaxValue: Int32 + if peer is TelegramUser { + resolvedMaxValue = peerValue + } else { + resolvedMaxValue = Int32.max + } + if updated { - var resolvedValue: Int32? = changedValue ?? resolvedDefaultValue - if resolvedValue == Int32.max { - resolvedValue = nil - } - - let resolvedMaxValue: Int32 - if peer is TelegramUser { - resolvedMaxValue = peerValue - } else { - resolvedMaxValue = Int32.max - } - let resolvedGlobalValue = globalValue ?? defaultGlobalValue let signal = setChatMessageAutoremoveTimeoutInteractively(account: context.account, peerId: peerId, timeout: resolvedValue, isGlobal: resolvedGlobalValue) @@ -301,7 +302,12 @@ public func peerAutoremoveSetupScreen(context: AccountContext, peerId: PeerId, c })) } else { dismissImpl?() - completion(.unchanged) + + if resolvedMaxValue != Int32.max { + completion(.updated(PeerAutoremoveSetupScreenResult.Updated(myValue: resolvedValue, limitedByValue: resolvedMaxValue))) + } else { + completion(.unchanged) + } } }) } diff --git a/submodules/TelegramCore/Sources/PeerInputActivityManager.swift b/submodules/TelegramCore/Sources/PeerInputActivityManager.swift index 57db211664..39227e30cc 100644 --- a/submodules/TelegramCore/Sources/PeerInputActivityManager.swift +++ b/submodules/TelegramCore/Sources/PeerInputActivityManager.swift @@ -83,7 +83,7 @@ private final class PeerInputActivityContext { }, queue: self.queue) let updateId = nextUpdateId nextUpdateId += 1 - self.activities.insert(ActivityRecord(peerId: peerId, activity: activity, id: activityId, timer: timer, episodeId: episodeId, timestamp: timestamp, updateId: updateId), at: 0) + self.activities.append(ActivityRecord(peerId: peerId, activity: activity, id: activityId, timer: timer, episodeId: episodeId, timestamp: timestamp, updateId: updateId)) timer.start() } diff --git a/submodules/TelegramUI/Resources/Animations/anim_autoremove_off.json b/submodules/TelegramUI/Resources/Animations/anim_autoremove_off.json index 42051fa6ef..c3b24c99fd 100644 --- a/submodules/TelegramUI/Resources/Animations/anim_autoremove_off.json +++ b/submodules/TelegramUI/Resources/Animations/anim_autoremove_off.json @@ -1 +1 @@ -{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":63,"w":512,"h":512,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Null 3","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[252,286,0],"ix":2},"a":{"a":0,"k":[50,50,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.3,0.3,0.3],"y":[1,1,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":30,"s":[100,100,100]},{"i":{"x":[0.71,0.71,0.71],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":38,"s":[95,95,100]},{"i":{"x":[0.71,0.71,0.71],"y":[1,1,1]},"o":{"x":[0.29,0.29,0.29],"y":[0,0,0]},"t":46,"s":[102,102,100]},{"t":53,"s":[100,100,100]}],"ix":6}},"ao":0,"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Fire 2","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":2.193,"ix":10},"p":{"a":0,"k":[6.858,0.314,0],"ix":2},"a":{"a":0,"k":[-654.13,1.695,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.541,"y":0},"t":25,"s":[{"i":[[0,0],[-13,-35],[-58.2,-4.2],[-23.7,25.95]],"o":[[-28.7,62.6],[25.7,69.1],[39.65,2.75],[0,0]],"v":[[-785.3,-63.6],[-802.5,92.6],[-667.4,197.5],[-560.8,161.05]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":28,"s":[{"i":[[0,0],[-13.09,-34.706],[-58.441,-4.166],[-24.065,24.466]],"o":[[-28.262,60.287],[25.396,67.393],[40.161,2.755],[0,0]],"v":[[-786.813,-61.155],[-803.805,93.972],[-668.372,197.603],[-561.768,162.648]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":30,"s":[{"i":[[0,0],[-13.236,-34.231],[-58.83,-4.112],[-24.656,22.063]],"o":[[-27.552,56.542],[24.905,64.63],[40.987,2.764],[0,0]],"v":[[-793.928,-51.372],[-805.917,96.192],[-669.945,197.771],[-569.277,168.752]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.167,"y":0.167},"t":32,"s":[{"i":[[0,0],[-13.568,-33.15],[-59.715,-3.987],[-25.999,16.602]],"o":[[-25.94,48.031],[23.789,58.348],[42.865,2.783],[0,0]],"v":[[-796.535,-38.065],[-810.718,101.24],[-673.521,198.151],[-571.671,175.699]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":34,"s":[{"i":[[0,0],[-13.768,-32.5],[-60.247,-3.913],[-26.806,13.318]],"o":[[-24.97,42.912],[23.117,54.571],[43.995,2.795],[0,0]],"v":[[-798.229,-32.182],[-813.605,104.275],[-675.672,198.379],[-573.237,177.758]],"c":true}]},{"t":43,"s":[{"i":[[0,0],[-13.3,-34.887],[-58.2,-4.2],[-24.393,20.093]],"o":[[-20.508,51.07],[22.332,58.58],[42.5,3],[0,0]],"v":[[-796.399,-36.719],[-810.241,97.157],[-676.994,198.174],[-569.221,173.112]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.541,"y":0},"t":25,"s":[{"i":[[0,0],[1.8,36.65],[27.1,38.4],[58.5,26.6],[-0.6,-16.6],[0,0],[5.7,-26.8],[9.1,-17.5],[2.2,3.3],[0,0],[13.15,-45.1],[0,0],[0,0],[0,0],[0,0]],"o":[[39.95,-33.1],[-2.305,-46.933],[-21.139,-29.954],[-5,-2.2],[0,0],[-0.1,29],[-5.9,27.6],[-2.55,4.35],[0,0],[-6.1,-8.25],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-560.95,161.1],[-508.8,22.1],[-550.1,-115.4],[-665,-213.1],[-683.15,-199.7],[-683.15,-199.7],[-690.1,-102.5],[-707.7,-37.85],[-717.6,-37.4],[-751.9,-91],[-785.4,-63.65],[-698.494,30.235],[-697.242,31.482],[-564.024,158.035],[-563.397,158.661]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":28,"s":[{"i":[[0,0],[1.802,35.68],[28.311,39.19],[57.865,26.165],[-0.602,-16.491],[0,0],[5.687,-26.753],[9.131,-17.385],[2.207,3.278],[0,0],[12.148,-41.455],[0,0],[0,0],[0,0],[0,0]],"o":[[40.422,-33.415],[-2.372,-46.622],[-21.326,-29.68],[-5.017,-2.186],[0,0],[-0.1,28.809],[-5.797,27.142],[-2.613,4.46],[0,0],[-5.852,-8.012],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-561.773,162.518],[-507.395,23.599],[-550.168,-112.934],[-664.501,-208.459],[-682.961,-195.288],[-682.961,-195.288],[-689.93,-99.719],[-707.865,-35.167],[-717.886,-34.82],[-752.364,-87.722],[-786.821,-59.831],[-697.458,30.02],[-696.202,31.26],[-564.857,159.474],[-564.228,160.095]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":30,"s":[{"i":[[0,0],[1.809,32.912],[31.764,41.443],[56.053,24.925],[-0.608,-16.179],[0,0],[5.648,-26.619],[9.218,-17.057],[2.229,3.216],[0,0],[9.29,-31.056],[0,0],[0,0],[0,0],[0,0]],"o":[[41.77,-34.313],[-2.563,-45.733],[-21.859,-28.901],[-5.065,-2.144],[0,0],[-0.101,28.265],[-5.502,25.834],[-2.794,4.774],[0,0],[-5.145,-7.334],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-550.594,155.609],[-503.389,27.876],[-550.362,-105.899],[-663.078,-195.222],[-682.421,-182.701],[-682.421,-182.701],[-689.443,-91.786],[-708.337,-27.515],[-718.702,-27.461],[-753.687,-78.37],[-778.418,-65.154],[-686.737,25.143],[-685.469,26.359],[-553.707,152.622],[-553.072,153.231]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.167,"y":0.167},"t":32,"s":[{"i":[[0,0],[1.819,28.76],[36.945,44.824],[53.336,23.065],[-0.616,-15.712],[0,0],[5.59,-26.419],[9.35,-16.564],[2.26,3.124],[0,0],[5.002,-15.459],[0,0],[0,0],[0,0],[0,0]],"o":[[43.791,-35.661],[-2.85,-44.4],[-22.659,-27.731],[-5.137,-2.082],[0,0],[-0.103,27.449],[-5.059,23.872],[-3.065,5.246],[0,0],[-4.084,-6.317],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-543.507,156.769],[-497.379,34.291],[-550.653,-95.346],[-660.943,-175.365],[-681.612,-163.821],[-681.612,-163.821],[-688.714,-79.887],[-709.045,-16.036],[-719.925,-16.422],[-755.673,-64.343],[-774.213,-60.399],[-685.441,25.743],[-684.155,26.924],[-546.666,153.868],[-546.021,154.46]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":34,"s":[{"i":[[0,0],[1.824,26.552],[39.7,46.621],[51.891,22.076],[-0.621,-15.464],[0,0],[5.56,-26.312],[9.42,-16.302],[2.277,3.074],[0,0],[2.722,-7.163],[0,0],[0,0],[0,0],[0,0]],"o":[[44.867,-36.378],[-3.002,-43.691],[-23.084,-27.109],[-5.176,-2.049],[0,0],[-0.103,27.015],[-4.824,22.829],[-3.209,5.496],[0,0],[-3.52,-5.776],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-540.631,157.399],[-494.183,37.703],[-550.807,-89.734],[-659.808,-164.804],[-681.182,-153.779],[-681.182,-153.779],[-688.326,-73.558],[-709.421,-9.932],[-720.576,-10.551],[-756.729,-56.883],[-773.692,-57.363],[-687.715,28.003],[-686.42,29.165],[-543.813,154.544],[-543.164,155.127]],"c":true}]},{"t":43,"s":[{"i":[[0,0],[1.8,28.5],[38.4,50],[50.128,23.698],[-0.6,-16.6],[0,0],[5.371,-28.245],[9.1,-17.5],[2.2,3.3],[0,0],[7.2,-17.3],[0,0],[0,0],[0,0],[0,0]],"o":[[43.342,-39.05],[-2.9,-46.9],[-22.3,-29.1],[-5,-2.2],[0,0],[-0.1,29],[-4.66,24.506],[-3.1,5.9],[0,0],[-3.4,-6.2],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-542.391,150.884],[-501.672,25.695],[-554.874,-111.161],[-661.669,-191.689],[-682.317,-179.854],[-682.317,-179.854],[-689.218,-93.739],[-709.596,-25.439],[-720.372,-26.104],[-755.297,-75.839],[-781.297,-69.739],[-692.39,18.896],[-691.139,20.143],[-545.465,147.819],[-544.837,148.444]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":25,"op":177,"st":-3,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Line","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-2,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.7,"y":1},"o":{"x":0.541,"y":0},"t":23,"s":[-712.833,-22.984,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":34,"s":[-655.767,32.752,0],"to":[0,0,0],"ti":[0,0,0]},{"t":43,"s":[-664.092,22.23,0]}],"ix":2},"a":{"a":0,"k":[-656.75,22.3,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-830.9,-151.3],[-482.6,195.9]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":31,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.69],"y":[1]},"o":{"x":[0.495],"y":[0]},"t":23,"s":[0]},{"t":34,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":20,"op":177,"st":-3,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Fire","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":19,"s":[0]},{"i":{"x":[0.3],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":28,"s":[-3]},{"i":{"x":[0.71],"y":[1]},"o":{"x":[0.5],"y":[0]},"t":36,"s":[11]},{"i":{"x":[0.71],"y":[1]},"o":{"x":[0.29],"y":[0]},"t":44,"s":[-8]},{"i":{"x":[0.71],"y":[1]},"o":{"x":[0.29],"y":[0]},"t":51,"s":[5]},{"i":{"x":[0.71],"y":[1]},"o":{"x":[0.29],"y":[0]},"t":57,"s":[-2]},{"t":62,"s":[0]}],"ix":10},"p":{"a":0,"k":[54,215.845,0],"ix":2},"a":{"a":0,"k":[0,195.845,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.3,0.3,0.3],"y":[1,1,1]},"o":{"x":[0.31,0.31,0.31],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"t":6,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.29,"y":0},"t":0,"s":[{"i":[[-3.876,-0.374],[-21.728,-4.273],[-3.77,-0.898],[-2.945,-8.566],[150.67,1.932],[25.749,12.598],[-3.973,4.568],[-21.735,7.34],[-6.555,-0.642],[0,0],[-3.456,1.274],[-5.895,5.057],[-0.095,5.289],[0,0]],"o":[[37.346,3.603],[4.415,0.868],[38.285,9.121],[2.945,8.566],[-58.14,-0.746],[-7.055,-3.452],[4.908,-5.643],[3.515,-1.196],[7.584,0.888],[2.185,0.607],[8.835,-3.208],[5.7,-4.89],[0,0],[1.044,-3.038]],"v":[[4.737,132.854],[93.348,144.668],[105.626,147.315],[156.926,172.041],[-12.839,203.963],[-150.398,185.184],[-155.022,173.154],[-115.058,153.678],[-96.723,152.673],[-58.533,162.834],[-46.184,162.712],[-24.048,150.315],[-15.308,135.039],[-15.308,135.039]],"c":true}]},{"i":{"x":0.4,"y":1},"o":{"x":0.29,"y":0},"t":9,"s":[{"i":[[-2.024,-2.348],[-12.871,-24.747],[-2.229,-5.191],[-1.744,-49.603],[89.254,11.19],[15.26,72.996],[-2.353,26.452],[-12.874,42.505],[-3.883,-3.715],[0,0],[-2.047,7.38],[-3.496,29.319],[-3.65,28.666],[0,0]],"o":[[19.482,22.605],[2.615,5.029],[22.678,52.816],[1.744,49.603],[-34.439,-4.318],[-4.179,-19.99],[2.907,-32.675],[2.082,-6.928],[4.492,5.139],[1.294,3.514],[5.233,-18.576],[3.376,-28.316],[0,0],[2.678,-16.389]],"v":[[9.111,-215.809],[50.473,-147.648],[57.745,-132.322],[93.132,9.806],[-7.426,194.662],[-88.908,85.917],[-91.647,16.25],[-63.475,-96.528],[-51.614,-101.295],[-33.993,-65.179],[-26.678,-65.882],[-14.066,-116.008],[-4.144,-205.611],[-4.144,-205.611]],"c":true}]},{"i":{"x":0.468,"y":1},"o":{"x":0.29,"y":0},"t":17,"s":[{"i":[[-4.294,-1.226],[-23.654,-16.653],[-4.099,-3.496],[-3.206,-41.125],[164.025,9.277],[28.043,60.515],[-4.325,21.931],[-23.661,28.603],[-7.136,-2.5],[0,0],[-3.762,4.966],[-4.682,20.212],[-0.103,20.609],[0,0]],"o":[[26.883,7.673],[4.806,3.384],[41.678,35.542],[3.206,41.125],[-63.292,-3.58],[-7.68,-16.574],[5.342,-27.091],[3.827,-4.662],[8.256,3.459],[2.379,2.365],[9.618,-12.5],[4.718,-20.37],[0,0],[1.137,-11.841]],"v":[[5.117,-116.673],[101.582,-70.633],[114.948,-60.32],[177.794,55.318],[-14.015,196.581],[-167.765,111.421],[-171.798,48.66],[-125.294,-35.522],[-101.334,-38.441],[-61.259,20.155],[-47.815,19.682],[-22.718,-43.63],[-16.704,-108.159],[-16.704,-108.159]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.541,"y":0},"t":25,"s":[{"i":[[-3.708,-2.156],[-20.775,-24.628],[-3.599,-5.168],[-2.816,-49.363],[144.064,11.135],[24.631,72.64],[-3.799,26.324],[-20.781,42.299],[-6.267,-3.697],[0,0],[-3.304,7.344],[-5.643,29.176],[-0.091,30.477],[0,0]],"o":[[35.708,20.762],[4.221,5.004],[36.605,52.561],[2.816,49.363],[-55.589,-4.297],[-6.746,-19.893],[4.692,-32.517],[3.361,-6.895],[7.252,5.115],[2.089,3.497],[8.447,-18.486],[5.45,-28.179],[0,0],[0.998,-17.511]],"v":[[4.548,-215.08],[89.272,-146.995],[101.012,-131.742],[150.061,10.751],[-12.256,194.713],[-143.781,86.494],[-148.201,17.163],[-109.991,-95.07],[-92.461,-100.866],[-55.946,-42.309],[-44.138,-43.009],[-22.974,-114.455],[-14.618,-202.489],[-14.618,-202.489]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":34,"s":[{"i":[[-4.008,-1.905],[-22.46,-21.763],[-3.892,-4.568],[-3.044,-43.621],[155.746,9.84],[26.628,64.189],[-4.107,23.262],[-22.466,37.379],[-6.776,-3.267],[0,0],[-3.572,6.49],[-6.1,25.781],[-0.098,26.932],[0,0]],"o":[[38.604,18.347],[4.564,4.422],[39.574,46.447],[3.044,43.621],[-60.098,-3.797],[-7.293,-17.579],[5.073,-28.735],[3.633,-6.093],[7.84,4.52],[2.259,3.091],[9.132,-16.336],[5.892,-24.901],[0,0],[1.079,-15.474]],"v":[[4.881,-166.111],[96.477,-105.946],[109.168,-92.467],[162.195,33.451],[-13.286,196.015],[-155.477,100.384],[-160.256,39.117],[-118.947,-60.061],[-99.995,-65.182],[-60.519,-13.437],[-47.753,-14.055],[-24.873,-77.191],[-15.839,-154.985],[-15.839,-154.985]],"c":true}]},{"t":43,"s":[{"i":[[-3.876,-2.053],[-21.728,-23.414],[-3.77,-4.909],[-2.945,-46.93],[150.67,10.64],[25.745,69.065],[-3.973,25.027],[-21.735,40.214],[-6.555,-3.515],[0,0],[-3.456,6.982],[-5.89,27.74],[-0.095,28.975],[0,0]],"o":[[37.346,19.739],[4.415,4.758],[38.285,49.97],[2.945,46.93],[-58.14,-4.085],[-7.055,-18.913],[4.908,-30.914],[3.515,-6.555],[7.584,4.863],[2.185,3.325],[8.835,-17.575],[5.7,-26.79],[0,0],[1.044,-16.648]],"v":[[4.737,-194.33],[93.348,-129.601],[105.626,-115.1],[156.926,20.37],[-12.839,195.265],[-150.398,92.38],[-155.022,26.466],[-115.058,-80.235],[-96.723,-85.745],[-58.533,-30.075],[-46.184,-30.74],[-24.048,-98.665],[-15.308,-182.36],[-15.308,-182.36]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path-Copy-8","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":25,"st":0,"bm":0}],"markers":[]} \ No newline at end of file +{"v":"5.7.6","fr":60,"ip":0,"op":120,"w":512,"h":512,"nm":"auto_delete_off","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"line","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[247,184,0],"ix":2,"l":2},"a":{"a":0,"k":[-9,-72,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-62.616,-33.827],[43,74]],"o":[[87,47],[-15.412,-26.523]],"v":[[93,127],[189,16]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":24,"s":[0]},{"t":33,"s":[10]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":20,"s":[0]},{"t":24,"s":[10]}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":20,"s":[0]},{"t":33,"s":[338.633]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":28.5,"s":[19]},{"t":33,"s":[0]}],"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":122,"st":2,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"line","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.6,"y":0},"t":15,"s":[266,307.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.19,"y":1},"o":{"x":0.6,"y":0},"t":26,"s":[306,347.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.19,"y":1},"o":{"x":0.167,"y":0},"t":38,"s":[246,287.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.2,"y":1},"o":{"x":0.167,"y":0},"t":52,"s":[286,327.5,0],"to":[0,0,0],"ti":[0,0,0]},{"t":68,"s":[266,307.5,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[1500,1500,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.2,"y":1},"o":{"x":0.6,"y":0},"t":15,"s":[{"i":[[0.322,-0.315],[0,0],[-0.285,-0.279],[0,0],[-0.322,0.315],[0,0],[0.285,0.279],[0,0]],"o":[[0,0],[-0.227,0.313],[0,0],[0.322,0.315],[0,0],[0.227,-0.313],[0,0],[-0.322,-0.315]],"v":[[-9.477,-9.646],[-9.565,-9.545],[-9.477,-8.512],[-9.398,-8.422],[-8.239,-8.422],[-8.151,-8.524],[-8.239,-9.556],[-8.318,-9.646]],"c":true}]},{"t":26,"s":[{"i":[[0.322,-0.315],[0,0],[-0.285,-0.279],[0,0],[-0.322,0.315],[0,0],[0.285,0.279],[0,0]],"o":[[0,0],[-0.227,0.313],[0,0],[0.322,0.315],[0,0],[0.227,-0.313],[0,0],[-0.322,-0.315]],"v":[[-9.477,-9.646],[-9.565,-9.545],[-9.477,-8.512],[9.102,9.678],[10.261,9.678],[10.349,9.576],[10.261,8.544],[-8.318,-9.646]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":15,"op":120,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":3,"nm":"scale","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[256,444,0],"ix":2,"l":2},"a":{"a":0,"k":[115,115,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":14,"s":[90,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":26,"s":[110,90,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[90,105,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":50,"s":[105,95,100]},{"t":64,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"ip":0,"op":122,"st":-46,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"fire 5","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[111.064,127.194,0],"ix":2,"l":2},"a":{"a":0,"k":[-0.9,31.4,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.1,0.1,0.1],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"i":{"x":[0.19,0.19,0.19],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":21.834,"s":[500,500,100]},{"i":{"x":[0.19,0.19,0.19],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":39,"s":[500,500,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":51,"s":[500,500,100]},{"t":70,"s":[500,500,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.5,"y":0},"t":0,"s":[{"i":[[-0.761,-1.046],[0.994,-10.706],[0.143,-0.695],[-0.034,0.073],[-5,10.105],[0,0]],"o":[[10.496,14.432],[-0.069,0.741],[-1.655,8.038],[0.556,-1.193],[0,0],[0.584,-1.18]],"v":[[4.091,-22.793],[20.241,17.589],[19.924,19.744],[-8.767,-1.859],[1.127,-22.541],[1.127,-22.541]],"c":true}]},{"i":{"x":0.4,"y":1},"o":{"x":0.333,"y":0},"t":6.469,"s":[{"i":[[-0.866,1.39],[-6.141,-12.686],[-0.305,-0.919],[0.103,0.179],[6.492,-5.156],[0,0]],"o":[[16.51,-26.505],[0.425,0.878],[3.524,10.617],[-1.675,-2.917],[0,0],[-1.539,-0.642]],"v":[[-22.694,11.893],[18.151,5.485],[19.248,8.184],[-9.909,16.487],[-22.135,15.619],[-22.135,15.619]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.6,"y":0},"t":13.748,"s":[{"i":[[-0.306,-1.481],[-2.015,-14.895],[-0.082,-0.969],[-0.053,0.672],[-3.924,5.099],[0,0]],"o":[[4.223,20.437],[0.139,1.03],[0.944,11.206],[0.867,-10.927],[0,0],[0.895,-1.054]],"v":[[-1.369,-44.454],[12.599,11.903],[12.932,14.904],[-13.18,-3.282],[-4.002,-45.444],[-4.002,-45.444]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":19,"s":[{"i":[[0.206,-1.396],[0.976,-13.008],[0.094,-0.827],[2.065,1.951],[-12.007,2.066],[0,0]],"o":[[-0.39,16.328],[-0.054,0.877],[-3.048,-2.857],[2.172,-8.379],[0,0],[1.183,-0.59]],"v":[[13.491,-32.859],[15.227,14.687],[15.136,16.751],[-9.819,-6.595],[11.247,-34.763],[11.247,-34.763]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20,"s":[{"i":[[0.43,-1.359],[2.278,-12.186],[0.171,-0.765],[2.516,2.466],[-15.527,0.746],[0,0]],"o":[[-2.399,14.539],[-0.138,0.81],[-3.591,-3.515],[2.741,-7.27],[0,0],[1.309,-0.389]],"v":[[19.961,-27.811],[16.121,15.698],[15.821,17.585],[-8.695,-6.519],[17.886,-30.112],[17.886,-30.112]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":21,"s":[{"i":[[0.653,-1.322],[3.581,-11.365],[0.248,-0.703],[2.966,2.981],[-19.047,-0.575],[0,0]],"o":[[-4.407,12.75],[-0.222,0.743],[-4.133,-4.173],[3.309,-6.161],[0,0],[1.434,-0.187]],"v":[[26.431,-22.763],[17.516,17.111],[17.008,18.82],[-7.57,-6.444],[24.525,-25.462],[24.525,-25.462]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":24,"s":[{"i":[[1.051,-1.256],[5.906,-9.897],[0.384,-0.593],[4.042,4.293],[-25.332,-2.933],[0,0]],"o":[[-7.993,9.555],[-0.372,0.624],[-6.374,-7.115],[4.324,-4.18],[0,0],[1.659,0.174]],"v":[[37.984,-13.748],[19.559,19.275],[18.886,20.664],[-5.261,-7.469],[36.38,-17.158],[36.38,-17.158]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":29,"s":[{"i":[[0.825,-0.713],[3.238,-10.544],[0.248,-0.701],[1.468,1.667],[-24.427,-10.705],[0,0]],"o":[[-9.337,5.276],[-0.224,0.729],[-5.649,-6.57],[1.455,-2.286],[0,0],[1.113,0.375]],"v":[[31.547,-12.102],[17.844,16.815],[17.326,18.746],[-5.675,-7.521],[30.97,-14.692],[30.97,-14.692]],"c":true}]},{"i":{"x":0.19,"y":1},"o":{"x":0.167,"y":0.167},"t":32,"s":[{"i":[[-0.609,-0.746],[2.997,-13.949],[1.192,-2.672],[-0.093,0.119],[-4.116,8.604],[0,0]],"o":[[7.708,10.876],[-0.207,0.965],[-6.608,-6.826],[1.515,-1.938],[0,0],[0.415,-0.914]],"v":[[13.783,-31.064],[22.062,11.723],[19.845,20.454],[-6.748,-6.262],[10.657,-31.172],[10.657,-31.172]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0},"t":39,"s":[{"i":[[-1.42,-0.817],[0.509,-14.419],[1.05,-1.666],[-0.018,0.087],[3.974,13.15],[0,0]],"o":[[18.509,10.647],[-0.035,0.997],[-8.253,-7.462],[0.295,-1.419],[0,0],[-0.831,-1.841]],"v":[[-6.301,-32.736],[20.731,10.687],[19.326,18.223],[-8.066,-5.088],[-9.532,-30.798],[-9.532,-30.798]],"c":true}]},{"i":{"x":0.2,"y":1},"o":{"x":0.167,"y":0.167},"t":51,"s":[{"i":[[-0.911,-1.361],[0.717,-13.303],[3.833,-2.596],[-0.049,0.103],[-6.826,12.543],[0,0]],"o":[[11.308,16.892],[-0.062,1.142],[-9.233,-10.058],[0.8,-1.675],[0,0],[0.797,-1.465]],"v":[[10.254,-32.842],[25.362,6.798],[20.373,21.467],[-6.464,-7.314],[6.49,-32.669],[6.49,-32.669]],"c":true}]},{"i":{"x":0.833,"y":1},"o":{"x":0.167,"y":0},"t":70,"s":[{"i":[[-1.448,-0.766],[2.787,-14.122],[2.318,-2.63],[-0.036,0.072],[-0.055,14.28],[0,0]],"o":[[19.982,10.565],[-0.193,0.977],[-9.78,-8.898],[0.589,-1.176],[0,0],[0.006,-1.668]],"v":[[0.699,-31.536],[24.819,11.17],[20.311,20.695],[-6.537,-6.42],[-2.532,-29.598],[-2.532,-29.598]],"c":true}]},{"t":82,"s":[{"i":[[-1.448,-0.766],[2.787,-14.122],[2.318,-2.63],[-0.036,0.072],[-0.055,14.28],[0,0]],"o":[[19.982,10.565],[-0.193,0.977],[-9.417,-9.362],[0.589,-1.176],[0,0],[0.006,-1.668]],"v":[[0.699,-31.536],[24.819,11.17],[20.204,21.024],[-6.998,-5.795],[-2.532,-29.598],[-2.532,-29.598]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path-Copy-8","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":19,"op":168,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"fire 4","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[111.064,127.194,0],"ix":2,"l":2},"a":{"a":0,"k":[-0.9,31.4,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.1,0.1,0.1],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"i":{"x":[0.19,0.19,0.19],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":21.834,"s":[500,500,100]},{"i":{"x":[0.19,0.19,0.19],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":38.922,"s":[500,500,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":50.922,"s":[500,500,100]},{"t":70,"s":[500,500,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.5,"y":0},"t":0,"s":[{"i":[[1.039,-1.888],[11.033,0.783],[-4.047,12.232]],"o":[[-2.976,5.406],[-11.136,-1.466],[0.232,-0.701]],"v":[[18.368,24.062],[-2.139,31.711],[-9.563,0.31]],"c":true}]},{"i":{"x":0.4,"y":1},"o":{"x":0.333,"y":0},"t":6.469,"s":[{"i":[[-0.006,-3.06],[16.205,-0.151],[1.01,4.163]],"o":[[0.017,8.764],[-11.136,-1.466],[-0.058,-0.238]],"v":[[20.309,14.516],[-2.139,31.711],[-9.392,17.693]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.6,"y":0},"t":13.748,"s":[{"i":[[0.23,-2.653],[9.578,0.532],[-0.944,10.35]],"o":[[-0.657,7.598],[-17.974,-0.275],[0.054,-0.593]],"v":[[12.986,20.944],[-1.135,32.44],[-13.419,0.215]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":19,"s":[{"i":[[-5.361,-5.312],[8.98,0.869],[-2.911,11.429]],"o":[[-1.96,6.782],[-15.621,-0.691],[4.053,3.772]],"v":[[13.884,22.354],[-1.484,32.187],[-11.652,-1.532]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":24,"s":[{"i":[[-3.934,-4.403],[7.858,1.503],[-6.607,13.455]],"o":[[-4.406,5.25],[-11.201,-1.474],[1.352,1.819]],"v":[[15.57,25.002],[-2.139,31.711],[-8.63,-2.973]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":29,"s":[{"i":[[-4.107,-4.938],[9.461,1.109],[-5.762,14.258]],"o":[[-3.032,5.712],[-11.136,-1.466],[5.499,6.365]],"v":[[14.778,24.342],[-2.139,31.711],[-8.606,-2.582]],"c":true}]},{"i":{"x":0.19,"y":1},"o":{"x":0.167,"y":0.167},"t":32,"s":[{"i":[[-4.88,-5.436],[10.453,0.903],[-5.367,14.716]],"o":[[-0.63,0.923],[-11.136,-1.466],[7.266,7.198]],"v":[[16.017,24.705],[-2.202,31.711],[-9.054,-0.724]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0},"t":39,"s":[{"i":[[-6.372,-5.321],[11.033,0.783],[-5.137,14.983]],"o":[[-1.555,3.839],[-11.136,-1.466],[6.433,5.258]],"v":[[16.781,23.881],[-2.239,31.711],[-9.702,1.185]],"c":true}]},{"i":{"x":0.2,"y":1},"o":{"x":0.167,"y":0.167},"t":51,"s":[{"i":[[-2.853,-3.312],[12.306,0.873],[-5.137,14.983]],"o":[[-1.279,1.522],[-11.136,-1.466],[5.653,6.125]],"v":[[16.616,25.862],[-2.239,31.711],[-8.722,-1.705]],"c":true}]},{"i":{"x":0.833,"y":1},"o":{"x":0.167,"y":0},"t":70,"s":[{"i":[[-5.832,-5.287],[11.033,0.783],[-5.137,14.983]],"o":[[-2.353,3.633],[-11.136,-1.466],[3.542,3.149]],"v":[[17.402,25.28],[-2.239,31.711],[-9.886,0.741]],"c":true}]},{"t":82,"s":[{"i":[[-5.832,-5.287],[11.033,0.783],[-5.137,14.983]],"o":[[-2.353,3.633],[-11.136,-1.466],[3.542,3.149]],"v":[[17.402,25.28],[-2.239,31.711],[-9.786,-0.159]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path-Copy-8","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":19,"op":168,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"fire 6","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[111.064,127.194,0],"ix":2,"l":2},"a":{"a":0,"k":[-0.9,31.4,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.1,0.1,0.1],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"i":{"x":[0.19,0.19,0.19],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":21.834,"s":[500,500,100]},{"i":{"x":[0.19,0.19,0.19],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":38.922,"s":[500,500,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":50.922,"s":[500,500,100]},{"t":70,"s":[500,500,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.5,"y":0},"t":0,"s":[{"i":[[0.994,-10.706],[0.482,-1.352],[-3.439,12.098],[-0.476,1.213]],"o":[[-0.145,1.562],[-2.389,6.699],[0.38,-1.336],[0.084,-0.167]],"v":[[20.241,17.589],[19.306,21.97],[-10.114,2.103],[-8.826,-1.734]],"c":true}]},{"i":{"x":0.4,"y":1},"o":{"x":0.333,"y":0},"t":6.469,"s":[{"i":[[-6.141,-12.686],[-0.34,-1.987],[0.471,4.325],[0.185,0.383]],"o":[[0.896,1.851],[1.685,9.842],[-0.052,-0.478],[-1.467,-3.038]],"v":[[18.151,5.485],[20.027,11.287],[-9.285,18.319],[-9.627,17.021]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.6,"y":0},"t":13.748,"s":[{"i":[[-2.015,-14.895],[-0.022,-1.892],[-1.187,10.809],[-0.044,0.942]],"o":[[0.294,2.174],[0.109,9.37],[0.131,-1.194],[0.445,-9.468]],"v":[[12.599,11.903],[13.087,18.011],[-13.578,1.776],[-13.299,-1.447]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":19,"s":[{"i":[[-0.557,-12.468],[1.537,-2.628],[-3.311,12.109],[3.029,3.063]],"o":[[0.169,3.775],[-4.238,7.248],[2.643,2.345],[0.27,-4.668]],"v":[[15.33,11.398],[13.494,23.706],[-10.707,-0.695],[-7.837,-4.609]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":20,"s":[{"i":[[1.084,-11.815],[1.384,-2.281],[-3.84,12.413],[2.839,3.063]],"o":[[-0.093,3.183],[-4.339,6.997],[3.398,2.683],[0.228,-3.537]],"v":[[16.554,13.097],[14.051,23.665],[6.423,15.287],[9.64,11.295]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":24,"s":[{"i":[[5.906,-9.897],[0.936,-1.264],[-5.392,13.307],[-0.782,1.333]],"o":[[-0.862,1.444],[-4.635,6.261],[0.596,-1.47],[0.107,-0.212]],"v":[[19.559,19.275],[16.871,23.35],[-9.616,-0.767],[-7.549,-4.985]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":29,"s":[{"i":[[3.238,-10.544],[0.594,-1.398],[-4.854,13.922],[-0.688,1.44]],"o":[[-0.473,1.539],[-2.945,6.923],[0.536,-1.538],[0.107,-0.212]],"v":[[17.844,16.815],[16.26,21.236],[-9.387,-0.505],[-7.549,-4.985]],"c":true}]},{"i":{"x":0.19,"y":1},"o":{"x":0.167,"y":0.167},"t":32,"s":[{"i":[[2.997,-13.949],[0.724,-1.83],[-4.56,14.269],[-0.634,1.501]],"o":[[-0.437,2.036],[-3.588,9.065],[0.504,-1.576],[0.107,-0.212]],"v":[[22.062,11.723],[20.323,17.539],[-9.259,-0.358],[-7.549,-4.985]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0},"t":39,"s":[{"i":[[0.509,-14.419],[0.481,-1.9],[-4.388,14.472],[-0.603,1.537]],"o":[[-0.074,2.104],[-2.381,9.412],[0.485,-1.599],[0.107,-0.212]],"v":[[20.731,10.687],[19.899,16.711],[-9.184,-0.271],[-7.549,-4.985]],"c":true}]},{"i":{"x":0.2,"y":1},"o":{"x":0.167,"y":0.167},"t":51,"s":[{"i":[[0.717,-13.303],[0.648,-2.214],[-4.388,14.472],[-0.603,1.537]],"o":[[-0.13,2.409],[-3.211,10.965],[0.485,-1.599],[0.107,-0.212]],"v":[[25.362,6.798],[24.187,13.756],[-9.184,-0.271],[-7.549,-4.985]],"c":true}]},{"t":70.078125,"s":[{"i":[[2.787,-14.122],[0.81,-1.86],[-4.388,14.472],[-0.603,1.537]],"o":[[-0.407,2.061],[-4.012,9.211],[0.485,-1.599],[0.107,-0.212]],"v":[[24.819,11.17],[22.988,17.069],[-9.184,-0.271],[-7.549,-4.985]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path-Copy-8","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":19,"op":21,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"fire 2","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[111.064,127.194,0],"ix":2,"l":2},"a":{"a":0,"k":[-0.9,31.4,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.1,0.1,0.1],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"i":{"x":[0.19,0.19,0.19],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":21.834,"s":[500,500,100]},{"i":{"x":[0.19,0.19,0.19],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":38.922,"s":[500,500,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":50.922,"s":[500,500,100]},{"t":70,"s":[500,500,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.5,"y":0},"t":0,"s":[{"i":[[-0.761,-1.046],[0.994,-10.706],[14.886,1.056],[-4.787,12.195],[-5.308,10.726],[0,0]],"o":[[10.496,14.432],[-0.864,9.301],[-11.774,-1.55],[0.084,-0.167],[0,0],[0.584,-1.18]],"v":[[4.091,-22.793],[20.241,17.589],[-2.139,31.711],[-8.826,-1.734],[1.127,-22.541],[1.127,-22.541]],"c":true}]},{"i":{"x":0.4,"y":1},"o":{"x":0.333,"y":0},"t":6.469,"s":[{"i":[[-0.866,1.39],[-6.141,-12.686],[21.864,-0.203],[1.859,3.851],[6.891,-5.474],[0,0]],"o":[[16.51,-26.505],[5.335,11.021],[-11.774,-1.55],[-1.467,-3.038],[0,0],[-1.539,-0.642]],"v":[[-22.694,11.893],[18.151,5.485],[-2.139,31.711],[-9.627,17.021],[-22.135,15.619],[-22.135,15.619]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.6,"y":0},"t":13.748,"s":[{"i":[[-0.306,-1.481],[-2.015,-14.895],[12.922,0.717],[-0.445,9.468],[-4.165,5.413],[0,0]],"o":[[4.223,20.437],[1.751,12.94],[-19.003,-0.29],[0.445,-9.468],[0,0],[0.895,-1.054]],"v":[[-1.369,-44.454],[12.599,11.903],[-1.135,32.44],[-13.299,-1.447],[-4.002,-45.444],[-4.002,-45.444]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":24,"s":[{"i":[[1.051,-1.256],[5.906,-9.897],[10.395,1.988],[-7.858,13.398],[-32.545,-3.768],[0,0]],"o":[[-7.993,9.555],[-5.131,8.598],[-11.774,-1.55],[0.107,-0.212],[0,0],[1.659,0.174]],"v":[[37.984,-13.748],[19.559,19.275],[-2.139,31.711],[-7.549,-4.985],[36.38,-17.158],[36.38,-17.158]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":29,"s":[{"i":[[0.825,-0.713],[3.238,-10.544],[12.764,1.496],[-6.911,14.479],[-25.929,-11.363],[0,0]],"o":[[-9.337,5.276],[-2.813,9.16],[-11.774,-1.55],[0.107,-0.212],[0,0],[1.113,0.375]],"v":[[31.547,-12.102],[17.844,16.815],[-2.139,31.711],[-7.549,-4.985],[30.97,-14.692],[30.97,-14.692]],"c":true}]},{"i":{"x":0.19,"y":1},"o":{"x":0.167,"y":0.167},"t":32,"s":[{"i":[[-0.609,-0.746],[2.997,-13.949],[14.103,1.218],[-6.376,15.089],[-4.369,9.133],[0,0]],"o":[[7.708,10.876],[-2.604,12.118],[-11.774,-1.55],[0.107,-0.212],[0,0],[0.415,-0.914]],"v":[[13.783,-31.064],[22.062,11.723],[-2.202,31.711],[-7.549,-4.985],[10.657,-31.172],[10.657,-31.172]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0},"t":39,"s":[{"i":[[-1.42,-0.817],[0.509,-14.419],[14.886,1.056],[-6.064,15.447],[4.219,13.959],[0,0]],"o":[[18.509,10.647],[-0.442,12.526],[-11.774,-1.55],[0.107,-0.212],[0,0],[-0.831,-1.841]],"v":[[-6.301,-32.736],[20.731,10.687],[-2.239,31.711],[-7.549,-4.985],[-9.532,-30.798],[-9.532,-30.798]],"c":true}]},{"i":{"x":0.2,"y":1},"o":{"x":0.167,"y":0.167},"t":51,"s":[{"i":[[-0.911,-1.361],[0.717,-13.303],[16.611,1.178],[-6.064,15.447],[-7.246,13.315],[0,0]],"o":[[11.308,16.892],[-0.773,14.34],[-11.774,-1.55],[0.107,-0.212],[0,0],[0.797,-1.465]],"v":[[10.254,-32.842],[25.362,6.798],[-2.239,31.711],[-7.549,-4.985],[6.49,-32.669],[6.49,-32.669]],"c":true}]},{"t":70.078125,"s":[{"i":[[-1.448,-0.766],[2.787,-14.122],[14.886,1.056],[-6.064,15.447],[-0.058,15.159],[0,0]],"o":[[19.982,10.565],[-2.421,12.269],[-11.774,-1.55],[0.107,-0.212],[0,0],[0.006,-1.668]],"v":[[0.699,-31.536],[24.819,11.17],[-2.239,31.711],[-7.549,-4.985],[-2.532,-29.598],[-2.532,-29.598]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path-Copy-8","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":19,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"fire 3","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[111.234,127.634,0],"ix":2,"l":2},"a":{"a":0,"k":[-0.866,31.488,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.19,0.19,0.19],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":7,"s":[0,0,100]},{"i":{"x":[0.19,0.19,0.19],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":39,"s":[500,500,100]},{"t":51,"s":[500,500,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.4,"y":0},"t":7,"s":[{"i":[[13.218,0.938],[-6,26.42],[-3.69,-12.452]],"o":[[-0.753,-0.053],[0.977,-4.302],[2.594,8.754]],"v":[[-2.139,31.711],[-24.603,1.809],[10.313,16.126]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10.834,"s":[{"i":[[13.218,0.938],[-35.03,6.383],[5.477,-5.198]],"o":[[-14.244,-1.011],[5.704,-1.039],[-3.851,3.655]],"v":[[-2.139,31.711],[2.52,0.258],[22.249,26.31]],"c":true}]},{"i":{"x":0.833,"y":0.783},"o":{"x":0.167,"y":0.167},"t":19,"s":[{"i":[[13.234,0.669],[-6.794,13.523],[-2.337,-11.325]],"o":[[-26.903,-1.35],[1.106,-2.202],[1.643,7.962]],"v":[[-2.139,31.711],[-18.369,-15.973],[12.096,17.355]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.217},"t":19.268,"s":[{"i":[[13.235,0.658],[-0.408,14.272],[-2.656,-11.575]],"o":[[-27.419,-1.364],[0.066,-2.324],[1.867,8.137]],"v":[[-2.139,31.711],[-22.145,-9.83],[11.682,16.99]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20,"s":[{"i":[[13.234,0.681],[-6.1,10.675],[-8.308,-14.188]],"o":[[-26.1,-1.221],[2.904,1.66],[2.753,6.471]],"v":[[-2.139,31.711],[-18.006,-14.058],[14.168,17.331]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":21,"s":[{"i":[[13.232,0.71],[-13.202,19.884],[-15.39,-17.462]],"o":[[-24.448,-1.042],[6.46,6.653],[3.864,4.384]],"v":[[-2.139,31.711],[-16.371,-19.356],[17.285,17.758]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":22,"s":[{"i":[[13.232,0.71],[-9.151,21.357],[-15.39,-17.462]],"o":[[-24.448,-1.042],[6.46,6.653],[3.864,4.384]],"v":[[-2.139,31.711],[-16.371,-19.356],[17.285,17.758]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":23,"s":[{"i":[[12.874,0.69],[-10.071,20.965],[-14.588,-16.517]],"o":[[-23.565,-0.937],[6.259,6.424],[0.663,3.809]],"v":[[-2.139,31.711],[-15.899,-17.857],[17.731,20.223]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":24,"s":[{"i":[[12.515,0.67],[-10.991,20.572],[-13.785,-15.573]],"o":[[-22.682,-0.832],[6.059,6.196],[-2.539,3.234]],"v":[[-2.139,31.711],[-15.427,-16.358],[18.417,22.551]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":25,"s":[{"i":[[12.155,0.65],[-11.916,20.177],[-12.979,-14.624]],"o":[[-21.795,-0.727],[5.858,5.966],[-2.517,3.44]],"v":[[-2.139,31.711],[-14.952,-14.852],[18.638,23.601]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":26,"s":[{"i":[[11.795,0.63],[-12.84,19.783],[-12.173,-13.675]],"o":[[-20.908,-0.621],[5.657,5.736],[-2.496,3.645]],"v":[[-2.139,31.711],[-14.478,-13.346],[17.998,23.476]],"c":true}]},{"i":{"x":0.833,"y":0.783},"o":{"x":0.167,"y":0.167},"t":27,"s":[{"i":[[11.435,0.61],[-13.764,19.388],[-11.367,-12.726]],"o":[[-20.021,-0.516],[5.455,5.506],[-2.475,3.851]],"v":[[-2.139,31.711],[-14.004,-11.84],[17.399,23.462]],"c":true}]},{"i":{"x":0.19,"y":1},"o":{"x":0.167,"y":0.217},"t":32,"s":[{"i":[[9.519,0.502],[-18.685,17.288],[-7.075,-7.674]],"o":[[-15.299,0.046],[4.384,4.282],[-3.778,3.157]],"v":[[-2.139,31.711],[-11.48,-3.823],[16.721,24.565]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0},"t":42,"s":[{"i":[[13.232,0.724],[-9.917,44.265],[-8.096,-7.352]],"o":[[-1.664,-0.091],[9.574,8.525],[2.596,8.724]],"v":[[-2.139,31.711],[-24.066,-12.228],[7.078,15.612]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":46,"s":[{"i":[[13.234,0.667],[-12.713,39.847],[-7.829,-7.622]],"o":[[-2.139,-0.104],[9.41,9.053],[2.285,8.596]],"v":[[-2.139,31.711],[-20.818,-11.969],[7.799,16.356]],"c":true}]},{"i":{"x":0.19,"y":1},"o":{"x":0.167,"y":0.167},"t":51,"s":[{"i":[[13.239,0.573],[-17.334,32.544],[-7.387,-8.067]],"o":[[-2.926,-0.125],[9.137,9.925],[1.771,8.383]],"v":[[-2.139,31.711],[-16.499,-10.182],[8.991,17.585]],"c":true}]},{"t":77,"s":[{"i":[[13.232,0.724],[-19.269,37.656],[-9.531,-8.837]],"o":[[-1.664,-0.091],[5.262,5.36],[2.596,8.724]],"v":[[-2.139,31.711],[-19.912,-10.379],[8.257,16.945]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path-Copy-8","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":19,"op":168,"st":7,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"fire","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[111.234,127.634,0],"ix":2,"l":2},"a":{"a":0,"k":[-0.866,31.488,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.19,0.19,0.19],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":7,"s":[0,0,100]},{"i":{"x":[0.19,0.19,0.19],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":39,"s":[500,500,100]},{"t":51,"s":[500,500,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.4,"y":0},"t":7,"s":[{"i":[[12.757,0.905],[-21.615,40.033],[-0.904,-1.391],[0,0],[-0.398,0.789],[-3.319,-12.644]],"o":[[-0.875,-0.062],[0.797,-1.476],[0,0],[0.491,0.755],[1.571,-5.928],[2.198,8.373]],"v":[[-2.139,31.711],[-18.728,-13.011],[-14.945,-13.165],[-9.555,-4.876],[-7.549,-4.985],[10.568,17.038]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10.834,"s":[{"i":[[12.757,0.906],[-61.742,-0.527],[0.525,-1.574],[0,0],[-0.688,0.008],[5.969,-5.223]],"o":[[-16.563,-1.176],[1.678,0.014],[0,0],[-0.285,0.854],[1.607,1.521],[-3.953,3.459]],"v":[[-2.139,31.711],[23.93,-1.278],[26.407,1.586],[24.435,9.286],[24.616,12.467],[21.833,26.689]],"c":true}]},{"i":{"x":0.833,"y":0.783},"o":{"x":0.167,"y":0.167},"t":19,"s":[{"i":[[12.773,0.646],[-8.145,6.855],[-0.338,-1.229],[-3.724,-7.404],[-0.441,0.674],[-1.947,-11.5]],"o":[[-31.284,-1.57],[1.381,-1.705],[0.4,1.21],[0.439,0.929],[1.576,-4.826],[1.29,7.616]],"v":[[-2.139,31.711],[-14.939,-20.826],[-11.385,-20.211],[-4.526,-2.887],[-2.79,-2.403],[12.252,18.184]],"c":true}]},{"i":{"x":0.833,"y":0.783},"o":{"x":0.167,"y":0.217},"t":19.268,"s":[{"i":[[12.773,0.635],[3.289,11.075],[-1.263,-0.405],[-3.876,-7.706],[-0.431,0.701],[-2.27,-11.756]],"o":[[-31.884,-1.586],[-0.656,-2.207],[1.263,0.405],[0.469,0.932],[1.575,-5.084],[1.503,7.785]],"v":[[-2.139,31.711],[-22.648,-15.721],[-20.052,-18.449],[-5.707,-3.384],[-3.908,-3.009],[11.861,17.838]],"c":true}]},{"i":{"x":0.19,"y":1},"o":{"x":0.167,"y":0.217},"t":32,"s":[{"i":[[12.76,0.854],[-27.415,18.544],[-0.128,-1.543],[-0.193,-1.613],[-1.849,4.374],[-2.755,-12.2]],"o":[[-16.774,0.05],[1.339,-1.042],[0.362,1.709],[0.189,0.907],[1.572,-5.769],[1.825,8.079]],"v":[[-2.139,31.711],[-5.178,-8.775],[-1.873,-7.307],[-2.775,-4.626],[-5.594,-3.655],[11.255,17.524]],"c":true}]},{"i":{"x":0.19,"y":1},"o":{"x":0.167,"y":0},"t":42,"s":[{"i":[[11.698,0.64],[-10.63,44.236],[-1.629,-2.333],[-4.358,-1.163],[-0.398,0.789],[-2.271,-12.936]],"o":[[-1.934,-0.106],[0.392,-1.632],[1.629,2.333],[1.487,0.397],[1.658,-6.257],[1.305,7.434]],"v":[[-2.139,31.711],[-23.959,-12.453],[-20.342,-13.572],[-10.655,-4.576],[-7.549,-4.985],[11.04,18.89]],"c":true}]},{"i":{"x":0.19,"y":1},"o":{"x":0.167,"y":0},"t":57,"s":[{"i":[[12.778,0.536],[-24.892,34.15],[-0.727,-1.491],[0,0],[-0.492,0.735],[-1.986,-12.061]],"o":[[-3.574,-0.15],[0.988,-1.356],[0,0],[0.395,0.809],[2.284,-5.691],[1.315,7.988]],"v":[[-2.139,31.711],[-13.821,-12.789],[-10.047,-12.479],[-5.712,-3.593],[-3.708,-3.456],[12.273,17.285]],"c":true}]},{"t":77,"s":[{"i":[[12.77,0.699],[-21.615,40.033],[-0.904,-1.391],[0,0],[-0.398,0.789],[-3.321,-12.607]],"o":[[-1.934,-0.106],[0.797,-1.476],[0,0],[0.491,0.755],[1.571,-5.928],[2.199,8.349]],"v":[[-2.139,31.711],[-18.728,-13.011],[-14.945,-13.165],[-9.555,-4.876],[-7.549,-4.985],[10.582,16.814]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path-Copy-8","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":7,"op":19,"st":7,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/submodules/TelegramUI/Resources/Animations/anim_autoremove_on.json b/submodules/TelegramUI/Resources/Animations/anim_autoremove_on.json index d23f4737b5..1145a411d1 100644 --- a/submodules/TelegramUI/Resources/Animations/anim_autoremove_on.json +++ b/submodules/TelegramUI/Resources/Animations/anim_autoremove_on.json @@ -1 +1 @@ -{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":64,"w":512,"h":512,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Null 1","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":0,"s":[-3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":14,"s":[-3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":30,"s":[3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":45,"s":[-2]},{"t":59,"s":[0]}],"ix":10},"p":{"a":0,"k":[256,452,0],"ix":2},"a":{"a":0,"k":[50,50,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Fire","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":6,"s":[3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":13,"s":[3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":20,"s":[3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":26,"s":[-3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":32,"s":[3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":38,"s":[-3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":44,"s":[3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":50,"s":[-3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":56,"s":[2]},{"t":63,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":0,"s":[50,107.845,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":8,"s":[50,37.845,0],"to":[0,0,0],"ti":[0,0,0]},{"t":17,"s":[50,49.845,0]}],"ix":2},"a":{"a":0,"k":[0,195.845,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.3,0.3,0.3],"y":[1,1,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":0,"s":[50,0,100]},{"i":{"x":[0.3,0.3,0.3],"y":[1,1,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":8,"s":[95,109,100]},{"i":{"x":[0.7,0.7,0.7],"y":[1,1,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":17,"s":[105,90,100]},{"i":{"x":[0.7,0.7,0.7],"y":[1,1,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":23,"s":[95,105,100]},{"i":{"x":[0.7,0.7,0.7],"y":[1,1,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":29,"s":[105,95,100]},{"i":{"x":[0.7,0.7,0.7],"y":[1,1,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":35,"s":[95,105,100]},{"i":{"x":[0.7,0.7,0.7],"y":[1,1,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":41,"s":[105,95,100]},{"i":{"x":[0.7,0.7,0.7],"y":[1,1,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":47,"s":[95,107,100]},{"i":{"x":[0.7,0.7,0.7],"y":[1,1,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":53,"s":[102,98,100]},{"t":61,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.3,"y":0},"t":0,"s":[{"i":[[-1.108,-1.357],[-5.487,-16.825],[-1.027,-4.504],[0.832,-40.786],[41.122,9.707],[7.03,63.314],[-0.937,22.993],[-4.557,28.938],[-2.515,-1.472],[0,0],[-1.26,6.501],[-3.777,19.921],[-0.454,19.918],[0,0]],"o":[[10.873,13.041],[1.386,3.612],[9.24,41.886],[-1.055,42.363],[-15.865,-3.745],[-1.925,-17.339],[1.031,-25.286],[1.122,-7.752],[2.351,2.556],[0.596,3.048],[3.11,-13.703],[2.781,-18.788],[0,0],[1.35,-12.055]],"v":[[9.663,-126.047],[33.18,-79.161],[39.952,-65.149],[49.69,55.454],[-1.662,196.15],[-42.41,109.493],[-44.091,49.065],[-35.909,-34.623],[-29.614,-45.184],[-16.156,-6.125],[-11.04,-7.692],[-3.394,-55.591],[1.331,-113.755],[2.483,-115.792]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.167,"y":0.167},"t":3,"s":[{"i":[[-3.37,-1.028],[-16.617,-13.287],[-2.988,-3.254],[-0.034,-29.976],[130.072,5.977],[21.692,45.671],[-3.126,16.574],[-12.783,17.224],[-6.298,-1.496],[0,0],[-3.222,4.665],[-7.932,15.736],[-1.142,13.784],[0,0]],"o":[[23.139,7.723],[3.782,2.791],[28.64,31.187],[-0.299,30.722],[-51.377,-2.33],[-5.941,-12.507],[3.671,-18.997],[3.039,-5.16],[6.452,2.315],[1.737,2.199],[8.071,-10.482],[6.364,-14.984],[0,0],[2.422,-9.491]],"v":[[19.532,-40.273],[81.72,-5.356],[96.599,4.574],[140.797,92.055],[-10.208,198.416],[-130.295,134.006],[-134.814,90.416],[-100.338,31.211],[-83.826,24.959],[-48.102,51.436],[-35.671,50.543],[-15.668,12.428],[-2.577,-31.837],[-0.854,-32.801]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":8,"s":[{"i":[[-2.387,-1.696],[-11.724,-23.414],[-2.031,-4.913],[-1.781,-46.93],[95.578,6.076],[15.581,69.06],[-2.403,25.027],[-8.319,15.504],[-3.537,-3.515],[0,0],[-1.865,6.982],[-3.184,27.738],[-0.645,19.158],[0,0]],"o":[[9.592,6.816],[2.382,4.758],[20.657,49.97],[1.781,46.93],[-38.539,-2.45],[-4.267,-18.913],[2.968,-30.914],[1.897,-6.555],[4.092,4.863],[1.179,3.325],[4.767,-17.575],[3.076,-26.79],[0,0],[0.563,-16.648]],"v":[[9.499,-183.78],[47.163,-127.815],[53.788,-113.315],[95.085,20.37],[-8.348,195.265],[-90.79,92.38],[-93.586,26.466],[-62.591,-59.7],[-52.698,-65.21],[-30.956,-30.075],[-24.292,-30.74],[-12.349,-98.665],[-3.949,-172.269],[-3.949,-172.269]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":15,"s":[{"i":[[-3.987,-2.031],[-22.851,-20.685],[-3.8,-4.44],[-3.358,-41.444],[158.458,9.352],[22.243,65.4],[-4.178,22.11],[-22.858,35.527],[-6.894,-3.105],[-8.82,-9.357],[-4.148,3.318],[-7.324,23.604],[-0.1,25.598],[0,0]],"o":[[30.741,15.658],[4.643,4.203],[31.068,36.303],[3.698,45.641],[-61.144,-3.609],[-5.847,-17.191],[5.161,-27.311],[3.697,-5.791],[7.976,4.296],[2.472,2.623],[8.757,-7.37],[7.265,-23.415],[0,0],[1.098,-14.707]],"v":[[10.529,-153.462],[99.29,-80.695],[112.202,-67.885],[166.961,42.049],[-13.492,196.498],[-158.232,109.168],[-163.021,47.375],[-115.361,-74.925],[-96.079,-79.793],[-61.142,-11.415],[-45.144,-11.543],[-26.176,-53.345],[-13.567,-143.837],[-13.567,-143.837]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":21,"s":[{"i":[[-3.67,-2.118],[-20.562,-24.196],[-3.562,-5.077],[-2.787,-48.497],[142.588,10.94],[24.379,71.366],[-3.76,25.863],[-10.653,16.216],[-6.203,-3.632],[0,0],[-3.27,7.216],[-5.585,28.664],[-0.09,29.943],[0,0]],"o":[[35.342,20.398],[4.178,4.917],[36.23,51.639],[2.787,48.497],[-55.02,-4.221],[-6.676,-19.545],[4.644,-31.947],[3.326,-6.774],[9.351,7.886],[2.97,2.211],[8.361,-18.162],[5.394,-27.685],[0,0],[0.988,-17.204]],"v":[[4.506,-207.698],[88.362,-140.806],[99.981,-125.821],[148.528,14.173],[-12.126,194.909],[-142.303,88.588],[-146.679,20.473],[-110.852,-59.221],[-93.501,-64.915],[-58.731,-37.342],[-43.681,-38.644],[-22.734,-108.838],[-14.463,-195.328],[-14.463,-195.328]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":27,"s":[{"i":[[-4.126,-1.956],[-22.851,-23.363],[-3.8,-5.015],[-3.358,-46.81],[158.458,10.563],[22.243,73.867],[-4.178,24.972],[-22.858,40.127],[-6.894,-3.507],[-8.82,-10.568],[-4.148,3.747],[-7.324,26.661],[-0.1,28.912],[0,0]],"o":[[32.496,15.406],[4.643,4.747],[31.068,41.003],[3.698,51.55],[-61.144,-4.076],[-5.847,-19.417],[5.161,-30.847],[3.697,-6.541],[7.976,4.852],[2.472,2.962],[8.757,-8.324],[7.265,-26.446],[0,0],[1.098,-16.611]],"v":[[9.115,-181.312],[99.29,-117.797],[112.202,-103.328],[166.961,20.84],[-13.492,195.288],[-158.232,96.65],[-163.021,26.856],[-115.361,-111.28],[-96.079,-116.778],[-61.142,-39.546],[-45.144,-39.69],[-26.176,-86.905],[-14.981,-170.441],[-14.981,-170.441]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":33,"s":[{"i":[[-3.67,-2.118],[-20.562,-24.196],[-3.562,-5.077],[-2.787,-48.497],[142.588,10.94],[24.379,71.366],[-3.76,25.863],[-10.653,16.216],[-6.203,-3.632],[0,0],[-3.27,7.216],[-5.585,28.664],[-0.09,29.943],[0,0]],"o":[[35.342,20.398],[4.178,4.917],[36.23,51.639],[2.787,48.497],[-55.02,-4.221],[-6.676,-19.545],[4.644,-31.947],[3.326,-6.774],[9.351,7.886],[2.97,2.211],[8.361,-18.162],[5.394,-27.685],[0,0],[0.988,-17.204]],"v":[[4.506,-207.698],[88.362,-140.806],[99.981,-125.821],[148.528,14.173],[-12.126,194.909],[-142.303,88.588],[-146.679,20.473],[-110.852,-59.221],[-93.501,-64.915],[-58.731,-37.342],[-43.681,-38.644],[-22.734,-108.838],[-14.463,-195.328],[-14.463,-195.328]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":39,"s":[{"i":[[-4.126,-1.956],[-22.851,-23.363],[-3.8,-5.015],[-3.358,-46.81],[158.458,10.563],[22.243,73.867],[-4.178,24.972],[-22.858,40.127],[-6.894,-3.507],[-8.82,-10.568],[-4.148,3.747],[-7.324,26.661],[-0.1,28.912],[0,0]],"o":[[32.496,15.406],[4.643,4.747],[31.068,41.003],[3.698,51.55],[-61.144,-4.076],[-5.847,-19.417],[5.161,-30.847],[3.697,-6.541],[7.976,4.852],[2.472,2.962],[8.757,-8.324],[7.265,-26.446],[0,0],[1.098,-16.611]],"v":[[9.115,-181.312],[99.29,-117.797],[112.202,-103.328],[166.961,20.84],[-13.492,195.288],[-158.232,96.65],[-163.021,26.856],[-115.361,-111.28],[-96.079,-116.778],[-61.142,-39.546],[-45.144,-39.69],[-26.176,-86.905],[-14.981,-170.441],[-14.981,-170.441]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":45,"s":[{"i":[[-3.876,-2.053],[-21.728,-23.414],[-3.77,-4.909],[-2.945,-46.93],[150.67,10.64],[25.745,69.065],[-3.973,25.027],[-11.257,15.692],[-6.555,-3.515],[0,0],[-3.456,6.982],[-5.89,27.74],[-0.095,28.975],[0,0]],"o":[[37.346,19.739],[4.415,4.758],[38.285,49.97],[2.945,46.93],[-58.14,-4.085],[-7.055,-18.913],[4.908,-30.914],[3.515,-6.555],[9.881,7.631],[3.139,2.139],[8.835,-17.575],[5.7,-26.79],[0,0],[1.044,-16.648]],"v":[[4.737,-194.33],[93.348,-129.601],[105.626,-115.1],[156.926,20.37],[-12.839,195.265],[-150.398,92.38],[-155.022,26.466],[-117.164,-50.652],[-98.829,-56.162],[-62.086,-29.48],[-46.184,-30.74],[-24.048,-98.665],[-15.308,-182.36],[-15.308,-182.36]],"c":true}]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":51,"s":[{"i":[[-4.441,-1.817],[-24.598,-21.698],[-4.09,-4.658],[-3.615,-43.474],[170.569,9.811],[23.943,68.603],[-4.498,23.193],[-24.605,37.267],[-7.421,-3.257],[-9.494,-9.815],[-4.465,3.48],[-7.884,24.761],[-0.108,26.852],[0,0]],"o":[[34.979,14.309],[4.998,4.409],[33.443,38.081],[3.981,47.877],[-65.817,-3.786],[-6.294,-18.033],[5.556,-28.649],[3.979,-6.075],[8.586,4.506],[2.661,2.751],[9.426,-7.731],[7.821,-24.562],[0,0],[1.182,-15.428]],"v":[[9.679,-153.722],[106.746,-94.733],[120.646,-81.295],[179.59,34.024],[-14.655,196.04],[-170.458,104.432],[-175.613,39.611],[-124.31,-88.681],[-103.554,-93.787],[-65.948,-22.058],[-48.727,-22.193],[-28.309,-66.043],[-16.258,-143.626],[-16.258,-143.626]],"c":true}]},{"t":59,"s":[{"i":[[-3.876,-2.053],[-21.728,-23.414],[-3.77,-4.909],[-2.945,-46.93],[150.67,10.64],[25.745,69.065],[-3.973,25.027],[-21.735,40.214],[-6.555,-3.515],[0,0],[-3.456,6.982],[-5.89,27.74],[-0.095,28.975],[0,0]],"o":[[37.346,19.739],[4.415,4.758],[38.285,49.97],[2.945,46.93],[-58.14,-4.085],[-7.055,-18.913],[4.908,-30.914],[3.515,-6.555],[7.584,4.863],[2.185,3.325],[8.835,-17.575],[5.7,-26.79],[0,0],[1.044,-16.648]],"v":[[4.737,-194.33],[93.348,-129.601],[105.626,-115.1],[156.926,20.37],[-12.839,195.265],[-150.398,92.38],[-155.022,26.466],[-115.058,-80.235],[-96.723,-85.745],[-58.533,-30.075],[-46.184,-30.74],[-24.048,-98.665],[-15.308,-182.36],[-15.308,-182.36]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path-Copy-8","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0}],"markers":[]} \ No newline at end of file +{"v":"5.7.6","fr":60,"ip":0,"op":120,"w":512,"h":512,"nm":"fire","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"line","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[247,184,0],"ix":2,"l":2},"a":{"a":0,"k":[-9,-72,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[50.643,50.002],[33,72]],"o":[[-79,-78],[-12.781,-27.886]],"v":[[33,-33],[-3,-242]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":43,"s":[0]},{"t":61,"s":[10]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":35,"s":[0]},{"t":43,"s":[10]}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":35,"s":[0]},{"t":61,"s":[338.633]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":52,"s":[19]},{"t":61,"s":[0]}],"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":2,"op":122,"st":2,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"line","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[247,184,0],"ix":2,"l":2},"a":{"a":0,"k":[-9,-72,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[50.701,49.944],[64,153]],"o":[[-67,-66],[-11.838,-28.3]],"v":[[-61,37],[-65,-232]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":39,"s":[0]},{"t":49,"s":[4]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":23,"s":[0]},{"t":31,"s":[4]}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":23,"s":[0]},{"t":49,"s":[338.633]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":40,"s":[19]},{"t":49,"s":[0]}],"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":-10,"op":110,"st":-10,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"line","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[247,184,0],"ix":2,"l":2},"a":{"a":0,"k":[-9,-72,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[66.749,24.688],[-52,95],[-10,91.5]],"o":[[-73,-27],[54.341,-99.277],[3.333,-30.494]],"v":[[-47,182],[-108,-23],[-135,-241.5]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":56.455,"s":[0]},{"t":81,"s":[4]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":45,"s":[0]},{"t":55.63671875,"s":[4]}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":45,"s":[0]},{"t":81,"s":[320.633]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":73.637,"s":[19]},{"t":81,"s":[0]}],"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":71.182,"s":[19]},{"t":78.544921875,"s":[0]}],"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":25,"op":145,"st":25,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"line","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":17,"ix":10},"p":{"a":0,"k":[323,197,0],"ix":2,"l":2},"a":{"a":0,"k":[-9,-72,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-64.572,29.924],[-29,69],[-4,77]],"o":[[123,-57],[61.908,-147.297],[1.591,-30.634]],"v":[[-3.889,181.364],[53,-23],[-23,-232]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":17,"s":[0]},{"t":38,"s":[10]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":7,"s":[0]},{"t":16.5390625,"s":[10]}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":7,"s":[0]},{"t":38,"s":[317.538]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":29,"s":[19]},{"t":38,"s":[0]}],"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":120,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":3,"nm":"NULL","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[256,444,0],"ix":2,"l":2},"a":{"a":0,"k":[115,115,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":14,"s":[94,107,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":26,"s":[106,94,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":37,"s":[94,106,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":48,"s":[106,94,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":59,"s":[94,106,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":72,"s":[106,94,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.6,0.6,0.6],"y":[0,0,0]},"t":87,"s":[97,103,100]},{"t":113,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"ip":0,"op":120,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"fire 2","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[111.064,127.194,0],"ix":2,"l":2},"a":{"a":0,"k":[-0.9,31.4,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.1,0.1,0.1],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":27,"s":[500,500,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":37,"s":[520,470,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":46,"s":[480,520,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":54,"s":[520,470,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":63,"s":[480,520,100]},{"i":{"x":[0.42,0.42,0.42],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":74,"s":[520,470,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.6,0.6,0.6],"y":[0,0,0]},"t":87,"s":[480,520,100]},{"t":113,"s":[500,500,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.5,"y":0},"t":0,"s":[{"i":[[-0.761,-1.046],[32.02,2.271],[-4.787,12.195],[-5.308,10.726],[0,0]],"o":[[19.614,26.969],[-11.774,-1.55],[0.084,-0.167],[0,0],[0.584,-1.18]],"v":[[4.091,-22.793],[-2.139,31.711],[-8.826,-1.734],[1.127,-22.541],[1.127,-22.541]],"c":true}]},{"i":{"x":0.4,"y":1},"o":{"x":0.333,"y":0},"t":8,"s":[{"i":[[-0.866,1.39],[47.031,-0.437],[1.859,3.851],[6.891,-5.474],[0,0]],"o":[[30.854,-49.531],[-11.774,-1.55],[-1.467,-3.038],[0,0],[-1.539,-0.642]],"v":[[-22.694,11.893],[-2.139,31.711],[-9.627,17.021],[-22.135,15.619],[-22.135,15.619]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.6,"y":0},"t":17,"s":[{"i":[[-0.306,-1.481],[27.797,1.543],[-0.445,9.468],[-4.165,5.413],[0,0]],"o":[[7.892,38.192],[-19.003,-0.29],[0.445,-9.468],[0,0],[0.895,-1.054]],"v":[[-1.369,-44.454],[-1.135,32.44],[-13.299,-1.447],[-4.002,-45.444],[-4.002,-45.444]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":30,"s":[{"i":[[-0.452,-1.574],[32.02,2.271],[-7.858,13.398],[-14.357,12.607],[0,0]],"o":[[12.003,41.837],[-11.774,-1.55],[0.107,-0.212],[0,0],[1.202,-1.156]],"v":[[17.084,-31.876],[-2.139,31.711],[-7.549,-4.985],[13.444,-32.846],[13.444,-32.846]],"c":true}]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":37.098,"s":[{"i":[[-1.37,-0.898],[32.02,2.271],[-6.064,15.447],[1.081,21.339],[0,0]],"o":[[36.401,23.861],[-11.774,-1.55],[0.107,-0.212],[0,0],[0.156,-1.66]],"v":[[-0.802,-32.019],[-2.139,31.711],[-7.549,-4.985],[-4.194,-30.378],[-4.194,-30.378]],"c":true}]},{"i":{"x":0.833,"y":1},"o":{"x":0.167,"y":0},"t":46,"s":[{"i":[[-1.448,-0.766],[32.02,2.271],[-6.064,15.447],[-0.058,15.159],[0,0]],"o":[[37.342,19.743],[-11.774,-1.55],[0.107,-0.212],[0,0],[0.006,-1.668]],"v":[[0.074,-36.536],[-2.139,31.711],[-7.549,-4.985],[-3.157,-34.598],[-3.157,-34.598]],"c":true}]},{"i":{"x":0.833,"y":1},"o":{"x":0.167,"y":0},"t":54,"s":[{"i":[[-1.134,-1.137],[32.02,2.064],[-6.064,14.034],[-2.573,13.53],[0,0]],"o":[[27.769,27.845],[-11.774,-1.408],[0.107,-0.192],[0,0],[0.283,-1.488]],"v":[[4.098,-27.621],[-2.139,31.919],[-7.549,-1.421],[0.6,-26.48],[0.6,-26.48]],"c":true}]},{"i":{"x":0.833,"y":1},"o":{"x":0.167,"y":0},"t":63,"s":[{"i":[[-1.166,-1.215],[32.02,2.248],[-6.064,15.288],[-0.428,23.268],[0,0]],"o":[[30.336,31.612],[-11.774,-1.534],[0.107,-0.21],[0,0],[0.192,-1.635]],"v":[[3.435,-35.532],[-2.139,31.734],[-7.549,-4.586],[0.011,-34.096],[0.011,-34.096]],"c":true}]},{"i":{"x":0.42,"y":1},"o":{"x":0.167,"y":0},"t":74,"s":[{"i":[[-1.319,-1.087],[32.958,4.121],[-6.064,14.034],[-4.913,19.918],[0,0]],"o":[[33.294,27.424],[-11.774,-1.408],[0.107,-0.192],[0,0],[0.316,-1.485]],"v":[[4.063,-31.81],[-2.139,31.919],[-10.818,-2.272],[0.154,-30.672],[0.154,-30.672]],"c":true}]},{"i":{"x":0.2,"y":1},"o":{"x":0.6,"y":0},"t":87,"s":[{"i":[[-1.224,-1.612],[32.02,2.064],[-6.064,14.034],[-1.545,26.796],[0,0]],"o":[[25.844,34.046],[-11.774,-1.408],[0.107,-0.192],[0,0],[0.769,-1.584]],"v":[[6.198,-36.773],[-2.139,31.919],[-10.674,-1.998],[1.23,-36.583],[1.23,-36.583]],"c":true}]},{"t":113,"s":[{"i":[[-1.448,-0.766],[32.02,2.271],[-6.064,15.447],[-0.058,15.159],[0,0]],"o":[[37.342,19.743],[-11.774,-1.55],[0.107,-0.212],[0,0],[0.006,-1.668]],"v":[[0.699,-31.536],[-2.239,31.711],[-7.549,-4.985],[-2.532,-29.598],[-2.532,-29.598]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path-Copy-8","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":120,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"fire","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[111.234,127.634,0],"ix":2,"l":2},"a":{"a":0,"k":[-0.866,31.488,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":7,"s":[0,0,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":37,"s":[500,500,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":46,"s":[480,520,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":54,"s":[520,470,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":63,"s":[480,520,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":74,"s":[520,470,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.6,0.6,0.6],"y":[0,0,0]},"t":87,"s":[480,520,100]},{"t":113,"s":[500,500,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.4,"y":0},"t":7,"s":[{"i":[[32.02,2.271],[-21.615,40.033],[-0.904,-1.391],[0,0],[-0.398,0.789]],"o":[[-0.875,-0.062],[0.797,-1.476],[0,0],[0.491,0.755],[2.611,-9.853]],"v":[[-2.139,31.711],[-18.728,-13.011],[-14.945,-13.165],[-9.555,-4.876],[-7.549,-4.985]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[32.02,2.273],[-61.742,-0.527],[0.525,-1.574],[0,0],[-0.688,0.008]],"o":[[-16.563,-1.176],[1.678,0.014],[0,0],[-0.285,0.854],[2.672,2.528]],"v":[[-2.139,31.711],[23.93,-1.278],[26.407,1.586],[24.435,9.286],[24.616,12.467]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":23,"s":[{"i":[[32.061,1.595],[3.289,11.075],[-1.263,-0.405],[-3.876,-7.706],[-0.431,0.701]],"o":[[-31.884,-1.586],[-0.656,-2.207],[1.263,0.405],[0.469,0.932],[2.618,-8.452]],"v":[[-2.139,31.711],[-22.648,-15.721],[-20.052,-18.449],[-5.707,-3.384],[-3.908,-3.009]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":33,"s":[{"i":[[32.028,2.144],[-19.471,26.765],[-0.646,-1.407],[-0.73,-1.451],[-1.849,4.374]],"o":[[-16.774,0.05],[0.905,-1.436],[0.922,1.484],[0.487,0.788],[2.613,-9.589]],"v":[[-2.139,31.711],[-12.042,-11.204],[-8.434,-10.947],[-8.83,-4.595],[-3.963,-6.813]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":37,"s":[{"i":[[32.041,-1.091],[-15.807,34.842],[-0.61,-1.822],[-0.38,-1.08],[-1.723,5.566]],"o":[[-9.421,0.37],[0.772,-1.751],[0.665,1.837],[0.331,0.947],[2.612,-9.8]],"v":[[-2.139,31.711],[-17.464,-13.847],[-12.973,-13.918],[-10.608,-4.979],[-5.562,-6.855]],"c":true}]},{"i":{"x":0.2,"y":1},"o":{"x":0.167,"y":0.167},"t":39,"s":[{"i":[[32.043,-1.705],[-15.112,36.374],[-0.603,-1.901],[-0.314,-1.01],[-1.698,5.791]],"o":[[-8.027,0.43],[0.747,-1.811],[0.616,1.904],[0.302,0.977],[2.611,-9.84]],"v":[[-2.139,31.711],[-18.492,-14.348],[-13.834,-14.482],[-10.945,-5.052],[-5.83,-6.964]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0},"t":42,"s":[{"i":[[32.044,-1.904],[-14.886,36.872],[-0.601,-1.926],[-0.292,-0.987],[-2.304,5.12]],"o":[[-7.574,0.45],[0.739,-1.83],[0.601,1.926],[0.292,0.987],[2.611,-9.853]],"v":[[-2.139,31.711],[-18.827,-14.511],[-14.113,-14.665],[-11.055,-5.076],[-5.9,-6.895]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":50,"s":[{"i":[[32.04,-1.109],[-16.407,38.867],[-0.752,-1.922],[-0.075,-1.24],[-1.302,3.966]],"o":[[-10.374,0.85],[0.652,-1.545],[0.752,1.922],[0.111,1.832],[3.038,-9.516]],"v":[[-2.139,31.711],[-13.906,-19.506],[-10.215,-18.661],[-9.195,-6.436],[-5.603,-7.16]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":54,"s":[{"i":[[32.037,-0.726],[-17.668,39.074],[-0.82,-1.686],[-0.042,-0.689],[-1.684,4.048]],"o":[[-7.948,0.582],[0.689,-1.528],[0.418,1.068],[0.28,1.353],[3.244,-9.353]],"v":[[-2.139,31.711],[-15.15,-17.738],[-11.418,-17.337],[-9.022,-7.187],[-4.581,-7.842]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":59,"s":[{"i":[[32.035,-0.247],[-19.244,39.333],[-0.904,-1.391],[0,0],[-1.489,3.795]],"o":[[-4.915,0.247],[0.735,-1.507],[0,0],[0.491,0.755],[3.501,-9.15]],"v":[[-2.139,31.711],[-16.706,-15.528],[-12.923,-15.682],[-8.805,-8.126],[-4.426,-8.823]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":63,"s":[{"i":[[32.032,0.21],[-17.554,40.788],[-0.904,-1.391],[-0.294,-2.115],[-1.245,2.93]],"o":[[-4.181,0.191],[0.663,-1.537],[0,0],[0.443,1.423],[3.474,-8.986]],"v":[[-2.139,31.711],[-16.856,-16.926],[-13.072,-17.08],[-9.784,-7.805],[-5.126,-7.781]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":70,"s":[{"i":[[32.027,1.011],[-14.596,43.333],[-0.904,-1.391],[-0.808,-5.817],[-1.152,2.348]],"o":[[-2.897,0.092],[0.535,-1.589],[0,0],[0.36,2.592],[3.412,-7.867]],"v":[[-2.139,31.711],[-17.117,-19.372],[-13.333,-19.526],[-11.497,-7.244],[-7.585,-6.231]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":74,"s":[{"i":[[32.026,1.288],[-14.819,42.366],[-0.904,-1.391],[-0.583,-4.09],[-1.308,2.399]],"o":[[-3.787,0.356],[0.701,-1.977],[0,0],[0.381,2.023],[3.805,-8.038]],"v":[[-2.048,31.88],[-17.745,-16.901],[-13.701,-17.084],[-11.232,-6.771],[-8.213,-6.371]],"c":true}]},{"i":{"x":0.2,"y":1},"o":{"x":0.6,"y":0},"t":83,"s":[{"i":[[32.022,1.912],[-15.321,40.188],[-0.904,-1.391],[-0.076,-0.203],[-1.66,2.511]],"o":[[-1.451,-0.018],[1.072,-2.848],[0,0],[0.427,0.743],[4.689,-8.424]],"v":[[-2.139,31.711],[-19.158,-11.341],[-14.527,-11.589],[-10.635,-5.707],[-6.383,-6.319]],"c":true}]},{"t":109,"s":[{"i":[[32.053,1.754],[-21.615,40.033],[-0.904,-1.391],[0,0],[-0.398,0.789]],"o":[[-1.934,-0.106],[0.797,-1.476],[0,0],[0.491,0.755],[2.611,-9.853]],"v":[[-2.139,31.711],[-18.728,-13.011],[-14.945,-13.165],[-9.555,-4.876],[-7.549,-4.985]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Path-Copy-8","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":7,"op":127,"st":7,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift index 7d5741d4cd..ab90ea334f 100644 --- a/submodules/TelegramUI/Sources/ChatController.swift +++ b/submodules/TelegramUI/Sources/ChatController.swift @@ -5566,8 +5566,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G canSetupAutoremoveTimeout = true } } - } else if let _ = peer as? TelegramUser { - canSetupAutoremoveTimeout = true + } else if let user = peer as? TelegramUser { + if user.id != strongSelf.context.account.peerId { + canSetupAutoremoveTimeout = true + } } else if let channel = peer as? TelegramChannel { if channel.hasPermission(.deleteAllMessages) { canSetupAutoremoveTimeout = true @@ -7746,8 +7748,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G canSetupAutoremoveTimeout = true } } - } else if let _ = self.presentationInterfaceState.renderedPeer?.peer as? TelegramUser { - canSetupAutoremoveTimeout = true + } else if let user = self.presentationInterfaceState.renderedPeer?.peer as? TelegramUser { + if user.id != self.context.account.peerId { + canSetupAutoremoveTimeout = true + } } else if let channel = self.presentationInterfaceState.renderedPeer?.peer as? TelegramChannel { if channel.hasPermission(.deleteAllMessages) { canSetupAutoremoveTimeout = true diff --git a/submodules/TelegramUI/Sources/ChatInterfaceInputContexts.swift b/submodules/TelegramUI/Sources/ChatInterfaceInputContexts.swift index c651663a7b..7dce1cf7ec 100644 --- a/submodules/TelegramUI/Sources/ChatInterfaceInputContexts.swift +++ b/submodules/TelegramUI/Sources/ChatInterfaceInputContexts.swift @@ -256,7 +256,7 @@ func inputTextPanelStateForChatPresentationInterfaceState(_ chatPresentationInte if canSetupAutoremoveTimeout { if case .scheduledMessages = chatPresentationInterfaceState.subject { - } else { + } else if chatPresentationInterfaceState.renderedPeer?.peerId != context.account.peerId { if currentAutoremoveTimeout != nil || chatPresentationInterfaceState.renderedPeer?.peer is TelegramSecretChat { accessoryItems.append(.messageAutoremoveTimeout(currentAutoremoveTimeout)) } @@ -283,7 +283,7 @@ func inputTextPanelStateForChatPresentationInterfaceState(_ chatPresentationInte } if !extendedSearchLayout { if case .scheduledMessages = chatPresentationInterfaceState.subject { - } else { + } else if chatPresentationInterfaceState.renderedPeer?.peerId != context.account.peerId { if let peer = chatPresentationInterfaceState.renderedPeer?.peer as? TelegramSecretChat { accessoryItems.append(.messageAutoremoveTimeout(peer.messageAutoremoveTimeout)) } else if currentAutoremoveTimeout != nil && chatPresentationInterfaceState.interfaceState.composeInputState.inputText.length == 0 { diff --git a/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift index 58b20eda9e..dc422e1d35 100644 --- a/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift +++ b/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift @@ -1250,7 +1250,7 @@ final class ChatDeleteMessageContextItem: ContextMenuCustomItem { private let textFont = Font.regular(17.0) -private final class ChatDeleteMessageContextItemNode: ASDisplayNode, ContextMenuCustomNode { +private final class ChatDeleteMessageContextItemNode: ASDisplayNode, ContextMenuCustomNode, ContextActionNodeProtocol { private let item: ChatDeleteMessageContextItem private let presentationData: PresentationData private let getController: () -> ContextController? diff --git a/submodules/TelegramUI/Sources/WidgetDataContext.swift b/submodules/TelegramUI/Sources/WidgetDataContext.swift index d8d15d21ab..83b81dfe5f 100644 --- a/submodules/TelegramUI/Sources/WidgetDataContext.swift +++ b/submodules/TelegramUI/Sources/WidgetDataContext.swift @@ -152,43 +152,8 @@ final class WidgetDataContext { } let processedRecent = recent - |> map { result -> WidgetData in - switch result { - case .disabled: - return WidgetData(accountId: account.id.int64, content: .empty, unlockedForLockId: nil) - case let .peers(peers, unread, messages): - return WidgetData(accountId: account.id.int64, content: .peers(WidgetDataPeers(accountPeerId: account.peerId.toInt64(), peers: peers.compactMap { peer -> WidgetDataPeer? in - var name: String = "" - var lastName: String? - - if let user = peer as? TelegramUser { - if let firstName = user.firstName { - name = firstName - lastName = user.lastName - } else if let lastName = user.lastName { - name = lastName - } else if let phone = user.phone, !phone.isEmpty { - name = phone - } - } else { - name = peer.debugDisplayTitle - } - - var badge: WidgetDataPeer.Badge? - if let unreadValue = unread[peer.id], unreadValue.count > 0 { - badge = WidgetDataPeer.Badge( - count: Int(unreadValue.count), - isMuted: unreadValue.isMuted - ) - } - - let message = messages[peer.id] - - return WidgetDataPeer(id: peer.id.toInt64(), name: name, lastName: lastName, letters: peer.displayLetters, avatarPath: smallestImageRepresentation(peer.profileImageRepresentations).flatMap { representation in - return account.postbox.mediaBox.resourcePath(representation.resource) - }, badge: badge, message: message) - }, updateTimestamp: Int32(Date().timeIntervalSince1970))), unlockedForLockId: nil) - } + |> map { _ -> WidgetData in + return WidgetData(accountId: account.id.int64, content: .peers(WidgetDataPeers(accountPeerId: account.peerId.toInt64(), peers: [], updateTimestamp: Int32(Date().timeIntervalSince1970))), unlockedForLockId: nil) } |> distinctUntilChanged diff --git a/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift b/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift index 7ce7123882..ca0fb96818 100644 --- a/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift +++ b/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift @@ -147,7 +147,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode { } self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(14.0), textColor: .white) displayUndo = false - self.originalRemainingSeconds = 3 + self.originalRemainingSeconds = 5 case let .succeed(text): self.avatarNode = nil self.iconNode = nil