Fix #4532: Prevent multiple concept card fragments #4939

masclot · 2023-04-06T13:52:39Z

Explanation

Fix #4532: only allow one concept card open at a time. If the new new concept card has the same skill id as an existing one, do not open and instead reuse the existing one.

I modified a couple of concept card data for dev so that they link to each other. This change is not necessary for this PR to work, but it allows manually testing the scenario where a concept car links to another.

Current behavior:
multiple concept cards allowed, even with same skill id.webm

New behavior:
ConceptCard deduplication demo.webm

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

Checking out the latest code in 'develop'

Update repository

… This prevents opening two dialog fragments on double click.

BenHenning · 2023-04-11T04:06:18Z

@masclot is this ready for review or did you open the draft so that people can help with specific parts? Just wanted to make sure that we aren't inadvertently ignoring this. :)

masclot · 2023-04-11T05:19:31Z

@masclot is this ready for review or did you open the draft so that people can help with specific parts? Just wanted to make sure that we aren't inadvertently ignoring this. :)

It is not ready. Since the change is not trivial, I just wanted to show what my idea is, so that I get early comments. @adhiamboperes already commented on chat.

…wn tag. Allow to switch concept cards by reusing instances instead of creating a new one each time.

- Modify two test concept cards to link to each other; this allows testing the functionality - Only allow one concept card at a time

- Finish implementation - Add unit tests

masclot · 2023-04-16T16:19:19Z

@adhiamboperes PTAL

masclot · 2023-04-16T16:19:29Z

@BenHenning PTAL

masclot · 2023-04-16T18:41:42Z

The error in the checks seems to be temporal:

# A fatal error has been detected by the Java Runtime Environment:
#
# SIGSEGV (0xb) at pc=0x00007f02ba37d3e0, pid=2671, tid=2685

Could anybody rerun them?

adhiamboperes

Thanks @masclot! I took a first pass, and I'll be able to provide more specific feedback in the next pass.

Since you've made changes to scripts/assets files , please have their rationale included in the PR explanation.
There are some unrelated commits/changes, please remove them.

oppiabot · 2023-04-17T19:56:37Z

Unassigning @adhiamboperes since the review is done.

oppiabot · 2023-04-17T19:56:40Z

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

BenHenning

Thanks @masclot! Just had a few follow-ups--PTAL.

app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragment.kt

app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt

app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragment.kt

app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivity.kt

masclot · 2023-04-28T09:35:39Z

Addressed the last two conversations.
@BenHenning PTAL

BenHenning

Thanks @masclot! Really sorry for the delayed review here.

The PR LGTM, but had 1 nit left and I think the branch needs to be brought up-to-date with the latest develop changes. Please assign back once both are done and I'll go ahead and kick-off the merge.

app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt

masclot · 2023-05-04T08:41:25Z

Thanks @masclot! Really sorry for the delayed review here.

The PR LGTM, but had 1 nit left and I think the branch needs to be brought up-to-date with the latest develop changes. Please assign back once both are done and I'll go ahead and kick-off the merge.

I addressed the comment. Regarding "bringing the branch up-to-date with the latest develop changes", I'm not sure I'm doing it right. In Android Studio, I checked out my develop branch and clicked "Update" on it. I then checked-out the branch for this change and also clicked "Update". Would that be enough?

masclot · 2023-05-04T10:38:07Z

I don't think Android Studio -> <branch-name> -> Update does a merge. This menu is what oppia documentation says we should do in Android Studio to update our repository: https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#making-a-local-code-change-using-android-studios-ui-based-github-workflow

Instead I did the following in Android Studio:

checkout develop
fetch
merge upsteam/develop
checkout <my-branch>
fetch
merge develop

I hope these steps are good. Please let me know otherwise.

BenHenning

Thanks @masclot! Re: updating the branch, I think we have instructions in the wiki for this but I can't find them off hand at the moment (@MohitGupta121 might you know?). We generally recommend doing this via Git CLI since it's easier to "debug" when something goes wrong, and I'm less familiar with the Android Studio Git interface.

PR LGTM!

BenHenning · 2023-05-09T03:00:24Z

Updating to latest develop & enabling auto-merge.

oppiabot · 2023-05-09T03:03:14Z

Unassigning @BenHenning since they have already approved the PR.

oppiabot · 2023-05-09T03:03:18Z

Hi @masclot, 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!

masclot and others added 8 commits January 20, 2023 11:11

Merge sw600 versions of profile_chooser_fragment.xml

90485b8

Merge branch 'oppia:develop' into merge-profile-chooser-xml

0798b59

Merge remote-tracking branch 'upstream/develop' into develop

5b31560

Checking out the latest code in 'develop'

Merge remote-tracking branch 'upstream/develop' into develop

67e9d7b

Merge remote-tracking branch 'upstream/develop' into develop

8e0c79c

