Various Improvements

This commit is contained in:
Ilya Laktyushin 2021-12-23 16:53:22 +04:00
parent 7c7626f6cc
commit 7d218f4812
18 changed files with 804 additions and 2916 deletions

View File

@ -1061,7 +1061,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
} }
} }
let messageString: NSAttributedString let messageString: NSAttributedString
if !message.text.isEmpty { if !message.text.isEmpty && entities.count > 0 {
messageString = stringWithAppliedEntities(message.text, entities: entities, baseColor: theme.messageTextColor, linkColor: theme.messageTextColor, baseFont: textFont, linkFont: textFont, boldFont: textFont, italicFont: textFont, boldItalicFont: textFont, fixedFont: textFont, blockQuoteFont: textFont, underlineLinks: false) messageString = stringWithAppliedEntities(message.text, entities: entities, baseColor: theme.messageTextColor, linkColor: theme.messageTextColor, baseFont: textFont, linkFont: textFont, boldFont: textFont, italicFont: textFont, boldItalicFont: textFont, fixedFont: textFont, blockQuoteFont: textFont, underlineLinks: false)
} else { } else {
messageString = NSAttributedString(string: messageText, font: textFont, textColor: theme.messageTextColor) messageString = NSAttributedString(string: messageText, font: textFont, textColor: theme.messageTextColor)

View File

@ -71,12 +71,9 @@ final class ContactsControllerNode: ASDisplayNode {
var addNearbyImpl: (() -> Void)? var addNearbyImpl: (() -> Void)?
var inviteImpl: (() -> Void)? var inviteImpl: (() -> Void)?
var qrScanImpl: (() -> Void)?
let options = [ContactListAdditionalOption(title: presentationData.strings.Contacts_AddPeopleNearby, icon: .generic(UIImage(bundleImageName: "Contact List/PeopleNearbyIcon")!), action: { let options = [ContactListAdditionalOption(title: presentationData.strings.Contacts_AddPeopleNearby, icon: .generic(UIImage(bundleImageName: "Contact List/PeopleNearbyIcon")!), action: {
addNearbyImpl?() addNearbyImpl?()
}), ContactListAdditionalOption(title: presentationData.strings.Contacts_ScanQrCode, icon: .generic(UIImage(bundleImageName: "Settings/QrIcon")!), action: {
qrScanImpl?()
}), ContactListAdditionalOption(title: presentationData.strings.Contacts_InviteFriends, icon: .generic(UIImage(bundleImageName: "Contact List/AddMemberIcon")!), action: { }), ContactListAdditionalOption(title: presentationData.strings.Contacts_InviteFriends, icon: .generic(UIImage(bundleImageName: "Contact List/AddMemberIcon")!), action: {
inviteImpl?() inviteImpl?()
})] })]
@ -133,12 +130,6 @@ final class ContactsControllerNode: ASDisplayNode {
} }
} }
qrScanImpl = { [weak self] in
if let strongSelf = self {
strongSelf.openQrScan?()
}
}
contextAction = { [weak self] peer, node, gesture in contextAction = { [weak self] peer, node, gesture in
self?.contextAction(peer: peer, node: node, gesture: gesture) self?.contextAction(peer: peer, node: node, gesture: gesture)
} }

View File

