Merge pull request #1085 from StepicOrg/release/1.203

Release 1.203
StepicOrg · Dec 22, 2021 · 0e5d36d · 0e5d36d
2 parents 9c931bf + 08a8aa2
commit 0e5d36d
Show file tree

Hide file tree

Showing 87 changed files with 2,383 additions and 418 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 ruby "2.6.5"
 
-gem "fastlane", "2.198.1"
+gem "fastlane", "2.199.0"
 gem "cocoapods", "1.11.2"
 gem "generamba", "1.5.0"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (6.1.4.1)
+    activesupport (6.1.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -17,16 +17,16 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.534.0)
-    aws-sdk-core (3.123.0)
+    aws-partitions (1.541.0)
+    aws-sdk-core (3.124.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.51.0)
+    aws-sdk-kms (1.52.0)
       aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.107.0)
+    aws-sdk-s3 (1.109.0)
       aws-sdk-core (~> 3, >= 3.122.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -86,7 +86,7 @@ GEM
     escape (0.0.4)
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    excon (0.88.0)
+    excon (0.89.0)
     faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -112,7 +112,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.5)
-    fastlane (2.198.1)
+    fastlane (2.199.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -151,7 +151,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-firebase_app_distribution (0.3.1)
+    fastlane-plugin-firebase_app_distribution (0.3.2)
     ffi (1.15.4)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
@@ -164,7 +164,7 @@ GEM
       xcodeproj (>= 1.5.0, < 2.0.0)
     gh_inspector (1.1.3)
     git (1.2.9.1)
-    google-apis-androidpublisher_v3 (0.13.0)
+    google-apis-androidpublisher_v3 (0.14.0)
       google-apis-core (>= 0.4, < 2.a)
     google-apis-core (0.4.1)
       addressable (~> 2.5, >= 2.5.1)
@@ -175,20 +175,20 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.8.0)
+    google-apis-iamcredentials_v1 (0.9.0)
       google-apis-core (>= 0.4, < 2.a)
     google-apis-playcustomapp_v1 (0.6.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.9.0)
+    google-apis-storage_v1 (0.10.0)
       google-apis-core (>= 0.4, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.2.0)
-    google-cloud-storage (1.34.1)
-      addressable (~> 2.5)
+    google-cloud-storage (1.35.0)
+      addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
       google-apis-storage_v1 (~> 0.1)
