Merge pull request #928 from hyperskill/release/1.51

Release 1.51
hyperskill · Mar 18, 2024 · 1c5e41b · 1c5e41b
2 parents d2f75af + 53d01b1
commit 1c5e41b
Show file tree

Hide file tree

Showing 148 changed files with 2,182 additions and 1,039 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -17,6 +17,7 @@ sentry.properties filter=git-crypt diff=git-crypt
 iosHyperskillApp/iosHyperskillApp/GoogleService-Info.plist filter=git-crypt diff=git-crypt
 iosHyperskillApp/iosHyperskillApp/Sentry-Info.plist filter=git-crypt diff=git-crypt
 iosHyperskillApp/iosHyperskillApp/AppsFlyer-Info.plist filter=git-crypt diff=git-crypt
+iosHyperskillApp/iosHyperskillApp/RevenueCat-Info.plist filter=git-crypt diff=git-crypt
 iosHyperskillApp/fastlane/Appfile filter=git-crypt diff=git-crypt
 iosHyperskillApp/fastlane/Devicefile filter=git-crypt diff=git-crypt
 iosHyperskillApp/fastlane/certs/** filter=git-crypt diff=git-crypt

diff --git a/.github/workflows/detect_changed_files_reusable_workflow.yml b/.github/workflows/detect_changed_files_reusable_workflow.yml
@@ -55,7 +55,7 @@ jobs:
       uses: actions/checkout@v4.1.1
 
     - name: Detect changes
-      uses: dorny/paths-filter@v3.0.1
+      uses: dorny/paths-filter@v3.0.2
       id: changes
       with:
         base: ${{ inputs.base }}

diff --git a/androidHyperskillApp/build.gradle.kts b/androidHyperskillApp/build.gradle.kts
@@ -43,7 +43,7 @@ dependencies {
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.messaging)
 
-    implementation(libs.google.play.review)
+    implementation(libs.googlePlay.review)
 
     implementation(libs.viewbinding)
     implementation(libs.kit.ui.adapters)

diff --git a/androidHyperskillApp/src/main/java/org/hyperskill/app/android/HyperskillApp.kt b/androidHyperskillApp/src/main/java/org/hyperskill/app/android/HyperskillApp.kt
@@ -56,6 +56,7 @@ class HyperskillApp : Application(), ImageLoaderFactory {
 
         setNightMode(appGraph)
         initSentry(appGraph)
+        initAppsFlyer(appGraph)
         initChannels()
     }
 
@@ -66,6 +67,10 @@ class HyperskillApp : Application(), ImageLoaderFactory {
         appGraph.sentryComponent.sentryInteractor.setup()
     }
 
+    private fun initAppsFlyer(appGraph: AndroidAppComponent) {
+        appGraph.platformAnalyticComponent.appsFlyerAnalyticEngine.startup()
+    }
+
     private fun buildUserAgentInfo() =
         UserAgentInfo(
             BuildConfig.VERSION_NAME,

diff --git a/...n/java/org/hyperskill/app/android/code/presentation/model/ProgrammingLanguageExtension.kt b/...n/java/org/hyperskill/app/android/code/presentation/model/ProgrammingLanguageExtension.kt
@@ -34,7 +34,7 @@ fun ProgrammingLanguage?.getSymbols(context: Context): Array<String> =
         SCALA, SCALA3,
         KOTLIN,
         GO,
-        PASCAL,
+        PASCAL_ABC,
         PERL,
         SWIFT,
         JULIA,

diff --git a/...illApp/src/main/java/org/hyperskill/app/android/core/injection/AndroidAppComponentImpl.kt b/...illApp/src/main/java/org/hyperskill/app/android/core/injection/AndroidAppComponentImpl.kt
@@ -1,9 +1,6 @@
 package org.hyperskill.app.android.core.injection
 
 import android.app.Application
-import org.hyperskill.app.analytic.domain.model.AnalyticEngine
-import org.hyperskill.app.analytic.injection.AnalyticComponent
-import org.hyperskill.app.analytic.injection.AnalyticComponentImpl
 import org.hyperskill.app.android.code.injection.PlatformCodeEditorComponent
 import org.hyperskill.app.android.code.injection.PlatformCodeEditorComponentImpl
 import org.hyperskill.app.android.image_loading.injection.ImageLoadingComponent
@@ -30,8 +27,7 @@ import org.hyperskill.app.sentry.injection.SentryComponentImpl
 class AndroidAppComponentImpl(
     override val application: Application,
     userAgentInfo: UserAgentInfo,
-    buildVariant: BuildVariant,
-    analyticEngines: List<AnalyticEngine> = emptyList()
+    buildVariant: BuildVariant
 ) : AndroidAppComponent, CommonAndroidAppGraphImpl() {
 
     override val commonComponent: CommonComponent by lazy {
@@ -50,28 +46,22 @@ class AndroidAppComponentImpl(
         SentryComponentImpl(SentryManagerImpl(commonComponent.buildKonfig))
     }
 
-    override val analyticComponent: AnalyticComponent by lazy {
-        AnalyticComponentImpl(
-            appGraph = this,
-            platformAnalyticEngines = analyticEngines
-        )
-    }
-
     override val platformLocalNotificationComponent: PlatformLocalNotificationComponent by lazy {
         PlatformLocalNotificationComponentImpl(this.application, this)
     }
 
-    override fun buildPlatformPushNotificationsComponent(): AndroidPlatformPushNotificationComponent =
-        AndroidPlatformPushNotificationsComponentImpl(this)
-
     /**
      * Main component
      */
