openedx · shafqat-muneer · Jul 2, 2024 · Jul 5, 2024 · Jul 5, 2024 · Jul 9, 2024
diff --git a/Core/Core/Assets.xcassets/CourseNavigationBar/noVideos.imageset/Contents.json b/Core/Core/Assets.xcassets/CourseNavigationBar/noVideos.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "noVideos.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/Core/Core/Assets.xcassets/CourseNavigationBar/noVideos.imageset/noVideos.svg b/Core/Core/Assets.xcassets/CourseNavigationBar/noVideos.imageset/noVideos.svg
diff --git a/Core/Core/Assets.xcassets/Handouts/noAnnouncements.imageset/Contents.json b/Core/Core/Assets.xcassets/Handouts/noAnnouncements.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "noAnnouncements.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/Core/Core/Assets.xcassets/Handouts/noAnnouncements.imageset/noAnnouncements.svg b/Core/Core/Assets.xcassets/Handouts/noAnnouncements.imageset/noAnnouncements.svg
diff --git a/Core/Core/Assets.xcassets/Handouts/noHandouts.imageset/Contents.json b/Core/Core/Assets.xcassets/Handouts/noHandouts.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "noHandouts.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/Core/Core/Assets.xcassets/Handouts/noHandouts.imageset/noHandouts.svg b/Core/Core/Assets.xcassets/Handouts/noHandouts.imageset/noHandouts.svg
diff --git a/Core/Core/Assets.xcassets/information.imageset/Contents.json b/Core/Core/Assets.xcassets/information.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Vector.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/Core/Core/Assets.xcassets/information.imageset/Vector.svg b/Core/Core/Assets.xcassets/information.imageset/Vector.svg
diff --git a/Core/Core/SwiftGen/Assets.swift b/Core/Core/SwiftGen/Assets.swift
@@ -44,6 +44,7 @@ public enum CoreAssets {
   public static let downloads = ImageAsset(name: "downloads")
   public static let home = ImageAsset(name: "home")
   public static let more = ImageAsset(name: "more")
+  public static let noVideos = ImageAsset(name: "noVideos")
   public static let videos = ImageAsset(name: "videos")
   public static let dashboardEmptyPage = ImageAsset(name: "DashboardEmptyPage")
   public static let addComment = ImageAsset(name: "addComment")
@@ -72,6 +73,8 @@ public enum CoreAssets {
   public static let stopDownloading = ImageAsset(name: "stopDownloading")
   public static let announcements = ImageAsset(name: "announcements")
   public static let handouts = ImageAsset(name: "handouts")
+  public static let noAnnouncements = ImageAsset(name: "noAnnouncements")
+  public static let noHandouts = ImageAsset(name: "noHandouts")
   public static let dashboard = ImageAsset(name: "dashboard")
   public static let discovery = ImageAsset(name: "discovery")
   public static let learn = ImageAsset(name: "learn")
@@ -109,6 +112,7 @@ public enum CoreAssets {
   public static let favorite = ImageAsset(name: "favorite")
   public static let finishedSequence = ImageAsset(name: "finished_sequence")
   public static let goodWork = ImageAsset(name: "goodWork")
+  public static let information = ImageAsset(name: "information")
   public static let learnEmpty = ImageAsset(name: "learn_empty")
   public static let airmail = ImageAsset(name: "airmail")
   public static let defaultMail = ImageAsset(name: "defaultMail")

diff --git a/Core/Core/View/Base/DynamicOffsetView.swift b/Core/Core/View/Base/DynamicOffsetView.swift
@@ -18,16 +18,19 @@ public struct DynamicOffsetView: View {
 
     @Binding private var coordinate: CGFloat
     @Binding private var collapsed: Bool
+    @Binding private var viewHeight: CGFloat
     @State private var collapseHeight: CGFloat = .zero
 
     @Environment(\.isHorizontal) private var isHorizontal
 
     public init(
         coordinate: Binding<CGFloat>,
-        collapsed: Binding<Bool>
+        collapsed: Binding<Bool>,
+        viewHeight: Binding<CGFloat>
     ) {
         self._coordinate = coordinate
         self._collapsed = collapsed
+        self._viewHeight = viewHeight
     }
 
     public var body: some View {
@@ -73,5 +76,6 @@ public struct DynamicOffsetView: View {
             ? (isHorizontal ? collapsedHorizontalHeight : collapsedVerticalHeight)
             : expandedHeight
         )
+        viewHeight = collapseHeight
     }
 }
diff --git a/Core/Core/View/Base/FullScreenErrorView/FullScreenErrorView.swift b/Core/Core/View/Base/FullScreenErrorView/FullScreenErrorView.swift
@@ -10,10 +10,11 @@ import Theme
 
 public struct FullScreenErrorView: View {
 
-    public enum ErrorType {
+    public enum ErrorType: Equatable {
         case noInternet
         case noInternetWithReload
         case generic
+        case noContent(_ message: String, image: SwiftUI.Image)
     }
 
     private let errorType: ErrorType
@@ -34,57 +35,69 @@ public struct FullScreenErrorView: View {
     }
 
     public var body: some View {
-        GeometryReader { proxy in
-            VStack(spacing: 28) {
-                Spacer()
-                switch errorType {
-                case .noInternet, .noInternetWithReload:
-                    CoreAssets.noWifi.swiftUIImage
-                        .renderingMode(.template)
-                        .foregroundStyle(Color.primary)
-                        .scaledToFit()
-
-                    Text(CoreLocalization.Error.Internet.noInternetTitle)
-                        .font(Theme.Fonts.titleLarge)
-                        .foregroundColor(Theme.Colors.textPrimary)
-
-                    Text(CoreLocalization.Error.Internet.noInternetDescription)
-                        .font(Theme.Fonts.bodyLarge)
-                        .foregroundColor(Theme.Colors.textPrimary)
-                        .multilineTextAlignment(.center)
-                        .padding(.horizontal, 50)
-                case .generic:
-                    CoreAssets.notAvaliable.swiftUIImage
-                        .renderingMode(.template)
-                        .foregroundStyle(Color.primary)
-                        .scaledToFit()
-
-                    Text(CoreLocalization.View.Snackbar.tryAgainBtn)
-                        .font(Theme.Fonts.titleLarge)
-                        .foregroundColor(Theme.Colors.textPrimary)
-
-                    Text(CoreLocalization.Error.unknownError)
-                        .font(Theme.Fonts.bodyLarge)
-                        .foregroundColor(Theme.Colors.textPrimary)
-                        .multilineTextAlignment(.center)
-                        .padding(.horizontal, 50)
-                }
+        VStack(spacing: 20) {
+            Spacer()
+            switch errorType {
+            case .noContent(let message, image: let image):
+                image
+                    .resizable()
+                    .renderingMode(.template)
+                    .foregroundStyle(Theme.Colors.textSecondary)
+                    .aspectRatio(contentMode: .fit)
+                    .frame(maxWidth: 72, maxHeight: 80)
 
-                if errorType != .noInternet {
-                    UnitButtonView(
-                        type: .reload,
-                        action: {
-                            self.action()
-                        }
-                    )
-                }
-                Spacer()
+                Text(message)
+                    .font(Theme.Fonts.labelLarge)
+                    .foregroundColor(Theme.Colors.textPrimary)
+                    .multilineTextAlignment(.center)
+                    .padding(.horizontal, 50)
+            case .noInternet,
+                    .noInternetWithReload:
+                CoreAssets.noWifi.swiftUIImage
+                    .renderingMode(.template)
+                    .foregroundStyle(Theme.Colors.textSecondary)
+                    .scaledToFit()
+
+                Text(CoreLocalization.Error.Internet.noInternetTitle)
+                    .font(Theme.Fonts.labelLarge)
+                    .foregroundColor(Theme.Colors.textPrimary)
+
+                Text(CoreLocalization.Error.Internet.noInternetDescription)
+                    .font(Theme.Fonts.labelLarge)
+                    .foregroundColor(Theme.Colors.textPrimary)
+                    .multilineTextAlignment(.center)
+                    .padding(.horizontal, 50)
+            case .generic:
+                CoreAssets.notAvaliable.swiftUIImage
+                    .renderingMode(.template)
+                    .foregroundStyle(Theme.Colors.textSecondary)
+                    .scaledToFit()
+
+                Text(CoreLocalization.View.Snackbar.tryAgainBtn)
+                    .font(Theme.Fonts.labelLarge)
+                    .foregroundColor(Theme.Colors.textPrimary)
+
+                Text(CoreLocalization.Error.unknownError)
+                    .font(Theme.Fonts.labelLarge)
+                    .foregroundColor(Theme.Colors.textPrimary)
+                    .multilineTextAlignment(.center)
+                    .padding(.horizontal, 50)
+
+            }
+            if errorType == .noInternetWithReload || errorType == .generic {
+                UnitButtonView(
+                    type: .reload,
+                    action: {
+                        self.action()
+                    }
+                )
             }
-            .frame(maxWidth: .infinity, maxHeight: proxy.size.height)
-            .background(
-                Theme.Colors.background
-            )
+            Spacer()
         }
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .background(
+            Theme.Colors.background
+        )
     }
 }
 

diff --git a/Course/Course/Presentation/Container/CourseContainerView.swift b/Course/Course/Presentation/Container/CourseContainerView.swift
@@ -24,6 +24,7 @@ public struct CourseContainerView: View {
     @State private var coordinate: CGFloat = .zero
     @State private var lastCoordinate: CGFloat = .zero
     @State private var collapsed: Bool = false
+    @State private var viewHeight: CGFloat = .zero
     @Environment(\.isHorizontal) private var isHorizontal
     @Namespace private var animationNamespace
     private var idiom: UIUserInterfaceIdiom { UIDevice.current.userInterfaceIdiom }
@@ -85,6 +86,7 @@ public struct CourseContainerView: View {
                     selection: $viewModel.selection,
                     coordinate: $coordinate,
                     collapsed: $collapsed,
+                    viewHeight: $viewHeight,
                     dateTabIndex: CourseTab.dates.rawValue
                 )
             } else {
@@ -182,6 +184,7 @@ public struct CourseContainerView: View {
                         selection: $viewModel.selection,
                         coordinate: $coordinate,
                         collapsed: $collapsed,
+                        viewHeight: $viewHeight,
                         dateTabIndex: CourseTab.dates.rawValue
                     )
                     .tabItem {
@@ -199,6 +202,7 @@ public struct CourseContainerView: View {
                         selection: $viewModel.selection,
                         coordinate: $coordinate,
                         collapsed: $collapsed,
+                        viewHeight: $viewHeight,
                         dateTabIndex: CourseTab.dates.rawValue
                     )
                     .tabItem {
@@ -212,6 +216,7 @@ public struct CourseContainerView: View {
                         courseID: courseID,
                         coordinate: $coordinate,
                         collapsed: $collapsed,
+                        viewHeight: $viewHeight,
                         viewModel: courseDatesViewModel
                     )
                     .tabItem {
@@ -225,6 +230,7 @@ public struct CourseContainerView: View {
                         courseID: courseID,
                         coordinate: $coordinate,
                         collapsed: $collapsed,
+                        viewHeight: $viewHeight,
                         viewModel: Container.shared.resolve(DiscussionTopicsViewModel.self,
                                                             argument: title)!,
                         router: Container.shared.resolve(DiscussionRouter.self)!
@@ -240,6 +246,7 @@ public struct CourseContainerView: View {
                         courseID: courseID,
                         coordinate: $coordinate,
                         collapsed: $collapsed,
+                        viewHeight: $viewHeight,
                         viewModel: Container.shared.resolve(HandoutsViewModel.self, argument: courseID)!
                     )
                     .tabItem {

diff --git a/Course/Course/Presentation/Container/CourseContainerViewModel.swift b/Course/Course/Presentation/Container/CourseContainerViewModel.swift
@@ -186,8 +186,6 @@ public class CourseContainerViewModel: BaseCourseViewModel {
             if isInternetAvaliable {
                 courseStructure = try await interactor.getCourseBlocks(courseID: courseID)
                 NotificationCenter.default.post(name: .getCourseDates, object: courseID)
-                isShowProgress = false
-                isShowRefresh = false
                 if let courseStructure {
                     try await getResumeBlock(
                         courseID: courseID,

diff --git a/Course/Course/Presentation/CourseRouter.swift b/Course/Course/Presentation/CourseRouter.swift
@@ -46,7 +46,8 @@ public protocol CourseRouter: BaseRouter {
         handouts: String?,
         announcements: [CourseUpdate]?,
         router: Course.CourseRouter,
-        cssInjector: CSSInjector
+        cssInjector: CSSInjector,
+        type: HandoutsItemType
     )
 
     func showCourseComponent(
@@ -103,7 +104,8 @@ public class CourseRouterMock: BaseRouterMock, CourseRouter {
         handouts: String?,
         announcements: [CourseUpdate]?,
         router: Course.CourseRouter,
-        cssInjector: CSSInjector
+        cssInjector: CSSInjector,
+        type: HandoutsItemType
     ) {}
 
     public func showCourseComponent(