Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TransactionInfo module: apply new design for status item #2315

Merged
merged 1 commit into from
Nov 20, 2020
Merged

TransactionInfo module: apply new design for status item #2315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ PODS:
- CNIOLinux (2.23.0)
- CNIOSHA1 (2.23.0)
- CNIOWindows (2.23.0)
- CryptoSwift (1.3.2)
- CryptoSwift (1.3.5)
- Cuckoo (1.4.1):
- Cuckoo/Swift (= 1.4.1)
- Cuckoo/Swift (1.4.1)
Expand Down Expand Up @@ -212,7 +212,7 @@ PODS:
- LanguageKit.swift (~> 1.0)
- ThemeKit.swift (~> 1.0)
- UIExtensions.swift (~> 1.1)
- Secp256k1Kit.swift (1.0)
- Secp256k1Kit.swift (1.1)
- SectionsTableView.swift (1.1):
- SnapKit (~> 5.0)
- UIExtensions.swift (~> 1.1.1)
Expand Down Expand Up @@ -288,7 +288,7 @@ PODS:
- ObjectMapper (~> 3.5.2)
- RxSwift (~> 5.0)
- RxSwiftExt (~> 5)
- ZcashLightClientKit (0.7.1):
- ZcashLightClientKit (0.7.2):
- gRPC-Swift (= 1.0.0-alpha.19)
- SQLite.swift (~> 0.12.2)

Expand Down Expand Up @@ -465,28 +465,28 @@ EXTERNAL SOURCES:

