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 #2581: Marquee auto restart issue #4392

Merged
merged 56 commits into from
Sep 29, 2022

Conversation

KevinGitonga
Copy link
Contributor

@KevinGitonga KevinGitonga commented Jun 13, 2022

Explanation

Fix #2581
This fix introduces a custom View "MarqueeView" which acts as parent view for the textview in the toolbar this allows the MarqueeView to manipulate the child TextView and allow's it to marquee through translation animation if the text is long enough. It also solves the issue which we had which of text animating over the back navigation icon by attaching the textview inside a scrollview which allows it disappear cleanly without overlapping.

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 changes demonstration

marquue_restart_issue_bf.mp4

After changes demonstration

after_demo.mp4

After changes RTL demonstration

marquee_rtl_demo.mp4

rt4914
rt4914 previously requested changes Jun 13, 2022
Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

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

@KevinGitonga Suggested changes.

@rt4914 rt4914 assigned KevinGitonga and unassigned BenHenning Jun 13, 2022
@BenHenning BenHenning changed the title Fix marquee auto restart issue Fix #2581: Marquee auto restart issue Jun 14, 2022
@BenHenning
Copy link
Member

Thanks @KevinGitonga. Left one comment--please also add tests once we land on a final solution.

Note that in the future I suggest only sending a PR for review once it's completed from your perspective (which includes adding tests). If you'd like first thoughts on a PR as you're finishing (e.g. before tests are written), I suggest marking the PR as a 'draft' and explicitly mentioning when assigning reviewers that you'd like their initial thoughts. This helps better communicate expectations and ensure that reviewers are giving you the type of feedback that you're looking for.

@BenHenning BenHenning removed their assignment Jun 22, 2022
@oppiabot
Copy link

oppiabot bot commented Jun 29, 2022

Hi @KevinGitonga, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added stale Corresponds to items that haven't seen a recent update and may be automatically closed. and removed stale Corresponds to items that haven't seen a recent update and may be automatically closed. labels Jun 29, 2022
Copy link
Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @KevinGitonga. Just had a few follow-up comments--PTAL.

app/src/main/res/layout-sw600dp/story_fragment.xml Outdated Show resolved Hide resolved
WORKSPACE Show resolved Hide resolved
app/build.gradle Outdated Show resolved Hide resolved
@KevinGitonga
Copy link
Contributor Author

@BenHenning have added tests and shallow_since config PTAL.

Copy link
Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @KevinGitonga! I think this has turned into quite a nice solution. LGTM.

@BenHenning BenHenning assigned rt4914 and unassigned BenHenning Sep 29, 2022
@BenHenning
Copy link
Member

@rt4914 since you requested changes, could you please take another look?

@BenHenning BenHenning dismissed rt4914’s stale review September 29, 2022 01:43

Dismissing since Rajat is out, and original concerns seem addressed.

@BenHenning
Copy link
Member

Actually, dismissing @rt4914's review since his original concerns seem addressed and he's on holiday at the moment.

Rajat: if you have any follow-up concerns, please be sure to let @KevinGitonga know.

Going ahead and merging this.

@BenHenning BenHenning merged commit 846657e into oppia:develop Sep 29, 2022
BenHenning added a commit that referenced this pull request Nov 17, 2022
This reverts commit 846657e.

Conflicts:
	app/src/main/res/layout/license_text_viewer_activity.xml
	app/src/main/res/layout/revision_card_activity.xml
BenHenning added a commit that referenced this pull request Nov 18, 2022
)

## Explanation
Fixes #4709

This reverts commit 846657e from PR
#4392. See
#4709 (comment)
for a detailed explanation for why this reversion is the correct
approach.

Note that this PR will be cherry-picked into the 0.10 release branch for
the upcoming MR2 beta release.

## Essential Checklist
- [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
This is a mostly clean reversion of #4392, so see that PR for an idea on
how marquees behaved prior to that PR (as this PR returns the app to
that behavior).
BenHenning added a commit that referenced this pull request Nov 18, 2022
)

## Explanation
Fixes #4709

This reverts commit 846657e from PR
#4392. See
#4709 (comment)
for a detailed explanation for why this reversion is the correct
approach.

Note that this PR will be cherry-picked into the 0.10 release branch for
the upcoming MR2 beta release.

## Essential Checklist
- [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
This is a mostly clean reversion of #4392, so see that PR for an idea on
how marquees behaved prior to that PR (as this PR returns the app to
that behavior).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Marquee restarts automatically in certain scenarios.
4 participants