mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-26 10:11:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix sidebar

Browse source
This commit is contained in:
Thomas Ricouard 2024-09-11 09:50:32 +02:00
parent 0a15f7ff1c
commit c0b0a3ee1c
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
IceCubesApp/App/Main/AppView.swift
View file

@ -110,10 +110,7 @@ struct AppView: View {
HStack(spacing: 0) { HStack(spacing: 0) {
if #available(iOS 18.0, *) { if #available(iOS 18.0, *) {
baseTabView baseTabView
.tabViewStyle(.sidebarAdaptable) .tabViewStyle(.tabBarOnly)
.introspect(.tabView, on: .iOS(.v17, .v18)) { (tabview: UITabBarController) in
tabview.sidebar.isHidden = true
}
} else { } else {
baseTabView baseTabView
} }

8
IceCubesApp/App/SideBarView.swift
View file

@ -34,8 +34,8 @@ struct SideBarView<Content: View>: View {
} }
private func makeIconForTab(tab: AppTab) -> some View { private func makeIconForTab(tab: AppTab) -> some View {
HStack { ZStack(alignment: .topTrailing) {
ZStack(alignment: .topTrailing) { HStack {
SideBarIcon(systemIconName: tab.iconName, SideBarIcon(systemIconName: tab.iconName,
isSelected: tab == selectedTab) isSelected: tab == selectedTab)
if userPreferences.isSidebarExpanded { if userPreferences.isSidebarExpanded {
@ -56,7 +56,7 @@ struct SideBarView<Content: View>: View {
) )
let badge = badgeFor(tab: tab) let badge = badgeFor(tab: tab)
if badge > 0 { if badge > 0 {
makeBadgeView(count: 10) makeBadgeView(count: badge)
} }
} }
} }
@ -70,7 +70,7 @@ struct SideBarView<Content: View>: View {
.font(.caption2) .font(.caption2)
} }
.frame(width: 24, height: 24) .frame(width: 24, height: 24)
.offset(x: 10, y: -10) .offset(x: 5, y: -5)
} }
private var postButton: some View { private var postButton: some View {