Skip to content
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

feat: [FC-0047] xBlock offline mode #346

Merged
merged 30 commits into from
Sep 9, 2024

Conversation

PavloNetrebchuk
Copy link
Contributor

https://www.figma.com/design/iZ56YMjbRMShCCDxqrqRrR/Open-edX-Mobile-App-All-Screens-v2.1?node-id=3240-20123&t=TDhBl4mEV0pNeAEs-0


  • Added a dedicated offline tab for managing user downloaded content.
  • Added informational dialogs to provide users with additional context before downloading and to inform them about errors.
  • Extended offline functionality to include xBlocks, ensuring that users can interact with and progress through xBlocks content even when offline. This includes saving user progress locally, which will be synced once the user is back online.

Light Theme Dark Theme
Screenshot 2024-06-20 at 15 36 24 Screenshot 2024-06-20 at 15 37 43
Screenshot 2024-06-20 at 15 38 30 Screenshot 2024-06-20 at 15 38 49
Screenshot 2024-06-20 at 15 39 25 Screenshot 2024-06-20 at 15 39 41
Screenshot 2024-06-20 at 15 40 45 Screenshot 2024-06-20 at 15 41 01
Screenshot 2024-06-20 at 15 42 41 Screenshot 2024-06-20 at 15 43 03
Screenshot 2024-06-20 at 15 57 48 Screenshot 2024-06-20 at 15 58 04
Screenshot 2024-06-20 at 15 58 52 Screenshot 2024-06-20 at 16 00 52
Screenshot 2024-06-20 at 16 01 34 Screenshot 2024-06-20 at 16 01 49
Screenshot 2024-06-20 at 16 02 47 Screenshot 2024-06-20 at 16 03 07
Screenshot 2024-06-20 at 16 03 41 Screenshot 2024-06-20 at 16 04 01
Screenshot 2024-06-20 at 16 04 45 Screenshot 2024-06-20 at 16 05 00
https://github.com/openedx/openedx-app-android/assets/141041606/3c58b3cf-9f65-492d-94d5-e880ba735a8e https://github.com/openedx/openedx-app-android/assets/141041606/b19c141c-5364-4f1b-911c-a6cff51db675

Offline xBlock logic

offline.mp4

@openedx-webhooks openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label Jun 20, 2024
@openedx-webhooks
Copy link

openedx-webhooks commented Jun 20, 2024

Thanks for the pull request, @PavloNetrebchuk!

What's next?

Please work through the following steps to get your changes ready for engineering review:

🔘 Get product approval

If you haven't already, check this list to see if your contribution needs to go through the product review process.

  • If it does, you'll need to submit a product proposal for your contribution, and have it reviewed by the Product Working Group.
    • This process (including the steps you'll need to take) is documented here.
  • If it doesn't, simply proceed with the next step.

🔘 Provide context

To 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:

  • Dependencies

    This PR must be merged before / after / at the same time as ...

  • Blockers

    This PR is waiting for OEP-1234 to be accepted.

  • Timeline information

    This PR must be merged by XX date because ...

  • Partner information

    This is for a course on edx.org.

  • Supporting documentation
  • Relevant Open edX discussion forum threads

🔘 Get a green build

If one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green.

🔘 Let us know that your PR is ready for review:

Who will review my changes?

This repository is currently maintained by @openedx/openedx-mobile-maintainers. Tag them in a comment and let them know that your changes are ready for review.

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:

  • The size and impact of the changes that it introduces
  • The need for product review
  • Maintenance status of the parent repository

💡 As a result it may take up to several weeks or months to complete a review and merge your PR.

# Conflicts:
#	app/src/main/java/org/openedx/app/di/ScreenModule.kt
@volodymyr-chekyrta volodymyr-chekyrta changed the title feat: [FC-0047] Upgrade Downloading logic. Offline xBlock feat: [FC-0047] xBlock offline mode Jun 20, 2024
@PavloNetrebchuk PavloNetrebchuk force-pushed the feat/offline branch 6 times, most recently from ce66a2a to b9f4a46 Compare June 22, 2024 12:42
# Conflicts:
#	app/src/main/java/org/openedx/app/AppViewModel.kt
#	app/src/main/java/org/openedx/app/di/ScreenModule.kt
#	app/src/test/java/org/openedx/AppViewModelTest.kt
# Conflicts:
#	course/src/main/java/org/openedx/course/presentation/outline/CourseOutlineViewModel.kt
#	course/src/main/java/org/openedx/course/presentation/videos/CourseVideoViewModel.kt
…offline

# Conflicts:
#	app/src/main/java/org/openedx/app/AppActivity.kt
#	app/src/main/java/org/openedx/app/di/AppModule.kt
#	app/src/main/java/org/openedx/app/room/AppDatabase.kt
#	core/src/main/java/org/openedx/core/data/api/CourseApi.kt
#	core/src/main/java/org/openedx/core/module/db/DownloadDao.kt
#	core/src/main/res/values/strings.xml
#	course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt
#	course/src/main/java/org/openedx/course/presentation/dates/CourseDatesViewModel.kt
#	course/src/main/java/org/openedx/course/presentation/dates/DashboardUIState.kt
@sdaitzman
Copy link

Hi @PavloNetrebchuk, thank you for all your work on this offline xBlock effort. I just wanted to note that the course-level tab title should be Downloads, not Offline. The title varied a lot in earlier design files, but we decided to standardize on Downloads at a mobile design weekly call

@mphilbrick211 mphilbrick211 added the FC Relates to an Axim Funded Contribution project label Jul 30, 2024
…offline

# Conflicts:
#	course/src/main/res/values-uk/strings.xml
@dixidroid
Copy link
Contributor

reviewing...

@volodymyr-chekyrta volodymyr-chekyrta merged commit ad5c646 into openedx:develop Sep 9, 2024
4 checks passed
@PavloNetrebchuk PavloNetrebchuk deleted the feat/offline branch September 26, 2024 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
FC Relates to an Axim Funded Contribution project open-source-contribution PR author is not from Axim or 2U
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants