keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove navigation view wrapper

Browse Source
pull/891/head
ryanzhao 2 years ago
parent 6741575f04
commit 42bfb63c19
6 changed files with 354 additions and 366 deletions
Show Stats Download Patch File Download Diff File

128
Session/Onboarding/DisplayNameView.swift
Unescape Escape View File

@ -18,76 +18,74 @@ struct DisplayNameView: View {
} }
var body: some View { var body: some View {
NavigationView { ZStack(alignment: .center) {
ZStack(alignment: .center) { if #available(iOS 14.0, *) {
if #available(iOS 14.0, *) { ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea()
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() } else {
} else { ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary)
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) }
}
VStack(
alignment: .leading,
spacing: 0
) {
Spacer(minLength: 0)
let title: String = (self.flow == .register) ? "vc_display_name_title_2".localized() : "onboarding_display_name_title_new".localized()
Text(title)
.bold()
.font(.system(size: Values.veryLargeFontSize))
.foregroundColor(themeColor: .textPrimary)
Spacer(minLength: 0)
.frame(maxHeight: 2 * Values.mediumSpacing)
let explanation: String = (self.flow == .register) ? "onboarding_display_name_explanation".localized() : "onboarding_display_name_explanation_new".localized()
Text(explanation)
.font(.system(size: Values.smallFontSize))
.foregroundColor(themeColor: .textPrimary)
.fixedSize(horizontal: false, vertical: true)
Spacer(minLength: 0)
.frame(maxHeight: 2 * Values.mediumSpacing)
VStack( SessionTextField(
alignment: .leading, $displayName,
spacing: 0 placeholder: "onboarding_display_name_hint".localized(),
) { error: $error
Spacer(minLength: 0) )
let title: String = (self.flow == .register) ? "vc_display_name_title_2".localized() : "onboarding_display_name_title_new".localized() Spacer(minLength: 0)
Text(title) .frame(maxHeight: Values.massiveSpacing)
Spacer(minLength: 0)
}
.padding(.horizontal, Values.veryLargeSpacing)
.padding(.bottom, Values.largeButtonHeight)
VStack() {
Spacer(minLength: 0)
Button {
register()
} label: {
Text("continue_2".localized())
.bold() .bold()
.font(.system(size: Values.veryLargeFontSize))
.foregroundColor(themeColor: .textPrimary)
Spacer(minLength: 0)
.frame(maxHeight: 2 * Values.mediumSpacing)
let explanation: String = (self.flow == .register) ? "onboarding_display_name_explanation".localized() : "onboarding_display_name_explanation_new".localized()
Text(explanation)
.font(.system(size: Values.smallFontSize)) .font(.system(size: Values.smallFontSize))
.foregroundColor(themeColor: .textPrimary) .foregroundColor(themeColor: .sessionButton_text)
.fixedSize(horizontal: false, vertical: true) .frame(
maxWidth: .infinity,
Spacer(minLength: 0) maxHeight: Values.largeButtonHeight,
.frame(maxHeight: 2 * Values.mediumSpacing) alignment: .center
)
SessionTextField( .overlay(
$displayName, Capsule()
placeholder: "onboarding_display_name_hint".localized(), .stroke(themeColor: .sessionButton_border)
error: $error )
)
Spacer(minLength: 0)
.frame(maxHeight: Values.massiveSpacing)
Spacer(minLength: 0)
}
.padding(.horizontal, Values.veryLargeSpacing)
.padding(.bottom, Values.largeButtonHeight)
VStack() {
Spacer(minLength: 0)
Button {
register()
} label: {
Text("continue_2".localized())
.bold()
.font(.system(size: Values.smallFontSize))
.foregroundColor(themeColor: .sessionButton_text)
.frame(
maxWidth: .infinity,
maxHeight: Values.largeButtonHeight,
alignment: .center
)
.overlay(
Capsule()
.stroke(themeColor: .sessionButton_border)
)
}
.padding(.horizontal, Values.massiveSpacing)
} }
.padding(.vertical, Values.mediumSpacing) .padding(.horizontal, Values.massiveSpacing)
} }
.padding(.vertical, Values.mediumSpacing)
} }
} }

200
Session/Onboarding/LandingView.swift
Unescape Escape View File

@ -12,116 +12,114 @@ struct LandingView: View {
@State var numberOfBubblesShown: Int = 0 @State var numberOfBubblesShown: Int = 0
var body: some View { var body: some View {
NavigationView { ZStack(alignment: .center) {
ZStack(alignment: .center) { if #available(iOS 14.0, *) {
if #available(iOS 14.0, *) { ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea()
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() } else {
} else { ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary)
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) }
}
VStack(
alignment: .center,
spacing: 0
) {
Spacer(minLength: 0)
VStack( Text("onboarding_landing_title".localized())
alignment: .center, .bold()
spacing: 0 .font(.system(size: Values.veryLargeFontSize))
) { .foregroundColor(themeColor: .textPrimary)
Spacer(minLength: 0)
Spacer(minLength: 0)
Text("onboarding_landing_title".localized()) .frame(maxHeight: 2 * Values.mediumSpacing)
.bold()
.font(.system(size: Values.veryLargeFontSize)) FakeChat($numberOfBubblesShown)
.foregroundColor(themeColor: .textPrimary) .onAppear {
guard numberOfBubblesShown < 4 else { return }
Spacer(minLength: 0)
.frame(maxHeight: 2 * Values.mediumSpacing) Timer.scheduledTimerOnMainThread(withTimeInterval: 0.2, repeats: false) { _ in
withAnimation(.spring().speed(0.68)) {
FakeChat($numberOfBubblesShown) numberOfBubblesShown = 1
.onAppear { }
guard numberOfBubblesShown < 4 else { return } Timer.scheduledTimerOnMainThread(withTimeInterval: 1.5, repeats: true) { timer in
Timer.scheduledTimerOnMainThread(withTimeInterval: 0.2, repeats: false) { _ in
withAnimation(.spring().speed(0.68)) { withAnimation(.spring().speed(0.68)) {
numberOfBubblesShown = 1 numberOfBubblesShown += 1
} if numberOfBubblesShown >= 4 {
Timer.scheduledTimerOnMainThread(withTimeInterval: 1.5, repeats: true) { timer in timer.invalidate()
withAnimation(.spring().speed(0.68)) {
numberOfBubblesShown += 1
if numberOfBubblesShown >= 4 {
timer.invalidate()
}
} }
} }
} }
} }
}
Spacer(minLength: 0)
.frame(maxHeight: Values.massiveSpacing) Spacer(minLength: 0)
.frame(maxHeight: Values.massiveSpacing)
Spacer(minLength: 0)
Spacer(minLength: 0)
}
.padding(.vertical, Values.mediumSpacing)
.padding(.bottom, 3 * Values.largeButtonHeight)
VStack(
alignment: .center,
spacing: Values.mediumSpacing
) {
Spacer()
Button {
register()
} label: {
Text("onboarding_landing_register_button_title".localized())
.bold()
.font(.system(size: Values.smallFontSize))
.foregroundColor(themeColor: .sessionButton_primaryFilledText)
.frame(
maxWidth: .infinity,
maxHeight: Values.largeButtonHeight,
alignment: .center
)
.backgroundColor(themeColor: .sessionButton_primaryFilledBackground)
.cornerRadius(Values.largeButtonHeight / 2)
} }
.padding(.vertical, Values.mediumSpacing) .padding(.horizontal, Values.massiveSpacing)
.padding(.bottom, 3 * Values.largeButtonHeight)
VStack( Button {
alignment: .center, restore()
spacing: Values.mediumSpacing } label: {
) { Text("onboarding_landing_restore_button_title".localized())
Spacer() .bold()
.font(.system(size: Values.smallFontSize))
Button { .foregroundColor(themeColor: .sessionButton_text)
register() .frame(
} label: { maxWidth: .infinity,
Text("onboarding_landing_register_button_title".localized()) maxHeight: Values.largeButtonHeight,
.bold() alignment: .center
.font(.system(size: Values.smallFontSize)) )
.foregroundColor(themeColor: .sessionButton_primaryFilledText) .overlay(
.frame( Capsule()
maxWidth: .infinity, .stroke(themeColor: .sessionButton_border)
maxHeight: Values.largeButtonHeight, )
alignment: .center }
) .padding(.horizontal, Values.massiveSpacing)
.backgroundColor(themeColor: .sessionButton_primaryFilledBackground)
.cornerRadius(Values.largeButtonHeight / 2) Button {
} openLegalUrl()
.padding(.horizontal, Values.massiveSpacing) } label: {
let attributedText: NSAttributedString = {
Button { let text = String(format: "onboarding_T&C".localized(), "terms_of_service".localized(), "privacy_policy".localized())
restore() let result = NSMutableAttributedString(
} label: { string: text,
Text("onboarding_landing_restore_button_title".localized()) attributes: [ .font : UIFont.systemFont(ofSize: Values.verySmallFontSize)]
.bold() )
.font(.system(size: Values.smallFontSize)) result.addAttribute(.font, value: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize), range: (text as NSString).range(of: "terms_of_service".localized()))
.foregroundColor(themeColor: .sessionButton_text) result.addAttribute(.font, value: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize), range: (text as NSString).range(of: "privacy_policy".localized()))
.frame(
maxWidth: .infinity, return result
maxHeight: Values.largeButtonHeight, }()
alignment: .center AttributedText(attributedText)
) .foregroundColor(themeColor: .textPrimary)
.overlay(
Capsule()
.stroke(themeColor: .sessionButton_border)
)
}
.padding(.horizontal, Values.massiveSpacing)
Button {
openLegalUrl()
} label: {
let attributedText: NSAttributedString = {
let text = String(format: "onboarding_T&C".localized(), "terms_of_service".localized(), "privacy_policy".localized())
let result = NSMutableAttributedString(
string: text,
attributes: [ .font : UIFont.systemFont(ofSize: Values.verySmallFontSize)]
)
result.addAttribute(.font, value: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize), range: (text as NSString).range(of: "terms_of_service".localized()))
result.addAttribute(.font, value: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize), range: (text as NSString).range(of: "privacy_policy".localized()))
return result
}()
AttributedText(attributedText)
.foregroundColor(themeColor: .textPrimary)
}
.padding(.horizontal, Values.massiveSpacing)
} }
.padding(.horizontal, Values.massiveSpacing)
} }
} }
} }

50
Session/Onboarding/LoadAccountView.swift
Unescape Escape View File

@ -15,33 +15,31 @@ struct LoadAccountView: View {
@State private var errorString: String? = nil @State private var errorString: String? = nil
var body: some View { var body: some View {
NavigationView { ZStack(alignment: .topLeading) {
ZStack(alignment: .topLeading) { if #available(iOS 14.0, *) {
if #available(iOS 14.0, *) { ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea()
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() } else {
} else { ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary)
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) }
VStack(
spacing: 0
){
CustomTopTabBar(tabIndex: $tabIndex)
.frame(maxWidth: .infinity)
if tabIndex == 0 {
EnterRecoveryPasswordView(
$recoveryPassword,
error: $errorString,
continueWithMnemonic: continueWithMnemonic
)
} }
VStack( else {
spacing: 0 ScanQRCodeView(
){ $hexEncodedSeed,
CustomTopTabBar(tabIndex: $tabIndex) error: $errorString,
.frame(maxWidth: .infinity) continueWithhexEncodedSeed: continueWithhexEncodedSeed
)
if tabIndex == 0 {
EnterRecoveryPasswordView(
$recoveryPassword,
error: $errorString,
continueWithMnemonic: continueWithMnemonic
)
}
else {
ScanQRCodeView(
$hexEncodedSeed,
error: $errorString,
continueWithhexEncodedSeed: continueWithhexEncodedSeed
)
}
} }
} }
} }

66
Session/Onboarding/LoadingView.swift
Unescape Escape View File

@ -20,42 +20,40 @@ struct LoadingView: View {
} }
var body: some View { var body: some View {
NavigationView { ZStack(alignment: .center) {
ZStack(alignment: .center) { if #available(iOS 14.0, *) {
if #available(iOS 14.0, *) { ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea()
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() } else {
} else { ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary)
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) }
}
VStack(
alignment: .center,
spacing: Values.mediumSpacing
) {
Spacer()
VStack( CircularProgressView($percentage)
alignment: .center, .padding(.horizontal, Values.massiveSpacing)
spacing: Values.mediumSpacing .padding(.bottom, Values.mediumSpacing)
) { .onAppear {
Spacer() progress()
observeProfileRetrieving()
CircularProgressView($percentage) }
.padding(.horizontal, Values.massiveSpacing)
.padding(.bottom, Values.mediumSpacing) Text("onboarding_load_account_waiting".localized())
.onAppear { .bold()
progress() .font(.system(size: Values.mediumLargeFontSize))
observeProfileRetrieving() .foregroundColor(themeColor: .textPrimary)
}
Text("onboarding_loading_account".localized())
Text("onboarding_load_account_waiting".localized()) .font(.system(size: Values.smallFontSize))
.bold() .foregroundColor(themeColor: .textPrimary)
.font(.system(size: Values.mediumLargeFontSize))
.foregroundColor(themeColor: .textPrimary) Spacer()
Text("onboarding_loading_account".localized())
.font(.system(size: Values.smallFontSize))
.foregroundColor(themeColor: .textPrimary)
Spacer()
}
.padding(.horizontal, Values.veryLargeSpacing)
.padding(.bottom, Values.massiveSpacing + Values.largeButtonHeight)
} }
.padding(.horizontal, Values.veryLargeSpacing)
.padding(.bottom, Values.massiveSpacing + Values.largeButtonHeight)
} }
} }

