New profile block created courses

Stepic/Legacy/Analytics/Events/AmplitudeAnalyticsEvents.swift

@@ -477,6 +477,7 @@ extension AnalyticsEvent {
         case story(id: Int)
         case deepLink(url: String)
         case notification
+        case profile(id: Int)
         case unknown
 
         var name: String {
@@ -499,6 +500,8 @@ extension AnalyticsEvent {
                 return "deeplink"
             case .notification:
                 return "notification"
+            case .profile:
+                return "profile"
             case .unknown:
                 return "unknown"
             }
@@ -512,6 +515,8 @@ extension AnalyticsEvent {
                 return ["query": query]
             case .collection(let id):
                 return ["collection": id]
+            case .profile(let id):
+                return ["profile": id]
             case .query(let courseListType):
                 var params: [String: Any] = [
                     "type": courseListType.analyticName

Stepic/Legacy/Model/Entities/User/User+CoreDataProperties.swift

@@ -29,6 +29,7 @@ extension User {
     @NSManaged var managedReputation: NSNumber?
     @NSManaged var managedReputationRank: NSNumber?
     @NSManaged var managedJoinDate: Date?
+    @NSManaged var managedCreatedCoursesArray: NSObject?
     @NSManaged var managedCreatedCoursesCount: NSNumber?
     @NSManaged var managedSolvedStepsCount: NSNumber?
     @NSManaged var managedCreatedLessonsCount: NSNumber?
@@ -207,6 +208,15 @@ extension User {
         }
     }
 
+    var createdCoursesArray: [Course.IdType] {
+        get {
+            (self.managedCreatedCoursesArray as? [Int]) ?? []
+        }
+        set {
+            self.managedCreatedCoursesArray = newValue as NSObject?
+        }
+    }
+
     var createdCoursesCount: Int {
         get {
             self.managedCreatedCoursesCount?.intValue ?? 0

Stepic/Legacy/Model/Model.xcdatamodeld/.xccurrentversion

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Model_new_profile_certificates_v55.xcdatamodel</string>
+	<string>Model_new_profile_created_courses_v56.xcdatamodel</string>
 </dict>
 </plist>

Stepic/Legacy/Model/Network/Endpoints/CoursesAPI.swift

@@ -45,6 +45,7 @@ final class CoursesAPI: APIEndpoint {
 
     func retrieve(
         tag: Int? = nil,
+        teacher: Int? = nil,
         featured: Bool? = nil,
         enrolled: Bool? = nil,
         excludeEnded: Bool? = nil,
@@ -93,6 +94,10 @@ final class CoursesAPI: APIEndpoint {
             params["tag"] = tag
         }
 
+        if let teacher = teacher {
+            params["teacher"] = teacher
+        }
+
         params["page"] = page
 
         return self.retrieve.requestWithFetching(
@@ -134,7 +139,8 @@ final class CoursesAPI: APIEndpoint {
     }
 
     enum Order: String {
-        case activityDescending = "-activity"
+        case activityDesc = "-activity"
+        case popularityDesc = "-popularity"
     }
 }
 

Stepic/Sources/Modules/CourseList/Provider/CourseListNetworkService.swift

@@ -90,7 +90,7 @@ final class PopularCourseListNetworkService: BaseCourseListNetworkService, Cours
         Promise { seal in
             self.coursesAPI.retrieve(
                 isCataloged: true,
-                order: .activityDescending,
+                order: .activityDesc,
                 language: self.type.language.popularCoursesParameter,
                 page: page
             ).done { result in
@@ -114,7 +114,7 @@ final class TagCourseListNetworkService: BaseCourseListNetworkService, CourseLis
         Promise { seal in
             self.coursesAPI.retrieve(
                 tag: self.type.id,
-                order: .activityDescending,
+                order: .activityDesc,
                 language: self.type.language.languageString,
                 page: page
             ).done { result in
@@ -183,3 +183,26 @@ final class SearchResultCourseListNetworkService: BaseCourseListNetworkService,
         }
     }
 }
+
+final class TeacherCourseListNetworkService: BaseCourseListNetworkService, CourseListNetworkServiceProtocol {
+    let type: TeacherCourseListType
+
+    init(type: TeacherCourseListType, coursesAPI: CoursesAPI) {
+        self.type = type
+        super.init(coursesAPI: coursesAPI)
+    }
+
+    func fetch(page: Int) -> Promise<([Course], Meta)> {
+        Promise { seal in
+            self.coursesAPI.retrieve(
+                teacher: self.type.teacherID,
+                order: .popularityDesc,
+                page: page
+            ).done { result in
+                seal.fulfill(result)
+            }.catch { _ in
+                seal.reject(Error.fetchFailed)
+            }
+        }
+    }
+}

Stepic/Sources/Modules/CourseList/Provider/CourseListPersistenceStorage.swift

@@ -32,3 +32,23 @@ final class PassiveCourseListPersistenceStorage: CourseListPersistenceStorage {
 
     func getCoursesList() -> [Course.IdType] { self.list }
 }
+
+final class CreatedCoursesCourseListPersistenceStorage: CourseListPersistenceStorage {
+    private let teacherID: User.IdType
+
+    private var teacherEntity: User? {
+        User.fetchById(self.teacherID)?.first
+    }
+
+    init(teacherID: User.IdType) {
+        self.teacherID = teacherID
+    }
+
+    func update(newCachedList: [Course.IdType]) {
+        self.teacherEntity?.createdCoursesArray = newCachedList
+    }
+
+    func getCoursesList() -> [Course.IdType] {
+        self.teacherEntity?.createdCoursesArray ?? []
+    }
+}

Stepic/Sources/Modules/CourseList/Provider/CourseListTypes.swift

@@ -45,6 +45,12 @@ struct SearchResultCourseListType: CourseListType {
     var analyticName: String { "search_result_course_list" }
 }
 
+struct TeacherCourseListType: CourseListType {
+    let teacherID: User.IdType
+
+    var analyticName: String { "teacher_course_list" }
+}
+
 // MARK: - Services factory
 
 final class CourseListServicesFactory {
@@ -100,6 +106,10 @@ final class CourseListServicesFactory {
             )
         } else if self.type is SearchResultCourseListType {
             return nil
+        } else if let type = self.type as? TeacherCourseListType {
+            return CourseListPersistenceService(
+                storage: CreatedCoursesCourseListPersistenceStorage(teacherID: type.teacherID)
+            )
         } else {
             fatalError("Unsupported course list type")
         }
@@ -126,6 +136,8 @@ final class CourseListServicesFactory {
                 coursesAPI: self.coursesAPI,
                 searchResultsAPI: self.searchResultsAPI
             )
+        } else if let type = self.type as? TeacherCourseListType {
+            return TeacherCourseListNetworkService(type: type, coursesAPI: self.coursesAPI)
         } else {
             fatalError("Unsupported course list type")
         }

Stepic/Sources/Modules/CourseList/Views/CourseListColorMode.swift

@@ -3,14 +3,15 @@ import Foundation
 enum CourseListColorMode {
     case light
     case dark
+    case clear
 
     static var `default`: CourseListColorMode { .light }
 }
 
 extension CourseListColorMode {
     var exploreBlockHeaderViewAppearance: ExploreBlockHeaderView.Appearance {
         switch self {
-        case .light:
+        case .light, .clear:
             return .init(
                 titleLabelColor: .stepikPrimaryText,
                 showAllButtonColor: .stepikTertiaryText
@@ -24,23 +25,16 @@ extension CourseListColorMode {
     }
 
     var exploreBlockContainerViewAppearance: ExploreBlockContainerView.Appearance {
-        switch self {
-        case .light:
-            var appearance = ExploreBlockContainerView.Appearance()
-            appearance.backgroundColor = self.exploreBlockContainerViewBackgroundColor
-            return appearance
-        case .dark:
-            var appearance = ExploreBlockContainerView.Appearance()
-            appearance.backgroundColor = self.exploreBlockContainerViewBackgroundColor
-            return appearance
-        }
+        var appearance = ExploreBlockContainerView.Appearance()
+        appearance.backgroundColor = self.exploreBlockContainerViewBackgroundColor
+        return appearance
     }
 
     private var exploreBlockContainerViewBackgroundColor: UIColor {
         if #available(iOS 13.0, *) {
             return UIColor { (traitCollection: UITraitCollection) -> UIColor in
                 switch self {
-                case .light:
+                case .light, .clear:
                     return .stepikBackground
                 case .dark:
                     if traitCollection.userInterfaceStyle == .dark {
@@ -51,7 +45,7 @@ extension CourseListColorMode {
             }
         } else {
             switch self {
-            case .light:
+            case .light, .clear:
                 return .white
             case .dark:
                 return .stepikAccentFixed
@@ -65,7 +59,7 @@ extension CourseListColorMode {
 
     var courseWidgetStatsViewAppearance: CourseWidgetStatsView.Appearance {
         switch self {
-        case .light:
+        case .light, .clear:
             return .init(
                 imagesRenderingBackgroundColor: .stepikAccent,
                 imagesRenderingTintColor: .stepikGreenFixed,
@@ -89,7 +83,7 @@ extension CourseListColorMode {
         )
 
         switch self {
-        case .light:
+        case .light, .clear:
             appearance.textColor = .stepikPrimaryText
         case .dark:
             appearance.textColor = .white
@@ -105,7 +99,7 @@ extension CourseListColorMode {
         )
 
         switch self {
-        case .light:
+        case .light, .clear:
             appearance.textColor = .stepikSecondaryText
         case .dark:
             appearance.textColor = UIColor.dynamic(
@@ -119,7 +113,7 @@ extension CourseListColorMode {
 
     var courseWidgetBorderColor: UIColor {
         switch self {
-        case .light:
+        case .light, .clear:
             return .dynamic(light: .stepikGrey8Fixed, dark: .stepikSeparator)
         case .dark:
             if #available(iOS 13.0, *) {

Stepic/Sources/Modules/CourseList/Views/CourseListView.swift

@@ -139,6 +139,8 @@ class CourseListView: UIView {
             return self.appearance.lightModeBackgroundColor
         case .dark:
             return self.appearance.darkModeBackgroundColor
+        case .clear:
+            return .clear
         }
     }
 
@@ -186,6 +188,11 @@ extension CourseListView: ProgrammaticallyInitializableViewProtocol {
                 DarkCourseListCollectionViewCell.self,
                 forCellWithReuseIdentifier: DarkCourseListCollectionViewCell.defaultReuseIdentifier
             )
+        case .clear:
+            self.collectionView.register(
+                ClearCourseListCollectionViewCell.self,
+                forCellWithReuseIdentifier: ClearCourseListCollectionViewCell.defaultReuseIdentifier
+            )
         }
 
         self.collectionView.register(
@@ -445,6 +452,18 @@ final class HorizontalCourseListView: CourseListView {
         fatalError("init(coder:) has not been implemented")
     }
 
+    override func updateCollectionViewData(delegate: UICollectionViewDelegate, dataSource: UICollectionViewDataSource) {
+        if dataSource.collectionView(self.collectionView, numberOfItemsInSection: 0) == 1 {
+            self.horizontalCourseFlowLayout.rowsCount = 1
+        } else {
+            self.horizontalCourseFlowLayout.rowsCount = self.rowsCount
+        }
+
+        super.updateCollectionViewData(delegate: delegate, dataSource: dataSource)
+
+        self.invalidateIntrinsicContentSize()
+    }
+
     override func calculateItemSize() -> CGSize {
         if self.isAdaptiveColumnsCount {
             let (columnsCount, columnWidth) = self.calculateAdaptiveLayoutColumnAttributes(
@@ -519,3 +538,18 @@ private class DarkCourseListCollectionViewCell: CourseListCollectionViewCell {
         String(describing: CourseListCollectionViewCell.self)
     }
 }
+
+private class ClearCourseListCollectionViewCell: CourseListCollectionViewCell {
+    override init(frame: CGRect) {
+        super.init(frame: frame, colorMode: .clear)
+    }
+
+    @available(*, unavailable)
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    static var defaultReuseIdentifier: String {
+        String(describing: CourseListCollectionViewCell.self)
+    }
+}

Stepic/Sources/Modules/CourseList/Views/Layouts/HorizontalCourseListFlowLayout.swift

@@ -12,7 +12,7 @@ extension HorizontalCourseListFlowLayout {
 
 final class HorizontalCourseListFlowLayout: BaseListFlowLayout {
     let appearance: Appearance
-    let rowsCount: Int
+    var rowsCount: Int
     var columnsCount: Int
 
     private var _contentWidth: CGFloat = 0

Stepic/Sources/Modules/CourseList/Views/Widget/CourseWidgetView.swift

@@ -75,6 +75,7 @@ final class CourseWidgetView: UIView {
         self.colorMode = colorMode
         super.init(frame: frame)
 
+        self.setupView()
         self.addSubviews()
         self.makeConstraints()
     }
@@ -123,6 +124,12 @@ final class CourseWidgetView: UIView {
 }
 
 extension CourseWidgetView: ProgrammaticallyInitializableViewProtocol {
+    func setupView() {
+        if self.colorMode == .clear {
+            self.backgroundColor = .stepikBackground
+        }
+    }
+
     func addSubviews() {
         self.addSubview(self.coverView)
         self.addSubview(self.titleLabel)

Stepic/Sources/Modules/NewProfile/NewProfileDataFlow.swift

@@ -5,6 +5,7 @@ enum NewProfile {
 
     enum Submodule: String, UniqueIdentifiable {
         case streakNotifications
+        case createdCourses
         case userActivity
         case achievements
         case certificates

Stepic/Sources/Modules/NewProfile/NewProfileInteractor.swift

@@ -334,6 +334,14 @@ extension NewProfileInteractor: NewProfileCertificatesOutputProtocol {
     }
 }
 
+// MARK: - NewProfileInteractor: NewProfileCreatedCoursesOutputProtocol -
+
+extension NewProfileInteractor: NewProfileCreatedCoursesOutputProtocol {
+    func handleCreatedCoursesEmptyState() {
+        self.presenter.presentSubmoduleEmptyState(response: .init(module: .createdCourses))
+    }
+}
+
 // MARK: - NewProfileInteractor: SettingsOutputProtocol -
 
 extension NewProfileInteractor: SettingsOutputProtocol {