zec
/
secant-ios-wallet
mirror of https://github.com/zcash/secant-ios-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Connect SuccessValidation Screen to home

This commit is contained in:
Francisco Gindre 2021-12-22 15:42:31 -03:00
parent 17c69bf2b5
commit 0dbb4dfcf7
6 changed files with 87 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
secant.xcodeproj/project.pbxproj
View File

@ -49,7 +49,7 @@
0DACFA9A27209FA70039EEA5 /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0DACFA8D27209FA70039EEA5 /* Roboto-Light.ttf */; };
0DACFA9C27209FA70039EEA5 /* Roboto-ThinItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0DACFA8F27209FA70039EEA5 /* Roboto-ThinItalic.ttf */; };
0DB8AA81271DC7520035BC9D /* DesignGuide.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB8AA80271DC7520035BC9D /* DesignGuide.swift */; };
0DC487C32772574C00BE6A63 /* SuccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DC487C22772574C00BE6A63 /* SuccessView.swift */; };
0DC487C32772574C00BE6A63 /* ValidationSuccededView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DC487C22772574C00BE6A63 /* ValidationSuccededView.swift */; };
0DDB6A5127737D4A0012A410 /* ValidationFailed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DDB6A5027737D4A0012A410 /* ValidationFailed.swift */; };
0DF2DC51272344E400FA31E2 /* EmptyChip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DF2DC50272344E400FA31E2 /* EmptyChip.swift */; };
0DF2DC5427235E3E00FA31E2 /* View+InnerShadow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DF2DC5327235E3E00FA31E2 /* View+InnerShadow.swift */; };
@ -173,7 +173,7 @@
0DACFA8D27209FA70039EEA5 /* Roboto-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Light.ttf"; sourceTree = "<group>"; };
0DACFA8F27209FA70039EEA5 /* Roboto-ThinItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-ThinItalic.ttf"; sourceTree = "<group>"; };
0DB8AA80271DC7520035BC9D /* DesignGuide.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DesignGuide.swift; sourceTree = "<group>"; };
0DC487C22772574C00BE6A63 /* SuccessView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SuccessView.swift; sourceTree = "<group>"; };
0DC487C22772574C00BE6A63 /* ValidationSuccededView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValidationSuccededView.swift; sourceTree = "<group>"; };
0DDB6A5027737D4A0012A410 /* ValidationFailed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValidationFailed.swift; sourceTree = "<group>"; };
0DF2DC50272344E400FA31E2 /* EmptyChip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyChip.swift; sourceTree = "<group>"; };
0DF2DC5327235E3E00FA31E2 /* View+InnerShadow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+InnerShadow.swift"; sourceTree = "<group>"; };
@ -308,7 +308,7 @@
0D3D04062728B2EC0032ABC1 /* Views */ = {
isa = PBXGroup;
children = (
0DC487C22772574C00BE6A63 /* SuccessView.swift */,
0DC487C22772574C00BE6A63 /* ValidationSuccededView.swift */,
0D3D04072728B3440032ABC1 /* RecoveryPhraseDisplayView.swift */,
0D8A43C5272B129C005A6414 /* WordChipGrid.swift */,
0DFE93E0272C9ECB000FCCA5 /* RecoveryPhraseBackupValidationView.swift */,
@ -968,7 +968,7 @@
669FDAE9272C23B3007B9422 /* CircularFrame.swift in Sources */,
F96B41E8273B501F0021B49A /* TransactionDetailView.swift in Sources */,
663FABA2271D876C00E495F8 /* SecondaryButton.swift in Sources */,
0DC487C32772574C00BE6A63 /* SuccessView.swift in Sources */,
0DC487C32772574C00BE6A63 /* ValidationSuccededView.swift in Sources */,
0D8A43C4272AEEDE005A6414 /* SecantTextStyles.swift in Sources */,
0D1922F226BDE29300052649 /* ZcashSDKStubs.swift in Sources */,
0DACFA7F27208CE00039EEA5 /* Clamped.swift in Sources */,

2
secant/Features/App/App.swift
View File

@ -43,7 +43,7 @@ extension AppReducer {
state.route = route
case .home(.reset):
state.route = .startup
case .onboarding(.createNewWallet):
case .onboarding(.createNewWallet), .phraseValidation(.proceedToHome):
state.route = .home
default:
break

3
secant/Features/BackupFlow/RecoveryPhraseValidation.swift
View File

@ -201,6 +201,7 @@ enum RecoveryPhraseValidationAction: Equatable {
case drag(wordChip: PhraseChip.Kind, intoGroup: Int)
case succeed
case fail
case proceedToHome
}
typealias RecoveryPhraseValidationReducer = Reducer<RecoveryPhraseValidationState, RecoveryPhraseValidationAction, BackupPhraseEnvironment>
@ -235,6 +236,8 @@ extension RecoveryPhraseValidationReducer {
case .updateRoute(let route):
state.route = route
return .none
case .proceedToHome:
return .none
}
}
}

2
secant/Features/BackupFlow/Views/RecoveryPhraseBackupValidationView.swift
View File

@ -79,7 +79,7 @@ struct RecoveryPhraseBackupValidationView: View {
@ViewBuilder func view(for route: RecoveryPhraseValidationState.Route) -> some View {
switch route {
case .success:
SuccessView()
ValidationSuccededView(store: store)
case .failure:
ValidationFailed(store: store)
}

70
secant/Features/BackupFlow/Views/SuccessView.swift
View File

@ -1,70 +0,0 @@
//
// SuccessView.swift
// secant-testnet
//
// Created by Adam Stener on 12/8/21.
//
import SwiftUI
struct SuccessView: View {
var body: some View {
GeometryReader { proxy in
VStack {
VStack(spacing: 10) {
Text("Success!")
.font(.custom(FontFamily.Rubik.regular.name, size: 36))
Text("Place that backup somewhere safe and venture forth in security.")
.font(.custom(FontFamily.Rubik.regular.name, size: 17))
.multilineTextAlignment(.center)
.lineSpacing(2)
.frame(width: proxy.size.width * 0.7)
}
.padding(.bottom, 75)
CircularFrame()
.backgroundImage(
Asset.Assets.Backgrounds.callout1.image
)
.frame(
width: proxy.size.width * 0.84,
height: proxy.size.width * 0.84
)
.badgeIcon(.shield)
Spacer()
VStack(spacing: 15) {
Button(
action: { () },
label: { Text("Take me to my wallet!") }
)
.activeButtonStyle
.frame(
width: proxy.size.width * 0.8,
height: 60
)
Button(
action: { () },
label: { Text("Show me my phrase again") }
)
.secondaryButtonStyle
.frame(
width: proxy.size.width * 0.8,
height: 60
)
}
}
.frame(width: proxy.size.width)
.padding(.vertical, 20)
.applyScreenBackground()
}
}
}
struct SuccessView_Previews: PreviewProvider {
static var previews: some View {
SuccessView()
}
}

78
secant/Features/BackupFlow/Views/ValidationSuccededView.swift Normal file
View File

@ -0,0 +1,78 @@
//
// SuccessView.swift
// secant-testnet
//
// Created by Adam Stener on 12/8/21.
//
import SwiftUI
import ComposableArchitecture
struct ValidationSuccededView: View {
var store: RecoveryPhraseValidationStore
var body: some View {
WithViewStore(store) { viewStore in
GeometryReader { proxy in
VStack {
VStack(spacing: 10) {
Text("Success!")
.font(.custom(FontFamily.Rubik.regular.name, size: 36))
Text("Place that backup somewhere safe and venture forth in security.")
.font(.custom(FontFamily.Rubik.regular.name, size: 17))
.multilineTextAlignment(.center)
.lineSpacing(2)
.frame(width: proxy.size.width * 0.7)
}
.padding(.bottom, 75)
CircularFrame()
.backgroundImage(
Asset.Assets.Backgrounds.callout1.image
)
.frame(
width: proxy.size.width * 0.84,
height: proxy.size.width * 0.84
)
.badgeIcon(.shield)
Spacer()
VStack(spacing: 15) {
Button(
action: {
viewStore.send(.proceedToHome, animation: .easeIn(duration: 1))
},
label: { Text("Take me to my wallet!") }
)
.activeButtonStyle
.frame(
width: proxy.size.width * 0.8,
height: 60
)
Button(
action: { () },
label: { Text("Show me my phrase again") }
)
.secondaryButtonStyle
.frame(
width: proxy.size.width * 0.8,
height: 60
)
}
}
.frame(width: proxy.size.width)
.padding(.vertical, 20)
.applyScreenBackground()
}
}
.navigationBarBackButtonHidden(true)
}
}
struct ValidationSuccededView_Previews: PreviewProvider {
static var previews: some View {
ValidationSuccededView(store: RecoveryPhraseValidationStore.demo)
}
}