110
Session/Onboarding/PNModeView.swift
Unescape Escape View File

@ -39,70 +39,68 @@ struct PNModeView: View {
] ]
var body: some View { var body: some View {
NavigationView { ZStack(alignment: .center) {
ZStack(alignment: .center) { if #available(iOS 14.0, *) {
if #available(iOS 14.0, *) { ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea()
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() } else {
} else { ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary)
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) }
}
VStack(
alignment: .leading,
spacing: Values.mediumSpacing
) {
Spacer()
Text("vc_pn_mode_title".localized())
.bold()
.font(.system(size: Values.veryLargeFontSize))
.foregroundColor(themeColor: .textPrimary)
.padding(.vertical, Values.mediumSpacing)
VStack( VStack(
alignment: .leading, alignment: .leading,
spacing: Values.mediumSpacing spacing: Values.mediumSpacing)
) { {
Spacer() ForEach(
0...(options.count - 1),
Text("vc_pn_mode_title".localized()) id: \.self
.bold() ) { index in
.font(.system(size: Values.veryLargeFontSize)) PNOptionView(
.foregroundColor(themeColor: .textPrimary) currentSelection: $currentSelection,
.padding(.vertical, Values.mediumSpacing) info: options[index]
)
VStack(
alignment: .leading,
spacing: Values.mediumSpacing)
{
ForEach(
0...(options.count - 1),
id: \.self
) { index in
PNOptionView(
currentSelection: $currentSelection,
info: options[index]
)
}
} }
Spacer()
} }
.padding(.horizontal, Values.veryLargeSpacing)
.padding(.bottom, Values.massiveSpacing + Values.largeButtonHeight)
VStack() { Spacer()
Spacer() }
.padding(.horizontal, Values.veryLargeSpacing)
Button { .padding(.bottom, Values.massiveSpacing + Values.largeButtonHeight)
register()
} label: { VStack() {
Text("continue_2".localized()) Spacer()
.bold()
.font(.system(size: Values.smallFontSize)) Button {
.foregroundColor(themeColor: .sessionButton_text) register()
.frame( } label: {
maxWidth: .infinity, Text("continue_2".localized())
maxHeight: Values.largeButtonHeight, .bold()
alignment: .center .font(.system(size: Values.smallFontSize))
) .foregroundColor(themeColor: .sessionButton_text)
.overlay( .frame(
Capsule() maxWidth: .infinity,
.stroke(themeColor: .sessionButton_border) maxHeight: Values.largeButtonHeight,
) alignment: .center
} )
.padding(.horizontal, Values.massiveSpacing) .overlay(
Capsule()
.stroke(themeColor: .sessionButton_border)
)
} }
.padding(.vertical, Values.mediumSpacing) .padding(.horizontal, Values.massiveSpacing)
} }
.padding(.vertical, Values.mediumSpacing)
} }
} }

166
Session/Onboarding/RecoveryPasswordView.swift
Unescape Escape View File

@ -25,100 +25,98 @@ struct RecoveryPasswordView: View {
} }
var body: some View { var body: some View {
NavigationView { ZStack(alignment: .center) {
ZStack(alignment: .center) { if #available(iOS 14.0, *) {
if #available(iOS 14.0, *) { ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea()
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() } else {
} else { ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary)
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) }
}
VStack(
alignment: .leading,
spacing: Values.mediumSpacing
) {
Spacer()
VStack( HStack(
alignment: .leading, alignment: .bottom,
spacing: Values.mediumSpacing spacing: Values.smallSpacing
) { ) {
Spacer() Text("onboarding_recovery_password_title".localized())
.bold()
HStack( .font(.system(size: Values.veryLargeFontSize))
alignment: .bottom,
spacing: Values.smallSpacing
) {
Text("onboarding_recovery_password_title".localized())
.bold()
.font(.system(size: Values.veryLargeFontSize))
.foregroundColor(themeColor: .textPrimary)
Image("SessionShield")
.resizable()
.renderingMode(.template)
.foregroundColor(themeColor: .textPrimary)
.scaledToFit()
.frame(
maxWidth: Values.largeFontSize,
maxHeight: Values.largeFontSize
)
.padding(.bottom, Values.verySmallSpacing)
}
Text("onboarding_recovery_password_explanation".localized())
.font(.system(size: Values.smallFontSize))
.foregroundColor(themeColor: .textPrimary) .foregroundColor(themeColor: .textPrimary)
Text(mnemonic) Image("SessionShield")
.font(.spaceMono(size: Values.verySmallFontSize)) .resizable()
.multilineTextAlignment(.center) .renderingMode(.template)
.foregroundColor(themeColor: .primary) .foregroundColor(themeColor: .textPrimary)
.frame(maxWidth: .infinity) .scaledToFit()
.padding(.all, Values.largeSpacing) .frame(
.overlay( maxWidth: Values.largeFontSize,
RoundedRectangle( maxHeight: Values.largeFontSize
cornerSize: CGSize(
width: Self.cornerRadius,
height: Self.cornerRadius
)
)
.stroke(themeColor: .borderSeparator)
) )
.padding(.bottom, Values.verySmallSpacing)
Button {
copyRecoveryPassword()
} label: {
let buttonTitle: String = self.copied ? "copied".localized() : "tap_to_copy".localized()
Text(buttonTitle)
.font(.system(size: Values.verySmallFontSize))
.foregroundColor(themeColor: .textSecondary)
}
.frame(maxWidth: .infinity)
Spacer()
} }
.padding(.horizontal, Values.veryLargeSpacing)
.padding(.bottom, Values.massiveSpacing + Values.largeButtonHeight)
VStack() { Text("onboarding_recovery_password_explanation".localized())
Spacer() .font(.system(size: Values.smallFontSize))
.foregroundColor(themeColor: .textPrimary)
Button {
finishRegister() Text(mnemonic)
} label: { .font(.spaceMono(size: Values.verySmallFontSize))
Text("continue_2".localized()) .multilineTextAlignment(.center)
.bold() .foregroundColor(themeColor: .primary)
.font(.system(size: Values.smallFontSize)) .frame(maxWidth: .infinity)
.foregroundColor(themeColor: .sessionButton_text) .padding(.all, Values.largeSpacing)
.frame( .overlay(
maxWidth: .infinity, RoundedRectangle(
maxHeight: Values.largeButtonHeight, cornerSize: CGSize(
alignment: .center width: Self.cornerRadius,
) height: Self.cornerRadius
.overlay(
Capsule()
.stroke(themeColor: .sessionButton_border)
) )
} )
.padding(.horizontal, Values.massiveSpacing) .stroke(themeColor: .borderSeparator)
)
Button {
copyRecoveryPassword()
} label: {
let buttonTitle: String = self.copied ? "copied".localized() : "tap_to_copy".localized()
Text(buttonTitle)
.font(.system(size: Values.verySmallFontSize))
.foregroundColor(themeColor: .textSecondary)
}
.frame(maxWidth: .infinity)
Spacer()
}
.padding(.horizontal, Values.veryLargeSpacing)
.padding(.bottom, Values.massiveSpacing + Values.largeButtonHeight)
VStack() {
Spacer()
Button {
finishRegister()
} label: {
Text("continue_2".localized())
.bold()
.font(.system(size: Values.smallFontSize))
.foregroundColor(themeColor: .sessionButton_text)
.frame(
maxWidth: .infinity,
maxHeight: Values.largeButtonHeight,
alignment: .center
)
.overlay(
Capsule()
.stroke(themeColor: .sessionButton_border)
)
} }
.padding(.vertical, Values.mediumSpacing) .padding(.horizontal, Values.massiveSpacing)
} }
.padding(.vertical, Values.mediumSpacing)
} }
} }

Write Preview
Loading…
Cancel
Save