Merge pull request #715 from hyperskill/release/1.38

Release 1.38
hyperskill · Oct 24, 2023 · c61a6b0 · c61a6b0
2 parents a660620 + 3b0c87c
commit c61a6b0
Show file tree

Hide file tree

Showing 99 changed files with 2,770 additions and 264 deletions.
diff --git a/.github/workflows/android_beta_deployment.yml b/.github/workflows/android_beta_deployment.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1.1.0
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Setup CI
         id: setup
@@ -80,7 +80,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Setup CI
         id: setup

diff --git a/.github/workflows/android_release_deployment.yml b/.github/workflows/android_release_deployment.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1.1.0
@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.1.0
+      uses: actions/checkout@v4.1.1
 
     - name: Setup CI
       id: setup

diff --git a/.github/workflows/automerge_into_release.yml b/.github/workflows/automerge_into_release.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0
           token: ${{ secrets.GH_PAT }}
@@ -84,5 +84,7 @@ jobs:
               git push origin release/$next_version_number
           else
               echo "No existing release/$next_version_number branch found"
-              echo "Not yet implemented"
+              echo "Creating new release/$next_version_number branch"
+
+              ./setup_new_release_branch.sh $next_version_number
           fi
diff --git a/.github/workflows/build_caches.yml b/.github/workflows/build_caches.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.1.0
+      uses: actions/checkout@v4.1.1
 
     - name: Setup CI
       uses: ./.github/actions/setup-android
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Setup CI
         id: setup

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1.1.0
@@ -64,7 +64,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.1.0
+      uses: actions/checkout@v4.1.1
 
     - name: Setup CI
       uses: ./.github/actions/setup-android
@@ -84,7 +84,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1.150.0
@@ -120,7 +120,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.1.0
+      uses: actions/checkout@v4.1.1
 
     - name: Setup CI
       id: setup
@@ -144,7 +144,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.1.0
+      uses: actions/checkout@v4.1.1
 
     - name: Setup CI
       id: setup
@@ -167,7 +167,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Setup CI
         id: setup

diff --git a/.github/workflows/cleanup_pr_caches.yml b/.github/workflows/cleanup_pr_caches.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Cleanup
         run: |

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.1.0
+      uses: actions/checkout@v4.1.1
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

diff --git a/.github/workflows/detect_changed_files_reusable_workflow.yml b/.github/workflows/detect_changed_files_reusable_workflow.yml
@@ -52,7 +52,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.1.0
+      uses: actions/checkout@v4.1.1
 
     - name: Detect changes
       uses: dorny/paths-filter@v2.11.1

diff --git a/.github/workflows/gh_pages_analytics.yml b/.github/workflows/gh_pages_analytics.yml
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Setup CI
         uses: ./.github/actions/setup-android

diff --git a/.github/workflows/ios_beta_deployment.yml b/.github/workflows/ios_beta_deployment.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1.1.0
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Setup CI
         id: setup

diff --git a/.github/workflows/ios_release_deployment.yml b/.github/workflows/ios_release_deployment.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1.1.0
@@ -36,7 +36,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.1.0
+      uses: actions/checkout@v4.1.1
 
     - name: Setup CI
       id: setup

diff --git a/.github/workflows/ios_unit_testing.yml b/.github/workflows/ios_unit_testing.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.1.0
+      uses: actions/checkout@v4.1.1
 
     - name: Setup CI
       id: setup

diff --git a/.github/workflows/merge_main_into_develop.yml b/.github/workflows/merge_main_into_develop.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0
           token: ${{ secrets.GH_PAT }}

diff --git a/.gitignore b/.gitignore
@@ -29,8 +29,9 @@ local.properties
 *.dSYM
 
 iosHyperskillApp/.build/
-
 iosHyperskillApp/.idea/
+iosHyperskillApp/.bundle/
+iosHyperskillApp/vendor/
 
 ## moko-kswift
 iosHyperskillApp/iosHyperskillApp/Sources/Frameworks/sharedSwift/Hyperskill-Mobile_shared.swift

diff --git a/androidHyperskillApp/build.gradle.kts b/androidHyperskillApp/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
     implementation(libs.android.ui.appcompat)
     implementation(libs.android.ui.constraintlayout)
     implementation(libs.android.ui.swiperefreshlayout)