@ -14,6 +14,7 @@ swift_library(
"//submodules/Display:Display", "//submodules/Display:Display",
"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit", "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
"//submodules/AppBundle:AppBundle", "//submodules/AppBundle:AppBundle",
"//submodules/LegacyComponents:LegacyComponents",
], ],
visibility = [ visibility = [
"//visibility:public", "//visibility:public",

View File

@ -5,6 +5,7 @@ import SwiftSignalKit
import AsyncDisplayKit import AsyncDisplayKit
import Display import Display
import AppBundle import AppBundle
import LegacyComponents
private func createEmitterBehavior(type: String) -> NSObject { private func createEmitterBehavior(type: String) -> NSObject {
let selector = ["behaviorWith", "Type:"].joined(separator: "") let selector = ["behaviorWith", "Type:"].joined(separator: "")
@ -14,8 +15,8 @@ private func createEmitterBehavior(type: String) -> NSObject {
return castedBehaviorWithType(behaviorClass, NSSelectorFromString(selector), type) return castedBehaviorWithType(behaviorClass, NSSelectorFromString(selector), type)
} }
private let textMaskImage: UIImage = { private func generateTextMaskImage(size: CGSize, position: CGPoint) -> UIImage? {
return generateImage(CGSize(width: 60.0, height: 60.0), rotatedContext: { size, context in return generateImage(size, rotatedContext: { size, context in
let bounds = CGRect(origin: CGPoint(), size: size) let bounds = CGRect(origin: CGPoint(), size: size)
context.clear(bounds) context.clear(bounds)
@ -24,13 +25,13 @@ private let textMaskImage: UIImage = {
let colorSpace = CGColorSpaceCreateDeviceRGB() let colorSpace = CGColorSpaceCreateDeviceRGB()
let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)! let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
let center = CGPoint(x: size.width / 2.0, y: size.height / 2.0) let center = position
context.drawRadialGradient(gradient, startCenter: center, startRadius: 0.0, endCenter: center, endRadius: size.width / 2.0, options: .drawsAfterEndLocation) context.drawRadialGradient(gradient, startCenter: center, startRadius: 0.0, endCenter: center, endRadius: min(10.0, min(size.width, size.height) * 0.4), options: .drawsAfterEndLocation)
})! })!
}() }
private let emitterMaskImage: UIImage = { private func generateEmitterMaskImage(size: CGSize, position: CGPoint) -> UIImage? {
return generateImage(CGSize(width: 120.0, height: 120.0), rotatedContext: { size, context in return generateImage(size, rotatedContext: { size, context in
let bounds = CGRect(origin: CGPoint(), size: size) let bounds = CGRect(origin: CGPoint(), size: size)
context.clear(bounds) context.clear(bounds)
@ -39,13 +40,14 @@ private let emitterMaskImage: UIImage = {
let colorSpace = CGColorSpaceCreateDeviceRGB() let colorSpace = CGColorSpaceCreateDeviceRGB()
let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)! let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
let center = CGPoint(x: size.width / 2.0, y: size.height / 2.0) let center = position
context.drawRadialGradient(gradient, startCenter: center, startRadius: 0.0, endCenter: center, endRadius: size.width / 10.0, options: .drawsAfterEndLocation) context.drawRadialGradient(gradient, startCenter: center, startRadius: 0.0, endCenter: center, endRadius: min(10.0, min(size.width, size.height) * 0.4), options: .drawsAfterEndLocation)
})! })
}() }
public class InvisibleInkDustNode: ASDisplayNode { public class InvisibleInkDustNode: ASDisplayNode {
private var currentParams: (size: CGSize, color: UIColor, rects: [CGRect], wordRects: [CGRect])? private var currentParams: (size: CGSize, color: UIColor, rects: [CGRect], wordRects: [CGRect])?
private var animColor: CGColor?
private weak var textNode: TextNode? private weak var textNode: TextNode?
private let textMaskNode: ASDisplayNode private let textMaskNode: ASDisplayNode
@ -68,13 +70,10 @@ public class InvisibleInkDustNode: ASDisplayNode {
self.textMaskNode = ASDisplayNode() self.textMaskNode = ASDisplayNode()
self.textSpotNode = ASImageNode() self.textSpotNode = ASImageNode()
let img = textMaskImage
self.textSpotNode.image = img
self.emitterMaskNode = ASDisplayNode() self.emitterMaskNode = ASDisplayNode()
self.emitterSpotNode = ASImageNode() self.emitterSpotNode = ASImageNode()
let simg = emitterMaskImage self.emitterSpotNode.contentMode = .scaleToFill
self.emitterSpotNode.image = simg
self.emitterMaskFillNode = ASDisplayNode() self.emitterMaskFillNode = ASDisplayNode()
self.emitterMaskFillNode.backgroundColor = .white self.emitterMaskFillNode.backgroundColor = .white
@ -93,24 +92,22 @@ public class InvisibleInkDustNode: ASDisplayNode {
let emitter = CAEmitterCell() let emitter = CAEmitterCell()
emitter.contents = UIImage(bundleImageName: "Components/TextSpeckle")?.cgImage emitter.contents = UIImage(bundleImageName: "Components/TextSpeckle")?.cgImage
emitter.setValue(1.8, forKey: "contentsScale") emitter.contentsScale = 1.8
emitter.emissionRange = .pi * 2.0 emitter.emissionRange = .pi * 2.0
emitter.setValue(3.0, forKey: "mass")
emitter.setValue(2.0, forKey: "massRange")
emitter.lifetime = 1.0 emitter.lifetime = 1.0
emitter.scale = 0.5 emitter.scale = 0.5
emitter.velocityRange = 20.0 emitter.velocityRange = 20.0
emitter.name = "dustCell" emitter.name = "dustCell"
emitter.setValue("point", forKey: "particleType")
emitter.color = UIColor.white.withAlphaComponent(0.0).cgColor
emitter.alphaRange = 1.0 emitter.alphaRange = 1.0
// emitter.setValue("point", forKey: "particleType")
// emitter.setValue(3.0, forKey: "mass")
// emitter.setValue(2.0, forKey: "massRange")
self.emitter = emitter self.emitter = emitter
let fingerAttractor = createEmitterBehavior(type: "simpleAttractor") let fingerAttractor = createEmitterBehavior(type: "simpleAttractor")
fingerAttractor.setValue("fingerAttractor", forKey: "name") fingerAttractor.setValue("fingerAttractor", forKey: "name")
let alphaBehavior = createEmitterBehavior(type: "valueOverLife") let alphaBehavior = createEmitterBehavior(type: "valueOverLife")
alphaBehavior.setValue("alphaBehavior", forKey: "name")
alphaBehavior.setValue("color.alpha", forKey: "keyPath") alphaBehavior.setValue("color.alpha", forKey: "keyPath")
alphaBehavior.setValue([0.0, 0.0, 1.0, 0.0, -1.0], forKey: "values") alphaBehavior.setValue([0.0, 0.0, 1.0, 0.0, -1.0], forKey: "values")
alphaBehavior.setValue(true, forKey: "additive") alphaBehavior.setValue(true, forKey: "additive")
@ -122,12 +119,12 @@ public class InvisibleInkDustNode: ASDisplayNode {
emitterLayer.allowsGroupOpacity = true emitterLayer.allowsGroupOpacity = true
emitterLayer.lifetime = 1 emitterLayer.lifetime = 1
emitterLayer.emitterCells = [emitter] emitterLayer.emitterCells = [emitter]
emitterLayer.setValue(behaviors, forKey: "emitterBehaviors")
emitterLayer.emitterPosition = CGPoint(x: 0, y: 0) emitterLayer.emitterPosition = CGPoint(x: 0, y: 0)
emitterLayer.seed = arc4random() emitterLayer.seed = arc4random()
emitterLayer.setValue("rectangles", forKey: "emitterShape")
emitterLayer.emitterSize = CGSize(width: 1, height: 1) emitterLayer.emitterSize = CGSize(width: 1, height: 1)
emitterLayer.setValue(0.0322, forKey: "updateInterval") emitterLayer.emitterShape = CAEmitterLayerEmitterShape(rawValue: "rectangles")
emitterLayer.setValue(behaviors, forKey: "emitterBehaviors")
// emitterLayer.setValue(0.0322, forKey: "updateInterval")
emitterLayer.setValue(4.0, forKeyPath: "emitterBehaviors.fingerAttractor.stiffness") emitterLayer.setValue(4.0, forKeyPath: "emitterBehaviors.fingerAttractor.stiffness")
emitterLayer.setValue(false, forKeyPath: "emitterBehaviors.fingerAttractor.enabled") emitterLayer.setValue(false, forKeyPath: "emitterBehaviors.fingerAttractor.enabled")
@ -160,7 +157,7 @@ public class InvisibleInkDustNode: ASDisplayNode {
} }
@objc private func tap(_ gestureRecognizer: UITapGestureRecognizer) { @objc private func tap(_ gestureRecognizer: UITapGestureRecognizer) {
guard let (size, _, _, _) = self.currentParams, let textNode = self.textNode, !self.isRevealed else { guard let (_, _, _, _) = self.currentParams, let textNode = self.textNode, !self.isRevealed else {
return return
} }
@ -171,23 +168,43 @@ public class InvisibleInkDustNode: ASDisplayNode {
self.emitterLayer?.setValue(position, forKeyPath: "emitterBehaviors.fingerAttractor.position") self.emitterLayer?.setValue(position, forKeyPath: "emitterBehaviors.fingerAttractor.position")
Queue.mainQueue().after(0.1 * UIView.animationDurationFactor()) { Queue.mainQueue().after(0.1 * UIView.animationDurationFactor()) {
textNode.view.mask = self.textMaskNode.view
textNode.alpha = 1.0 textNode.alpha = 1.0
let radius = max(size.width, size.height) textNode.view.mask = self.textMaskNode.view
self.textSpotNode.frame = CGRect(x: position.x - radius / 2.0, y: position.y - radius / 2.0, width: radius, height: radius) self.textSpotNode.frame = CGRect(x: 0.0, y: 0.0, width: self.emitterMaskNode.frame.width * 3.0, height: self.emitterMaskNode.frame.height * 3.0)
let txtImg = generateTextMaskImage(size: self.emitterNode.frame.size, position: position)
self.textSpotNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15) self.textSpotNode.image = txtImg
self.textSpotNode.layer.animateScale(from: 0.1, to: 3.5, duration: 0.71, removeOnCompletion: false, completion: { _ in
let xFactor = (position.x / self.emitterNode.frame.width - 0.5) * 2.0
let yFactor = (position.y / self.emitterNode.frame.height - 0.5) * 2.0
let maxFactor = max(abs(xFactor), abs(yFactor))
var scaleAddition = maxFactor * 4.0
var durationAddition = -maxFactor * 0.2
if self.emitterNode.frame.height > 0.0, self.emitterNode.frame.width / self.emitterNode.frame.height < 0.3 {
scaleAddition *= 4.0
durationAddition *= 2.0
}
self.textSpotNode.layer.anchorPoint = CGPoint(x: position.x / self.emitterMaskNode.frame.width, y: position.y / self.emitterMaskNode.frame.height)
self.textSpotNode.position = position
self.textSpotNode.layer.animateScale(from: 0.3333, to: 10.5 + scaleAddition, duration: 0.55 + durationAddition, removeOnCompletion: false, completion: { _ in
textNode.view.mask = nil textNode.view.mask = nil
}) })
self.textSpotNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15)
self.emitterNode.view.mask = self.emitterMaskNode.view self.emitterNode.view.mask = self.emitterMaskNode.view
let emitterSide = radius * 5.0 self.emitterSpotNode.frame = CGRect(x: 0.0, y: 0.0, width: self.emitterMaskNode.frame.width * 3.0, height: self.emitterMaskNode.frame.height * 3.0)
self.emitterSpotNode.frame = CGRect(x: position.x - emitterSide / 2.0, y: position.y - emitterSide / 2.0, width: emitterSide, height: emitterSide) let img = generateEmitterMaskImage(size: self.emitterNode.frame.size, position: position)
self.emitterSpotNode.layer.animateScale(from: 0.1, to: 3.0, duration: 0.71, removeOnCompletion: false, completion: { [weak self] _ in self.emitterSpotNode.image = img
self.emitterSpotNode.layer.anchorPoint = CGPoint(x: position.x / self.emitterMaskNode.frame.width, y: position.y / self.emitterMaskNode.frame.height)
self.emitterSpotNode.position = position
self.emitterSpotNode.layer.animateScale(from: 0.3333, to: 10.5 + scaleAddition, duration: 0.55 + durationAddition, removeOnCompletion: false, completion: { [weak self] _ in
self?.alpha = 0.0 self?.alpha = 0.0
self?.emitterNode.view.mask = nil self?.emitterNode.view.mask = nil
self?.emitter?.color = UIColor(rgb: 0x000000).cgColor
}) })
self.emitterMaskFillNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false) self.emitterMaskFillNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
} }
@ -211,10 +228,49 @@ public class InvisibleInkDustNode: ASDisplayNode {
let timeToRead = min(45.0, ceil(max(4.0, Double(spoilersLength) * 0.04))) let timeToRead = min(45.0, ceil(max(4.0, Double(spoilersLength) * 0.04)))
Queue.mainQueue().after(timeToRead * UIView.animationDurationFactor()) { Queue.mainQueue().after(timeToRead * UIView.animationDurationFactor()) {
self.isRevealed = false self.isRevealed = false
if let (_, color, _, _) = self.currentParams {
let colorSpace = CGColorSpaceCreateDeviceRGB()
let animation = POPBasicAnimation()
animation.property = (POPAnimatableProperty.property(withName: "color", initializer: { property in
property?.readBlock = { node, values in
if let color = (node as! InvisibleInkDustNode).emitter?.color {
if let a = color.components {
values?[0] = a[0]
values?[1] = a[1]
values?[2] = a[2]
values?[3] = a[3]
}
}
}
property?.writeBlock = { node, values in
if let values = values, let color = CGColor(colorSpace: colorSpace, components: values) {
let uicolor = UIColor(cgColor: color)
print(uicolor)
(node as! InvisibleInkDustNode).animColor = color
(node as! InvisibleInkDustNode).updateEmitter()
}
}
property?.threshold = 0.4
}) as! POPAnimatableProperty)
animation.fromValue = self.emitter?.color
animation.toValue = color
animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
animation.duration = 0.1
animation.completionBlock = { [weak self] _, _ in
if let strongSelf = self {
strongSelf.animColor = nil
strongSelf.updateEmitter()
}
}
self.pop_add(animation, forKey: "color")
}
let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .linear) Queue.mainQueue().after(0.15) {
transition.updateAlpha(node: self, alpha: 1.0) let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .linear)
transition.updateAlpha(node: textNode, alpha: 0.0) transition.updateAlpha(node: self, alpha: 1.0)
transition.updateAlpha(node: textNode, alpha: 0.0)
}
} }
} }
@ -223,7 +279,7 @@ public class InvisibleInkDustNode: ASDisplayNode {
return return
} }
self.emitter?.color = color.cgColor self.emitter?.color = self.animColor ?? color.cgColor
self.emitterLayer?.setValue(wordRects, forKey: "emitterRects") self.emitterLayer?.setValue(wordRects, forKey: "emitterRects")
self.emitterLayer?.frame = CGRect(origin: CGPoint(), size: size) self.emitterLayer?.frame = CGRect(origin: CGPoint(), size: size)
@ -236,7 +292,7 @@ public class InvisibleInkDustNode: ASDisplayNode {
square += Float(rect.width * rect.height) square += Float(rect.width * rect.height)
} }
self.emitter?.birthRate = min(100000, square * 0.33) self.emitter?.birthRate = min(120000, square * 0.35)
} }
public func update(size: CGSize, color: UIColor, rects: [CGRect], wordRects: [CGRect]) { public func update(size: CGSize, color: UIColor, rects: [CGRect], wordRects: [CGRect]) {

View File

@ -355,7 +355,7 @@ public final class InviteLinkInviteController: ViewController {
}))) })))
items.append(.action(ContextMenuActionItem(text: presentationData.strings.InviteLink_ContextGetQRCode, icon: { theme in items.append(.action(ContextMenuActionItem(text: presentationData.strings.InviteLink_ContextGetQRCode, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: "Wallet/QrIcon"), color: theme.contextMenu.primaryColor) return generateTintedImage(image: UIImage(bundleImageName: "Settings/QrIcon"), color: theme.contextMenu.primaryColor)
}, action: { _, f in }, action: { _, f in
f(.dismissWithoutContent) f(.dismissWithoutContent)

View File

@ -500,7 +500,7 @@ public func inviteLinkListController(context: AccountContext, updatedPresentatio
}))) })))
items.append(.action(ContextMenuActionItem(text: presentationData.strings.InviteLink_ContextGetQRCode, icon: { theme in items.append(.action(ContextMenuActionItem(text: presentationData.strings.InviteLink_ContextGetQRCode, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: "Wallet/QrIcon"), color: theme.contextMenu.primaryColor) return generateTintedImage(image: UIImage(bundleImageName: "Settings/QrIcon"), color: theme.contextMenu.primaryColor)
}, action: { _, f in }, action: { _, f in
f(.dismissWithoutContent) f(.dismissWithoutContent)
@ -672,7 +672,7 @@ public func inviteLinkListController(context: AccountContext, updatedPresentatio
}))) })))
items.append(.action(ContextMenuActionItem(text: presentationData.strings.InviteLink_ContextGetQRCode, icon: { theme in items.append(.action(ContextMenuActionItem(text: presentationData.strings.InviteLink_ContextGetQRCode, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: "Wallet/QrIcon"), color: theme.contextMenu.primaryColor) return generateTintedImage(image: UIImage(bundleImageName: "Settings/QrIcon"), color: theme.contextMenu.primaryColor)
}, action: { _, f in }, action: { _, f in
f(.default) f(.default)

View File

@ -582,7 +582,7 @@ public final class InviteLinkViewController: ViewController {
} else { } else {
if !invitationAvailability(invite).isZero { if !invitationAvailability(invite).isZero {
items.append(.action(ContextMenuActionItem(text: presentationData.strings.InviteLink_ContextGetQRCode, icon: { theme in items.append(.action(ContextMenuActionItem(text: presentationData.strings.InviteLink_ContextGetQRCode, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: "Wallet/QrIcon"), color: theme.contextMenu.primaryColor) return generateTintedImage(image: UIImage(bundleImageName: "Settings/QrIcon"), color: theme.contextMenu.primaryColor)
}, action: { [weak self] _, f in }, action: { [weak self] _, f in
f(.dismissWithoutContent) f(.dismissWithoutContent)

View File

@ -1049,7 +1049,7 @@ public func channelVisibilityController(context: AccountContext, updatedPresenta
}))) })))
items.append(.action(ContextMenuActionItem(text: presentationData.strings.InviteLink_ContextGetQRCode, icon: { theme in items.append(.action(ContextMenuActionItem(text: presentationData.strings.InviteLink_ContextGetQRCode, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: "Wallet/QrIcon"), color: theme.contextMenu.primaryColor) return generateTintedImage(image: UIImage(bundleImageName: "Settings/QrIcon"), color: theme.contextMenu.primaryColor)
}, action: { _, f in }, action: { _, f in
f(.dismissWithoutContent) f(.dismissWithoutContent)

View File

@ -1,7 +1,7 @@
{ {
"images" : [ "images" : [
{ {
"filename" : "qrbutton_24.pdf", "filename" : "qr_24.pdf",
"idiom" : "universal" "idiom" : "universal"
} }
], ],

View File

@ -0,0 +1,323 @@
%PDF-1.7
1 0 obj
<< >>
endobj
2 0 obj
<< /Length 3 0 R >>
stream
/DeviceRGB CS
/DeviceRGB cs
q
1.000000 0.000000 -0.000000 1.000000 3.334961 3.334961 cm
0.000000 0.000000 0.000000 scn
3.665008 17.330078 m
3.642213 17.330078 l
3.642173 17.330078 l
3.195620 17.330084 2.827102 17.330088 2.525429 17.309504 c
2.212656 17.288164 1.923462 17.242495 1.645156 17.127216 c
0.992156 16.856735 0.473350 16.337929 0.202869 15.684929 c
0.087591 15.406623 0.041921 15.117428 0.020580 14.804656 c
-0.000003 14.502975 0.000002 14.134445 0.000007 13.687876 c
0.000007 13.687872 l
0.000008 13.665077 l
0.000007 13.642282 l
0.000007 13.642279 l
0.000002 13.195708 -0.000003 12.827179 0.020580 12.525498 c
0.041921 12.212727 0.087591 11.923532 0.202869 11.645226 c
0.473350 10.992226 0.992156 10.473419 1.645156 10.202938 c
1.923462 10.087660 2.212656 10.041990 2.525429 10.020650 c
2.827112 10.000067 3.195646 10.000071 3.642220 10.000077 c
3.665008 10.000077 l
3.687795 10.000077 l
4.134369 10.000071 4.502903 10.000067 4.804586 10.020650 c
5.117359 10.041990 5.406553 10.087660 5.684859 10.202938 c
6.337859 10.473419 6.856665 10.992226 7.127147 11.645226 c
7.242424 11.923532 7.288095 12.212727 7.309435 12.525498 c
7.330019 12.827182 7.330014 13.195715 7.330008 13.642290 c
7.330008 13.665077 l
7.330008 13.687864 l
7.330014 14.134439 7.330019 14.502973 7.309435 14.804656 c
7.288095 15.117428 7.242424 15.406623 7.127147 15.684929 c
6.856665 16.337929 6.337859 16.856735 5.684859 17.127216 c
5.406553 17.242495 5.117359 17.288164 4.804586 17.309504 c
4.502913 17.330088 4.134395 17.330084 3.687842 17.330078 c
3.687802 17.330078 l
3.665008 17.330078 l
h
2.154125 15.898457 m
2.243362 15.935419 2.370909 15.965870 2.615963 15.982590 c
2.866992 15.999717 3.189967 16.000076 3.665008 16.000076 c
4.140048 16.000076 4.463024 15.999717 4.714052 15.982590 c
4.959106 15.965870 5.086654 15.935419 5.175890 15.898457 c
5.503003 15.762961 5.762892 15.503072 5.898387 15.175960 c
5.935350 15.086723 5.965800 14.959176 5.982520 14.714121 c
5.999648 14.463093 6.000008 14.140118 6.000008 13.665077 c
6.000008 13.190037 5.999648 12.867062 5.982520 12.616034 c
5.965800 12.370978 5.935350 12.243431 5.898387 12.154195 c
5.762892 11.827082 5.503003 11.567192 5.175890 11.431698 c
5.086654 11.394735 4.959106 11.364285 4.714052 11.347565 c
4.463024 11.330437 4.140048 11.330077 3.665008 11.330077 c
3.189967 11.330077 2.866992 11.330437 2.615963 11.347565 c
2.370909 11.364285 2.243362 11.394735 2.154125 11.431698 c
1.827013 11.567192 1.567123 11.827082 1.431628 12.154195 c
1.394665 12.243431 1.364215 12.370978 1.347495 12.616034 c
1.330368 12.867062 1.330008 13.190037 1.330008 13.665077 c
1.330008 14.140118 1.330368 14.463093 1.347495 14.714121 c
1.364215 14.959176 1.394665 15.086723 1.431628 15.175960 c
1.567123 15.503072 1.827013 15.762961 2.154125 15.898457 c
h
13.665008 17.330078 m
13.642213 17.330078 l
13.642173 17.330078 l
13.195621 17.330084 12.827102 17.330088 12.525429 17.309504 c
12.212657 17.288164 11.923462 17.242495 11.645156 17.127216 c
10.992156 16.856735 10.473350 16.337929 10.202868 15.684929 c
10.087590 15.406623 10.041921 15.117428 10.020580 14.804656 c
9.999997 14.502989 10.000002 14.134479 10.000008 13.687937 c
10.000008 13.687872 l
10.000008 13.665077 l
10.000008 13.642282 l
10.000008 13.642218 l
10.000002 13.195675 9.999997 12.827166 10.020580 12.525498 c
10.041921 12.212727 10.087590 11.923532 10.202868 11.645226 c
10.473350 10.992226 10.992156 10.473419 11.645156 10.202938 c
11.923462 10.087660 12.212657 10.041990 12.525429 10.020650 c
12.827112 10.000067 13.195646 10.000071 13.642220 10.000077 c
13.665008 10.000077 l
13.687795 10.000077 l
14.134369 10.000071 14.502903 10.000067 14.804586 10.020650 c
15.117359 10.041990 15.406553 10.087660 15.684858 10.202938 c
16.337858 10.473419 16.856665 10.992226 17.127148 11.645226 c
17.242424 11.923532 17.288094 12.212727 17.309435 12.525498 c
17.330017 12.827168 17.330013 13.195679 17.330008 13.642224 c
17.330008 13.642290 l
17.330008 13.665077 l
17.330008 13.687864 l
17.330008 13.687929 l
17.330013 14.134475 17.330017 14.502987 17.309435 14.804656 c
17.288094 15.117428 17.242424 15.406623 17.127148 15.684929 c
16.856665 16.337929 16.337858 16.856735 15.684858 17.127216 c
15.406553 17.242495 15.117359 17.288164 14.804586 17.309504 c
14.502913 17.330088 14.134395 17.330084 13.687842 17.330078 c
13.687802 17.330078 l
13.665008 17.330078 l
h
12.154125 15.898457 m
12.243361 15.935419 12.370909 15.965870 12.615964 15.982590 c
12.866991 15.999717 13.189967 16.000076 13.665008 16.000076 c
14.140048 16.000076 14.463024 15.999717 14.714052 15.982590 c
14.959106 15.965870 15.086654 15.935419 15.175890 15.898457 c
15.503002 15.762961 15.762892 15.503072 15.898388 15.175960 c
15.935350 15.086723 15.965799 14.959176 15.982521 14.714121 c
15.999647 14.463093 16.000008 14.140118 16.000008 13.665077 c
16.000008 13.190037 15.999647 12.867062 15.982521 12.616034 c
15.965799 12.370978 15.935350 12.243431 15.898388 12.154195 c
15.762892 11.827082 15.503002 11.567192 15.175890 11.431698 c
15.086654 11.394735 14.959106 11.364285 14.714052 11.347565 c
14.463024 11.330437 14.140048 11.330077 13.665008 11.330077 c
13.189967 11.330077 12.866991 11.330437 12.615964 11.347565 c
12.370909 11.364285 12.243361 11.394735 12.154125 11.431698 c
11.827013 11.567192 11.567122 11.827082 11.431628 12.154195 c
11.394666 12.243431 11.364215 12.370978 11.347495 12.616034 c
11.330368 12.867062 11.330008 13.190037 11.330008 13.665077 c
11.330008 14.140118 11.330368 14.463093 11.347495 14.714121 c
11.364215 14.959176 11.394666 15.086723 11.431628 15.175960 c
11.567122 15.503072 11.827013 15.762961 12.154125 15.898457 c
h
3.642206 7.330039 m
3.665000 7.330039 l
3.687795 7.330039 l
3.687860 7.330039 l
4.134403 7.330045 4.502913 7.330050 4.804579 7.309466 c
5.117352 7.288126 5.406546 7.242456 5.684852 7.127178 c
6.337852 6.856697 6.856658 6.337891 7.127140 5.684891 c
7.242417 5.406585 7.288087 5.117390 7.309428 4.804618 c
7.330011 4.502934 7.330007 4.134401 7.330000 3.687826 c
7.330000 3.665039 l
7.330000 3.642252 l
7.330007 3.195677 7.330011 2.827144 7.309428 2.525460 c
7.288087 2.212688 7.242417 1.923493 7.127140 1.645187 c
6.856658 0.992188 6.337852 0.473381 5.684852 0.202900 c
5.406546 0.087622 5.117352 0.041952 4.804579 0.020611 c
4.502896 0.000029 4.134362 0.000032 3.687788 0.000038 c
3.665000 0.000038 l
3.642213 0.000038 l
3.195639 0.000032 2.827105 0.000029 2.525422 0.020611 c
2.212649 0.041952 1.923455 0.087622 1.645149 0.202900 c
0.992149 0.473381 0.473343 0.992188 0.202861 1.645187 c
0.087583 1.923493 0.041913 2.212688 0.020573 2.525460 c
-0.000011 2.827142 -0.000006 3.195673 0.000000 3.642244 c
0.000000 3.665039 l
0.000000 3.687834 l
-0.000006 4.134405 -0.000011 4.502936 0.020573 4.804618 c
0.041913 5.117390 0.087583 5.406585 0.202861 5.684891 c
0.473343 6.337891 0.992149 6.856697 1.645149 7.127178 c
1.923455 7.242456 2.212649 7.288126 2.525422 7.309466 c
2.827089 7.330050 3.195599 7.330045 3.642140 7.330039 c
3.642206 7.330039 l
h
2.615956 5.982552 m
2.370902 5.965832 2.243355 5.935381 2.154118 5.898418 c
1.827006 5.762924 1.567116 5.503034 1.431621 5.175921 c
1.394658 5.086685 1.364208 4.959138 1.347488 4.714083 c
1.330361 4.463055 1.330000 4.140079 1.330000 3.665039 c
1.330000 3.189999 1.330361 2.867023 1.347488 2.615995 c
1.364208 2.370940 1.394658 2.243393 1.431621 2.154157 c
1.567116 1.827044 1.827006 1.567154 2.154118 1.431660 c
2.243355 1.394697 2.370902 1.364246 2.615956 1.347527 c
2.866984 1.330399 3.189960 1.330040 3.665000 1.330040 c
4.140041 1.330040 4.463017 1.330399 4.714045 1.347527 c
4.959099 1.364246 5.086647 1.394697 5.175883 1.431660 c
5.502995 1.567154 5.762885 1.827044 5.898380 2.154157 c
5.935343 2.243393 5.965793 2.370940 5.982513 2.615995 c
5.999640 2.867023 6.000000 3.189999 6.000000 3.665039 c
6.000000 4.140079 5.999640 4.463055 5.982513 4.714083 c
5.965793 4.959138 5.935343 5.086685 5.898380 5.175921 c
5.762885 5.503034 5.502995 5.762924 5.175883 5.898418 c
5.086647 5.935381 4.959099 5.965832 4.714045 5.982552 c
4.463017 5.999679 4.140041 6.000039 3.665000 6.000039 c
3.189960 6.000039 2.866984 5.999679 2.615956 5.982552 c
h
10.164962 6.365039 m
10.164962 6.645065 10.164962 6.785078 10.219459 6.892035 c
10.267395 6.986115 10.343885 7.062606 10.437966 7.110542 c
10.544923 7.165039 10.684936 7.165039 10.964962 7.165039 c
11.364962 7.165039 l
11.644988 7.165039 11.785001 7.165039 11.891957 7.110542 c
11.986038 7.062606 12.062529 6.986115 12.110465 6.892035 c
12.164962 6.785078 12.164962 6.645065 12.164962 6.365039 c
12.164962 5.965039 l
12.164962 5.685013 12.164962 5.545000 12.110465 5.438044 c
12.062529 5.343963 11.986038 5.267472 11.891957 5.219536 c
11.785001 5.165039 11.644988 5.165039 11.364962 5.165039 c
10.964962 5.165039 l
10.684936 5.165039 10.544923 5.165039 10.437966 5.219536 c
10.343885 5.267472 10.267395 5.343963 10.219459 5.438044 c
10.164962 5.545000 10.164962 5.685013 10.164962 5.965039 c
10.164962 6.365039 l
h
12.719459 4.392035 m
12.664962 4.285078 12.664962 4.145065 12.664962 3.865039 c
12.664962 3.465039 l
12.664962 3.185013 12.664962 3.045000 12.719459 2.938044 c
12.767395 2.843963 12.843885 2.767472 12.937966 2.719536 c
13.044922 2.665039 13.184936 2.665039 13.464962 2.665039 c
13.864962 2.665039 l
14.144988 2.665039 14.285002 2.665039 14.391957 2.719536 c
14.486038 2.767472 14.562529 2.843963 14.610465 2.938044 c
14.664962 3.045000 14.664962 3.185013 14.664962 3.465039 c
14.664962 3.865039 l
14.664962 4.145065 14.664962 4.285078 14.610465 4.392035 c
14.562529 4.486115 14.486038 4.562606 14.391957 4.610542 c
14.285002 4.665039 14.144988 4.665039 13.864962 4.665039 c
13.464962 4.665039 l
13.184936 4.665039 13.044922 4.665039 12.937966 4.610542 c
12.843885 4.562606 12.767395 4.486115 12.719459 4.392035 c
h
10.219459 1.892035 m
10.164962 1.785078 10.164962 1.645065 10.164962 1.365039 c
10.164962 0.965038 l
10.164962 0.685013 10.164962 0.545000 10.219459 0.438044 c
10.267395 0.343964 10.343885 0.267471 10.437966 0.219536 c
10.544923 0.165039 10.684936 0.165039 10.964962 0.165039 c
11.364962 0.165039 l
11.644988 0.165039 11.785001 0.165039 11.891957 0.219536 c
11.986038 0.267471 12.062529 0.343964 12.110465 0.438044 c
12.164962 0.545000 12.164962 0.685013 12.164962 0.965038 c
12.164962 1.365039 l
12.164962 1.645065 12.164962 1.785078 12.110465 1.892035 c
12.062529 1.986115 11.986038 2.062606 11.891957 2.110542 c
11.785001 2.165039 11.644988 2.165039 11.364962 2.165039 c
10.964962 2.165039 l
10.684936 2.165039 10.544923 2.165039 10.437966 2.110542 c
10.343885 2.062606 10.267395 1.986115 10.219459 1.892035 c
h
15.219459 6.892035 m
15.164962 6.785078 15.164962 6.645065 15.164962 6.365039 c
15.164962 5.965039 l
15.164962 5.685013 15.164962 5.545000 15.219459 5.438044 c
15.267395 5.343963 15.343885 5.267472 15.437966 5.219536 c
15.544922 5.165039 15.684937 5.165039 15.964962 5.165039 c
16.364962 5.165039 l
16.644989 5.165039 16.785002 5.165039 16.891956 5.219536 c
16.986038 5.267472 17.062529 5.343963 17.110466 5.438044 c
17.164963 5.545000 17.164963 5.685013 17.164963 5.965039 c
17.164963 6.365039 l
17.164963 6.645065 17.164963 6.785078 17.110466 6.892035 c
17.062529 6.986115 16.986038 7.062606 16.891956 7.110542 c
16.785002 7.165039 16.644989 7.165039 16.364962 7.165039 c
15.964962 7.165039 l
15.684937 7.165039 15.544922 7.165039 15.437966 7.110542 c
15.343885 7.062606 15.267395 6.986115 15.219459 6.892035 c
h
15.164962 1.365039 m
15.164962 1.645065 15.164962 1.785078 15.219459 1.892035 c
15.267395 1.986115 15.343885 2.062606 15.437966 2.110542 c
15.544922 2.165039 15.684937 2.165039 15.964962 2.165039 c
16.364962 2.165039 l
16.644989 2.165039 16.785002 2.165039 16.891956 2.110542 c
16.986038 2.062606 17.062529 1.986115 17.110466 1.892035 c
17.164963 1.785078 17.164963 1.645065 17.164963 1.365039 c
17.164963 0.965038 l
17.164963 0.685013 17.164963 0.545000 17.110466 0.438044 c
17.062529 0.343964 16.986038 0.267471 16.891956 0.219536 c
16.785002 0.165039 16.644989 0.165039 16.364962 0.165039 c
15.964962 0.165039 l
15.684937 0.165039 15.544922 0.165039 15.437966 0.219536 c
15.343885 0.267471 15.267395 0.343964 15.219459 0.438044 c
15.164962 0.545000 15.164962 0.685013 15.164962 0.965038 c
15.164962 1.365039 l
h
f*
n
Q
endstream
endobj
3 0 obj
12183
endobj
4 0 obj
<< /Annots []
/Type /Page
/MediaBox [ 0.000000 0.000000 24.000000 24.000000 ]
/Resources 1 0 R
/Contents 2 0 R
/Parent 5 0 R
>>
endobj
5 0 obj
<< /Kids [ 4 0 R ]
/Count 1
/Type /Pages
>>
endobj
6 0 obj
<< /Pages 5 0 R
/Type /Catalog
>>
endobj
xref
0 7
0000000000 65535 f
0000000010 00000 n
0000000034 00000 n
0000012273 00000 n
0000012297 00000 n
0000012470 00000 n
0000012544 00000 n
trailer
<< /ID [ (some) (id) ]
/Root 6 0 R
/Size 7
>>
startxref
12603
%%EOF

View File

@ -1,7 +1,7 @@
{ {
"images" : [ "images" : [
{ {
"filename" : "Icon-33.pdf", "filename" : "qr_30.pdf",
"idiom" : "universal" "idiom" : "universal"
} }
], ],

View File

@ -1,359 +0,0 @@
%PDF-1.7
1 0 obj
<< >>
endobj
2 0 obj
<< /Length 3 0 R >>
stream
/DeviceRGB CS
/DeviceRGB cs
q
1.000000 0.000000 -0.000000 1.000000 5.334961 5.334961 cm
0.000000 0.478431 1.000000 scn
3.865000 19.330078 m
3.837526 19.330078 l
3.837508 19.330078 l
3.300819 19.330086 2.857976 19.330093 2.497252 19.300621 c
2.122624 19.270012 1.778399 19.204330 1.455116 19.039610 c
0.953664 18.784107 0.545971 18.376413 0.290469 17.874962 c
0.125748 17.551680 0.060066 17.207455 0.029458 16.832825 c
-0.000015 16.472101 -0.000008 16.029259 0.000000 15.492570 c
0.000000 15.492552 l
0.000000 15.465077 l
0.000000 14.365076 l
0.000000 14.337603 l
0.000000 14.337584 l
-0.000008 13.800896 -0.000015 13.358052 0.029458 12.997328 c
0.060066 12.622700 0.125748 12.278475 0.290469 11.955193 c
0.545971 11.453741 0.953664 11.046047 1.455116 10.790545 c
1.778399 10.625824 2.122624 10.560143 2.497253 10.529534 c
2.857977 10.500062 3.300822 10.500069 3.837512 10.500077 c
3.837542 10.500077 l
3.865001 10.500077 l
4.965002 10.500077 l
4.992460 10.500077 l
4.992490 10.500077 l
5.529181 10.500069 5.972024 10.500062 6.332750 10.529534 c
6.707378 10.560143 7.051603 10.625824 7.374886 10.790545 c
7.876338 11.046047 8.284031 11.453741 8.539533 11.955193 c
8.704254 12.278475 8.769936 12.622700 8.800544 12.997328 c
8.830016 13.358053 8.830009 13.800898 8.830001 14.337588 c
8.830001 14.337618 l
8.830001 14.365078 l
8.830001 15.465077 l
8.830001 15.492537 l
8.830001 15.492566 l
8.830009 16.029257 8.830016 16.472101 8.800544 16.832825 c
8.769936 17.207455 8.704254 17.551680 8.539533 17.874962 c
8.284031 18.376413 7.876338 18.784107 7.374886 19.039610 c
7.051603 19.204330 6.707378 19.270012 6.332750 19.300621 c
5.972026 19.330093 5.529183 19.330086 4.992494 19.330078 c
4.992475 19.330078 l
4.965001 19.330078 l
3.865000 19.330078 l
h
2.058923 17.854570 m
2.163464 17.907837 2.313177 17.951149 2.605557 17.975037 c
2.905700 17.999559 3.293975 18.000076 3.865000 18.000076 c
4.965001 18.000076 l
5.536026 18.000076 5.924302 17.999559 6.224445 17.975037 c
6.516825 17.951149 6.666538 17.907837 6.771079 17.854570 c
7.022274 17.726580 7.226504 17.522350 7.354495 17.271154 c
7.407761 17.166615 7.451073 17.016901 7.474962 16.724522 c
7.499484 16.424377 7.500001 16.036102 7.500001 15.465077 c
7.500001 14.365078 l
7.500001 13.794052 7.499484 13.405777 7.474962 13.105633 c
7.451073 12.813253 7.407761 12.663540 7.354495 12.559000 c
7.226504 12.307804 7.022274 12.103575 6.771079 11.975584 c
6.666538 11.922318 6.516825 11.879005 6.224445 11.855116 c
5.924302 11.830595 5.536027 11.830076 4.965002 11.830076 c
3.865001 11.830076 l
3.293975 11.830076 2.905700 11.830595 2.605557 11.855116 c
2.313177 11.879005 2.163464 11.922318 2.058923 11.975584 c
1.807727 12.103575 1.603498 12.307804 1.475507 12.559000 c
1.422241 12.663540 1.378929 12.813253 1.355041 13.105633 c
1.330518 13.405777 1.330001 13.794050 1.330001 14.365076 c
1.330001 15.465077 l
1.330001 16.036102 1.330518 16.424377 1.355041 16.724522 c
1.378929 17.016901 1.422241 17.166615 1.475507 17.271154 c
1.603498 17.522350 1.807727 17.726580 2.058923 17.854570 c
h
14.365001 19.330078 m
14.337526 19.330078 l
14.337506 19.330078 l
13.800819 19.330086 13.357977 19.330093 12.997252 19.300621 c
12.622624 19.270012 12.278399 19.204330 11.955116 19.039610 c
11.453664 18.784107 11.045971 18.376413 10.790468 17.874962 c
10.625748 17.551680 10.560066 17.207455 10.529458 16.832825 c
10.499986 16.472103 10.499992 16.029264 10.500001 15.492581 c
10.500001 15.492552 l
10.500001 15.465077 l
10.500001 14.365076 l
10.500001 14.337603 l
10.500001 14.337572 l
10.499992 13.800890 10.499986 13.358049 10.529458 12.997328 c
10.560066 12.622700 10.625748 12.278475 10.790468 11.955193 c
11.045971 11.453741 11.453664 11.046047 11.955116 10.790545 c
12.278399 10.625824 12.622624 10.560143 12.997252 10.529534 c
13.357978 10.500062 13.800820 10.500069 14.337513 10.500077 c
14.337542 10.500077 l
14.365001 10.500077 l
15.465001 10.500077 l
15.492460 10.500077 l
15.492489 10.500077 l
16.029179 10.500069 16.472023 10.500062 16.832748 10.529534 c
17.207378 10.560143 17.551603 10.625824 17.874886 10.790545 c
18.376337 11.046047 18.784031 11.453741 19.039534 11.955193 c
19.204254 12.278475 19.269936 12.622700 19.300545 12.997328 c
19.330015 13.358044 19.330009 13.800873 19.330002 14.337545 c
19.330002 14.337618 l
19.330002 14.365078 l
19.330002 15.465077 l
19.330002 15.492537 l
19.330002 15.492609 l
19.330009 16.029282 19.330015 16.472111 19.300545 16.832825 c
19.269936 17.207455 19.204254 17.551680 19.039534 17.874962 c
18.784031 18.376413 18.376337 18.784107 17.874886 19.039610 c
17.551603 19.204330 17.207378 19.270012 16.832748 19.300621 c
16.472025 19.330093 16.029184 19.330086 15.492496 19.330078 c
15.492476 19.330078 l
15.465000 19.330078 l
14.365001 19.330078 l
h
12.558924 17.854570 m
12.663465 17.907837 12.813177 17.951149 13.105556 17.975037 c
13.405701 17.999559 13.793975 18.000076 14.365001 18.000076 c
15.465000 18.000076 l
16.036026 18.000076 16.424301 17.999559 16.724445 17.975037 c
17.016825 17.951149 17.166538 17.907837 17.271078 17.854570 c
17.522274 17.726580 17.726503 17.522350 17.854494 17.271154 c
17.907761 17.166615 17.951073 17.016901 17.974960 16.724522 c
17.999483 16.424377 18.000000 16.036102 18.000000 15.465077 c
18.000000 14.365078 l
18.000000 13.794052 17.999483 13.405777 17.974960 13.105633 c
17.951073 12.813253 17.907761 12.663540 17.854494 12.559000 c
17.726503 12.307804 17.522274 12.103575 17.271078 11.975584 c
17.166538 11.922318 17.016825 11.879005 16.724445 11.855116 c
16.424301 11.830595 16.036026 11.830076 15.465001 11.830076 c
14.365001 11.830076 l
13.793976 11.830076 13.405701 11.830595 13.105557 11.855116 c
12.813177 11.879005 12.663465 11.922318 12.558924 11.975584 c
12.307727 12.103575 12.103498 12.307804 11.975508 12.559000 c
11.922241 12.663540 11.878929 12.813253 11.855041 13.105633 c
11.830518 13.405777 11.830001 13.794050 11.830001 14.365076 c
11.830001 15.465077 l
11.830001 16.036102 11.830518 16.424377 11.855041 16.724522 c
11.878929 17.016901 11.922241 17.166615 11.975508 17.271154 c
12.103498 17.522350 12.307727 17.726580 12.558924 17.854570 c
h
14.337526 8.830077 m
14.365001 8.830077 l
15.465000 8.830077 l
15.492476 8.830077 l
15.492504 8.830077 l
16.029188 8.830086 16.472029 8.830092 16.832748 8.800620 c
17.207378 8.770012 17.551603 8.704330 17.874886 8.539610 c
18.376337 8.284107 18.784031 7.876414 19.039534 7.374962 c
19.204254 7.051679 19.269936 6.707454 19.300545 6.332826 c
19.330015 5.972111 19.330009 5.529281 19.330002 4.992608 c
19.330002 4.992537 l
19.330002 4.965077 l
19.330002 3.865078 l
19.330002 3.837619 l
19.330002 3.837547 l
19.330009 3.300873 19.330015 2.858044 19.300545 2.497330 c
19.269936 2.122700 19.204254 1.778475 19.039534 1.455193 c
18.784031 0.953741 18.376337 0.546047 17.874886 0.290545 c
17.551603 0.125824 17.207378 0.060143 16.832748 0.029533 c
16.472034 0.000063 16.029202 0.000069 15.492532 0.000076 c
15.492460 0.000076 l
15.465001 0.000076 l
14.365001 0.000076 l
14.337542 0.000076 l
14.337470 0.000076 l
13.800797 0.000069 13.357968 0.000063 12.997252 0.029533 c
12.622624 0.060143 12.278399 0.125824 11.955116 0.290545 c
11.453664 0.546047 11.045971 0.953741 10.790468 1.455193 c
10.625748 1.778475 10.560066 2.122700 10.529458 2.497330 c
10.499986 2.858051 10.499992 3.300890 10.500001 3.837574 c
10.500001 3.837603 l
10.500001 3.865077 l
10.500001 4.965077 l
10.500001 4.992552 l
10.500001 4.992580 l
10.499992 5.529266 10.499986 5.972104 10.529458 6.332826 c
10.560066 6.707454 10.625748 7.051679 10.790468 7.374962 c
11.045971 7.876414 11.453664 8.284107 11.955116 8.539610 c
12.278399 8.704330 12.622624 8.770012 12.997252 8.800620 c
13.357974 8.830092 13.800812 8.830086 14.337498 8.830077 c
14.337526 8.830077 l
h
13.105556 7.475038 m
12.813177 7.451149 12.663465 7.407837 12.558924 7.354570 c
12.307727 7.226580 12.103498 7.022351 11.975508 6.771154 c
11.922241 6.666614 11.878929 6.516901 11.855041 6.224521 c
11.830518 5.924377 11.830001 5.536102 11.830001 4.965077 c
11.830001 3.865077 l
11.830001 3.294052 11.830518 2.905777 11.855041 2.605633 c
11.878929 2.313253 11.922241 2.163540 11.975508 2.059000 c
12.103498 1.807804 12.307727 1.603575 12.558924 1.475584 c
12.663465 1.422318 12.813177 1.379005 13.105557 1.355118 c
13.405701 1.330595 13.793976 1.330078 14.365001 1.330078 c
15.465001 1.330078 l
16.036026 1.330078 16.424301 1.330595 16.724445 1.355118 c
17.016825 1.379005 17.166538 1.422318 17.271078 1.475584 c
17.522274 1.603575 17.726503 1.807804 17.854494 2.059000 c
17.907761 2.163540 17.951073 2.313253 17.974960 2.605633 c
17.999483 2.905777 18.000000 3.294052 18.000000 3.865078 c
18.000000 4.965077 l
18.000000 5.536103 17.999483 5.924377 17.974960 6.224522 c
17.951073 6.516901 17.907761 6.666614 17.854494 6.771154 c
17.726503 7.022351 17.522274 7.226580 17.271078 7.354570 c
17.166538 7.407837 17.016825 7.451149 16.724445 7.475038 c
16.424301 7.499560 16.036026 7.500077 15.465000 7.500077 c
14.365001 7.500077 l
13.793975 7.500077 13.405701 7.499560 13.105556 7.475038 c
h
0.665001 7.365077 m
0.665001 7.645103 0.665001 7.785116 0.719498 7.892073 c
0.767434 7.986154 0.843925 8.062644 0.938006 8.110580 c
1.044962 8.165077 1.184975 8.165077 1.465001 8.165077 c
1.865001 8.165077 l
2.145027 8.165077 2.285040 8.165077 2.391996 8.110580 c
2.486077 8.062644 2.562567 7.986154 2.610504 7.892073 c
2.665001 7.785116 2.665001 7.645103 2.665001 7.365077 c
2.665001 6.965077 l
2.665001 6.685051 2.665001 6.545038 2.610504 6.438082 c
2.562567 6.344001 2.486077 6.267510 2.391996 6.219574 c
2.285040 6.165077 2.145027 6.165077 1.865001 6.165077 c
1.465001 6.165077 l
1.184975 6.165077 1.044962 6.165077 0.938006 6.219574 c
0.843925 6.267510 0.767434 6.344001 0.719498 6.438082 c
0.665001 6.545038 0.665001 6.685051 0.665001 6.965077 c
0.665001 7.365077 l
h
6.219498 7.892073 m
6.165001 7.785116 6.165001 7.645103 6.165001 7.365077 c
6.165001 6.965077 l
6.165001 6.685051 6.165001 6.545038 6.219498 6.438082 c
6.267435 6.344001 6.343925 6.267510 6.438006 6.219574 c
6.544961 6.165077 6.684975 6.165077 6.965002 6.165077 c
7.365001 6.165077 l
7.645028 6.165077 7.785040 6.165077 7.891997 6.219574 c
7.986078 6.267510 8.062568 6.344001 8.110504 6.438082 c
8.165001 6.545038 8.165001 6.685051 8.165001 6.965077 c
8.165001 7.365077 l
8.165001 7.645103 8.165001 7.785116 8.110504 7.892073 c
8.062568 7.986154 7.986078 8.062644 7.891997 8.110580 c
7.785040 8.165077 7.645028 8.165077 7.365001 8.165077 c
6.965002 8.165077 l
6.684975 8.165077 6.544961 8.165077 6.438006 8.110580 c
6.343925 8.062644 6.267435 7.986154 6.219498 7.892073 c
h
3.469498 5.142073 m
3.415001 5.035116 3.415001 4.895103 3.415001 4.615077 c
3.415001 4.215077 l
3.415001 3.935051 3.415001 3.795038 3.469498 3.688082 c
3.517434 3.594001 3.593925 3.517510 3.688006 3.469574 c
3.794961 3.415077 3.934975 3.415077 4.215001 3.415077 c
4.615001 3.415077 l
4.895028 3.415077 5.035040 3.415077 5.141997 3.469574 c
5.236078 3.517510 5.312568 3.594001 5.360505 3.688082 c
5.415001 3.795038 5.415001 3.935051 5.415001 4.215077 c
5.415001 4.615077 l
5.415001 4.895103 5.415001 5.035116 5.360505 5.142073 c
5.312568 5.236154 5.236078 5.312644 5.141997 5.360580 c
5.035040 5.415077 4.895028 5.415077 4.615001 5.415077 c
4.215001 5.415077 l
3.934975 5.415077 3.794961 5.415077 3.688006 5.360580 c
3.593925 5.312644 3.517434 5.236154 3.469498 5.142073 c
h
0.719498 2.392073 m
0.665001 2.285116 0.665001 2.145103 0.665001 1.865078 c
0.665001 1.465076 l
0.665001 1.185051 0.665001 1.045038 0.719498 0.938082 c
0.767434 0.844002 0.843925 0.767509 0.938006 0.719574 c
1.044962 0.665077 1.184975 0.665077 1.465001 0.665077 c
1.865001 0.665077 l
2.145027 0.665077 2.285040 0.665077 2.391996 0.719574 c
2.486077 0.767509 2.562567 0.844002 2.610504 0.938082 c
2.665001 1.045038 2.665001 1.185051 2.665001 1.465076 c
2.665001 1.865078 l
2.665001 2.145103 2.665001 2.285116 2.610504 2.392073 c
2.562567 2.486153 2.486077 2.562645 2.391996 2.610580 c
2.285040 2.665077 2.145027 2.665077 1.865001 2.665077 c
1.465001 2.665077 l
1.184975 2.665077 1.044962 2.665077 0.938006 2.610580 c
0.843925 2.562645 0.767434 2.486153 0.719498 2.392073 c
h
6.165001 1.865078 m
6.165001 2.145103 6.165001 2.285116 6.219498 2.392073 c
6.267435 2.486153 6.343925 2.562645 6.438006 2.610580 c
6.544961 2.665077 6.684975 2.665077 6.965002 2.665077 c
7.365001 2.665077 l
7.645028 2.665077 7.785040 2.665077 7.891997 2.610580 c
7.986078 2.562645 8.062568 2.486153 8.110504 2.392073 c
8.165001 2.285116 8.165001 2.145103 8.165001 1.865078 c
8.165001 1.465076 l
8.165001 1.185051 8.165001 1.045038 8.110504 0.938082 c
8.062568 0.844002 7.986078 0.767509 7.891997 0.719574 c
7.785040 0.665077 7.645028 0.665077 7.365001 0.665077 c
6.965002 0.665077 l
6.684975 0.665077 6.544961 0.665077 6.438006 0.719574 c
6.343925 0.767509 6.267435 0.844002 6.219498 0.938082 c
6.165001 1.045038 6.165001 1.185051 6.165001 1.465076 c
6.165001 1.865078 l
h
f*
n
Q
endstream
endobj
3 0 obj
12876
endobj
4 0 obj
<< /Annots []
/Type /Page
/MediaBox [ 0.000000 0.000000 30.000000 30.000000 ]
/Resources 1 0 R
/Contents 2 0 R
/Parent 5 0 R
>>
endobj
5 0 obj
<< /Kids [ 4 0 R ]
/Count 1
/Type /Pages
>>
endobj
6 0 obj
<< /Type /Catalog
/Pages 5 0 R
>>
endobj
xref
0 7
0000000000 65535 f
0000000010 00000 n
0000000034 00000 n
0000012966 00000 n
0000012990 00000 n
0000013163 00000 n
0000013237 00000 n
trailer
<< /ID [ (some) (id) ]
/Root 6 0 R
/Size 7
>>
startxref
13296
%%EOF

View File

@ -0,0 +1,357 @@
%PDF-1.7
1 0 obj
<< >>
endobj
2 0 obj
<< /Length 3 0 R >>
stream
/DeviceRGB CS
/DeviceRGB cs
q
1.000000 0.000000 -0.000000 1.000000 5.334961 5.334961 cm
0.000000 0.000000 0.000000 scn
3.865000 19.330078 m
3.837526 19.330078 l
3.837508 19.330078 l
3.300819 19.330086 2.857976 19.330093 2.497252 19.300621 c
2.122624 19.270012 1.778399 19.204330 1.455116 19.039610 c
0.953664 18.784107 0.545971 18.376413 0.290469 17.874962 c
0.125748 17.551680 0.060066 17.207455 0.029458 16.832825 c
-0.000015 16.472101 -0.000008 16.029259 0.000000 15.492570 c
0.000000 15.492552 l
0.000000 15.465077 l
0.000000 14.365076 l
0.000000 14.337603 l
0.000000 14.337584 l
-0.000008 13.800896 -0.000015 13.358052 0.029458 12.997328 c
0.060066 12.622700 0.125748 12.278475 0.290469 11.955193 c
0.545971 11.453741 0.953664 11.046047 1.455116 10.790545 c
1.778399 10.625824 2.122624 10.560143 2.497253 10.529534 c
2.857977 10.500062 3.300822 10.500069 3.837512 10.500077 c
3.837542 10.500077 l
3.865001 10.500077 l
4.965002 10.500077 l
4.992460 10.500077 l
4.992490 10.500077 l
5.529181 10.500069 5.972024 10.500062 6.332750 10.529534 c
6.707378 10.560143 7.051603 10.625824 7.374886 10.790545 c
7.876338 11.046047 8.284031 11.453741 8.539533 11.955193 c
8.704254 12.278475 8.769936 12.622700 8.800544 12.997328 c
8.830016 13.358053 8.830009 13.800898 8.830001 14.337588 c
8.830001 14.337618 l
8.830001 14.365078 l
8.830001 15.465077 l
8.830001 15.492537 l
8.830001 15.492566 l
8.830009 16.029257 8.830016 16.472101 8.800544 16.832825 c
8.769936 17.207455 8.704254 17.551680 8.539533 17.874962 c
8.284031 18.376413 7.876338 18.784107 7.374886 19.039610 c
7.051603 19.204330 6.707378 19.270012 6.332750 19.300621 c
5.972026 19.330093 5.529183 19.330086 4.992494 19.330078 c
4.992475 19.330078 l
4.965001 19.330078 l
3.865000 19.330078 l
h
2.058923 17.854570 m
2.163464 17.907837 2.313177 17.951149 2.605557 17.975037 c
2.905700 17.999559 3.293975 18.000076 3.865000 18.000076 c
4.965001 18.000076 l
5.536026 18.000076 5.924302 17.999559 6.224445 17.975037 c
6.516825 17.951149 6.666538 17.907837 6.771079 17.854570 c
7.022274 17.726580 7.226504 17.522350 7.354495 17.271154 c
7.407761 17.166615 7.451073 17.016901 7.474962 16.724522 c
7.499484 16.424377 7.500001 16.036102 7.500001 15.465077 c
7.500001 14.365078 l
7.500001 13.794052 7.499484 13.405777 7.474962 13.105633 c
7.451073 12.813253 7.407761 12.663540 7.354495 12.559000 c
7.226504 12.307804 7.022274 12.103575 6.771079 11.975584 c
6.666538 11.922318 6.516825 11.879005 6.224445 11.855116 c
5.924302 11.830595 5.536027 11.830076 4.965002 11.830076 c
3.865001 11.830076 l
3.293975 11.830076 2.905700 11.830595 2.605557 11.855116 c
2.313177 11.879005 2.163464 11.922318 2.058923 11.975584 c
1.807727 12.103575 1.603498 12.307804 1.475507 12.559000 c
1.422241 12.663540 1.378929 12.813253 1.355041 13.105633 c
1.330518 13.405777 1.330001 13.794050 1.330001 14.365076 c
1.330001 15.465077 l
1.330001 16.036102 1.330518 16.424377 1.355041 16.724522 c
1.378929 17.016901 1.422241 17.166615 1.475507 17.271154 c
1.603498 17.522350 1.807727 17.726580 2.058923 17.854570 c
h
14.365001 19.330078 m
14.337526 19.330078 l
14.337506 19.330078 l
13.800819 19.330086 13.357977 19.330093 12.997252 19.300621 c
12.622624 19.270012 12.278399 19.204330 11.955116 19.039610 c
11.453664 18.784107 11.045971 18.376413 10.790468 17.874962 c
10.625748 17.551680 10.560066 17.207455 10.529458 16.832825 c
10.499986 16.472103 10.499992 16.029264 10.500001 15.492581 c
10.500001 15.492552 l
10.500001 15.465077 l
10.500001 14.365076 l
10.500001 14.337603 l
10.500001 14.337572 l
10.499992 13.800890 10.499986 13.358049 10.529458 12.997328 c
10.560066 12.622700 10.625748 12.278475 10.790468 11.955193 c
11.045971 11.453741 11.453664 11.046047 11.955116 10.790545 c
12.278399 10.625824 12.622624 10.560143 12.997252 10.529534 c
13.357978 10.500062 13.800820 10.500069 14.337513 10.500077 c
14.337542 10.500077 l
14.365001 10.500077 l
15.465001 10.500077 l
15.492460 10.500077 l
15.492489 10.500077 l
16.029179 10.500069 16.472023 10.500062 16.832748 10.529534 c
17.207378 10.560143 17.551603 10.625824 17.874886 10.790545 c
18.376337 11.046047 18.784031 11.453741 19.039534 11.955193 c
19.204254 12.278475 19.269936 12.622700 19.300545 12.997328 c
19.330015 13.358044 19.330009 13.800873 19.330002 14.337545 c
19.330002 14.337618 l
19.330002 14.365078 l
19.330002 15.465077 l
19.330002 15.492537 l
19.330002 15.492609 l
19.330009 16.029282 19.330015 16.472111 19.300545 16.832825 c
19.269936 17.207455 19.204254 17.551680 19.039534 17.874962 c
18.784031 18.376413 18.376337 18.784107 17.874886 19.039610 c
17.551603 19.204330 17.207378 19.270012 16.832748 19.300621 c
16.472025 19.330093 16.029184 19.330086 15.492496 19.330078 c
15.492476 19.330078 l
15.465000 19.330078 l
14.365001 19.330078 l
h
12.558924 17.854570 m
12.663465 17.907837 12.813177 17.951149 13.105556 17.975037 c
13.405701 17.999559 13.793975 18.000076 14.365001 18.000076 c
15.465000 18.000076 l
16.036026 18.000076 16.424301 17.999559 16.724445 17.975037 c
17.016825 17.951149 17.166538 17.907837 17.271078 17.854570 c
17.522274 17.726580 17.726503 17.522350 17.854494 17.271154 c
17.907761 17.166615 17.951073 17.016901 17.974960 16.724522 c
17.999483 16.424377 18.000000 16.036102 18.000000 15.465077 c
18.000000 14.365078 l
18.000000 13.794052 17.999483 13.405777 17.974960 13.105633 c
17.951073 12.813253 17.907761 12.663540 17.854494 12.559000 c
17.726503 12.307804 17.522274 12.103575 17.271078 11.975584 c
17.166538 11.922318 17.016825 11.879005 16.724445 11.855116 c
16.424301 11.830595 16.036026 11.830076 15.465001 11.830076 c
14.365001 11.830076 l
13.793976 11.830076 13.405701 11.830595 13.105557 11.855116 c
12.813177 11.879005 12.663465 11.922318 12.558924 11.975584 c
12.307727 12.103575 12.103498 12.307804 11.975508 12.559000 c
11.922241 12.663540 11.878929 12.813253 11.855041 13.105633 c
11.830518 13.405777 11.830001 13.794050 11.830001 14.365076 c
11.830001 15.465077 l
11.830001 16.036102 11.830518 16.424377 11.855041 16.724522 c
11.878929 17.016901 11.922241 17.166615 11.975508 17.271154 c
12.103498 17.522350 12.307727 17.726580 12.558924 17.854570 c
h
3.837565 8.830039 m
3.865039 8.830039 l
4.965039 8.830039 l
4.992514 8.830039 l
4.992544 8.830039 l
5.529227 8.830048 5.972066 8.830054 6.332788 8.800582 c
6.707416 8.769974 7.051641 8.704292 7.374924 8.539572 c
7.876376 8.284069 8.284069 7.876376 8.539572 7.374924 c
8.704292 7.051641 8.769974 6.707416 8.800582 6.332788 c
8.830054 5.972063 8.830048 5.529220 8.830039 4.992527 c
8.830039 4.992498 l
8.830039 4.965039 l
8.830039 3.865040 l
8.830039 3.837581 l
8.830039 3.837552 l
8.830048 3.300861 8.830054 2.858015 8.800582 2.497292 c
8.769974 2.122662 8.704292 1.778437 8.539572 1.455154 c
8.284069 0.953703 7.876376 0.546009 7.374924 0.290506 c
7.051641 0.125786 6.707417 0.060104 6.332788 0.029495 c
5.972073 0.000025 5.529243 0.000031 4.992571 0.000038 c
4.992498 0.000038 l
4.965040 0.000038 l
3.865039 0.000038 l
3.837580 0.000038 l
3.837507 0.000038 l
3.300836 0.000031 2.858006 0.000025 2.497291 0.029495 c
2.122663 0.060104 1.778437 0.125786 1.455155 0.290506 c
0.953703 0.546009 0.546009 0.953703 0.290507 1.455154 c
0.125786 1.778437 0.060105 2.122662 0.029496 2.497292 c
0.000024 2.858019 0.000031 3.300867 0.000039 3.837564 c
0.000039 3.865039 l
0.000039 4.965039 l
0.000039 4.992514 l
0.000031 5.529211 0.000024 5.972059 0.029496 6.332788 c
0.060105 6.707416 0.125786 7.051641 0.290507 7.374924 c
0.546009 7.876376 0.953703 8.284069 1.455155 8.539572 c
1.778437 8.704292 2.122663 8.769974 2.497291 8.800582 c
2.858012 8.830054 3.300851 8.830048 3.837535 8.830039 c
3.837565 8.830039 l
h
2.605595 7.474999 m
2.313215 7.451111 2.163502 7.407799 2.058962 7.354532 c
1.807766 7.226542 1.603537 7.022313 1.475546 6.771116 c
1.422280 6.666575 1.378968 6.516863 1.355079 6.224483 c
1.330557 5.924339 1.330039 5.536064 1.330039 4.965039 c
1.330039 3.865039 l
1.330039 3.294014 1.330557 2.905739 1.355079 2.605595 c
1.378968 2.313215 1.422280 2.163502 1.475546 2.058962 c
1.603537 1.807766 1.807766 1.603537 2.058962 1.475546 c
2.163502 1.422279 2.313215 1.378967 2.605595 1.355080 c
2.905739 1.330557 3.294014 1.330040 3.865039 1.330040 c
4.965040 1.330040 l
5.536066 1.330040 5.924340 1.330557 6.224483 1.355080 c
6.516863 1.378967 6.666576 1.422279 6.771117 1.475546 c
7.022313 1.603537 7.226542 1.807766 7.354533 2.058962 c
7.407799 2.163502 7.451111 2.313215 7.475000 2.605595 c
7.499522 2.905739 7.500040 3.294014 7.500040 3.865040 c
7.500040 4.965039 l
7.500040 5.536065 7.499522 5.924339 7.475000 6.224483 c
7.451111 6.516863 7.407799 6.666575 7.354533 6.771116 c
7.226542 7.022313 7.022313 7.226542 6.771117 7.354532 c
6.666576 7.407799 6.516863 7.451111 6.224483 7.474999 c
5.924340 7.499522 5.536065 7.500039 4.965039 7.500039 c
3.865039 7.500039 l
3.294014 7.500039 2.905739 7.499522 2.605595 7.474999 c
h
11.165039 7.365039 m
11.165039 7.645065 11.165039 7.785078 11.219536 7.892035 c
11.267472 7.986115 11.343963 8.062606 11.438044 8.110542 c
11.545000 8.165039 11.685013 8.165039 11.965039 8.165039 c
12.365039 8.165039 l
12.645065 8.165039 12.785078 8.165039 12.892035 8.110542 c
12.986115 8.062606 13.062606 7.986115 13.110542 7.892035 c
13.165039 7.785078 13.165039 7.645065 13.165039 7.365039 c
13.165039 6.965039 l
13.165039 6.685013 13.165039 6.545000 13.110542 6.438044 c
13.062606 6.343963 12.986115 6.267472 12.892035 6.219536 c
12.785078 6.165039 12.645065 6.165039 12.365039 6.165039 c
11.965039 6.165039 l
11.685013 6.165039 11.545000 6.165039 11.438044 6.219536 c
11.343963 6.267472 11.267472 6.343963 11.219536 6.438044 c
11.165039 6.545000 11.165039 6.685013 11.165039 6.965039 c
11.165039 7.365039 l
h
16.719536 7.892035 m
16.665039 7.785078 16.665039 7.645065 16.665039 7.365039 c
16.665039 6.965039 l
16.665039 6.685013 16.665039 6.545000 16.719536 6.438044 c
16.767471 6.343963 16.843964 6.267472 16.938044 6.219536 c
17.045000 6.165039 17.185013 6.165039 17.465038 6.165039 c
17.865040 6.165039 l
18.145065 6.165039 18.285078 6.165039 18.392035 6.219536 c
18.486115 6.267472 18.562607 6.343963 18.610542 6.438044 c
18.665039 6.545000 18.665039 6.685013 18.665039 6.965039 c
18.665039 7.365039 l
18.665039 7.645065 18.665039 7.785078 18.610542 7.892035 c
18.562607 7.986115 18.486115 8.062606 18.392035 8.110542 c
18.285078 8.165039 18.145065 8.165039 17.865040 8.165039 c
17.465038 8.165039 l
17.185013 8.165039 17.045000 8.165039 16.938044 8.110542 c
16.843964 8.062606 16.767471 7.986115 16.719536 7.892035 c
h
13.969536 5.142035 m
13.915039 5.035078 13.915039 4.895065 13.915039 4.615039 c
13.915039 4.215039 l
13.915039 3.935013 13.915039 3.795000 13.969536 3.688044 c
14.017472 3.593963 14.093963 3.517472 14.188044 3.469536 c
14.295000 3.415039 14.435013 3.415039 14.715039 3.415039 c
15.115039 3.415039 l
15.395065 3.415039 15.535078 3.415039 15.642035 3.469536 c
15.736115 3.517472 15.812606 3.593963 15.860542 3.688044 c
15.915039 3.795000 15.915039 3.935013 15.915039 4.215039 c
15.915039 4.615039 l
15.915039 4.895065 15.915039 5.035078 15.860542 5.142035 c
15.812606 5.236115 15.736115 5.312606 15.642035 5.360542 c
15.535078 5.415039 15.395065 5.415039 15.115039 5.415039 c
14.715039 5.415039 l
14.435013 5.415039 14.295000 5.415039 14.188044 5.360542 c
14.093963 5.312606 14.017472 5.236115 13.969536 5.142035 c
h
11.219536 2.392035 m
11.165039 2.285078 11.165039 2.145065 11.165039 1.865040 c
11.165039 1.465038 l
11.165039 1.185013 11.165039 1.045000 11.219536 0.938044 c
11.267472 0.843964 11.343963 0.767471 11.438044 0.719536 c
11.545000 0.665039 11.685013 0.665039 11.965039 0.665039 c
12.365039 0.665039 l
12.645065 0.665039 12.785078 0.665039 12.892035 0.719536 c
12.986115 0.767471 13.062606 0.843964 13.110542 0.938044 c
13.165039 1.045000 13.165039 1.185013 13.165039 1.465038 c
13.165039 1.865040 l
13.165039 2.145065 13.165039 2.285078 13.110542 2.392035 c
13.062606 2.486115 12.986115 2.562607 12.892035 2.610542 c
12.785078 2.665039 12.645065 2.665039 12.365039 2.665039 c
11.965039 2.665039 l
11.685013 2.665039 11.545000 2.665039 11.438044 2.610542 c
11.343963 2.562607 11.267472 2.486115 11.219536 2.392035 c
h
16.665039 1.865040 m
16.665039 2.145065 16.665039 2.285078 16.719536 2.392035 c
16.767471 2.486115 16.843964 2.562607 16.938044 2.610542 c
17.045000 2.665039 17.185013 2.665039 17.465038 2.665039 c
17.865040 2.665039 l
18.145065 2.665039 18.285078 2.665039 18.392035 2.610542 c
18.486115 2.562607 18.562607 2.486115 18.610542 2.392035 c
18.665039 2.285078 18.665039 2.145065 18.665039 1.865040 c
18.665039 1.465038 l
18.665039 1.185013 18.665039 1.045000 18.610542 0.938044 c
18.562607 0.843964 18.486115 0.767471 18.392035 0.719536 c
18.285078 0.665039 18.145065 0.665039 17.865040 0.665039 c
17.465038 0.665039 l
17.185013 0.665039 17.045000 0.665039 16.938044 0.719536 c
16.843964 0.767471 16.767471 0.843964 16.719536 0.938044 c
16.665039 1.045000 16.665039 1.185013 16.665039 1.465038 c
16.665039 1.865040 l
h
f*
n
Q
endstream
endobj
3 0 obj
12895
endobj
4 0 obj
<< /Annots []
/Type /Page
/MediaBox [ 0.000000 0.000000 30.000000 30.000000 ]
/Resources 1 0 R
/Contents 2 0 R
/Parent 5 0 R
>>
endobj
5 0 obj
<< /Kids [ 4 0 R ]
/Count 1
/Type /Pages
>>
endobj
6 0 obj
<< /Pages 5 0 R
/Type /Catalog
>>
endobj
xref
0 7
0000000000 65535 f
0000000010 00000 n
0000000034 00000 n
0000012985 00000 n
0000013009 00000 n
0000013182 00000 n
0000013256 00000 n
trailer
<< /ID [ (some) (id) ]
/Root 6 0 R
/Size 7
>>
startxref
13315
%%EOF

View File

@ -194,6 +194,10 @@ final class ChatMessageNotificationItemNode: NotificationItemNode {
return false return false
} }
} }
if messageEntities?.count == 0 {
messageEntities = nil
messageText = textString
}
} else { } else {
messageText = textString messageText = textString
} }

View File

@ -105,7 +105,11 @@ class ChatMessageReplyInfoNode: ASDisplayNode {
return false return false
} }
} }
messageText = stringWithAppliedEntities(message.text, entities: entities, baseColor: textColor, linkColor: textColor, baseFont: textFont, linkFont: textFont, boldFont: textFont, italicFont: textFont, boldItalicFont: textFont, fixedFont: textFont, blockQuoteFont: textFont, underlineLinks: false) if entities.count > 0 {
messageText = stringWithAppliedEntities(message.text, entities: entities, baseColor: textColor, linkColor: textColor, baseFont: textFont, linkFont: textFont, boldFont: textFont, italicFont: textFont, boldItalicFont: textFont, fixedFont: textFont, blockQuoteFont: textFont, underlineLinks: false)
} else {
messageText = NSAttributedString(string: textString, font: textFont, textColor: textColor)
}
} else { } else {
messageText = NSAttributedString(string: textString, font: textFont, textColor: textColor) messageText = NSAttributedString(string: textString, font: textFont, textColor: textColor)
} }

View File

@ -467,7 +467,11 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode {
} }
} }
let textColor = theme.chat.inputPanel.primaryTextColor let textColor = theme.chat.inputPanel.primaryTextColor
messageText = stringWithAppliedEntities(message.text, entities: entities, baseColor: textColor, linkColor: textColor, baseFont: textFont, linkFont: textFont, boldFont: textFont, italicFont: textFont, boldItalicFont: textFont, fixedFont: textFont, blockQuoteFont: textFont, underlineLinks: false) if entities.count > 0 {
messageText = stringWithAppliedEntities(message.text, entities: entities, baseColor: textColor, linkColor: textColor, baseFont: textFont, linkFont: textFont, boldFont: textFont, italicFont: textFont, boldItalicFont: textFont, fixedFont: textFont, blockQuoteFont: textFont, underlineLinks: false)
} else {
messageText = NSAttributedString(string: foldLineBreaks(textString), font: textFont, textColor: textColor)
}
} else { } else {
messageText = NSAttributedString(string: foldLineBreaks(textString), font: textFont, textColor: message.media.isEmpty || message.media.first is TelegramMediaWebpage ? theme.chat.inputPanel.primaryTextColor : theme.chat.inputPanel.secondaryTextColor) messageText = NSAttributedString(string: foldLineBreaks(textString), font: textFont, textColor: message.media.isEmpty || message.media.first is TelegramMediaWebpage ? theme.chat.inputPanel.primaryTextColor : theme.chat.inputPanel.secondaryTextColor)
} }

