messenger/ios_app
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

topbar update

Browse Source
This commit is contained in:
cheykrym 2025-08-13 01:11:14 +03:00
parent 2052492912
commit db12fca1c3
4 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shared/Components/TopBarView.swift
View File

@ -56,7 +56,7 @@ struct TopBarView: View {
.padding() .padding()
.frame(height: 50) // Стандартная высота для нав. бара .frame(height: 50) // Стандартная высота для нав. бара
Divider() // Divider()
} }
.background(Color(UIColor.systemBackground)) .background(Color(UIColor.systemBackground))
} }

47
Shared/Views/Tab/MainView.swift
View File

@ -38,15 +38,16 @@ struct MainView: View {
var body: some View { var body: some View {
NavigationView { NavigationView {
VStack(spacing: 0) { VStack(spacing: 0) {
TopBarView( if topBarVisible {
title: tabTitle, TopBarView(
selectedAccount: $selectedAccount, title: tabTitle,
sheetType: $sheetType, selectedAccount: $selectedAccount,
accounts: accounts, sheetType: $sheetType,
viewModel: viewModel accounts: accounts,
) viewModel: viewModel
.offset(y: topBarVisible ? 0 : -100) )
.animation(.spring(response: 0.4, dampingFraction: 0.8), value: topBarVisible) .transition(AnyTransition.move(edge: .top).combined(with: .opacity))
}
ZStack { ZStack {
switch selectedTab { switch selectedTab {
@ -70,9 +71,11 @@ struct MainView: View {
} }
.frame(maxWidth: .infinity, maxHeight: .infinity) .frame(maxWidth: .infinity, maxHeight: .infinity)
if topBarVisible {
CustomTabBar(selectedTab: $selectedTab) { CustomTabBar(selectedTab: $selectedTab) {
print("Create button tapped") print("Create button tapped")
} }
}
} }
.ignoresSafeArea(edges: .bottom) .ignoresSafeArea(edges: .bottom)
.navigationBarHidden(true) .navigationBarHidden(true)
@ -97,17 +100,21 @@ struct MainView: View {
let currentY = offset.y let currentY = offset.y
// Показываем бар, если скроллим вверх или дошли до верха // Показываем бар, если скроллим вверх или дошли до верха
if currentY < lastScrollY || currentY <= 0 { // if currentY < lastScrollY || currentY <= 0 {
if !topBarVisible { // if !topBarVisible {
topBarVisible = true // withAnimation(.default) {
} // topBarVisible = true
} // }
// Скрываем, если скроллим вниз и отступили от верха // }
else if currentY > lastScrollY && currentY > 50 { // }
if topBarVisible { // // Скрываем, если скроллим вниз и отступили от верха
topBarVisible = false // else if currentY > lastScrollY && currentY > 50 {
} // if topBarVisible {
} // withAnimation(.default) {
// topBarVisible = false
// }
// }
// }
lastScrollY = currentY lastScrollY = currentY
} }

2
yobble.xcodeproj/project.pbxproj
View File

@ -66,7 +66,7 @@
1A7940A52DF77DF5002569DA /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; }; 1A7940A52DF77DF5002569DA /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
1A7940A92DF77E05002569DA /* LoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewModel.swift; sourceTree = "<group>"; }; 1A7940A92DF77E05002569DA /* LoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewModel.swift; sourceTree = "<group>"; };
1A7940AF2DF77E26002569DA /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = "<group>"; }; 1A7940AF2DF77E26002569DA /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = "<group>"; };
1A7940B52DF77F21002569DA /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; }; 1A7940B52DF77F21002569DA /* MainView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; tabWidth = 4; };
1A7940C52DF7A98E002569DA /* ContactsTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactsTab.swift; sourceTree = "<group>"; }; 1A7940C52DF7A98E002569DA /* ContactsTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactsTab.swift; sourceTree = "<group>"; };
1A7940C92DF7A99B002569DA /* ChatsTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatsTab.swift; sourceTree = "<group>"; }; 1A7940C92DF7A99B002569DA /* ChatsTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatsTab.swift; sourceTree = "<group>"; };
1A7940CD2DF7A9AA002569DA /* ProfileTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileTab.swift; sourceTree = "<group>"; }; 1A7940CD2DF7A9AA002569DA /* ProfileTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileTab.swift; sourceTree = "<group>"; };

4
yobble.xcodeproj/xcuserdata/cheykrym.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@ -17,12 +17,12 @@
<key>yobble (iOS).xcscheme_^#shared#^_</key> <key>yobble (iOS).xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>0</integer> <integer>1</integer>
</dict> </dict>
<key>yobble (macOS).xcscheme_^#shared#^_</key> <key>yobble (macOS).xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>1</integer> <integer>0</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>