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

chore: enhance app theme capability for prod edX theme/branding #262

Merged

Conversation

farhan-arshad-dev
Copy link
Contributor

@farhan-arshad-dev farhan-arshad-dev commented Mar 18, 2024

Description

  • Enhance app theme capability for prod edX theme/branding
  • Integrate Program config updates
  • Theming/branding code improvements for light and dark modes

Jira: LEARNER-9783, LEARNER-9874
Github issue: [Android] Theming Customization Improvements

Note: No major changes in the OpenEdx Theme.

omerhabib26
omerhabib26 previously approved these changes Mar 20, 2024
k1rill
k1rill previously approved these changes Mar 22, 2024
@volodymyr-chekyrta
Copy link
Contributor

volodymyr-chekyrta commented Mar 25, 2024

@farhan-arshad-dev, I see TODO in the description.
Could you please add some screenshots?

Also, I see that this PR breaks the Open edX theme by using a secondary button style instead of the primary one.

Design PR
image image

@k1rill k1rill self-requested a review March 26, 2024 06:34
@farhan-arshad-dev
Copy link
Contributor Author

@farhan-arshad-dev, I see TODO in the description. Could you please add some screenshots?

Also, I see that this PR breaks the Open edX theme by using a secondary button style instead of the primary one.

Design PR
image image

Hi @volodymyr-chekyrta

I am currently addressing the design team's feedback. Soon I'll push more appropriate code, that will not break the Openedx theme.

@volodymyr-chekyrta
Copy link
Contributor

Hi @volodymyr-chekyrta

I am currently addressing the design team's feedback. Soon I'll push more appropriate code, that will not break the Openedx theme.

@farhan-arshad-dev Thank you! 👍

@farhan-arshad-dev farhan-arshad-dev force-pushed the farhan_ar/LEARNER-9783 branch 2 times, most recently from 43a5dd9 to e59f589 Compare April 18, 2024 08:19
@farhan-arshad-dev
Copy link
Contributor Author

@volodymyr-chekyrta PR is ready for another pass of review.

@volodymyr-chekyrta
Copy link
Contributor

Incorrect button color

develop farhan_ar/LEARNER-9783
image image

@volodymyr-chekyrta
Copy link
Contributor

Incorrect text field and cursor color

develop farhan_ar/LEARNER-9783
image image

@volodymyr-chekyrta
Copy link
Contributor

Incorrect color

develop farhan_ar/LEARNER-9783
image image

- Integrate Program config updates
- theming/branding code improvements for light and dark modes

fixes: LEARNER-9783
@farhan-arshad-dev farhan-arshad-dev force-pushed the farhan_ar/LEARNER-9783 branch 2 times, most recently from b57063e to 3865e89 Compare May 23, 2024 05:14
@farhan-arshad-dev
Copy link
Contributor Author

@volodymyr-chekyrta all the comments are addressed, and ready for another pass.

Copy link
Contributor

@volodymyr-chekyrta volodymyr-chekyrta left a comment

Choose a reason for hiding this comment

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

We can go with this approach 👍
Just a few comments and we are good to merge

core/src/openedx/org/openedx/core/ui/theme/Colors.kt Outdated Show resolved Hide resolved
core/src/openedx/org/openedx/core/ui/theme/Colors.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/ui/theme/AppColors.kt Outdated Show resolved Hide resolved
Copy link
Contributor

@volodymyr-chekyrta volodymyr-chekyrta left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

@volodymyr-chekyrta
Copy link
Contributor

@farhan-arshad-dev, feel free to squash and merge this PR

@farhan-arshad-dev farhan-arshad-dev merged commit a712170 into openedx:develop May 23, 2024
3 checks passed
@farhan-arshad-dev farhan-arshad-dev deleted the farhan_ar/LEARNER-9783 branch May 23, 2024 09:43
PavloNetrebchuk pushed a commit to raccoongang/openedx-app-android that referenced this pull request May 30, 2024
…edx#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
volodymyr-chekyrta added a commit that referenced this pull request Jun 6, 2024
* 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>
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.

4 participants