chore: revert dashboard changes

Author: szabinst

Horizon/Horizon/Sources/Common/View/NavigationBar/NavigationBarView.swift

@@ -17,8 +17,8 @@
 //
 
 import Core
-import SwiftUI
 import HorizonUI
+import SwiftUI
 
 struct DashboardView: View {
     @Bindable private var viewModel: DashboardViewModel
@@ -27,17 +27,19 @@ struct DashboardView: View {
     // TODO: - Set with correct url later
     private let logoURL = "https://cdn.prod.website-files.com/5f7685be6c8c113f558855d9/62c87dbd6208a1e98e89e707_Logo_Canvas_Red_Vertical%20copy.png"
 
-    private let navigationBarViewModel: NavigationBarViewModel = .init()
-
     init(viewModel: DashboardViewModel) {
         self.viewModel = viewModel
     }
 
     var body: some View {
-        NavigationBarView(
+        InstUI.BaseScreen(
             state: viewModel.state,
-            viewModel: navigationBarViewModel
-        ) {
+            config: .init(
+                refreshable: true,
+                loaderBackgroundColor: .huiColors.surface.pagePrimary
+            ),
+            refreshAction: viewModel.reload
+        ) { _ in
             LazyVStack(spacing: .zero) {
                 ForEach(viewModel.nextUpViewModels) { nextUpViewModel in
                     VStack(alignment: .leading, spacing: .zero) {
@@ -78,9 +80,29 @@ struct DashboardView: View {
                     .padding(.horizontal, .huiSpaces.space24)
                 }
             }
-            .toolbar(.visible)
             .padding(.bottom, .huiSpaces.space16)
         }
+        .toolbar(.hidden)
+        .safeAreaInset(edge: .top, spacing: .zero) { navigationBar }
+        .scrollIndicators(.hidden, axes: .vertical)
+        .background(Color.huiColors.surface.pagePrimary)
+    }
+
+    private var navigationBar: some View {
+        HStack(spacing: .zero) {
+            HorizonUI.NavigationBar.Leading(logoURL: logoURL)
+            Spacer()
+            HorizonUI.NavigationBar.Trailing {
+                viewModel.notebookDidTap(viewController: viewController)
+            } onNotificationDidTap: {
+                viewModel.notificationsDidTap()
+            } onMailDidTap: {
+                viewModel.mailDidTap(viewController: viewController)
+            }
+        }
+        .padding(.horizontal, .huiSpaces.space24)
+        .padding(.bottom, .huiSpaces.space4)
+        .background(Color.huiColors.surface.pagePrimary)
     }
 
     private var nameLabel: some View {

Horizon/Horizon/Sources/Common/View/NavigationBar/NavigationBarViewModel.swift

@@ -33,7 +33,6 @@ public extension HorizonUI.NavigationBar {
                     .resizable()
                     .aspectRatio(contentMode: .fit)
                     .frame(width: 118, height: 44)
-                    .background(Color.huiColors.surface.pageTertiary)
             }
         }
     }

Horizon/Horizon/Sources/Features/Dashboard/View/DashboardView.swift

@@ -39,7 +39,7 @@ public extension HorizonUI.NavigationBar {
         }
 
         public var body: some View {
-            HStack(spacing: .zero) {
+            HStack(spacing: .huiSpaces.space8) {
 
                 if let onNotebookDidTap = onNotebookDidTap {
                     Button {