Skip to content

Commit bb7463b

Browse files
ivan-magdaivan-magda
authored
Merge pull request #1200 from hyperskill/release/1.74
Release 1.74
2 parents 0da1d29 + 243c603 commit bb7463b

File tree

21 files changed

+107
-252
lines changed

21 files changed

+107
-252
lines changed

‎config/detekt/baseline.xml

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
<ID>LongMethod:StepQuizCodeBlanksReducer.kt$StepQuizCodeBlanksReducer$private fun handleSuggestionClicked( state: State, message: Message.SuggestionClicked ): StepQuizCodeBlanksReducerResult?</ID>
7373
<ID>LongMethod:StepQuizCodeBlanksViewStateMapper.kt$StepQuizCodeBlanksViewStateMapper$private fun mapContentState( state: StepQuizCodeBlanksFeature.State.Content ): StepQuizCodeBlanksViewState.Content</ID>
7474
<ID>LongMethod:StreakFreezeDialogFragment.kt$StreakFreezeDialogFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
75-
<ID>LongMethod:StudyPlanWidgetReducer.kt$StudyPlanWidgetReducer$private fun handleLearningActivitiesWithSectionsFetchSuccess( state: State, message: StudyPlanWidgetFeature.LearningActivitiesWithSectionsFetchResult.Success ): StudyPlanWidgetReducerResult</ID>
7675
<ID>LongMethod:TrackProgressContent.kt$@Composable fun TrackProgressContent( viewState: ProgressScreenViewState.TrackProgressViewState.Content, onNewMessage: (ProgressScreenFeature.Message) -&gt; Unit, modifier: Modifier = Modifier )</ID>
7776
<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>
7877
<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>

‎gradle/app.versions.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
minSdk = '24'
33
targetSdk = '34'
44
compileSdk = '34'
5-
versionName = '1.73'
6-
versionCode = '567'
5+
versionName = '1.74'
6+
versionCode = '570'

‎iosHyperskillApp/NotificationServiceExtension/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<key>CFBundleIdentifier</key>
1010
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleVersion</key>
12-
<string>594</string>
12+
<string>597</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>1.73</string>
14+
<string>1.74</string>
1515
<key>CFBundlePackageType</key>
1616
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1717
<key>CFBundleExecutable</key>