-    override val platformMainComponent: PlatformMainComponent =
+    override val platformMainComponent: PlatformMainComponent by lazy {
         PlatformMainComponentImpl(
             mainComponent = mainComponent,
             analyticComponent = analyticComponent
         )
+    }
+
+    override fun buildPlatformPushNotificationsComponent(): AndroidPlatformPushNotificationComponent =
+        AndroidPlatformPushNotificationsComponentImpl(this)
 
     /**
      * Latex component

diff --git a/...yperskillApp/src/main/java/org/hyperskill/app/android/paywall/fragment/PaywallFragment.kt b/...yperskillApp/src/main/java/org/hyperskill/app/android/paywall/fragment/PaywallFragment.kt
@@ -77,8 +77,8 @@ class PaywallFragment : Fragment() {
             ViewAction.CompletePaywall -> {
                 requireAppRouter().sendResult(PAYWALL_COMPLETED, Any())
             }
-            ViewAction.StudyPlan -> {
-                requireRouter().backTo(MainScreen(initialTab = Tabs.STUDY_PLAN))
+            ViewAction.NavigateTo.Back -> {
+                requireRouter().exit()
             }
             is ViewAction.ShowMessage -> {
                 Toast.makeText(

diff --git a/...c/main/java/org/hyperskill/app/android/step_quiz/view/fragment/DefaultStepQuizFragment.kt b/...c/main/java/org/hyperskill/app/android/step_quiz/view/fragment/DefaultStepQuizFragment.kt
@@ -23,6 +23,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.hyperskill.app.android.HyperskillApp
 import org.hyperskill.app.android.R
 import org.hyperskill.app.android.core.extensions.argument
+import org.hyperskill.app.android.core.view.ui.dialog.dismissDialogFragmentIfExists
 import org.hyperskill.app.android.core.view.ui.fragment.parentOfType
 import org.hyperskill.app.android.core.view.ui.navigation.requireRouter
 import org.hyperskill.app.android.databinding.FragmentStepQuizBinding
@@ -290,6 +291,9 @@ abstract class DefaultStepQuizFragment :
                     .newInstance(action.modalData)
                     .showIfNotExists(childFragmentManager, ProblemsLimitReachedBottomSheet.TAG)
             }
+            StepQuizFeature.Action.ViewAction.HideProblemsLimitReachedModal -> {
+                childFragmentManager.dismissDialogFragmentIfExists(ProblemsLimitReachedBottomSheet.TAG)
+            }
             is StepQuizFeature.Action.ViewAction.ShowProblemOnboardingModal -> {
                 ProblemOnboardingBottomSheetDialogFragment.newInstance(action.modalType)
                     .showIfNotExists(

diff --git a/gradle/app.versions.toml b/gradle/app.versions.toml
@@ -2,5 +2,5 @@
 minSdk = '24'
 targetSdk = '33'
 compileSdk = '33'
-versionName = '1.50.2'
-versionCode = '345'
+versionName = '1.51'
+versionCode = '352'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,7 +19,8 @@ kermit = '2.0.0-RC4'
 androidxBrowser = "1.5.0"
 revenueCat = "7.4.0"
 googlePlayReview = "2.0.1"
-
+appsFlyer = "6.13.0"
+googlePlayInstallReferrer = "2.2"
 
 kotlinCompilerExtension = "1.4.8"
 composeBom = "2023.06.01"
@@ -85,7 +86,8 @@ plugin-googleServises = { module = "com.google.gms:google-services", version = "
 gms-play-services = { module = "com.google.android.gms:play-services-base", version = "18.1.0" }
 gms-play-login = { module = "com.google.android.gms:play-services-auth", version = "20.4.0" }
 
-google-play-review = { module = "com.google.android.play:review-ktx", version.ref = "googlePlayReview"}
+googlePlay-review = { module = "com.google.android.play:review-ktx", version.ref = "googlePlayReview"}
+googlePlay-installreferrer = { module = "com.android.installreferrer:installreferrer", version.ref = "googlePlayInstallReferrer" }
 
 revenuecat = { module = "com.revenuecat.purchases:purchases", version.ref = "revenueCat" }
 
@@ -124,6 +126,8 @@ android-lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie"
 
 android-desugar-jdk = { module = "com.android.tools:desugar_jdk_libs", version = "1.1.5" }
 
+android-appsFlyer = { module = "com.appsflyer:af-android-sdk", version.ref = "appsFlyer" }
+
 compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
 compose-foundation = { module = "androidx.compose.foundation:foundation" }
 compose-ui = { module = "androidx.compose.ui:ui" }

diff --git a/iosHyperskillApp/NotificationServiceExtension/Info.plist b/iosHyperskillApp/NotificationServiceExtension/Info.plist
@@ -9,9 +9,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleVersion</key>
-	<string>351</string>
+	<string>361</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.50.2</string>
+	<string>1.51</string>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleExecutable</key>

diff --git a/iosHyperskillApp/Podfile b/iosHyperskillApp/Podfile
@@ -12,6 +12,8 @@ target "iosHyperskillApp" do
   pod "SwiftLint", "0.54.0"
   pod "Sentry", "8.17.2"
 
+  pod "RevenueCat", "4.38.1"
+
   # Firebase
   pod "Firebase/CoreOnly", "10.17.0"
   pod "Firebase/Messaging", "10.17.0"

diff --git a/iosHyperskillApp/Podfile.lock b/iosHyperskillApp/Podfile.lock
@@ -83,6 +83,7 @@ PODS:
     - Nuke (~> 10.5)
   - PanModal (1.2.7)
   - PromisesObjC (2.3.1)
+  - RevenueCat (4.38.1)
   - Sentry (8.17.2):
     - Sentry/Core (= 8.17.2)
     - SentryPrivate (= 8.17.2)
@@ -111,6 +112,7 @@ DEPENDENCIES:
   - lottie-ios (= 4.3.3)
   - NukeUI (from `https://github.com/kean/NukeUI.git`, tag `0.8.3`)
   - PanModal (from `https://github.com/ivan-magda/PanModal.git`, branch `remove-presenting-appearance-transitions`)
+  - RevenueCat (= 4.38.1)
   - Sentry (= 8.17.2)
   - shared (from `../shared`)
   - SkeletonUI (= 1.0.11)
@@ -143,6 +145,7 @@ SPEC REPOS:
     - nanopb
     - Nuke
     - PromisesObjC
+    - RevenueCat
     - Sentry
     - SentryPrivate
     - SkeletonUI
@@ -213,6 +216,7 @@ SPEC CHECKSUMS:
   NukeUI: 3c7ec7b299dd99707afdc783b436f39768b4493b
   PanModal: 3e16ead1a907fb06f4df3f13492fd00149fa4974
   PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
+  RevenueCat: f1b4bce353e676260eddc65a34c9fdf595adf2f4
   Sentry: 64a9f9c3637af913adcf53deced05bbe452d1410
   SentryPrivate: 024c6fed507ac39ae98e6d087034160f942920d5
   shared: 210f065b47c10083f8ccc49e665dec6d32c5b2d3
@@ -223,6 +227,6 @@ SPEC CHECKSUMS:
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
 
-PODFILE CHECKSUM: 1ed5181374da1a28796a674e5e12e4fbb0aad2fa
+PODFILE CHECKSUM: 4a7f7e2c618260919026c572d5dbe1ec7f32ae37
 
 COCOAPODS: 1.15.2
-Original file line number
+Diff line change
@@ Expand Up @@
             SCALA, SCALA3,
             KOTLIN,
             GO,
-            PASCAL,
+            PASCAL_ABC,
             PERL,
             SWIFT,
             JULIA,
@@ Expand Down @@