Merge branch 'develop' into feature/ALTAPPS-882/iOS_profile_badges

hyperskill · Aug 3, 2023 · 97d321e · 97d321e
2 parents 752a4ea + e14429e
commit 97d321e
Show file tree

Hide file tree

Showing 33 changed files with 76 additions and 150 deletions.
diff --git a/.github/workflows/android_beta_deployment.yml b/.github/workflows/android_beta_deployment.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v1.0.6
+        uses: gradle/wrapper-validation-action@v1.1.0
 
   # Build and submit to the Firebase App Distribution
   firebase-deployment:

diff --git a/.github/workflows/android_release_deployment.yml b/.github/workflows/android_release_deployment.yml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v1.0.6
+        uses: gradle/wrapper-validation-action@v1.1.0
 
   # Build and submit to the Google Play
   deployment:

diff --git a/.github/workflows/gradle_wrapper_validation.yml b/.github/workflows/gradle_wrapper_validation.yml
@@ -19,4 +19,4 @@ jobs:
         uses: actions/[email protected]
 
       - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v1.0.6
+        uses: gradle/wrapper-validation-action@v1.1.0
diff --git a/.github/workflows/ios_beta_deployment.yml b/.github/workflows/ios_beta_deployment.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v1.0.6
+        uses: gradle/wrapper-validation-action@v1.1.0
 
   # Build, archive for ad-hoc and submit to Firebase App Distribution
   deployment:

diff --git a/.github/workflows/ios_release_deployment.yml b/.github/workflows/ios_release_deployment.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v1.0.6
+        uses: gradle/wrapper-validation-action@v1.1.0
 
   # Build, archive for app-store and submit to App Store Connect
   deployment:

diff --git a/androidHyperskillApp/Gemfile b/androidHyperskillApp/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 ruby "3.1.0"
 
-gem "fastlane", "2.213.0"
+gem "fastlane", "2.214.0"
 
 eval_gemfile("fastlane/Pluginfile")
diff --git a/androidHyperskillApp/Gemfile.lock b/androidHyperskillApp/Gemfile.lock
@@ -8,20 +8,20 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.780.0)
-    aws-sdk-core (3.175.0)
+    aws-partitions (1.793.0)
+    aws-sdk-core (3.180.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.67.0)
-      aws-sdk-core (~> 3, >= 3.174.0)
+    aws-sdk-kms (1.71.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.126.0)
-      aws-sdk-core (~> 3, >= 3.174.0)
+    aws-sdk-s3 (1.132.0)
+      aws-sdk-core (~> 3, >= 3.179.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.6)
+    aws-sigv4 (1.6.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -30,7 +30,7 @@ GEM
     commander (4.6.0)
       highline (~> 2.0.0)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -66,7 +66,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.7)
-    fastlane (2.213.0)
+    fastlane (2.214.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -107,9 +107,9 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-firebase_app_distribution (0.6.1)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.44.0)
+    google-apis-androidpublisher_v3 (0.46.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.0)
+    google-apis-core (0.11.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -138,7 +138,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.5.2)
+    googleauth (1.7.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -162,14 +162,14 @@ GEM
     optparse (0.1.1)
     os (1.1.4)
     plist (3.7.0)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     rake (13.0.6)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -215,7 +215,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  fastlane (= 2.213.0)
+  fastlane (= 2.214.0)
   fastlane-plugin-firebase_app_distribution
 
 RUBY VERSION

diff --git a/androidHyperskillApp/fastlane/Fastfile b/androidHyperskillApp/fastlane/Fastfile
@@ -1,4 +1,4 @@
-fastlane_version "2.212.1"
+fastlane_version "2.214.0"
 
 default_platform(:android)
 

diff --git a/...perskill/app/android/next_learning_activity/view/delegate/NextLearningActivityDelegate.kt b/...perskill/app/android/next_learning_activity/view/delegate/NextLearningActivityDelegate.kt
@@ -83,7 +83,6 @@ class NextLearningActivityDelegate(
             progress = content.progress,
             formattedProgress = content.formattedProgress,
             endIcon = nextLearningActivityEndIcon,
-            isClickable = true,
             isIdeRequired = content.isIdeRequired
         )
 

diff --git a/...in/java/org/hyperskill/app/android/study_plan/adapter/StudyPlanActivityAdapterDelegate.kt b/...in/java/org/hyperskill/app/android/study_plan/adapter/StudyPlanActivityAdapterDelegate.kt
@@ -69,8 +69,6 @@ class StudyPlanActivityAdapterDelegate(
             binding.activityIdeRequiredTextView.isVisible = data.isIdeRequired
 
             binding.activityEndIcon.setImageDrawable(data.endIcon)
-
-            itemView.isClickable = data.isClickable
         }
     }
 }
diff --git a/...p/src/main/java/org/hyperskill/app/android/study_plan/delegate/StudyPlanWidgetDelegate.kt b/...p/src/main/java/org/hyperskill/app/android/study_plan/delegate/StudyPlanWidgetDelegate.kt
@@ -64,8 +64,6 @@ class StudyPlanWidgetDelegate(
     private val activityTopMargin =
         context.resources.getDimensionPixelOffset(R.dimen.study_plan_activity_top_margin)
 
-    private val lockIcon =
-        ContextCompat.getDrawable(context, StudyPlanRecyclerItem.Activity.lockedActivityIconRes)
     private val activeIcon =
         ContextCompat.getDrawable(context, StudyPlanRecyclerItem.Activity.nextActivityIconRes)
     private val skippedIcon =
@@ -220,11 +218,9 @@ class StudyPlanWidgetDelegate(
                 endIcon = when (item.state) {
                     StudyPlanWidgetViewState.SectionItemState.IDLE -> null
                     StudyPlanWidgetViewState.SectionItemState.NEXT -> activeIcon
-                    StudyPlanWidgetViewState.SectionItemState.LOCKED -> lockIcon
                     StudyPlanWidgetViewState.SectionItemState.SKIPPED -> skippedIcon
                     StudyPlanWidgetViewState.SectionItemState.COMPLETED -> completedIcon
                 },
-                isClickable = item.isClickable,
                 isIdeRequired = item.isIdeRequired
             )
         }