View File

@ -134,7 +134,11 @@ final class ReplyAccessoryPanelNode: AccessoryPanelNode {
} }
} }
let textColor = strongSelf.theme.chat.inputPanel.primaryTextColor let textColor = strongSelf.theme.chat.inputPanel.primaryTextColor
messageText = stringWithAppliedEntities(message.text, entities: entities, baseColor: textColor, linkColor: textColor, baseFont: textFont, linkFont: textFont, boldFont: textFont, italicFont: textFont, boldItalicFont: textFont, fixedFont: textFont, blockQuoteFont: textFont, underlineLinks: false) if entities.count > 0 {
messageText = stringWithAppliedEntities(message.text, entities: entities, baseColor: textColor, linkColor: textColor, baseFont: textFont, linkFont: textFont, boldFont: textFont, italicFont: textFont, boldItalicFont: textFont, fixedFont: textFont, blockQuoteFont: textFont, underlineLinks: false)
} else {
messageText = NSAttributedString(string: text, font: textFont, textColor: isMedia ? strongSelf.theme.chat.inputPanel.secondaryTextColor : strongSelf.theme.chat.inputPanel.primaryTextColor)
}
} else { } else {
messageText = NSAttributedString(string: text, font: textFont, textColor: isMedia ? strongSelf.theme.chat.inputPanel.secondaryTextColor : strongSelf.theme.chat.inputPanel.primaryTextColor) messageText = NSAttributedString(string: text, font: textFont, textColor: isMedia ? strongSelf.theme.chat.inputPanel.secondaryTextColor : strongSelf.theme.chat.inputPanel.primaryTextColor)
} }