diff --git a/Uplift.xcodeproj/project.pbxproj b/Uplift.xcodeproj/project.pbxproj index 1fe2717..e2f1add 100644 --- a/Uplift.xcodeproj/project.pbxproj +++ b/Uplift.xcodeproj/project.pbxproj @@ -902,7 +902,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 33; + CURRENT_PROJECT_VERSION = 34; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ZGMCXU7X3U; ENABLE_PREVIEWS = YES; @@ -946,7 +946,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 33; + CURRENT_PROJECT_VERSION = 34; DEVELOPMENT_TEAM = ZGMCXU7X3U; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; diff --git a/Uplift/Views/ClassesView.swift b/Uplift/Views/ClassesView.swift index 40686b3..9181f29 100644 --- a/Uplift/Views/ClassesView.swift +++ b/Uplift/Views/ClassesView.swift @@ -185,8 +185,16 @@ struct ClassesView: View { ForEach(viewModel.filteredClasses, id: \.self) { classInstance in NavigationLink { ClassDetailView(classInstance: classInstance, viewModel: viewModel) - .onAppear { tabBarProp.hidden = true } - .onDisappear { tabBarProp.hidden = false } + .onAppear { + withAnimation(.easeIn(duration: 0.05)) { + tabBarProp.hidden = true + } + } + .onDisappear { + withAnimation(.easeIn(duration: 0.05)) { + tabBarProp.hidden = false + } + } } label: { ClassCell(classInstance: classInstance, viewModel: viewModel) } diff --git a/Uplift/Views/MainView.swift b/Uplift/Views/MainView.swift index 519a7e3..eaff7f2 100644 --- a/Uplift/Views/MainView.swift +++ b/Uplift/Views/MainView.swift @@ -21,9 +21,7 @@ struct MainView: View { var body: some View { ZStack { - HomeView(popUpGiveaway: $viewModel.popUpGiveaway) - - ZStack(alignment: .bottom) { + VStack(spacing: 0) { switch selectedTab { case .home: HomeView(popUpGiveaway: $viewModel.popUpGiveaway) @@ -32,7 +30,7 @@ struct MainView: View { .environmentObject(tabBarProp) } - !tabBarProp.hidden ? tabBar : nil + !tabBarProp.hidden ? tabBar.transition(.move(edge: .bottom)) : nil } if viewModel.popUpGiveaway {