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 part of #3602: Add label for all non-test activities for Profile Edit Activity #4783

Closed
wants to merge 33 commits into from
Closed

Fix part of #3602: Add label for all non-test activities for Profile Edit Activity #4783

wants to merge 33 commits into from

Conversation

deonwaju
Copy link
Collaborator

@deonwaju deonwaju commented Dec 9, 2022

Explanation

Fix part of #3602: Add label for all non-test activities for Profile Edit Activity

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).

@deonwaju deonwaju requested a review from BenHenning as a code owner December 9, 2022 13:12
model/build.gradle Outdated Show resolved Hide resolved
@MohitGupta121 MohitGupta121 self-assigned this Dec 9, 2022
@MohitGupta121
Copy link
Member

MohitGupta121 commented Dec 9, 2022

@deonwaju can you please tag issue number using # in PR description.

PTAL, I added review.

@deonwaju deonwaju changed the title Add label for all non-test activities for Profile Edit Activity #3602 Add label for all non-test activities for Profile Edit Activity #4783 Dec 9, 2022
@MohitGupta121 MohitGupta121 self-requested a review December 10, 2022 03:36
.gitignore Outdated Show resolved Hide resolved
@deonwaju deonwaju changed the title Add label for all non-test activities for Profile Edit Activity #4783 Fix part of #4783 Add label for all non-test activities for Profile Edit Activity Dec 10, 2022
@deonwaju deonwaju changed the title Fix part of #4783 Add label for all non-test activities for Profile Edit Activity Fix part of #4783: Add label for all non-test activities for Profile Edit Activity Dec 10, 2022
@deonwaju deonwaju changed the title Fix part of #4783: Add label for all non-test activities for Profile Edit Activity Fix part of #3602: Add label for all non-test activities for Profile Edit Activity Dec 10, 2022
JishnuGoyal and others added 19 commits January 9, 2023 21:19
… no next revision card (#4743)

## Explanation
Fixes #4645 

This PR hides the "Continue Studying" text when there is only one
revision card in the list. It does so by adding a condition to the
visibility of this view inside the corresponding xml file. This PR is
backed up by unit tests.

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

Before

![image](https://user-images.githubusercontent.com/64526117/202563107-452cbbf0-aa14-43cb-91c6-6b256061851f.png)

After

![image](https://user-images.githubusercontent.com/64526117/202565577-00b2299e-f92f-4dcf-9f0a-30830641e191.png)
)

## 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).
## Explanation
Updates version codes for RC02 of Beta MR2 (since cherry-picks were
needed).

## 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: ...".)~
- [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".
- [ ] ~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
N/A -- This is an infrastructural change that doesn't affect the user
experience.
## Explanation
Fixes #4746

This PR updates the app to target SDK 31 instead of 30 as this is now
required for continued Play Store releases.

Verification from the PR standpoint heavily relies on CI checks passing.
Beyond that, manual testing is needed to ensure no Android behavior
changes have led to regressions or new breakages.

This PR does NOT include updating Robolectric tests to run on SDK 31
since it's actually much harder than I had expected, and would lead to
potential production-affecting changes (as it would require updating
Kotlin & potentially other dependencies). #4748 is tracking fixing this
in the long-term.

## 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
N/A, mostly. While this is an infrastructure change, Android component
behaviors change with different target SDKs so it's quite possible for
there to be UI regressions or issues. Fortunately, most of the UI used
by the app is material and Jetpack (meaning it ships with the app and
will be mostly unaffected by target SDK changes).
<!-- 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 #4445

This PR is part of the GSoC project: Interactive Onboarding Flow which
fixes #4445. It does so by creating a new custom view which connects to
the `ContinueInteractionItemViewModel`, which receives a flag to start
animating from the explorationProgressController. We wait for 45 seconds
when the first card of a lesson is opened by the user, and then start
the animation for the continue button.

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


https://user-images.githubusercontent.com/64526117/202579860-643e2d20-b969-438d-be86-f690630b8278.mp4

Co-authored-by: Ben Henning <[email protected]>
Co-authored-by: Ben Henning <[email protected]>
## Explanation

Fixes #2546 

Rename instances of ../recentlyplayed/OngoingStory to PromotedStory.

- [x] ongoingStoryListSummaryResultLiveData =>
promotedStoryListSummaryResultLiveData
- [x] fun subscribeToOngoingStoryList => fun
subscribeToPromotedStoryList in RecentlyPlayedFragmentPresenter
- [x] fun subscribeToOngoingStoryList => fun
subscribeToPromotedStoryList in RecentlyPlayedFragment
- [x] class name OngoingStoryViewModel => PromotedStoryViewModel
- [x] class name OngoingListAdapter => PromotedStoryListAdapter
- [x] private class OngoingStoryViewHolder => PromotedStoryViewHolder
- [x] interface name OngoingStoryClickListener =>
PromotedStoryClickListener

Note: `ongoing_story_card` is used to show stories in the "recently
played screen", under "Played within the last week and recommended
stories", shown when a user clicks "View all promoted stories" from the
home screen. I have renamed it to `recently_played_story_card.xml`.

`promoted_story_card.xml` is the layout file used to show promoted
stories on the home page.

I removed `PromotedStoryClickListener`, `PromotedStoryListAdapter` and
`PromotedStoryViewModel` from Kdoc excemption since the kdocs have been
added.

## 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)).

Co-authored-by: Ben Henning <[email protected]>
## Explanation
Fixes #4750

This PR fixes issues that were introduced in #4747 when trying to use
the app on an actual API 31 device. The problems come from two breaking
changes in Android 12:
- Public activities, services, and providers must be marked as exported
(this only affected our SplashActivity).
- PendingIntents must be explicitly marked as mutable/immutable (this
only affects WorkManager, but that's tricky for us).

The WorkManager issue was fixed in version 2.7.0 (where we currently
depend on version 2.4.0), but we can't actually updated in a way that
would be low-risk to cherry-pick (since it would require updating our
Kotlin SDK to 1.5.x instead of 1.4.x). A safer option is to disable
WorkManager outright, but while doing this I discovered that we have
unrestricted getInstance() calls that will force WorkManager to get
created regardless. This was fixed by introducing a new
analytics-specific application creation listener and ensuring those do
not get called for SDK 31+. #4751 is tracking fixing this longer term.
Approximately 9% of our users will have analytics disabled until we
properly fix it & push a new release.

Note that I opted for a fix-forward instead of rolling back #4747 since
these are small PRs that need to be easily cherry-picked, and it's
guaranteed that the target SDK change be isolated to SDK 31 devices (so
developers would still be able to use the app on lower versions).

Proper testing for ensuring this works requires manual testing, for now
(as we don't have automated end-to-end tests). I manually verified that
the app opens and can be used on Android 12. One test exemption was
added for the new listener since it's an interface and thus not
testable.

A new regex check was also added to ensure WorkManager.getInstance calls
always go through the new listener to avoid future situations where they
can accidentally trigger an instance creation when it's not wanted.

## 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 mainly an infrastructural change as it's literally fixing
whether the app can open at all on SDK 31+ devices, so there's not much
to show.
## Explanation
Fixes #4756

This PR introduces a new event for tracking individual play sessions
where a learner has reached a level of 'invested' engagement, where
'invested' here is considered to be strong engagement with a likelihood
of continuing at least with that play session.

This metric is planned to be used as one of the team's conversion
metrics to better help track the user marketing pipeline by helping to
determine how we can better reach learners who are more likely to reach
this level of engagement with lessons (and, thus, hopefully learn what
they need to).

Note that the event is based on a single play session, not a profile or
even a single exploration (so if a user pauses and resumes an
exploration, the count for engagement resets **from that point**).
Engagement means completing _and_ moving past at minimum 3 cards (which
may just be simple 'Continue' button interactions).

For simplicity, this PR keeps the new event name the same between the
Kenya & non-Kenya styles of naming events.

I've verified that the event is logging as expected using Firebase's
DebugView:


![image](https://user-images.githubusercontent.com/12983742/203501899-dbccd386-4e04-4966-82bc-a4646b3b742c.png)

## 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 PR is introducing a log and has no impact on the UI or UX of the
app.
<!-- 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 #4764

Updated screenshots:

![WhatsApp Image 2022-11-26 at 5 07 26 PM
(1)](https://user-images.githubusercontent.com/64526117/204086939-e5433525-0f28-4686-b599-4515e26cb173.jpeg)
![WhatsApp Image 2022-11-26 at 5 07 26
PM](https://user-images.githubusercontent.com/64526117/204086940-3fd0bb20-e15d-4a6f-a7b5-bd7237f0350c.jpeg)
![WhatsApp Image 2022-11-26 at 5 07 25 PM
(1)](https://user-images.githubusercontent.com/64526117/204086942-64611338-c428-4e11-9646-65fdea536c61.jpeg)
![WhatsApp Image 2022-11-26 at 5 07 25
PM](https://user-images.githubusercontent.com/64526117/204086943-5f09b2a3-c4d5-4c8d-974b-bcf74adfd8b9.jpeg)

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

Portrait

![WhatsApp Image 2022-11-25 at 10 28 03 PM
(1)](https://user-images.githubusercontent.com/64526117/204029760-d312e050-72b6-42d1-84bf-5cf96080eee7.jpeg)
![WhatsApp Image 2022-11-25 at 10 28 03
PM](https://user-images.githubusercontent.com/64526117/204029764-c3d74f21-5670-4e13-ac37-79ba3843eec6.jpeg)
![WhatsApp Image 2022-11-25 at 10 28 04 PM
(1)](https://user-images.githubusercontent.com/64526117/204029767-943a2fb9-831b-4917-a9bd-24b1d866ba0e.jpeg)
![WhatsApp Image 2022-11-25 at 10 28 04 PM
(2)](https://user-images.githubusercontent.com/64526117/204029770-8797e881-d388-49bc-a0e4-4fae0235f801.jpeg)
![WhatsApp Image 2022-11-25 at 10 28 04
PM](https://user-images.githubusercontent.com/64526117/204029773-367ee30f-75d0-472b-889d-ea791dae7f27.jpeg)
![WhatsApp Image 2022-11-25 at 10 28 05
PM](https://user-images.githubusercontent.com/64526117/204029774-b2591983-ac05-4607-9127-86423d1ac320.jpeg)
![WhatsApp Image 2022-11-25 at 10 31 51
PM](https://user-images.githubusercontent.com/64526117/204030109-73450d40-9317-4d27-872c-8daed98b5032.jpeg)

Land:

![WhatsApp Image 2022-11-25 at 10 35 15
PM](https://user-images.githubusercontent.com/64526117/204030662-c6c18c7b-80bd-48aa-904c-e50a435d883b.jpeg)
![WhatsApp Image 2022-11-25 at 10 35 16 PM
(1)](https://user-images.githubusercontent.com/64526117/204030668-1c944b62-22f2-4af9-8956-58f88a94c2d7.jpeg)
![WhatsApp Image 2022-11-25 at 10 35 16 PM
(2)](https://user-images.githubusercontent.com/64526117/204030672-90fcc908-1dd1-4a5c-8867-33598c43bb21.jpeg)
![WhatsApp Image 2022-11-25 at 10 35 16
PM](https://user-images.githubusercontent.com/64526117/204030673-39bba84b-f387-464e-b28d-7129297d93c4.jpeg)
![WhatsApp Image 2022-11-25 at 10 35 17 PM
(1)](https://user-images.githubusercontent.com/64526117/204030678-972298fa-e223-4b8f-8eb9-297f05745fce.jpeg)
![WhatsApp Image 2022-11-25 at 10 35 17
PM](https://user-images.githubusercontent.com/64526117/204030681-5260b61b-9bce-46b5-83d7-ee4a9c98c650.jpeg)

mobile rtl:
![WhatsApp Image 2022-11-25 at 10 44 58
PM](https://user-images.githubusercontent.com/64526117/204031771-f4e2d2e1-e91d-4505-b9e9-78cf148092c6.jpeg)
![WhatsApp Image 2022-11-25 at 10 44 59 PM
(1)](https://user-images.githubusercontent.com/64526117/204031775-452d7e7d-bcb0-4987-9431-3d38e07f5719.jpeg)
![WhatsApp Image 2022-11-25 at 10 44 59 PM
(2)](https://user-images.githubusercontent.com/64526117/204031779-f4e75421-f8fe-4325-9f2b-67970889eb73.jpeg)
![WhatsApp Image 2022-11-25 at 10 44 59
PM](https://user-images.githubusercontent.com/64526117/204031782-852b142e-4b89-47ba-9de8-39ae9f949442.jpeg)
![WhatsApp Image 2022-11-25 at 10 45 00 PM
(1)](https://user-images.githubusercontent.com/64526117/204031785-d5cfa361-815a-40cb-be42-0b52ac46e8d0.jpeg)
![WhatsApp Image 2022-11-25 at 10 45 00 PM
(2)](https://user-images.githubusercontent.com/64526117/204031787-b03affa8-08f2-41a3-8e4a-a2d00d535f20.jpeg)
![WhatsApp Image 2022-11-25 at 10 45 00
PM](https://user-images.githubusercontent.com/64526117/204031790-ccb3fde6-ad6d-45d6-8d10-5d158023287f.jpeg)

Tablet:

![image](https://user-images.githubusercontent.com/64526117/204032348-aabac5c6-7264-4b9b-9be8-c35b83329446.png)

![image](https://user-images.githubusercontent.com/64526117/204032377-a668902f-e585-49ab-801a-bf475abdc9e0.png)

![image](https://user-images.githubusercontent.com/64526117/204032427-36cb7df7-442e-44b6-8b0b-a0231466a61a.png)

![image](https://user-images.githubusercontent.com/64526117/204032539-44953af2-ed7c-463e-8896-71d90c567a4c.png)

![image](https://user-images.githubusercontent.com/64526117/204032581-b2fa1837-ec57-495c-97ef-76027556124b.png)

![image](https://user-images.githubusercontent.com/64526117/204032637-ac5e0d05-d0de-4d2e-a4f5-2a0bf0f1c4d1.png)

Video (spotlight experience):

https://user-images.githubusercontent.com/64526117/204033854-12f2f0ca-fb92-4ddc-8589-02e5b1e38c46.mp4

Video (Talkback):

https://user-images.githubusercontent.com/64526117/204034102-f420b8ef-972e-4517-a55d-dcd3d5fb5919.mp4

Co-authored-by: Ben Henning <[email protected]>
Co-authored-by: madhurgera2 <[email protected]>
Co-authored-by: JishnuGoyal <[email protected]>
<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation

**Mockups:**

Concept Card Default: 

https://xd.adobe.com/view/3dca36c2-5115-419c-b25e-0f10526b077c-6899/screen/2cc59921-923b-43ef-bf11-cf7cc5f7d903/specs/

Concept Card Dark Mode: 

https://xd.adobe.com/view/c05e9343-60f6-4c11-84ac-c756b75b940f-950d/screen/2ee531cf-c358-4a7d-b9dd-b772b51c3d3c/specs/

Hint Summary Default: 

https://xd.adobe.com/view/3dca36c2-5115-419c-b25e-0f10526b077c-6899/screen/99e9e4c3-6c5e-4c13-a9f2-6b92aee17392/specs/

Hint Summary Dark Mode:

https://xd.adobe.com/view/c05e9343-60f6-4c11-84ac-c756b75b940f-950d/screen/d43c5d96-945a-4b89-9552-c4fb482ce2f2/specs/

https://xd.adobe.com/view/c05e9343-60f6-4c11-84ac-c756b75b940f-950d/screen/a70b76a7-49ae-47b6-b5fe-f148b71ee620/specs/

Solution Summary Default:

https://xd.adobe.com/view/3dca36c2-5115-419c-b25e-0f10526b077c-6899/screen/545c6f32-2fec-4a8b-bb53-cecfb8e52f31/specs/

Solution Summary Dark Mode:

https://xd.adobe.com/view/c05e9343-60f6-4c11-84ac-c756b75b940f-950d/screen/5362a633-73cb-4288-aa7d-8c69e4eef349/specs/

https://xd.adobe.com/view/c05e9343-60f6-4c11-84ac-c756b75b940f-950d/screen/a50b0252-f883-451d-9729-dde8d34e2cc5/specs/



Fixed Hints & Solution and Concept Card Dark Mode

<!--
- 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.
  -->



## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [ ] 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](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [ ] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [ ] 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)).
- [ ] 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](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only

|**Default - Concept Card**|**Dark Mode - Concept Card**|

|:----------------------------------------:|:-----------------------------------------:|
|
![](https://user-images.githubusercontent.com/76530270/205581914-6db3574e-1194-4180-86cb-caeb92187185.png)
|
![](https://user-images.githubusercontent.com/76530270/205581905-dbeacc20-bdb0-4b4b-b991-405c1f5796d8.png)
|
|**Default - Hint Summary**|**Dark Mode - Hint Summary**|
|
![](https://user-images.githubusercontent.com/76530270/205582293-ae3bc35b-a9d7-48ea-bd5a-893b65891f17.png)
|
![](https://user-images.githubusercontent.com/76530270/205582318-a5f8ed46-a231-4326-98ba-9c4a42df1217.png)
|
|||
|
![](https://user-images.githubusercontent.com/76530270/205582650-02298c99-35e9-4165-94b3-3a60eaa645e6.png)
|
![](https://user-images.githubusercontent.com/76530270/205582668-8f0277ea-f3d7-4188-9e00-ed1a096094f0.png)
|
|**Default - Solution Summary**|**Dark Mode - Solution Summary**|
|
![](https://user-images.githubusercontent.com/76530270/205595119-1fbae1d3-1def-40f7-af4d-98aca98d2250.png)
|
![](https://user-images.githubusercontent.com/76530270/205595124-8162d7b6-5cdd-4fba-9ce1-c8e6d03beaff.png)
|
|||
|
![](https://user-images.githubusercontent.com/76530270/205595165-f08d6a8a-3f55-47de-bbf3-5aafd60ada79.png)
|
![](https://user-images.githubusercontent.com/76530270/205595160-d8549aff-c3e3-447e-a7b6-a44ebb505268.png)
|
|||
|
![](https://user-images.githubusercontent.com/76530270/205595210-88d2470f-c6de-4c13-a974-a56102f72ed2.png)
|
![](https://user-images.githubusercontent.com/76530270/205595204-f4ca6cba-b378-486a-b1a7-afeeb482fa70.png)
|



<!-- Delete these section if this PR does not include UI-related
changes. -->
<!-- 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 #4775 

This PR was created to investigate why 2 tests mentioned
[here](#4775 (comment))
were so flaky and fix these issues. From what I found, it seems that the
problem occurs in sequencing while adding spotlight targets:


>checkNotNull(activity.getSpotlightFragment()).requestSpotlight(firstSpotlightTarget)

checkNotNull(activity.getSpotlightFragment()).requestSpotlight(secondSpotlightTarget)


The addition of targets probably lead to a race condition? I haven't
really gotten as deep as to debug it though, but I assumed my
speculation was correct, and an easy fix was to add
`testCoroutineDispatchers.runCurrent()` between these two lines.

## 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)).

Co-authored-by: Ben Henning <[email protected]>
…om/DeonWaju/oppia-android into add-label-to-profile-edit-activity

� Conflicts:
�	app/src/main/res/values/strings.xml
@deonwaju
Copy link
Collaborator Author

deonwaju commented Jan 9, 2023

ok, got it

@MohitGupta121 Done.

@MohitGupta121
Copy link
Member

MohitGupta121 commented Jan 10, 2023

@deonwaju update your branch through sync with the latest develop changes. Also follow this instruction for PR

Thanks, feel free to ask any query.

@oppiabot
Copy link

oppiabot bot commented Jan 21, 2023

Hi @deonwaju, 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 the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 21, 2023
@MohitGupta121
Copy link
Member

@deonwaju are you still working on this PR? Please give update?

@oppiabot oppiabot bot removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 27, 2023
@oppiabot
Copy link

oppiabot bot commented Feb 3, 2023

Hi @deonwaju, 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 the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Feb 3, 2023
@oppiabot oppiabot bot closed this Feb 10, 2023
@MohitGupta121
Copy link
Member

@deonwaju are you still working on this PR? Please give update this if you still active.
And feel free to ask any query.
Thanks.

@deonwaju
Copy link
Collaborator Author

deonwaju commented Nov 13, 2023 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stale Corresponds to items that haven't seen a recent update and may be automatically closed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants