From 53e67adb1c4adb9cd7bd1131fbe2fc946c703295 Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Wed, 24 Aug 2022 15:37:43 +1000 Subject: [PATCH] wip: new conversation menu screen --- Session/Home/HomeVC.swift | 32 +-- .../New Conversation/NewConversationVC.swift | 199 +++++++++++++++++- .../Session/Globe.imageset/Contents.json | 10 +- .../Session/Globe.imageset/Globe.pdf | Bin 8146 -> 0 bytes .../Session/Globe.imageset/Vector (1).pdf | 181 ++++++++++++++++ .../Session/Group.imageset/Contents.json | 10 +- .../Session/Group.imageset/Group.pdf | Bin 30357 -> 4130 bytes .../Session/Message.imageset/Contents.json | 10 +- .../Session/Message.imageset/Message.pdf | Bin 5742 -> 0 bytes .../Session/Message.imageset/Vector.pdf | 91 ++++++++ .../Translations/de.lproj/Localizable.strings | 2 + .../Translations/en.lproj/Localizable.strings | 6 +- .../Translations/es.lproj/Localizable.strings | 2 + .../Translations/fa.lproj/Localizable.strings | 2 + .../Translations/fi.lproj/Localizable.strings | 2 + .../Translations/fr.lproj/Localizable.strings | 2 + .../Translations/hi.lproj/Localizable.strings | 6 +- .../Translations/hr.lproj/Localizable.strings | 2 + .../id-ID.lproj/Localizable.strings | 2 + .../Translations/it.lproj/Localizable.strings | 2 + .../Translations/ja.lproj/Localizable.strings | 2 + .../Translations/nl.lproj/Localizable.strings | 2 + .../Translations/pl.lproj/Localizable.strings | 2 + .../pt_BR.lproj/Localizable.strings | 2 + .../Translations/ru.lproj/Localizable.strings | 2 + .../Translations/si.lproj/Localizable.strings | 6 +- .../Translations/sk.lproj/Localizable.strings | 2 + .../Translations/sv.lproj/Localizable.strings | 2 + .../Translations/th.lproj/Localizable.strings | 2 + .../vi-VN.lproj/Localizable.strings | 2 + .../zh-Hant.lproj/Localizable.strings | 2 + .../zh_CN.lproj/Localizable.strings | 2 + Session/Shared/BaseVC.swift | 7 +- 33 files changed, 551 insertions(+), 45 deletions(-) delete mode 100644 Session/Meta/Images.xcassets/Session/Globe.imageset/Globe.pdf create mode 100644 Session/Meta/Images.xcassets/Session/Globe.imageset/Vector (1).pdf delete mode 100644 Session/Meta/Images.xcassets/Session/Message.imageset/Message.pdf create mode 100644 Session/Meta/Images.xcassets/Session/Message.imageset/Vector.pdf diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index 3bbad236b..1abee7be2 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -110,7 +110,7 @@ final class HomeVC: BaseVC, UITableViewDataSource, UITableViewDelegate, SeedRemi result.setCircularGlow(with: glowConfiguration) result.layer.masksToBounds = false result.tintColor = .white - result.addTarget(self, action: #selector(createNewDM), for: .touchUpInside) + result.addTarget(self, action: #selector(createNewConversation), for: .touchUpInside) return result }() @@ -731,17 +731,16 @@ final class HomeVC: BaseVC, UITableViewDataSource, UITableViewDelegate, SeedRemi self.navigationController?.setViewControllers([ self, searchController ], animated: true) } -// @objc func joinOpenGroup() { -// let joinOpenGroupVC: JoinOpenGroupVC = JoinOpenGroupVC() -// let navigationController: OWSNavigationController = OWSNavigationController(rootViewController: joinOpenGroupVC) -// -// if UIDevice.current.isIPad { -// navigationController.modalPresentationStyle = .fullScreen -// } -// -// present(navigationController, animated: true, completion: nil) -// } -// + @objc func createNewConversation() { + let newConversationVC = NewConversationVC() + let navigationController = OWSNavigationController(rootViewController: newConversationVC) + if UIDevice.current.isIPad { + navigationController.modalPresentationStyle = .fullScreen + } + navigationController.modalPresentationCapturesStatusBarAppearance = true + present(navigationController, animated: true, completion: nil) + } + @objc func createNewDM() { let newDMVC = NewDMVC() let navigationController = OWSNavigationController(rootViewController: newDMVC) @@ -762,13 +761,4 @@ final class HomeVC: BaseVC, UITableViewDataSource, UITableViewDelegate, SeedRemi navigationController.modalPresentationCapturesStatusBarAppearance = true present(navigationController, animated: true, completion: nil) } - -// @objc func createClosedGroup() { -// let newClosedGroupVC = NewClosedGroupVC() -// let navigationController = OWSNavigationController(rootViewController: newClosedGroupVC) -// if UIDevice.current.isIPad { -// navigationController.modalPresentationStyle = .fullScreen -// } -// present(navigationController, animated: true, completion: nil) -// } } diff --git a/Session/Home/New Conversation/NewConversationVC.swift b/Session/Home/New Conversation/NewConversationVC.swift index 0a8ab0dac..73d9f2bea 100644 --- a/Session/Home/New Conversation/NewConversationVC.swift +++ b/Session/Home/New Conversation/NewConversationVC.swift @@ -1,3 +1,200 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. -import Foundation +import UIKit + +final class NewConversationVC: BaseVC, UITableViewDelegate, UITableViewDataSource { + + // MARK: - UI + + private lazy var newDMButton: NewConversationButton = NewConversationButton(icon: #imageLiteral(resourceName: "Message"), title: "vc_create_private_chat_title".localized()) + private lazy var newGroupButton: NewConversationButton = NewConversationButton(icon: #imageLiteral(resourceName: "Group"), title: "vc_create_closed_group_title".localized()) + private lazy var joinCommunityButton: NewConversationButton = NewConversationButton(icon: #imageLiteral(resourceName: "Globe"), title: "vc_join_public_chat_title".localized(), shouldShowSeparator: false) + + private lazy var buttonStackView: UIStackView = { + let lineTop = UIView() + lineTop.set(.height, to: 0.5) + lineTop.backgroundColor = Colors.border.withAlphaComponent(0.3) + + let lineBottom = UIView() + lineBottom.set(.height, to: 0.5) + lineBottom.backgroundColor = Colors.border.withAlphaComponent(0.3) + + let result = UIStackView( + arrangedSubviews: [ + lineTop, + newDMButton, + newGroupButton, + joinCommunityButton, + lineBottom + ] + ) + result.axis = .vertical + return result + }() + + private lazy var buttonStackViewContainer = UIView(wrapping: buttonStackView, withInsets: .zero) + + private lazy var contactsTitleLabel: UILabel = { + let result = UILabel() + result.textColor = Colors.text + result.text = "Contacts" + result.font = .systemFont(ofSize: Values.mediumSpacing) + return result + }() + + private lazy var contactsTableView: UITableView = { + let result = UITableView() + result.delegate = self + result.dataSource = self + result.separatorStyle = .none + result.backgroundColor = .clear + result.register(view: UserCell.self) + + return result + }() + + // MARK: - Lifecycle + + override func viewDidLoad() { + super.viewDidLoad() + setUpNavBarStyle() + setNavBarTitle(NSLocalizedString("vc_new_conversation_title", comment: "")) + let navigationBar = navigationController!.navigationBar + // Set up navigation bar buttons + let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close)) + closeButton.tintColor = Colors.text + navigationItem.leftBarButtonItem = closeButton + setUpViewHierarchy() + } + + private func setUpViewHierarchy() { + buttonStackViewContainer.backgroundColor = Colors.cellBackground + view.addSubview(buttonStackViewContainer) + buttonStackViewContainer.pin([ UIView.HorizontalEdge.leading, UIView.HorizontalEdge.trailing ], to: view) + buttonStackViewContainer.pin(.top, to: .top, of: view, withInset: Values.mediumSpacing) + + view.addSubview(contactsTitleLabel) + contactsTitleLabel.pin(.leading, to: .leading, of: view, withInset: Values.mediumSpacing) + contactsTitleLabel.pin(.top, to: .bottom, of: buttonStackViewContainer, withInset: Values.smallSpacing) + + view.addSubview(contactsTableView) + contactsTableView.pin([ UIView.HorizontalEdge.leading, UIView.HorizontalEdge.trailing, UIView.VerticalEdge.bottom], to: view) + contactsTableView.pin(.top, to: .bottom, of: contactsTitleLabel, withInset: Values.smallSpacing) + } + + // MARK: - UITableViewDataSource + + func numberOfSections(in tableView: UITableView) -> Int { + return 1 + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + return 1 + } + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell: UserCell = tableView.dequeue(type: UserCell.self, for: indexPath) + + return cell + } + + func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { + return nil + } + + // MARK: - UITableViewDelegate + + func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { + return 0 + } + + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + tableView.deselectRow(at: indexPath, animated: true) + } + + // MARK: - Interaction + + @objc private func close() { + dismiss(animated: true, completion: nil) + } + + @objc func createNewDM() { + let newDMVC = NewDMVC() + self.navigationController?.pushViewController(newDMVC, animated: true) + } + + @objc func createClosedGroup() { + let newClosedGroupVC = NewClosedGroupVC() + self.navigationController?.pushViewController(newClosedGroupVC, animated: true) + } + + @objc func joinOpenGroup() { + let joinOpenGroupVC: JoinOpenGroupVC = JoinOpenGroupVC() + self.navigationController?.pushViewController(joinOpenGroupVC, animated: true) + } +} + +// MARK: NewConversationButton + +private final class NewConversationButton: UIView { + private let icon: UIImage + private let title: String + private let shouldShowSeparator: Bool + + private static let height: CGFloat = 56 + private static let iconSize: CGFloat = 38 + + init(icon: UIImage, title: String, shouldShowSeparator: Bool = true) { + self.icon = icon.withRenderingMode(.alwaysTemplate) + self.title = title + self.shouldShowSeparator = shouldShowSeparator + super.init(frame: .zero) + setUpViewHierarchy() + } + + override init(frame: CGRect) { + preconditionFailure("Use init(icon:title:) instead.") + } + + required init?(coder: NSCoder) { + preconditionFailure("Use init(icon:title:) instead.") + } + + private func setUpViewHierarchy() { + let iconImageView = UIImageView(image: self.icon) + iconImageView.contentMode = .center + iconImageView.tintColor = Colors.text + iconImageView.set(.width, to: Self.iconSize) + + let titleLable = UILabel() + titleLable.text = self.title + titleLable.textColor = Colors.text + titleLable.font = .systemFont(ofSize: Values.mediumFontSize) + + let stackView = UIStackView( + arrangedSubviews: [ + iconImageView, + UIView.hSpacer(Values.mediumSpacing), + titleLable, + UIView.hStretchingSpacer() + ] + ) + stackView.axis = .horizontal + stackView.alignment = .center + stackView.isLayoutMarginsRelativeArrangement = true + stackView.layoutMargins = UIEdgeInsets(uniform: Values.mediumSpacing) + addSubview(stackView) + stackView.pin(to: self) + stackView.set(.width, to: UIScreen.main.bounds.width) + stackView.set(.height, to: Self.height) + + let line = UIView() + line.set(.height, to: 0.5) + line.backgroundColor = Colors.border.withAlphaComponent(0.3) + addSubview(line) + line.pin([ UIView.VerticalEdge.bottom, UIView.HorizontalEdge.trailing ], to: self) + line.pin(.leading, to: .leading, of: self, withInset: (Self.iconSize + 2 * Values.mediumSpacing)) + + line.isHidden = !shouldShowSeparator + } +} diff --git a/Session/Meta/Images.xcassets/Session/Globe.imageset/Contents.json b/Session/Meta/Images.xcassets/Session/Globe.imageset/Contents.json index e2c452cdc..991ec6321 100644 --- a/Session/Meta/Images.xcassets/Session/Globe.imageset/Contents.json +++ b/Session/Meta/Images.xcassets/Session/Globe.imageset/Contents.json @@ -1,12 +1,12 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "Globe.pdf" + "filename" : "Vector (1).pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Session/Meta/Images.xcassets/Session/Globe.imageset/Globe.pdf b/Session/Meta/Images.xcassets/Session/Globe.imageset/Globe.pdf deleted file mode 100644 index 65e91cc323308f8fa86e4c251dc9af29534f7832..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8146 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 diff --git a/Session/Meta/Images.xcassets/Session/Globe.imageset/Vector (1).pdf b/Session/Meta/Images.xcassets/Session/Globe.imageset/Vector (1).pdf new file mode 100644 index 000000000..a849476b5 --- /dev/null +++ b/Session/Meta/Images.xcassets/Session/Globe.imageset/Vector (1).pdf @@ -0,0 +1,181 @@ +%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 0.000000 0.000000 cm +0.000000 0.000000 0.000000 scn +15.087405 24.729021 m +15.087405 24.729021 15.043699 24.737762 15.026217 24.746504 c +14.213280 24.912588 13.365377 25.000000 12.499993 25.000000 c +11.634609 25.000000 10.786708 24.912588 9.973771 24.746504 c +9.921324 24.746504 9.877617 24.720280 9.833911 24.711538 c +4.222026 23.479021 0.000000 18.479021 0.000000 12.500000 c +0.000000 5.603148 5.611885 0.000000 12.499993 0.000000 c +19.388102 0.000000 24.999987 5.611889 24.999987 12.500000 c +25.008728 18.505245 20.742996 23.531469 15.087405 24.729021 c +h +13.374119 1.783218 m +13.374119 5.708042 l +14.458035 5.777973 15.480761 5.926575 16.451040 6.136364 c +15.690551 4.029720 14.790201 2.526224 14.388103 1.914337 c +14.055936 1.853148 13.715028 1.809443 13.374119 1.783218 c +13.374119 1.783218 l +h +10.585658 1.923079 m +10.192302 2.526224 9.318177 3.968533 8.566429 6.013987 c +9.615380 5.821680 10.638106 5.716784 11.625868 5.690559 c +11.625868 1.791960 l +11.276218 1.818184 10.926567 1.870630 10.585658 1.931820 c +10.585658 1.923079 l +h +11.625868 23.208042 m +11.625868 19.309441 l +10.603142 19.283216 9.545450 19.178322 8.461535 18.968533 c +8.968527 20.314686 9.659086 21.687063 10.594400 23.068182 c +10.935308 23.129372 11.276218 23.173077 11.625868 23.199301 c +11.625868 23.208042 l +h +14.379364 23.076923 m +15.340901 21.643356 16.057684 20.227272 16.564678 18.837414 c +15.568174 19.055944 14.501740 19.213287 13.374119 19.283216 c +13.374119 23.208042 l +13.715028 23.181818 14.047196 23.138111 14.379364 23.076923 c +h +23.216770 13.374126 m +19.335655 13.374126 l +19.309431 14.344406 19.213278 15.349651 19.020969 16.372379 c +21.048941 15.620630 22.491247 14.755245 23.076910 14.361889 c +23.138100 14.038462 23.181805 13.706294 23.208029 13.374126 c +23.216770 13.374126 l +h +17.639851 13.374126 m +13.382860 13.374126 l +13.382860 17.587414 l +14.737755 17.500000 15.996496 17.272728 17.141600 16.975525 c +17.447544 15.734266 17.604887 14.527972 17.639851 13.374126 c +17.639851 13.374126 l +h +11.634610 17.613636 m +11.634610 13.374126 l +7.351395 13.374126 l +7.395101 14.562938 7.552444 15.795455 7.875870 17.071678 c +9.169576 17.403847 10.428317 17.569931 11.634610 17.613636 c +h +5.646850 13.374126 m +1.791957 13.374126 l +1.818181 13.706294 1.861887 14.029720 1.923076 14.353147 c +3.286712 15.279720 4.650347 15.970280 5.979018 16.468533 c +5.777969 15.410839 5.673074 14.370629 5.646850 13.365385 c +5.646850 13.374126 l +h +1.791957 11.625875 m +5.673074 11.625875 l +5.743004 10.515735 5.900346 9.466784 6.110137 8.479021 c +4.737760 8.986015 3.330418 9.694057 1.914335 10.646853 c +1.861887 10.970281 1.818181 11.293707 1.783216 11.625875 c +1.791957 11.625875 l +h +7.368877 11.625875 m +11.625868 11.625875 l +11.625868 7.386364 l +10.454540 7.421329 9.230764 7.587414 7.972024 7.902100 c +7.674821 9.038463 7.447549 10.288462 7.360136 11.625875 c +7.368877 11.625875 l +h +13.374119 7.412588 m +13.374119 11.625875 l +17.604885 11.625875 l +17.526215 10.323427 17.307682 9.108392 17.019222 7.998251 c +15.909082 7.709791 14.676566 7.491259 13.365377 7.412588 c +13.374119 7.412588 l +h +19.309431 11.625875 m +23.216770 11.625875 l +23.190546 11.293707 23.146841 10.961538 23.085651 10.638112 c +22.482506 10.236014 20.987753 9.335664 18.889851 8.575174 c +19.090900 9.536714 19.239500 10.550699 19.309431 11.625875 c +19.309431 11.625875 l +h +22.368870 16.765736 m +21.389849 17.263987 20.096144 17.840910 18.557682 18.312937 c +18.173067 19.615385 17.631109 20.952797 16.896845 22.298950 c +19.335653 21.197552 21.302437 19.222029 22.368870 16.765736 c +22.368870 16.765736 l +h +8.068177 22.281469 m +7.368877 20.996504 6.844402 19.720280 6.459787 18.470280 c +5.218529 18.085665 3.959788 17.569931 2.683565 16.870628 c +3.758739 19.265734 5.681815 21.197552 8.068177 22.290211 c +8.068177 22.281469 l +h +2.674824 8.138111 m +4.012236 7.403847 5.332165 6.853148 6.625871 6.468531 c +7.097898 4.938812 7.674821 3.636366 8.173073 2.657345 c +5.725522 3.741261 3.758739 5.699301 2.674824 8.138111 c +2.674824 8.138111 l +h +16.791948 2.639862 m +17.307682 3.653847 17.902090 5.017483 18.391600 6.634617 c +19.999990 7.124126 21.354885 7.709791 22.368870 8.225525 c +21.284954 5.734266 19.283205 3.732519 16.791948 2.639862 c +16.791948 2.639862 l +h +f +n +Q + +endstream +endobj + +3 0 obj + 4273 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 25.000000 25.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 +0000004363 00000 n +0000004386 00000 n +0000004559 00000 n +0000004633 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +4692 +%%EOF \ No newline at end of file diff --git a/Session/Meta/Images.xcassets/Session/Group.imageset/Contents.json b/Session/Meta/Images.xcassets/Session/Group.imageset/Contents.json index 10de2f9a6..93044cb41 100644 --- a/Session/Meta/Images.xcassets/Session/Group.imageset/Contents.json +++ b/Session/Meta/Images.xcassets/Session/Group.imageset/Contents.json @@ -1,12 +1,12 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "Group.pdf" + "filename" : "Group.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Session/Meta/Images.xcassets/Session/Group.imageset/Group.pdf b/Session/Meta/Images.xcassets/Session/Group.imageset/Group.pdf index be41ce92df6735b7f431981cdb1d5fbb96bb73e5..6421aeaf378847be5194bab6c287eff5d36e8635 100644 GIT binary patch literal 4130 zcmds)%Z?jG6o&Wx6t#(zEK;ufMT#Pk2|)-DVZttAF?gJ0P{xL_gMg>!JKgQmo|#1w z!~)T)_V4O*{m-QyynO!RvA1;?ym4mt^Dl!jPo9{kPlwI+QhpBM6kmP2*}grzGZFAy zPVEmjn~UpV^?dXD)p~RO)iZPU>h#xoKm0a$>&C~pA=nmG#0=6YzhkMzzZE30e=qX6I7$qu>ctn^l-1Cpr~V(^S;rm8x8z_3&=-pP1F)TEYEl zldr^E;y7W=cFc^?R2y6Lc&dol5o#vZgl#?*Z4Dvj!tq&Bup!1o^wbPR)&s{=2)+>7 z`4lgy=9-L3QshLRVrrF2Qp;7JBI5O%VLSZrsl4j8W|vx9$oFwtbqjwQIj`2`mU|+s z$@c7e^$X^0$UVkj5&=so6j4!Qjm3DILn9i5m4pQ+%(2jsju8XO#W~TxL>76mrWD1mIRP}0(n9TR$&$LNxm*wTvG<=#t5Aq; z2sDV!i&VfTw5wzjttNg6~K3Ku+}ODX|Li5%SHF)N<9Qh?J|MWPl#r#cL=@k15iU zW~@>I-H+WBBa)XC&IkfxYaCwF+-5A;UPGkwizE^rU^Ldf89C9XSSB`TadLc;q?W5bMLxSpA+%Fe>0ct#*oh{BDRurCnNDb;ZYpv9 z^JE%Z-z_ppv%X8Fi30y4G8G%DYs_C67}>}A39X4$rc{@M%%b2^DU~YqG++ug$}Fj+ z`jjZjTIt*p*%E=I`G&@JkrqUF!QgVtO+AIwkb01M4a{SjfHsuGkdfM=ydCR^D~u0> zGAdHV8pr&pRV?V)BY+9utEYEH8yON9C;DQFqL2R1)NFDbs}kcU+Lk%(7dsV^b|PJv zaiLhZp+`Cku}hV4A1KLAU%)@dO6VgIVrn`1P;%o|!J3#FVRH}*H;#kM(UBa3j7|2~ z+kyDh+r*4w37Z4JIZrF@rO0MbV#suvTj>Z)QrXaMfm4n?dv0merF%zddmmqi#6Cwp zqTkRa?G+61`$+<6uD!EkgO+o<6sNRLgKt4vY&Kj%-Ff-Q*sArr0tXpl;%c#g(48I0%jQG^ zS>#YvQ*YQh=6TvqAOV{Q>>JsT7>%-OFfGE!7zl9Uqi|?MWH_fL6|kJ@45jWUAQ*}z z;u>3=lid_3x)4K}h{fjYn0``mux(@q7P88r+t-|B3A&$p4E?k{<<-%mltn0Gw|K!^6KK*?ho^txG{2g zmY3L$P|!b*lFm2#-G`g?W^ZT(=6n`+w%Z;yTQthG^9a7YxB)X%%m|%aP6g6S>*|}U zOH4K5!MQo=Ioo~UTYt~~J;;e9ICmmR9NeqI#qqO?!^QjE+uNW1akF_dz=L6Oe+)q( zPuT#^k0&bQA6tc_quhe1rG6JGFzwE%TJie!hb=819&RqK-fwOOZt<(HpA(LU``z{C tk$HG^`DhBt>U_657;$(E@aomoUmL6+Z}S&7htVAhx(yE=eEI#0zXAJRJbwTH literal 30357 zcma&NWmud|vo4Ce2iFO~-6gm~g1fuBySqCK7Tn$4-66QUI|SE5-gkXxt$p^su6_Q@ z(_P(N)m>dZbKlj^kje^+(lXL9!;$vy-|U|j{mGv0AB1B8FaT`y&EdGY0rZka)+Uao z0M<{DJb+%*%+k@w{_|<6=V&BsWME@x1mNX`b8xgb(zAkd1tpCVfa_&I7kn}MqD;awS)0| z5ya-QPS73+Y9nxb4rx=W@oy^cupp8iVrKhO@15fP#{|a;&dA#Ezf69X{?7F8^!`2> z8Cd={{w*^7k3}fD*%|@pW%W${`Ls8(b_6j0yC8WZ2OB4Q10x3j+rI)K8*9hUb_c*; zC&>R@+<)o&+x{P?$lBW&C>S{cG(MFIivs8sja(f8S^#<>8%rB|1zSA>BfwwZ2{|wV z*#Aq-r_Vk$|07m3U;=Rd6~poJ{tp9;4FAKzf4QBJ@t@)J(x3CC7x?RY>rcl6=!K1( z%?ym>#RUKFTkkbQ;;S$GykPDOWl?4k9By$#q6h%j+ zR5n!X1{Dh-HV{FF5AfGtguOwL9qf@47TI5qw1B;=VEwa^_BN!pxqR5PxNLIiwb%+G z`|1zT>!=Fq%aWstesS8PiS}iz{{aje1r$jYw0qmw7((n(7;NsfgC{k$SbVVV{({ce zux*v5OP0)G;ln46m|chj3ItAMo{ig^3~L`OQK4=Chv@@i^frl-DVUK7GY2-eoOrjt z%JRPGfVyoY1xU7+gR3@))6S9^*(SS@M!KCB36Z0jLb_#==Lv1pp(v3Cvj0FaJNuX+ z3BrJ$sxy8_mSY*lB!Z4}5q1Lx0+ZO!*=~;%@x*DG3F2C4vKI~!CZS)5x|m|Ne>80T zd|jvTq|Zp5*eA6e>MA*PTaOUUfaP0dlPm&Cs%DjH8h2iSe}1mEaA5k>wY*8_t?Ll|tS z9pAr$Kn@>qc4p}Snq@&peZ>Bf|E70mgNI(G4*%vFfR=l4wlgV{)Azp$wAr||eV z0upe_@a+NRW4D{rY+|I3CL^mG>pJL2N$w~SHZaVzEr{DsHI~j0F3@Lw+XtJC92&>_ zmj$}1lMaYi5T|Uj1oW^C4~Wn=a1v`icQCJ04HQPW;m&r`inuC=7$*1k!)GFR&2Z~& zNdaPogL{M+LwnL(8l1e%K+7I5v{-1zY&aG_ItDNrT||6eW?S$L07#&(I0|?&IGs3{ z89zj=0PhkAoB-nzsB?h1Ey$do`!s~KKbtL-CWJ~iqAfgvuNXgEaL-Q$&<#H`82>92 zj9h`zSj>FnRKW!lJarg1ApuzqbnpS8uvnCM{-+3kTth2-d^U}FyA?1rdC zZtE-SE$IJXm`^cCQI^CyU^7Nx_IvU#(4Vg4OSJsWu)u;y6fG_Et zap5Bkb>r;d+j=)+Ycg50Rzfr(FGjZcp7tSblU=*EQ*EGM`Xl!^T2#aqHLAr>u!y5@?seCzDP< zmk1`ok|&`|t@l%uFela`<00$#nlSR+P|O}%jbB@)k|YbDLy8>FC!0t?hA#61Uqo zLzhLa^VR3ad*N#{m|PEkkAh!bwQ`Q=c6~2Tkc3EDZjyeeewu!me!vdvfE;OiykC41 znoJ4*arF#o!B`xN{5`?&jc zqw-L_47!iZ@;C*N36X7)F@IPNTBdfVR@th|v_IM@lb)!osXUX2lZ=x|{Gt_4r@=1Jq}in4A}I5dUX@;_O71d;S1zj}E5A#uOT%Zhdm6B! z8zGS1Q=Ai?)1{ZGm$z;3tu(IeH&vc`9@ij;L8D#xHSewlS#{ViiFk>q5h;bGxeZ0# z)~Wg_1d9VxGL|ydwxQhWH8r(z(S>ZzKJH=9Jh${GYIvRq)reo1>zFz;=QIkmr!+)r zlxmQwR`n;<&wVTXX%<=rUPHm=y9RZWh3f|m6(zKr&RyqTTxnX>>zHlQZBzG1_rxz` zFO1MUA+8}ENDoVn&J=BdUh}A@N88Pl*O9x>CH{;vK(HYW3>bTnG%qguV?W&(Xk4r5^9Xj`0^{+4SEWb6sP$U0DjuVR*N-Rn^ z#GQiI4h2@J#Hmy@#Xsm@nqL<2e&-G2jpF^%>D*c7MgOSx2KMIsy#8nL>hO8-MFxTc zq8#=JE+0Y^LK&JDo(UEW(g~uk2ehZnpNM`&heUG@6HM?`$T^4`mK8w@_pD3iBtXi|B~hfXKX@Pc%|J z5>Uv4NrZ>tLE>y*@-VahGi3K{2X6O*j#)Fg?rg=rVZUT-sxnrmN6n6k5RZsp6Xhf9 zOK-`(WaX_+i_1R5VnSQUOZ?#=^!{iMh0>Q?{@-zu z6b@>}Z7I?3l6T^fBhBdue;tV+13AMqa#GjaglsOgf$4 zgI{}CFD#HMf)*+@S6ifAw0c^%?>bLotN>Qx%U5HfV^KzUo7UkQb8^{o)t$Pgb(aT& zf-Qn_+a0u%8c3D{mKc`j>&A5z=Bq$r?caC$V>{tHGNfzqr<-bCDo^X<_krgf1@{Fn zE?dqpE^F(@t$$Qg_0_bOrz^L#D)z^3a&Ma2RL(k;^)&2skWy)l=bBq&FJ@0<>y3&Ztl702vU%IO6Y}^{b}Y-B*YXI# z@s;y>XXugWG82J&*)80w^qBlD>%MVXJzPC!VQnF-F`v!ML(*gO*mw39!6X4KU;2mV zZRCAwTHUD0&#AacjEr>7EEn$^!NH*Gh%l^>?<$VGt@V2|zbdOMH^%&cRod4r_9d$w zFRx0#GLuS9EiSKLULEJbZ&3?`ZJEhBXWnMV4VP9O$F_BE$-5QNoseFK&ss0^8~3eV z`_Ui2@W3OWo-gP+JwCM8c#gd`-hM-uAZzoDyK}smz8ReD=90t7P-T|#RlLnVE*h6~ z+@57G>Q2>#n#2S*3(G#pmJ)`+DO_W@UV^`4IT$<$s6Q|G?0HKs6g9(|-W*Uu64N_6dR|goFh3 z9E=PB|6o{ofYyKd{6*RS0nPsn!W{tgQbvYmdV)5t0FA$>mzfE`#QYC_cKXD~i~#zd zW`+)*==v{)|J3$BLGu3&>xJ|j^(<{n{>AqW{{`&-8@K;O+W+em{sH3j3Qqct|ImWJ z^ZGRTcLD#ls7i`U{}7@6TM=;iDHUB6?vnV`HOF-tm`cXaJZ$!Mu}$k-ft|OZ%h`HcHlJf4LMK z#;#1B&qF zb2v|72%yNsfPxZ~C_ef78;A%lo(b^w{= zD_%q)r3e<0F5_FmQ77N+vFp~C`y)~XT614E_FH6Dc@=!WeYMN>Jrsg}2@g$=$2 zlNUFdwcb0PpfA1QVHB|VkS!~bgv{NUdtcv09wPUnM9A>)eY6@3{T~AOKLnA9f&D+R z`On7v?~(D}Tl?=;OY2#E60ZMSOjzofd{RcZe}Y5spSY%FWd+cF?h$~Uos%8F!Or>_ z-x8mZYGxo{ZDMKk8I|+`4hDaz=x5tsM)z;!pCR-@dbZ+5W+tYNa2!lb0D1*SBP(S9 z$7f0PUon8~bN2s;#Q|&_pPHOa{)vmv1IX~HSW3_J-|DC7&whU+_LI3AF~c$b%X0tw zbo?Xuj}!hwI{)RY|DO{g^na(C=U(tBS|Ul-zev`#_DHz3`|B&>&W2-gR)7*VlNRt$p; z2yDs-Uf)~$_*nGLsGD8qG@(wl>%`+#UR-V?EK{yfx0o+gYJj(1!&ad{M|#`a^gPNV zdg_+*@!G~R>GZjGJIC_gZvP_P_ShSf!WmF30g(C%`j%g*68zV+1r8X3FEzIVw+ z8r$W_)n)70BMSpULSImW;kq|Qa$`5G$9~N4p^t~G&1e1eV#MIX%7(pCmSbzF>uCwr zhUcKV#E0+He=6$*E2QH*&_IUcf`GjJ{LvuVur5U8oY1*f&-AIf_&9EJ+??-n$N5lG zFBLC{NTp8O3_uDf1W+feW{;Zc%SXL0MC7^o_1)Wm!CxFc}B*5$X zg{y*BL)FJv4=|u~H7^iopn6OQ!EgWNMBm=$pbRO)tU(!i%qWYjEP6sE%fu|3WmN|o z^B(fxv~(W0yhiw$x@qy0Lde>mUGTfX*PUPF%Ts>?Un%AdE}BOuu{Xn>33U$iP&@9jLQAshGa!IXJl*SvXl zsmWv7%sn3~uXbPVqc`88FGlCfGS4qy)%hB8CoY|j9&1!&%(yIitxw4#KMo!*(YxID zlT_%2K2)@q+su0dqdKVDJTfyF?5;{B0(3SXF1+Bf@FK$Y*0d)(23kJ$2l3Aay=S7l zdZN-V)p-wAG9BK%n^yT+ul?{o3{>!U$<{8MHz&^Dshfr-tfzdOJ)BxQ_>S*6C#6=# zq}*4|JsMYS8dopdE_~y;wy<5gSJ(a8TEKnwky@7tZoj!)IlBzUUBt??32h#0vyXIK zaJnpcUEFzHTuHn1FJB;zt>YE7v3o5^rJfb8Z56&Ev)@s;>`7JDFAz9&di;^NpsjMS zahvbB174(*t*^2*8}MC5a}5xD*gf34T@VztxDak{+_64jIjpy}t$SG8`aJPGY`m<8 zbvaymjJ(aey3FWZ z$g*-VnR4;@&~uptuC>6gyKOpt@Yo(^?eQ+|(mh%{AbYgnTQ7L5l_NK+5jpAHSl?e*-)p*zq*_m|t`)4V8DTZM5jpl9Cz{_rFARPaBpqXk2_UAO@3>GUudJIcOK*0 zQpVp>Zr^JCDAI7N(C8Sr%RH{kJgJ0T2eP-FZtPUPU^O)kRd7vd`Q*2Gm%WUVHEk0& zZJSu{UR&>)H<=Z#I+m>7PF)1swBU6ebha+7J2t+oc&sfVJ9_b4;CVFLcuu_S_FNEQ zwc2Q(S@X`XzfN6bxvw{^tT*wUSi5z!?c-f6KwfYWxik@+cCPMpzQ8|pct1@2SwDzr zxukb#im_|*nOx_cUB4D`8S=WA6k12-yYyCd`gjIj=ny%&T%KRN`@J;%TsEZIb6B5RU8h%Hr>}JSIGnin zu(bVX>U+DXy8y1PS6$d5zb)|GLO+~Nza4yiNDudTl)Bh8?9ptJX+O2Go7pzc;}hVK)7SB6 z_7Jk!I@(fs6N%S8)$z*u@S_Nx?^OFOa`oL?#p_oYuZ}GrMe_^X#UkXxi{N%;Z%R-Q zV;Q^wpE9Z!HfPI&m24t0*JoZcLIOzj8$?YlNCq|FN3N6Mf+E_ksudDp(6 zAa+6}*IC{mb}7pCW0xRGa*VeYJmK zT1(b|9QS3oUDg;w2(oyP3Oq2H?4-Q$8Q;QiGHp)5E^40EGJJj^pD+(hzhPdi7~~Au ziE336xFsk3X#{qasRwQqDm!VncEdziQ1;DPu&3dwypL@T`H}TJYn6 z8pu^Uk2I9+e+w?cnyN${+URV9IyBCr@C^SgYKB8b9Y8?#qfy{at>6(G8>_+Qk-n8VShRjHdDity6n~T ze%;ixIq!_(+7YA~Tf995wcF8DNJG#N8f;F(hkNo;kvpRm*|uK(aiKK|UtQr`3WOib z$^%4deF+EL6Y`F*c}IO>oOb=NOxk$$HgCCi6{hAi)T_K8dqW7m(X}S?{8FWX(O5sS zXHlyE910uLFzp77rs-8ID0Kfwg&fYw$Rc=m1n?_N(F_<^}>dzAf%Bv&vA%9+sxb%n6*Sd&{P@jwbq7pKV8IWzJ zEc$VM<0{|xBbiAe_p}7L; ziTUVOv6#AG_vQPVN@e^gd+66}V;*0o4T8}2&2W~H?ZlE9lB#c3vvZe}-;wgU-)Ykm zoFx>Hlb%`E4j~WyYF~}u5;#?1=X^5CmDQ3!m396Is^!bbft!D)pUErbnay3n4+^nCdOkDw4}0C)95&m5cT-fR}^ z6!gHhFI9O_=~g>-ErW$PVfH-*o_d+G8YoHBe86{sHF=*Iw3UbzEHYT*?wA6CYACM? z=)VI5?=%<<_3laCy4}?{sJh`iuZ&?lyo=oXrbN*qP>s3RSJ=`|K&bAlVX=K@TV(ES6AfJ$10u&l}I zEBxVk6MVryTD1NVoNQL1)@;g3_4=I~-5g}(5wp+RBokr9Y3A%)xc%suFY}xlf#WLysG_~976`0)Ue(*QEJz^L#f2}L`M8A#Kn4whbT8S(& z{9ZM{oJxr^29bd3#sk@qu!LD}$Nat|wu#-{FGcS5_9Bh}*Pv>h-4{#Nc>{HWEngi) zxi{BQ-(*(Wx%u9*pfB5U6v;eoP9?H;6N?@<$9YjK#xPhC%AAVvC6rj9EhnSswoy<9 z84daPg5?gn@?~fj(#cAuC~*!trGL77rPM_6VP+A>N-`G~O0Gcp}B?Dc?OX)2^nxD{`VJ%l)h96mEp^D`P?s zPCn(tWIx3|nt#UnT5ncfeojo0)wyDH5g$kBLQQ^T7)Zdeqhyh3TIu3FAi!9Frqn!@ zFSDirNp8~I;HPfNXt1Joeu-+Os)}dL+lK9B_FJN@K1yH{5+M;pl7>b&N>?%JN%|MD zUrJ5$0~`%Ag`5q8#6IV4G5mXR`4mZMOHsww8V)PWoWF=M8i599M6e5<0SCyffojNY zP_rG7#Ih*&S1Eo>EGl;3R6`38nelD+WZCuQ66ewbWU+2J<5aw*{y1RS&-f{gixmnnDg=p`btWmLB-XbX*5)W1TktoG^eTO zt%mC8m}jZxqxxlpu`FlvP_gD-)y~%qe=2`9J|7eBs=R@2IKcn5j&IW94s!ff+@) z3Aij_4l7lr4(=fnUMbv`3)gy{9hs81qxlLy9_cA{jmtlfOEcUa@uIBOX7Pe42T|I{ zhufa$$x4af8;6qz$!_rmQe2%X!fG&RhKgKcPNjow1`<4tKSZlf zkC&FVee&%D;<}pnTdl$rs+OH*Bz%p#R4hWs&DT^0BL^Ybdfq~>Xz^ImpFGqiv5{#I z$C8wV-*gqImfIzu=x}}$6q^cHWEEpf=NrT1%56RgfBs4;oIqu7cdn<)z^td&Su|v< zF+{r^`>64fe94qFRuozbdcwpZC%AxHGEj%d#@Fb*-J=2-`*8vKAdfz#kDp6HNFvj{ zcNw`2u+UXD%!^xq)!|H3XhI(1M)53%l+n|n+g8uD$)REjWsqd3TP~iGlMnhpD%2g_ zm@e+W!A$n=A!P~!eAOj<>VH=)De4$CLE-g+Ls~Xh1$2k`yW{kS=X&;GdIW_CsOpw* zkvyszje|4vG^48p5n!hVX3zWRB_MQA#~%4IG^6U3ZF2b@LApf6uB&u@p7BJ;jMD0b zp!-Pbeh$dD?p{y4$D9&u!$O#xR*bB%H7ZT;T&#NNtCbK-nX28 zQxt|=sNxIJ2=n5=b}P#$P0a*cF5fh5e-q)K+5ySGWWE(*9TxG^tA0}%kr3c@Dy5qZ zOv3=)~`uzAQPEWDriNch0VjDz;>it*(fvvFQ(*J)E>DvlQml=F#0M^xn2+V8 zMSxo@RKRyK)55T25satSZM|t;N7f4qlB(aBYD8I3*Nw)lXStc|*~)F3=biHMS*?5< zvf3CIMTU0Ah6)7)!BbIHvo-K>;K_+@VfS;Ylyw;l&7kjXImTXnjk}_3X9nLlBQ7b} zuk*w#+LG}Jw*kzew~$DH`Jd(xqpNw{kz=pVZmi6}s;O*W0)K+2V@xwE0(X>wL{d;F zk~e(0;082N#L2`R)dFy_ZlJkp0(mX;@2kvPsR61QVY>7)u1wV6a;W}L2ijFegzfsC zQ-q@US^03_I~;JBfCvBL>-!tyaX_+-H(*Kr8mrv;)ZfWm73+96^%<)A&L ztrNFW&Pqi*MUGltYu}!TsfzL(IFomW2tq)H@b}~A#p^Yx{N^;ReiSSeLUC|_Ck|!o z#NY$zJ8Ot$$wOAR;>1?$lXj;&)EvT7h(^5U2hq64i$aWdk-US!B1J>|5U`rnaNp>O+|cUx18!yvwfohY6+$YGf3C;=M3_R#h!)gX0mx`PfAqBK1F zLM?P#_v;}S6W}Zbu*iaGdUlFn&JE(`qr%t;_x6SV%&rv%0Yedk(}QtM3;b$%EYtzb zpn?0UyN%K_!P~s7Phy@&Mq?@vhw6liStT|ODM$$huTxxt$eQQ9om>xxK!Z=rv5EC( zkcW)=?V!+pqj)mI!Qz&`Hx*B#m8KCE|2wo@{T zb)u*RsBj1}SRqRx(O4s_ZXY@q#gDPQ>(~Oc zitl@Ygu|IjQTKuBw-iQY6)dbsT1j=rame4}kfkUhaG<7lS1t$aBf*u{6%P9AQoiN<=mlT?^K&FF%{hFT+T@hXXvuC0N`S>{!o#h1e3_-$ z6)!0rWCOTm6fowbLAgH^{~}>Bh(Ng59VpTdY;E(68d*#f`rPQq;Yl7Mi}G9+BpZEz5Hfam2yCHznWuOL93_ zMFP4L5T5+8ZfW|w3RyW+ne4x$*QLlP$#T~Dvep6$!;OF*CN$J?PN`&bDJUpZ{NV~g zKE%)vKjG48rr{IoD^1sz+DTRuW4xz6?V(MKyliLcmL7mp#dSWx(`&nAU)6;8y6jeqP1R&c&3jh@U)IZ2eLe$92Lhbwo8 z{25kHcUQl#f)gv+YTGSaDNV={Y1B)}#t;>~&K#C#S*iKE6$cUi+*eeTt`Eqjn;-Io zJCjHOXWTn25EjsMt5^ro=qYVRfhQ2T{#=%LI?L<#M*$ZwWR{PY0jR&XB^3-&-VqR2=BYUTh0 z_?d!E=8VV!zW9`Uh}DKr3=mf5*i%ovUccuP%VO$8|3p^|deQA4o%{AGh|AY4>I1lT z%aa59Sp%Ruo@<`cyz^PI`7NpHKBk_A)+5+#M`@gj`4tTz2^R?Yl;_Xl)TTCiD+Eu< z26rT3kJi|g z<=ChUuE%6BO~PJhda1#g4eX)>s_@G?aXez%Im8NxGmbLj*95bpX9 zc<}<2TN+ zRem3)KT83s)Fdo4R%k5tLcsGg{q3mi$)sP{u1t92N{=QI&I<#-;=+)ZFq6FovyAzt0`B}yBhK1i2qfg zY0QJzm0GcrO$`*q=zXraoldAt^yi@DR0Wqv3Jn)8laAknQ+^-L(%%jU1uVk97-QpO>O)1n(T68ka{3;@Ti^{mZ)yuyD&Yfe{# z#Qxpz+cmk_&^)~Gz$^_7s(aun7s_fQHL{k%(4thXeK#Ln*%$~7%u}gRY5$_Y9$gES zPLgRmY1Z7^gW(#;AZ^G5;}l;H=`I(;sExQhn@-mlmx}|C3ja)1p7C-Ad_gH0W|#@W zW`UAyE27lmA#<0oU`nLa0_$4%6Jw{&_AV8rAN0#2lNF<=;q*JS_BRPsU(i3JmpBj&9Q-L>rgLkPWTj(Ch!Qt%LesbsgnEoS0*1KNz zE2J8MF`_b&NH&;(r>-xxDNcdzFFj`7v@LD}Ya4A)hxR|(mMkK8LvyS%^zm2$d$BB} zUU8zmeOndDvir`Uh85ORAf5clbl8m%8f{=>a9xUt^U=w5u?4Dl;0^)%x*7nI4k)ss z;BS~}v9R7<4~y8c_bPbzgLAuMCd7jwRKGWLaae&pKdX^Za^;+$fdZUkGCx|cg>i00 zutNppe?`y-f_@8L0TAy$fF_^5ttVp7eV5N{jNSbn9at-dZ=-|LlmLDH0CY zcMvARg;)o5m(%pf=p9)&q$JwG=_)=!>KnaX?cSk{-MzG?oyjz@hDX|JjgRC_+7ho zo7ZY-&yeIp2A*Z(G2k)GgemT96R+Izr-o=bZY4=vJIUw!vNmrT8ZO>VC$=hOCu!dO zI6J+{{N+~SowO{86^G|V@Sri;*$Gww(*UJn1G^6xYg8v?Y z5wVyYC9?C3bo)8v4w&1n?(52o^zk>CECz{U; z0tcGLTy2sIh>vH6L}n6b`D1W0)ZSqY31&Z4{s|QNYC8V+P?PTp3SO9bDhcMht5#b& z8%)`juaJEp%eDOUvR`VUs36YAc2cR_9EWg)XM3PxxG)lBQi_jh0O8}k@Ngs$vR>b( zLK494yx|Rt_Dn~uP`Q+k#;f-`9qpioA!C0a#nzdLMbd-ui0Z1~$WGv$k-SbuZ1;J> z#d2pG)>~5f<|=~%;JE^ovx;;r0;nuem(WWk0POIK!n)v26c$O*#4QgB*^NCyKV2a~ zfOa<=h>w*mXGrt-ICrFGVK8;Jfv{BKR|eRw?q)>dzi%7tCx|Qsv71E#7Y9SfoFj(U`_sN@VqNND;srJo>5qVOi(;bdVRKMi6UoS4_4{yJV7S2cxWJyG=NOAd zYi03xEG;=571`r#)H3d2p+E3F$+`-52(@k--2^>3YVQYb?IA}IvUPdiAL;!`3TywS z`isF=dVZY@pAqq>h8i`QyJiq%AEZs^g9({3=xS zCpYYYRPB0cu^KS8+%uNkGq!Z!jFh{KsPlVkw8v4&;Et*q>_>Uo%FeJ>@!N%LDg&YW z?a!%7R6Z0%<-yFHg{yb~LxOw_x2$ZQ@Ka(gb}sn493MqdnR0xiA9VFLkI~P>-hCKX z6WP>nvE2RC=&DQ_V=&x^TWChvU9awHzF5GVu5mJ$*-p*Q@#u$?Z?=Mp=+S%&f}TA> zfjY_uM-(V^%Q=7o*@(uHukJKWKk}ln#D|)t3#QYeNl~D60u@va^Ib1}t!4s-4rsMH zZ$}GW^*05xId=vs8$sO9waAZtzn=xu=S;m`%J4W5Bw3`k6PzYDqkVh1}&>S6aKny=|*5HfF-OMw=+}q z?!_=?|i7(RPn;30;qwdHBE(ALWHlH4dhAr(|Q*gB{tscaNpnbpnO3Lt`h~Y`yl1ISwKo}%qYXb zxh(o1ogdArRfbR5SS@7;N2PEpG4s>!GO*crw$yXSW1V`LmI<_^8Xd_wGU`uP)FEKs z$_p?40MNi?zgJ!~<2qo^M(Lx@^-X3}y@omyJ{-}ALfQl)YLvXfv_dY&;;1PimY!D2 zzXHBd_#eD-vNtVH6uq-wn%1n!cpa^VC;8aG1L$|PL?dz2=k69*Dd)!H4l?&+;(5kQ z^S(UQd1PE8nNA12T7e4kSa~GO8$-zKr*`tgv0FzO zY|l~jL}}=0CcbZqds7Xh*+!wJ_$S%sO=E3pEw`OldBa)DG)bc06o{ZVDS2K$Y~#Jd z;q{>CW15`Y8#Qq7k0YZ9%7EHOHuE4PMOWwr%z#xJa}=6iy3L9qVC}Mfwf#LKA?mQw zDsN8Us=MVIfK0UQnB$@%0yzCj%;LcWxWj_K`hxG(QV{3d?Q(feP$cNT|39^atZys22b5-c*5~ zam|V;DIv~b#4iXcRHL|&t350oWc<|1e9Xi@>F?{q;`*cgo*U2$DTWMEd}$L&FjQfv zW{-l@zuvwGFb0S=fqvH&pb6-<2Z@Z69mBfhe;c~WTX%$;XtoL#Vfa(a7NKsub{}Q0 zp$C5hit_m7=%h;GRmHYK!_c>H34;00wgLpb;Bz|0b)@%=RoaTEuny(dO=WrJHKa}h zIHt5fv#&UeUXr?JSh>$w` zZmWAZl;z46@L6Sq$Q{a zJHVp*oTG*{Fx^v`Hnk(4q1{bhfOhPp9{E&XpVPBR3L7Yy7#WicqG<#pB2h>pqcye) z5Qy5tRBt#(kJGcuzcXF&xP#ProVz+#yeIs?_6^)c30+K>c`$1YeER3 zLhyw!ZnWh#kHm2DwP_NPba^sk;V0H8K;Iw7r5P@vVX&3v>u4x>okjDYV6tEG92{n3 zfkx@uzx>`&k(xr^m3okBt{gM*ZhY53>6omh%e(HRVxjQF-oz#{HoF=Q;Hg(7LC1&} zpQm*qf3qr4)Kc);#Y^1UQ;bXR{h{QY#zYEqMV-Za%r`&QS<9hhr57goRWS1*DeZJE z+K&IF$RF?VW;|o3*n=gBayyPeV9>S!cEEou8|=dSE5>#xyZiZ~PRtY+)2=wtDvdIk z;?>8|Dp}oP-&x)vQT3e9K1L5ltb;i1>@1y*<^r1~^)-RgcH-#VZ;LJK0xFHc(h?X* zJ6f#tfe@;Q?Ld?dw z4%CYarj_7<-|WmSW<~}OFe3pynuX|XJp;o`S13cRok@F0HKTK*iN7tx2W|2RBN~%- zjvfjM3|PJ^g@41FYCsdX$Nl`55$?`lh?|SajcC&T+Am7|Tvj3#X4Vu3EZ6Y3R_D%I z<}07&6&xCjZ+>@rGcTM)GW*h=t!OOi;{I&lhK!`tGO^We2F?CT~ zB$wA}IH!~#uua5dO|C<-#!Old3AyTlVJMrpT#SF*(WG3C z2u5)r=$E7zh4<2T4&$L+&EVaseRKUTOYmScv=VMu5ArNqKd;(9-&$Ny4Jyp$jFdl> zqwI(^OgNVCp_bVpW+uR}og0y90-ui9!w=DcSfnV96Qdyl#q&&fdRrs8&+-sZ%f_-r zv8>r$Y$BxFs0ICNMk4eCFpXObt@;Sv4tI1-JaHz~c2_Rx46pD@Eqe!yPcas`ZCMPt` zqvluw>r#h#UA201fB_~af^%zdI`;A`s};UXM>i*)p|JC&gS*BX4d~{a7vFfH)SqX9 zS^Air1(wOYcAf4StSq?fuC*oP)f-G4U9s|8h4NsUbL?Mc`AeWP_bUcgw0_@r&R~o4 z$QsCb{J>JNM$7dZ@d8FE>?Bmu%kBx{$5W}J{R``?SUQT2t*TQc2*sI%+mvXEe-~nP zu?>JLIlo4<`&C%Jo5hPvldk$j6^tY8ghVZf7h3|$^Kiz6p%%o6aefoekkWkT2Cw^> zY!pJLCZps~$ZF5SSYO%gSBT=_D4YZuaWaODS>zhc!Wt;gJp$hkI7i5}BAyr{PvU{U z6;z8SrWh`2wWM4P#5K4ln0!_D)}z>~1@Ih!1ShX9;aV0_#tMB2Ca|h6;LeXg=4TP% zQlod2Wx8B%%I;;gCD^^F!Wj@xbGwXf3~vSBXWNm+R$EO2?Ugz5-oLfx16zEWhY8WHeg$*Kz}M5qn`KeY(=49Zfc^bBMphxy=$6P@bJ&!m(E|1Gt& z)TUUd`Jy?1qxV5D8mRUm%lqX}%d8N0T1a9}#dKR`Det`W%N-WqB9jt{ z<>47i518+_lB|b4C;NtHRZ8 z9v_pD`(zz9Ctk;DrF6apaBboIV_(l9M|AK$rIU9Y=lZLrN^)*hI3+?$q+7ez$tCy3 zXir;^-Dz({Bwuh(%V{vL7=y2+`9d-_ujlw6eU^U9Pq4Z%Y=I|19uZ+TOsz0{lkV0&8 zh8)E}0Q!KXEOJV3B;5c_oB4dC1C2HLYo`%3pAG1mv7eF%b-|<~n$h70s-7)zBF7`0 z!1%yj$cN92f5{*^8UAt5IQ5kbEKe_d`~Bj6-Uf8n{Iipk(Glh?JkfTyYwiD2*jWI@ z(Qs>eaCdii8*GpOVQ>%bZb1jP;O_43P6!^{A!u-d2X_swS-$_?mHXe_+ODatp105G zo@%LWwRLg+{nAb*W0hAsGpI?kzLjl7$1LrJsDslZf5#i=p*i)MDzBz22K+_Hcf z3{`!MC9GwD0c+Vp%YJMoEPQj7v{bYiFHG&c!(0q#=I3X<`o$>=QYLXm7;P*M7UlA` zApnigXs@Mr)cPEgC_}o5D1+9SxeCH0uK8USt~WXj-(8?yWyQbF+OJ43Gcm1BoZ@;5 z0Qg;GO8aeOATa|`qw?)i^t$jG4Hvd{kVh+L`q7ijj`Yw()g=kv;B&HDI8XX$-l6V! z{6>St_~D0XZa&BR825+-o<&*Z!MhqqnJ@L%WJkix9X~(C3LAOw1|mpz4o%H!V}GtNsg3npuxFcSH9Pk zd^kY|!ndO`Z-~i?!bO=up;8;mI$)LBYDfyAcvpIAE)E-S4=?M4W}k_pz|8Qo4oJ zpdFRJa4l(1Tdxkk!yvDDjL)i?9TZU(2)#?i+|$sp3e%(V5zAw@C9U+3nYjnspj;^0 z21-Sl#p%;B^#JOYLuG4rzV_Bv?Fi*I86;>8cg6t^8+By91*71#i>bcT)T#a`uCGjA z%WZZHAGaevVkp@$X+plPeSy6ULJ2lF5K8hYo#+QDj_%6Q#2F#Rmp{VLM+C&=B(`p` z4*Dh%j5yt(cP@^9zr1P$Cc2wnkE}pfOOGV1Q}A1>p9$xXi*YLAU8^}AqmGw--7xOEHMSyFFuw@K^Q! zo(Xxse_=3Cu>7F%p%b)Lc~B*g+}Qy7O- z6AU&SQFRL42+#KiaWoBnlK?K-d`5RHeU($Tn~PhEZQ5!b*DHKM32@& zX%tN`oD~?m41tnZMMMK75JrgjGP80Kw(Ca$_oN`Arr)q?=nT&-x3~8b&~J`^phVO} zaDMe|i$P@sX`?a9?&-xrcs8p@_Sz53yb&(YX2;c~)^W5&l#(Rjzy%J;(HYiQ$0Rfps)lDAo16Iot2r@Bo?J&UwD}2 zfFQ&V_7oT_A6A$8ReaEsK#rSHL)6o&v&oe%S_v3SStLSql`YH7yj>a&NM#C@zOhj? z3k=Go0%{O|dB%m6mWq}Ncp_9!M+@$#jqTy6H?TJ&uD$!HUwlGGyxXP_I+a;5 zLw(?ChjkS%2d7FPhmMZXO9SMUMtpGU>I} z(LYH#MU%A784WJW8+zEoRKzJB5`(z|?v01ILIrvVBQ7;25rSK}!4ulY7Z^{0oc?`2 zyKLxezOV3G78-LtLo0T?8D&e%GvF)gX(nWs7nyh`i&N%TSQus$t{^C1Y-;6FKl`Pi zuNX4Q%O-3|F|$9t(zTr$@qZ{H*e%pTp$a1tU6YkCWh%+0xG7a1g)ZvvPFeFfdBK#y z{pJ149oy+iY~hpv{{T908$HRK>fmQ3md{371~TL)$ES=k{n(E=c`^tHvp*@CrwIFi z7NXKR_S3Y3-)tgMI#6D60Zo=^hz29fHO_E!CaLTOzroGRX)vNkPjtppRH zt$pK$xk{XfRpl44zrS_;m(c-G_K(qF=jXT3#h7%`a+0YR=Rea}J6VVlUVmB}G2uwX z4uf_KU49g}qK?S!NU=*6myBdWZ);GXMvzOE<~*ey#lD}2=C5gEkk_$Rfm`mgIxI@M z;JRumZMngWI#EQc8GPEVuYAW^D~UX*?imI%jIU9pju^cMSItd7#w>zcjU!9?z;`Hu zuRji10KsPFsu#hmg%b^VUlL|whszwpRQ`;!p2-DADtlrsH!lhGiE?e*h6b9J&((b6LSP#@HQp%*WKDREnZ zRu;As{DAMziI1MxgU&FIxLL)CW`oe)rdUF!s*~y3!sSc#ReU}AbfRdNm-#bkNZf+0hhi7P->0SL#ip&PuR9zNudd1 zlt(B&!MX?iufdF!L+P;2sE?OPAYCi2+&tEFr&x0KI?jkC!zw5rsD1jcW3SfbCJP+- z7?xBk-_QIfrO(A(Ec+FWi4zsN1q_^_u=eAivCiL|ET%Tkd&v6y%bnNe_TNC$pl5BD z@W~ALupK0(Q)u@4^4CxNB=pxFBt{ogOcmdHWYEtCK3mHbk)~6?XOGme`5yRAL%;qVi46A^0X;^h%+At!1n?E>0?&@Nc6t*d7*{d^plyO{0cYRX~m?< zyT4^x!&susMz#Q57Ojj)=_E@#6S=E~RzbohHe{Fy=0>bIa3Z0w{Dy+}HKnjxnOvgQ zcC}89Q&G*XBdn!RsPnWsYs^Z`Bm?jaMlQ zFsAlF&V*l#wzTD@9MdGTlwHjQ+>#t*hd!EAwr>e3lF^ zjw1df!27}^Q0w(Gvn;wKi-X{;2{IoGZJj@>p0*S589i>bGt>DaLb*+dC@~wfG@|!_ zZDFOhfH^7qu)01nuBk7Noe$H7t$qc6rb{co5c*}UUI?2#+Rx#{P@_X{=bl~E5M)7w z#Gk&tM$-&Ej$UUcV-})5z*7{}zyo6#7=e1UK-IqG?hgxe+9Z;4VZ7FYjxE~9pBimY z!+W(mAVj~`iG2_}pgwK2#CpRV@Wlk^NuY(i1aX~6(updco)m4cEuDasPA3c0FUfjb z)2a1gB{NZ|Q^Mg?UmOZ0%VS4xSE`F0RigGZtq+nD zqh`7@XB~1!Qify!QYZvfWTGv#-g#~iVwCy6Qxnt z$JLL{x81-|L*8__rWacwcZNLe0~Fg$97)Q%x5r2xz1Tdu>AD%` z?Bk4y{pgx+sMD&jZ+tX`e;=n#UNX?qS>7^3E_O*ni`cHDS`TV`4st!>$Z5T-U8P(~ zJWrh4d=BcsIkGP!rRj0xRDKLqgnsu=$k8bGwqD`^D~A$ZH_8h|V=k{zvSU>- z)=A4+e^p9!NTkprlTmxs5ya%49PRk`Yc6y%6AyWCRQ6NI7^#;7OD5yYFpn}2!RXGEk}B=QH+1eZ)p5^P^U)FGt> zWfwzG{ysIqM91J4IE=gBG!eY1r}Iz=rvt<*;>pIDeRT}$@&yBki~g=xD@s}bZKOB* z6ApiUfjsFig<1hTZetPQlTjna$Des<%XuSqt`4t%YB4!)@iqex$`}S)rFboMRlF;MmtWW_e@Vhgj*8W- zn7-P9KU11Gwj!B)1Iz4FV-?*xQrIT0r9`Dum0q$HNmcQQEC-qn;B+xLA*7I`yA3Is z`&$IS!q#=$L>qQ#9&2r&)pr3`Yl37kGc%(mnA_O z&z)Y$s>Bq-02AfDbMzhO>=L!jRK_fk7s$Y(4F?y7HROb116=I@yMsd8Ld)9LxUHZsF_2m!W+n(d2+k7nAg54pZHGX+JmOtep>*wcE%V?)nr_9a^a>sPkT@(1}c@;KF zf>;$*Y%+R_=PU4n(Jnm0)B99d zg;Ba60(|%|O@_+Y5%d;U;?5x!jr@|K>lBDg!HDeJbF!lOMl;h+ERlv0P}aG;h&uLW z&oO*K4sa==c*JNuMIS1Bu#6&_Odq}=FS$K@Dt`Z~c$*h-aVzYVRSwh7X-IX6yvAs! z3WT+@8qUAjhnPQtO&gbhG~Yk94Dqg#wn9YvE*{ajtFH$w4o3ZcR?a#i^9p_ip5{>q z_P1eGmv4FeiHcQUkWsWjB~s)-`^{U~lzWS&FbCL<<@tq3hvk-2wT&gKQ!_y!D3bH3 zUa6zAt#Kz_7;5Q{f$Hzgq0KDemTLmi#rV6%@c$DVeDIG})>Fd3pd3U)! zR<*ha9|0@2?cQNPszIFRigOF_O^|osVdF&(3{+%@A4mlP?ylGSC7UmIZT6Nsxpoqg z1Fa#IO21VsajJt(@$q1Aio^bcJjPxsgJ6T`v=w*Xr6AHYc&3@kW0v`llo`vAAtt-Y z5oI$xksKsB?$EEHoTnHrZBDFtW!l-cMEow5^Klq@%yyB?71ang;SgZOExtR5HsUJn z_cPUESxt$!iu_Ho{Sr!va>UnaW+NyiIg<}EAWpa3r-By+D&)8>HF=2?*s7esc%0n8 z3*0Rh$xMzBT8-n(rUA(v z*B4;C;^%LmpQP*eAxb%d?SGMfBaMWRxB^i4Wqdqg%V}!lE8!Y}$zT2T3vkJ2v3)%g z%luQ2;Evj$R)Gsxv0%H1r^|#fssh=URph?1?JrK$IzjeX<&t({jd7N=BIs^17F=J7 z@V)^&zQv|1W4ger+_6S%H^3E+ep$eDwc3ktbhdEzl)xm%RzmNmVGakx(_9u-0mA3M zlIe<7EOtA=X|o3YzC@O<+Ktxsl&cSE&Dscc>B5X*Ww z2uQ;vfT2dLB``Id2$V9jmqD$WctWg|!|9ipa45_u8@I}>l={bpBf{KAGwb);{ZMx{{K9gsjZhJEwky$U_X zrkZb|op13?wrk=$W1~#@z=J$o3Jr=jPOeTLwZB~UAdjsE+Tj%XZM9;`Q6Do2afFxR z!zOX}h$=RuAv0w*H$wI4hWgNZQ324`8iLBYZHqVZQS_zIP#xXjrO8MvjwwEuM*KCA z!UG_K98X9Te=&kK8Pc0Kz34Buw_EVna6+w(G6AcNO;xDlb)efOxm;N+pHc2rQjfW` zcn7ESP7}}EqiUDje3Exn!>H&m*&-nCAg9s( zQ+GoGWQwR(Q4Rc!*@zO7OACt)@X3=N`CDt6>11@WSF zqf}xB!(VuC<(%^E`bHj+HR8W8ZJ0)s3;iOcLQ?Qu!f#>Agr}jG(z~fcO0=IYNjWYM zwiy&3&(_jhVYUZSEV;tUWQs+41GLEqo5~*NbO<8 zCtqqX4UdaLHb^EhCpPqSwU)-BUNaXY1Q5uibwJek$ppxoFqt!_R~nqoGP$KRtKUOa z8J(szwHn)=sEN*;5|m`hK~4^nFXfhgwOLA;ByvsVav9WB7c27xkFVg;r<$10mZY(e zkOy{t-HT}(lb5e6-S=>z9UW&F)%m#(FLc4mco+Q9O;|F!w!HTh$0!sfrMQbDQSApA&I(|-`m6Dc=OXG)FtT|BR6&sZks6? zE~AOQw8UX_r=|vQ-yxfk2RFE$k)^l9uDd$>4-IS$TZbWKFkZ#f%}mt{$`aGv5*sFN z5BuPzWCwcGp1ynG=2pY*orixT<^JKZ0+>oP2+{WRqLSUs_G5$|l5iIf&65-V)Ez^- zFlCQYe|e=WZL=q&?vuCh95OR!rO^}{*{qVjgA(Ug^;w%|a*c(#umDzI(E-=o;_t)r zLU8H$xzOT8Ih}k8)Ny;oG#7QnzrSdYNdSXAXu_^h4b5*zWFWu9O{x0#unX4Z{FV}|UHY;O%ApG}y1e)E(&QG5#KT-s{?`Q4U1W9i73-4_t9w3dt z3bNk*Ap7j9D0VZlF!MlCSX66l#s85U?AIXTjxZeSiZk7n8sD^ztG*s6I@VltvZneY zDg5Ky{KiWgUoG{z=b4oLXFuag3Q6?E5<${$j$NNVPF#IujVuSoe2=PFK*&n|!h$jypowoM-HR-e@5Va;6D zujuILPfL`zdq>;xZYtqvCk~Z8Q3ox=%548p``&H`E0AXTVnL5&)`n=#+4j=4#gwtI z8Ux4wSep4XCBx*m<*b;|eksRJPI z`K0NE$K2{z`FHj-O(|Kg;H`KD)=Iii%w`D*oouFZsLUZ%L9P&!I%bO#TlAlpeS!buZW%y| zyaWZ`cR3txH$@!5EZ+QqXThN>LZzYE7=6eS8y*l7fS;YT7QMZv>asr{{J54T8AG&- zP!W{5T6dds|7Re_cig*~MlfBxYb`ZC>AUfobHbk+AAPRVTQD;5ASXL48nl>*3$+6g zBLepe(Ju4qLvMCfzjtXi7iH}89)5&Nr9B=K zswrKDkp$L;u7Dn4)y$@U6K7CEYs2p3qz4vS>5|To4h4W?ex2VvxO81b}-A$ zf*v@rMs6+;wV8#x!5U4EdD`509?<+~Y0?V%&4apZh)$#?QHdNWdf&ZnGrZJ)JYFK3 zRrQzDi1hJF*WUVqRbS@UW^bZ$3wxA0RftRi^yPSC|kw zJauXe(!`g!t%?A1E9i(Bp6srw)qP5@!SJ~;VP0!NN_TfaWk|9EjKXwE;HMxhBAlc% zrp`+kwJuDV^2{aQ1&)s`Ya?} z=nhI8YIrtXKWLBN8C>ZX>1`M7Y@bN^Q8?7?Dp4~8)G^^i1yDL)HNd5__13%RxC58B z2QY$96y0`Ihh?UjT@AK*6-Q;RN)n+jF^_i#7RMs3;5fB^1rB=`A`!XccPSlnEuj1+ zW7$adnFKHekxTH&ww?VfpLKL((}AEvc`a~^kxW(px|Vxm4z@Ws=;vKyi) z)8{}d;xy3^W5F-NgR|LU!e3~03J+RYrKpDXQ8sLL)ZkfPirGR)MiX;B+qOM0_~39` z+Gpoy{g&8L;Bj;;x&FYR-Gs~1In*a6HDCoxhw#>(Zy|=LY zY9h;kzvuQ5ei$FDQfBR`abmza#{V6=M&%nCjodRr+C_2rQ=wwv>eRi?G%`DG{+-%aNZQH1qCVC5%#*uIb zk#%6wBhkT5^5F1Jzx;{&qCou^)(Aygyh03MK zL_zLMWD$Yk!V(Y{n0nE8FS%|tk}%Di_!iVIp~4Oo+@!Q0?kW0)1!V zV2pZmg^X!E8FV;(>>>e^1(v7MHqgd|`ok0}q^;p^j7^syanuIH>UXNRnAwl>%;C=M z5N_Dn)C<#OLGyl?2>&tQC=N20!k1~nLNB<@pTp0$iH*T7l4U7|A6!IsgSrg$CALLS zSCAUjrGsIN6BFWc7N@S&ka=tjXqJRmaKWw_6|dWB-KW(~miCOk;(WAJ>M#o+r)lPG zBNjdtafO#67*ggJo|cn;`{WoN$ z4|||mOF{Cp;NTunVR8PK!2S`dWvJpP_0qK>Yi_wx?%cydt=NgUF^v?(W8zN_0~eqd zq)B9>1Z1Y(nl`$v;Uds^8!6R(px z_(NfgP*C$Dp52XZUJPlZ%CKo<39Pm`l){3f*(agzh4=!GtKn7Z&H8jdfkFFK*`ajO0H&)wWRM@71MfvIXU%&J7qhfxIKVxe()& zQN`_}IHBFY@jSpqdj>mqVx-l1evW-p)NWhdi{(eHP~;N2I0>KnVr6Q^x=dM)ret-7 zR;xSHIQH?`g&zg@ch@;$t#xO&IhX{X&l0{+4fCR)837p;SI(Zb#MX!&O^`?$xeNLM zBclKQ=1v#i&CqX1Ok$KYMSo7~!UTlyt#hQ(p=}kx9*Pw659K&#dMi`vT!0}ZN}Tcw z;Wff+n3X(BmENH42D%GGhNxxssxkxjQFeBI{Ev0g!x~L}aONsc-xU(SOLW#5YW4Ep z*Bg)PIZuBD~2Y-{C`pj({+{{8j!_&VYjld=gM@{@fyW zK_bDqHnE@`L&!!h6nPi|0TsI*IBRYLqu=$O zVFaF|9s{G~PGYPzNllIH@P?s#VOZ~@4skH02YEw51h|>6ETnr*$F9zn&d~wu0xD=9 zc1KjNJ+I^S{-V5CaSqdAn$Nz~hG!19-j%Jin=UI9J`je52@o+TG=Ux&Si$FLQU39W ztyjw%&V9S}o4*K`@zufa-x-0x^?epZOv&w`bQvm$Of*YI>LC&1IYPzmh%PRMF#$+^ z@tQ%{L_+*~zzVW&A4UpbT_8weUaF416v``9Z@8oqY%+~xjq>zF;e&_@Z4Ee1@+E2u zk2B#xb7#ZaA$l%ELzlf>fHGfmDo{s~x%mCee<`7~Im%f&EgHXaStb@{jO-B5U<+q# zh8YDvs!0kv0p;bqkf&-ajvCh4l^F-oqO&TV3pchpbBRc5>I2GKfJ~NNd@uUn@HeVo zDxz(Fa_~%c`bO+-!=BzzkcfWw#HbSqsJxI>?T6+2a_x9p-0j?QD&R;jF?ilifP$H9 z4-j1ysw@cL)8;Wk&~3oHm@BlZP&}HGxkQ1&LJr1RUEGv{mSMc)C#1#H1H?%)!Q0%i zAHnfmkLP6N?{~mIKOp>W{}LGM!XvO*xBqB{+Ubv3Y~h@%$Id)?`C}vXMU%$1rQjow zQnx`fuy2+(`ejNW;~4&m=M$lKU!EREM*nw|5{Zn&V7dB;wy2^Qv04a)s9`}cdc{{- z4aRyk?AUqV14r}3I&2>kI`ta-OE?yb{oefGL~}8Xz>O;0X7g+wo|12YIiHGB)WtHY z2GIcqb*!gJ97-Q-xOq@4IotV;#hlnX8eODF``eS3mplqYiqgx$E*95|*8a0k@Fe>9 zd`qjQJk7l)#@B()A4F*Ht&DoW37a$BB0f~;pHNNx(p!&4Pj3MjS5@>ZC|1P6y6laD zqOGPgu*gXyy*Y>n5y^}O><+p$n1;cGKZD;LfIfG|X$W7ZoPr86l)6C z`C%RUF5qk$Ep-$85)&Rw9UzfEvZlpYl=d}IN(iYf-SHuyJ@A9w zKBy&QP40>=^RwP5Zhs9BWtN{>b(HVmI%9Dyi$$nS0AYWBAHQUBD^6#1LPV~y)#w-P zIoha3NDRsMKJ9?5<>jN#+xxj@6?a=^krI$#bRvrWZ}l24*(4f&?|ERJX>l+nQw0K5US|mD=q8&gLL4xigMXwR4mn~s z1K_%Spf1@>$@udmTMKIBIZ5*!QtIhLLs`?~67$!!Hkn(V`-+%bCwkqAdm|URN8Xzc zDEM!PgQmju>3EHg_zq_)3j_(nb!(?F%2P3Zskt#x{%Fo+?b{R4e+*(9DGukKflZM? z3JnNbmu_MWElPKzXF%05ZCR94Ybg;+PwU1v=y$U!Aqu{UiQBiOk!0h|Gnh?n7!%_Y zx7dr;ZX4@DU>nCpi0-L;bjrpV1d|V_dF&l<3N7b3VOsqral-Ayczf3KoKH1mJSp`= zIcI6Fg4J^~jPb)Z+G-Zx=j>BE9i&0X;f5d5BIFm`)V`RZ1hBva7ekubF@?*dn;FG; zJU?dr5J4Ohjuo^@zIcH_D#C2wd(sI8FFMe`!E^*p5o<%O$o=6=vKd(4L?1j!Yn-s- zyB*#jb495>s0fzHJR54haijoU2UmQvy#2X%S4Y9e0?6i^UU-+TRz(z~4g@ zhv6ark+RQk`gPD);KR3bp z(ZjyB;+f`&pwHzL2QVYT<nK)$ways-Bny+q1HB_)x7LN`v9>zdjpone zk-ek>=2yMa@2z;|?FvrMvo>FI8W8hR#^eUzC9))5K&V zOiS*i-EcEM*<79MkD1ghgJ9ygeK3P+KcXT~WFIaMGqH1cW{J7gu>+y3@eDtItyfd6 z^GrR8{vtW=^@ICm6B7^qD&P~!%`;c>?iWS56+#c)eyL)KuI*rZL53@znZV;%XwSwYUME7fSpoynr*+$E6r!zMC9`i^ ze^3viQB*9Lu#zOQ2RT?_dV6YGPz+s^gseFs7Uc)L3`PN6w1EpqRp0pKkr5guCi`{gg>iy|B zQ6+b!Zg6Yyr*NK_PxOGtQUGKnTw^O9A{dHI;D?1^Dqxj;aY%Efr5sA?Fpaka)1XOR z@Uqg(wqBpcXYmuc6mu{*u|{%Alob~7R(#c10$Nn_z3F6Ko{Tpq0D+((t3C9!cLsqh zs)*k(Ks@~}puSXDV3{*s6euyySUg-nZ&8Ddo^mxxZzt$#${%{fAJfU?%=|YiWw)i} z_cC<34aVKf40C%7r?dyN{nxXCcoAgOLbuU$j=qKMDW~?+SjlD)8atrr@vA^&2_ZV{ zwZ7J)tsO8U78al2X|!BBHToC8F+o(2ROwL4(f}3EU}_i82{xztPP_8Uh~UkwM5?L> zVV|Cqg5wtaA`I?y^$)$=eY})s?|`-S@a-prE+vc00?A=N!B>@3DKb6uLnpV?Cmfyh z2qihWG7I^f4#XF!$bn$6<2p<>^vU$e#&fZ4lBWWft>y#QJ+U?Gp?BXbvS0$-YtkN> zviDkAH(yX7VIunuB+jWNho-VM$Y@n1{jUj)IBQ8}Ebt*=oOozxG=ofW?tm{;D8E=a zf~`db#a2v&ClGExKA63YfYm;=>Sh*Ua@0g}hEWnoh2f<_D>?xGE?emlh8V|i; zT1|JT=p@sQ5j#o1qq+$au_334Via$`aY-WVhIBL*!6154Ck05%mpY^V8Ic8R53GcC zCUbJQ-+~!u^K)*k1jot~@3^J9Cx*eO-3mU`0jc7{V^;as|zYuW)(lJ}Agv!LN`WR$Gy+OQR1+Cj|^hl3ZdF5>7eRRBRz`BCBchC=~9!ZQF9P zj^N2=6W~(dj8pxEBTXG15rZwzMBQMW^tCIuGR(r3TD|0kUw=Ef1lN@yVa~(ur1K_! ze~t07LSS>xytQ1C`8!&*we=QvLKE5TFsL*Abu$ugef$;8NXoh(&YQl3=i4p8HIla| z`5+&!K+C= zmP7)MSlkq-jG#wsWW_CMl7z!+0;aOXY*_sbU~XL4vy>*1I>mfJBqiDJq*b-Zva~|O zm7W4>mt^IG6-*E(c5axaPO=W7|6+`nJ0<*IU?=~R%)`aY1LFQ)xRd{bgY%BFF?Tb2 z2YE8uo0xr4qttw7(O5e`-svIioV@JZl=_TfZq|11I3EECK9D{WrHY%0v+Ebich=>< z@R**iOz&{ZcjTw*dy>REkP?|uLXZo{1q5>cGvegr;@1TN8Qwqdaf%M+|AbKfzeD~v zjl|R0!V(!s$;prWjxqVqffB^a%gsw^N%#gTp(8=^xUP>N~RrV(IXXWcrV3iFfXh5Rlu9n_Iw=%fb}IZ^~oFZEnsB t0-9J_0?p0LfLwe)5#;}W$bW!~TwLFetAFiuE&+aS0c1Kl$xl+q{{scLy(0hs diff --git a/Session/Meta/Images.xcassets/Session/Message.imageset/Contents.json b/Session/Meta/Images.xcassets/Session/Message.imageset/Contents.json index 22681b32e..c6f97a05d 100644 --- a/Session/Meta/Images.xcassets/Session/Message.imageset/Contents.json +++ b/Session/Meta/Images.xcassets/Session/Message.imageset/Contents.json @@ -1,12 +1,12 @@ { "images" : [ { - "idiom" : "universal", - "filename" : "Message.pdf" + "filename" : "Vector.pdf", + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Session/Meta/Images.xcassets/Session/Message.imageset/Message.pdf b/Session/Meta/Images.xcassets/Session/Message.imageset/Message.pdf deleted file mode 100644 index 46a40dafdb84ec47b20c20bac5bf85d2321aa0de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5742 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 diff --git a/Session/Meta/Images.xcassets/Session/Message.imageset/Vector.pdf b/Session/Meta/Images.xcassets/Session/Message.imageset/Vector.pdf new file mode 100644 index 000000000..86fd5e008 --- /dev/null +++ b/Session/Meta/Images.xcassets/Session/Message.imageset/Vector.pdf @@ -0,0 +1,91 @@ +%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 0.000000 0.000000 cm +0.066667 0.066667 0.066667 scn +0.953107 0.009306 m +0.829203 0.009306 0.705298 0.027918 0.590926 0.074448 c +0.228745 0.214037 0.000000 0.558357 0.000000 0.939899 c +0.000000 20.482357 l +0.000000 22.417992 1.610750 24.000000 3.602744 24.000000 c +21.397257 24.000000 l +23.379719 24.000000 25.000000 22.427298 25.000000 20.482357 c +25.000000 7.761148 l +25.000000 5.825514 23.389250 4.243507 21.397257 4.243507 c +5.642394 4.243507 l +1.639342 0.279181 l +1.458252 0.102367 1.210445 0.000000 0.962637 0.000000 c +0.953107 0.009306 l +h +3.602744 22.138813 m +2.668699 22.138813 1.906215 21.394339 1.906215 20.482357 c +1.906215 3.201242 l +4.555852 5.825514 l +4.736942 6.002327 4.975218 6.104692 5.232557 6.104692 c +21.387730 6.104692 l +22.321775 6.104692 23.084259 6.849167 23.084259 7.761148 c +23.084259 20.482357 l +23.084259 21.394339 22.321775 22.138813 21.387730 22.138813 c +3.593215 22.138813 l +3.602744 22.138813 l +h +f +n +Q + +endstream +endobj + +3 0 obj + 1003 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 25.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 +0000001093 00000 n +0000001116 00000 n +0000001289 00000 n +0000001363 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +1422 +%%EOF \ No newline at end of file diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings index 4650c3a01..8dd59a8bd 100644 --- a/Session/Meta/Translations/de.lproj/Localizable.strings +++ b/Session/Meta/Translations/de.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index f387abee0..145fe9ab5 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -497,14 +497,14 @@ "vc_enter_public_key_explanation" = "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code."; "vc_scan_qr_code_camera_access_explanation" = "Session needs camera access to scan QR codes"; "vc_scan_qr_code_grant_camera_access_button_title" = "Grant Camera Access"; -"vc_create_closed_group_title" = "New Closed Group"; +"vc_create_closed_group_title" = "Create Group"; "vc_create_closed_group_text_field_hint" = "Enter a group name"; "vc_create_closed_group_empty_state_message" = "You don't have any contacts yet"; "vc_create_closed_group_empty_state_button_title" = "Start a Session"; "vc_create_closed_group_group_name_missing_error" = "Please enter a group name"; "vc_create_closed_group_group_name_too_long_error" = "Please enter a shorter group name"; "vc_create_closed_group_too_many_group_members_error" = "A closed group cannot have more than 100 members"; -"vc_join_public_chat_title" = "Join Open Group"; +"vc_join_public_chat_title" = "Join Community"; "vc_join_public_chat_enter_group_url_tab_title" = "Open Group URL"; "vc_join_public_chat_scan_qr_code_tab_title" = "Scan QR Code"; "vc_join_public_chat_scan_qr_code_explanation" = "Scan the QR code of the open group you'd like to join"; @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/es.lproj/Localizable.strings b/Session/Meta/Translations/es.lproj/Localizable.strings index 0b46eb925..da37af6d6 100644 --- a/Session/Meta/Translations/es.lproj/Localizable.strings +++ b/Session/Meta/Translations/es.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings index 14d251bd4..e64050680 100644 --- a/Session/Meta/Translations/fa.lproj/Localizable.strings +++ b/Session/Meta/Translations/fa.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings index bdb3af166..e26a39d6d 100644 --- a/Session/Meta/Translations/fi.lproj/Localizable.strings +++ b/Session/Meta/Translations/fi.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings index ca123a3e0..d7f5f23db 100644 --- a/Session/Meta/Translations/fr.lproj/Localizable.strings +++ b/Session/Meta/Translations/fr.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings index b026595d9..d32fabc5a 100644 --- a/Session/Meta/Translations/hi.lproj/Localizable.strings +++ b/Session/Meta/Translations/hi.lproj/Localizable.strings @@ -497,14 +497,14 @@ "vc_enter_public_key_explanation" = "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code."; "vc_scan_qr_code_camera_access_explanation" = "Session needs camera access to scan QR codes"; "vc_scan_qr_code_grant_camera_access_button_title" = "Grant Camera Access"; -"vc_create_closed_group_title" = "New Closed Group"; +"vc_create_closed_group_title" = "Create Group"; "vc_create_closed_group_text_field_hint" = "Enter a group name"; "vc_create_closed_group_empty_state_message" = "You don't have any contacts yet"; "vc_create_closed_group_empty_state_button_title" = "Start a Session"; "vc_create_closed_group_group_name_missing_error" = "Please enter a group name"; "vc_create_closed_group_group_name_too_long_error" = "Please enter a shorter group name"; "vc_create_closed_group_too_many_group_members_error" = "A closed group cannot have more than 100 members"; -"vc_join_public_chat_title" = "Join Open Group"; +"vc_join_public_chat_title" = "Join Community"; "vc_join_public_chat_enter_group_url_tab_title" = "Open Group URL"; "vc_join_public_chat_scan_qr_code_tab_title" = "Scan QR Code"; "vc_join_public_chat_scan_qr_code_explanation" = "Scan the QR code of the open group you'd like to join"; @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings index 1b995f4a7..9fb14dbf7 100644 --- a/Session/Meta/Translations/hr.lproj/Localizable.strings +++ b/Session/Meta/Translations/hr.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/id-ID.lproj/Localizable.strings b/Session/Meta/Translations/id-ID.lproj/Localizable.strings index ede8337f5..566d78d09 100644 --- a/Session/Meta/Translations/id-ID.lproj/Localizable.strings +++ b/Session/Meta/Translations/id-ID.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings index 2e3a2d95e..bb2fe0ace 100644 --- a/Session/Meta/Translations/it.lproj/Localizable.strings +++ b/Session/Meta/Translations/it.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings index ccdf6c570..f12f5e24d 100644 --- a/Session/Meta/Translations/ja.lproj/Localizable.strings +++ b/Session/Meta/Translations/ja.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings index fa3fc1332..6585b22c8 100644 --- a/Session/Meta/Translations/nl.lproj/Localizable.strings +++ b/Session/Meta/Translations/nl.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings index 075b1e650..b19382322 100644 --- a/Session/Meta/Translations/pl.lproj/Localizable.strings +++ b/Session/Meta/Translations/pl.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings index 4ece8d754..ed2582731 100644 --- a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings index d24c568c4..446506e66 100644 --- a/Session/Meta/Translations/ru.lproj/Localizable.strings +++ b/Session/Meta/Translations/ru.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/si.lproj/Localizable.strings b/Session/Meta/Translations/si.lproj/Localizable.strings index 2b9717c54..7c8715d3f 100644 --- a/Session/Meta/Translations/si.lproj/Localizable.strings +++ b/Session/Meta/Translations/si.lproj/Localizable.strings @@ -497,14 +497,14 @@ "vc_enter_public_key_explanation" = "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code."; "vc_scan_qr_code_camera_access_explanation" = "Session needs camera access to scan QR codes"; "vc_scan_qr_code_grant_camera_access_button_title" = "Grant Camera Access"; -"vc_create_closed_group_title" = "New Closed Group"; +"vc_create_closed_group_title" = "Create Group"; "vc_create_closed_group_text_field_hint" = "Enter a group name"; "vc_create_closed_group_empty_state_message" = "You don't have any contacts yet"; "vc_create_closed_group_empty_state_button_title" = "Start a Session"; "vc_create_closed_group_group_name_missing_error" = "Please enter a group name"; "vc_create_closed_group_group_name_too_long_error" = "Please enter a shorter group name"; "vc_create_closed_group_too_many_group_members_error" = "A closed group cannot have more than 100 members"; -"vc_join_public_chat_title" = "Join Open Group"; +"vc_join_public_chat_title" = "Join Community"; "vc_join_public_chat_enter_group_url_tab_title" = "Open Group URL"; "vc_join_public_chat_scan_qr_code_tab_title" = "Scan QR Code"; "vc_join_public_chat_scan_qr_code_explanation" = "Scan the QR code of the open group you'd like to join"; @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings index 84f0b412d..eae301238 100644 --- a/Session/Meta/Translations/sk.lproj/Localizable.strings +++ b/Session/Meta/Translations/sk.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/sv.lproj/Localizable.strings b/Session/Meta/Translations/sv.lproj/Localizable.strings index 463cc8ddc..991c1d095 100644 --- a/Session/Meta/Translations/sv.lproj/Localizable.strings +++ b/Session/Meta/Translations/sv.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings index 07327949b..aa7aafc29 100644 --- a/Session/Meta/Translations/th.lproj/Localizable.strings +++ b/Session/Meta/Translations/th.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings index e7ac16f63..b1af7c548 100644 --- a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings +++ b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings index d2fcb0c8e..e90cda9ba 100644 --- a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings index f7c393a48..00487f34a 100644 --- a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings @@ -703,3 +703,5 @@ /* The name for the emoji category 'Travel & Places' */ "EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places"; "EMOJI_REACTS_NOTIFICATION" = "%@ reacts to a message with %@"; +/* New conversation screen*/ +"vc_new_conversation_title" = "New Conversation"; diff --git a/Session/Shared/BaseVC.swift b/Session/Shared/BaseVC.swift index 4946295dd..79f0bf379 100644 --- a/Session/Shared/BaseVC.swift +++ b/Session/Shared/BaseVC.swift @@ -24,6 +24,7 @@ class BaseVC : UIViewController { override func viewDidLoad() { setNeedsStatusBarAppearanceUpdate() + view.backgroundColor = isLightMode ? UIColor(hex: 0xF9F9F9) : UIColor(hex: 0x1B1B1B) NotificationCenter.default.addObserver(self, selector: #selector(handleAppModeChangedNotification(_:)), name: .appModeChanged, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(appDidBecomeActive(_:)), name: .OWSApplicationDidBecomeActive, object: nil) } @@ -51,7 +52,7 @@ class BaseVC : UIViewController { if #available(iOS 15.0, *) { let appearance = UINavigationBarAppearance() appearance.configureWithOpaqueBackground() - appearance.backgroundColor = Colors.navigationBarBackground + appearance.backgroundColor = hasGradient ? Colors.navigationBarBackground : view.backgroundColor appearance.shadowColor = .clear navigationBar.standardAppearance = appearance; navigationBar.scrollEdgeAppearance = navigationBar.standardAppearance @@ -59,7 +60,7 @@ class BaseVC : UIViewController { navigationBar.setBackgroundImage(UIImage(), for: UIBarMetrics.default) navigationBar.shadowImage = UIImage() navigationBar.isTranslucent = false - navigationBar.barTintColor = Colors.navigationBarBackground + navigationBar.barTintColor = hasGradient ? Colors.navigationBarBackground : view.backgroundColor } navigationItem.backButtonTitle = "" @@ -118,6 +119,8 @@ class BaseVC : UIViewController { @objc internal func handleAppModeChangedNotification(_ notification: Notification) { if hasGradient { setUpGradientBackground() // Re-do the gradient + } else { + view.backgroundColor = isLightMode ? UIColor(hex: 0xF9F9F9) : UIColor(hex: 0x1B1B1B) } ensureWindowBackground() }