Fix #3841: Combine time and quantity plurals

[aayushimathur6]

Explanation

Fixes #3841

This PR involves Combining plurals and quantity strings from:
<string name="time_ago">%s ago</string>

and

<plurals name="minutes">
  <item quantity="one">a minute</item>
  <item quantity="other">%s minutes</item>
</plurals>

to

 <plurals name="minutes_ago">
    <item quantity="one">a minute ago</item>
    <item quantity="other">%s minutes ago</item>
  </plurals>

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)
• Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing

BEFORE	AFTER

[adhiamboperes]

Thanks @aayushimathur6!

Some feedback:

• There are some failing tests in TextViewBindingAdaptersTest as a result of the change. Please run the test class locally to find the failing tests or Interpret the CI results.
• Please update the PR title as instructed in the essential checklist.

[oppiabot]

Unassigning @adhiamboperes since the review is done.

[oppiabot]

Hi @aayushimathur6, it looks like some changes were requested on this pull request by @adhiamboperes. PTAL. Thanks!

[aayushimathur6]

Thanks @aayushimathur6!

Some feedback:

• There are some failing tests in TextViewBindingAdaptersTest as a result of the change. Please run the test class locally to find the failing tests or Interpret the CI results.
• Please update the PR title as instructed in the essential checklist.

updated

[adhiamboperes]

Thanks @aayushimathur6.

This solution is still incomplete since the fun getPluralString is still accepting 2 seperate stings. Since the time_ago string is nolonger needed or used, you need to refactor getPluralString so that where we are currently passing time_ago we replace it with pluralsResId.

At the same time, you need to remove the TODO comment in that method so that the TODO check will not fail.

[aayushimathur6]

Thanks @aayushimathur6.

This solution is still incomplete since the fun getPluralString is still accepting 2 seperate stings. Since the time_ago string is nolonger needed or used, you need to refactor getPluralString so that where we are currently passing time_ago we replace it with pluralsResId.

At the same time, you need to remove the TODO comment in that method so that the TODO check will not fail.

done

[adhiamboperes]

Thanks @aayushimathur6, this looks good to me.

You are missing the screenshots that prove that the solution works. Can you add before(from develop) and after(from this branch) screenshots? They should show that the text displays correctly still, for both LTR and RTL.

[aayushimathur6]

Thanks @aayushimathur6, this looks good to me.

You are missing the screenshots that prove that the solution works. Can you add before(from develop) and after(from this branch) screenshots? They should show that the text displays correctly still, for both LTR and RTL.

done

[aayushimathur6]

Hi @aayushimathur6, it looks like some changes were requested on this pull request by @adhiamboperes. PTAL. Thanks!

Thanks @aayushimathur6.

This solution is still incomplete since the fun getPluralString is still accepting 2 seperate stings. Since the time_ago string is nolonger needed or used, you need to refactor getPluralString so that where we are currently passing time_ago we replace it with pluralsResId.

At the same time, you need to remove the TODO comment in that method so that the TODO check will not fail.

done

[oppiabot]

Unassigning @aayushimathur6 since a re-review was requested. @aayushimathur6, please make sure you have addressed all review comments. Thanks!

[adhiamboperes]

LGTM, thanks @aayushimathur6!

[oppiabot]

Unassigning @adhiamboperes since they have already approved the PR.

[oppiabot]

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