Merge branch 'develop' into feature/ALTAPPS-1036/Android-challenges-w…

…idget
hyperskill · Nov 20, 2023 · 62e4210 · 62e4210
2 parents cff336e + 8cdeea1
commit 62e4210
Show file tree

Hide file tree

Showing 79 changed files with 1,762 additions and 142 deletions.
diff --git a/androidHyperskillApp/Gemfile b/androidHyperskillApp/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 ruby "3.1.0"
 
-gem "fastlane", "2.216.0"
+gem "fastlane", "2.217.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.826.0)
-    aws-sdk-core (3.183.0)
+    aws-partitions (1.853.0)
+    aws-sdk-core (3.187.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.71.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.72.0)
+      aws-sdk-core (~> 3, >= 3.184.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.135.0)
+    aws-sdk-s3 (1.137.0)
       aws-sdk-core (~> 3, >= 3.181.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+    aws-sigv4 (1.6.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -32,11 +32,10 @@ GEM
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20231109)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.103.0)
+    excon (0.104.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -66,7 +65,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.7)
-    fastlane (2.216.0)
+    fastlane (2.217.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -106,12 +105,12 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-firebase_app_distribution (0.7.3)
+    fastlane-plugin-firebase_app_distribution (0.7.4)
       google-apis-firebaseappdistribution_v1 (~> 0.3.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.49.0)
+    google-apis-androidpublisher_v3 (0.52.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.1)
+    google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -126,19 +125,19 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-storage_v1 (0.29.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-storage (1.45.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.29.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
@@ -164,8 +163,8 @@ GEM
     optparse (0.1.1)
     os (1.1.4)
     plist (3.7.0)
-    public_suffix (5.0.3)
-    rake (13.0.6)
+    public_suffix (5.0.4)
+    rake (13.1.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -193,13 +192,10 @@ GEM
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
     word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.23.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -217,7 +213,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  fastlane (= 2.216.0)
+  fastlane (= 2.217.0)
   fastlane-plugin-firebase_app_distribution
 
 RUBY VERSION

diff --git a/...erskillApp/src/main/java/org/hyperskill/app/android/home/view/ui/fragment/HomeFragment.kt b/...erskillApp/src/main/java/org/hyperskill/app/android/home/view/ui/fragment/HomeFragment.kt
@@ -20,7 +20,7 @@ import org.hyperskill.app.android.problem_of_day.view.delegate.ProblemOfDayCardF
 import org.hyperskill.app.android.step.view.screen.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.core.view.mapper.SharedDateFormatter
+import org.hyperskill.app.core.view.mapper.date.SharedDateFormatter
 import org.hyperskill.app.home.presentation.HomeFeature
 import org.hyperskill.app.home.presentation.HomeViewModel
 import org.hyperskill.app.step.domain.model.StepRoute
@@ -30,7 +30,7 @@ import ru.nobird.app.presentation.redux.container.ReduxView
 
 class HomeFragment :
     Fragment(R.layout.fragment_home),
-    ReduxView<HomeFeature.State, HomeFeature.Action.ViewAction> {
+    ReduxView<HomeFeature.ViewState, HomeFeature.Action.ViewAction> {
     companion object {
         fun newInstance(): Fragment =
             HomeFragment()
@@ -166,10 +166,13 @@ class HomeFragment :
                     StepScreen(action.stepRoute)
                 )
             }
+            is HomeFeature.Action.ViewAction.ChallengeWidgetViewAction -> {
+                // TODO: ALTAPPS-1036 handle challenge widget view actions
+            }
         }
     }
 
-    override fun render(state: HomeFeature.State) {
+    override fun render(state: HomeFeature.ViewState) {
         homeViewStateDelegate.switchState(state.homeState)
 
         renderSwipeRefresh(state)
@@ -183,7 +186,7 @@ class HomeFragment :
         gamificationToolbarDelegate?.render(state.toolbarState)
     }
 
-    private fun renderSwipeRefresh(state: HomeFeature.State) {
+    private fun renderSwipeRefresh(state: HomeFeature.ViewState) {
         with(viewBinding.homeScreenSwipeRefreshLayout) {
             isEnabled = state.homeState is HomeFeature.HomeState.Content
             updateIsRefreshing(state.isRefreshing)

diff --git a/...a/org/hyperskill/app/android/problem_of_day/view/delegate/ProblemOfDayCardFormDelegate.kt b/...a/org/hyperskill/app/android/problem_of_day/view/delegate/ProblemOfDayCardFormDelegate.kt
@@ -4,7 +4,7 @@ import android.view.View
 import androidx.core.view.isVisible
 import org.hyperskill.app.android.R
 import org.hyperskill.app.android.databinding.LayoutProblemOfTheDayCardBinding
-import org.hyperskill.app.core.view.mapper.SharedDateFormatter
+import org.hyperskill.app.core.view.mapper.date.SharedDateFormatter
 import org.hyperskill.app.home.presentation.HomeFeature
 
 class ProblemOfDayCardFormDelegate(

diff --git a/.../src/main/java/org/hyperskill/app/android/step_theory/view/fragment/StepTheoryFragment.kt b/.../src/main/java/org/hyperskill/app/android/step_theory/view/fragment/StepTheoryFragment.kt
@@ -27,7 +27,7 @@ import org.hyperskill.app.android.step.view.model.StepCompletionView
 import org.hyperskill.app.android.step_content_text.view.fragment.TextStepContentFragment
 import org.hyperskill.app.android.step_theory.view.model.StepTheoryRating
 import org.hyperskill.app.core.view.mapper.ResourceProvider
-import org.hyperskill.app.core.view.mapper.SharedDateFormatter
+import org.hyperskill.app.core.view.mapper.date.SharedDateFormatter
 import org.hyperskill.app.step.domain.model.CommentStatisticsEntry
 import org.hyperskill.app.step.domain.model.Step
 import org.hyperskill.app.step.domain.model.StepRoute

diff --git a/iosHyperskillApp/Gemfile b/iosHyperskillApp/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 ruby "3.1.0"
 
-gem "fastlane", "2.216.0"
+gem "fastlane", "2.217.0"
 gem "cocoapods", "1.14.2"
 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.1.1)
+    activesupport (7.1.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -34,23 +34,23 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.843.0)
-    aws-sdk-core (3.185.1)
+    aws-partitions (1.853.0)
+    aws-sdk-core (3.187.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.72.0)
       aws-sdk-core (~> 3, >= 3.184.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.136.0)
+    aws-sdk-s3 (1.137.0)
       aws-sdk-core (~> 3, >= 3.181.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
     aws-sigv4 (1.6.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    base64 (0.1.1)
+    base64 (0.2.0)
     bigdecimal (3.1.4)
     claide (1.1.0)
     cocoapods (1.14.2)
@@ -99,10 +99,9 @@ GEM
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20231109)
     dotenv (2.8.1)
-    drb (2.1.1)
+    drb (2.2.0)
       ruby2_keywords
     emoji_regex (3.2.3)
     escape (0.0.4)
@@ -138,7 +137,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.7)
-    fastlane (2.216.0)
+    fastlane (2.217.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -189,7 +188,7 @@ GEM
     git (1.13.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.51.0)
+    google-apis-androidpublisher_v3 (0.52.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
@@ -206,19 +205,19 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-storage_v1 (0.29.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-storage (1.45.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.29.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
@@ -244,7 +243,7 @@ GEM
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.3.0)
-    mutex_m (0.1.2)
+    mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
@@ -283,14 +282,11 @@ GEM
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
     word_wrap (1.0.0)
@@ -314,7 +310,7 @@ PLATFORMS
 
 DEPENDENCIES
   cocoapods (= 1.14.2)
-  fastlane (= 2.216.0)
+  fastlane (= 2.217.0)
   fastlane-plugin-firebase_app_distribution
   fastlane-plugin-sentry
   generamba!

diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Home/HomeViewModel.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Home/HomeViewModel.swift
@@ -1,7 +1,7 @@
 import shared
 import UIKit
 
-final class HomeViewModel: FeatureViewModel<HomeFeatureState, HomeFeatureMessage, HomeFeatureActionViewAction> {
+final class HomeViewModel: FeatureViewModel<HomeFeature.ViewState, HomeFeatureMessage, HomeFeatureActionViewAction> {
     private var applicationWasInBackground = false
     private var shouldReloadContent = false
 
@@ -25,7 +25,10 @@ final class HomeViewModel: FeatureViewModel<HomeFeatureState, HomeFeatureMessage
         )
     }
 
-    override func shouldNotifyStateDidChange(oldState: HomeFeatureState, newState: HomeFeatureState) -> Bool {
+    override func shouldNotifyStateDidChange(
+        oldState: HomeFeature.ViewState,
+        newState: HomeFeature.ViewState
+    ) -> Bool {
         !oldState.isEqual(newState)
     }
 

diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Home/Views/HomeView.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Modules/Home/Views/HomeView.swift
@@ -121,12 +121,13 @@ struct HomeView: View {
                 let assembly = ProgressScreenAssembly()
                 stackRouter.pushViewController(assembly.makeModule())
             }
+        case .challengeWidgetViewAction:
+            #warning("TODO: Handle challenge widget view action")
         }
     }
 }
 
+@available(iOS 17, *)
 #Preview {
-    UIKitViewControllerPreview {
-        HomeAssembly().makeModule()
-    }
+    HomeAssembly().makeModule()
 }
diff --git a/shared/src/androidMain/kotlin/org/hyperskill/app/core/injection/CommonComponentImpl.kt b/shared/src/androidMain/kotlin/org/hyperskill/app/core/injection/CommonComponentImpl.kt
@@ -16,7 +16,7 @@ import org.hyperskill.app.core.remote.UserAgentInfo
 import org.hyperskill.app.core.view.mapper.NumbersFormatter
 import org.hyperskill.app.core.view.mapper.ResourceProvider
 import org.hyperskill.app.core.view.mapper.ResourceProviderImpl
-import org.hyperskill.app.core.view.mapper.SharedDateFormatter
+import org.hyperskill.app.core.view.mapper.date.SharedDateFormatter
 import org.hyperskill.app.network.injection.NetworkModule
 
 class CommonComponentImpl(

diff --git a/shared/src/androidMain/kotlin/org/hyperskill/app/home/presentation/HomeViewModel.kt b/shared/src/androidMain/kotlin/org/hyperskill/app/home/presentation/HomeViewModel.kt
@@ -4,5 +4,5 @@ import ru.nobird.android.view.redux.viewmodel.ReduxViewModel
 import ru.nobird.app.presentation.redux.container.ReduxViewContainer
 
 class HomeViewModel(
-    reduxViewContainer: ReduxViewContainer<HomeFeature.State, HomeFeature.Message, HomeFeature.Action.ViewAction>
-) : ReduxViewModel<HomeFeature.State, HomeFeature.Message, HomeFeature.Action.ViewAction>(reduxViewContainer)
+    reduxViewContainer: ReduxViewContainer<HomeFeature.ViewState, HomeFeature.Message, HomeFeature.Action.ViewAction>
+) : ReduxViewModel<HomeFeature.ViewState, HomeFeature.Message, HomeFeature.Action.ViewAction>(reduxViewContainer)
diff --git a/...Main/kotlin/org/hyperskill/app/analytic/domain/model/hyperskill/HyperskillAnalyticPart.kt b/...Main/kotlin/org/hyperskill/app/analytic/domain/model/hyperskill/HyperskillAnalyticPart.kt
@@ -14,6 +14,7 @@ enum class HyperskillAnalyticPart(val partName: String) {
     NOTIFICATIONS_SYSTEM_NOTICE("notifications_system_notice"),
     PROBLEM_OF_THE_DAY_CARD("problem_of_the_day_card"),
     TOPICS_REPETITIONS_CARD("topics_repetitions_card"),
+    CHALLENGE_CARD("challenge_card"),
     REPEAT_NEXT_TOPIC("repeat_next_topic"),
     REPEAT_TOPIC("repeat_topic"),
     DAILY_NOTIFICATIONS_NOTICE("daily_notifications_notice"),