fix: two TabBars in course dashboard screen for iOS 15 (#59)

edx · Jul 31, 2024 · 6f9ab22 · 6f9ab22
1 parent 5f92db6
commit 6f9ab22
Show file tree

Hide file tree

Showing 36 changed files with 57 additions and 55 deletions.
diff --git a/Core/Core/Data/Model/Data_UserProfile.swift b/Core/Core/Data/Model/Data_UserProfile.swift
@@ -69,12 +69,13 @@ public extension DataLayer {
 // MARK: - AccountPrivacy
 public enum AccountPrivacy: String, Codable {
     case privateAccess = "private"
+    case privateAccessBig = "PRIVATE"
     case allUsers = "all_users"
     case allUsersBig = "ALL_USERS"
 
     public var boolValue: Bool {
         switch self {
-        case .privateAccess:
+        case .privateAccess, .privateAccessBig:
             return false
         case .allUsers, .allUsersBig:
             return true

diff --git a/Core/Core/Extensions/ViewExtension.swift b/Core/Core/Extensions/ViewExtension.swift
@@ -179,16 +179,18 @@ public extension View {
         }
     }
 
-    func hideNavigationBar() -> some View {
+    func hideNavigationBar(_ isHidden: Bool = true) -> some View {
         if #available(iOS 16.0, *) {
-            return self.navigationBarHidden(true)
+            return self.navigationBarHidden(isHidden)
         } else {
-            return self.introspect(
-                .navigationView(style: .stack),
-                on: .iOS(.v15...),
-                scope: .ancestor) {
-                    $0.isNavigationBarHidden = true
-                }
+            return self
+                .navigationBarHidden(isHidden)
+                .introspect(
+                    .navigationView(style: .stack),
+                    on: .iOS(.v15...),
+                    scope: .ancestor) {
+                        $0.isNavigationBarHidden = isHidden
+                    }
         }
     }
 

diff --git a/Core/Core/View/Base/VideoDownloadQualityView.swift b/Core/Core/View/Base/VideoDownloadQualityView.swift
@@ -136,7 +136,7 @@ public struct VideoDownloadQualityView: View {
                 }
             }
         }
-        .navigationBarHidden(!isModal)
+        .hideNavigationBar(!isModal)
         .navigationBarBackButtonHidden(!isModal)
         .navigationTitle(CoreLocalization.Settings.videoDownloadQualityTitle)
         .ignoresSafeArea(.all, edges: .horizontal)

diff --git a/Core/Core/View/Base/WebBrowser.swift b/Core/Core/View/Base/WebBrowser.swift
@@ -42,7 +42,7 @@ public struct WebBrowser: View {
                 }
             }
             .navigationBarTitle(Text(""))
-            .navigationBarHidden(true)
+            .hideNavigationBar(true)
             .ignoresSafeArea()
         }
     }

diff --git a/Course/Course/Presentation/Container/CourseContainerView.swift b/Course/Course/Presentation/Container/CourseContainerView.swift
@@ -78,7 +78,7 @@ public struct CourseContainerView: View {
         ZStack(alignment: .top) {
             content
         }
-        .navigationBarHidden(true)
+        .hideNavigationBar(true)
         .navigationBarBackButtonHidden(true)
         .navigationTitle(title)
         .onChange(of: viewModel.selection, perform: didSelect)
@@ -237,6 +237,7 @@ public struct CourseContainerView: View {
                                 viewHeight: $viewHeight,
                                 dateTabIndex: CourseTab.dates.rawValue
                             )
+                            .padding(.bottom, 1)
                             .tabItem {
                                 tab.image
                                 Text(tab.title)
@@ -255,6 +256,7 @@ public struct CourseContainerView: View {
                                 viewHeight: $viewHeight,
                                 dateTabIndex: CourseTab.dates.rawValue
                             )
+                            .padding(.bottom, 1)
                             .tabItem {
                                 tab.image
                                 Text(tab.title)
@@ -271,6 +273,7 @@ public struct CourseContainerView: View {
                                 shouldShowUpgradeButton: $viewModel.shouldShowUpgradeButton,
                                 shouldHideMenuBar: $viewModel.shouldHideMenuBar
                             )
+                            .padding(.bottom, 1)
                             .tabItem {
                                 tab.image
                                 Text(tab.title)
@@ -289,6 +292,7 @@ public struct CourseContainerView: View {
                                 shouldShowUpgradeButton: $viewModel.shouldShowUpgradeButton,
                                 shouldHideMenuBar: $viewModel.shouldHideMenuBar
                             )
+                            .padding(.bottom, 1)
                             .tabItem {
                                 tab.image
                                 Text(tab.title)
@@ -305,6 +309,7 @@ public struct CourseContainerView: View {
                                 shouldShowUpgradeButton: $viewModel.shouldShowUpgradeButton,
                                 shouldHideMenuBar: $viewModel.shouldHideMenuBar
                             )
+                            .padding(.bottom, 1)
                             .tabItem {
                                 tab.image
                                 Text(tab.title)
@@ -320,9 +325,7 @@ public struct CourseContainerView: View {
         .introspect(.scrollView, on: .iOS(.v16...), customize: { tabView in
             tabView.isScrollEnabled = false
         })
-        .introspect(.viewController, on: .iOS(.v15), customize: { controller in
-            controller.navigationController?.setNavigationBarHidden(true, animated: false)
-        })
+        .accentColor(Theme.Colors.accentXColor)
         .onFirstAppear {
             Task {
                 await viewModel.tryToRefreshCookies()

diff --git a/Course/Course/Presentation/Container/CourseContainerViewModel.swift b/Course/Course/Presentation/Container/CourseContainerViewModel.swift
@@ -218,9 +218,13 @@ public class CourseContainerViewModel: BaseCourseViewModel {
 
     @MainActor
     func updateMenuBarVisibility() {
-        shouldHideMenuBar =
-            courseStructure == nil ||
-            courseStructure?.coursewareAccessDetails?.coursewareAccess?.hasAccess == false
+        if #available(iOS 16.0, *) {
+            shouldHideMenuBar =
+                courseStructure == nil ||
+                courseStructure?.coursewareAccessDetails?.coursewareAccess?.hasAccess == false
+        } else {
+            shouldHideMenuBar = true
+        }
     }
 
     @MainActor

diff --git a/Course/Course/Presentation/Dates/CourseDatesView.swift b/Course/Course/Presentation/Dates/CourseDatesView.swift
@@ -50,6 +50,7 @@ public struct CourseDatesView: View {
                             .padding(.top, 200)
                             .padding(.horizontal)
                     }
+                    .frame(maxWidth: .infinity, maxHeight: .infinity)
                 } else if let courseDates = viewModel.courseDates, !courseDates.courseDateBlocks.isEmpty {
                     CourseDateListView(
                         viewModel: viewModel,

diff --git a/Course/Course/Presentation/Handouts/HandoutsUpdatesDetailView.swift b/Course/Course/Presentation/Handouts/HandoutsUpdatesDetailView.swift
@@ -105,7 +105,7 @@ public struct HandoutsUpdatesDetailView: View {
                 }
             }
         }
-        .navigationBarHidden(false)
+        .hideNavigationBar(false)
         .navigationBarBackButtonHidden(false)
         .navigationTitle(title)
         .onChange(of: colorSchemeNative) { _ in

diff --git a/Course/Course/Presentation/Outline/CourseVertical/CourseVerticalView.swift b/Course/Course/Presentation/Outline/CourseVertical/CourseVerticalView.swift
@@ -168,7 +168,7 @@ public struct CourseVerticalView: View {
                 }
             }
         }
-        .navigationBarHidden(false)
+        .hideNavigationBar(false)
         .navigationBarBackButtonHidden(false)
         .navigationTitle(title)
         .background(

diff --git a/Course/Course/Presentation/Unit/CourseUnitView.swift b/Course/Course/Presentation/Unit/CourseUnitView.swift
@@ -135,7 +135,7 @@ public struct CourseUnitView: View {
                 showDiscussion = viewModel.selectedLesson().type == .discussion
             }
         }
-        .navigationBarHidden(true)
+        .hideNavigationBar(true)
         .navigationBarBackButtonHidden(true)
         .navigationTitle("")
         .background(

diff --git a/Course/Course/Presentation/Unit/Subviews/NotAvailableOnMobileView.swift b/Course/Course/Presentation/Unit/Subviews/NotAvailableOnMobileView.swift
@@ -40,6 +40,6 @@ public struct NotAvailableOnMobileView: View {
             }
             .padding(24)
         }
-        .navigationBarHidden(false)
+        .hideNavigationBar(false)
     }
 }
diff --git a/Dashboard/Dashboard/Presentation/AllCoursesView.swift b/Dashboard/Dashboard/Presentation/AllCoursesView.swift
@@ -164,7 +164,7 @@ public struct AllCoursesView: View {
                     .ignoresSafeArea()
             )
             .navigationBarBackButtonHidden(true)
-            .navigationBarHidden(true)
+            .hideNavigationBar(true)
             .navigationTitle(DashboardLocalization.Learn.allCourses)
         }
     }

diff --git a/Dashboard/Dashboard/Presentation/PrimaryCourseDashboardView.swift b/Dashboard/Dashboard/Presentation/PrimaryCourseDashboardView.swift
@@ -223,7 +223,7 @@ public struct PrimaryCourseDashboardView<ProgramView: View>: View {
                     .ignoresSafeArea()
             )
             .navigationBarBackButtonHidden(true)
-            .navigationBarHidden(true)
+            .hideNavigationBar(true)
             .navigationTitle(DashboardLocalization.title)
         }
     }

diff --git a/Discovery/Discovery/Presentation/NativeDiscovery/CourseDetailsView.swift b/Discovery/Discovery/Presentation/NativeDiscovery/CourseDetailsView.swift
@@ -166,7 +166,7 @@ public struct CourseDetailsView: View {
                     }
                 }
             }.padding(.top, 8)
