lilorg/tokenary
1
1
Fork 0
mirror of https://github.com/lilorg/tokenary.git synced 2024-10-04 10:17:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

faster accounts preview

Browse Source
This commit is contained in:
ivan grachev 2024-03-28 21:20:13 +03:00
parent ad82ecee1f
commit 4d7c95f7ee
8 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
App iOS/Screens/Accounts/EditAccountsViewController.swift
View File

@ -93,8 +93,8 @@ class EditAccountsViewController: UIViewController {
}
private func previewMoreAccounts() {
guard Date().timeIntervalSince(lastPreviewDate) > 1.31 else {
previewAccountsQueue.asyncAfter(deadline: .now() + .milliseconds(1310)) { [weak self] in
guard Date().timeIntervalSince(lastPreviewDate) > 0.23 else {
previewAccountsQueue.asyncAfter(deadline: .now() + .milliseconds(230)) { [weak self] in
self?.previewMoreAccounts()
}
return
@ -120,7 +120,7 @@ class EditAccountsViewController: UIViewController {
extension EditAccountsViewController: UITableViewDelegate {
func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
if indexPath.row == cellModels.count - 1 {
if indexPath.row >= cellModels.count - 20 {
previewMoreAccountsIfNeeded()
}
}

15
App macOS/Extensions/NSAttributedString.swift Normal file
View File

@ -0,0 +1,15 @@
// ∅ 2024 lil org
import WalletCore
extension NSAttributedString {
static func accountImageAttachment(account: Account) -> NSAttributedString {
let attachment = NSTextAttachment()
attachment.image = account.image?.withCornerRadius(7)
attachment.bounds = CGRect(x: 0, y: 0, width: 14, height: 14)
let attachmentString = NSAttributedString(attachment: attachment)
return attachmentString
}
}

1
App macOS/Extensions/NSImage.swift
View File

@ -1,6 +1,7 @@
// ∅ 2024 lil org
import Cocoa
import WalletCore
extension NSImage {

2
App macOS/Screens/ApproveTransactionViewController.swift
View File

@ -117,7 +117,7 @@ class ApproveTransactionViewController: NSViewController {
}
private var displayedMetaAndBalance = ("", "")
private lazy var accountImageAttachmentString = account.accountImageAttachmentString
private lazy var accountImageAttachmentString = NSAttributedString.accountImageAttachment(account: account)
private func updateTextView() {
let meta = transaction.description(chain: chain, price: priceService.forNetwork(chain))

2
App macOS/Screens/ApproveViewController.swift
View File

@ -80,7 +80,7 @@ class ApproveViewController: NSViewController {
}
private func updateDisplayedMeta() {
let fullString = NSMutableAttributedString(attributedString: account.accountImageAttachmentString)
let fullString = NSMutableAttributedString(attributedString: NSAttributedString.accountImageAttachment(account: account))
fullString.insert(NSAttributedString(string: " ", attributes: [.font: NSFont.systemFont(ofSize: 5)]), at: 0)
let addressString = NSAttributedString(string: " " + account.croppedAddress + "\n\n",
attributes: [.font: NSFont.systemFont(ofSize: 13), .foregroundColor: NSColor.labelColor])

6
App macOS/Screens/EditAccountsViewController.swift
View File

@ -100,8 +100,8 @@ class EditAccountsViewController: NSViewController {
}
private func previewMoreAccounts() {
guard Date().timeIntervalSince(lastPreviewDate) > 1.31 else {
previewAccountsQueue.asyncAfter(deadline: .now() + .milliseconds(1310)) { [weak self] in
guard Date().timeIntervalSince(lastPreviewDate) > 0.23 else {
previewAccountsQueue.asyncAfter(deadline: .now() + .milliseconds(230)) { [weak self] in
self?.previewMoreAccounts()
}
return
@ -153,7 +153,7 @@ extension EditAccountsViewController: NSTableViewDataSource {
let rowView = tableView.makeViewOfType(PreviewAccountCellView.self, owner: self)
rowView.setup(title: model.account.croppedAddress, index: row, image: model.account.image, isEnabled: model.isEnabled, delegate: self)
if row == cellModels.count - 1 {
if row >= cellModels.count - 20 {
previewMoreAccountsIfNeeded()
}

8
Shared/Wallets/Account.swift
View File

@ -26,12 +26,4 @@ extension Account {
}
}
var accountImageAttachmentString: NSAttributedString {
let attachment = NSTextAttachment()
attachment.image = image?.withCornerRadius(7)
attachment.bounds = CGRect(x: 0, y: 0, width: 14, height: 14)
let attachmentString = NSAttributedString(attachment: attachment)
return attachmentString
}
}

4
Wallet.xcodeproj/project.pbxproj
View File

@ -63,6 +63,7 @@
2C40709127667A6600AB3D55 /* MultilineLabelTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2C40708F27667A6600AB3D55 /* MultilineLabelTableViewCell.xib */; };
2C40709427667A8600AB3D55 /* ImageWithLabelTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C40709227667A8600AB3D55 /* ImageWithLabelTableViewCell.swift */; };
2C40709527667A8600AB3D55 /* ImageWithLabelTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2C40709327667A8600AB3D55 /* ImageWithLabelTableViewCell.xib */; };
2C420DF12BB5EA69004F1D56 /* NSAttributedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C420DF02BB5EA69004F1D56 /* NSAttributedString.swift */; };
2C4297282ADEDCBD0044357A /* PeerMeta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C4297272ADEDCBD0044357A /* PeerMeta.swift */; };
2C4297292ADEDCBD0044357A /* PeerMeta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C4297272ADEDCBD0044357A /* PeerMeta.swift */; };
2C4768A728258627005E8D4D /* EditAccountsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C4768A628258627005E8D4D /* EditAccountsViewController.swift */; };
@ -355,6 +356,7 @@
2C40708F27667A6600AB3D55 /* MultilineLabelTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MultilineLabelTableViewCell.xib; sourceTree = "<group>"; };
2C40709227667A8600AB3D55 /* ImageWithLabelTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageWithLabelTableViewCell.swift; sourceTree = "<group>"; };
2C40709327667A8600AB3D55 /* ImageWithLabelTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageWithLabelTableViewCell.xib; sourceTree = "<group>"; };
2C420DF02BB5EA69004F1D56 /* NSAttributedString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSAttributedString.swift; sourceTree = "<group>"; };
2C4297272ADEDCBD0044357A /* PeerMeta.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeerMeta.swift; sourceTree = "<group>"; };
2C452ECF2B0EDB8F0017CE2C /* utils.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; name = utils.js; path = "Inpage Provider/utils.js"; sourceTree = "<group>"; };
2C452ED02B0EDB8F0017CE2C /* yarn.lock */ = {isa = PBXFileReference; lastKnownFileType = text; name = yarn.lock; path = "Inpage Provider/yarn.lock"; sourceTree = "<group>"; };
@ -740,6 +742,7 @@
2C4B72CA2B0E7EA800113087 /* NSViewController.swift */,
2CFAE56928BE6292001D0799 /* NSImage.swift */,
2CD0B3F426A0DAA900488D92 /* NSPasteboard.swift */,
2C420DF02BB5EA69004F1D56 /* NSAttributedString.swift */,
2CB4031C281D745D00BAEBEE /* NSTableView.swift */,
);
path = Extensions;
@ -1661,6 +1664,7 @@
2C03D1D2269B407900EF10EA /* NetworkMonitor.swift in Sources */,
2C8ED8DC2AEADDC400818D74 /* BigInt.swift in Sources */,
2C8A09E326757FC000993638 /* AccountCellView.swift in Sources */,
2C420DF12BB5EA69004F1D56 /* NSAttributedString.swift in Sources */,
2C603D0226B6E13F00956955 /* String.swift in Sources */,
2CED86C32AF262E6006F9E26 /* Nodes.swift in Sources */,
2C264BC127B2F2C100234393 /* EthereumSafariRequest.swift in Sources */,