Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.214 #1135

Merged
merged 11 commits into from
Mar 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
252 changes: 190 additions & 62 deletions Stepic.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions Stepic/Images.xcassets/CertificateDetail/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"images" : [
{
"filename" : "certificate-detail-badge-distinction.pdf",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "certificate-detail-badge-distinction-dark.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"images" : [
{
"filename" : "certificate-detail-badge-regular.pdf",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "certificate-detail-badge-regular-dark.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
Binary file not shown.
Binary file not shown.
6 changes: 6 additions & 0 deletions Stepic/Images.xcassets/CertificatesList/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "certificates-list-certificate-distinction.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "certificates-list-certificate-regular.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
Binary file not shown.
15 changes: 15 additions & 0 deletions Stepic/Images.xcassets/edit.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "edit.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true
}
}
Binary file added Stepic/Images.xcassets/edit.imageset/edit.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions Stepic/Info-Develop.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.213-develop</string>
<string>1.214-develop</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down Expand Up @@ -62,7 +62,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>423</string>
<string>426</string>
<key>FacebookAppID</key>
<string>171127739724012</string>
<key>FacebookDisplayName</key>
Expand Down
4 changes: 2 additions & 2 deletions Stepic/Info-Production.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.213</string>
<string>1.214</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down Expand Up @@ -62,7 +62,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>423</string>
<string>426</string>
<key>FacebookAppID</key>
<string>171127739724012</string>
<key>FacebookDisplayName</key>
Expand Down
4 changes: 2 additions & 2 deletions Stepic/Info-Release.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.213-release</string>
<string>1.214-release</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down Expand Up @@ -62,7 +62,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>423</string>
<string>426</string>
<key>FacebookAppID</key>
<string>171127739724012</string>
<key>FacebookDisplayName</key>
Expand Down
84 changes: 83 additions & 1 deletion Stepic/Legacy/Analytics/Events/AmplitudeAnalyticsEvents.swift
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,84 @@ extension AnalyticsEvent {

// MARK: - Certificates -

static let certificatesScreenOpened = AmplitudeAnalyticsEvent(name: "Certificates screen opened")
static func certificatesScreenOpened(
userID: Int,
certificateUserState: CertificateUserState
) -> AmplitudeAnalyticsEvent {
AmplitudeAnalyticsEvent(
name: "Certificates screen opened",
parameters: [
"user": userID,
"state": certificateUserState.rawValue
]
)
}

static func certificateScreenOpened(
certificateID: Int,
courseID: Int,
userID: Int,
certificateUserState: CertificateUserState
) -> AmplitudeAnalyticsEvent {
AmplitudeAnalyticsEvent(
name: "Certificate screen opened",
parameters: [
"certificate": certificateID,
"course": courseID,
"user": userID,
"state": certificateUserState.rawValue
]
)
}

static func certificateShareClicked(
certificateID: Int,
courseID: Int,
userID: Int,
certificateUserState: CertificateUserState
) -> AmplitudeAnalyticsEvent {
AmplitudeAnalyticsEvent(
name: "Certificate share clicked",
parameters: [
"certificate": certificateID,
"course": courseID,
"user": userID,
"state": certificateUserState.rawValue
]
)
}

enum CertificateUserState: String {
case `self` = "self"
case other
}

static func certificateChangeNameClicked(certificateID: Int, courseID: Int) -> AmplitudeAnalyticsEvent {
AmplitudeAnalyticsEvent(
name: "Certificate change name clicked",
parameters: [
"certificate": certificateID,
"course": courseID
]
)
}

static func certificatePDFClicked(
certificateID: Int,
courseID: Int,
userID: Int,
certificateUserState: CertificateUserState
) -> AmplitudeAnalyticsEvent {
AmplitudeAnalyticsEvent(
name: "Certificate pdf clicked",
parameters: [
"certificate": certificateID,
"course": courseID,
"user": userID,
"state": certificateUserState.rawValue
]
)
}

// MARK: - Achievements -

Expand Down Expand Up @@ -863,6 +940,7 @@ extension AnalyticsEvent {
case profile(id: Int)
case userCoursesReviews
case wishlist
case certificate(id: Int)
case unknown

var name: String {
Expand Down Expand Up @@ -899,6 +977,8 @@ extension AnalyticsEvent {
return "user_courses_reviews"
case .wishlist:
return "wishlist"
case .certificate:
return "certificate"
case .unknown:
return "unknown"
}
Expand Down Expand Up @@ -946,6 +1026,8 @@ extension AnalyticsEvent {
return ["story": id]
case .deepLink(let url), .widgetExtension(let url):
return ["url": url]
case .certificate(let id):
return ["id": id]
}
}
}
Expand Down

This file was deleted.

Loading