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

Fixes #3895: Rich-text hyperlink text improvement #4486

Merged
merged 3 commits into from
Aug 2, 2022
Merged

Fixes #3895: Rich-text hyperlink text improvement #4486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b37cfe
Rich text changed for hyperlink text
vrajdesai78 Aug 2, 2022
9d5e8b8
Failing test fixed
vrajdesai78 Aug 2, 2022
f010dff
klint issue fixed
vrajdesai78 Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ class RevisionCardFragmentTest {
testCoroutineDispatchers.runCurrent()

onView(withId(R.id.revision_card_explanation_text)).check(
matches(withText(containsString("Learn more")))
matches(withText(containsString("Description of subtopic is here.")))
)
}
}
Expand All @@ -386,7 +386,7 @@ class RevisionCardFragmentTest {
testCoroutineDispatchers.runCurrent()

onView(withId(R.id.revision_card_explanation_text)).check(
matches(withText(containsString("Learn more")))
matches(withText(containsString("Description of subtopic is here.")))
)
}
}
Expand All @@ -403,7 +403,9 @@ class RevisionCardFragmentTest {
).use {
testCoroutineDispatchers.runCurrent()

onView(withId(R.id.revision_card_explanation_text)).perform(openClickableSpan("Learn more"))
onView(withId(R.id.revision_card_explanation_text)).perform(
openClickableSpan("This concept card demonstrates overall concept card functionality.")
)
testCoroutineDispatchers.runCurrent()

onView(withText("Concept Card")).inRoot(isDialog()).check(matches(isDisplayed()))
Expand All @@ -427,7 +429,9 @@ class RevisionCardFragmentTest {
onView(isRoot()).perform(orientationLandscape())
testCoroutineDispatchers.runCurrent()

onView(withId(R.id.revision_card_explanation_text)).perform(openClickableSpan("Learn more"))
onView(withId(R.id.revision_card_explanation_text)).perform(
openClickableSpan("This concept card demonstrates overall concept card functionality.")
)
testCoroutineDispatchers.runCurrent()

onView(withText("Concept Card")).inRoot(isDialog()).check(matches(isDisplayed()))
Expand Down
2 changes: 1 addition & 1 deletion domain/src/main/assets/GJ2rLXRKD5hw_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"page_contents": {
"subtitled_html": {
"content_id": "content",
"html": "<p>Description of subtopic is here. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;5RM9KPfQxobH&amp;quot;\" text-with-value=\"&amp;quot;Learn more&amp;quot;\"></oppia-noninteractive-skillreview></p>"
"html": "<p>Description of subtopic is here. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;5RM9KPfQxobH&amp;quot;\" text-with-value=\"&amp;quot;This concept card demonstrates overall concept card functionality.&amp;quot;\"></oppia-noninteractive-skillreview></p>"
},
"recorded_voiceovers": {
"voiceovers_mapping": {
Expand Down
2 changes: 1 addition & 1 deletion domain/src/main/assets/GJ2rLXRKD5hw_2.textproto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
subtopic_title: "Fractions of a group"
page_contents {
html: "<p>Description of subtopic is here. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;5RM9KPfQxobH&amp;quot;\" text-with-value=\"&amp;quot;Learn more&amp;quot;\"></oppia-noninteractive-skillreview></p>"
html: "<p>Description of subtopic is here. <oppia-noninteractive-skillreview skill_id-with-value=\"&amp;quot;5RM9KPfQxobH&amp;quot;\" text-with-value=\"&amp;quot;This concept card demonstrates overall concept card functionality.&amp;quot;\"></oppia-noninteractive-skillreview></p>"
content_id: "content"
}
recorded_voiceover {
Expand Down