From 6cd83269047f50790ace55102b1a7eb04e799db5 Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Thu, 17 Aug 2023 14:14:07 +1000
Subject: [PATCH] refactor and improvements on landing view

---
 .../MessageInfoView.swift                     |  2 +-
 Session/Onboarding/DisplayNameView.swift      | 15 ++++
 Session/Onboarding/LandingView.swift          | 68 ++++++++++++-------
 .../Shared/SessionHostingViewController.swift | 17 ++++-
 SessionUIKit/Components/AttributedText.swift  |  1 -
 .../Components/SessionTextField.swift         | 15 ++++
 6 files changed, 89 insertions(+), 29 deletions(-)
 create mode 100644 Session/Onboarding/DisplayNameView.swift
 create mode 100644 SessionUIKit/Components/SessionTextField.swift

diff --git a/Session/Media Viewing & Editing/MessageInfoView.swift b/Session/Media Viewing & Editing/MessageInfoView.swift
index 50822724a..dfc8d7350 100644
--- a/Session/Media Viewing & Editing/MessageInfoView.swift	
+++ b/Session/Media Viewing & Editing/MessageInfoView.swift	
@@ -475,7 +475,7 @@ final class MessageInfoViewController: SessionHostingViewController<MessageInfoV
         )
         
         super.init(rootView: messageInfoView)
-        rootView.dismiss = dismiss
+        rootView.content.dismiss = dismiss
     }
     
     @MainActor required dynamic init?(coder aDecoder: NSCoder) {
diff --git a/Session/Onboarding/DisplayNameView.swift b/Session/Onboarding/DisplayNameView.swift
new file mode 100644
index 000000000..8c8a2e799
--- /dev/null
+++ b/Session/Onboarding/DisplayNameView.swift
@@ -0,0 +1,15 @@
+// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
+
+import SwiftUI
+
+struct DisplayNameView: View {
+    var body: some View {
+        Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
+    }
+}
+
+struct DisplayNameView_Previews: PreviewProvider {
+    static var previews: some View {
+        DisplayNameView()
+    }
+}
diff --git a/Session/Onboarding/LandingView.swift b/Session/Onboarding/LandingView.swift
index 7bf0e37ec..61fbf4767 100644
--- a/Session/Onboarding/LandingView.swift
+++ b/Session/Onboarding/LandingView.swift
@@ -1,12 +1,15 @@
 // Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
 
 import SwiftUI
+import UIKit
 import SessionUIKit
 
 struct LandingView: View {
+    @EnvironmentObject var host: HostWrapper
+    
     var body: some View {
         NavigationView {
-            ZStack (alignment: .topLeading) {
+            ZStack(alignment: .center) {
                 if #available(iOS 14.0, *) {
                     ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea()
                 } else {
@@ -15,9 +18,9 @@ struct LandingView: View {
                 
                 VStack(
                     alignment: .center,
-                    spacing: 16
+                    spacing: Values.mediumSpacing
                 ) {
-                    Spacer(minLength: Values.massiveSpacing)
+                    Spacer()
                     
                     Text("onboarding_landing_title".localized())
                         .bold()
@@ -27,10 +30,19 @@ struct LandingView: View {
                     
                     FakeChat()
                     
-                    Spacer(minLength: Values.massiveSpacing)
+                    Spacer()
+                }
+                .padding(.vertical, Values.mediumSpacing)
+                .padding(.bottom, Values.massiveSpacing + 3 * Values.largeButtonHeight)
+                
+                VStack(
+                    alignment: .center,
+                    spacing: Values.mediumSpacing)
+                {
+                    Spacer()
                     
                     Button {
-                        
+                        register()
                     } label: {
                         Text("onboarding_landing_register_button_title".localized())
                             .bold()
@@ -47,7 +59,7 @@ struct LandingView: View {
                     .padding(.horizontal, Values.massiveSpacing)
                     
                     Button {
-                        
+                        restore()
                     } label: {
                         Text("onboarding_landing_restore_button_title".localized())
                             .bold()
@@ -84,10 +96,19 @@ struct LandingView: View {
                     }
                     .padding(.horizontal, Values.massiveSpacing)
                 }
-                .padding(.vertical, Values.mediumSpacing)
             }
         }
     }
+    
+    private func register() {
+        let viewController: SessionHostingViewController = SessionHostingViewController(rootView: DisplayNameView(flow: .register))
+        viewController.setUpNavBarSessionIcon()
+        self.host.controller?.navigationController?.pushViewController(viewController, animated: true)
+    }
+    
+    private func restore() {
+        
+    }
 }
 
 struct ChatBubble: View {
@@ -118,28 +139,23 @@ struct FakeChat: View {
     ]
     
     var body: some View {
-        ScrollView(
-            .vertical,
-            showsIndicators: false
+        VStack(
+            alignment: .leading,
+            spacing: 18
         ) {
-            VStack(
-                alignment: .leading,
-                spacing: 18
-            ) {
-                ForEach(
-                    0...(chatBubbles.count - 1),
-                    id: \.self
-                ) { index in
-                    let chatBubble: ChatBubble = chatBubbles[index]
-                    chatBubble
-                        .frame(
-                            maxWidth: .infinity,
-                            alignment: chatBubble.outgoing ? .trailing : .leading
-                        )
-                }
+            ForEach(
+                0...(chatBubbles.count - 1),
+                id: \.self
+            ) { index in
+                let chatBubble: ChatBubble = chatBubbles[index]
+                chatBubble
+                    .frame(
+                        maxWidth: .infinity,
+                        alignment: chatBubble.outgoing ? .trailing : .leading
+                    )
             }
-            .padding(.horizontal, 36)
         }
+        .padding(.horizontal, 36)
     }
 }
 
diff --git a/Session/Shared/SessionHostingViewController.swift b/Session/Shared/SessionHostingViewController.swift
index f3971e56e..148cc0a1a 100644
--- a/Session/Shared/SessionHostingViewController.swift
+++ b/Session/Shared/SessionHostingViewController.swift
@@ -3,7 +3,11 @@
 import SwiftUI
 import SessionUIKit
 
-public class SessionHostingViewController<Content>: UIHostingController<Content> where Content : View {
+public class HostWrapper: ObservableObject {
+    public weak var controller: UIViewController?
+}
+
+public class SessionHostingViewController<Content>: UIHostingController<ModifiedContent<Content,SwiftUI._EnvironmentKeyWritingModifier<HostWrapper?>>> where Content : View {
     public override var preferredStatusBarStyle: UIStatusBarStyle {
         return ThemeManager.currentTheme.statusBarStyle
     }
@@ -28,6 +32,17 @@ public class SessionHostingViewController<Content>: UIHostingController<Content>
         return result
     }()
     
+    public init(rootView:Content) {
+        let container = HostWrapper()
+        let modified = rootView.environmentObject(container) as! ModifiedContent<Content, _EnvironmentKeyWritingModifier<HostWrapper?>>
+        super.init(rootView: modified)
+        container.controller = self
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
     public override func viewDidLoad() {
         super.viewDidLoad()
         
diff --git a/SessionUIKit/Components/AttributedText.swift b/SessionUIKit/Components/AttributedText.swift
index f5f14816c..b5707fd64 100644
--- a/SessionUIKit/Components/AttributedText.swift
+++ b/SessionUIKit/Components/AttributedText.swift
@@ -33,7 +33,6 @@ public struct AttributedText: View {
     }
     
     public var body: some View {
-        let _ = print(descriptions)
         descriptions.map { description in
             var text: Text = Text(description.content)
             if let font: Font = description.font { text = text.font(font) }
diff --git a/SessionUIKit/Components/SessionTextField.swift b/SessionUIKit/Components/SessionTextField.swift
new file mode 100644
index 000000000..346868edc
--- /dev/null
+++ b/SessionUIKit/Components/SessionTextField.swift
@@ -0,0 +1,15 @@
+// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
+
+import SwiftUI
+
+struct SessionTextField: View {
+    var body: some View {
+        Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
+    }
+}
+
+struct SessionTextField_Previews: PreviewProvider {
+    static var previews: some View {
+        SessionTextField()
+    }
+}