@@ -215,7 +215,7 @@ GEM
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    minitest (5.14.4)
+    minitest (5.15.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
@@ -283,7 +283,7 @@ PLATFORMS
 
 DEPENDENCIES
   cocoapods (= 1.11.2)
-  fastlane (= 2.198.1)
+  fastlane (= 2.199.0)
   fastlane-plugin-firebase_app_distribution
   generamba (= 1.5.0)
 

diff --git a/Stepic.xcodeproj/project.pbxproj b/Stepic.xcodeproj/project.pbxproj
diff --git a/Stepic/Images.xcassets/CourseInfoPurchaseModal/Contents.json b/Stepic/Images.xcassets/CourseInfoPurchaseModal/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...assets/CourseInfoPurchaseModal/CourseInfoPurchaseModalPurchaseFail.imageset/Contents.json b/...assets/CourseInfoPurchaseModal/CourseInfoPurchaseModalPurchaseFail.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "CourseInfoPurchaseModalPurchaseFail.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/...odal/CourseInfoPurchaseModalPurchaseFail.imageset/CourseInfoPurchaseModalPurchaseFail.pdf b/...odal/CourseInfoPurchaseModalPurchaseFail.imageset/CourseInfoPurchaseModalPurchaseFail.pdf
diff --git a/...foPurchaseModal/CourseInfoPurchaseModalPurchaseFailExclamationMark.imageset/Contents.json b/...foPurchaseModal/CourseInfoPurchaseModalPurchaseFailExclamationMark.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "CourseInfoPurchaseModalPurchaseFailExclamationMark.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/...rchaseFailExclamationMark.imageset/CourseInfoPurchaseModalPurchaseFailExclamationMark.pdf b/...rchaseFailExclamationMark.imageset/CourseInfoPurchaseModalPurchaseFailExclamationMark.pdf
diff --git a/...ets/CourseInfoPurchaseModal/CourseInfoPurchaseModalPurchaseSuccess.imageset/Contents.json b/...ets/CourseInfoPurchaseModal/CourseInfoPurchaseModalPurchaseSuccess.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "CourseInfoPurchaseModalPurchaseSuccess.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/...ourseInfoPurchaseModalPurchaseSuccess.imageset/CourseInfoPurchaseModalPurchaseSuccess.pdf b/...ourseInfoPurchaseModalPurchaseSuccess.imageset/CourseInfoPurchaseModalPurchaseSuccess.pdf
diff --git a/Stepic/Info-Develop.plist b/Stepic/Info-Develop.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.202-develop</string>
+	<string>1.203-develop</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -62,7 +62,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>390</string>
+	<string>396</string>
 	<key>FacebookAppID</key>
 	<string>171127739724012</string>
 	<key>FacebookDisplayName</key>

diff --git a/Stepic/Info-Production.plist b/Stepic/Info-Production.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.202</string>
+	<string>1.203</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -62,7 +62,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>390</string>
+	<string>396</string>
 	<key>FacebookAppID</key>
 	<string>171127739724012</string>
 	<key>FacebookDisplayName</key>

diff --git a/Stepic/Info-Release.plist b/Stepic/Info-Release.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.202-release</string>
+	<string>1.203-release</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -62,7 +62,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>390</string>
+	<string>396</string>
 	<key>FacebookAppID</key>
 	<string>171127739724012</string>
 	<key>FacebookDisplayName</key>

diff --git a/Stepic/Legacy/Analytics/Events/AmplitudeAnalyticsEvents.swift b/Stepic/Legacy/Analytics/Events/AmplitudeAnalyticsEvents.swift
@@ -133,20 +133,27 @@ extension AnalyticsEvent {
         case siriShortcut = "ios_siri_shortcut"
     }
 
-    static func courseBuyPressed(source: CourseBuySource, id: Int, isWishlisted: Bool) -> AmplitudeAnalyticsEvent {
+    static func courseBuyPressed(
+        id: Int,
+        source: CourseBuySource,
+        isWishlisted: Bool,
+        promoCode: String?
+    ) -> AmplitudeAnalyticsEvent {
         AmplitudeAnalyticsEvent(
             name: "Buy course pressed",
             parameters: [
                 "source": source.rawValue,
                 "course": id,
-                "is_wishlisted": isWishlisted
+                "is_wishlisted": isWishlisted,
+                "promo": promoCode as Any
             ]
         )
     }
 
     enum CourseBuySource: String {
         case courseWidget = "course_widget"
         case courseScreen = "course_screen"
+        case demoLessonDialog = "demo_lesson_dialog"
     }
 
     static func courseBuyReceiptRefreshed(id: Int, successfully: Bool) -> AmplitudeAnalyticsEvent {
@@ -159,6 +166,132 @@ extension AnalyticsEvent {
         )
     }
 
+    static func courseBuyCoursePromoStartPressed(id: Int) -> AmplitudeAnalyticsEvent {
+        AmplitudeAnalyticsEvent(
+            name: "Buy course promo start pressed",
+            parameters: ["course": id]
+        )
+    }
+
+    static func courseBuyCoursePromoSuccess(id: Int, promoCode: String) -> AmplitudeAnalyticsEvent {
+        AmplitudeAnalyticsEvent(
+            name: "Buy course promo success",
+            parameters: [
+                "course": id,
+                "promo": promoCode
+            ]
+        )
+    }
+
+    static func courseBuyCoursePromoFailure(id: Int, promoCode: String) -> AmplitudeAnalyticsEvent {
+        AmplitudeAnalyticsEvent(
+            name: "Buy course promo failure",
+            parameters: [
+                "course": id,
+                "promo": promoCode
+            ]
+        )
+    }
+
+    static func courseBuyCourseIAPFlowStart(
+        id: Int,
+        source: CourseBuySource,
+        isWishlisted: Bool,
+        promoCode: String?
+    ) -> AmplitudeAnalyticsEvent {
+        AmplitudeAnalyticsEvent(
+            name: "Buy course IAP flow start",
+            parameters: [
+                "course": id,
+                "source": source.rawValue,
+                "is_wishlisted": isWishlisted,
+                "promo": promoCode as Any
+            ]
+        )
+    }
+
+    static func courseBuyCourseIAPFlowSuccess(
+        id: Int,
+        source: CourseBuySource,
+        isWishlisted: Bool,
+        promoCode: String?
+    ) -> AmplitudeAnalyticsEvent {
+        AmplitudeAnalyticsEvent(
+            name: "Buy course IAP flow success",
+            parameters: [
+                "course": id,
+                "source": source.rawValue,
+                "is_wishlisted": isWishlisted,
+                "promo": promoCode as Any
+            ]
+        )
+    }
+
+    static func courseBuyCourseIAPFlowFailure(
+        id: Int,
+        errorType: String,
+        errorDescription: String?
+    ) -> AmplitudeAnalyticsEvent {
+        AmplitudeAnalyticsEvent(
+            name: "Buy course IAP flow failure",
+            parameters: [
+                "course": id,
+                "type": errorType,
+                "message": errorDescription as Any
+            ]
+        )
+    }
+
+    static func courseBuyCourseVerificationSuccess(
+        id: Int,
+        source: CourseBuySource,
+        isWishlisted: Bool,
+        promoCode: String?
+    ) -> AmplitudeAnalyticsEvent {
+        AmplitudeAnalyticsEvent(
+            name: "Buy course verification success",
+            parameters: [
+                "course": id,
+                "source": source.rawValue,
+                "is_wishlisted": isWishlisted,
+                "promo": promoCode as Any
+            ]
+        )
+    }
+
+    static func courseBuyCourseVerificationFailure(
+        id: Int,
+        errorType: String,
+        errorDescription: String?
+    ) -> AmplitudeAnalyticsEvent {
+        AmplitudeAnalyticsEvent(
+            name: "Buy course verification failure",
+            parameters: [
+                "course": id,
+                "type": errorType,
+                "message": errorDescription as Any
+            ]
+        )
+    }
+
+    static func courseRestoreCoursePurchasePressed(
+        id: Int,
+        source: CourseRestorePurchaseSource
+    ) -> AmplitudeAnalyticsEvent {
+        AmplitudeAnalyticsEvent(
+            name: "Restore course purchase pressed",
+            parameters: [
+                "course": id,
+                "source": source.rawValue
+            ]
+        )
+    }
+
+    enum CourseRestorePurchaseSource: String {
+        case buyCourseDialog = "buy_course_dialog"
+        case courseScreen = "course_screen"
+    }
+
     // MARK: - Course Search -
 
     static func courseContentSearchScreenOpened(id: Int, title: String?) -> AmplitudeAnalyticsEvent {