CHECKOUT OPTIONS:
ActionSheet.swift:
:commit: 9278b438d74e586f41996af8319ba519eff4e3cf
:commit: 1f37d58e745ad53f62cf23a935fda3ab6419f305
:git: https://github.com/horizontalsystems/gui-kit/
BinanceChainKit.swift:
:commit: 90c82f0ed78dfcba30c5073f76c79e89511bd82d
:git: https://github.com/horizontalsystems/binance-chain-kit-ios
BitcoinCashKit.swift:
:commit: 9119eec536c5bda451b1267d0e4fc4d27f81ca72
:commit: 9c9f48120e62c90df57712055811d8822ffc12c6
:git: https://github.com/horizontalsystems/bitcoin-kit-ios.git
BitcoinCore.swift:
:commit: 9119eec536c5bda451b1267d0e4fc4d27f81ca72
:commit: 9c9f48120e62c90df57712055811d8822ffc12c6
:git: https://github.com/horizontalsystems/bitcoin-kit-ios.git
BitcoinKit.swift:
:commit: 9119eec536c5bda451b1267d0e4fc4d27f81ca72
:commit: 9c9f48120e62c90df57712055811d8822ffc12c6
:git: https://github.com/horizontalsystems/bitcoin-kit-ios.git
Chart.swift:
:commit: 9278b438d74e586f41996af8319ba519eff4e3cf
:commit: 1f37d58e745ad53f62cf23a935fda3ab6419f305
:git: https://github.com/horizontalsystems/gui-kit/
CurrencyKit.swift:
:commit: 28500c54b72759f44a36cbb9645d7bc3afc3a6ef
:commit: dbbb721e89b4da3b9f6b5f44866b07f28bca67c1
:git: https://github.com/horizontalsystems/component-kit-ios/
DashKit.swift:
:commit: 9119eec536c5bda451b1267d0e4fc4d27f81ca72
:commit: 9c9f48120e62c90df57712055811d8822ffc12c6
:git: https://github.com/horizontalsystems/bitcoin-kit-ios.git
EosioSwift:
:commit: da261f581d9a19d7bbb4ef592bf649df1422fdb8
Expand Down Expand Up @@ -516,40 +516,40 @@ CHECKOUT OPTIONS:
:commit: 3e3720f600d10929146e5e8583cf39a072b37e61
:git: https://github.com/horizontalsystems/hd-wallet-kit-ios
Hodler.swift:
:commit: 9119eec536c5bda451b1267d0e4fc4d27f81ca72
:commit: 9c9f48120e62c90df57712055811d8822ffc12c6
:git: https://github.com/horizontalsystems/bitcoin-kit-ios.git
HsToolKit.swift:
:commit: 52d655b99381d1940e215f22382f0814cc0c8bc3
:git: https://github.com/horizontalsystems/hs-tool-kit-ios
HUD.swift:
:commit: 9278b438d74e586f41996af8319ba519eff4e3cf
:commit: 1f37d58e745ad53f62cf23a935fda3ab6419f305
:git: https://github.com/horizontalsystems/gui-kit/
LanguageKit.swift:
:commit: 28500c54b72759f44a36cbb9645d7bc3afc3a6ef
:commit: dbbb721e89b4da3b9f6b5f44866b07f28bca67c1
:git: https://github.com/horizontalsystems/component-kit-ios/
LitecoinKit.swift:
:commit: 9119eec536c5bda451b1267d0e4fc4d27f81ca72
:commit: 9c9f48120e62c90df57712055811d8822ffc12c6
:git: https://github.com/horizontalsystems/bitcoin-kit-ios.git
ModuleKit.swift:
:commit: 28500c54b72759f44a36cbb9645d7bc3afc3a6ef
:commit: dbbb721e89b4da3b9f6b5f44866b07f28bca67c1
:git: https://github.com/horizontalsystems/component-kit-ios/
PinKit.swift:
:commit: a3190c9722c322892e0ab3792481566dc750a627
:commit: dbbb721e89b4da3b9f6b5f44866b07f28bca67c1
:git: https://github.com/horizontalsystems/component-kit-ios/
ScanQrKit.swift:
:commit: 28500c54b72759f44a36cbb9645d7bc3afc3a6ef
:commit: dbbb721e89b4da3b9f6b5f44866b07f28bca67c1
:git: https://github.com/horizontalsystems/component-kit-ios/
SectionsTableView.swift:
:commit: 1f37d58e745ad53f62cf23a935fda3ab6419f305
:git: https://github.com/horizontalsystems/gui-kit/
StorageKit.swift:
:commit: 28500c54b72759f44a36cbb9645d7bc3afc3a6ef
:commit: dbbb721e89b4da3b9f6b5f44866b07f28bca67c1
:git: https://github.com/horizontalsystems/component-kit-ios/
ThemeKit.swift:
:commit: 28500c54b72759f44a36cbb9645d7bc3afc3a6ef
:commit: dbbb721e89b4da3b9f6b5f44866b07f28bca67c1
:git: https://github.com/horizontalsystems/component-kit-ios/
UIExtensions.swift:
:commit: 9278b438d74e586f41996af8319ba519eff4e3cf
:commit: 1f37d58e745ad53f62cf23a935fda3ab6419f305
:git: https://github.com/horizontalsystems/gui-kit/
UniswapKit.swift:
:commit: dbe0a6d3dda048e7ac2a60fe47af777d48414171
Expand All @@ -561,7 +561,7 @@ CHECKOUT OPTIONS:
:commit: c0ef7faf52500375de0912b041dd9015ae028384
:git: https://github.com/horizontalsystems/xrates-kit-ios/
ZcashLightClientKit:
:commit: fb226d951fcafa45cff1c4763e42b2a71d9964e0
:commit: ac2b4623c8baf999ab6a42da7953414a8d66b17c
:git: https://github.com/zcash/ZcashLightClientKit.git

