-
Notifications
You must be signed in to change notification settings - Fork 521
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
<!-- 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 #5344 - Introduces models for `ClassroomIdList`, `ClassroomSummary`, & `EphemeralClassroomSummary` and updates `ClassroomList` to contain a list of `EphemeralClassroomSummary`s and a `written_translation_context`. - Topic and Story models are updated to include reference to `classroomId` & `classroomTitle`. - Test json & textproto data files are also added for 3 test classrooms, alongwith updating existing topic data files to include classroom information. ## 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
- Loading branch information
Showing
13 changed files
with
396 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,3 @@ | ||
{ | ||
"classrooms": [{ | ||
"id": "test_classroom_id_0", | ||
"topic_prerequisites": { | ||
"test_topic_id_0": ["GJ2rLXRKD5hw"], | ||
"test_topic_id_1": ["test_topic_id_0", "omzF4oqgeTXd"], | ||
"test_topic_id_2": [], | ||
"GJ2rLXRKD5hw": [], | ||
"omzF4oqgeTXd": [] | ||
} | ||
}] | ||
"classroom_id_list": ["test_classroom_id_0", "test_classroom_id_1", "test_classroom_id_2"] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,3 @@ | ||
classrooms { | ||
id: "test_classroom_id_0" | ||
topic_prerequisites { | ||
key: "test_topic_id_0" | ||
value { | ||
topic_ids: "GJ2rLXRKD5hw" | ||
} | ||
} | ||
topic_prerequisites { | ||
key: "test_topic_id_1" | ||
value { | ||
topic_ids: "test_topic_id_0" | ||
topic_ids: "omzF4oqgeTXd" | ||
} | ||
} | ||
topic_prerequisites { | ||
key: "test_topic_id_2" | ||
value { | ||
} | ||
} | ||
topic_prerequisites { | ||
key: "GJ2rLXRKD5hw" | ||
value { | ||
} | ||
} | ||
topic_prerequisites { | ||
key: "omzF4oqgeTXd" | ||
value { | ||
} | ||
} | ||
} | ||
classroom_ids: "test_classroom_id_0" | ||
classroom_ids: "test_classroom_id_1" | ||
classroom_ids: "test_classroom_id_2" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"classroom_id": "test_classroom_id_0", | ||
"classroom_title": { | ||
"content_id": "classroom_title", | ||
"html": "Science" | ||
}, | ||
"thumbnail_bg_color": "#00FFFFFF", | ||
"thumbnail_filename": "", | ||
"topic_prerequisites": { | ||
"test_topic_id_0": ["GJ2rLXRKD5hw"], | ||
"test_topic_id_1": ["test_topic_id_0", "omzF4oqgeTXd"] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
id: "test_classroom_id_0" | ||
translatable_title { | ||
content_id: "classroom_title" | ||
html: "Science" | ||
} | ||
classroom_thumbnail { | ||
} | ||
topic_prerequisites { | ||
key: "test_topic_id_0" | ||
value { | ||
topic_ids: "GJ2rLXRKD5hw" | ||
} | ||
} | ||
topic_prerequisites { | ||
key: "test_topic_id_1" | ||
value { | ||
topic_ids: "test_topic_id_0" | ||
topic_ids: "omzF4oqgeTXd" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"classroom_id": "test_classroom_id_1", | ||
"classroom_title": { | ||
"content_id": "classroom_title", | ||
"html": "Maths" | ||
}, | ||
"thumbnail_bg_color": "#00FFFFFF", | ||
"thumbnail_filename": "", | ||
"topic_prerequisites": { | ||
"GJ2rLXRKD5hw": [], | ||
"omzF4oqgeTXd": [] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
id: "test_classroom_id_1" | ||
translatable_title { | ||
content_id: "classroom_title" | ||
html: "Maths" | ||
} | ||
classroom_thumbnail { | ||
} | ||
topic_prerequisites { | ||
key: "GJ2rLXRKD5hw" | ||
value { | ||
} | ||
} | ||
topic_prerequisites { | ||
key: "omzF4oqgeTXd" | ||
value { | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"classroom_id": "test_classroom_id_2", | ||
"classroom_title": { | ||
"content_id": "classroom_title", | ||
"html": "English" | ||
}, | ||
"thumbnail_bg_color": "#00FFFFFF", | ||
"thumbnail_filename": "", | ||
"topic_prerequisites": { | ||
"test_topic_id_2": [] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
id: "test_classroom_id_2" | ||
translatable_title { | ||
content_id: "classroom_title" | ||
html: "English" | ||
} | ||
classroom_thumbnail { | ||
} | ||
topic_prerequisites { | ||
key: "test_topic_id_2" | ||
value { | ||
} | ||
} |
Oops, something went wrong.