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.

Sign up for GitHub

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

Jump to bottom

feat: Add WebView based Discovery Experience #163

Merged
merged 17 commits into from
Dec 27, 2023
Merged

feat: Add WebView based Discovery Experience #163

merged 17 commits into from
Dec 27, 2023

Conversation

HamzaIsrar12
Copy link
Contributor

Webview Discovery Experience

Introduces a feature flag-based approach to introduce a webView Discovery screen so the community has a choice to either use native or webView implementation.

The webView-based feature set includes:

  • The main landing Discover screen
  • Course info screen
  • Program info screen
  • Enrolment handling
  • External link handling

Implementation Key-Points

  • The native Discovery experience is the default for the repository
  • The Course Info and Program Info screens will be open in a separate view
  • Links are considered external if it has a different host URL or contains a query parameter of external_link=true
  • We have also introduced a new config for webView discovery:
DISCOVERY:
  TYPE: 'native'
  WEBVIEW:
    BASE_URL: ''
    COURSE_DETAIL_TEMPLATE: ''
    PROGRAM_DETAIL_TEMPLATE: ''

Acceptance Criteria

  • App behaviour to reflect flag settings as expected
  • Back navigation needs to be implemented on the webView screen.
  • If the URL directs to a link outside of the supported domain show a pop-up that you are being directed to the browser to the user.
  • On successful enrolment, the user should be directed to the enrolled course’s dashboard screen.

Notes

  • The enrollment won't work with RG Sandbox so you will have to shift to edX Sandbox for that only.
WebView.Discovery.mp4

@HamzaIsrar12 HamzaIsrar12 linked an issue Dec 13, 2023 that may be closed by this pull request
[Android] Webview Discovery Experience #149
Closed
k1rill
k1rill reviewed Dec 13, 2023
View reviewed changes
core/src/main/java/org/openedx/core/presentation/dialog/alert/ActionDialogFragment.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/presentation/dialog/alert/ActionDialogFragment.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/presentation/dialog/alert/ActionDialogFragment.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/presentation/dialog/alert/ActionDialogFragment.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/presentation/dialog/alert/ActionDialogFragment.kt Outdated Show resolved Hide resolved
course/src/main/java/org/openedx/course/presentation/info/CourseInfoViewModel.kt Outdated Show resolved Hide resolved
course/src/main/java/org/openedx/course/presentation/info/CourseInfoViewModel.kt Outdated Show resolved Hide resolved
course/src/main/java/org/openedx/course/presentation/info/CourseInfoViewModel.kt Outdated Show resolved Hide resolved
discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryViewModel.kt Outdated Show resolved Hide resolved
discovery/src/main/java/org/openedx/discovery/presentation/WebviewDiscoveryFragment.kt Outdated Show resolved Hide resolved
@HamzaIsrar12 HamzaIsrar12 requested a review from k1rill December 14, 2023 09:50
@HamzaIsrar12
Copy link
Contributor Author

@k1rill & @farhan-arshad-dev , I have updated the UI to address some bugs identified by the QA Team at TouchMedia and ensured consistency in the toolbar throughout the navigation.

k1rill
k1rill previously approved these changes Dec 22, 2023
View reviewed changes
farhan-arshad-dev
farhan-arshad-dev requested changes Dec 22, 2023
View reviewed changes
Copy link
Contributor

@farhan-arshad-dev farhan-arshad-dev left a comment

Choose a reason for hiding this comment

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

Some minor suggestions.

app/src/main/AndroidManifest.xml Show resolved Hide resolved
discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryFragment.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/system/DefaultWebViewClient.kt Show resolved Hide resolved
core/src/main/java/org/openedx/core/system/DefaultWebViewClient.kt Show resolved Hide resolved
discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryFragment.kt Show resolved Hide resolved
core/src/main/java/org/openedx/core/presentation/catalog/WebViewLink.kt Show resolved Hide resolved
course/src/main/java/org/openedx/course/presentation/info/CourseInfoFragment.kt Show resolved Hide resolved
course/src/main/java/org/openedx/course/presentation/info/CourseInfoFragment.kt Outdated Show resolved Hide resolved
course/src/main/java/org/openedx/course/presentation/info/CourseInfoFragment.kt Show resolved Hide resolved
@HamzaIsrar12
Copy link
Contributor Author

@volodymyr-chekyrta If it's approved on your end, feel free to merge the pull request.

@volodymyr-chekyrta
Copy link
Contributor

@HamzaIsrar12, could you please resolve the conflicts so we can merge this PR?

@HamzaIsrar12
build: Add Discovery Config
345d4f2 
Fixes: LEARNER-9716
@HamzaIsrar12
refactor: Move Composable from CourseUI to ComposeCommon
90979a5 
Fixes: LEARNER-9716
@HamzaIsrar12
feat: Add WebView based Discovery
92467b1 
Fixes": LEARNER-9716
@HamzaIsrar12
feat: Add Course and Program Info screen
5d45875 
Fixes": LEARNER-9716
@HamzaIsrar12
feat: Add feature for enrollment in a course
2e3c04c 
Fixes": LEARNER-9716
@HamzaIsrar12
feat: Handle External Links
bebd412 
Fixes": LEARNER-9716
@HamzaIsrar12
feat: Handle BackNavigation within Webview
f684952 
Fixes: LEARNER-9716
@HamzaIsrar12
feat: Persist WebView state on fragment transactions
7a9018a 
Fixes: LEARNER-9716
@HamzaIsrar12
feat: Open External Links in Browser
b8089a7 
Fixes: LEARNER-9716
@HamzaIsrar12
feat: Manage Course & Program links within Course & Program as well
148f028 
Fixes: LEARNER-9716
@HamzaIsrar12
refactor: Move InfoFragment's Config to ViewModel
94c569d 
Fixes: LEARNER-9716
@HamzaIsrar12
refactor: Move things around
963a923 
- Convert LiveData to SharedFlow
- Moved injections to ViewModel
- Added imports for Resource and Colors
- Refactored some code
- Made functions private

Fixes: LEARNER-9716
@HamzaIsrar12
fix: Toolbar position and webview bottom padding
702727b 
Fixes: LEARNER-9716
@HamzaIsrar12
refactor: Improve the UI to load Toolbars
fab88f8 
Fixes: LEARNER-9716
@HamzaIsrar12
Copy link
Contributor Author

@volodymyr-chekyrta You can merge this PR now. 🚀

@volodymyr-chekyrta volodymyr-chekyrta merged commit 36041a7 into openedx:develop Dec 27, 2023
3 checks passed
@HamzaIsrar12 HamzaIsrar12 deleted the hamza/LEARNER-9716 branch January 1, 2024 07:31
This was linked to issues Apr 4, 2024
[Android] Course Enrollment Page #130
Closed
[Android] Browse Catalog (filters or sorting, card groupings, trending tags) #129
Closed
[Android] Course Search #128
Closed
[Android] Program Enrollment Page #116
Closed
[Android] Program Catalog #115
Closed
[Android] Program Search #117
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@volodymyr-chekyrta volodymyr-chekyrta volodymyr-chekyrta approved these changes

@farhan-arshad-dev farhan-arshad-dev farhan-arshad-dev left review comments

@k1rill k1rill k1rill left review comments

@dixidroid dixidroid Awaiting requested review from dixidroid

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@HamzaIsrar12 @volodymyr-chekyrta @k1rill @farhan-arshad-dev