Merge pull request #1014 from hyperskill/release/1.57

Release 1.57

.github/actions/setup-android/action.yml

@@ -62,7 +62,7 @@ runs:
 
     - name: Setup Ruby
       if: ${{ inputs.setup-ruby == 'true' }}
-      uses: ruby/setup-ruby@v1.171.0
+      uses: ruby/setup-ruby@v1.175.1
       with:
         ruby-version: '3.3.0'
         bundler-cache: true

.github/actions/setup-ios/action.yml

@@ -49,7 +49,7 @@ runs:
       shell: bash
 
     - name: Setup Ruby
-      uses: ruby/setup-ruby@v1.171.0
+      uses: ruby/setup-ruby@v1.175.1
       with:
         ruby-version: '3.3.0'
         bundler-cache: true

.github/workflows/android_beta_deployment.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Gradle Wrapper Validation
         uses: gradle/actions/wrapper-validation@v3
@@ -47,7 +47,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Setup CI
         id: setup

.github/workflows/android_deploy_to_firebase.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Setup CI
         id: setup

.github/workflows/android_deploy_to_firebase_manually.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Gradle Wrapper Validation
         uses: gradle/actions/wrapper-validation@v3

.github/workflows/android_release_deployment.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Gradle Wrapper Validation
         uses: gradle/actions/wrapper-validation@v3
@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].1
+      uses: actions/[email protected].4
 
     - name: Setup CI
       id: setup

.github/workflows/automerge_into_release.yml

@@ -31,13 +31,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
         with:
           fetch-depth: 0
           token: ${{ secrets.GH_PAT }}
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.171.0
+        uses: ruby/setup-ruby@v1.175.1
         with:
           ruby-version: "3.3.0"
           bundler-cache: true

.github/workflows/build_caches.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].1
+      uses: actions/[email protected].4
 
     - name: Setup CI
       uses: ./.github/actions/setup-android
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Setup CI
         id: setup

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Gradle Wrapper Validation
         uses: gradle/actions/wrapper-validation@v3
@@ -64,7 +64,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].1
+      uses: actions/[email protected].4
 
     - name: Setup CI
       uses: ./.github/actions/setup-android
@@ -91,7 +91,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].1
+      uses: actions/[email protected].4
 
     - name: Setup CI
       uses: ./.github/actions/setup-android
@@ -115,10 +115,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.171.0
+        uses: ruby/setup-ruby@v1.175.1
         with:
           ruby-version: '3.3.0'
           bundler-cache: true
@@ -151,7 +151,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].1
+      uses: actions/[email protected].4
 
     - name: Setup CI
       id: setup
@@ -175,7 +175,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].1
+      uses: actions/[email protected].4
 
     - name: Setup CI
       id: setup
@@ -198,7 +198,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Setup CI
         id: setup

.github/workflows/cleanup_pr_caches.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Cleanup
         run: |

.github/workflows/codeql.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].1
+      uses: actions/[email protected].4
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3

.github/workflows/detect_changed_files_reusable_workflow.yml

@@ -52,7 +52,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].1
+      uses: actions/[email protected].4
 
     - name: Detect changes
       uses: dorny/[email protected]

.github/workflows/gh_pages_analytics.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Setup CI
         uses: ./.github/actions/setup-android

.github/workflows/ios_beta_deployment.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Gradle Wrapper Validation
         uses: gradle/actions/wrapper-validation@v3
@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Setup CI
         id: setup

.github/workflows/ios_release_deployment.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
 
       - name: Gradle Wrapper Validation
         uses: gradle/actions/wrapper-validation@v3
@@ -36,7 +36,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].1
+      uses: actions/[email protected].4
 
     - name: Setup CI
       id: setup

.github/workflows/ios_unit_testing.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/[email protected].1
+      uses: actions/[email protected].4
 
     - name: Setup CI
       id: setup

.github/workflows/merge_main_into_develop.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/[email protected].1
+        uses: actions/[email protected].4
         with:
           fetch-depth: 0
           token: ${{ secrets.GH_PAT }}

androidHyperskillApp/src/main/java/org/hyperskill/app/android/HyperskillApp.kt

@@ -6,6 +6,7 @@ import android.os.Build
 import androidx.appcompat.app.AppCompatDelegate
 import coil.ImageLoader
 import coil.ImageLoaderFactory
+import org.hyperskill.app.analytic.injection.PlatformAnalyticComponent
 import org.hyperskill.app.android.core.extensions.NotificationChannelInitializer
 import org.hyperskill.app.android.core.injection.AndroidAppComponent
 import org.hyperskill.app.android.core.injection.AndroidAppComponentImpl
@@ -56,7 +57,7 @@ class HyperskillApp : Application(), ImageLoaderFactory {
 
         setNightMode(appGraph)
         initSentry(appGraph)
-        initAppsFlyer(appGraph)
+        initAnalyticEngines(appGraph.platformAnalyticComponent)
         initChannels()
     }
 
@@ -67,8 +68,9 @@ class HyperskillApp : Application(), ImageLoaderFactory {
         appGraph.sentryComponent.sentryInteractor.setup()
     }
 
