Feat/sandbox setup - #656
Draft
IvanStepanok wants to merge 40 commits into
Draft
Conversation
Fix/issue 581
openedx-webhooks
added
the
open-source-contribution
openedx-webhooks
added
the
core contributor
|
Thanks for the pull request, @IvanStepanok! This repository is currently maintained by Once you've gone through the following steps feel free to tag them in a comment and let them know that your changes are ready for engineering review. 🔘 Get product approvalIf you haven't already, check this list to see if your contribution needs to go through the product review process.
🔘 Provide contextTo help your reviewers and other members of the community understand the purpose and larger context of your changes, feel free to add as much of the following information to the PR description as you can:
🔘 Get a green buildIf one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green. 🔘 Update the status of your PRYour PR is currently marked as a draft. After completing the steps above, update its status by clicking "Ready for Review", or removing "WIP" from the title, as appropriate. Where can I find more information?If you'd like to get more details on all aspects of the review process for open source pull requests (OSPRs), check out the following resources: When can I expect my changes to be merged?Our goal is to get community contributions seen and reviewed as efficiently as possible. However, the amount of time that it takes to review and merge a PR can vary significantly based on factors such as:
💡 As a result it may take up to several weeks or months to complete a review and merge your PR. |
Brings in 35 commits, notably the ObservableObject -> @observable migration (#653) and the connectivity fix for issue 581 (#635). Conflict resolutions: - Core/Core/Configuration/Connectivity.swift Both branches had independently implemented an offline debounce. Took develop's (notReachableDelay/notReachableTask): it verifies with a live request before declaring offline, and it assigns internetState, which the sandbox side never did -- develop's OfflineSnackBarView now reads .onChange(of: connectivity.internetState), so keeping the sandbox side would have left the snackbar permanently dead. Grafted the sandbox side's de-dupe guard onto internetState.didSet so the Combine subject stops re-emitting unchanged states. Dropped the now-orphaned scheduleOffline/cancelOfflineDebounce. - Course/.../Unit/Subviews/WebView.swift Took develop's: the init already resolves viewModel/connectivity into @State/let, so re-resolving from the DI container in body was stale pre-Observable code that also discarded the injected connectivity. - Theme/.../TextColor/TextSecondary.colorset/Contents.json Kept sandbox's: generated by "Sandbox (3)/apply_ios_theme.py" from theme.json (textSecondary #97A5BB / #79889F). Deliberate branding override of the upstream token update in #658. - OpenEdX.xcodeproj/project.pbxproj Kept sandbox's DEVELOPMENT_TEAM and CURRENT_PROJECT_VERSION.
Brings in 35 commits, notably the ObservableObject -> @observable migration (#653) and the connectivity fix for issue 581 (#635). Conflict resolutions: - Core/Core/Configuration/Connectivity.swift Both branches had independently implemented an offline debounce. Took develop's (notReachableDelay/notReachableTask): it verifies with a live request before declaring offline, and it assigns internetState, which the sandbox side never did -- develop's OfflineSnackBarView now reads .onChange(of: connectivity.internetState), so keeping the sandbox side would have left the snackbar permanently dead. Grafted the sandbox side's de-dupe guard onto internetState.didSet so the Combine subject stops re-emitting unchanged states. Dropped the now-orphaned scheduleOffline/cancelOfflineDebounce. - Course/.../Unit/Subviews/WebView.swift Took develop's: the init already resolves viewModel/connectivity into @State/let, so re-resolving from the DI container in body was stale pre-Observable code that also discarded the injected connectivity. - Theme/.../TextColor/TextSecondary.colorset/Contents.json Kept sandbox's: generated by "Sandbox (3)/apply_ios_theme.py" from theme.json (textSecondary #97A5BB / #79889F). Deliberate branding override of the upstream token update in #658. - OpenEdX.xcodeproj/project.pbxproj Kept sandbox's DEVELOPMENT_TEAM and CURRENT_PROJECT_VERSION in the two conflicting hunks, but kept develop's IPHONEOS_DEPLOYMENT_TARGET bump 16.4 -> 17.0 across all 6 configurations: Core is now built for iOS 17.0, so leaving the app target at 16.4 fails to compile with "module 'Core' has a minimum deployment target of iOS 17.0".
…dx-app-ios into feat/sandbox-setup
Brings in 35 commits, notably the ObservableObject -> @observable migration (#653) and the connectivity fix for issue 581 (#635). Conflict resolutions: - Core/Core/Configuration/Connectivity.swift Took develop's version verbatim. Both branches had independently implemented an offline debounce; develop's (notReachableDelay / notReachableTask) verifies with a live request before declaring offline and assigns internetState, which the sandbox side never did -- develop's OfflineSnackBarView reads .onChange(of: connectivity.internetState), so the sandbox side would have left the snackbar permanently dead. This branch carries only the sandbox design and AppStore build configuration, so it keeps no connectivity logic of its own. - Course/.../Unit/Subviews/WebView.swift Took develop's: the init already resolves viewModel/connectivity into @State/let, so re-resolving from the DI container in body was stale pre-Observable code that also discarded the injected connectivity. - Theme/.../TextColor/TextSecondary.colorset/Contents.json Kept sandbox's: generated by "Sandbox (3)/apply_ios_theme.py" from theme.json (textSecondary #97A5BB / #79889F). Deliberate branding override of the upstream token update in #658. - OpenEdX.xcodeproj/project.pbxproj Kept sandbox's DEVELOPMENT_TEAM and CURRENT_PROJECT_VERSION in the two conflicting hunks, but kept develop's IPHONEOS_DEPLOYMENT_TARGET bump 16.4 -> 17.0 across all 6 configurations: Core is now built for iOS 17.0, so leaving the app target at 16.4 fails to compile with "module 'Core' has a minimum deployment target of iOS 17.0".
…dx-app-ios into feat/sandbox-setup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.