Release 3.0.0 Build 33 (#71)

* Addressed Matt's comments

- Removed TabView and used environment object to allow tab bar to be hidden when necessary
- Allowed rescaling of font size for class title
- Added instructor label

* Merge Release to Main (#69)

* Add support for custom GraphQL errors

* Remove codegen build phase

* Implemented classes page

- Performed soft reset and squashing the previous commits
- Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel
- Created FitnessClass and FitnessClassInstance models
- Other modifications to create the classes screens

* Comment out giveaway modal on home

* Update Package.resolved

* Updated build number

* Release 2.5.8 Build 29 (#68)

* Add support for custom GraphQL errors

* Update queries

* Remove codegen build phase

* Implemented classes page

- Performed soft reset and squashing the previous commits
- Implemented ClassesView, ClassCell, ClassDetailView, NextSessionCell, and ClassesViewModel
- Created FitnessClass and FitnessClassInstance models
- Other modifications to create the classes screens

* Comment out giveaway modal on home

* Optimized filtered classes

* Optimized next sessions

* Cleaned up code

* Update fragments and mutations

* Fixed error due to updated mutation

* Update project.pbxproj

* Create Package.resolved

---------

Co-authored-by: Vin Bui <[email protected]>
Co-authored-by: Vin Bui <[email protected]>

---------

Co-authored-by: Vin Bui <[email protected]>
Co-authored-by: Caitlyn Jin <[email protected]>
Co-authored-by: Caitlyn Jin <[email protected]>
Co-authored-by: Vin Bui <[email protected]>

* Update build and version number

---------

Co-authored-by: Richie Sun <[email protected]>
Co-authored-by: Vin Bui <[email protected]>
Co-authored-by: Vin Bui <[email protected]>

Author: 3 people

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 = 28;
+				CURRENT_PROJECT_VERSION = 33;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = ZGMCXU7X3U;
 				ENABLE_PREVIEWS = YES;
@@ -923,7 +923,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5.7;
+				MARKETING_VERSION = 3.0.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.cornellappdev.uplift.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -946,7 +946,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 28;
+				CURRENT_PROJECT_VERSION = 33;
 				DEVELOPMENT_TEAM = ZGMCXU7X3U;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -966,7 +966,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.5.7;
+				MARKETING_VERSION = 3.0.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.cornellappdev.uplift.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";

Uplift/Views/Classes/ClassDetailView.swift

@@ -99,13 +99,15 @@ struct ClassDetailView: View {
                         .font(Constants.Fonts.s1)
                         .foregroundStyle(Constants.Colors.white)
                         .multilineTextAlignment(.center)
+                        .minimumScaleFactor(0.01)
+                        .lineLimit(2)
 
                     Text(classInstance.location)
                         .font(Constants.Fonts.bodyNormal)
                         .foregroundStyle(Constants.Colors.white)
                         .multilineTextAlignment(.center)
 
-                    Text(classInstance.instructor.uppercased())
+                    Text("INSTRUCTOR: \(classInstance.instructor.uppercased())")
                         .font(Constants.Fonts.h2)
                         .foregroundStyle(Constants.Colors.white)
                         .multilineTextAlignment(.center)

Uplift/Views/ClassesView.swift

@@ -13,6 +13,7 @@ struct ClassesView: View {
 
     // MARK: - Properties
 
+    @EnvironmentObject var tabBarProp: TabBarProperty
     @StateObject private var viewModel = ViewModel()
     @State private var weeks: [Int] = [0, 1, 2]     // Integers represent the number of weeks from the current week
 
@@ -184,6 +185,8 @@ struct ClassesView: View {
                         ForEach(viewModel.filteredClasses, id: \.self) { classInstance in
                             NavigationLink {
                                 ClassDetailView(classInstance: classInstance, viewModel: viewModel)
+                                    .onAppear { tabBarProp.hidden = true }
+                                    .onDisappear { tabBarProp.hidden = false }
                             } label: {
                                 ClassCell(classInstance: classInstance, viewModel: viewModel)
                             }

Uplift/Views/MainView.swift

@@ -14,6 +14,7 @@ struct MainView: View {
     // MARK: - Properties
 
     @State private var selectedTab: Screen = .home
+    @StateObject var tabBarProp = TabBarProperty()
     @StateObject private var viewModel = ViewModel()
 
     // MARK: - UI
@@ -23,15 +24,15 @@ struct MainView: View {
             HomeView(popUpGiveaway: $viewModel.popUpGiveaway)
 
             ZStack(alignment: .bottom) {
-                TabView(selection: $selectedTab) {
+                switch selectedTab {
+                case .home:
                     HomeView(popUpGiveaway: $viewModel.popUpGiveaway)
-                        .tag(Screen.home)
-
+                case .classes:
                     ClassesView()
-                        .tag(Screen.classes)
+                        .environmentObject(tabBarProp)
                 }
 
-                tabBar
+                !tabBarProp.hidden ? tabBar : nil
             }
 
             if viewModel.popUpGiveaway {
@@ -131,6 +132,10 @@ extension MainView {
 
 }
 
+final class TabBarProperty: ObservableObject {
+    @Published var hidden: Bool = false
+}
+
 #Preview {
     MainView()
 }