Update repository

Do not open a child fragment if one with the same tag already exists.…

25cb49e

… This prevents opening two dialog fragments on double click.

Fix line length

0f3faa4

Fix formatting issues

9bc3bdd

masclot requested a review from BenHenning as a code owner April 6, 2023 13:52

masclot marked this pull request as draft April 6, 2023 13:52

masclot added 5 commits April 11, 2023 11:52

Add support for multiple, simultaneous concept cards, each with its o…

9ea7967

…wn tag. Allow to switch concept cards by reusing instances instead of creating a new one each time.

Fix formatting.

2d58a56

Two things:

744a309

- Modify two test concept cards to link to each other; this allows testing the functionality - Only allow one concept card at a time

Two things:

d0acadc

- Finish implementation - Add unit tests

Fix formatting

23bae3f

masclot changed the title ~~Fix part of #4532: Prevent multiple revision card fragments~~ Fix #4532: Prevent multiple revision card fragments Apr 16, 2023

masclot changed the title ~~Fix #4532: Prevent multiple revision card fragments~~ Fix #4532: Prevent multiple concept card fragments Apr 16, 2023

masclot marked this pull request as ready for review April 16, 2023 16:18

masclot assigned BenHenning and adhiamboperes Apr 16, 2023

Fix static check: use InjectableDialogFragment instead of DialogFragment

c366f27

adhiamboperes requested changes Apr 17, 2023

View reviewed changes

oppiabot bot unassigned adhiamboperes Apr 17, 2023

BenHenning reviewed Apr 25, 2023

View reviewed changes

BenHenning assigned adhiamboperes and masclot and unassigned BenHenning and adhiamboperes Apr 25, 2023

Address PR comments

073730d

masclot assigned BenHenning and unassigned masclot Apr 28, 2023

BenHenning reviewed May 3, 2023

View reviewed changes

app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt Outdated Show resolved Hide resolved

BenHenning assigned masclot and unassigned BenHenning May 3, 2023

Address PR comments

251ac60

masclot added 2 commits May 4, 2023 10:51

Merge remote-tracking branch 'upstream/develop' into develop

763eba6

Merge branch 'develop' into fix_double_click_in_card

be35c9c

masclot assigned BenHenning and unassigned masclot May 4, 2023

BenHenning approved these changes May 9, 2023

View reviewed changes

Merge branch 'develop' into fix_double_click_in_card

5ad7089

BenHenning enabled auto-merge (squash) May 9, 2023 03:00

oppiabot bot unassigned BenHenning May 9, 2023

oppiabot bot added the PR: LGTM label May 9, 2023

oppiabot bot assigned masclot May 9, 2023

Merge branch 'develop' into fix_double_click_in_card

9ee916a

BenHenning merged commit ac4eb44 into oppia:develop May 9, 2023
40 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #4532: Prevent multiple concept card fragments #4939

Fix #4532: Prevent multiple concept card fragments #4939

masclot commented Apr 6, 2023 •

edited

BenHenning commented Apr 11, 2023 •

edited

masclot commented Apr 11, 2023

masclot commented Apr 16, 2023

masclot commented Apr 16, 2023

masclot commented Apr 16, 2023 •

edited

adhiamboperes left a comment

oppiabot bot commented Apr 17, 2023

oppiabot bot commented Apr 17, 2023

BenHenning left a comment

masclot commented Apr 28, 2023

BenHenning left a comment

masclot commented May 4, 2023

masclot commented May 4, 2023 •

edited

BenHenning left a comment

BenHenning commented May 9, 2023

oppiabot bot commented May 9, 2023

oppiabot bot commented May 9, 2023

Fix #4532: Prevent multiple concept card fragments #4939

Fix #4532: Prevent multiple concept card fragments #4939

Conversation

masclot commented Apr 6, 2023 • edited

Explanation

Essential Checklist

For UI-specific PRs only

BenHenning commented Apr 11, 2023 • edited

masclot commented Apr 11, 2023

masclot commented Apr 16, 2023

masclot commented Apr 16, 2023

masclot commented Apr 16, 2023 • edited

adhiamboperes left a comment

Choose a reason for hiding this comment

oppiabot bot commented Apr 17, 2023

oppiabot bot commented Apr 17, 2023

BenHenning left a comment

Choose a reason for hiding this comment

masclot commented Apr 28, 2023

BenHenning left a comment

Choose a reason for hiding this comment

masclot commented May 4, 2023

masclot commented May 4, 2023 • edited

BenHenning left a comment

Choose a reason for hiding this comment

BenHenning commented May 9, 2023

oppiabot bot commented May 9, 2023

oppiabot bot commented May 9, 2023

masclot commented Apr 6, 2023 •

edited

BenHenning commented Apr 11, 2023 •

edited

masclot commented Apr 16, 2023 •

edited

masclot commented May 4, 2023 •

edited