Merge pull request #1121 from StepicOrg/release/1.210

Release 1.210

.swift-version

@@ -1 +1 @@
-5.4.2
+5.5.2

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 ruby "2.6.5"
 
-gem "fastlane", "2.204.2"
+gem "fastlane", "2.204.3"
 gem "cocoapods", "1.11.2"
 gem "generamba", "1.5.0"
 

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (6.1.4.4)
+    activesupport (6.1.4.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -17,8 +17,8 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.552.0)
-    aws-sdk-core (3.126.0)
+    aws-partitions (1.554.0)
+    aws-sdk-core (3.126.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -116,7 +116,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.204.2)
+    fastlane (2.204.3)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -191,15 +191,15 @@ GEM
     google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.2.0)
-    google-cloud-storage (1.36.0)
+    google-cloud-storage (1.36.1)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
       google-apis-storage_v1 (~> 0.1)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.1.0)
+    googleauth (1.1.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -210,9 +210,9 @@ GEM
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.9.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    jmespath (1.5.0)
+    jmespath (1.6.0)
     json (2.6.1)
     jwt (2.3.0)
     liquid (4.0.0)
@@ -287,7 +287,7 @@ PLATFORMS
 
 DEPENDENCIES
   cocoapods (= 1.11.2)
-  fastlane (= 2.204.2)
+  fastlane (= 2.204.3)
   fastlane-plugin-firebase_app_distribution
   generamba (= 1.5.0)
 

Podfile

@@ -13,6 +13,8 @@ project 'Stepic',
         'Develop Release' => :release
 
 def shared_pods
+  pod 'StepikModel', path: './StepikModel'
+
   pod 'Alamofire', '5.4.4'
   pod 'Atributika', '4.10.1'
   pod 'SwiftyJSON', '5.0.0'

Podfile.lock

@@ -194,6 +194,7 @@ PODS:
     - SDWebImage/Core (= 5.12.1)
   - SDWebImage/Core (5.12.1)
   - SnapKit (5.0.1)
+  - StepikModel (0.0.1)
   - STRegex (2.1.1)
   - SVGKit (2.1.0):
     - CocoaLumberjack (~> 3.0)
@@ -250,6 +251,7 @@ DEPENDENCIES:
   - Quick (= 4.0.0)
   - SDWebImage (= 5.12.1)
   - SnapKit (= 5.0.1)
+  - StepikModel (from `./StepikModel`)
   - STRegex (= 2.1.1)
   - SVGKit (from `https://github.com/SVGKit/SVGKit.git`, branch `2.x`)
   - SVProgressHUD (= 2.2.5)
@@ -339,6 +341,8 @@ EXTERNAL SOURCES:
   PromiseKit:
     :git: https://github.com/mxcl/PromiseKit.git
     :tag: 6.16.2
+  StepikModel:
+    :path: "./StepikModel"
   SVGKit:
     :branch: 2.x
     :git: https://github.com/SVGKit/SVGKit.git
@@ -416,6 +420,7 @@ SPEC CHECKSUMS:
   Quick: 6473349e43b9271a8d43839d9ba1c442ed1b7ac4
   SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b
   SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
+  StepikModel: 7bf35e3dcd1687b5b7cf4f49838e1e74776a593c
   STRegex: d49e88d0fe58538d3175fdd989bc1243b9be2a07
   SVGKit: 8a2fc74258bdb2abb54d3b65f3dd68b0277a9c4d
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
@@ -430,6 +435,6 @@ SPEC CHECKSUMS:
   VK-ios-sdk: 5bcf00a2014a7323f98db9328b603d4f96635caa
   YandexMobileMetrica: 9e713c16bb6aca0ba63b84c8d7b8b86d32f4ecc4
 
-PODFILE CHECKSUM: 42090896731b9ed2149070e8d1307c88748217fa
+PODFILE CHECKSUM: 3ad6914f999990d5539bd6b9014b1f7be682e575
 
 COCOAPODS: 1.11.2

Stepic/Images.xcassets/Course_list_placeholder/new_courses_gradient.imageset/Contents.json

@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "new_courses_gradient.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "new_courses_gradient_dark.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Stepic/Images.xcassets/Course_list_placeholder/new_courses_placeholder_gradient_large.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "new_courses_placeholder_gradient_large.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Stepic/Images.xcassets/Course_list_placeholder/new_courses_placeholder_gradient_small.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "new_courses_placeholder_gradient_small.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Stepic/Images.xcassets/PromoBannersIllustrations/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Stepic/Images.xcassets/PromoBannersIllustrations/promo-banner-illustration-bicycle-green.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "promo-banner-illustration-bicycle-green.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Stepic/Images.xcassets/PromoBannersIllustrations/promo-banner-illustration-bicycle-violet.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "promo-banner-illustration-bicycle-violet.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Stepic/Images.xcassets/PromoBannersIllustrations/promo-banner-illustration-work.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "promo-banner-illustration-work.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Stepic/Images.xcassets/plus.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "plus.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Stepic/Info-Develop.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.209-develop</string>
+	<string>1.210-develop</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -62,7 +62,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>411</string>
+	<string>415</string>
 	<key>FacebookAppID</key>
 	<string>171127739724012</string>
 	<key>FacebookDisplayName</key>

Stepic/Info-Production.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.209</string>
+	<string>1.210</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -62,7 +62,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>411</string>
+	<string>415</string>
 	<key>FacebookAppID</key>
 	<string>171127739724012</string>
 	<key>FacebookDisplayName</key>

Stepic/Info-Release.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.209-release</string>
+	<string>1.210-release</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -62,7 +62,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>411</string>
+	<string>415</string>
 	<key>FacebookAppID</key>
 	<string>171127739724012</string>
 	<key>FacebookDisplayName</key>

Stepic/Legacy/Analytics/Events/AnalyticsEvents.swift

@@ -108,6 +108,38 @@ extension AnalyticsEvent {
     static let profileOpenSettingsTapped = AnalyticsEvent(name: "main_choice_settings")
     static let profilePinsMapInteracted = AnalyticsEvent(name: "pins_map_interaction")
 
+    // MARK: - Promo Banners -
+
+    static func promoBannerSeen(_ promoBanner: PromoBanner) -> AnalyticsEvent {
+        AnalyticsEvent(
+            name: "Promo banner seen",
+            parameters: [
+                "type": promoBanner.type,
+                "lang": promoBanner.lang,
+                "title": promoBanner.title,
+                "description": promoBanner.description,
+                "url": promoBanner.url,
+                "screen": promoBanner.screen,
+                "position": promoBanner.position
+            ]
+        )
+    }
+
+    static func promoBannerClicked(_ promoBanner: PromoBanner) -> AnalyticsEvent {
+        AnalyticsEvent(
+            name: "Promo banner clicked",
+            parameters: [
+                "type": promoBanner.type,
+                "lang": promoBanner.lang,
+                "title": promoBanner.title,
+                "description": promoBanner.description,
+                "url": promoBanner.url,
+                "screen": promoBanner.screen,
+                "position": promoBanner.position
+            ]
+        )
+    }
+
     // MARK: - Step -
 
     static let generateNewAttemptTapped = AnalyticsEvent(name: "clicked_generate_new_attempt")

Stepic/Legacy/Model/Entities/WishlistEntryEntity/WishlistEntryEntity.swift

@@ -1,5 +1,6 @@
 import CoreData
 import Foundation
+import StepikModel
 
 final class WishlistEntryEntity: NSManagedObject, ManagedObject, Identifiable {
     typealias IdType = Int
@@ -15,8 +16,8 @@ final class WishlistEntryEntity: NSManagedObject, ManagedObject, Identifiable {
 // MARK: - WishlistEntryEntity (PlainObject Support) -
 
 extension WishlistEntryEntity {
-    var plainObject: WishlistEntryPlainObject {
-        WishlistEntryPlainObject(
+    var plainObject: WishlistEntry {
+        WishlistEntry(
             id: self.id,
             courseID: self.courseID,
             userID: self.userID,
@@ -27,14 +28,14 @@ extension WishlistEntryEntity {
 
     static func insert(
         into context: NSManagedObjectContext,
-        wishlistEntry: WishlistEntryPlainObject
+        wishlistEntry: WishlistEntry
     ) -> WishlistEntryEntity {
         let entity: WishlistEntryEntity = context.insertObject()
         entity.update(wishlistEntry: wishlistEntry)
         return entity
     }
 
-    func update(wishlistEntry: WishlistEntryPlainObject) {
+    func update(wishlistEntry: WishlistEntry) {
         self.id = wishlistEntry.id
         self.courseID = wishlistEntry.courseID
         self.userID = wishlistEntry.userID