feat: [FC-0047] Course progress and collapsing sections

Core/Core.xcodeproj/project.pbxproj

@@ -163,7 +163,6 @@
 		BA8FA6702AD59EA300EA029A /* MicrosoftAuthProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA8FA66F2AD59EA300EA029A /* MicrosoftAuthProvider.swift */; };
 		BA981BCE2B8F5C49005707C2 /* Sequence+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA981BCD2B8F5C49005707C2 /* Sequence+Extensions.swift */; };
 		BA981BD02B91ED50005707C2 /* FullScreenProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA981BCF2B91ED50005707C2 /* FullScreenProgressView.swift */; };
-		BAAD62C62AFCF00B000E6103 /* CustomDisclosureGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAAD62C52AFCF00B000E6103 /* CustomDisclosureGroup.swift */; };
 		BAD9CA2F2B289B3500DE790A /* ajaxHandler.js in Resources */ = {isa = PBXBuildFile; fileRef = BAD9CA2E2B289B3500DE790A /* ajaxHandler.js */; };
 		BAD9CA332B28A8F300DE790A /* AjaxProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAD9CA322B28A8F300DE790A /* AjaxProvider.swift */; };
 		BAD9CA422B2B140100DE790A /* AgreementConfigTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAD9CA412B2B140100DE790A /* AgreementConfigTests.swift */; };
@@ -359,7 +358,6 @@
 		BA8FA66F2AD59EA300EA029A /* MicrosoftAuthProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MicrosoftAuthProvider.swift; sourceTree = "<group>"; };
 		BA981BCD2B8F5C49005707C2 /* Sequence+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Sequence+Extensions.swift"; sourceTree = "<group>"; };
 		BA981BCF2B91ED50005707C2 /* FullScreenProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullScreenProgressView.swift; sourceTree = "<group>"; };
-		BAAD62C52AFCF00B000E6103 /* CustomDisclosureGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomDisclosureGroup.swift; sourceTree = "<group>"; };
 		BAD9CA2E2B289B3500DE790A /* ajaxHandler.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = ajaxHandler.js; sourceTree = "<group>"; };
 		BAD9CA322B28A8F300DE790A /* AjaxProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AjaxProvider.swift; sourceTree = "<group>"; };
 		BAD9CA412B2B140100DE790A /* AgreementConfigTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgreementConfigTests.swift; sourceTree = "<group>"; };
@@ -748,7 +746,6 @@
 				023A1137291432FD00D0D354 /* FieldConfiguration.swift */,
 				BA4AFB412B5A7A0900A21367 /* VideoDownloadQualityView.swift */,
 				BA593F1A2AF8E487009ADB51 /* ScrollSlidingTabBar */,
-				BAAD62C52AFCF00B000E6103 /* CustomDisclosureGroup.swift */,
 				BA8FA6672AD59A5700EA029A /* SocialAuthButton.swift */,
 				02E93F862AEBAED4006C4750 /* AppReview */,
 				BA981BCF2B91ED50005707C2 /* FullScreenProgressView.swift */,

Core/Core/Assets.xcassets/DownloadManager/deleteDownloading.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Frame-17.svg",
+      "filename" : "deleteDownloading.svg",
       "idiom" : "universal"
     }
   ],

Core/Core/Assets.xcassets/DownloadManager/startDownloading.imageset/Contents.json

@@ -1,12 +1,25 @@
 {
   "images" : [
     {
-      "filename" : "Frame-16.svg",
+      "filename" : "download_light.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "download_dark.svg",
       "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }

Core/Core/Assets.xcassets/finished_sequence.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "finished_sequence.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Core/Core/Configuration/Config/UIComponentsConfig.swift

@@ -8,16 +8,16 @@
 import Foundation
 
 private enum Keys: String, RawStringExtractable {
-    case courseNestedListEnabled = "COURSE_NESTED_LIST_ENABLED"
+    case courseDropDownNavigationEnabled = "COURSE_DROPDOWN_NAVIGATION_ENABLED"
     case courseUnitProgressEnabled = "COURSE_UNIT_PROGRESS_ENABLED"
 }
 
 public class UIComponentsConfig: NSObject {
-    public var courseNestedListEnabled: Bool
+    public var courseDropDownNavigationEnabled: Bool
     public var courseUnitProgressEnabled: Bool
 
     init(dictionary: [String: Any]) {
-        courseNestedListEnabled = dictionary[Keys.courseNestedListEnabled] as? Bool ?? false
+        courseDropDownNavigationEnabled = dictionary[Keys.courseDropDownNavigationEnabled] as? Bool ?? false
         courseUnitProgressEnabled = dictionary[Keys.courseUnitProgressEnabled] as? Bool ?? false
         super.init()
     }

Core/Core/Data/Model/Data_PrimaryEnrollment.swift

@@ -36,7 +36,7 @@ public extension DataLayer {
         public let certificate: DataLayer.Certificate?
         public let courseModes: [CourseMode]?
         public let courseStatus: CourseStatus?
-        public let progress: CourseProgress?
+        public let progress: DataLayer.CourseProgress?
         public let courseAssignments: CourseAssignments?
 
         enum CodingKeys: String, CodingKey {

Core/Core/Domain/Model/CourseBlockModel.swift

@@ -24,6 +24,7 @@ public struct CourseStructure: Equatable {
     public let certificate: Certificate?
     public let org: String
     public let isSelfPaced: Bool
+    public let courseProgress: CourseProgress?
 
     public init(
         id: String,
@@ -37,7 +38,8 @@ public struct CourseStructure: Equatable {
         media: DataLayer.CourseMedia,
         certificate: Certificate?,
         org: String,
-        isSelfPaced: Bool
+        isSelfPaced: Bool,
+        courseProgress: CourseProgress?
     ) {
         self.id = id
         self.graded = graded
@@ -51,6 +53,7 @@ public struct CourseStructure: Equatable {
         self.certificate = certificate
         self.org = org
         self.isSelfPaced = isSelfPaced
+        self.courseProgress = courseProgress
     }
 
     public func totalVideosSizeInBytes(downloadQuality: DownloadQuality) -> Int {
@@ -78,6 +81,16 @@ public struct CourseStructure: Equatable {
     }
 }
 
+public struct CourseProgress {
+    public let totalAssignmentsCount: Int?
+    public let assignmentsCompleted: Int?
+
+    public init(totalAssignmentsCount: Int, assignmentsCompleted: Int) {
+        self.totalAssignmentsCount = totalAssignmentsCount
+        self.assignmentsCompleted = assignmentsCompleted
+    }
+}
+
 public struct CourseChapter: Identifiable {
 
     public let blockId: String
@@ -109,6 +122,8 @@ public struct CourseSequential: Identifiable {
     public let type: BlockType
     public let completion: Double
     public var childs: [CourseVertical]
+    public let sequentialProgress: SequentialProgress?
+    public let due: Date?
 
     public var isDownloadable: Bool {
         return childs.first(where: { $0.isDownloadable }) != nil
@@ -120,14 +135,18 @@ public struct CourseSequential: Identifiable {
         displayName: String,
         type: BlockType,
         completion: Double,
-        childs: [CourseVertical]
+        childs: [CourseVertical],
+        sequentialProgress: SequentialProgress?,
+        due: Date?
     ) {
         self.blockId = blockId
         self.id = id
         self.displayName = displayName
         self.type = type
         self.completion = completion
         self.childs = childs
+        self.sequentialProgress = sequentialProgress
+        self.due = due
     }
 }
 
@@ -177,6 +196,18 @@ public struct SubtitleUrl: Equatable {
     }
 }
 
+public struct SequentialProgress {
+    public let assignmentType: String?
+    public let numPointsEarned: Int?
+    public let numPointsPossible: Int?
+
+    public init(assignmentType: String?, numPointsEarned: Int?, numPointsPossible: Int?) {
+        self.assignmentType = assignmentType
+        self.numPointsEarned = numPointsEarned
+        self.numPointsPossible = numPointsPossible
+    }
+}
+
 public struct CourseBlock: Hashable, Identifiable {
     public static func == (lhs: CourseBlock, rhs: CourseBlock) -> Bool {
         lhs.id == rhs.id &&
@@ -193,6 +224,7 @@ public struct CourseBlock: Hashable, Identifiable {
     public let courseId: String
     public let topicId: String?
     public let graded: Bool
+    public let due: Date?
     public var completion: Double
     public let type: BlockType
     public let displayName: String
@@ -212,6 +244,7 @@ public struct CourseBlock: Hashable, Identifiable {
         courseId: String,
         topicId: String? = nil,
         graded: Bool,
+        due: Date?,
         completion: Double,
         type: BlockType,
         displayName: String,
@@ -226,6 +259,7 @@ public struct CourseBlock: Hashable, Identifiable {
         self.courseId = courseId
         self.topicId = topicId
         self.graded = graded
+        self.due = due
         self.completion = completion
         self.type = type
         self.displayName = displayName

Core/Core/SwiftGen/Assets.swift

@@ -107,6 +107,7 @@ public enum CoreAssets {
   public static let clearInput = ImageAsset(name: "clearInput")
   public static let edit = ImageAsset(name: "edit")
   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 learnEmpty = ImageAsset(name: "learn_empty")
   public static let airmail = ImageAsset(name: "airmail")

Core/Core/View/Base/DownloadView.swift

@@ -24,7 +24,6 @@ public struct DownloadAvailableView: View {
                 .resizable()
                 .scaledToFit()
                 .frame(width: 24, height: 24)
-                .foregroundColor(Theme.Colors.textPrimary)
         }
         .frame(width: 30, height: 30)
     }
@@ -41,6 +40,7 @@ public struct DownloadProgressView: View {
                 .resizable()
                 .scaledToFit()
                 .frame(width: 20, height: 20)
+                .foregroundStyle(Theme.Colors.snackbarErrorColor)
                 .foregroundColor(Theme.Colors.textPrimary)
         }
     }
@@ -52,11 +52,10 @@ public struct DownloadFinishedView: View {
 
     public var body: some View {
         VStack(spacing: 0) {
-            CoreAssets.deleteDownloading.swiftUIImage.renderingMode(.template)
+            CoreAssets.deleteDownloading.swiftUIImage
                 .resizable()
                 .scaledToFit()
                 .frame(width: 24, height: 24)
-                .foregroundColor(Theme.Colors.textPrimary)
         }
         .frame(width: 30, height: 30)
     }

Core/Core/en.lproj/Localizable.strings

@@ -48,6 +48,7 @@
 "DATE.COURSE_STARTS" = "Course Starts";
 "DATE.COURSE_ENDS" = "Course Ends";
 "DATE.COURSE_ENDED" = "Course Ended";
+
 "DATE.ENDED" = "Ended";
 "DATE.START" = "Start";
 "DATE.STARTED" = "Started";