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

Fix part of #5344: Add classroom label to stories on view all screen #5502

Merged
merged 5 commits into from
Aug 23, 2024
Merged

Fix part of #5344: Add classroom label to stories on view all screen #5502

merged 5 commits into from
Aug 23, 2024

Conversation

theMr17
Copy link
Collaborator

@theMr17 theMr17 commented Aug 21, 2024

Explanation

Fixes part of #5344

This PR adds classroom label to the promoted stories on view all screen.

Screenshots

Light Mode Dark Mode
image image

Essential Checklist

  • The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • Any changes to scripts/assets files have their rationale included in the PR explanation.
  • The PR follows the style guide.
  • The PR does not contain any unnecessary code changes from Android Studio (reference).
  • The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
  • The PR is assigned to the appropriate reviewers (reference).

For UI-specific PRs only

If your PR includes UI-related changes, then:

  • Add screenshots for portrait/landscape for both a tablet & phone of the before & after UI changes
  • For the screenshots above, include both English and pseudo-localized (RTL) screenshots (see RTL guide)
  • Add a video showing the full UX flow with a screen reader enabled (see accessibility guide)
  • For PRs introducing new UI elements or color changes, both light and dark mode screenshots must be included
  • Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing

@theMr17 theMr17 requested a review from a team as a code owner August 21, 2024 11:33
@theMr17 theMr17 requested a review from adhiamboperes August 21, 2024 11:33
@theMr17 theMr17 mentioned this pull request Aug 21, 2024
Closed
@github-actions GitHub Actions
Copy link

Coverage Report

Results

Number of files assessed: 1
Overall Coverage: 0.00%
Coverage Analysis: PASS ✅

Exempted coverage

Files exempted from coverage
File Exemption Reason
PromotedStoryViewModel.ktapp/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt
 This file is exempted from having a test file; skipping coverage check.

Refer test_file_exemptions.textproto for the comprehensive list of file exemptions and their required coverage percentages.

@theMr17
Copy link
Collaborator Author

theMr17 commented Aug 21, 2024

@adhiamboperes PTAL.

@github-actions GitHub Actions
Copy link

Coverage Report

Results

Number of files assessed: 2
Overall Coverage: 0.00%
Coverage Analysis: PASS ✅

Exempted coverage

Files exempted from coverage
File Exemption Reason
PromotedStoryViewModel.ktapp/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt
 This file is exempted from having a test file; skipping coverage check.
RecentlyPlayedViewModel.ktapp/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedViewModel.kt
 This file is exempted from having a test file; skipping coverage check.

Refer test_file_exemptions.textproto for the comprehensive list of file exemptions and their required coverage percentages.

adhiamboperes
adhiamboperes requested changes Aug 22, 2024
View reviewed changes
Copy link
Collaborator

@adhiamboperes adhiamboperes left a comment

Choose a reason for hiding this comment

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

Thanks @theMr17! The code looks good. For the tests, please ensure the test names reflect feature flag on and off statuses, and the secoction e.g recently played, recommended stories etc. I have notice that tests have only been added for the feature flag on state.

@theMr17
Copy link
Collaborator Author

theMr17 commented Aug 22, 2024

Added tests for disabled feature flag as well, PTAL @adhiamboperes.

@theMr17 theMr17 assigned adhiamboperes and unassigned theMr17 Aug 22, 2024
adhiamboperes
adhiamboperes approved these changes Aug 22, 2024
View reviewed changes
Copy link
Collaborator

@adhiamboperes adhiamboperes left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@adhiamboperes adhiamboperes enabled auto-merge (squash) August 22, 2024 16:32
@oppiabot OppiaBot
Copy link

oppiabot bot commented Aug 22, 2024

Unassigning @adhiamboperes since they have already approved the PR.

@oppiabot oppiabot bot added the PR: LGTM label Aug 22, 2024
@oppiabot OppiaBot
Copy link

oppiabot bot commented Aug 22, 2024

Hi @theMr17, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to merge this PR once the CI checks pass and you're happy with it. Thanks!

@github-actions GitHub Actions
Copy link

Coverage Report

Results

Number of files assessed: 2
Overall Coverage: 0.00%
Coverage Analysis: PASS ✅

Exempted coverage

Files exempted from coverage
File Exemption Reason
PromotedStoryViewModel.ktapp/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt
 This file is exempted from having a test file; skipping coverage check.
RecentlyPlayedViewModel.ktapp/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedViewModel.kt
 This file is exempted from having a test file; skipping coverage check.

Refer test_file_exemptions.textproto for the comprehensive list of file exemptions and their required coverage percentages.

@github-actions GitHub Actions
Copy link

Coverage Report

Results

Number of files assessed: 2
Overall Coverage: 0.00%
Coverage Analysis: PASS ✅

Exempted coverage

Files exempted from coverage
File Exemption Reason
PromotedStoryViewModel.ktapp/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt
 This file is exempted from having a test file; skipping coverage check.
RecentlyPlayedViewModel.ktapp/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedViewModel.kt
 This file is exempted from having a test file; skipping coverage check.

Refer test_file_exemptions.textproto for the comprehensive list of file exemptions and their required coverage percentages.

@adhiamboperes adhiamboperes merged commit 6ce90ad into develop Aug 23, 2024
42 checks passed
@adhiamboperes adhiamboperes deleted the multiple-classrooms-view-all branch August 23, 2024 02:25
adhiamboperes pushed a commit to adhiamboperes/oppia-android that referenced this pull request Aug 24, 2024
@theMr17 @adhiamboperes
Fix part of oppia#5344: Add classroom label to stories on view all sc…
496ca4c 
…reen (oppia#5502)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

Fixes part of oppia#5344

This PR adds classroom label to the promoted stories on view all screen.

## Screenshots
|Light Mode|Dark Mode|
|--|--|

|![image](https://github.com/user-attachments/assets/c97cbdf7-4e2a-43bf-a3f4-d57c0c53811f)|![image](https://github.com/user-attachments/assets/caff0087-cf33-4de3-ad74-44fa375f4f7c)|

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- For PRs introducing new UI elements or color changes, both light and
dark mode screenshots must be included
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adhiamboperes adhiamboperes adhiamboperes approved these changes

Assignees

@theMr17 theMr17

Labels
PR: LGTM
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@theMr17 @adhiamboperes