‎iosHyperskillApp/iosHyperskillApp.xcodeproj/project.pbxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -5821,7 +5821,7 @@
58215821
buildSettings = {
58225822
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
58235823
CODE_SIGN_STYLE = Automatic;
5824-
CURRENT_PROJECT_VERSION = 594;
5824+
CURRENT_PROJECT_VERSION = 597;
58255825
DEBUG_INFORMATION_FORMAT = dwarf;
58265826
DEVELOPMENT_TEAM = UJ4KC2QN7B;
58275827
GENERATE_INFOPLIST_FILE = NO;
@@ -5842,7 +5842,7 @@
58425842
buildSettings = {
58435843
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
58445844
CODE_SIGN_STYLE = Automatic;
5845-
CURRENT_PROJECT_VERSION = 594;
5845+
CURRENT_PROJECT_VERSION = 597;
58465846
DEVELOPMENT_TEAM = UJ4KC2QN7B;
58475847
GENERATE_INFOPLIST_FILE = NO;
58485848
INFOPLIST_FILE = iosHyperskillAppUITests/Info.plist;
@@ -5863,7 +5863,7 @@
58635863
BUNDLE_LOADER = "$(TEST_HOST)";
58645864
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
58655865
CODE_SIGN_STYLE = Automatic;
5866-
CURRENT_PROJECT_VERSION = 594;
5866+
CURRENT_PROJECT_VERSION = 597;
58675867
DEBUG_INFORMATION_FORMAT = dwarf;
58685868
DEVELOPMENT_TEAM = UJ4KC2QN7B;
58695869
INFOPLIST_FILE = iosHyperskillAppTests/Info.plist;
@@ -5884,7 +5884,7 @@
58845884
BUNDLE_LOADER = "$(TEST_HOST)";
58855885
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
58865886
CODE_SIGN_STYLE = Automatic;
5887-
CURRENT_PROJECT_VERSION = 594;
5887+
CURRENT_PROJECT_VERSION = 597;
58885888
DEVELOPMENT_TEAM = UJ4KC2QN7B;
58895889
INFOPLIST_FILE = iosHyperskillAppTests/Info.plist;
58905890
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -5905,7 +5905,7 @@
59055905
CODE_SIGN_ENTITLEMENTS = NotificationServiceExtension/NotificationServiceExtension.entitlements;
59065906
CODE_SIGN_IDENTITY = "Apple Development";
59075907
CODE_SIGN_STYLE = Automatic;
5908-
CURRENT_PROJECT_VERSION = 594;
5908+
CURRENT_PROJECT_VERSION = 597;
59095909
DEBUG_INFORMATION_FORMAT = dwarf;
59105910
DEVELOPMENT_TEAM = UJ4KC2QN7B;
59115911
INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
@@ -5934,7 +5934,7 @@
59345934
CODE_SIGN_ENTITLEMENTS = NotificationServiceExtension/NotificationServiceExtension.entitlements;
59355935
CODE_SIGN_IDENTITY = "Apple Development";
59365936
CODE_SIGN_STYLE = Automatic;
5937-
CURRENT_PROJECT_VERSION = 594;
5937+
CURRENT_PROJECT_VERSION = 597;
59385938
DEVELOPMENT_TEAM = UJ4KC2QN7B;
59395939
INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
59405940
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -6080,7 +6080,7 @@
60806080
CODE_SIGN_ENTITLEMENTS = iosHyperskillApp/iosHyperskillApp.entitlements;
60816081
CODE_SIGN_IDENTITY = "iPhone Developer";
60826082
CODE_SIGN_STYLE = Automatic;
6083-
CURRENT_PROJECT_VERSION = 594;
6083+
CURRENT_PROJECT_VERSION = 597;
60846084
DEVELOPMENT_ASSET_PATHS = "\"iosHyperskillApp/Preview Content\"";
60856085
DEVELOPMENT_TEAM = UJ4KC2QN7B;
60866086
ENABLE_PREVIEWS = YES;
@@ -6116,7 +6116,7 @@
61166116
CODE_SIGN_ENTITLEMENTS = iosHyperskillApp/iosHyperskillApp.entitlements;
61176117
CODE_SIGN_IDENTITY = "iPhone Developer";
61186118
CODE_SIGN_STYLE = Automatic;
6119-
CURRENT_PROJECT_VERSION = 594;
6119+
CURRENT_PROJECT_VERSION = 597;
61206120
DEVELOPMENT_ASSET_PATHS = "\"iosHyperskillApp/Preview Content\"";
61216121
DEVELOPMENT_TEAM = UJ4KC2QN7B;
61226122
ENABLE_PREVIEWS = YES;

‎iosHyperskillApp/iosHyperskillApp/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundlePackageType</key>
2222
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
2323
<key>CFBundleShortVersionString</key>
24-
<string>1.73</string>
24+
<string>1.74</string>
2525
<key>CFBundleURLTypes</key>
2626
<array>
2727
<dict>
@@ -34,7 +34,7 @@
3434
</dict>
3535
</array>
3636
<key>CFBundleVersion</key>
37-
<string>594</string>
37+
<string>597</string>
3838
<key>FirebaseAppDelegateProxyEnabled</key>
3939
<false/>
4040
<key>FirebaseMessagingAutoInitEnabled</key>

‎iosHyperskillApp/iosHyperskillApp/Sources/Extensions/SwiftUI/View/View+OnTapWhenDisabled.swift

+28-28
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@ extension View {
1515
}
1616
}
1717

18-
#if DEBUG
19-
@available(iOS 17.0, *)
20-
#Preview {
21-
@Previewable @State var isButtonDisabled = true
22-
23-
VStack {
24-
Button(
25-
action: {
26-
print("Button tapped!")
27-
},
28-
label: {
29-
Text("Submit")
30-
.padding()
31-
.background(isButtonDisabled ? Color.gray : Color.blue)
32-
.foregroundColor(.white)
33-
.cornerRadius(8)
34-
}
35-
)
36-
.disabled(isButtonDisabled)
37-
.onTapWhenDisabled(isDisabled: isButtonDisabled) {
38-
print("Button is disabled!")
39-
}
40-
41-
Toggle("Disable View", isOn: $isButtonDisabled)
42-
.padding()
43-
}
44-
}
45-
#endif
18+
// #if DEBUG
19+
// @available(iOS 17.0, *)
20+
// #Preview {
21+
// @Previewable @State var isButtonDisabled = true
22+
//
23+
// VStack {
24+
// Button(
25+
// action: {
26+
// print("Button tapped!")
27+
// },
28+
// label: {
29+
// Text("Submit")
30+
// .padding()
31+
// .background(isButtonDisabled ? Color.gray : Color.blue)
32+
// .foregroundColor(.white)
33+
// .cornerRadius(8)
34+
// }
35+
// )
36+
// .disabled(isButtonDisabled)
37+
// .onTapWhenDisabled(isDisabled: isButtonDisabled) {
38+
// print("Button is disabled!")
39+
// }
40+
//
41+
// Toggle("Disable View", isOn: $isButtonDisabled)
42+
// .padding()
43+
// }
44+
// }
45+
// #endif

