Skip to content

Merge Horizon feature branch into master #3007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
May 22, 2025
Merged

Merge Horizon feature branch into master #3007

merged 31 commits into from
May 22, 2025

Conversation

tamaskozmer
Copy link
Contributor

@tamaskozmer tamaskozmer commented May 19, 2025

Test plan: Smoke test the app.

refs: -
affects: -
release note: -

Checklist

  • Run E2E test suite
  • Tested in dark mode
  • Tested in light mode

tamaskozmer and others added 30 commits March 22, 2025 12:25
* Project init.

* Colors

* Loading user and colors on the home screen.

* Cleanup

* Refactor
* Basic dashboard implementation.

* Typography and Spaces.

* Borders and corner radius.

* Icons and shadows

* Pull to refresh, other logi for dashboard learning object cards.

* Loading and error states

* Previous PR suggestions.

* Pill design element and some dashboard changes.

* Some design issues fixed.

* Design system IconButtons, some refactoring.

* UI improvements.

* Progress bar and Spinner.
* Segmented control

* Changes regarding Figma comments.

* PR comments.
* Avatar

* PR comments.
* Module item cards.

* Module header.

* Some more previews.

* Fix previews.
* Checkbox and switch without anim.

* Switch with animation.

* Radio item.
* Added some showroom elements.
Some design changes in IconButtons, FileDrop.

* Molecules showroom.
Fixed tag disabled state.

* Organisms

* Fixed navigation

* Colors and icons.

* A11y fixes.

* Make error content swipeable.

* Dashboard error handling and added snackbar to the LoadingStateWrapper.kt
# Conflicts:
#	libs/horizon/.gitignore
#	libs/pandautils/src/main/java/com/instructure/pandautils/di/ApplicationModule.kt
* Module item pager.

* Header animation.

* Locked content.

* Module progress.

* Bottom sheet and loading state.

* Learning object status.

* Fixed points strings

* Collapse animation.

* Fixed learning object card onclick.

* PR review changes

* Handle module item asset case.

* Progress animation.

* Fixed subheader.

* label
* Show all courses on the Dashboard.

* Navigate to learn tab from the Dashboard course.

* Fixed copilot review comment.

* Fixed bottom navigation Dashboard click when navigating to learn from the Dashboard.
* Page details screen

* mark as done

* Handle locked content.

* Handle mark as done visibility. Removed some unused code.

* Fixed pull to refresh

* Fixed first page blinking.

* Refresh Dashboard when closing the module pager.

* Handle webview styling.

* Review changes.

* Review changes.
…2975)

* Assignment assessment fix.

* External link.

* Added TextLink design system element.
ExternalToolContentScreen.
Refactored ViewModel handling in the pager.

* Refactor WebView callbacks.

* Fix opening external tools externally and add loading.

* Fixed issues.
# Conflicts:
#	libs/pandautils/src/main/java/com/instructure/pandautils/utils/DoubleExtensions.kt
* File details with file download.

* Embedded image content.

* Remove test delay.

* Basic preview for media files.

* Moved fileCache to pandautils.

* Moved FileCache extension.

* Text files preview.

* Revert "Moved FileCache extension."

This reverts commit fb35d71.

* Revert "Moved fileCache to pandautils."

This reverts commit 14a60a0.

* Revert unnecessary changes.

* Fixed mimeType

* Previews

* Migrate db from LiveData to Flow

* Implement mark as read logic based on iOS.

* Fixed review findings.

* Fixed db conflicts with master

* Fixed remaining issues.

* Added error content.
* Handle attempt count and assignment details isntructions.

* Text submission details.

* Submission type selector.

* Module sequence button logic.

* Moved fileCache to pandautils.

* File submission details.

* Design changes based on feedback.

* Fixed some WebView routings.

* File download.

* Added cancel for file details

* Bottom sheet for actions.

* Previews.

* Mark as done button shadow.

* Added lti buttons to webviews. Other findings.

* Fixed remaining findings.
# Conflicts:
#	libs/DocumentScanner/src/main/java/com/zynksoftware/documentscanner/ui/imageprocessing/ImageProcessingFragment.kt
#	libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/filedetails/MediaFileContent.kt
#	libs/pandautils/src/main/java/com/instructure/pandautils/dialogs/RatingDialog.kt
@inst-danger
Copy link
Contributor

Parent Install Page

@inst-danger
Copy link
Contributor

Student Install Page

@inst-danger
Copy link
Contributor

Teacher Install Page

Copy link
Contributor

@kdeakinstructure kdeakinstructure left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

QA 👍

@tamaskozmer tamaskozmer merged commit 2f46f47 into master May 22, 2025
4 checks passed
@tamaskozmer tamaskozmer deleted the feature/horizon branch May 22, 2025 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants