From c8d71996d9ed1f886a3a448a9e8185f6e78aff06 Mon Sep 17 00:00:00 2001 From: cheykrym Date: Wed, 13 Aug 2025 02:57:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B1=D1=83=D1=80=D0=B3=D0=B5=D1=80=20=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Shared/Components/TopBarView.swift | 24 +++++++++++++++++------- Shared/Views/Tab/MainView.swift | 13 ++++++++----- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/Shared/Components/TopBarView.swift b/Shared/Components/TopBarView.swift index 160a3e2..76f0ab0 100644 --- a/Shared/Components/TopBarView.swift +++ b/Shared/Components/TopBarView.swift @@ -62,13 +62,23 @@ struct TopBarView: View { } if isHomeTab{ - // Заглушка кнопки - Button(action: { - // пока ничего не делаем - }) { - Image(systemName: "magnifyingglass") - .imageScale(.large) - .foregroundColor(.primary) + HStack(spacing: 20) { + // Кнопка поиска + Button(action: { + // пока ничего не делаем + }) { + Image(systemName: "magnifyingglass") + .imageScale(.large) + .foregroundColor(.primary) + } + // Кнопка уведомлений + Button(action: { + // пока ничего не делаем + }) { + Image(systemName: "bell") + .imageScale(.large) + .foregroundColor(.primary) + } } } else if isProfileTab { NavigationLink(destination: SettingsView(viewModel: viewModel)) { diff --git a/Shared/Views/Tab/MainView.swift b/Shared/Views/Tab/MainView.swift index 658b303..e661a89 100644 --- a/Shared/Views/Tab/MainView.swift +++ b/Shared/Views/Tab/MainView.swift @@ -69,11 +69,14 @@ struct MainView: View { // Боковое меню if isSideMenuPresented { - SideMenuView(isPresented: $isSideMenuPresented) - .frame(width: UIScreen.main.bounds.width * 0.8) - .offset(x: isSideMenuPresented ? 0 : -UIScreen.main.bounds.width) - .transition(.move(edge: .leading)) - .zIndex(1) // Убедимся, что меню поверх всего + HStack { + SideMenuView(isPresented: $isSideMenuPresented) + .frame(width: UIScreen.main.bounds.width * 0.8) + Spacer() + } + .ignoresSafeArea(edges: .vertical) // Игнорируем safe area + .transition(.move(edge: .leading)) + .zIndex(1) // Убедимся, что меню поверх всего } } }