‎iosHyperskillApp/iosHyperskillApp/Sources/Views/SwiftUI/Effects/BounceEffect.swift

+15-15
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ extension View {
2929
}
3030
}
3131

32-
#if DEBUG
33-
@available(iOS 17.0, *)
34-
#Preview {
35-
@Previewable @State var isBouncing = false
36-
37-
Button {
38-
isBouncing.toggle()
39-
} label: {
40-
Text("Retry")
41-
}
42-
.buttonStyle(RoundedRectangleButtonStyle(style: .violet))
43-
.bounceEffect(isActive: isBouncing)
44-
.padding()
45-
}
46-
#endif
32+
// #if DEBUG
33+
// @available(iOS 17.0, *)
34+
// #Preview {
35+
// @Previewable @State var isBouncing = false
36+
//
37+
// Button {
38+
// isBouncing.toggle()
39+
// } label: {
40+
// Text("Retry")
41+
// }
42+
// .buttonStyle(RoundedRectangleButtonStyle(style: .violet))
43+
// .bounceEffect(isActive: isBouncing)
44+
// .padding()
45+
// }
46+
// #endif

‎iosHyperskillApp/iosHyperskillApp/Sources/Views/SwiftUI/Effects/JiggleEffect.swift

+15-15
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ extension View {
3939
}
4040
}
4141

42-
#if DEBUG
43-
@available(iOS 17.0, *)
44-
#Preview {
45-
@Previewable @State var isJiggling = false
46-
47-
Button {
48-
isJiggling.toggle()
49-
} label: {
50-
Text("Retry")
51-
}
52-
.buttonStyle(RoundedRectangleButtonStyle(style: .violet))
53-
.jiggleEffect(amount: 2, isActive: isJiggling)
54-
.padding()
55-
}
56-
#endif
42+
// #if DEBUG
43+
// @available(iOS 17.0, *)
44+
// #Preview {
45+
// @Previewable @State var isJiggling = false
46+
//
47+
// Button {
48+
// isJiggling.toggle()
49+
// } label: {
50+
// Text("Retry")
51+
// }
52+
// .buttonStyle(RoundedRectangleButtonStyle(style: .violet))
53+
// .jiggleEffect(amount: 2, isActive: isJiggling)
54+
// .padding()
55+
// }
56+
// #endif

‎iosHyperskillApp/iosHyperskillAppTests/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<key>CFBundlePackageType</key>
1414
<string>BNDL</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>1.73</string>
16+
<string>1.74</string>
1717
<key>CFBundleVersion</key>
18-
<string>594</string>
18+
<string>597</string>
1919
</dict>
2020
</plist>

‎iosHyperskillApp/iosHyperskillAppUITests/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<key>CFBundlePackageType</key>
1414
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>1.73</string>
16+
<string>1.74</string>
1717
<key>CFBundleVersion</key>
18-
<string>594</string>
18+
<string>597</string>
1919
</dict>
2020
</plist>

‎shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeatureKeys.kt

-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ internal object FeatureKeys {
1111
const val MOBILE_ONLY_SUBSCRIPTION = "mobile.mobile_only_subscription"
1212
const val MOBILE_USERS_INTERVIEW_WIDGET = "mobile.users_interview_widget"
1313
const val MOBILE_CONTENT_TRIAL = "mobile.content_trial"
14-
const val MOBILE_PYTHON_ADOPTED_COURSE = "mobile.python_adopted_course"
1514
}

‎shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeaturesMap.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,4 @@ val FeaturesMap.isMobileUsersInterviewWidgetEnabled: Boolean
3939
get() = get(FeatureKeys.MOBILE_USERS_INTERVIEW_WIDGET) ?: false
4040

4141
val FeaturesMap.isMobileContentTrialEnabled: Boolean
42-
get() = get(FeatureKeys.MOBILE_CONTENT_TRIAL) ?: false
43-
44-
val FeaturesMap.isMobilePythonAdoptedCourseEnabled: Boolean
45-
get() = get(FeatureKeys.MOBILE_PYTHON_ADOPTED_COURSE) ?: false
42+
get() = get(FeatureKeys.MOBILE_CONTENT_TRIAL) ?: false

‎shared/src/commonMain/kotlin/org/hyperskill/app/study_plan/widget/presentation/StudyPlanWidgetFakeTopicsFeature.kt

-73
This file was deleted.

0 commit comments

Comments
 (0)