From b21f0a9a2eaada9c957c7324912011a6c121ea47 Mon Sep 17 00:00:00 2001 From: Hwee-Boon Yar Date: Mon, 23 Apr 2018 14:26:05 +0800 Subject: [PATCH 1/4] Show the app's background color while help documents are loading (albeit just for a split second sometimes) instead of a white background --- Trust/Tokens/ViewControllers/StaticHTMLViewController.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Trust/Tokens/ViewControllers/StaticHTMLViewController.swift b/Trust/Tokens/ViewControllers/StaticHTMLViewController.swift index 005f6a219..f70d63a66 100644 --- a/Trust/Tokens/ViewControllers/StaticHTMLViewController.swift +++ b/Trust/Tokens/ViewControllers/StaticHTMLViewController.swift @@ -11,6 +11,8 @@ class StaticHTMLViewController: UIViewController { view.backgroundColor = Colors.appBackground webView.backgroundColor = Colors.appBackground + //So webview is seethrough to reveal its parents background color when HTML is not loaded yet + webView.isOpaque = false webView.translatesAutoresizingMaskIntoConstraints = false webView.delegate = self if let path = url() { From 58ac3deb80a1a48a13387a6722a27b36e669db1f Mon Sep 17 00:00:00 2001 From: Hwee-Boon Yar Date: Mon, 23 Apr 2018 14:31:47 +0800 Subject: [PATCH 2/4] Remove debug print in deinit() --- Trust/Redeem/Helpers/RedeemEventListener.swift | 5 ----- .../ViewControllers/TicketRedemptionViewController.swift | 4 ---- 2 files changed, 9 deletions(-) diff --git a/Trust/Redeem/Helpers/RedeemEventListener.swift b/Trust/Redeem/Helpers/RedeemEventListener.swift index e959539be..f54f7ff3a 100644 --- a/Trust/Redeem/Helpers/RedeemEventListener.swift +++ b/Trust/Redeem/Helpers/RedeemEventListener.swift @@ -35,9 +35,4 @@ class RedeemEventListener { shouldListen = false RestClient.cancel() } - - deinit { - print("deinit") - } - } diff --git a/Trust/Redeem/ViewControllers/TicketRedemptionViewController.swift b/Trust/Redeem/ViewControllers/TicketRedemptionViewController.swift index 3a8122120..1039d17b6 100644 --- a/Trust/Redeem/ViewControllers/TicketRedemptionViewController.swift +++ b/Trust/Redeem/ViewControllers/TicketRedemptionViewController.swift @@ -136,10 +136,6 @@ class TicketRedemptionViewController: UIViewController { } } - deinit { - print("deinit called") - } - func configure(viewModel: TicketRedemptionViewModel) { self.viewModel = viewModel From 22c1a23d18aaaf7ca48160b2bb39760de896fad7 Mon Sep 17 00:00:00 2001 From: Hwee-Boon Yar Date: Mon, 23 Apr 2018 14:40:58 +0800 Subject: [PATCH 3/4] Extract app store link to a constant --- Trust/Settings/Coordinators/HelpUsCoordinator.swift | 2 +- Trust/Settings/Types/Constants.swift | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Trust/Settings/Coordinators/HelpUsCoordinator.swift b/Trust/Settings/Coordinators/HelpUsCoordinator.swift index d7fa55330..a8c3c5638 100644 --- a/Trust/Settings/Coordinators/HelpUsCoordinator.swift +++ b/Trust/Settings/Coordinators/HelpUsCoordinator.swift @@ -31,7 +31,7 @@ class HelpUsCoordinator: Coordinator { func rateUs() { if #available(iOS 10.3, *) { SKStoreReviewController.requestReview() } else { - UIApplication.shared.openURL(URL(string: "itms-apps://itunes.apple.com/app/id1288339409")!) + UIApplication.shared.openURL(URL(string: Constants.appstoreURL)!) } appTracker.completedRating = true } diff --git a/Trust/Settings/Types/Constants.swift b/Trust/Settings/Types/Constants.swift index 9353fa0bf..b59b4cac4 100644 --- a/Trust/Settings/Types/Constants.swift +++ b/Trust/Settings/Types/Constants.swift @@ -14,6 +14,8 @@ public struct Constants { public static let twitterUsername = "Alpha_wallet" public static let redditGroupName = "r/AlphaWallet/" public static let facebookUsername = "AlphaWallet" + //TODO need to change this for launch + public static let appstoreURL = "itms-apps://itunes.apple.com/app/id1288339409" // support public static let supportEmail = "support@awallet.io" From 2b2adeae7d48064bf208c838f0f2f36143bd1330 Mon Sep 17 00:00:00 2001 From: Hwee-Boon Yar Date: Mon, 23 Apr 2018 23:43:30 +0800 Subject: [PATCH 4/4] Fix: deleted file was not removed from Xcode project --- Trust.xcodeproj/project.pbxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Trust.xcodeproj/project.pbxproj b/Trust.xcodeproj/project.pbxproj index 15d382caa..f95f7c56d 100644 --- a/Trust.xcodeproj/project.pbxproj +++ b/Trust.xcodeproj/project.pbxproj @@ -301,7 +301,6 @@ 5E7C72C8A15397C5A40BFE76 /* WhatIsEthereumInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C774BCA281E4B077DBBFA /* WhatIsEthereumInfoViewController.swift */; }; 5E7C72E1D4B4B4C8443F3DA1 /* SendHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7828BD821B6F04B71C00 /* SendHeaderView.swift */; }; 5E7C731B88842C036A74A039 /* AlphaWalletSettingsButtonRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C71EBD4C95AD4E11F3352 /* AlphaWalletSettingsButtonRow.swift */; }; - 5E7C73305DF984B99E94D9F9 /* ShareModeButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7717D829205D1E254AC1 /* ShareModeButton.swift */; }; 5E7C733638D7596F93DEE2A9 /* OnboardingCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C75CE3F1D6B7993E7A840 /* OnboardingCollectionViewController.swift */; }; 5E7C7376B566E5A59CC8F463 /* ImportTicketViewControllerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C72D0E7CA03ADE5CFAE7A /* ImportTicketViewControllerViewModel.swift */; }; 5E7C73FC3990D110C474C3D6 /* WalletFilterViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C75CC640BAFFE0E789F44 /* WalletFilterViewModel.swift */; }; @@ -840,7 +839,6 @@ 5E7C76AF81B8DFF605558499 /* UniversalLinkCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UniversalLinkCoordinator.swift; sourceTree = ""; }; 5E7C76D3CFA12C2236E73E10 /* TransferTicketsViaWalletAddressViewControllerViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransferTicketsViaWalletAddressViewControllerViewModel.swift; sourceTree = ""; }; 5E7C77061BEF269BCE358086 /* BaseTicketTableViewCellViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseTicketTableViewCellViewModel.swift; sourceTree = ""; }; - 5E7C7717D829205D1E254AC1 /* ShareModeButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareModeButton.swift; sourceTree = ""; }; 5E7C77316522DF2B256F1F92 /* TicketsViewControllerHeaderViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TicketsViewControllerHeaderViewModel.swift; sourceTree = ""; }; 5E7C7742709724B3BD0C2A0D /* TicketRowViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TicketRowViewModel.swift; sourceTree = ""; }; 5E7C774BCA281E4B077DBBFA /* WhatIsEthereumInfoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WhatIsEthereumInfoViewController.swift; sourceTree = ""; }; @@ -2416,7 +2414,6 @@ 5E7C7F64537949FBD3F77457 /* Views */ = { isa = PBXGroup; children = ( - 5E7C7717D829205D1E254AC1 /* ShareModeButton.swift */, 5E7C7828BD821B6F04B71C00 /* SendHeaderView.swift */, ); path = Views; @@ -3584,7 +3581,6 @@ 5E7C776BE1B19F824954962D /* BaseTicketTableViewCell.swift in Sources */, 5E7C7C0FAC500A6651E663FD /* TransferTicketsQuantitySelectionViewModel.swift in Sources */, 5E7C77AD9FAAC18211B6F355 /* TransferTicketsQuantitySelectionViewController.swift in Sources */, - 5E7C73305DF984B99E94D9F9 /* ShareModeButton.swift in Sources */, 5E7C7EEE563D81793CB96FA0 /* TransferTicketsCoordinator.swift in Sources */, 5E7C7567A690B6B8F889AE83 /* SendViewController.swift in Sources */, 5E7C72E1D4B4B4C8443F3DA1 /* SendHeaderView.swift in Sources */,