From cbb59065ba896520c7c342228d1bd27eaf51fd11 Mon Sep 17 00:00:00 2001 From: Hwee-Boon Yar Date: Thu, 29 Mar 2018 16:12:05 +0800 Subject: [PATCH] Add empty Marketplace tab --- Trust.xcodeproj/project.pbxproj | 20 +++++++++++++++++++ Trust/InCoordinator.swift | 5 +++++ .../Localization/en.lproj/Localizable.strings | 1 + .../MarketplaceViewController.swift | 16 +++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 Trust/MarketPlace/ViewControllers/MarketplaceViewController.swift diff --git a/Trust.xcodeproj/project.pbxproj b/Trust.xcodeproj/project.pbxproj index 477ac706d..af51f7d5f 100644 --- a/Trust.xcodeproj/project.pbxproj +++ b/Trust.xcodeproj/project.pbxproj @@ -292,6 +292,7 @@ 5E7C71F8050CCF990539B293 /* LockView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C79D674D45A07E694CE31 /* LockView.swift */; }; 5E7C7248A9A732452BDC27D7 /* AdvancedSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C78581AA28CA5C3CBC468 /* AdvancedSettingsViewController.swift */; }; 5E7C72670E16AFB8DAF64673 /* OnboardingPageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7E24936CC2190D2A16C2 /* OnboardingPageViewModel.swift */; }; + 5E7C728CDF33FBDBA47F71A6 /* MarketplaceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C794F8EBAEE5E8F2821C2 /* MarketplaceViewController.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 */; }; @@ -787,6 +788,7 @@ 5E7C78581AA28CA5C3CBC468 /* AdvancedSettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdvancedSettingsViewController.swift; sourceTree = ""; }; 5E7C78B001F9F95F404D5FEF /* HowDoIGetMyMoneyInfoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HowDoIGetMyMoneyInfoViewController.swift; sourceTree = ""; }; 5E7C793E23E2364B73C4D813 /* WelcomeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WelcomeViewController.swift; sourceTree = ""; }; + 5E7C794F8EBAEE5E8F2821C2 /* MarketplaceViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarketplaceViewController.swift; sourceTree = ""; }; 5E7C796039C0F47CDCA236C0 /* TicketsViewControllerHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TicketsViewControllerHeader.swift; sourceTree = ""; }; 5E7C7981AB6584B25C72D46B /* LockEnterPasscodeCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LockEnterPasscodeCoordinator.swift; sourceTree = ""; }; 5E7C79D674D45A07E694CE31 /* LockView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LockView.swift; sourceTree = ""; }; @@ -1063,6 +1065,7 @@ 76F1D1936604D6A022E9AE90 /* Market */, 76F1D47A29573DA8BD3E4979 /* Redeem */, 5E7C7ACB32FB112CD7D92977 /* AlphaWalletHelp */, + 5E7C7C37B4E80BA2E0DC7FA4 /* Marketplace */, ); path = Trust; sourceTree = ""; @@ -2190,6 +2193,14 @@ path = ViewControllers; sourceTree = ""; }; + 5E7C7254740FFAE67AE9ECE6 /* ViewControllers */ = { + isa = PBXGroup; + children = ( + 5E7C794F8EBAEE5E8F2821C2 /* MarketplaceViewController.swift */, + ); + path = ViewControllers; + sourceTree = ""; + }; 5E7C74128421DCAC6BCC2354 /* Views */ = { isa = PBXGroup; children = ( @@ -2208,6 +2219,14 @@ path = AlphaWalletHelp; sourceTree = ""; }; + 5E7C7C37B4E80BA2E0DC7FA4 /* Marketplace */ = { + isa = PBXGroup; + children = ( + 5E7C7254740FFAE67AE9ECE6 /* ViewControllers */, + ); + path = Marketplace; + sourceTree = ""; + }; 615F10571FCBEF6A008A45AF /* Views */ = { isa = PBXGroup; children = ( @@ -3348,6 +3367,7 @@ 5E7C76A0365D128B7F19A0C2 /* ProtectionCoordinator.swift in Sources */, 5E7C774B5332AC0DC19C5B1B /* EthTokenViewCellViewModel.swift in Sources */, 5E7C75D46140FACBD12333BF /* EthTokenViewCell.swift in Sources */, + 5E7C728CDF33FBDBA47F71A6 /* MarketplaceViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Trust/InCoordinator.swift b/Trust/InCoordinator.swift index c766d16bf..a598dd11c 100644 --- a/Trust/InCoordinator.swift +++ b/Trust/InCoordinator.swift @@ -142,6 +142,11 @@ class InCoordinator: Coordinator { } } + let marketplaceController = MarketplaceViewController() + let marketplaceNavigationController = UINavigationController(rootViewController: marketplaceController) + marketplaceController.tabBarItem = UITabBarItem(title: R.string.localizable.aMarketplaceTabbarItemTitle(), image: R.image.tab_marketplace(), selectedImage: nil) + tabBarController.viewControllers?.append(marketplaceNavigationController) + let alphaSettingsCoordinator = SettingsCoordinator( keystore: keystore, session: session, diff --git a/Trust/Localization/en.lproj/Localizable.strings b/Trust/Localization/en.lproj/Localizable.strings index 63d258547..508a61469 100644 --- a/Trust/Localization/en.lproj/Localizable.strings +++ b/Trust/Localization/en.lproj/Localizable.strings @@ -218,3 +218,4 @@ "a.welcome.onboarding.3" = "Buy, sell and transfer your favourite tokens"; "a.welcome.onboarding.createwallet.button.title" = "GET STARTED"; "a.settings.advanced.label.title" = "Advanced"; +"a.marketplace.tabbar.item.title" = "Marketplace"; diff --git a/Trust/MarketPlace/ViewControllers/MarketplaceViewController.swift b/Trust/MarketPlace/ViewControllers/MarketplaceViewController.swift new file mode 100644 index 000000000..feee0b93c --- /dev/null +++ b/Trust/MarketPlace/ViewControllers/MarketplaceViewController.swift @@ -0,0 +1,16 @@ +// Copyright © 2018 Stormbird PTE. LTD. + +import UIKit + +class MarketplaceViewController: UIViewController { + init() { + super.init(nibName: nil, bundle: nil) + + title = R.string.localizable.aMarketplaceTabbarItemTitle() + view.backgroundColor = Colors.appBackground + } + + required init?(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } +}