diff --git a/IceCubesApp/App/Main/AppView.swift b/IceCubesApp/App/Main/AppView.swift index c82409b6..45d814b5 100644 --- a/IceCubesApp/App/Main/AppView.swift +++ b/IceCubesApp/App/Main/AppView.swift @@ -110,10 +110,7 @@ struct AppView: View { HStack(spacing: 0) { if #available(iOS 18.0, *) { baseTabView - .tabViewStyle(.sidebarAdaptable) - .introspect(.tabView, on: .iOS(.v17, .v18)) { (tabview: UITabBarController) in - tabview.sidebar.isHidden = true - } + .tabViewStyle(.tabBarOnly) } else { baseTabView } diff --git a/IceCubesApp/App/SideBarView.swift b/IceCubesApp/App/SideBarView.swift index ae7a9ce7..5e4ea7ef 100644 --- a/IceCubesApp/App/SideBarView.swift +++ b/IceCubesApp/App/SideBarView.swift @@ -34,8 +34,8 @@ struct SideBarView: View { } private func makeIconForTab(tab: AppTab) -> some View { - HStack { - ZStack(alignment: .topTrailing) { + ZStack(alignment: .topTrailing) { + HStack { SideBarIcon(systemIconName: tab.iconName, isSelected: tab == selectedTab) if userPreferences.isSidebarExpanded { @@ -56,7 +56,7 @@ struct SideBarView: View { ) let badge = badgeFor(tab: tab) if badge > 0 { - makeBadgeView(count: 10) + makeBadgeView(count: badge) } } } @@ -70,7 +70,7 @@ struct SideBarView: View { .font(.caption2) } .frame(width: 24, height: 24) - .offset(x: 10, y: -10) + .offset(x: 5, y: -5) } private var postButton: some View {