Remove filename/classname prefixes

pull/72/head
Hwee-Boon Yar 7 years ago
parent 5c7a3b3392
commit 93198ac60e
  1. 56
      Trust.xcodeproj/project.pbxproj
  2. 4
      Trust/AlphaWalletHelp/ViewControllers/HelpContentsViewController.swift
  3. 12
      Trust/AlphaWalletHelp/ViewControllers/HelpViewController.swift
  4. 2
      Trust/AlphaWalletHelp/ViewControllers/HowDoIGetMyMoneyInfoViewController.swift
  5. 2
      Trust/AlphaWalletHelp/ViewControllers/HowDoITransferETHIntoMyWalletInfoViewController.swift
  6. 2
      Trust/AlphaWalletHelp/ViewControllers/PrivacyPolicyViewController.swift
  7. 2
      Trust/AlphaWalletHelp/ViewControllers/TermsOfServiceViewController.swift
  8. 2
      Trust/AlphaWalletHelp/ViewControllers/WhatIsASeedPhraseInfoViewController.swift
  9. 2
      Trust/AlphaWalletHelp/ViewControllers/WhatIsEthereumInfoViewController.swift
  10. 2
      Trust/AlphaWalletHelp/ViewControllers/WhyUseEthereumInfoViewController.swift
  11. 2
      Trust/AlphaWalletHelp/Views/ContactUsBannerView.swift
  12. 4
      Trust/AlphaWalletHelp/Views/HelpViewCell.swift
  13. 2
      Trust/InCoordinator.swift
  14. 2
      Trust/Tokens/Models/WalletFilter.swift
  15. 2
      Trust/Tokens/ViewControllers/TicketSellInfoViewController.swift
  16. 6
      Trust/Tokens/ViewControllers/TokensViewController.swift
  17. 2
      Trust/Tokens/ViewModels/TokensViewModel.swift
  18. 8
      Trust/Tokens/ViewModels/WalletFilterViewModel.swift
  19. 12
      Trust/Tokens/Views/WalletFilterView.swift
  20. 2
      TrustTests/Coordinators/InCoordinatorTests.swift

@ -284,17 +284,17 @@
442FCED8B618930EFD1F7BA8 /* GetIsStormBird.swift in Sources */ = {isa = PBXBuildFile; fileRef = 442FCA1F19B6293FE5FAD494 /* GetIsStormBird.swift */; };
4AEDE35A1DC3B1F4B885A073 /* Pods_AlphaWallet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BD60178B937124277D81CCD /* Pods_AlphaWallet.framework */; };
5E7C701BFF4469B35A074EB9 /* RequestViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C767497AD8DEE83F384D7 /* RequestViewModel.swift */; };
5E7C70BE9AE35408038E1971 /* AlphaWalletHelpContentsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7B089FD4C96810DD10FD /* AlphaWalletHelpContentsViewController.swift */; };
5E7C70BE9AE35408038E1971 /* HelpContentsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7B089FD4C96810DD10FD /* HelpContentsViewController.swift */; };
5E7C70FF17622C0FFD45A542 /* AlphaWalletSettingPushRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7D2AAB777BF35B8B56BD /* AlphaWalletSettingPushRow.swift */; };
5E7C71B52A77008694BFA5D1 /* TokensDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C74B9EB81C51E956566E7 /* TokensDataStore.swift */; };
5E7C7248A9A732452BDC27D7 /* AdvancedSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C78581AA28CA5C3CBC468 /* AdvancedSettingsViewController.swift */; };
5E7C72670E16AFB8DAF64673 /* OnboardingPageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7E24936CC2190D2A16C2 /* OnboardingPageViewModel.swift */; };
5E7C72B0A10A92E591696E48 /* AlphaWalletContactUsBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7AE6FAE0DF969B4F52E9 /* AlphaWalletContactUsBannerView.swift */; };
5E7C72B0A10A92E591696E48 /* ContactUsBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7AE6FAE0DF969B4F52E9 /* ContactUsBannerView.swift */; };
5E7C72C8A15397C5A40BFE76 /* WhatIsEthereumInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C774BCA281E4B077DBBFA /* WhatIsEthereumInfoViewController.swift */; };
5E7C731B88842C036A74A039 /* AlphaWalletSettingsButtonRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C71EBD4C95AD4E11F3352 /* AlphaWalletSettingsButtonRow.swift */; };
5E7C733638D7596F93DEE2A9 /* OnboardingCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C75CE3F1D6B7993E7A840 /* OnboardingCollectionViewController.swift */; };
5E7C73FC3990D110C474C3D6 /* AlphaWalletFilterViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C75CC640BAFFE0E789F44 /* AlphaWalletFilterViewModel.swift */; };
5E7C73FD5BD75D90C8D0EF3C /* AlphaWalletFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7C58586099F082973073 /* AlphaWalletFilterView.swift */; };
5E7C73FC3990D110C474C3D6 /* WalletFilterViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C75CC640BAFFE0E789F44 /* WalletFilterViewModel.swift */; };
5E7C73FD5BD75D90C8D0EF3C /* WalletFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7C58586099F082973073 /* WalletFilterView.swift */; };
5E7C745DACB5FCCEBCEB49CA /* WelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C793E23E2364B73C4D813 /* WelcomeViewController.swift */; };
5E7C75F80A7E178B49830BCD /* TicketsViewControllerHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C796039C0F47CDCA236C0 /* TicketsViewControllerHeader.swift */; };
5E7C760C7D55C97424F55138 /* TicketTableViewCellViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C75F877B2F2E24C7EF258 /* TicketTableViewCellViewModel.swift */; };
@ -305,7 +305,7 @@
5E7C78B3FD5CA87E395E1861 /* OnboardingPageStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7AF9A592D7224ED58016 /* OnboardingPageStyle.swift */; };
5E7C78D6C94739B1ADDFBB5B /* WhyUseEthereumInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C74FABE14B7B1BEEC4F5E /* WhyUseEthereumInfoViewController.swift */; };
5E7C797BE2C8DB7EF6F217B3 /* OnboardingPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7103135DCCCAB96EE5FC /* OnboardingPage.swift */; };
5E7C7AB2ECFB589632F2A26C /* AlphaWalletFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7E2DCCE0D775ECF83088 /* AlphaWalletFilter.swift */; };
5E7C7AB2ECFB589632F2A26C /* WalletFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7E2DCCE0D775ECF83088 /* WalletFilter.swift */; };
5E7C7AB6950E43BD6E8D0CBE /* TokensViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7B3302309706CA0F972A /* TokensViewController.swift */; };
5E7C7B3E08EEA63C5B68B9C4 /* TicketRedemptionInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C778F20D32B70D7FF2135 /* TicketRedemptionInfoViewController.swift */; };
5E7C7C21E5CAF122AA4F6617 /* HowDoIGetMyMoneyInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C78B001F9F95F404D5FEF /* HowDoIGetMyMoneyInfoViewController.swift */; };
@ -317,8 +317,8 @@
5E7C7CF3BB38045FA40F38AE /* PrivacyPolicyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C72142D5817EF8FA8CADA /* PrivacyPolicyViewController.swift */; };
5E7C7CF43176653FFCE86644 /* SettingsCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7B1FB2702A2A8A4EBD76 /* SettingsCoordinator.swift */; };
5E7C7D03D745BF5C202A2CD1 /* TokensCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7F932B48011A24C26733 /* TokensCoordinator.swift */; };
5E7C7D71D3184F44C397FFE7 /* AlphaWalletHelpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C715F395B973FB61056CF /* AlphaWalletHelpViewController.swift */; };
5E7C7D8173CB1089D622DA38 /* AlphaWalletHelpViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7646352F10C96B5FC6F6 /* AlphaWalletHelpViewCell.swift */; };
5E7C7D71D3184F44C397FFE7 /* HelpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C715F395B973FB61056CF /* HelpViewController.swift */; };
5E7C7D8173CB1089D622DA38 /* HelpViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7646352F10C96B5FC6F6 /* HelpViewCell.swift */; };
5E7C7D8AFC9BA1E8C1D05167 /* TicketSellInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C74A2C738BF2412D412A7 /* TicketSellInfoViewController.swift */; };
5E7C7E2C03099D78A9D911D7 /* WhatIsASeedPhraseInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7B0BE9EE3B198AE7D92D /* WhatIsASeedPhraseInfoViewController.swift */; };
5E7C7E4B4054AAD41C5BE3EC /* SettingsAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7564AF453BAB0BDAAA57 /* SettingsAction.swift */; };
@ -754,7 +754,7 @@
477899BEAA4489DA423E8857 /* Pods-TrustUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TrustUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TrustUITests/Pods-TrustUITests.debug.xcconfig"; sourceTree = "<group>"; };
4DB8204016307EAFC079EA48 /* Pods-Trust.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Trust.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Trust/Pods-Trust.debug.xcconfig"; sourceTree = "<group>"; };
5E7C7103135DCCCAB96EE5FC /* OnboardingPage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingPage.swift; sourceTree = "<group>"; };
5E7C715F395B973FB61056CF /* AlphaWalletHelpViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlphaWalletHelpViewController.swift; sourceTree = "<group>"; };
5E7C715F395B973FB61056CF /* HelpViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelpViewController.swift; sourceTree = "<group>"; };
5E7C71684B93F60206992E10 /* AlphaWalletSettingsTextRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AlphaWalletSettingsTextRow.swift; path = Views/AlphaWalletSettingsTextRow.swift; sourceTree = "<group>"; };
5E7C719B717E002583B1E2E9 /* AdvancedSettingsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdvancedSettingsViewModel.swift; sourceTree = "<group>"; };
5E7C71CE10548877F1124BF2 /* WelcomeViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WelcomeViewModel.swift; sourceTree = "<group>"; };
@ -767,11 +767,11 @@
5E7C74FABE14B7B1BEEC4F5E /* WhyUseEthereumInfoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WhyUseEthereumInfoViewController.swift; sourceTree = "<group>"; };
5E7C7534FB6BF4D199643246 /* AlphaWalletSettingsSwitchRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AlphaWalletSettingsSwitchRow.swift; path = Views/AlphaWalletSettingsSwitchRow.swift; sourceTree = "<group>"; };
5E7C7564AF453BAB0BDAAA57 /* SettingsAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsAction.swift; sourceTree = "<group>"; };
5E7C75CC640BAFFE0E789F44 /* AlphaWalletFilterViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlphaWalletFilterViewModel.swift; sourceTree = "<group>"; };
5E7C75CC640BAFFE0E789F44 /* WalletFilterViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WalletFilterViewModel.swift; sourceTree = "<group>"; };
5E7C75CE3F1D6B7993E7A840 /* OnboardingCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingCollectionViewController.swift; sourceTree = "<group>"; };
5E7C75F877B2F2E24C7EF258 /* TicketTableViewCellViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TicketTableViewCellViewModel.swift; sourceTree = "<group>"; };
5E7C7607B0EF9B8F1BC41073 /* TermsOfServiceViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TermsOfServiceViewController.swift; sourceTree = "<group>"; };
5E7C7646352F10C96B5FC6F6 /* AlphaWalletHelpViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlphaWalletHelpViewCell.swift; sourceTree = "<group>"; };
5E7C7646352F10C96B5FC6F6 /* HelpViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelpViewCell.swift; sourceTree = "<group>"; };
5E7C764B98F526271E4C2A6A /* StaticHTMLViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StaticHTMLViewController.swift; sourceTree = "<group>"; };
5E7C767497AD8DEE83F384D7 /* RequestViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestViewModel.swift; sourceTree = "<group>"; };
5E7C77316522DF2B256F1F92 /* TicketsViewControllerHeaderViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TicketsViewControllerHeaderViewModel.swift; sourceTree = "<group>"; };
@ -783,19 +783,19 @@
5E7C793E23E2364B73C4D813 /* WelcomeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WelcomeViewController.swift; sourceTree = "<group>"; };
5E7C796039C0F47CDCA236C0 /* TicketsViewControllerHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TicketsViewControllerHeader.swift; sourceTree = "<group>"; };
5E7C79ED9F842D3FC102AC54 /* TokenViewCellViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenViewCellViewModel.swift; sourceTree = "<group>"; };
5E7C7AE6FAE0DF969B4F52E9 /* AlphaWalletContactUsBannerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlphaWalletContactUsBannerView.swift; sourceTree = "<group>"; };
5E7C7AE6FAE0DF969B4F52E9 /* ContactUsBannerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactUsBannerView.swift; sourceTree = "<group>"; };
5E7C7AF9A592D7224ED58016 /* OnboardingPageStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingPageStyle.swift; sourceTree = "<group>"; };
5E7C7AFE9AF9FE6B58C925D4 /* SettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
5E7C7B089FD4C96810DD10FD /* AlphaWalletHelpContentsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlphaWalletHelpContentsViewController.swift; sourceTree = "<group>"; };
5E7C7B089FD4C96810DD10FD /* HelpContentsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelpContentsViewController.swift; sourceTree = "<group>"; };
5E7C7B0BE9EE3B198AE7D92D /* WhatIsASeedPhraseInfoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WhatIsASeedPhraseInfoViewController.swift; sourceTree = "<group>"; };
5E7C7B1FB2702A2A8A4EBD76 /* SettingsCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsCoordinator.swift; sourceTree = "<group>"; };
5E7C7B3302309706CA0F972A /* TokensViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokensViewController.swift; sourceTree = "<group>"; };
5E7C7C077372C3F2A4349FA1 /* TokenViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenViewCell.swift; sourceTree = "<group>"; };
5E7C7C58586099F082973073 /* AlphaWalletFilterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlphaWalletFilterView.swift; sourceTree = "<group>"; };
5E7C7C58586099F082973073 /* WalletFilterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WalletFilterView.swift; sourceTree = "<group>"; };
5E7C7D2AAB777BF35B8B56BD /* AlphaWalletSettingPushRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AlphaWalletSettingPushRow.swift; path = Views/AlphaWalletSettingPushRow.swift; sourceTree = "<group>"; };
5E7C7D4F7C566EDD30EF1C19 /* HowDoITransferETHIntoMyWalletInfoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HowDoITransferETHIntoMyWalletInfoViewController.swift; sourceTree = "<group>"; };
5E7C7E24936CC2190D2A16C2 /* OnboardingPageViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingPageViewModel.swift; sourceTree = "<group>"; };
5E7C7E2DCCE0D775ECF83088 /* AlphaWalletFilter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AlphaWalletFilter.swift; path = Models/AlphaWalletFilter.swift; sourceTree = "<group>"; };
5E7C7E2DCCE0D775ECF83088 /* WalletFilter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WalletFilter.swift; path = Models/WalletFilter.swift; sourceTree = "<group>"; };
5E7C7EE467A7F5F2E5B1F660 /* TokensViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokensViewModel.swift; sourceTree = "<group>"; };
5E7C7F932B48011A24C26733 /* TokensCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokensCoordinator.swift; sourceTree = "<group>"; };
613D04881FDE15F8008DE72E /* COMODO ECC Domain Validation Secure Server CA 2.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = "COMODO ECC Domain Validation Secure Server CA 2.cer"; sourceTree = "<group>"; };
@ -1382,7 +1382,7 @@
2977CAF11F7E0C33009682A0 /* ViewControllers */,
2977CAF01F7E0C2E009682A0 /* Views */,
442FCB1A0F74A68425907AC9 /* Helpers */,
5E7C7E2DCCE0D775ECF83088 /* AlphaWalletFilter.swift */,
5E7C7E2DCCE0D775ECF83088 /* WalletFilter.swift */,
);
path = Tokens;
sourceTree = "<group>";
@ -1549,7 +1549,7 @@
AAEB8DA7204D5CFA00CB0B2C /* TicketView.swift */,
5E7C796039C0F47CDCA236C0 /* TicketsViewControllerHeader.swift */,
5E7C7C077372C3F2A4349FA1 /* TokenViewCell.swift */,
5E7C7C58586099F082973073 /* AlphaWalletFilterView.swift */,
5E7C7C58586099F082973073 /* WalletFilterView.swift */,
5E7C783E3ADA4CF9554A0E7D /* TicketTokenViewCell.swift */,
);
path = Views;
@ -1582,7 +1582,7 @@
5E7C79ED9F842D3FC102AC54 /* TokenViewCellViewModel.swift */,
5E7C731B6F01534683227123 /* TicketTokenViewCellViewModel.swift */,
5E7C7EE467A7F5F2E5B1F660 /* TokensViewModel.swift */,
5E7C75CC640BAFFE0E789F44 /* AlphaWalletFilterViewModel.swift */,
5E7C75CC640BAFFE0E789F44 /* WalletFilterViewModel.swift */,
);
path = ViewModels;
sourceTree = "<group>";
@ -2171,9 +2171,9 @@
5E7C70333A8A3616EDE068D7 /* ViewControllers */ = {
isa = PBXGroup;
children = (
5E7C715F395B973FB61056CF /* AlphaWalletHelpViewController.swift */,
5E7C715F395B973FB61056CF /* HelpViewController.swift */,
5E7C774BCA281E4B077DBBFA /* WhatIsEthereumInfoViewController.swift */,
5E7C7B089FD4C96810DD10FD /* AlphaWalletHelpContentsViewController.swift */,
5E7C7B089FD4C96810DD10FD /* HelpContentsViewController.swift */,
5E7C78B001F9F95F404D5FEF /* HowDoIGetMyMoneyInfoViewController.swift */,
5E7C7D4F7C566EDD30EF1C19 /* HowDoITransferETHIntoMyWalletInfoViewController.swift */,
5E7C7B0BE9EE3B198AE7D92D /* WhatIsASeedPhraseInfoViewController.swift */,
@ -2187,8 +2187,8 @@
5E7C74128421DCAC6BCC2354 /* Views */ = {
isa = PBXGroup;
children = (
5E7C7646352F10C96B5FC6F6 /* AlphaWalletHelpViewCell.swift */,
5E7C7AE6FAE0DF969B4F52E9 /* AlphaWalletContactUsBannerView.swift */,
5E7C7646352F10C96B5FC6F6 /* HelpViewCell.swift */,
5E7C7AE6FAE0DF969B4F52E9 /* ContactUsBannerView.swift */,
);
path = Views;
sourceTree = "<group>";
@ -3300,11 +3300,11 @@
442FC01053E2F1B59355A961 /* Arguments.swift in Sources */,
5E7C7CF06533EDACC8E220B3 /* StaticHTMLViewController.swift in Sources */,
442FC54FB6CADF0461F6C95F /* RedeemEventListener.swift in Sources */,
5E7C7D71D3184F44C397FFE7 /* AlphaWalletHelpViewController.swift in Sources */,
5E7C7D8173CB1089D622DA38 /* AlphaWalletHelpViewCell.swift in Sources */,
5E7C7D71D3184F44C397FFE7 /* HelpViewController.swift in Sources */,
5E7C7D8173CB1089D622DA38 /* HelpViewCell.swift in Sources */,
5E7C72C8A15397C5A40BFE76 /* WhatIsEthereumInfoViewController.swift in Sources */,
5E7C72B0A10A92E591696E48 /* AlphaWalletContactUsBannerView.swift in Sources */,
5E7C70BE9AE35408038E1971 /* AlphaWalletHelpContentsViewController.swift in Sources */,
5E7C72B0A10A92E591696E48 /* ContactUsBannerView.swift in Sources */,
5E7C70BE9AE35408038E1971 /* HelpContentsViewController.swift in Sources */,
5E7C7C21E5CAF122AA4F6617 /* HowDoIGetMyMoneyInfoViewController.swift in Sources */,
5E7C7FE8247F0E50BEF35D77 /* HowDoITransferETHIntoMyWalletInfoViewController.swift in Sources */,
5E7C7E2C03099D78A9D911D7 /* WhatIsASeedPhraseInfoViewController.swift in Sources */,
@ -3334,9 +3334,9 @@
5E7C76F8CB67466725C590CE /* TokenViewCellViewModel.swift in Sources */,
5E7C78407F6DCB0EDD562DF6 /* TicketTokenViewCellViewModel.swift in Sources */,
5E7C7CE5CA19183FCED8C907 /* TokensViewModel.swift in Sources */,
5E7C73FC3990D110C474C3D6 /* AlphaWalletFilterViewModel.swift in Sources */,
5E7C7AB2ECFB589632F2A26C /* AlphaWalletFilter.swift in Sources */,
5E7C73FD5BD75D90C8D0EF3C /* AlphaWalletFilterView.swift in Sources */,
5E7C73FC3990D110C474C3D6 /* WalletFilterViewModel.swift in Sources */,
5E7C7AB2ECFB589632F2A26C /* WalletFilter.swift in Sources */,
5E7C73FD5BD75D90C8D0EF3C /* WalletFilterView.swift in Sources */,
5E7C7C98EAF40E8110241DBD /* TicketTokenViewCell.swift in Sources */,
5E7C71B52A77008694BFA5D1 /* TokensDataStore.swift in Sources */,
5E7C7793AB6B577906F2BCA3 /* SettingsViewController.swift in Sources */,

@ -2,8 +2,8 @@
import UIKit
class AlphaWalletHelpContentsViewController: StaticHTMLViewController {
let banner = AlphaWalletContactUsBannerView()
class HelpContentsViewController: StaticHTMLViewController {
let banner = ContactUsBannerView()
override init() {
super.init()

@ -2,9 +2,9 @@
import UIKit
class AlphaWalletHelpViewController: UIViewController {
class HelpViewController: UIViewController {
let tableView = UITableView()
let banner = AlphaWalletContactUsBannerView()
let banner = ContactUsBannerView()
let rows: [(title: String, controller: UIViewController)] = [
(title: R.string.localizable.aHelpContentsWhatIsETH(), controller: WhatIsEthereumInfoViewController()),
(title: R.string.localizable.aHelpContentsWhyETH(), controller: WhyUseEthereumInfoViewController()),
@ -22,7 +22,7 @@ class AlphaWalletHelpViewController: UIViewController {
view.backgroundColor = Colors.appBackground
tableView.register(AlphaWalletHelpViewCell.self, forCellReuseIdentifier: AlphaWalletHelpViewCell.identifier)
tableView.register(HelpViewCell.self, forCellReuseIdentifier: HelpViewCell.identifier)
tableView.translatesAutoresizingMaskIntoConstraints = false
tableView.delegate = self
tableView.dataSource = self
@ -57,7 +57,7 @@ class AlphaWalletHelpViewController: UIViewController {
}
}
extension AlphaWalletHelpViewController: UITableViewDelegate {
extension HelpViewController: UITableViewDelegate {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true)
let controller = rows[indexPath.row].controller
@ -69,9 +69,9 @@ extension AlphaWalletHelpViewController: UITableViewDelegate {
}
}
extension AlphaWalletHelpViewController: UITableViewDataSource {
extension HelpViewController: UITableViewDataSource {
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: AlphaWalletHelpViewCell.identifier, for: indexPath) as! AlphaWalletHelpViewCell
let cell = tableView.dequeueReusableCell(withIdentifier: HelpViewCell.identifier, for: indexPath) as! HelpViewCell
cell.configure(text: rows[indexPath.row].title)
return cell
}

@ -2,7 +2,7 @@
import UIKit
class HowDoIGetMyMoneyInfoViewController: AlphaWalletHelpContentsViewController{
class HowDoIGetMyMoneyInfoViewController: HelpContentsViewController {
override func url() -> URL? {
return R.file.howDoIGetMyMoneyInfoHtml()
}

@ -2,7 +2,7 @@
import UIKit
class HowDoITransferETHIntoMyWalletInfoViewController: AlphaWalletHelpContentsViewController{
class HowDoITransferETHIntoMyWalletInfoViewController: HelpContentsViewController {
override func url() -> URL? {
return R.file.howDoITransferETHIntoMyWalletInfoHtml()
}

@ -2,7 +2,7 @@
import UIKit
class PrivacyPolicyViewController: AlphaWalletHelpContentsViewController{
class PrivacyPolicyViewController: HelpContentsViewController {
override func url() -> URL? {
return R.file.privacyPolicyHtml()
}

@ -2,7 +2,7 @@
import UIKit
class TermsOfServiceViewController: AlphaWalletHelpContentsViewController{
class TermsOfServiceViewController: HelpContentsViewController {
override func url() -> URL? {
return R.file.termsOfServiceHtml()
}

@ -2,7 +2,7 @@
import UIKit
class WhatIsASeedPhraseInfoViewController: AlphaWalletHelpContentsViewController{
class WhatIsASeedPhraseInfoViewController: HelpContentsViewController {
override func url() -> URL? {
return R.file.whatIsASeedPhraseInfoHtml()
}

@ -2,7 +2,7 @@
import UIKit
class WhatIsEthereumInfoViewController: AlphaWalletHelpContentsViewController{
class WhatIsEthereumInfoViewController: HelpContentsViewController {
override func url() -> URL? {
return R.file.whatIsEthereumInfoHtml()
}

@ -2,7 +2,7 @@
import UIKit
class WhyUseEthereumInfoViewController: AlphaWalletHelpContentsViewController{
class WhyUseEthereumInfoViewController: HelpContentsViewController {
override func url() -> URL? {
return R.file.whyUseEthereumInfoHtml()
}

@ -2,7 +2,7 @@
import UIKit
class AlphaWalletContactUsBannerView: UIView {
class ContactUsBannerView: UIView {
let button = UIButton(type: .system)
let imageView = UIImageView()
let label = UILabel()

@ -2,8 +2,8 @@
import UIKit
class AlphaWalletHelpViewCell: UITableViewCell {
static let identifier = "AlphaWalletHelpViewCell"
class HelpViewCell: UITableViewCell {
static let identifier = "HelpViewCell"
let background = UIView()
let titleLabel = UILabel()

@ -156,7 +156,7 @@ class InCoordinator: Coordinator {
addCoordinator(alphaSettingsCoordinator)
tabBarController.viewControllers?.append(alphaSettingsCoordinator.navigationController)
let helpController = AlphaWalletHelpViewController()
let helpController = HelpViewController()
helpController.tabBarItem = UITabBarItem(title: R.string.localizable.aHelpNavigationTitle(), image: R.image.tab_help(), selectedImage: nil)
tabBarController.viewControllers?.append(UINavigationController(rootViewController: helpController))

@ -2,7 +2,7 @@
import Foundation
enum AlphaWalletFilter {
enum WalletFilter {
case all
case currencyOnly
case assetsOnly

@ -2,7 +2,7 @@
import UIKit
class TicketSellInfoViewController: AlphaWalletHelpContentsViewController{
class TicketSellInfoViewController: HelpContentsViewController {
override func url() -> URL? {
return R.file.sellInfoHtml()
}

@ -20,7 +20,7 @@ class TokensViewController: UIViewController {
}
}
let account: Wallet
let filterView = AlphaWalletFilterView()
let filterView = WalletFilterView()
var importWalletView: UIView?
var importWalletLayer = CAShapeLayer()
let tableView: UITableView
@ -273,8 +273,8 @@ extension TokensViewController: UITableViewDataSource {
}
}
extension TokensViewController: AlphaWalletFilterViewDelegate {
func didPressWalletFilter(filter: AlphaWalletFilter, in filterView: AlphaWalletFilterView) {
extension TokensViewController: WalletFilterViewDelegate {
func didPressWalletFilter(filter: WalletFilter, in filterView: WalletFilterView) {
viewModel.filter = filter
reload()
}

@ -6,7 +6,7 @@ import UIKit
struct TokensViewModel {
var tokens: [TokenObject] = []
var tickers: [String: CoinTicker]?
var filter: AlphaWalletFilter = .all
var filter: WalletFilter = .all
var filteredTokens: [TokenObject] {
get {
switch filter {

@ -2,10 +2,10 @@
import UIKit
struct AlphaWalletFilterViewModel {
var currentFilter: AlphaWalletFilter
struct WalletFilterViewModel {
var currentFilter: WalletFilter
init(filter: AlphaWalletFilter) {
init(filter: WalletFilter) {
currentFilter = filter
}
@ -13,7 +13,7 @@ struct AlphaWalletFilterViewModel {
return Colors.appBackground
}
func colorForFilter(filter: AlphaWalletFilter) -> UIColor {
func colorForFilter(filter: WalletFilter) -> UIColor {
if currentFilter == filter {
return Colors.appWhite
} else {

@ -2,16 +2,16 @@
import UIKit
protocol AlphaWalletFilterViewDelegate: class {
func didPressWalletFilter(filter: AlphaWalletFilter, in filterView: AlphaWalletFilterView)
protocol WalletFilterViewDelegate: class {
func didPressWalletFilter(filter: WalletFilter, in filterView: WalletFilterView)
}
class AlphaWalletFilterView: UIView {
class WalletFilterView: UIView {
let allButton = UIButton(type: .system)
let currencyButton = UIButton(type: .system)
let assetsButton = UIButton(type: .system)
let highlightedBar = UIView()
var filter: AlphaWalletFilter = .all {
var filter: WalletFilter = .all {
didSet {
viewModel.currentFilter = filter
delegate?.didPressWalletFilter(filter: filter, in: self)
@ -20,8 +20,8 @@ class AlphaWalletFilterView: UIView {
}
}
var highlightBarHorizontalConstraints: [NSLayoutConstraint]?
weak var delegate: AlphaWalletFilterViewDelegate?
lazy var viewModel = AlphaWalletFilterViewModel(filter: filter)
weak var delegate: WalletFilterViewDelegate?
lazy var viewModel = WalletFilterViewModel(filter: filter)
override init(frame: CGRect) {
super.init(frame: frame)

@ -25,7 +25,7 @@ class InCoordinatorTests: XCTestCase {
XCTAssert((tabbarController?.viewControllers?[0] as? UINavigationController)?.viewControllers[0] is TransactionsViewController)
XCTAssert((tabbarController?.viewControllers?[1] as? UINavigationController)?.viewControllers[0] is TokensViewController)
XCTAssert((tabbarController?.viewControllers?[2] as? UINavigationController)?.viewControllers[0] is SettingsViewController)
XCTAssert((tabbarController?.viewControllers?[3] as? UINavigationController)?.viewControllers[0] is AlphaWalletHelpViewController)
XCTAssert((tabbarController?.viewControllers?[3] as? UINavigationController)?.viewControllers[0] is HelpViewController)
}
func testChangeRecentlyUsedAccount() {

Loading…
Cancel
Save