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.

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

Fix #5381 Talkback reads 14 underscore in a question in What is a ratio chapter #5553

Merged
merged 39 commits into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
d819e70
Merge pull request #1 from oppia/develop
subhajitxyz Jul 23, 2024
c6f54ea
Merge branch 'oppia:develop' into develop
subhajitxyz Jul 27, 2024
d44015b
Merge remote-tracking branch 'upstream/develop' into develop
subhajitxyz Aug 17, 2024
d604bc2
Merge pull request #2 from oppia/develop
subhajitxyz Aug 26, 2024
cc0ddef
Merge pull request #3 from oppia/develop
subhajitxyz Aug 26, 2024
52c6bb1
Merge pull request #4 from oppia/develop
subhajitxyz Aug 29, 2024
773c810
Merge remote-tracking branch 'upstream/develop' into develop
subhajitxyz Sep 5, 2024
56af5ae
Merge pull request #5 from oppia/develop
subhajitxyz Sep 16, 2024
3883f70
Merge pull request #6 from oppia/develop
subhajitxyz Sep 27, 2024
10c8e6e
Fix #5404: Migrate away from onBackPressed for remaining activities (…
dattasneha Oct 3, 2024
5e140e9
Fix #5404: Migrate away from onBackPressed for RevisionCardActivity (…
dattasneha Oct 9, 2024
b4ad7a3
Merge branch 'oppia:develop' into develop
subhajitxyz Oct 11, 2024
238645d
Merge pull request #8 from oppia/develop
subhajitxyz Oct 12, 2024
8d0328c
Add replaceRegexWithBlank function
subhajitxyz Oct 12, 2024
16230b7
Merge remote-tracking branch 'upstream/develop' into fix-talkback-read
subhajitxyz Oct 12, 2024
5a546b9
Merge pull request #9 from oppia/develop
subhajitxyz Nov 3, 2024
95d5d65
add test
subhajitxyz Nov 10, 2024
8c78531
correct klint
subhajitxyz Nov 10, 2024
94929f2
correct formatting
subhajitxyz Nov 10, 2024
6d0bea3
add spaces between functions
subhajitxyz Nov 10, 2024
2732fff
Merge branch 'develop' into fix-talkback-read
subhajitxyz Nov 10, 2024
944474b
add audio datasource
subhajitxyz Nov 10, 2024
7ee17ee
Merge branch 'fix-talkback-read' of https://github.com/subhajitxyz/op…
subhajitxyz Nov 10, 2024
31c5db1
change audio filename
subhajitxyz Nov 11, 2024
8706dff
added shodowmediaplayer resetStaticState
subhajitxyz Nov 11, 2024
e48f898
correct formatting
subhajitxyz Nov 11, 2024
a393924
Merge branch 'develop' into fix-talkback-read
subhajitxyz Nov 19, 2024
b1ca8e1
Merge pull request #10 from oppia/develop
subhajitxyz Nov 19, 2024
f730578
Merge branch 'develop' into fix-talkback-read
adhiamboperes Dec 2, 2024
ad7e380
Merge pull request #11 from oppia/develop
subhajitxyz Dec 11, 2024
b938a4c
Fix #5508: Skipping redundant code coverage and APK/AAB report commen…
Rd4dev Dec 12, 2024
fc2f932
Fix part of #4865: Use profileId in classroom activity and presenter …
tobioyelekan Dec 16, 2024
35f937b
Merge branch 'oppia:develop' into develop
subhajitxyz Dec 17, 2024
81d54c8
Merge branch 'develop' into fix-talkback-read
subhajitxyz Dec 17, 2024
33f0a8f
add practice 5 data source
subhajitxyz Dec 17, 2024
4605b28
Merge branch 'fix-talkback-read' of https://github.com/subhajitxyz/op…
subhajitxyz Dec 17, 2024
47a67b3
correct audio file name
subhajitxyz Dec 18, 2024
7e59fd6
Merge branch 'develop' into fix-talkback-read
subhajitxyz Dec 18, 2024
a00ae61
Merge branch 'develop' into fix-talkback-read
adhiamboperes Dec 23, 2024
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
Prev Previous commit
Next Next commit
Fix #5404: Migrate away from onBackPressed for RevisionCardActivity (#…
…5548)

<!-- 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 #5404 

This PR migrates deprecated `onBackPressed `usage to
`OnBackPressedDispatcher` callback in the RevisonCardActivity and
RevisionCardActivityPresenter.
## 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
dattasneha authored and subhajitxyz committed Oct 11, 2024
commit 5e140e989949bee89b1b266b535608bd2f839615
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.oppia.android.app.topic.revisioncard
import android.content.Context
import android.content.Intent
import android.os.Bundle
import androidx.activity.OnBackPressedCallback
import org.oppia.android.app.activity.ActivityComponentImpl
import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
import org.oppia.android.app.model.ProfileId
Expand Down Expand Up @@ -56,6 +57,15 @@ class RevisionCardActivity :
subtopicListSize
)
}
onBackPressedDispatcher.addCallback(
this,
object : OnBackPressedCallback(/* enabled = */ true) {
override fun handleOnBackPressed() {
revisionCardActivityPresenter.setReadingTextSizeMedium()
onReturnToTopicRequested()
}
}
)
}

override fun handleOnOptionsItemSelected(itemId: Int) {
Expand Down Expand Up @@ -115,13 +125,6 @@ class RevisionCardActivity :
revisionCardActivityPresenter.dismissConceptCard()
}

// TODO(#5404): Migrate to a back pressed dispatcher.
@Deprecated("Deprecated in Java")
override fun onBackPressed() {
revisionCardActivityPresenter.setReadingTextSizeMedium()
onReturnToTopicRequested()
}

override fun onDefaultFontSizeLoaded(readingTextSize: ReadingTextSize) {
revisionCardActivityPresenter.loadRevisionCardFragment(readingTextSize)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ class RevisionCardActivityPresenter @Inject constructor(
binding.revisionCardToolbar.setNavigationOnClickListener {
(activity as ReturnToTopicClickListener).onReturnToTopicRequested()
fontScaleConfigurationUtil.adjustFontScale(activity, ReadingTextSize.MEDIUM_TEXT_SIZE)
@Suppress("DEPRECATION") // TODO(#5404): Migrate to a back pressed dispatcher.
activity.onBackPressed()
activity.onBackPressedDispatcher.onBackPressed()
}
if (!accessibilityService.isScreenReaderEnabled()) {
binding.revisionCardToolbarTitle.setOnClickListener {
Expand Down