Merge pull request #1200 from hyperskill/release/1.74

Release 1.74
hyperskill · Oct 7, 2024 · bb7463b · bb7463b
2 parents 0da1d29 + 243c603
commit bb7463b
Show file tree

Hide file tree

Showing 21 changed files with 107 additions and 252 deletions.
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
@@ -72,7 +72,6 @@
     <ID>LongMethod:StepQuizCodeBlanksReducer.kt$StepQuizCodeBlanksReducer$private fun handleSuggestionClicked( state: State, message: Message.SuggestionClicked ): StepQuizCodeBlanksReducerResult?</ID>
     <ID>LongMethod:StepQuizCodeBlanksViewStateMapper.kt$StepQuizCodeBlanksViewStateMapper$private fun mapContentState( state: StepQuizCodeBlanksFeature.State.Content ): StepQuizCodeBlanksViewState.Content</ID>
     <ID>LongMethod:StreakFreezeDialogFragment.kt$StreakFreezeDialogFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
-    <ID>LongMethod:StudyPlanWidgetReducer.kt$StudyPlanWidgetReducer$private fun handleLearningActivitiesWithSectionsFetchSuccess( state: State, message: StudyPlanWidgetFeature.LearningActivitiesWithSectionsFetchResult.Success ): StudyPlanWidgetReducerResult</ID>
     <ID>LongMethod:TrackProgressContent.kt$@Composable fun TrackProgressContent( viewState: ProgressScreenViewState.TrackProgressViewState.Content, onNewMessage: (ProgressScreenFeature.Message) -&gt; Unit, modifier: Modifier = Modifier )</ID>
     <ID>LongParameterList:AppInteractor.kt$AppInteractor$( private val appRepository: AppRepository, private val authInteractor: AuthInteractor, private val currentProfileStateRepository: CurrentProfileStateRepository, private val userStorageInteractor: UserStorageInteractor, private val analyticInteractor: AnalyticInteractor, private val progressesRepository: ProgressesRepository, private val trackRepository: TrackRepository, private val providersRepository: ProvidersRepository, private val projectsRepository: ProjectsRepository, private val shareStreakRepository: ShareStreakRepository, private val pushNotificationsInteractor: PushNotificationsInteractor )</ID>
     <ID>LongParameterList:AuthRemoteDataSourceImpl.kt$AuthRemoteDataSourceImpl$( private val authCacheMutex: Mutex, private val deauthorizationFlow: Flow&lt;UserDeauthorized&gt;, private val authSocialHttpClient: HttpClient, private val authCredentialsHttpClient: HttpClient, private val networkEndpointConfigInfo: NetworkEndpointConfigInfo, private val json: Json, private val settings: Settings )</ID>

diff --git a/gradle/app.versions.toml b/gradle/app.versions.toml
@@ -2,5 +2,5 @@
 minSdk = '24'
 targetSdk = '34'
 compileSdk = '34'
-versionName = '1.73'
-versionCode = '567'
+versionName = '1.74'
+versionCode = '570'
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>594</string>
+	<string>597</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.73</string>
+	<string>1.74</string>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleExecutable</key>

diff --git a/iosHyperskillApp/iosHyperskillApp.xcodeproj/project.pbxproj b/iosHyperskillApp/iosHyperskillApp.xcodeproj/project.pbxproj
@@ -5821,7 +5821,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 594;
+				CURRENT_PROJECT_VERSION = 597;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				GENERATE_INFOPLIST_FILE = NO;
@@ -5842,7 +5842,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 594;
+				CURRENT_PROJECT_VERSION = 597;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = iosHyperskillAppUITests/Info.plist;
@@ -5863,7 +5863,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 594;
+				CURRENT_PROJECT_VERSION = 597;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				INFOPLIST_FILE = iosHyperskillAppTests/Info.plist;
@@ -5884,7 +5884,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 594;
+				CURRENT_PROJECT_VERSION = 597;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				INFOPLIST_FILE = iosHyperskillAppTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -5905,7 +5905,7 @@
 				CODE_SIGN_ENTITLEMENTS = NotificationServiceExtension/NotificationServiceExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 594;
