Skip to content

Commit da92c60

Browse files
LainaaaLainaaa
committed
[trello.com/c/vawidi4o] Change icon of secret wallet. Change caption of wallet section and address row.
1 parent c7e0284 commit da92c60

File tree

52 files changed

+538
-212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+538
-212
lines changed

‎Adamant.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,14 @@
189189
41E3C9CC2A0E20F500AF0985 /* AdamantCoinTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E3C9CB2A0E20F500AF0985 /* AdamantCoinTools.swift */; };
190190
48023DEF2D72EA7F00852961 /* AccountHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 48023DEE2D72EA7F00852961 /* AccountHeader.xib */; };
191191
48023DF12D72FB3500852961 /* SecretWalletsAlertMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48023DF02D72FB3500852961 /* SecretWalletsAlertMenuView.swift */; };
192-
4803FC9A2D6715AF00452D2C /* SecretWalletsFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4803FC992D6715AF00452D2C /* SecretWalletsFactory.swift */; };
192+
4803FC9A2D6715AF00452D2C /* AdamantSecretWalletsManager+SecretWalletsFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4803FC992D6715AF00452D2C /* AdamantSecretWalletsManager+SecretWalletsFactory.swift */; };
193193
481558702D65A7660011B470 /* SecretWalletsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4815586F2D65A7660011B470 /* SecretWalletsManager.swift */; };
194194
481558722D65A7BD0011B470 /* SecretWalletsManagerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 481558712D65A7BD0011B470 /* SecretWalletsManagerProtocol.swift */; };
195-
482231212D714C3D00D592D8 /* SecretWalletsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 482231202D714C3D00D592D8 /* SecretWalletsViewModel.swift */; };
196-
488C1E8A2D7150F900E955E8 /* SecretWalletsState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 488C1E892D7150F900E955E8 /* SecretWalletsState.swift */; };
197195
48B6A8EB2D5738D800326EE8 /* WalletsStoreService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48B6A8EA2D5738D800326EE8 /* WalletsStoreService.swift */; };
198196
48B6A8ED2D57390400326EE8 /* AdamantWalletsStoreService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48B6A8EC2D57390400326EE8 /* AdamantWalletsStoreService.swift */; };
199197
48B6A8EF2D573A3C00326EE8 /* AdamantWalletStoreServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48B6A8EE2D573A3C00326EE8 /* AdamantWalletStoreServiceProvider.swift */; };
198+
48C034F92D81560800F50E35 /* SecretWalletsState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48C034F82D81560800F50E35 /* SecretWalletsState.swift */; };
199+
48C034FF2D81587800F50E35 /* SecretWalletsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48C034FE2D81587800F50E35 /* SecretWalletsViewModel.swift */; };
200200
48DA2FCF2D4A0519008F9FC1 /* AccountWalletsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DA2FCE2D4A0519008F9FC1 /* AccountWalletsViewModel.swift */; };
201201
48DA2FD12D4A054E008F9FC1 /* AccountWalletsState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DA2FD02D4A054E008F9FC1 /* AccountWalletsState.swift */; };
202202
48DA2FD62D4A58D8008F9FC1 /* WalletCollectionViewCell+Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DA2FD52D4A58D8008F9FC1 /* WalletCollectionViewCell+Model.swift */; };
@@ -924,14 +924,14 @@
924924
41E3C9CB2A0E20F500AF0985 /* AdamantCoinTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantCoinTools.swift; sourceTree = "<group>"; };
925925
48023DEE2D72EA7F00852961 /* AccountHeader.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountHeader.xib; sourceTree = "<group>"; };
926926
48023DF02D72FB3500852961 /* SecretWalletsAlertMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsAlertMenuView.swift; sourceTree = "<group>"; };
927-
4803FC992D6715AF00452D2C /* SecretWalletsFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsFactory.swift; sourceTree = "<group>"; };
927+
4803FC992D6715AF00452D2C /* AdamantSecretWalletsManager+SecretWalletsFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AdamantSecretWalletsManager+SecretWalletsFactory.swift"; sourceTree = "<group>"; };
928928
4815586F2D65A7660011B470 /* SecretWalletsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsManager.swift; sourceTree = "<group>"; };
929929
481558712D65A7BD0011B470 /* SecretWalletsManagerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsManagerProtocol.swift; sourceTree = "<group>"; };
930-
482231202D714C3D00D592D8 /* SecretWalletsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsViewModel.swift; sourceTree = "<group>"; };
931-
488C1E892D7150F900E955E8 /* SecretWalletsState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsState.swift; sourceTree = "<group>"; };
932930
48B6A8EA2D5738D800326EE8 /* WalletsStoreService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletsStoreService.swift; sourceTree = "<group>"; };
933931
48B6A8EC2D57390400326EE8 /* AdamantWalletsStoreService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantWalletsStoreService.swift; sourceTree = "<group>"; };
934932
48B6A8EE2D573A3C00326EE8 /* AdamantWalletStoreServiceProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantWalletStoreServiceProvider.swift; sourceTree = "<group>"; };
933+
48C034F82D81560800F50E35 /* SecretWalletsState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsState.swift; sourceTree = "<group>"; };
934+
48C034FE2D81587800F50E35 /* SecretWalletsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsViewModel.swift; sourceTree = "<group>"; };
935935
48DA2FCE2D4A0519008F9FC1 /* AccountWalletsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountWalletsViewModel.swift; sourceTree = "<group>"; };
936936
48DA2FD02D4A054E008F9FC1 /* AccountWalletsState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountWalletsState.swift; sourceTree = "<group>"; };
937937
48DA2FD52D4A58D8008F9FC1 /* WalletCollectionViewCell+Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WalletCollectionViewCell+Model.swift"; sourceTree = "<group>"; };
@@ -1805,9 +1805,9 @@
18051805
482231222D714C4400D592D8 /* SecretWallets */ = {
18061806
isa = PBXGroup;
18071807
children = (
1808-
488C1E892D7150F900E955E8 /* SecretWalletsState.swift */,
1809-
482231202D714C3D00D592D8 /* SecretWalletsViewModel.swift */,
1808+
48C034FE2D81587800F50E35 /* SecretWalletsViewModel.swift */,
18101809
48023DF02D72FB3500852961 /* SecretWalletsAlertMenuView.swift */,
1810+
48C034F82D81560800F50E35 /* SecretWalletsState.swift */,
18111811
);
18121812
path = SecretWallets;
18131813
sourceTree = "<group>";
@@ -2640,7 +2640,7 @@
26402640
41047B75294C62710039E956 /* AdamantVisibleWalletsService.swift */,
26412641
4815586F2D65A7660011B470 /* SecretWalletsManager.swift */,
26422642
4153045829C09902000E4BEA /* AdamantIncreaseFeeService.swift */,
2643-
4803FC992D6715AF00452D2C /* SecretWalletsFactory.swift */,
2643+
4803FC992D6715AF00452D2C /* AdamantSecretWalletsManager+SecretWalletsFactory.swift */,
26442644
4184F1722A33102800D7B8B9 /* AdamantCrashlysticsService.swift */,
26452645
48B6A8EC2D57390400326EE8 /* AdamantWalletsStoreService.swift */,
26462646
3A9015A62A614A62002A2464 /* AdamantEmojiService.swift */,
@@ -3634,7 +3634,7 @@
36343634
4186B332294200B4006594A3 /* BtcWalletService+DynamicConstants.swift in Sources */,
36353635
3AFE7E432B19E4D900718739 /* WalletServiceCompose.swift in Sources */,
36363636
3A26D93D2C3C1CC3003AD832 /* KlyNodeApiService.swift in Sources */,
3637-
4803FC9A2D6715AF00452D2C /* SecretWalletsFactory.swift in Sources */,
3637+
4803FC9A2D6715AF00452D2C /* AdamantSecretWalletsManager+SecretWalletsFactory.swift in Sources */,
36383638
93A118512993167500E144CC /* ChatMessageBackgroundColor.swift in Sources */,
36393639
93760BD72C656CF8002507C3 /* DefaultNodesProvider.swift in Sources */,
36403640
3A26D93B2C3C1C97003AD832 /* KlyApiCore.swift in Sources */,
@@ -3737,7 +3737,6 @@
37373737
3A7BD0102AA9BD030045AAB0 /* AdamantVibroService.swift in Sources */,
37383738
85B405022D3012D5000AB744 /* AccountViewController+Form.swift in Sources */,
37393739
937EDFC02C9CF6B300F219BB /* VersionFooterView.swift in Sources */,
3740-
488C1E8A2D7150F900E955E8 /* SecretWalletsState.swift in Sources */,
37413740
A5E04227282A8BDC0076CD13 /* BtcBalanceResponse.swift in Sources */,
37423741
64F085D920E2D7600006DE68 /* AdmTransactionsViewController.swift in Sources */,
37433742
9322E87B2970431200B8357C /* ChatMessageFactory.swift in Sources */,
@@ -3770,6 +3769,7 @@
37703769
6449BA6A235CA0930033B936 /* ERC20Wallet.swift in Sources */,
37713770
E9147B612050599000145913 /* LoginViewController+QR.swift in Sources */,
37723771
9399F5ED29A85A48006C3E30 /* ChatCacheService.swift in Sources */,
3772+
48C034F92D81560800F50E35 /* SecretWalletsState.swift in Sources */,
37733773
3A9015A92A615893002A2464 /* ChatMessagesListViewModel.swift in Sources */,
37743774
936658952B0AC15300BDB2D3 /* Node+UI.swift in Sources */,
37753775
26A976012B7E852E0095C367 /* ChatSelectTextViewFactory.swift in Sources */,
@@ -3967,6 +3967,7 @@
39673967
41C1698C29E7F34900FEB3CB /* RichTransactionReplyService.swift in Sources */,
39683968
9390C5032976B42800270CDF /* ChatDialogManager.swift in Sources */,
39693969
E926E02E213EAABF005E536B /* TransferViewControllerBase+Alert.swift in Sources */,
3970+
48C034FF2D81587800F50E35 /* SecretWalletsViewModel.swift in Sources */,
39703971
936658A52B0AE67A00BDB2D3 /* CoinsNodesListFactory.swift in Sources */,
39713972
2621AB3B2C613C8100046D7A /* NotificationsFactory.swift in Sources */,
39723973
E9B1AA572121ACC000080A2A /* AdmWalletViewController.swift in Sources */,
@@ -4095,7 +4096,6 @@
40954096
41BCB310295C6082004B12AB /* VisibleWalletsResetTableViewCell.swift in Sources */,
40964097
93CCAE7B2B06D9B500EA5B94 /* DogeBlocksDTO.swift in Sources */,
40974098
3AF08D612B4EB3C400EB82B1 /* LanguageStorageProtocol.swift in Sources */,
4098-
482231212D714C3D00D592D8 /* SecretWalletsViewModel.swift in Sources */,
40994099
E9E7CDB12002B97B00DFC4DB /* AccountFactory.swift in Sources */,
41004100
E9AA8BF82129F13000F9249F /* ComplexTransferViewController.swift in Sources */,
41014101
E9A174B52057EDCE003667CD /* AdamantTransfersProvider+backgroundFetch.swift in Sources */,

‎Adamant/App/DI/AppAssembly.swift‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ struct AppAssembly: MainThreadAssembly {
8383
}.inObjectScope(.container)
8484

8585
// MARK: Secret Wallets
86-
container.register(SecretWalletsFactory.self) { r in
87-
SecretWalletsFactory(
86+
container.register(AdamantSecretWalletsManager.SecretWalletsFactory.self) { r in
87+
AdamantSecretWalletsManager.SecretWalletsFactory(
8888
visibleWalletsService: r.resolve(VisibleWalletsService.self)!,
8989
accountService: r.resolve(AccountService.self)!,
9090
securedStore: r.resolve(SecuredStore.self)!,
@@ -95,7 +95,7 @@ struct AppAssembly: MainThreadAssembly {
9595
container.register(SecretWalletsManagerProtocol.self) { r in
9696
AdamantSecretWalletsManager(
9797
walletsStoreService: r.resolve(WalletStoreServiceProtocol.self)!,
98-
secretWalletsFactory: r.resolve(SecretWalletsFactory.self)!
98+
secretWalletsFactory: r.resolve(AdamantSecretWalletsManager.SecretWalletsFactory.self)!
9999
)
100100
}.inObjectScope(.container)
101101

@@ -410,7 +410,7 @@ struct AppAssembly: MainThreadAssembly {
410410
coreDataStack: r.resolve(CoreDataStack.self)!,
411411
apiService: r.resolve(AdamantApiServiceProtocol.self)!,
412412
adamantCore: r.resolve(AdamantCore.self)!,
413-
accountService: r.resolve(AccountService.self)!,
413+
accountService: r.resolve(AccountService.self)!,
414414
walletServiceCompose: r.resolve(WalletServiceCompose.self)!
415415
)
416416
}.inObjectScope(.container)
@@ -491,11 +491,16 @@ struct AppAssembly: MainThreadAssembly {
491491
EthBIP32Service(ethApiService: r.resolve(ERC20ApiService.self)!)
492492
}.inObjectScope(.container)
493493

494+
// MARK: SecretWalletsViewModel
495+
container.register(SecretWalletsViewModel.self) { r in
496+
SecretWalletsViewModel(secretWalletsManager: r.resolve(SecretWalletsManagerProtocol.self)!)
497+
}.inObjectScope(.container)
498+
494499
// MARK: SecretWalletsAlertService
495500
container.register(SecretWalletsAlertMenuView.self) { r in
496501
SecretWalletsAlertMenuView(
497502
dialogService: r.resolve(DialogService.self)!,
498-
secretWalletsManager: r.resolve(SecretWalletsManagerProtocol.self)!
503+
secretWalletsViewModel: r.resolve(SecretWalletsViewModel.self)!
499504
)
500505
}.inObjectScope(.transient)
501506
}

‎Adamant/Modules/Account/AccountFactory.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ struct AccountFactory {
2828
walletServiceCompose: assembler.resolve(WalletServiceCompose.self)!,
2929
apiServiceCompose: assembler.resolve(ApiServiceComposeProtocol.self)!,
3030
secretWalletsManager: assembler.resolve(SecretWalletsManagerProtocol.self)!,
31-
secretWalletsAlertService: assembler.resolve(SecretWalletsAlertMenuView.self)!
31+
secretWalletsAlertService: assembler.resolve(SecretWalletsAlertMenuView.self)!,
32+
secretWalletsViewModel: assembler.resolve(SecretWalletsViewModel.self)!
3233
)
3334
}
3435
}

‎Adamant/Modules/Account/AccountHeader.xib‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3-
<device id="retina4_7" orientation="portrait" appearance="light"/>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3+
<device id="retina4_7" orientation="portrait" appearance="dark"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
77
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
88
</dependencies>
99
<customFonts key="customFonts">
@@ -53,45 +53,40 @@
5353
<rect key="frame" x="0.0" y="184" width="378" height="231"/>
5454
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
5555
</view>
56-
<button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eb2-uN-n5L" userLabel="Wallets">
57-
<rect key="frame" x="246.5" y="54" width="50" height="47.5"/>
56+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="secret_wallets_regular" translatesAutoresizingMaskIntoConstraints="NO" id="Man-rA-gFA">
57+
<rect key="frame" x="271.5" y="45" width="35" height="35"/>
5858
<constraints>
59-
<constraint firstAttribute="height" constant="50" id="1fJ-oy-zWi"/>
60-
<constraint firstAttribute="width" constant="50" id="IYN-Ky-Mer"/>
59+
<constraint firstAttribute="width" constant="35" id="45y-Er-QMf"/>
60+
<constraint firstAttribute="height" constant="35" id="YhE-0q-neO"/>
6161
</constraints>
62-
<fontDescription key="fontDescription" type="system" pointSize="18"/>
63-
<state key="normal" backgroundImage="lock.square" catalog="system"/>
64-
<connections>
65-
<action selector="walletsButtonTapped:" destination="iN0-l3-epB" eventType="touchUpInside" id="qE9-xE-Bul"/>
66-
</connections>
67-
</button>
62+
</imageView>
6863
</subviews>
6964
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
7065
<constraints>
7166
<constraint firstItem="LHk-7R-5oq" firstAttribute="top" secondItem="6hF-gW-1fF" secondAttribute="bottom" constant="28" id="0d9-Ro-csQ"/>
67+
<constraint firstItem="Man-rA-gFA" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="45" id="4Gw-op-P7G"/>
7268
<constraint firstAttribute="bottom" secondItem="LHk-7R-5oq" secondAttribute="bottom" id="5u8-dI-fD1"/>
7369
<constraint firstItem="6hF-gW-1fF" firstAttribute="top" secondItem="IVQ-4p-zci" secondAttribute="bottom" constant="13" id="EN0-a5-cHs"/>
7470
<constraint firstAttribute="trailing" secondItem="LHk-7R-5oq" secondAttribute="trailing" id="FJv-73-Ayr"/>
75-
<constraint firstItem="eb2-uN-n5L" firstAttribute="leading" secondItem="IVQ-4p-zci" secondAttribute="trailing" constant="20" id="Wjj-r2-R44"/>
71+
<constraint firstItem="Man-rA-gFA" firstAttribute="leading" secondItem="IVQ-4p-zci" secondAttribute="trailing" constant="45" id="YDE-9H-P5x"/>
7672
<constraint firstItem="IVQ-4p-zci" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="25" id="Z7D-Q0-s2x"/>
7773
<constraint firstItem="LHk-7R-5oq" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="eip-WC-PKw"/>
7874
<constraint firstItem="6hF-gW-1fF" firstAttribute="centerX" secondItem="IVQ-4p-zci" secondAttribute="centerX" id="gMH-Q7-bMw"/>
79-
<constraint firstItem="6hF-gW-1fF" firstAttribute="top" secondItem="eb2-uN-n5L" secondAttribute="bottom" constant="10" id="gah-vl-ppB"/>
8075
<constraint firstItem="IVQ-4p-zci" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="jUo-aI-jOv"/>
8176
</constraints>
8277
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
8378
<connections>
8479
<outlet property="addressButton" destination="Iro-jA-X5P" id="u6V-wQ-5UR"/>
8580
<outlet property="avatarImageView" destination="IVQ-4p-zci" id="FoL-e1-OKu"/>
81+
<outlet property="secretWalletsImageView" destination="Man-rA-gFA" id="pbA-HV-NNe"/>
8682
<outlet property="walletViewContainer" destination="LHk-7R-5oq" id="u0m-up-Zyy"/>
87-
<outlet property="walletsButton" destination="eb2-uN-n5L" id="wmX-XR-OS7"/>
8883
</connections>
8984
<point key="canvasLocation" x="33.600000000000001" y="-95.802098950524751"/>
9085
</view>
9186
</objects>
9287
<resources>
9388
<image name="avatar_placeholder" width="75" height="75"/>
94-
<image name="lock.square" catalog="system" width="128" height="114"/>
89+
<image name="secret_wallets_regular" width="55.5" height="55.5"/>
9590
<image name="square.and.arrow.up" catalog="system" width="110" height="128"/>
9691
</resources>
9792
</document>

0 commit comments

Comments
 (0)