feat: [FC-0047] Calendar main screen and dialogs #322

PavloNetrebchuk · 2024-05-17T14:08:52Z

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

This pull request contains a portion of the FC-0047 scope. We have only added the UI for now. The logic will be added later.

Light Theme	Dark Theme

# Conflicts: # core/src/main/res/values/strings.xml # course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt # course/src/main/java/org/openedx/course/presentation/container/CourseContainerViewModel.kt # 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/videos/CourseVideosFragment.kt # course/src/test/java/org/openedx/course/presentation/container/CourseContainerViewModelTest.kt

openedx-webhooks · 2024-05-17T14:08:56Z

Thanks for the pull request, @PavloNetrebchuk! Please note that it may take us up to several weeks or months to complete a review and merge your PR.

Feel free to add as much of the following information to the ticket as you can:

supporting documentation
Open edX discussion forum threads
timeline information ("this must be merged by XX date", and why that is)
partner information ("this is a course on edx.org")
any other information that can help Product understand the context for the PR

All technical communication about the code itself will be done via the GitHub pull request interface. As a reminder, our process documentation is here.

Please let us know once your PR is ready for our review and all tests are green.

core/src/main/java/org/openedx/core/presentation/dialog/DialogUI.kt

profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarAccessDialogFragment.kt

profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarColor.kt

PavloNetrebchuk · 2024-05-20T10:45:39Z

The CalendarManager and several calendar logic classes were moved to the core module to save the efficiency of the dates tab on the course home screen. We will move them back after adding a new calendar setting and removing the calendar logic from dates tab.

volodymyr-chekyrta · 2024-05-21T14:34:40Z

@HamzaIsrar12 @k1rill friendly reminder on this PR 🙏
We have to unblock further work.

volodymyr-chekyrta · 2024-05-24T08:47:14Z

@HamzaIsrar12 @k1rill, please spare some time to review this PR 🙏
We have to unlock further work.

k1rill

Great, just minor nits from my side

core/src/main/java/org/openedx/core/config/Config.kt

profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarAccessDialogFragment.kt

profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarFragment.kt

profile/src/main/java/org/openedx/profile/presentation/calendar/NewCalendarDialogFragment.kt

profile/src/main/java/org/openedx/profile/presentation/settings/SettingsViewModel.kt

PavloNetrebchuk · 2024-05-24T10:42:19Z

@k1rill I've completed it. Could you please review it again at your earliest convenience?

HamzaIsrar12 · 2024-05-24T10:58:00Z

@volodymyr-chekyrta I'm reviewing it. 😄

k1rill

LGTM

volodymyr-chekyrta · 2024-05-24T11:27:35Z

Thank you guys!

HamzaIsrar12

Minor nits only. ✨

Maybe we need to introduce a feature flag as well for the app-level calendar sync feature.

core/src/main/res/drawable/core_ic_external_link.xml

profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarColor.kt

profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarFragment.kt

profile/src/main/java/org/openedx/profile/presentation/calendar/CalendarAccessDialogFragment.kt

volodymyr-chekyrta · 2024-05-27T07:01:51Z

Maybe we need to introduce a feature flag as well for the app-level calendar sync feature.

Just for clarification 🤓
By FC-0047 the app level calendar should replace the course level calendar.

PavloNetrebchuk · 2024-05-27T13:44:57Z

@HamzaIsrar12
Thanks for your feedback! I've added the recent changes.

HamzaIsrar12

LGTM 🏎️ ✨

openedx-webhooks · 2024-05-29T10:03:16Z

@PavloNetrebchuk 🎉 Your pull request was merged! Please take a moment to answer a two question survey so we can improve your experience in the future.

* feat: Created calendar setting screen * feat: CalendarAccessDialog * feat: NewCalendarDialog * fix: Fixes according to PR feedback

* feat: Course Home progress bar * feat: Collapsing course sections * feat: New download icons * feat: show CourseContainerFragment if COURSE_NESTED_LIST_ENABLED false * fix: course progress bar updating * feat: Renamed COURSE_NESTED_LIST_ENABLE feature flag * feat: Course home. Moved certificate access. * chore: enhance app theme capability for prod edX theme/branding (#262) chore: enhance app theme capability for prod edX theme/branding - Integrate Program config updates - theming/branding code improvements for light and dark modes - Force dark mode for the WebView (beta version) - No major change in the Open edX theme fixes: LEARNER-9783 * feat: [FC-0047] Calendar main screen and dialogs (#322) * feat: Created calendar setting screen * feat: CalendarAccessDialog * feat: NewCalendarDialog * fix: Fixes according to PR feedback * fix: DiscussionTopicsViewModelTest.kt jUnit test * fix: assignment dates * feat: [FC-0047] Improved Dashboard Level Navigation (#308) * feat: Created Learn screen. Added course/program navigation. Added endpoint for UserCourses screen. * feat: Added primary course card * feat: Added start/resume course button * feat: Added alignment items * feat: Fix future assignment date, add courses list, add onSearch and onCourse clicks * feat: Add feature flag for enabling new/old dashboard screen, add UserCoursesScreen onClick methods * feat: Create AllEnrolledCoursesFragment. Add endpoint parameters * feat: AllEnrolledCoursesFragment UI * feat: Minor code refactoring, show cached data if no internet connection * feat: UserCourses screen data caching * feat: Dashboard * refactor: Dashboard type flag change, start course button change * feat: Added programs fragment to LearnFragment viewPager * feat: Empty states and settings button * fix: Number of courses * fix: Minor UI changes * fix: Fixes according to designer feedback * fix: Fixes after demo * refactor: Move CourseContainerTab * fix: Fixes according to PR feedback * fix: Fixes according to PR feedback * feat: added a patch from Omer Habib * fix: Fixes according to PR feedback * fix: Assignment date string * fix: Lint error * fix: Assignment date string * fix: Fixes according to PR feedback * fix: Fixes according to designer feedback * fix: Fixes according to PR feedback --------- Co-authored-by: Volodymyr Chekyrta <volodymyr.chekyrta@raccoongang.com> Co-authored-by: Farhan Arshad <43750646+farhan-arshad-dev@users.noreply.github.com>

PavloNetrebchuk added 3 commits April 30, 2024 18:19

feat: Created calendar setting screen

4ff1d21

feat: CalendarAccessDialog

6e09d35

openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label May 17, 2024

PavloNetrebchuk force-pushed the feat/calendar branch 3 times, most recently from 6134ed4 to 3929fed Compare May 20, 2024 10:22

volodymyr-chekyrta requested changes May 20, 2024

View reviewed changes

PavloNetrebchuk force-pushed the feat/calendar branch from 3929fed to a5a0f89 Compare May 20, 2024 10:36

volodymyr-chekyrta previously approved these changes May 20, 2024

View reviewed changes

volodymyr-chekyrta requested review from HamzaIsrar12 and k1rill May 20, 2024 11:21

volodymyr-chekyrta marked this pull request as ready for review May 20, 2024 12:27

volodymyr-chekyrta changed the title ~~Feat: Calendar main screen and dialogs~~ feat: [FC-0047] Calendar main screen and dialogs May 22, 2024

PavloNetrebchuk dismissed volodymyr-chekyrta’s stale review via be8a6db May 23, 2024 15:23

PavloNetrebchuk force-pushed the feat/calendar branch from a5a0f89 to be8a6db Compare May 23, 2024 15:23

feat: NewCalendarDialog

ddd9c64

PavloNetrebchuk force-pushed the feat/calendar branch from be8a6db to ddd9c64 Compare May 23, 2024 15:23

k1rill reviewed May 24, 2024

View reviewed changes

PavloNetrebchuk requested a review from k1rill May 24, 2024 10:37

k1rill previously approved these changes May 24, 2024

View reviewed changes

HamzaIsrar12 requested changes May 27, 2024

View reviewed changes

fix: Fixes according to PR feedback

f80afcc

PavloNetrebchuk dismissed k1rill’s stale review via f80afcc May 27, 2024 13:34

PavloNetrebchuk force-pushed the feat/calendar branch from 437febc to f80afcc Compare May 27, 2024 13:34

PavloNetrebchuk requested review from HamzaIsrar12 and k1rill May 27, 2024 13:40

HamzaIsrar12 approved these changes May 29, 2024

View reviewed changes

volodymyr-chekyrta merged commit 0d093ea into openedx:develop May 29, 2024

volodymyr-chekyrta deleted the feat/calendar branch May 29, 2024 10:03

PavloNetrebchuk mentioned this pull request Nov 6, 2024

Develop to main. Release v2 #399

Merged

feat: [FC-0047] Calendar main screen and dialogs #322

feat: [FC-0047] Calendar main screen and dialogs #322

Uh oh!

Conversation

PavloNetrebchuk commented May 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openedx-webhooks commented May 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PavloNetrebchuk commented May 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

volodymyr-chekyrta commented May 21, 2024

Uh oh!

volodymyr-chekyrta commented May 24, 2024

Uh oh!

k1rill left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PavloNetrebchuk commented May 24, 2024

Uh oh!

HamzaIsrar12 commented May 24, 2024

Uh oh!

k1rill left a comment

Choose a reason for hiding this comment

Uh oh!

volodymyr-chekyrta commented May 24, 2024

Uh oh!

HamzaIsrar12 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

volodymyr-chekyrta commented May 27, 2024

Uh oh!

PavloNetrebchuk commented May 27, 2024

Uh oh!

HamzaIsrar12 left a comment

Choose a reason for hiding this comment

Uh oh!

openedx-webhooks commented May 29, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

PavloNetrebchuk commented May 17, 2024 •

edited

Loading

openedx-webhooks commented May 17, 2024 •

edited

Loading

PavloNetrebchuk commented May 20, 2024 •

edited

Loading