From c12723464d6675aa875b3af68db4c0c9cb6ebaf3 Mon Sep 17 00:00:00 2001 From: wuyueyang Date: Fri, 21 Mar 2025 01:35:17 +0800 Subject: [PATCH] New paste icon --- Mixin.xcodeproj/project.pbxproj | 12 ++-- .../paste.imageset/Contents.json | 25 ++++++++ .../paste.imageset/paste@2x.png | Bin 0 -> 590 bytes .../paste.imageset/paste@3x.png | Bin 0 -> 863 bytes .../Common/IntroViewController.swift | 54 ------------------ .../SignInWithMnemonicsViewController.swift | 2 +- .../PIN/TIPIntroView.xib} | 18 +++--- .../Wallet/PIN/TIPIntroViewController.swift | 39 ++++++++++++- 8 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 Mixin/Assets.xcassets/paste.imageset/Contents.json create mode 100644 Mixin/Assets.xcassets/paste.imageset/paste@2x.png create mode 100644 Mixin/Assets.xcassets/paste.imageset/paste@3x.png delete mode 100644 Mixin/UserInterface/Controllers/Common/IntroViewController.swift rename Mixin/UserInterface/Controllers/{Common/IntroView.xib => Wallet/PIN/TIPIntroView.xib} (92%) diff --git a/Mixin.xcodeproj/project.pbxproj b/Mixin.xcodeproj/project.pbxproj index 0e6845c5ff..de3f56b8a6 100644 --- a/Mixin.xcodeproj/project.pbxproj +++ b/Mixin.xcodeproj/project.pbxproj @@ -1036,7 +1036,7 @@ 948ACAA52AF3950C0057D76B /* SnapshotMessageContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 948ACAA42AF3950C0057D76B /* SnapshotMessageContentView.swift */; }; 948E276B29D2A521002BFCE1 /* NetworkFeeOption.swift in Sources */ = {isa = PBXBuildFile; fileRef = 948E276A29D2A521002BFCE1 /* NetworkFeeOption.swift */; }; 948E6CB528AF95CC00DFF5DF /* TIPIntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 948E6CB328AF95CC00DFF5DF /* TIPIntroViewController.swift */; }; - 948E6CB628AF95CC00DFF5DF /* IntroView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 948E6CB428AF95CC00DFF5DF /* IntroView.xib */; }; + 948E6CB628AF95CC00DFF5DF /* TIPIntroView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 948E6CB428AF95CC00DFF5DF /* TIPIntroView.xib */; }; 948FBC882D6EF5CE000795E4 /* ClassicWalletViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 948FBC872D6EF5CE000795E4 /* ClassicWalletViewController.swift */; }; 948FC2962D74DE73000795E4 /* Web3TokenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 948FC2952D74DE70000795E4 /* Web3TokenViewController.swift */; }; 948FC56B2D760018000795E4 /* TokenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 948FC56A2D760017000795E4 /* TokenViewController.swift */; }; @@ -1061,7 +1061,6 @@ 9497AEA92C5D196D00966946 /* UIBackgroundConfiguration+GroupedCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9497AEA82C5D196D00966946 /* UIBackgroundConfiguration+GroupedCell.swift */; }; 9497AEE92C5E264600966946 /* MixinTransactionHistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9497AEE82C5E264600966946 /* MixinTransactionHistoryViewController.swift */; }; 9497AEEE2C5E69B000966946 /* TransactionHistoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9497AEED2C5E69B000966946 /* TransactionHistoryView.xib */; }; - 94980FC72A5D653A0051AE6D /* IntroViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94980FC62A5D653A0051AE6D /* IntroViewController.swift */; }; 949A3686261D9C5C004251B2 /* post.css in Resources */ = {isa = PBXBuildFile; fileRef = 949A3685261D9C5C004251B2 /* post.css */; }; 949B03C32D15922300A34EE3 /* StackedIconWrapperView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 949B03C22D15921E00A34EE3 /* StackedIconWrapperView.swift */; }; 94A0C8C22C77259E00BDE672 /* AddressReceiversCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 94A0C8C12C77259E00BDE672 /* AddressReceiversCell.xib */; }; @@ -2561,7 +2560,7 @@ 948ACAA42AF3950C0057D76B /* SnapshotMessageContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapshotMessageContentView.swift; sourceTree = ""; }; 948E276A29D2A521002BFCE1 /* NetworkFeeOption.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkFeeOption.swift; sourceTree = ""; }; 948E6CB328AF95CC00DFF5DF /* TIPIntroViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TIPIntroViewController.swift; sourceTree = ""; }; - 948E6CB428AF95CC00DFF5DF /* IntroView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IntroView.xib; sourceTree = ""; }; + 948E6CB428AF95CC00DFF5DF /* TIPIntroView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TIPIntroView.xib; sourceTree = ""; }; 948FBC872D6EF5CE000795E4 /* ClassicWalletViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassicWalletViewController.swift; sourceTree = ""; }; 948FC2952D74DE70000795E4 /* Web3TokenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Web3TokenViewController.swift; sourceTree = ""; }; 948FC56A2D760017000795E4 /* TokenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokenViewController.swift; sourceTree = ""; }; @@ -2585,7 +2584,6 @@ 9497AEA82C5D196D00966946 /* UIBackgroundConfiguration+GroupedCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIBackgroundConfiguration+GroupedCell.swift"; sourceTree = ""; }; 9497AEE82C5E264600966946 /* MixinTransactionHistoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MixinTransactionHistoryViewController.swift; sourceTree = ""; }; 9497AEED2C5E69B000966946 /* TransactionHistoryView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TransactionHistoryView.xib; sourceTree = ""; }; - 94980FC62A5D653A0051AE6D /* IntroViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntroViewController.swift; sourceTree = ""; }; 949A3685261D9C5C004251B2 /* post.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = post.css; sourceTree = ""; }; 949B03C22D15921E00A34EE3 /* StackedIconWrapperView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StackedIconWrapperView.swift; sourceTree = ""; }; 94A0C8C02C77259E00BDE672 /* AddressReceiversCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressReceiversCell.swift; sourceTree = ""; }; @@ -3567,8 +3565,6 @@ 947FA4CB299577B700EF13A0 /* AuthorizationsViewController.swift */, 948374812A5D49110011A2CA /* PopupSelectorView.xib */, 948374802A5D49110011A2CA /* PopupSelectorViewController.swift */, - 948E6CB428AF95CC00DFF5DF /* IntroView.xib */, - 94980FC62A5D653A0051AE6D /* IntroViewController.swift */, 941D3BF92A7912C700538504 /* QRCodeView.xib */, 941D3BF82A7912C700538504 /* QRCodeViewController.swift */, 52DE7B4E2BEB7C940060A364 /* TransactionViewController.swift */, @@ -4197,6 +4193,7 @@ isa = PBXGroup; children = ( 9459693528B28F18006F5421 /* TIPNavigationController.swift */, + 948E6CB428AF95CC00DFF5DF /* TIPIntroView.xib */, 948E6CB328AF95CC00DFF5DF /* TIPIntroViewController.swift */, 94C359F428B506D40010F53C /* TIPFullscreenInputViewController.swift */, 9459693728B28FF8006F5421 /* TIPActionViewController.swift */, @@ -5872,7 +5869,7 @@ 942FD67D2D38CFA2004DCC4C /* SwapOrderCell.xib in Resources */, 7B7B5DB3230EBA5E00D0F463 /* PopupSearchableTableView.xib in Resources */, DF8EF6BC2034737F00E99CE8 /* payment_success.caf in Resources */, - 948E6CB628AF95CC00DFF5DF /* IntroView.xib in Resources */, + 948E6CB628AF95CC00DFF5DF /* TIPIntroView.xib in Resources */, 9BB351691FB1A94100EDDD2C /* ConversationDateHeaderView.xib in Resources */, 943CAA3B2CC8CBB900346677 /* SignUpView.xib in Resources */, 941995012CCE79E700F5425C /* IntroductionView.xib in Resources */, @@ -6855,7 +6852,6 @@ DFC0ECFA23BB610C0091E7AC /* GiphyAPI.swift in Sources */, 940FC8602CDCA8970056BFF2 /* PhoneNumberVerificationContext.swift in Sources */, 944A5A722C2604F70021460C /* CollectibleCollectionHeaderView.swift in Sources */, - 94980FC72A5D653A0051AE6D /* IntroViewController.swift in Sources */, 7B3887BE22E1AD74002B0864 /* HomeContainerViewController.swift in Sources */, 94046B96272DC2CF007C1D4A /* IncomingPeerCall.swift in Sources */, 94FCB83B264683D900CCC8FD /* TranscriptAttachmentUploadJob.swift in Sources */, diff --git a/Mixin/Assets.xcassets/paste.imageset/Contents.json b/Mixin/Assets.xcassets/paste.imageset/Contents.json new file mode 100644 index 0000000000..f9a6e99ca8 --- /dev/null +++ b/Mixin/Assets.xcassets/paste.imageset/Contents.json @@ -0,0 +1,25 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "paste@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "paste@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Mixin/Assets.xcassets/paste.imageset/paste@2x.png b/Mixin/Assets.xcassets/paste.imageset/paste@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d6227061c6d8229d44e5f7bcb62305436025b9f8 GIT binary patch literal 590 zcmV-U01W@C8bB|yrXMC0>?z9y(gCUDVJ z>NP`68t}j~dBbV~q?Aq6q_zMlJ3aU%zagPC2B=A?g}5FkPe0TD1Eti$eLtDxI2%&@ ztv!lgBf|YKzQ+af7A2p7fw7E6tM$1n+JOvJuFZoh6>lrN{0Gm>w6qNi(OA%FES%)u4XM`0orC2 zcO1n|Xv_m8f5qLoY@Fi=tSvA`0K8VxO;8y`dK@3)E%Bu_c`7EqI-1XUR!o> zN;H-z$Yo@UcdWqCy3f93uA?TafFpIEeJSi-@4`AK{yD7?ef{gq;53L;{pqQ3L6uf} cB=R5m1{!|96av%AN&o-=07*qoM6N<$f<*)Q>;M1& literal 0 HcmV?d00001 diff --git a/Mixin/Assets.xcassets/paste.imageset/paste@3x.png b/Mixin/Assets.xcassets/paste.imageset/paste@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..b43a71af4946cc01d623301c9746cd198ddea000 GIT binary patch literal 863 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG zH+==^AvVAegtw3n6JKKaWA3Y;p2*D9hLe?unNV!`Q7t>EiS%qw}ANwYvk{Y2OnR*jq;f- z!q&e0T&na$`i&>pyncl@)nXisq za{RAQx421NlbFGaK-*tdkLQ*1a|Q&~^t|Z%=etzv;i=3gTQyq6o;zDR$=Zlj+xs$q zE-_yD%@mQ&qOjGoz+)+`RU=3)iJz()cK8X)Y-&5%72@2Z;7SrEc>(ib(^xSZRe?IY`m?0 zZ%$G4&Ahr!d;N)hvxAp-W~Fedh`;0mG81RT|5J+$a6hYgX~S9l+gG|OPXbMzWwt-% r%h~7V%RN5Z&x#ju4HS9$?1OY}gjA)Tn(zx?eqiu)^>bP0l+XkKqMUG0 literal 0 HcmV?d00001 diff --git a/Mixin/UserInterface/Controllers/Common/IntroViewController.swift b/Mixin/UserInterface/Controllers/Common/IntroViewController.swift deleted file mode 100644 index feb90a5674..0000000000 --- a/Mixin/UserInterface/Controllers/Common/IntroViewController.swift +++ /dev/null @@ -1,54 +0,0 @@ -import UIKit - -class IntroViewController: UIViewController { - - @IBOutlet weak var contentStackView: UIStackView! - @IBOutlet weak var iconImageView: UIImageView! - @IBOutlet weak var titleLabel: UILabel! - @IBOutlet weak var descriptionTextLabel: TextLabel! - @IBOutlet weak var noticeTextView: UITextView! - @IBOutlet weak var nextButton: RoundedButton! - @IBOutlet weak var actionDescriptionLabel: UILabel! - - @IBOutlet weak var noticeTextViewHeightConstraint: NSLayoutConstraint! - - required init?(coder: NSCoder) { - fatalError("Storyboard is not supported") - } - - init() { - let nib = R.nib.introView - super.init(nibName: nib.name, bundle: nib.bundle) - } - - override func viewDidLoad() { - super.viewDidLoad() - contentStackView.setCustomSpacing(24, after: iconImageView) - descriptionTextLabel.delegate = self - noticeTextView.textContainerInset = UIEdgeInsets(top: 12, left: 8, bottom: 12, right: 14) - } - - override func viewDidLayoutSubviews() { - super.viewDidLayoutSubviews() - if noticeTextViewHeightConstraint.constant != noticeTextView.contentSize.height { - noticeTextViewHeightConstraint.constant = noticeTextView.contentSize.height - } - } - - @IBAction func continueToNext(_ sender: RoundedButton) { - - } - -} - -extension IntroViewController: CoreTextLabelDelegate { - - func coreTextLabel(_ label: CoreTextLabel, didSelectURL url: URL) { - UIApplication.shared.open(url, options: [:], completionHandler: nil) - } - - func coreTextLabel(_ label: CoreTextLabel, didLongPressOnURL url: URL) { - - } - -} diff --git a/Mixin/UserInterface/Controllers/Login/SignInWithMnemonicsViewController.swift b/Mixin/UserInterface/Controllers/Login/SignInWithMnemonicsViewController.swift index 82206ad67f..a8234d360f 100644 --- a/Mixin/UserInterface/Controllers/Login/SignInWithMnemonicsViewController.swift +++ b/Mixin/UserInterface/Controllers/Login/SignInWithMnemonicsViewController.swift @@ -83,7 +83,7 @@ final class SignInWithMnemonicsViewController: InputMnemonicsViewController { } addButtonIntoInputFields( - image: R.image.web.ic_action_copy()!, + image: R.image.paste()!, title: R.string.localizable.paste(), action: #selector(pastePhrases(_:)) ) diff --git a/Mixin/UserInterface/Controllers/Common/IntroView.xib b/Mixin/UserInterface/Controllers/Wallet/PIN/TIPIntroView.xib similarity index 92% rename from Mixin/UserInterface/Controllers/Common/IntroView.xib rename to Mixin/UserInterface/Controllers/Wallet/PIN/TIPIntroView.xib index a5278ae4f3..e22972f2d6 100644 --- a/Mixin/UserInterface/Controllers/Common/IntroView.xib +++ b/Mixin/UserInterface/Controllers/Wallet/PIN/TIPIntroView.xib @@ -1,17 +1,17 @@ - + - + - + @@ -30,7 +30,7 @@ - + @@ -39,7 +39,7 @@ - + - + @@ -69,7 +69,7 @@