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.217 #1144

Merged
merged 7 commits into from
Apr 6, 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
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.571.0)
aws-partitions (1.573.0)
aws-sdk-core (3.130.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
Expand Down Expand Up @@ -63,7 +63,7 @@ GEM
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.6.2)
cocoapods-downloader (1.6.3)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
Expand All @@ -86,7 +86,7 @@ GEM
escape (0.0.4)
ethon (0.15.0)
ffi (>= 1.15.0)
excon (0.92.1)
excon (0.92.2)
faraday (1.10.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand Down Expand Up @@ -168,7 +168,7 @@ GEM
xcodeproj (>= 1.5.0, < 2.0.0)
gh_inspector (1.1.3)
git (1.2.9.1)
google-apis-androidpublisher_v3 (0.17.0)
google-apis-androidpublisher_v3 (0.18.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-core (0.4.2)
addressable (~> 2.5, >= 2.5.1)
Expand All @@ -183,7 +183,7 @@ GEM
google-apis-core (>= 0.4, < 2.a)
google-apis-playcustomapp_v1 (0.7.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-storage_v1 (0.11.0)
google-apis-storage_v1 (0.12.0)
google-apis-core (>= 0.4, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
Expand Down
24 changes: 12 additions & 12 deletions Stepic.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -13189,7 +13189,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = UJ4KC2QN7B;
INFOPLIST_FILE = "StickerPackExtension/Info-Production.plist";
Expand All @@ -13214,7 +13214,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UJ4KC2QN7B;
INFOPLIST_FILE = "StickerPackExtension/Info-Production.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
Expand Down Expand Up @@ -13356,7 +13356,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UJ4KC2QN7B;
ENABLE_BITCODE = YES;
INFOPLIST_FILE = "Stepic/Info-Production.plist";
Expand Down Expand Up @@ -13386,7 +13386,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UJ4KC2QN7B;
ENABLE_BITCODE = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand Down Expand Up @@ -13477,7 +13477,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UJ4KC2QN7B;
ENABLE_BITCODE = YES;
INFOPLIST_FILE = "Stepic/Info-Develop.plist";
Expand Down Expand Up @@ -13529,7 +13529,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = UJ4KC2QN7B;
INFOPLIST_FILE = "StickerPackExtension/Info-Develop.plist";
Expand Down Expand Up @@ -13610,7 +13610,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UJ4KC2QN7B;
ENABLE_BITCODE = YES;
INFOPLIST_FILE = "Stepic/Info-Develop.plist";
Expand Down Expand Up @@ -13658,7 +13658,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UJ4KC2QN7B;
INFOPLIST_FILE = "StickerPackExtension/Info-Develop.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
Expand Down Expand Up @@ -14178,7 +14178,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UJ4KC2QN7B;
ENABLE_BITCODE = YES;
INFOPLIST_FILE = "Stepic/Info-Release.plist";
Expand Down Expand Up @@ -14232,7 +14232,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = UJ4KC2QN7B;
INFOPLIST_FILE = "StickerPackExtension/Info-Release.plist";
Expand Down Expand Up @@ -14314,7 +14314,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UJ4KC2QN7B;
ENABLE_BITCODE = YES;
INFOPLIST_FILE = "Stepic/Info-Release.plist";
Expand Down Expand Up @@ -14362,7 +14362,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 427;
CURRENT_PROJECT_VERSION = 429;
DEVELOPMENT_TEAM = UJ4KC2QN7B;
INFOPLIST_FILE = "StickerPackExtension/Info-Release.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
Expand Down
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.216-develop</string>
<string>1.217-develop</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down Expand Up @@ -62,7 +62,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>427</string>
<string>429</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.216</string>
<string>1.217</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down Expand Up @@ -62,7 +62,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>427</string>
<string>429</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.216-release</string>
<string>1.217-release</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down Expand Up @@ -62,7 +62,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>427</string>
<string>429</string>
<key>FacebookAppID</key>
<string>171127739724012</string>
<key>FacebookDisplayName</key>
Expand Down
39 changes: 30 additions & 9 deletions Stepic/Legacy/Analytics/AnalyticsUserProperties.swift
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
//
// AnalyticsUserProperties.swift
// Stepic
//
// Created by Ostrenkiy on 20.06.2018.
// Copyright © 2018 Alex Karpov. All rights reserved.
//

import Amplitude
import FirebaseAnalytics
import FirebaseCrashlytics
import Foundation
import UIKit
import YandexMobileMetrica

final class AnalyticsUserProperties: ABAnalyticsServiceProtocol {
Expand Down Expand Up @@ -110,6 +102,33 @@ final class AnalyticsUserProperties: ABAnalyticsServiceProtocol {
self.setAmplitudeProperty(key: UserPropertyKey.isNightModeEnabled.rawValue, value: "\(isEnabled)")
}

func updateAccessibilityIsVoiceOverRunning() {
self.setAmplitudeProperty(
key: UserPropertyKey.isAccessibilityScreenReaderEnabled.rawValue,
value: UIAccessibility.isVoiceOverRunning
)
}

func updateAccessibilityFontScale() {
guard #available(iOS 13.0, *) else {
return
}

let defaultBodyFont = UIFont.preferredFont(
forTextStyle: .body,
compatibleWith: UITraitCollection(preferredContentSizeCategory: .large)
)

let currentBodyFont = UIFont.preferredFont(
forTextStyle: .body,
compatibleWith: UITraitCollection.current
)

let fontScale = currentBodyFont.pointSize / defaultBodyFont.pointSize

self.setAmplitudeProperty(key: UserPropertyKey.accessibilityFontScale.rawValue, value: fontScale)
}

func setRemoteConfigUserProperties(_ keysAndValues: [String: Any]) {
Amplitude.instance().setUserProperties(keysAndValues)
Crashlytics.crashlytics().setCustomKeysAndValues(keysAndValues)
Expand Down Expand Up @@ -167,5 +186,7 @@ final class AnalyticsUserProperties: ABAnalyticsServiceProtocol {
case screenOrientation = "screen_orientation"
case applicationID = "application_id"
case isNightModeEnabled = "is_night_mode_enabled"
case isAccessibilityScreenReaderEnabled = "accessibility_screen_reader_enabled"
case accessibilityFontScale = "accessibility_font_scale"
}
}
2 changes: 2 additions & 0 deletions Stepic/Legacy/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
AnalyticsUserProperties.shared.setApplicationID(id: Bundle.main.bundleIdentifier!)
AnalyticsUserProperties.shared.updateUserID()
AnalyticsUserProperties.shared.updateIsDarkModeEnabled()
AnalyticsUserProperties.shared.updateAccessibilityFontScale()
AnalyticsUserProperties.shared.updateAccessibilityIsVoiceOverRunning()

NotificationsBadgesManager.shared.setup()

Expand Down
4 changes: 2 additions & 2 deletions StepicTests/Info-Develop.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.216-develop</string>
<string>1.217-develop</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>427</string>
<string>429</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions StepicTests/Info-Production.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.216</string>
<string>1.217</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>427</string>
<string>429</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions StepicTests/Info-Release.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.216-release</string>
<string>1.217-release</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>427</string>
<string>429</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions StepicUITests/Info-Develop.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.216-develop</string>
<string>1.217-develop</string>
<key>CFBundleVersion</key>
<string>427</string>
<string>429</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions StepicUITests/Info-Production.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.216</string>
<string>1.217</string>
<key>CFBundleVersion</key>
<string>427</string>
<string>429</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions StepicUITests/Info-Release.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.216-release</string>
<string>1.217-release</string>
<key>CFBundleVersion</key>
<string>427</string>
<string>429</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions StepicWidget/Info-Develop.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.216-develop</string>
<string>1.217-develop</string>
<key>CFBundleVersion</key>
<string>427</string>
<string>429</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
4 changes: 2 additions & 2 deletions StepicWidget/Info-Production.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.216</string>
<string>1.217</string>
<key>CFBundleVersion</key>
<string>427</string>
<string>429</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
4 changes: 2 additions & 2 deletions StepicWidget/Info-Release.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.216-release</string>
<string>1.217-release</string>
<key>CFBundleVersion</key>
<string>427</string>
<string>429</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
4 changes: 2 additions & 2 deletions StickerPackExtension/Info-Develop.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.216-develop</string>
<string>1.217-develop</string>
<key>CFBundleVersion</key>
<string>427</string>
<string>429</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
Expand Down
Loading