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: Added webView based myPrograms #176

Merged
merged 13 commits into from
Jan 22, 2024
Merged

feat: Added webView based myPrograms #176

merged 13 commits into from
Jan 22, 2024

Conversation

omerhabib26
Copy link
Contributor

@omerhabib26 omerhabib26 commented Jan 7, 2024 •
edited
Loading

Description:

  • Create Separate directories for Dashboard & MyPrograms
  • Added webView-based myPrograms
  • Added config dic for myPrograms
  • Move URI_SCHEME to class level in config
  • Update TestCases for some classes

Ref: Issue: 157

HamzaIsrar12
HamzaIsrar12 requested changes Jan 8, 2024
View reviewed changes
Copy link
Contributor

@HamzaIsrar12 HamzaIsrar12 left a comment

Choose a reason for hiding this comment

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

Points from manual & initial review:

  • Please implement swipe refresh for Program screen
  • Program WebView:
    1. Clicking on an enrolled course should redirect that course
    2. Clicking on an un-erolled course should redirect to Discover's course info screen
    3. Clicking on enroll button should enrol and redirect the user to that course

app/src/main/java/org/openedx/app/MainFragment.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/config/ProgramConfig.kt Outdated Show resolved Hide resolved
dashboard/src/main/java/org/openedx/dashboard/presentation/program/ProgramFragment.kt Outdated Show resolved Hide resolved
dashboard/src/main/java/org/openedx/dashboard/presentation/program/ProgramFragment.kt Outdated Show resolved Hide resolved
dashboard/src/main/java/org/openedx/dashboard/presentation/program/ProgramFragment.kt Outdated Show resolved Hide resolved
dashboard/src/main/java/org/openedx/dashboard/presentation/program/ProgramFragment.kt Outdated Show resolved Hide resolved
HamzaIsrar12
HamzaIsrar12 requested changes Jan 9, 2024
View reviewed changes
Copy link
Contributor

@HamzaIsrar12 HamzaIsrar12 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Features to look into:

  • Swipe to refresh
  • Snackbar after successful course enrollment
  • "Explore new Courses" button in Programs WebView

discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryFragment.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/presentation/catalog/CatalogWebView.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/ui/ComposeCommon.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/ui/ComposeCommon.kt Show resolved Hide resolved
course/src/main/java/org/openedx/course/presentation/info/CourseInfoFragment.kt Show resolved Hide resolved
core/src/main/java/org/openedx/core/presentation/catalog/WebViewLink.kt Outdated Show resolved Hide resolved
HamzaIsrar12
HamzaIsrar12 requested changes Jan 11, 2024
View reviewed changes
Copy link
Contributor

@HamzaIsrar12 HamzaIsrar12 left a comment

Choose a reason for hiding this comment

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

Minor nits only.

app/src/main/java/org/openedx/app/MainFragment.kt Outdated Show resolved Hide resolved
app/src/main/java/org/openedx/app/MainViewModel.kt Outdated Show resolved Hide resolved
app/src/main/java/org/openedx/app/MainViewModel.kt Outdated Show resolved Hide resolved
dashboard/src/main/java/org/openedx/dashboard/notifier/DashboardEvent.kt Outdated Show resolved Hide resolved
dashboard/src/main/java/org/openedx/dashboard/presentation/dashboard/DashboardViewModel.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/presentation/catalog/CatalogWebView.kt Outdated Show resolved Hide resolved
k1rill
k1rill reviewed Jan 15, 2024
View reviewed changes
Copy link
Contributor

@k1rill k1rill left a comment

Choose a reason for hiding this comment

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

only some nits

course/src/main/java/org/openedx/course/presentation/info/CourseInfoViewModel.kt Show resolved Hide resolved
dashboard/src/main/java/org/openedx/dashboard/presentation/program/ProgramViewModel.kt Outdated Show resolved Hide resolved
dashboard/src/main/java/org/openedx/dashboard/presentation/program/ProgramFragment.kt Outdated Show resolved Hide resolved
dashboard/src/main/java/org/openedx/dashboard/presentation/program/ProgramFragment.kt Show resolved Hide resolved
HamzaIsrar12
HamzaIsrar12 previously approved these changes Jan 15, 2024
View reviewed changes
Copy link
Contributor

@HamzaIsrar12 HamzaIsrar12 left a comment

Choose a reason for hiding this comment

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

Approved from my side, please proceed with the merge after addressing Kirill's feedback. 🚀

@miankhalid miankhalid linked an issue Jan 16, 2024 that may be closed by this pull request
[Android] Webview Programs Experience #157
Closed
1 task
volodymyr-chekyrta
volodymyr-chekyrta reviewed Jan 22, 2024
View reviewed changes
app/src/main/java/org/openedx/app/di/AppModule.kt Outdated
@@ -153,4 +157,6 @@ val appModule = module {
factory { FacebookAuthHelper() }
factory { GoogleAuthHelper(get()) }
factory { MicrosoftAuthHelper() }

single<EnrollInCourseInteractor> { get<CourseInteractor>() }
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to keep this dependency as a singleton?
CourseInteractor, by nature, does not keep any state or data, so it seems there is no reason to keep EnrollInCourseInteractor as singleton.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated

k1rill
k1rill previously approved these changes Jan 22, 2024
View reviewed changes
@k1rill k1rill self-requested a review January 22, 2024 12:42
k1rill
k1rill previously approved these changes Jan 22, 2024
View reviewed changes
@omerhabib26
feat: add config for myPrograms
81a8583 
- Add config dict for myPrograms
- Move URI_SCHEME to file level

fix: LEARNER-9715
@omerhabib26
feat: move dashboard to a separate directory
9d60ecc 
- Move dashboard files to a separate directory
- Updated test cases where needed

fix: LEARNER-9715
@omerhabib26
feat: added webView based MyPrograms
d2c9c17 
- Added webView based myPrograms
- Behavior reflects the current prod app behaviour

fix: LEARNER-9715
@omerhabib26
fix: update DashboardRouter path
9213027
@omerhabib26
refactor: optimise toolbar with back button
41d0717
@omerhabib26 omerhabib26 dismissed stale reviews from k1rill and volodymyr-chekyrta January 22, 2024 13:08

The merge-base changed after approval.

@omerhabib26 omerhabib26 merged commit 1948e3c into openedx:develop Jan 22, 2024
3 checks passed
@omerhabib26 omerhabib26 deleted the omer/LEARNER-9715 branch January 22, 2024 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@HamzaIsrar12 HamzaIsrar12 HamzaIsrar12 approved these changes

@farhan-arshad-dev farhan-arshad-dev farhan-arshad-dev approved these changes

@volodymyr-chekyrta volodymyr-chekyrta volodymyr-chekyrta left review comments

@k1rill k1rill k1rill left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Android] Webview Programs Experience
5 participants
@omerhabib26 @k1rill @farhan-arshad-dev @HamzaIsrar12 @volodymyr-chekyrta