Skip to content

Release 3.0.0 Build 34 #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 8, 2024
Merged

Release 3.0.0 Build 34 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1c36a1
Addressed Matt's comments
caitlynjin Oct 28, 2024
ff4d1c5
Merge Release to Main (#69)
rs929 Nov 4, 2024
99b59eb
Fixed spacing of tabbar and transition
caitlynjin Nov 7, 2024
6268c50
Merge branch 'release' into main-copy
caitlynjin Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Uplift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
12 changes: 10 additions & 2 deletions Uplift/Views/ClassesView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
6 changes: 2 additions & 4 deletions Uplift/Views/MainView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -32,7 +30,7 @@ struct MainView: View {
.environmentObject(tabBarProp)
}

!tabBarProp.hidden ? tabBar : nil
!tabBarProp.hidden ? tabBar.transition(.move(edge: .bottom)) : nil
}

if viewModel.popUpGiveaway {
Expand Down