SPEC CHECKSUMS:
Expand All @@ -585,7 +585,7 @@ SPEC CHECKSUMS:
CNIOLinux: e4487ef3f25ce7b0019224cbf621ae2153d1f8bb
CNIOSHA1: cdd2e93752f5273b528946560337ca092cdbe0aa
CNIOWindows: a0f8814c907c2621b66bc2789682d5e889602b45
CryptoSwift: 093499be1a94b0cae36e6c26b70870668cb56060
CryptoSwift: 82a5798c280a72ec105e2392d607a456e8ae63b6
Cuckoo: 4625f7f54d9bb880123270e8969898d6c1d036b5
CurrencyKit.swift: c1a37e0e43eac3828be95c8348693f192d67b376
DashKit.swift: 743a4a0cada73a93b1b560d98c9feba9f8935ad9
Expand Down Expand Up @@ -623,7 +623,7 @@ SPEC CHECKSUMS:
RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178
RxSwiftExt: 4ca80336f43c28f11a2825cdd2fc61dd6c044697
ScanQrKit.swift: ac548dac6dec848f20afe6afc97cd419128d1b01
Secp256k1Kit.swift: 93b1bfbb8909c12605666cc3b1e59d1d1fde7322
Secp256k1Kit.swift: 322a66c4b3e95e96a397d73d45ad4d79af991bab
SectionsTableView.swift: 1541226d2cff974a131cfc2df3b8908d4902d703
SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
SQLite.swift: d2b4642190917051ce6bd1d49aab565fe794eea3
Expand All @@ -646,7 +646,7 @@ SPEC CHECKSUMS:
WalletConnect: 7253f3c123df3bba10d71459f0d62a900fee68ac
X11Kit.swift: 6cfd05473e41c7b866c1a016300da02af63ad049
XRatesKit.swift: e30efad6badf909b67cad6914ac29e6dbc50079d
ZcashLightClientKit: ac7b123159008f51255c8b85861ff580f6a55faa
ZcashLightClientKit: bfdadb8e91b62edd0b15d972db4147dbceb16b42

PODFILE CHECKSUM: 0ed3a7762c45a30b2a1a2792ea4d960aed081e77