+				CURRENT_PROJECT_VERSION = 597;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
@@ -5934,7 +5934,7 @@
 				CODE_SIGN_ENTITLEMENTS = NotificationServiceExtension/NotificationServiceExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 594;
+				CURRENT_PROJECT_VERSION = 597;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -6080,7 +6080,7 @@
 				CODE_SIGN_ENTITLEMENTS = iosHyperskillApp/iosHyperskillApp.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 594;
+				CURRENT_PROJECT_VERSION = 597;
 				DEVELOPMENT_ASSET_PATHS = "\"iosHyperskillApp/Preview Content\"";
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				ENABLE_PREVIEWS = YES;
@@ -6116,7 +6116,7 @@
 				CODE_SIGN_ENTITLEMENTS = iosHyperskillApp/iosHyperskillApp.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 594;
+				CURRENT_PROJECT_VERSION = 597;
 				DEVELOPMENT_ASSET_PATHS = "\"iosHyperskillApp/Preview Content\"";
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				ENABLE_PREVIEWS = YES;

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.73</string>
+	<string>1.74</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>594</string>
+	<string>597</string>
 	<key>FirebaseAppDelegateProxyEnabled</key>
 	<false/>
 	<key>FirebaseMessagingAutoInitEnabled</key>

diff --git a/...perskillApp/iosHyperskillApp/Sources/Extensions/SwiftUI/View/View+OnTapWhenDisabled.swift b/...perskillApp/iosHyperskillApp/Sources/Extensions/SwiftUI/View/View+OnTapWhenDisabled.swift
@@ -15,31 +15,31 @@ extension View {
     }
 }
 
-#if DEBUG
-@available(iOS 17.0, *)
-#Preview {
-    @Previewable @State var isButtonDisabled = true
-
-    VStack {
-        Button(
-            action: {
-                print("Button tapped!")
-            },
-            label: {
-                Text("Submit")
-                    .padding()
-                    .background(isButtonDisabled ? Color.gray : Color.blue)
-                    .foregroundColor(.white)
-                    .cornerRadius(8)
-            }
-        )
-        .disabled(isButtonDisabled)
-        .onTapWhenDisabled(isDisabled: isButtonDisabled) {
-            print("Button is disabled!")
-        }
-
-        Toggle("Disable View", isOn: $isButtonDisabled)
-            .padding()
-    }
-}
-#endif
+// #if DEBUG
+// @available(iOS 17.0, *)
+// #Preview {
+//    @Previewable @State var isButtonDisabled = true
+//
+//    VStack {
+//        Button(
+//            action: {
+//                print("Button tapped!")
+//            },
+//            label: {
+//                Text("Submit")
+//                    .padding()
+//                    .background(isButtonDisabled ? Color.gray : Color.blue)
+//                    .foregroundColor(.white)
+//                    .cornerRadius(8)
+//            }
+//        )
+//        .disabled(isButtonDisabled)
+//        .onTapWhenDisabled(isDisabled: isButtonDisabled) {
+//            print("Button is disabled!")
+//        }
+//
+//        Toggle("Disable View", isOn: $isButtonDisabled)
+//            .padding()
+//    }
+// }
+// #endif
diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Views/SwiftUI/Effects/BounceEffect.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Views/SwiftUI/Effects/BounceEffect.swift
@@ -29,18 +29,18 @@ extension View {
     }
 }
 
-#if DEBUG
-@available(iOS 17.0, *)
-#Preview {
-    @Previewable @State var isBouncing = false
-
-    Button {
-        isBouncing.toggle()
-    } label: {
-        Text("Retry")
-    }
-    .buttonStyle(RoundedRectangleButtonStyle(style: .violet))
-    .bounceEffect(isActive: isBouncing)
-    .padding()
-}
-#endif
+// #if DEBUG
+// @available(iOS 17.0, *)
+// #Preview {
+//    @Previewable @State var isBouncing = false
+//
+//    Button {
+//        isBouncing.toggle()
+//    } label: {
+//        Text("Retry")
+//    }
+//    .buttonStyle(RoundedRectangleButtonStyle(style: .violet))
+//    .bounceEffect(isActive: isBouncing)
+//    .padding()
+// }
+// #endif
diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Views/SwiftUI/Effects/JiggleEffect.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Views/SwiftUI/Effects/JiggleEffect.swift
@@ -39,18 +39,18 @@ extension View {
     }
 }
 
-#if DEBUG
-@available(iOS 17.0, *)
-#Preview {
-    @Previewable @State var isJiggling = false
-
-    Button {
-        isJiggling.toggle()
-    } label: {
-        Text("Retry")
-    }
-    .buttonStyle(RoundedRectangleButtonStyle(style: .violet))
-    .jiggleEffect(amount: 2, isActive: isJiggling)
-    .padding()
-}
-#endif
+// #if DEBUG
+// @available(iOS 17.0, *)
+// #Preview {
+//    @Previewable @State var isJiggling = false
+//
+//    Button {
+//        isJiggling.toggle()
+//    } label: {
+//        Text("Retry")
+//    }
+//    .buttonStyle(RoundedRectangleButtonStyle(style: .violet))
+//    .jiggleEffect(amount: 2, isActive: isJiggling)
+//    .padding()
+// }
+// #endif
diff --git a/iosHyperskillApp/iosHyperskillAppTests/Info.plist b/iosHyperskillApp/iosHyperskillAppTests/Info.plist
@@ -13,8 +13,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.73</string>
+	<string>1.74</string>
 	<key>CFBundleVersion</key>
-	<string>594</string>
+	<string>597</string>
 </dict>
 </plist>
diff --git a/iosHyperskillApp/iosHyperskillAppUITests/Info.plist b/iosHyperskillApp/iosHyperskillAppUITests/Info.plist
@@ -13,8 +13,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.73</string>
+	<string>1.74</string>
 	<key>CFBundleVersion</key>
-	<string>594</string>
+	<string>597</string>
 </dict>
 </plist>
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeatureKeys.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeatureKeys.kt
@@ -11,5 +11,4 @@ internal object FeatureKeys {
     const val MOBILE_ONLY_SUBSCRIPTION = "mobile.mobile_only_subscription"
     const val MOBILE_USERS_INTERVIEW_WIDGET = "mobile.users_interview_widget"
     const val MOBILE_CONTENT_TRIAL = "mobile.content_trial"
-    const val MOBILE_PYTHON_ADOPTED_COURSE = "mobile.python_adopted_course"
 }
diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeaturesMap.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeaturesMap.kt
@@ -39,7 +39,4 @@ val FeaturesMap.isMobileUsersInterviewWidgetEnabled: Boolean
     get() = get(FeatureKeys.MOBILE_USERS_INTERVIEW_WIDGET) ?: false
 
 val FeaturesMap.isMobileContentTrialEnabled: Boolean
-    get() = get(FeatureKeys.MOBILE_CONTENT_TRIAL) ?: false
-
-val FeaturesMap.isMobilePythonAdoptedCourseEnabled: Boolean
-    get() = get(FeatureKeys.MOBILE_PYTHON_ADOPTED_COURSE) ?: false
+    get() = get(FeatureKeys.MOBILE_CONTENT_TRIAL) ?: false
diff --git a/...lin/org/hyperskill/app/study_plan/widget/presentation/StudyPlanWidgetFakeTopicsFeature.kt b/...lin/org/hyperskill/app/study_plan/widget/presentation/StudyPlanWidgetFakeTopicsFeature.kt