-    private fun initAppsFlyer(appGraph: AndroidAppComponent) {
-        appGraph.platformAnalyticComponent.appsFlyerAnalyticEngine.startup()
+    private fun initAnalyticEngines(platformAnalyticComponent: PlatformAnalyticComponent) {
+        platformAnalyticComponent.appsFlyerAnalyticEngine.startup()
+        platformAnalyticComponent.amplitudeAnalyticEngine.startup(this)
     }
 
     private fun buildUserAgentInfo() =

androidHyperskillApp/src/main/java/org/hyperskill/app/android/core/view/ui/fragment/FragmentExtensions.kt

@@ -2,6 +2,7 @@ package org.hyperskill.app.android.core.view.ui.fragment
 
 import androidx.annotation.IdRes
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.commitNow
 
 @Suppress("UNCHECKED_CAST")
 fun <T> Fragment.parentOfType(klass: Class<T>): T? =
@@ -32,8 +33,8 @@ fun Fragment.setChildFragment(
     if (childFragmentManager.findFragmentByTag(tag) == null) {
         val fragment = buildFragment()
         childFragmentManager
-            .beginTransaction()
-            .add(containerViewId, fragment, tag)
-            .commitNow()
+            .commitNow {
+                add(containerViewId, fragment, tag)
+            }
     }
 }

androidHyperskillApp/src/main/java/org/hyperskill/app/android/debug/fragment/DebugFragment.kt

@@ -15,7 +15,7 @@ import org.hyperskill.app.android.core.view.ui.navigation.requireRouter
 import org.hyperskill.app.android.core.view.ui.widget.compose.HyperskillTheme
 import org.hyperskill.app.android.debug.ui.DebugScreen
 import org.hyperskill.app.android.stage_implementation.view.navigation.StageImplementationScreen
-import org.hyperskill.app.android.step.view.screen.StepScreen
+import org.hyperskill.app.android.step.view.navigation.StepScreen
 import org.hyperskill.app.core.view.handleActions
 import org.hyperskill.app.debug.presentation.DebugFeature
 import org.hyperskill.app.debug.presentation.DebugViewModel

androidHyperskillApp/src/main/java/org/hyperskill/app/android/home/view/ui/fragment/HomeFragment.kt

@@ -23,7 +23,7 @@ import org.hyperskill.app.android.databinding.FragmentHomeBinding
 import org.hyperskill.app.android.gamification_toolbar.view.ui.delegate.GamificationToolbarDelegate
 import org.hyperskill.app.android.main.view.ui.navigation.MainScreenRouter
 import org.hyperskill.app.android.problem_of_day.view.delegate.ProblemOfDayCardFormDelegate
-import org.hyperskill.app.android.step.view.screen.StepScreen
+import org.hyperskill.app.android.step.view.navigation.StepScreen
 import org.hyperskill.app.android.topics_repetitions.view.delegate.TopicsRepetitionCardFormDelegate
 import org.hyperskill.app.android.topics_repetitions.view.screen.TopicsRepetitionScreen
 import org.hyperskill.app.challenges.widget.view.model.ChallengeWidgetViewState

androidHyperskillApp/src/main/java/org/hyperskill/app/android/main/view/ui/activity/MainActivity.kt

@@ -45,7 +45,7 @@ import org.hyperskill.app.android.notification_onboarding.fragment.Notifications
 import org.hyperskill.app.android.notification_onboarding.navigation.NotificationsOnboardingScreen
 import org.hyperskill.app.android.paywall.fragment.PaywallFragment
 import org.hyperskill.app.android.paywall.navigation.PaywallScreen
-import org.hyperskill.app.android.step.view.screen.StepScreen
+import org.hyperskill.app.android.step.view.navigation.StepScreen
 import org.hyperskill.app.android.streak_recovery.view.delegate.StreakRecoveryViewActionDelegate
 import org.hyperskill.app.android.track_selection.list.navigation.TrackSelectionListScreen
 import org.hyperskill.app.android.users_questionnaire_onboarding.fragment.UsersQuestionnaireOnboardingFragment

androidHyperskillApp/src/main/java/org/hyperskill/app/android/notification/click_handling/delegate/NotificationClickHandlingDelegate.kt

@@ -5,7 +5,7 @@ import com.github.terrakok.cicerone.Router
 import org.hyperskill.app.android.main.view.ui.navigation.MainScreen
 import org.hyperskill.app.android.main.view.ui.navigation.Tabs
 import org.hyperskill.app.android.profile.view.dialog.BadgeEarnedDialogFragment
-import org.hyperskill.app.android.step.view.screen.StepScreen
+import org.hyperskill.app.android.step.view.navigation.StepScreen
 import org.hyperskill.app.android.topics_repetitions.view.screen.TopicsRepetitionScreen
 import org.hyperskill.app.notification.click_handling.presentation.NotificationClickHandlingFeature
 import ru.nobird.android.view.base.ui.extension.showIfNotExists

androidHyperskillApp/src/main/java/org/hyperskill/app/android/sentry/domain/model/manager/SentryManagerImpl.kt

@@ -56,9 +56,9 @@ class SentryManagerImpl(
 
     override fun captureMessage(message: String, level: HyperskillSentryLevel, data: Map<String, Any>) {
         Sentry.captureMessage(message, level.toSentryLevel()) { scope ->
-            scope.span.let {
+            scope.span?.let { span ->
                 data.forEach { (key, value) ->
-                    it?.setData(key, value)
+                    span.setData(key, value)
                 }
             }
         }