-            .navigationBarHidden(false)
+            .hideNavigationBar(false)
             .navigationBarBackButtonHidden(false)
             .navigationTitle(DiscoveryLocalization.Details.title)
 

diff --git a/Discovery/Discovery/Presentation/NativeDiscovery/DiscoveryView.swift b/Discovery/Discovery/Presentation/NativeDiscovery/DiscoveryView.swift
@@ -179,7 +179,7 @@ public struct DiscoveryView: View {
                     }
                 }
             }
-            .navigationBarHidden(sourceScreen != .startup)
+            .hideNavigationBar(sourceScreen != .startup)
             .onFirstAppear {
                 if !(searchQuery.isEmpty) {
                     router.showDiscoverySearch(searchQuery: searchQuery)

diff --git a/Discovery/Discovery/Presentation/NativeDiscovery/SearchView.swift b/Discovery/Discovery/Presentation/NativeDiscovery/SearchView.swift
@@ -161,7 +161,7 @@ public struct SearchView: View {
                 }
             }
             .navigationBarBackButtonHidden(true)
-            .navigationBarHidden(true)
+            .hideNavigationBar(true)
             .onAppear {
                 DispatchQueue.main.asyncAfter(deadline: .now()) {
                     withAnimation(.easeIn(duration: 0.3)) {

diff --git a/Discovery/Discovery/Presentation/WebDiscovery/DiscoveryWebview.swift b/Discovery/Discovery/Presentation/WebDiscovery/DiscoveryWebview.swift
@@ -162,7 +162,7 @@ public struct DiscoveryWebview: View {
                 }
             }
         }
-        .navigationBarHidden(viewModel.sourceScreen == .default && discoveryType == .discovery)
+        .hideNavigationBar(viewModel.sourceScreen == .default && discoveryType == .discovery)
         .navigationTitle(CoreLocalization.Mainscreen.discovery)
         .background(Theme.Colors.background.ignoresSafeArea())
         .onFirstAppear {

diff --git a/Discovery/Discovery/Presentation/WebPrograms/ProgramWebviewView.swift b/Discovery/Discovery/Presentation/WebPrograms/ProgramWebviewView.swift
@@ -121,7 +121,7 @@ public struct ProgramWebviewView: View {
                 }
             }
         }
-        .navigationBarHidden(viewType == .program)
+        .hideNavigationBar(viewType == .program)
         .navigationTitle(CoreLocalization.Mainscreen.programs)
         .background(Theme.Colors.background.ignoresSafeArea())
         .animation(.default, value: viewModel.showError)

diff --git a/Discussion/Discussion/Presentation/Comments/Responses/ResponsesView.swift b/Discussion/Discussion/Presentation/Comments/Responses/ResponsesView.swift
@@ -208,7 +208,7 @@ public struct ResponsesView: View {
                 }
             }
             .ignoresSafeArea(.all, edges: .horizontal)
-            .navigationBarHidden(false)
+            .hideNavigationBar(false)
             .navigationBarBackButtonHidden(true)
             .navigationTitle(title)
             .toolbar {

diff --git a/Discussion/Discussion/Presentation/Comments/Thread/ThreadView.swift b/Discussion/Discussion/Presentation/Comments/Thread/ThreadView.swift
@@ -225,7 +225,7 @@ public struct ThreadView: View {
                 }
             }
             .ignoresSafeArea(.all, edges: .horizontal)
-            .navigationBarHidden(false)
+            .hideNavigationBar(false)
             .navigationBarBackButtonHidden(true)
             .navigationTitle(title)
             .toolbar {

diff --git a/Discussion/Discussion/Presentation/CreateNewThread/CreateNewThreadView.swift b/Discussion/Discussion/Presentation/CreateNewThread/CreateNewThreadView.swift
@@ -190,7 +190,7 @@ public struct CreateNewThreadView: View {
                     }
                 }.padding(.top, 8)
             }
-            .navigationBarHidden(false)
+            .hideNavigationBar(false)
             .navigationBarBackButtonHidden(false)
             .navigationTitle(DiscussionLocalization.CreateThread.newPost)
             .background(

diff --git a/Discussion/Discussion/Presentation/DiscussionTopics/DiscussionSearchTopicsView.swift b/Discussion/Discussion/Presentation/DiscussionTopics/DiscussionSearchTopicsView.swift
@@ -149,7 +149,7 @@ public struct DiscussionSearchTopicsView: View {
             .background(Theme.Colors.background.ignoresSafeArea())
             .avoidKeyboard(dismissKeyboardByTap: true)
             .navigationBarBackButtonHidden(true)
-            .navigationBarHidden(true)
+            .hideNavigationBar(true)
             .navigationTitle(DiscussionLocalization.search)
             .onAppear {
                 DispatchQueue.main.asyncAfter(deadline: .now()) {
@@ -158,9 +158,6 @@ public struct DiscussionSearchTopicsView: View {
                     }
                 }
             }
-            .introspect(.viewController, on: .iOS(.v15)) { controller in
-                controller.navigationController?.setNavigationBarHidden(true, animated: false)
-            }
         }
     }
 

diff --git a/Discussion/Discussion/Presentation/DiscussionTopics/DiscussionTopicsView.swift b/Discussion/Discussion/Presentation/DiscussionTopics/DiscussionTopicsView.swift
@@ -205,7 +205,6 @@ public struct DiscussionTopicsView: View {
                     await viewModel.getTopics(courseID: courseID)
                 }
             }
-            .navigationBarHidden(false)
             .navigationBarBackButtonHidden(false)
             .navigationTitle(viewModel.title)
             .background(

diff --git a/Discussion/Discussion/Presentation/Posts/PostsView.swift b/Discussion/Discussion/Presentation/Posts/PostsView.swift
@@ -236,7 +236,7 @@ public struct PostsView: View {
                     )
                 }
             }
-            .navigationBarHidden(!showTopMenu)
+            .hideNavigationBar(!showTopMenu)
             .navigationBarBackButtonHidden(!showTopMenu)
             .navigationTitle(title)
             .background(

diff --git a/OpenEdX/View/MainScreenView.swift b/OpenEdX/View/MainScreenView.swift
@@ -144,7 +144,7 @@ struct MainScreenView: View {
             .tag(MainTab.profile)
             .accessibilityIdentifier("profile_tabitem")
         }
-        .navigationBarHidden(viewModel.selection == .dashboard)
+        .hideNavigationBar(viewModel.selection == .dashboard)
         .navigationBarBackButtonHidden(viewModel.selection == .dashboard)
         .navigationTitle(titleBar())
         .toolbar {
@@ -194,11 +194,6 @@ struct MainScreenView: View {
             }
         }
         .accentColor(Theme.Colors.accentXColor)
-        .introspect(.viewController, on: .iOS(.v15)) { controller in
-            if viewModel.selection != .profile {
-                controller.navigationController?.setNavigationBarHidden(true, animated: false)
-            }
-        }
     }
 
     @ViewBuilder

diff --git a/Profile/Profile/Presentation/DatesAndCalendar/CoursesToSyncView.swift b/Profile/Profile/Presentation/DatesAndCalendar/CoursesToSyncView.swift
@@ -71,7 +71,7 @@ public struct CoursesToSyncView: View {
                     .roundedBackground(Theme.Colors.background)
                     .ignoresSafeArea(.all, edges: .bottom)
                 }
-                .navigationBarHidden(true)
+                .hideNavigationBar(true)
                 .navigationBarBackButtonHidden(true)
 
                 if viewModel.showError {

diff --git a/Profile/Profile/Presentation/DatesAndCalendar/DatesAndCalendarView.swift b/Profile/Profile/Presentation/DatesAndCalendar/DatesAndCalendarView.swift
@@ -52,7 +52,7 @@ public struct DatesAndCalendarView: View {
                     .roundedBackground(Theme.Colors.background)
                     .ignoresSafeArea(.all, edges: .bottom)
                 }
-                .navigationBarHidden(true)
+                .hideNavigationBar(true)
                 .navigationBarBackButtonHidden(true)
 
                 // Error Alert if needed

diff --git a/Profile/Profile/Presentation/DatesAndCalendar/SyncCalendarOptionsView.swift b/Profile/Profile/Presentation/DatesAndCalendar/SyncCalendarOptionsView.swift
@@ -103,7 +103,7 @@ public struct SyncCalendarOptionsView: View {
                     .roundedBackground(Theme.Colors.background)
                     .ignoresSafeArea(.all, edges: .bottom)
                 }
-                .navigationBarHidden(true)
+                .hideNavigationBar(true)
                 .navigationBarBackButtonHidden(true)
 
                 // Error Alert if needed

diff --git a/Profile/Profile/Presentation/DeleteAccount/DeleteAccountView.swift b/Profile/Profile/Presentation/DeleteAccount/DeleteAccountView.swift
@@ -142,7 +142,7 @@ public struct DeleteAccountView: View {
                        maxHeight: .infinity,
                        alignment: .top)
                 .padding(.top, 8)
-                .navigationBarHidden(false)
+                .hideNavigationBar(false)
                 .navigationBarBackButtonHidden(true)
                 .navigationTitle(ProfileLocalization.DeleteAccount.title)
                 .toolbar {

diff --git a/Profile/Profile/Presentation/EditProfile/EditProfileView.swift b/Profile/Profile/Presentation/EditProfile/EditProfileView.swift
@@ -235,7 +235,7 @@ public struct EditProfileView: View {
                         .accessibilityIdentifier("progress_bar")
                 }
             }
-            .navigationBarHidden(false)
+            .hideNavigationBar(false)
             .navigationBarBackButtonHidden(true)
             .navigationTitle(ProfileLocalization.editProfile)
             .toolbar {

diff --git a/Profile/Profile/Presentation/Profile/ProfileView.swift b/Profile/Profile/Presentation/Profile/ProfileView.swift
@@ -33,7 +33,7 @@ public struct ProfileView: View {
                 )
                 .accessibilityAction {}
                 .padding(.top, 8)
-                .navigationBarHidden(false)
+                .hideNavigationBar(false)
                 .navigationBarBackButtonHidden(false)
                 .navigationTitle(ProfileLocalization.title)
 

diff --git a/Profile/Profile/Presentation/Profile/UserProfile/UserProfileView.swift b/Profile/Profile/Presentation/Profile/UserProfile/UserProfileView.swift
@@ -85,7 +85,7 @@ public struct UserProfileView: View {
                     .frameLimit(width: proxy.size.width)
                 }
                 .padding(.top, 8)
-                .navigationBarHidden(false)
+                .hideNavigationBar(false)
                 .navigationBarBackButtonHidden(false)
 
                 // MARK: - Error Alert

diff --git a/Profile/Profile/Presentation/Settings/ManageAccountView.swift b/Profile/Profile/Presentation/Settings/ManageAccountView.swift
@@ -79,7 +79,7 @@ public struct ManageAccountView: View {
                     .padding(.horizontal, isHorizontal ? 24 : 0)
                     .roundedBackground(Theme.Colors.background)
                 }
-                .navigationBarHidden(true)
+                .hideNavigationBar(true)
                 .navigationBarBackButtonHidden(true)
                 .navigationTitle(ProfileLocalization.manageAccount)