From 90b2a4545c5fc999fb370b20dd69e777c281bd8a Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Mon, 21 Aug 2023 13:24:04 +1000 Subject: [PATCH] Enter recovery password screen --- Session.xcodeproj/project.pbxproj | 4 + .../Translations/de.lproj/Localizable.strings | 4 + .../Translations/en.lproj/Localizable.strings | 4 + .../Translations/es.lproj/Localizable.strings | 4 + .../Translations/fa.lproj/Localizable.strings | 4 + .../Translations/fi.lproj/Localizable.strings | 4 + .../Translations/fr.lproj/Localizable.strings | 4 + .../Translations/hi.lproj/Localizable.strings | 4 + .../Translations/hr.lproj/Localizable.strings | 4 + .../id-ID.lproj/Localizable.strings | 4 + .../Translations/it.lproj/Localizable.strings | 4 + .../Translations/ja.lproj/Localizable.strings | 4 + .../Translations/nl.lproj/Localizable.strings | 4 + .../Translations/pl.lproj/Localizable.strings | 4 + .../pt_BR.lproj/Localizable.strings | 4 + .../Translations/ru.lproj/Localizable.strings | 4 + .../Translations/si.lproj/Localizable.strings | 4 + .../Translations/sk.lproj/Localizable.strings | 4 + .../Translations/sv.lproj/Localizable.strings | 4 + .../Translations/th.lproj/Localizable.strings | 4 + .../vi-VN.lproj/Localizable.strings | 4 + .../zh-Hant.lproj/Localizable.strings | 4 + .../zh_CN.lproj/Localizable.strings | 4 + Session/Onboarding/DisplayNameView.swift | 1 - Session/Onboarding/LandingView.swift | 4 + Session/Onboarding/LoadAccountView.swift | 207 ++++++++++++++++++ .../Utilities/SwiftUI+Utilities.swift | 50 +++++ 27 files changed, 353 insertions(+), 1 deletion(-) create mode 100644 Session/Onboarding/LoadAccountView.swift diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index c5f755e9a..4e2c60abb 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -125,6 +125,7 @@ 7B87EF442A8DA720002A0E8F /* SessionTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B87EF432A8DA720002A0E8F /* SessionTextField.swift */; }; 7B87EF462A8DDA8E002A0E8F /* PNModeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B87EF452A8DDA8E002A0E8F /* PNModeView.swift */; }; 7B87EF482A8DFBBF002A0E8F /* RecoveryPasswordView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B87EF472A8DFBBF002A0E8F /* RecoveryPasswordView.swift */; }; + 7B87EF4A2A92DFB4002A0E8F /* LoadAccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B87EF492A92DFB4002A0E8F /* LoadAccountView.swift */; }; 7B8914772A7CAAE200A4C627 /* SessionHostingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B8914762A7CAAE200A4C627 /* SessionHostingViewController.swift */; }; 7B8C44C528B49DDA00FBE25F /* NewConversationVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B8C44C428B49DDA00FBE25F /* NewConversationVC.swift */; }; 7B8D5FC428332600008324D9 /* VisibleMessage+Reaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B8D5FC328332600008324D9 /* VisibleMessage+Reaction.swift */; }; @@ -1243,6 +1244,7 @@ 7B87EF432A8DA720002A0E8F /* SessionTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionTextField.swift; sourceTree = ""; }; 7B87EF452A8DDA8E002A0E8F /* PNModeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PNModeView.swift; sourceTree = ""; }; 7B87EF472A8DFBBF002A0E8F /* RecoveryPasswordView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecoveryPasswordView.swift; sourceTree = ""; }; + 7B87EF492A92DFB4002A0E8F /* LoadAccountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadAccountView.swift; sourceTree = ""; }; 7B8914762A7CAAE200A4C627 /* SessionHostingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionHostingViewController.swift; sourceTree = ""; }; 7B8C44C428B49DDA00FBE25F /* NewConversationVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewConversationVC.swift; sourceTree = ""; }; 7B8D5FC328332600008324D9 /* VisibleMessage+Reaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "VisibleMessage+Reaction.swift"; sourceTree = ""; }; @@ -3011,6 +3013,7 @@ 7B87EF412A8D9840002A0E8F /* DisplayNameView.swift */, 7B87EF452A8DDA8E002A0E8F /* PNModeView.swift */, 7B87EF472A8DFBBF002A0E8F /* RecoveryPasswordView.swift */, + 7B87EF492A92DFB4002A0E8F /* LoadAccountView.swift */, ); path = Onboarding; sourceTree = ""; @@ -6166,6 +6169,7 @@ B8269D3D25C7B34D00488AB4 /* InputTextView.swift in Sources */, 7B0EFDF0275084AA00FFAAE7 /* CallMessageCell.swift in Sources */, 7B93D06A27CF173D00811CB6 /* MessageRequestsViewController.swift in Sources */, + 7B87EF4A2A92DFB4002A0E8F /* LoadAccountView.swift in Sources */, C3AAFFF225AE99710089E6DD /* AppDelegate.swift in Sources */, B8BB82A5238F627000BA5194 /* HomeVC.swift in Sources */, 4521C3C01F59F3BA00B4C582 /* TextFieldHelper.swift in Sources */, diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings index b56cd21a8..6702f2e08 100644 --- a/Session/Meta/Translations/de.lproj/Localizable.strings +++ b/Session/Meta/Translations/de.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index 4656127b0..85f4f71ae 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/es.lproj/Localizable.strings b/Session/Meta/Translations/es.lproj/Localizable.strings index 1c8f2444d..758ef4449 100644 --- a/Session/Meta/Translations/es.lproj/Localizable.strings +++ b/Session/Meta/Translations/es.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings index 4924174ab..61c37bee2 100644 --- a/Session/Meta/Translations/fa.lproj/Localizable.strings +++ b/Session/Meta/Translations/fa.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings index 116a2e900..dce1cff2b 100644 --- a/Session/Meta/Translations/fi.lproj/Localizable.strings +++ b/Session/Meta/Translations/fi.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings index 7981061bd..734143a09 100644 --- a/Session/Meta/Translations/fr.lproj/Localizable.strings +++ b/Session/Meta/Translations/fr.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings index 3f2454af0..b3c2b7dc4 100644 --- a/Session/Meta/Translations/hi.lproj/Localizable.strings +++ b/Session/Meta/Translations/hi.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings index 6b66d782e..c70d7e9ce 100644 --- a/Session/Meta/Translations/hr.lproj/Localizable.strings +++ b/Session/Meta/Translations/hr.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/id-ID.lproj/Localizable.strings b/Session/Meta/Translations/id-ID.lproj/Localizable.strings index 18d0b9347..92bf3f657 100644 --- a/Session/Meta/Translations/id-ID.lproj/Localizable.strings +++ b/Session/Meta/Translations/id-ID.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings index 14665e59b..8173c064a 100644 --- a/Session/Meta/Translations/it.lproj/Localizable.strings +++ b/Session/Meta/Translations/it.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings index 87ef43d09..f2bfe16b6 100644 --- a/Session/Meta/Translations/ja.lproj/Localizable.strings +++ b/Session/Meta/Translations/ja.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings index e29084999..a71ea74aa 100644 --- a/Session/Meta/Translations/nl.lproj/Localizable.strings +++ b/Session/Meta/Translations/nl.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings index 46dd4945d..4911c9ce4 100644 --- a/Session/Meta/Translations/pl.lproj/Localizable.strings +++ b/Session/Meta/Translations/pl.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings index 708bc1628..e0f86bcd5 100644 --- a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings index 6faa8183f..025dec6ad 100644 --- a/Session/Meta/Translations/ru.lproj/Localizable.strings +++ b/Session/Meta/Translations/ru.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/si.lproj/Localizable.strings b/Session/Meta/Translations/si.lproj/Localizable.strings index 77a829793..e4d1bb7c0 100644 --- a/Session/Meta/Translations/si.lproj/Localizable.strings +++ b/Session/Meta/Translations/si.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings index 154283982..31b267a4c 100644 --- a/Session/Meta/Translations/sk.lproj/Localizable.strings +++ b/Session/Meta/Translations/sk.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/sv.lproj/Localizable.strings b/Session/Meta/Translations/sv.lproj/Localizable.strings index db6fe082d..fcf53f493 100644 --- a/Session/Meta/Translations/sv.lproj/Localizable.strings +++ b/Session/Meta/Translations/sv.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings index ab420529f..d7b4c8041 100644 --- a/Session/Meta/Translations/th.lproj/Localizable.strings +++ b/Session/Meta/Translations/th.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings index 8608e5063..31cc17823 100644 --- a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings +++ b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings index 9a51ccf70..b98ffe2ac 100644 --- a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings index b0e90762c..c4175fa00 100644 --- a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings @@ -673,3 +673,7 @@ "home_empty_state_welcome" = "Welcome to Session"; "home_empty_state_no_conversation" = "You don't have any conversations yet"; "home_empty_state_instruction" = "Hit the plus button to start a chat, create a group, or join an official communitiy!"; +"onboarding_recovery_password_tab_title" = "Recovery Password"; +"onboarding_recovery_password_tab_explanation" = "To load your account, enter the recovery password that was given to you when you signed up."; +"onboarding_recovery_password_hint" = "Enter your recovery password"; +"onboarding_load_account_title" = "Load Account"; diff --git a/Session/Onboarding/DisplayNameView.swift b/Session/Onboarding/DisplayNameView.swift index ed4d6624c..f15e98e4e 100644 --- a/Session/Onboarding/DisplayNameView.swift +++ b/Session/Onboarding/DisplayNameView.swift @@ -35,7 +35,6 @@ struct DisplayNameView: View { .bold() .font(.system(size: Values.veryLargeFontSize)) .foregroundColor(themeColor: .textPrimary) - .padding(.vertical, Values.mediumSpacing) Text("onboarding_display_name_explanation".localized()) .font(.system(size: Values.smallFontSize)) diff --git a/Session/Onboarding/LandingView.swift b/Session/Onboarding/LandingView.swift index 3ea9d22fe..094ee191d 100644 --- a/Session/Onboarding/LandingView.swift +++ b/Session/Onboarding/LandingView.swift @@ -118,7 +118,11 @@ struct LandingView: View { } private func restore() { + Onboarding.Flow.register.unregister() + let viewController: SessionHostingViewController = SessionHostingViewController(rootView: LoadAccountView()) + viewController.setNavBarTitle("onboarding_load_account_title".localized()) + self.host.controller?.navigationController?.pushViewController(viewController, animated: true) } } diff --git a/Session/Onboarding/LoadAccountView.swift b/Session/Onboarding/LoadAccountView.swift new file mode 100644 index 000000000..5c47848d6 --- /dev/null +++ b/Session/Onboarding/LoadAccountView.swift @@ -0,0 +1,207 @@ +// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved. + +import SwiftUI +import SessionUIKit +import SignalUtilitiesKit +import SessionUtilitiesKit + +struct LoadAccountView: View { + @EnvironmentObject var host: HostWrapper + + @State var tabIndex = 0 + @State private var recoveryPassword: String = "" + + var body: some View { + NavigationView { + ZStack(alignment: .topLeading) { + if #available(iOS 14.0, *) { + ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea() + } else { + ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary) + } + VStack( + spacing: 0 + ){ + CustomTopTabBar(tabIndex: $tabIndex) + .frame(maxWidth: .infinity) + + if tabIndex == 0 { + EnterRecoveryPasswordView($recoveryPassword) + } + else { + ScanQRCodeView() + } + } + } + } + } + + func continueWithSeed(_ seed: Data, onError: (() -> ())?) { + if (seed.count != 16) { + let modal: ConfirmationModal = ConfirmationModal( + info: ConfirmationModal.Info( + title: "invalid_recovery_phrase".localized(), + body: .text("INVALID_RECOVERY_PHRASE_MESSAGE".localized()), + cancelTitle: "BUTTON_OK".localized(), + cancelStyle: .alert_text, + afterClosed: onError + ) + ) + self.host.controller?.present(modal, animated: true) + return + } + let (ed25519KeyPair, x25519KeyPair) = try! Identity.generate(from: seed) + + Onboarding.Flow.link + .preregister( + with: seed, + ed25519KeyPair: ed25519KeyPair, + x25519KeyPair: x25519KeyPair + ) + + // Otherwise continue on to request push notifications permissions + let viewController: SessionHostingViewController = SessionHostingViewController(rootView: PNModeView(flow: .link)) + viewController.setUpNavBarSessionIcon() + self.host.controller?.navigationController?.pushViewController(viewController, animated: true) + } +} + +struct TabBarButton: View { + @Binding var isSelected: Bool + + let text: String + + var body: some View { + ZStack( + alignment: .bottom + ) { + Text(text) + .bold() + .font(.system(size: Values.mediumFontSize)) + .foregroundColor(themeColor: .textPrimary) + .padding(.bottom, 5) + .frame( + maxWidth: .infinity, + maxHeight: .infinity + ) + if isSelected { + Rectangle() + .foregroundColor(themeColor: .primary) + .frame( + maxWidth: .infinity, + maxHeight: 5 + ) + .padding(.horizontal, Values.verySmallSpacing) + } + + } + } +} + +struct CustomTopTabBar: View { + @Binding var tabIndex: Int + + private static let height = isIPhone5OrSmaller ? CGFloat(32) : CGFloat(48) + + var body: some View { + HStack(spacing: 0) { + TabBarButton( + isSelected: .constant(tabIndex == 0), + text: "onboarding_recovery_password_tab_title".localized() + ) + .onTapGesture { onButtonTapped(index: 0) } + + TabBarButton( + isSelected: .constant(tabIndex == 1), + text: "vc_qr_code_view_scan_qr_code_tab_title".localized() + ) + .onTapGesture { onButtonTapped(index: 1) } + } + .frame( + maxWidth: .infinity, + maxHeight: Self.height + ) + .border(width: 1, edges: [.bottom], color: .borderSeparator) + } + + private func onButtonTapped(index: Int) { + withAnimation(.easeInOut(duration: 0.2)) { + tabIndex = index + } + } +} + +struct EnterRecoveryPasswordView: View{ + @Binding var recoveryPassword: String + + init(_ recoveryPassword: Binding) { + self._recoveryPassword = recoveryPassword + } + + var body: some View{ + ZStack(alignment: .center) { + VStack( + alignment: .leading, + spacing: Values.mediumSpacing + ) { + Spacer() + + Text("onboarding_recovery_password_tab_title".localized()) + .bold() + .font(.system(size: Values.veryLargeFontSize)) + .foregroundColor(themeColor: .textPrimary) + + Text("onboarding_recovery_password_tab_explanation".localized()) + .font(.system(size: Values.smallFontSize)) + .foregroundColor(themeColor: .textPrimary) + .padding(.vertical, Values.mediumSpacing) + + SessionTextField( + $recoveryPassword, + placeholder: "onboarding_recovery_password_hint".localized() + ) + + Spacer() + } + .padding(.horizontal, Values.veryLargeSpacing) + .padding(.bottom, Values.massiveSpacing + Values.largeButtonHeight) + + VStack() { + Spacer() + + Button { + + } 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) + } + } +} + +struct ScanQRCodeView: View{ + var body: some View{ + ZStack{ + } + } +} + +struct LoadAccountView_Previews: PreviewProvider { + static var previews: some View { + LoadAccountView() + } +} diff --git a/SessionUIKit/Utilities/SwiftUI+Utilities.swift b/SessionUIKit/Utilities/SwiftUI+Utilities.swift index 90c32a91a..1c6b7c3a3 100644 --- a/SessionUIKit/Utilities/SwiftUI+Utilities.swift +++ b/SessionUIKit/Utilities/SwiftUI+Utilities.swift @@ -35,3 +35,53 @@ extension UIViewController { self.present(toPresent, animated: true, completion: nil) } } + +struct EdgeBorder: Shape { + + var width: CGFloat + var edges: [Edge] + + func path(in rect: CGRect) -> Path { + var path = Path() + for edge in edges { + var x: CGFloat { + switch edge { + case .top, .bottom, .leading: return rect.minX + case .trailing: return rect.maxX - width + } + } + + var y: CGFloat { + switch edge { + case .top, .leading, .trailing: return rect.minY + case .bottom: return rect.maxY - width + } + } + + var w: CGFloat { + switch edge { + case .top, .bottom: return rect.width + case .leading, .trailing: return self.width + } + } + + var h: CGFloat { + switch edge { + case .top, .bottom: return self.width + case .leading, .trailing: return rect.height + } + } + path.addPath(Path(CGRect(x: x, y: y, width: w, height: h))) + } + return path + } +} + +extension View { + public func border(width: CGFloat, edges: [Edge], color: ThemeValue) -> some View { + overlay( + EdgeBorder(width: width, edges: edges) + .foregroundColor(themeColor: color) + ) + } +}