+    implementation(libs.android.ui.flexbox)
     implementation(libs.android.ui.core.ktx)
     implementation(libs.android.ui.fragment)
     implementation(libs.android.ui.fragment.ktx)

diff --git a/...perskill/app/android/gamification_toolbar/view/ui/delegate/GamificationToolbarDelegate.kt b/...perskill/app/android/gamification_toolbar/view/ui/delegate/GamificationToolbarDelegate.kt
@@ -51,13 +51,11 @@ class GamificationToolbarDelegate(
         if (state is GamificationToolbarFeature.State.Content) {
             with(viewBinding.gamificationStreakDurationTextView) {
                 isVisible = true
-                val streakDuration = state.streak?.currentStreak ?: 0
-                text = streakDuration.toString()
-                val historicalStreak = state.streak?.history?.firstOrNull()
+                text = state.currentStreak.toString()
                 setCompoundDrawablesWithIntrinsicBounds(
                     /* left = */ when {
-                        historicalStreak?.state == StreakState.RECOVERED -> R.drawable.ic_menu_recovered_streak
-                        historicalStreak?.isCompleted == true -> R.drawable.ic_menu_enabled_streak
+                        state.historicalStreak.state == StreakState.RECOVERED -> R.drawable.ic_menu_recovered_streak
+                        state.historicalStreak.isCompleted -> R.drawable.ic_menu_enabled_streak
                         else -> R.drawable.ic_menu_empty_streak
                     },
                     /* top = */ 0,
@@ -70,12 +68,12 @@ class GamificationToolbarDelegate(
                 text = state.hypercoinsBalance.toString()
             }
 
-            state.trackWithProgress.let { trackProgress ->
+            state.trackProgress.let { trackProgress ->
                 viewBinding.gamificationTrackProgressLinearLayout.isVisible = trackProgress != null
                 if (trackProgress != null) {
                     viewBinding.gamificationTrackProgressView.setProgress(
                         trackProgress.averageProgress,
-                        trackProgress.trackProgress.isCompleted
+                        trackProgress.isCompleted
                     )
                 }
             }

diff --git a/...rc/main/java/org/hyperskill/app/android/step_quiz/view/factory/StepQuizFragmentFactory.kt b/...rc/main/java/org/hyperskill/app/android/step_quiz/view/factory/StepQuizFragmentFactory.kt
@@ -3,6 +3,7 @@ package org.hyperskill.app.android.step_quiz.view.factory
 import androidx.fragment.app.Fragment
 import org.hyperskill.app.android.step_quiz_choice.view.fragment.ChoiceStepQuizFragment
 import org.hyperskill.app.android.step_quiz_code.view.fragment.CodeStepQuizFragment
+import org.hyperskill.app.android.step_quiz_fill_blanks.fragment.FillBlanksStepQuizFragment
 import org.hyperskill.app.android.step_quiz_matching.view.fragment.MatchingStepQuizFragment
 import org.hyperskill.app.android.step_quiz_parsons.view.fragment.ParsonsStepQuizFragment
 import org.hyperskill.app.android.step_quiz_sorting.view.fragment.SortingStepQuizFragment
@@ -42,6 +43,9 @@ object StepQuizFragmentFactory {
                 BlockName.PARSONS ->
                     ParsonsStepQuizFragment.newInstance(step, stepRoute)
 
+                BlockName.FILL_BLANKS ->
+                    FillBlanksStepQuizFragment.newInstance(step, stepRoute)
+
                 else ->
                     UnsupportedStepQuizFragment.newInstance()
             }

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
@@ -261,7 +261,7 @@ abstract class DefaultStepQuizFragment :
                 view?.snackbar(messageRes = org.hyperskill.app.R.string.connection_error)
             }
             is StepQuizFeature.Action.ViewAction.NavigateTo.Home -> {
-                requireRouter().backTo(MainScreen())
+                requireRouter().backTo(MainScreen(Tabs.TRAINING))
                 mainScreenRouter.switch(Tabs.TRAINING)
             }
             is StepQuizFeature.Action.ViewAction.NavigateTo.StepScreen -> {