Skip to content

Commit

Permalink
Start working on new paperkey page
Browse files Browse the repository at this point in the history
  • Loading branch information
@SwenVanZanten
SwenVanZanten committed Nov 25, 2018
1 parent 2334666 commit 4112bf7
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 24 deletions.
8 changes: 4 additions & 4 deletions VergeiOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
A305DDC52107C9E300911B64 /* BackKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = A305DDC42107C9E300911B64 /* BackKey.swift */; };
A316B0AF215454FB00FF5200 /* AddressValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A316B0AE215454FB00FF5200 /* AddressValidator.swift */; };
A32566412112588D006FB08A /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A32566402112588D006FB08A /* SettingsTableViewController.swift */; };
A325664321135A00006FB08A /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A325664221135A00006FB08A /* Settings.storyboard */; };
A32566452113729C006FB08A /* Receive.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A32566442113729C006FB08A /* Receive.storyboard */; };
A3256647211372A7006FB08A /* Send.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A3256646211372A7006FB08A /* Send.storyboard */; };
A3256649211372B3006FB08A /* Transactions.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A3256648211372B3006FB08A /* Transactions.storyboard */; };
Expand Down Expand Up @@ -86,6 +85,7 @@
A33B759421A22F5A00030CCF /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A33B759321A22F5A00030CCF /* CryptoSwift.framework */; };
A33B759E21A5CDD400030CCF /* BitcoinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A33B759D21A5CDD400030CCF /* BitcoinKit.framework */; };
A33B75C021A61A3500030CCF /* CurrencyInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = A33B75BF21A61A3500030CCF /* CurrencyInput.swift */; };
A33B75C421A8917700030CCF /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A33B75C321A8917700030CCF /* Settings.storyboard */; };
A33F6A7020EEE485001492C2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A33F6A6F20EEE485001492C2 /* AppDelegate.swift */; };
A33F6A7220EEE485001492C2 /* WelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A33F6A7120EEE485001492C2 /* WelcomeViewController.swift */; };
A33F6A7520EEE485001492C2 /* WelcomeGuide.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A33F6A7320EEE485001492C2 /* WelcomeGuide.storyboard */; };
Expand Down Expand Up @@ -255,7 +255,6 @@
A305DDC42107C9E300911B64 /* BackKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackKey.swift; sourceTree = "<group>"; };
A316B0AE215454FB00FF5200 /* AddressValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressValidator.swift; sourceTree = "<group>"; };
A32566402112588D006FB08A /* SettingsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTableViewController.swift; sourceTree = "<group>"; };
A325664221135A00006FB08A /* Settings.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Settings.storyboard; sourceTree = "<group>"; };
A32566442113729C006FB08A /* Receive.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Receive.storyboard; sourceTree = "<group>"; };
A3256646211372A7006FB08A /* Send.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Send.storyboard; sourceTree = "<group>"; };
A3256648211372B3006FB08A /* Transactions.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Transactions.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -300,6 +299,7 @@
A33B759321A22F5A00030CCF /* CryptoSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CryptoSwift.framework; path = Carthage/Build/iOS/CryptoSwift.framework; sourceTree = "<group>"; };
A33B759D21A5CDD400030CCF /* BitcoinKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BitcoinKit.framework; path = Carthage/Build/iOS/BitcoinKit.framework; sourceTree = "<group>"; };
A33B75BF21A61A3500030CCF /* CurrencyInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyInput.swift; sourceTree = "<group>"; };
A33B75C321A8917700030CCF /* Settings.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Settings.storyboard; sourceTree = "<group>"; };
A33F6A6C20EEE485001492C2 /* VergeiOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VergeiOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
A33F6A6F20EEE485001492C2 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
A33F6A7120EEE485001492C2 /* WelcomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -528,7 +528,7 @@
A3256648211372B3006FB08A /* Transactions.storyboard */,
A3256646211372A7006FB08A /* Send.storyboard */,
A32566442113729C006FB08A /* Receive.storyboard */,
A325664221135A00006FB08A /* Settings.storyboard */,
A33B75C321A8917700030CCF /* Settings.storyboard */,
);
path = Storyboards;
sourceTree = "<group>";
Expand Down Expand Up @@ -1096,11 +1096,11 @@
A376411B2108F0C700E04521 /* Cartfile in Resources */,
A338E6B92110D60F000D44EE /* ChartWalletSlideView.xib in Resources */,
A398B21F21302DC5004ACB73 /* ConfirmSendView.xib in Resources */,
A325664321135A00006FB08A /* Settings.storyboard in Resources */,
A305DDA52106940E00911B64 /* .gitignore in Resources */,
A33F6A7D20EEE487001492C2 /* LaunchScreen.storyboard in Resources */,
A325666E211CABE7006FB08A /* .travis.yml in Resources */,
A3256647211372A7006FB08A /* Send.storyboard in Resources */,
A33B75C421A8917700030CCF /* Settings.storyboard in Resources */,
A305DD95210641C300911B64 /* MainTabbarNavigator.storyboard in Resources */,
A338E6B32110D064000D44EE /* TransactionsWalletSlideView.xib in Resources */,
A3256649211372B3006FB08A /* Transactions.storyboard in Resources */,
Expand Down
2 changes: 1 addition & 1 deletion VergeiOS/Kernel/Config.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ struct Config {
static let iOSRepo: String = "https://github.com/vergecurrency/vIOS"
static let blockchainExlorer: String = "https://verge-blockchain.info/"
static let bwsEndpoint: String = "https://load.vergecoreteam.com/bws/api/"
static let priceDataEndpoint: String = "https://usxvglw.vergecoreteam.com/price/api/v1/price/"
static let priceDataEndpoint: String = "https://load.vergecoreteam.com/price/api/v1/price/"
static let chartDataEndpoint: String = "https://graphs2.coinmarketcap.com/currencies/"
static let ipCheckEndpoint: String = "http://api.ipstack.com/check?access_key=e95ebddbee9137302b3cf50b39a33362&format=1"

Expand Down
77 changes: 66 additions & 11 deletions VergeiOS/Storyboards/Settings.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@
<!--Use Face ID-->
<scene sceneID="VZs-4e-cK2">
<objects>
<tableViewController hidesBottomBarWhenPushed="YES" id="9dK-qh-T3Q" customClass="LocalAuthTableViewController" customModule="VergeiOS" customModuleProvider="target" sceneMemberID="viewController">
<tableViewController id="9dK-qh-T3Q" customClass="LocalAuthTableViewController" customModule="VergeiOS" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="IgJ-HN-I40">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand Down Expand Up @@ -504,27 +504,82 @@
<scene sceneID="tdG-gH-mRv">
<objects>
<navigationController id="EJT-TO-hr5" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Tgc-A0-eHQ" customClass="TransparantNavigationBar" customModule="VergeiOS" customModuleProvider="target">
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Tgc-A0-eHQ" customClass="BlendedNavigationBar" customModule="VergeiOS" customModuleProvider="target">
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
<segue destination="qpT-q5-jap" kind="relationship" relationship="rootViewController" id="Mh5-5D-L82"/>
<segue destination="K7u-WG-qlZ" kind="relationship" relationship="rootViewController" id="jNg-bM-lYA"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="pld-Yk-v8y" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1622" y="310"/>
</scene>
<!--PaperKeyWordsViewController-->
<scene sceneID="liG-rG-xMN">
<!--View Controller-->
<scene sceneID="MLW-bm-GQ4">
<objects>
<viewControllerPlaceholder storyboardName="WelcomeGuide" referencedIdentifier="PaperKeyWordsViewController" id="qpT-q5-jap" sceneMemberID="viewController">
<navigationItem key="navigationItem" id="Yrf-lI-lVg"/>
</viewControllerPlaceholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="Gdy-qI-IpG" userLabel="First Responder" sceneMemberID="firstResponder"/>
<viewController id="K7u-WG-qlZ" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="8JF-dm-4Az">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="cws-fz-4I9">
<rect key="frame" x="40" y="208.5" width="295" height="250"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your Paperkey" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FAR-af-j8d">
<rect key="frame" x="0.0" y="0.0" width="295" height="30.5"/>
<constraints>
<constraint firstAttribute="height" constant="30.5" id="FgV-ZH-LRv"/>
</constraints>
<fontDescription key="fontDescription" name="AvenirNext-DemiBold" family="Avenir Next" pointSize="22"/>
<color key="textColor" name="SecondaryDark"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hZ7-OT-VPE" customClass="PanelView" customModule="VergeiOS" customModuleProvider="target">
<rect key="frame" x="0.0" y="40.5" width="295" height="209.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="THE DOG WALKS ALONG THE BEACH WITH HIS OWNER AND IS HAPPY ABOUT HIS LIVE" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tkd-wH-xQK">
<rect key="frame" x="20" y="20" width="255" height="169.5"/>
<fontDescription key="fontDescription" name="Menlo-Regular" family="Menlo" pointSize="17"/>
<color key="textColor" name="SecondaryDark"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="tkd-wH-xQK" firstAttribute="top" secondItem="hZ7-OT-VPE" secondAttribute="top" constant="20" id="Dwq-Ls-zGD"/>
<constraint firstAttribute="bottom" secondItem="tkd-wH-xQK" secondAttribute="bottom" constant="20" id="RGd-ec-R9s"/>
<constraint firstItem="tkd-wH-xQK" firstAttribute="leading" secondItem="hZ7-OT-VPE" secondAttribute="leading" constant="20" id="SIy-aI-GuO"/>
<constraint firstAttribute="trailing" secondItem="tkd-wH-xQK" secondAttribute="trailing" constant="20" id="knU-LR-phP"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="hZ7-OT-VPE" secondAttribute="trailing" id="1NA-2c-nHY"/>
<constraint firstItem="hZ7-OT-VPE" firstAttribute="leading" secondItem="cws-fz-4I9" secondAttribute="leading" id="D8t-Os-IS8"/>
<constraint firstItem="FAR-af-j8d" firstAttribute="leading" secondItem="cws-fz-4I9" secondAttribute="leading" id="L7c-cP-pAv"/>
<constraint firstAttribute="trailing" secondItem="FAR-af-j8d" secondAttribute="trailing" id="Wny-49-dbP"/>
<constraint firstAttribute="height" constant="250" id="zFz-kY-oVz"/>
</constraints>
</stackView>
</subviews>
<color key="backgroundColor" name="BackgroundGrey"/>
<constraints>
<constraint firstItem="cws-fz-4I9" firstAttribute="leading" secondItem="FiB-Pn-F5D" secondAttribute="leading" constant="40" id="OPC-e8-oUn"/>
<constraint firstItem="cws-fz-4I9" firstAttribute="centerY" secondItem="8JF-dm-4Az" secondAttribute="centerY" id="e1k-a1-2Cj"/>
<constraint firstAttribute="trailing" secondItem="cws-fz-4I9" secondAttribute="trailing" constant="40" id="oUB-rp-Pq8"/>
<constraint firstItem="cws-fz-4I9" firstAttribute="centerX" secondItem="8JF-dm-4Az" secondAttribute="centerX" id="tTA-gw-cnz"/>
</constraints>
<viewLayoutGuide key="safeArea" id="FiB-Pn-F5D"/>
</view>
<navigationItem key="navigationItem" id="QD1-8o-Wbb">
<barButtonItem key="leftBarButtonItem" systemItem="stop" id="Kea-2p-XyA"/>
</navigationItem>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="R4B-y9-hMF" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2315" y="309"/>
<point key="canvasLocation" x="2590" y="310"/>
</scene>
<!--Disconnect Wallet View Controller-->
<scene sceneID="cl0-4N-jbc">
Expand Down Expand Up @@ -605,8 +660,8 @@
<!--WelcomeViewController-->
<scene sceneID="pNK-1S-NFM">
<objects>
<viewControllerPlaceholder storyboardName="Setup" referencedIdentifier="WelcomeViewController" id="ihU-0k-uOE" sceneMemberID="viewController"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="0iu-Wz-3Ex" userLabel="First Responder" sceneMemberID="firstResponder"/>
<viewControllerPlaceholder storyboardName="Setup" referencedIdentifier="WelcomeViewController" id="ihU-0k-uOE" sceneMemberID="viewController"/>
</objects>
<point key="canvasLocation" x="3318" y="1026"/>
</scene>
Expand Down
8 changes: 4 additions & 4 deletions VergeiOS/Views/Settings/CreditsTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ import UIKit
class CreditsTableViewController: EdgedTableViewController {

var developers = [
[
"name": "Justin",
"twitter": "justinvendetta"
],
[
"name": "Swen",
"twitter": "SwenVanZanten"
Expand All @@ -23,6 +19,10 @@ class CreditsTableViewController: EdgedTableViewController {
"name": "Marvin",
"twitter": "marpme_"
],
[
"name": "Justin",
"twitter": "justinvendetta"
],
[
"name": "Kris",
"twitter": "ksteigerwald"
Expand Down
4 changes: 0 additions & 4 deletions VergeiOS/Views/WelcomeGuide/ConfirmPaperkeyViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ class ConfirmPaperkeyViewController: AbstractPaperkeyViewController {
return
}

if ApplicationManager.default.setup {
return dismiss(animated: true)
}

// Save the mnemonic.
ApplicationManager.default.mnemonic = mnemonic

Expand Down

0 comments on commit 4112bf7

Please sign in to comment.