Expand Down
16 changes: 8 additions & 8 deletions UnstoppableWallet/UnstoppableWallet.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
11B3527D20636D21F0F45C80 /* CurrentDateProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35779E6353B98B298FF29 /* CurrentDateProvider.swift */; };
11B352839BBDEC888ACCFFF7 /* RestoreWordsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35C49E6B99C4B3CE6B9CA /* RestoreWordsViewController.swift */; };
11B35293733280FC1D6E2497 /* SendMemoRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35BF93F697057885AC62A /* SendMemoRouter.swift */; };
11B3529861813E5E19E894E5 /* TransactionInfoStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35C8C8BAC409D02AEDD1D /* TransactionInfoStatusCell.swift */; };
11B3529861813E5E19E894E5 /* TransactionInfoPendingStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35C8C8BAC409D02AEDD1D /* TransactionInfoPendingStatusCell.swift */; };
11B35299556E6EF88F241A25 /* PrivacySortModePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35FD8874AAFB34B3A377C /* PrivacySortModePresenter.swift */; };
11B35299F0C9CBE119C458ED /* BalanceAmountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B359279331554A99F2DB22 /* BalanceAmountView.swift */; };
11B3529B3DD134BC0770BD20 /* MarkdownModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35609D3FA1729A7D80153 /* MarkdownModule.swift */; };
Expand Down Expand Up @@ -713,7 +713,7 @@
11B35AF67D9BA187050E8F0D /* TransactionViewItemFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B358E4D11420A3D0B7A283 /* TransactionViewItemFactory.swift */; };
11B35AFE607E4B25984A83B1 /* MarkdownBlockQuoteCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B3552D3F84BA594EFE964C /* MarkdownBlockQuoteCell.swift */; };
11B35B068DF7197164BDAD4B /* BackupEosRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B3537D10E0DC42026B43EC /* BackupEosRouter.swift */; };
11B35B0712356BCDC57C477C /* TransactionInfoStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35C8C8BAC409D02AEDD1D /* TransactionInfoStatusCell.swift */; };
11B35B0712356BCDC57C477C /* TransactionInfoPendingStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35C8C8BAC409D02AEDD1D /* TransactionInfoPendingStatusCell.swift */; };
11B35B077A52041C9939C6E8 /* FaqCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B3528090862B6792A76DA4 /* FaqCell.swift */; };
11B35B0826C2795CCEFF8B8C /* ManageAccountsInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B355330C2EB2870BD7087A /* ManageAccountsInteractor.swift */; };
11B35B0B1BBEE95059B799A1 /* SortTypePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35E791179A3827B0485F2 /* SortTypePresenter.swift */; };
Expand Down Expand Up @@ -970,7 +970,7 @@
11B35EBB0DC7C0CE6F51E9DA /* BarsProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35A686DD5BA335FEB6BEB /* BarsProgressView.swift */; };
11B35EC7F06AEAB8E555B833 /* AppStatusViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B3525406D0B011EB76ACE6 /* AppStatusViewModel.swift */; };
11B35EC7FDD947309458265D /* PriceAlertStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B353FED1586171A5C73554 /* PriceAlertStorage.swift */; };
11B35ECCE59E558DAA1BD331 /* TransactionInfoStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35C8C8BAC409D02AEDD1D /* TransactionInfoStatusCell.swift */; };
11B35ECCE59E558DAA1BD331 /* TransactionInfoPendingStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35C8C8BAC409D02AEDD1D /* TransactionInfoPendingStatusCell.swift */; };
11B35ECD30CF372165CBE7D7 /* ManageWalletsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B353E8B5933D7158BAFB7B /* ManageWalletsService.swift */; };
11B35ED28A224521738CAC59 /* TransactionRecordPoolRepo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35B93B5B43FF00B24528B /* TransactionRecordPoolRepo.swift */; };
11B35ED36B4DDD19C5D14EEC /* AddErc20TokenPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11B35AF22887061DE1E59CA8 /* AddErc20TokenPresenter.swift */; };
Expand Down Expand Up @@ -2575,7 +2575,7 @@
11B35C6D66CF7BCBF59E67D6 /* BottomSheetCheckmarkCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BottomSheetCheckmarkCell.swift; sourceTree = "<group>"; };
11B35C7DCF9B7894F7600623 /* LaunchRouter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LaunchRouter.swift; sourceTree = "<group>"; };
11B35C8856A137E92441AF19 /* IndexedInputField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IndexedInputField.swift; sourceTree = "<group>"; };
11B35C8C8BAC409D02AEDD1D /* TransactionInfoStatusCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionInfoStatusCell.swift; sourceTree = "<group>"; };
11B35C8C8BAC409D02AEDD1D /* TransactionInfoPendingStatusCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionInfoPendingStatusCell.swift; sourceTree = "<group>"; };
11B35C8E5281BF85C421CB73 /* RateDiffView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RateDiffView.swift; sourceTree = "<group>"; };
11B35C9740FFE70C764CC71C /* NotificationSettingsInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationSettingsInteractor.swift; sourceTree = "<group>"; };
11B35C9F199E2A1D297480A4 /* AlertModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlertModule.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3477,7 +3477,7 @@
isa = PBXGroup;
children = (
11B35CA40778FB3783D186C7 /* Views */,
11B35C8C8BAC409D02AEDD1D /* TransactionInfoStatusCell.swift */,
11B35C8C8BAC409D02AEDD1D /* TransactionInfoPendingStatusCell.swift */,
11B35DF34CA46AFA139D23AF /* TransactionInfoFromToCell.swift */,
11B35B4FE35F6A9122C7688B /* TransactionInfoTransactionIdCell.swift */,
11B351E46B028BA34AB5F192 /* TransactionInfoValueCell.swift */,
Expand Down Expand Up @@ -6126,7 +6126,7 @@
11B351B48D171634D896D41C /* DerivationSettingConfirmationViewController.swift in Sources */,
11B35F0222DD4D2671F68937 /* DerivationSettingConfirmationModule.swift in Sources */,
11B35CF4456C62D1B1497289 /* DerivationSettingConfirmationRouter.swift in Sources */,
11B35ECCE59E558DAA1BD331 /* TransactionInfoStatusCell.swift in Sources */,
11B35ECCE59E558DAA1BD331 /* TransactionInfoPendingStatusCell.swift in Sources */,
11B357BA7B48CEE5F90D392F /* TransactionInfoTitleView.swift in Sources */,
11B3527B671281A5DE818078 /* TransactionInfoFromToCell.swift in Sources */,
11B351292C46308D0380DED9 /* TransactionInfoTransactionIdCell.swift in Sources */,
Expand Down Expand Up @@ -6907,7 +6907,7 @@
11B357800441857F2E6DCEA0 /* DerivationSettingConfirmationViewController.swift in Sources */,
11B35AA4AA5F26E7A7C80E6C /* DerivationSettingConfirmationModule.swift in Sources */,
11B353F76D63345101E15C6B /* DerivationSettingConfirmationRouter.swift in Sources */,
11B3529861813E5E19E894E5 /* TransactionInfoStatusCell.swift in Sources */,
11B3529861813E5E19E894E5 /* TransactionInfoPendingStatusCell.swift in Sources */,
11B35CAF39034FAD05130DD2 /* TransactionInfoTitleView.swift in Sources */,
11B35DD11863080EFAE18F92 /* TransactionInfoFromToCell.swift in Sources */,
11B35A4F668BF94A56BA27C4 /* TransactionInfoTransactionIdCell.swift in Sources */,
Expand Down Expand Up @@ -7649,7 +7649,7 @@
11B35723699E0165AD9E7FA3 /* DerivationSettingConfirmationViewController.swift in Sources */,
11B352BF9F4A74CF1C968260 /* DerivationSettingConfirmationModule.swift in Sources */,
11B35B9B9617CE64AC6A8C78 /* DerivationSettingConfirmationRouter.swift in Sources */,
11B35B0712356BCDC57C477C /* TransactionInfoStatusCell.swift in Sources */,
11B35B0712356BCDC57C477C /* TransactionInfoPendingStatusCell.swift in Sources */,
11B358A9A1E29D7750EC3B07 /* TransactionInfoTitleView.swift in Sources */,
11B350E75BE7007E176B9996 /* TransactionInfoFromToCell.swift in Sources */,
11B35C083B5DA616347D90DF /* TransactionInfoTransactionIdCell.swift in Sources */,
Expand Down
52 changes: 52 additions & 0 deletions ...et/UnstoppableWallet/Modules/TransactionInfo/Cells/TransactionInfoPendingStatusCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import UIKit
import ThemeKit

class TransactionInfoPendingStatusCell: BaseThemeCell {
private let leftView = LeftCView()
private let rightView = UIView()

private let statusLabel = UILabel()
private let barsProgressView = BarsProgressView(barWidth: 4, color: .themeGray50, inactiveColor: .themeSteel20)

override init(style: CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)

layout(leftView: leftView, leftInset: 0, rightView: rightView)

rightView.addSubview(statusLabel)
statusLabel.snp.makeConstraints { maker in
maker.leading.equalToSuperview()
maker.centerY.equalToSuperview()
}

statusLabel.font = .subhead1
statusLabel.textColor = .themeLeah

rightView.addSubview(barsProgressView)
barsProgressView.snp.makeConstraints { maker in
maker.leading.equalTo(statusLabel.snp.trailing).offset(CGFloat.margin2x)
maker.trailing.equalToSuperview()
maker.centerY.equalToSuperview()
maker.height.equalTo(18)
}

barsProgressView.set(barsCount: BarsProgressView.progressStepsCount)

leftView.text = "status".localized
leftView.image = UIImage(named: "Info Icon")?.tinted(with: .themeJacob)
}

required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}

func bind(progress: Double, incoming: Bool, iconAction: (() -> ())?) {
statusLabel.text = incoming ? "transactions.receiving".localized : "transactions.pending".localized
leftView.imageAction = iconAction

barsProgressView.set(filledColor: incoming ? .themeGreenD : .themeYellowD)
barsProgressView.set(progress: progress)
barsProgressView.startAnimating()
}

}
Loading