diff --git a/...illApp/src/main/java/org/hyperskill/app/android/study_plan/model/StudyPlanRecyclerItem.kt b/...illApp/src/main/java/org/hyperskill/app/android/study_plan/model/StudyPlanRecyclerItem.kt
@@ -40,15 +40,13 @@ interface StudyPlanRecyclerItem {
         val progress: Int,
         val formattedProgress: String?,
         val endIcon: Drawable?,
-        val isClickable: Boolean,
         val isIdeRequired: Boolean
     ) : StudyPlanRecyclerItem, Identifiable<Long> {
         companion object {
             val activeTextColorRes: Int = org.hyperskill.app.R.color.color_on_surface_alpha_87
             val inactiveTextColorRes: Int = org.hyperskill.app.R.color.color_on_surface_alpha_60
 
             const val nextActivityIconRes: Int = R.drawable.ic_home_screen_arrow_button
-            const val lockedActivityIconRes: Int = R.drawable.ic_activity_locked
             const val skippedActivityIconRes: Int = R.drawable.ic_topic_skipped
             const val completedActivityIconRes: Int = R.drawable.ic_topic_completed
         }

diff --git a/androidHyperskillApp/src/main/res/drawable/ic_activity_locked.xml b/androidHyperskillApp/src/main/res/drawable/ic_activity_locked.xml
diff --git a/gradle/app.versions.toml b/gradle/app.versions.toml
@@ -2,5 +2,5 @@
 minSdk = '24'
 targetSdk = '33'
 compileSdk = '33'
-versionName = '1.26'
-versionCode = '156'
+versionName = '1.27'
+versionCode = '163'
diff --git a/iosHyperskillApp/Gemfile b/iosHyperskillApp/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 ruby "3.1.0"
 
-gem "fastlane", "2.213.0"
+gem "fastlane", "2.214.0"
 gem "cocoapods", "1.12.1"
 gem "generamba", git: "https://github.com/ivan-magda/Generamba.git", branch: "develop"
 

diff --git a/iosHyperskillApp/Gemfile.lock b/iosHyperskillApp/Gemfile.lock
@@ -16,7 +16,7 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    activesupport (7.0.5)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -29,20 +29,20 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.780.0)
-    aws-sdk-core (3.175.0)
+    aws-partitions (1.793.0)
+    aws-sdk-core (3.180.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.67.0)
-      aws-sdk-core (~> 3, >= 3.174.0)
+    aws-sdk-kms (1.71.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.126.0)
-      aws-sdk-core (~> 3, >= 3.174.0)
+    aws-sdk-s3 (1.132.0)
+      aws-sdk-core (~> 3, >= 3.179.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.6)
+    aws-sigv4 (1.6.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -89,7 +89,7 @@ GEM
       highline (~> 2.0.0)
     concurrent-ruby (1.2.2)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -128,7 +128,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.7)
-    fastlane (2.213.0)
+    fastlane (2.214.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -177,9 +177,9 @@ GEM
     git (1.13.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.44.0)
+    google-apis-androidpublisher_v3 (0.46.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.0)
+    google-apis-core (0.11.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -208,7 +208,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.5.2)
+    googleauth (1.7.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -228,7 +228,7 @@ GEM
     memoist (0.16.2)
     mini_magick (4.12.0)
     mini_mime (1.1.2)
-    minitest (5.18.1)
+    minitest (5.19.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.3.0)
@@ -247,7 +247,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
@@ -299,7 +299,7 @@ PLATFORMS
 
 DEPENDENCIES
   cocoapods (= 1.12.1)
-  fastlane (= 2.213.0)
+  fastlane (= 2.214.0)
   fastlane-plugin-firebase_app_distribution
   fastlane-plugin-sentry
   generamba!

diff --git a/iosHyperskillApp/fastlane/Fastfile b/iosHyperskillApp/fastlane/Fastfile
@@ -1,4 +1,4 @@
-fastlane_version "2.212.2"
+fastlane_version "2.214.0"
 
 default_platform(:ios)
 

diff --git a/iosHyperskillApp/iosHyperskillApp.xcodeproj/project.pbxproj b/iosHyperskillApp/iosHyperskillApp.xcodeproj/project.pbxproj
@@ -3963,7 +3963,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 159;
+				CURRENT_PROJECT_VERSION = 164;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 3DWS674B2M;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -3984,7 +3984,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 159;
+				CURRENT_PROJECT_VERSION = 164;
 				DEVELOPMENT_TEAM = 3DWS674B2M;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.4;

diff --git a/iosHyperskillApp/iosHyperskillApp/Info.plist b/iosHyperskillApp/iosHyperskillApp/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.26</string>
+	<string>1.27</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>159</string>
+	<string>164</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationSceneManifest</key>

diff --git a/...osHyperskillApp/Sources/Modules/NextLearningActivity/Views/NextLearningActivityView.swift b/...osHyperskillApp/Sources/Modules/NextLearningActivity/Views/NextLearningActivityView.swift
@@ -37,7 +37,6 @@ struct NextLearningActivityView: View {
                 StudyPlanSectionItemView(
                     title: content.title,
                     subtitle: content.subtitle,
-                    isClickable: true,
                     progress: content.progress,
                     formattedProgress: content.formattedProgress,
                     isIdeRequired: content.isIdeRequired,