Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

For #12855 - Upstream the CFRPopup from Fenix to AC to share it in multiple projects (backport #12828) #13015

Merged
merged 2 commits into from Oct 27, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 26, 2022

This is an automatic backport of pull request #12828 done by Mergify.

Cherry-pick of 96444dd has failed: ``` On branch mergify/bp/releases/107.0/pr-12828 Your branch is up to date with 'origin/releases/107.0'.

You are currently cherry-picking commit 96444dd.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
modified: .buildconfig.yml
new file: components/compose/cfr/README.md
new file: components/compose/cfr/build.gradle
new file: components/compose/cfr/proguard-rules.pro
new file: components/compose/cfr/src/main/AndroidManifest.xml
new file: components/compose/cfr/src/main/java/mozilla/components/compose/cfr/CFRPopup.kt
new file: components/compose/cfr/src/main/java/mozilla/components/compose/cfr/CFRPopupContent.kt
new file: components/compose/cfr/src/main/java/mozilla/components/compose/cfr/CFRPopupFullscreenLayout.kt
new file: components/compose/cfr/src/main/java/mozilla/components/compose/cfr/CFRPopupShape.kt
new file: components/compose/cfr/src/main/java/mozilla/components/compose/cfr/helper/DisplayOrientationListener.kt
new file: components/compose/cfr/src/main/java/mozilla/components/compose/cfr/helper/ViewDetachedListener.kt
new file: components/compose/cfr/src/main/res/values/strings.xml
new file: components/compose/cfr/src/test/java/mozilla/components/compose/cfr/CFRPopupFullscreenLayoutTest.kt
new file: components/compose/cfr/src/test/java/mozilla/components/compose/cfr/helper/DisplayOrientationListenerTest.kt
new file: components/compose/cfr/src/test/java/mozilla/components/compose/cfr/helper/ViewDetachedListenerTest.kt
new file: components/compose/cfr/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
modified: taskcluster/ci/config.yml

Unmerged paths:
(use "git add ..." to mark resolution)
both modified: buildSrc/src/main/java/Dependencies.kt
both modified: docs/changelog.md



To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

</details>

@mergify mergify bot requested review from a team as code owners October 26, 2022 16:33
@mergify mergify bot added the conflicts label Oct 26, 2022
@mergify mergify bot requested review from escapewindow and removed request for a team October 26, 2022 16:33
This upstreams the CFR composable already used on Fenix allowing it to be
reused on other projects also.
The setup process requires quite a few parameters because as it is highly
customizable supporting different indicator orientations or positionings
in relation to the anchor and also supporting RTL.

(cherry picked from commit 96444dd)

# Conflicts resolved:
#	buildSrc/src/main/java/Dependencies.kt
#	docs/changelog.md
@Mugurell Mugurell force-pushed the mergify/bp/releases/107.0/pr-12828 branch from 50cf4ce to 00fdbde Compare October 26, 2022 16:46
@mergify mergify bot merged commit 729905e into releases/107.0 Oct 27, 2022
@bors bors bot deleted the mergify/bp/releases/107.0/pr-12828 branch October 27, 2022 10:06
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
🛬 needs landing PRs that are ready to land
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants