Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

For #27401 - refactor SelectableChip into Chip composable #27602

Merged
merged 2 commits into from
Jan 24, 2023
Merged

For #27401 - refactor SelectableChip into Chip composable #27602

merged 2 commits into from
Jan 24, 2023

Conversation

HarrisonOg
Copy link
Contributor

@HarrisonOg HarrisonOg commented Oct 28, 2022 •
edited by github-actions bot
Loading

Pull Request checklist

  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Screenshots: This PR includes screenshots or GIFs of the changes made or an explanation of why it does not
  • Accessibility: The code in this PR follows accessibility best practices or does not include any user facing features. In addition, it includes a screenshot of a successful accessibility scan to ensure no new defects are added to the product.

QA

  • QA Needed

To download an APK when reviewing a PR (after all CI tasks finished running):

  1. Click on Checks at the top of the PR page.
  2. Click on the firefoxci-taskcluster group on the left to expand all tasks.
  3. Click on the build-debug task.
  4. Click on View task in Taskcluster in the new DETAILS section.
  5. The APK links should be on the right side of the screen, named for each CPU architecture.

GitHub Automation

Fixes #27401

@HarrisonOg HarrisonOg force-pushed the harrison/widget/chip-composable branch from 7e10099 to a08cfbf Compare October 28, 2022 20:35
MozillaNoah
MozillaNoah reviewed Oct 28, 2022
View reviewed changes
Copy link
Contributor

@MozillaNoah MozillaNoah left a comment

Choose a reason for hiding this comment

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

First round of feedback. Looking good so far!

app/src/main/java/org/mozilla/fenix/compose/Chip.kt Outdated Show resolved Hide resolved
app/src/main/java/org/mozilla/fenix/compose/Chip.kt Outdated Show resolved Hide resolved
app/src/main/java/org/mozilla/fenix/compose/Chip.kt Outdated Show resolved Hide resolved
app/src/main/java/org/mozilla/fenix/compose/Chip.kt Outdated Show resolved Hide resolved
app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt Outdated Show resolved Hide resolved
app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt Outdated Show resolved Hide resolved
app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt Outdated Show resolved Hide resolved
@mozilla-mobile mozilla-mobile deleted a comment from Mukuljangir372 Oct 29, 2022
@HarrisonOg HarrisonOg force-pushed the harrison/widget/chip-composable branch from a08cfbf to 010183f Compare November 1, 2022 16:14
@mergify
Copy link
Contributor

mergify bot commented Nov 16, 2022

This pull request has conflicts when rebasing. Could you fix it @HarrisonOg? 🙏

@gabrielluong gabrielluong added the pr:work-in-progress PRs that are not ready to be reviewed yet and are actively being worked on label Nov 22, 2022
@HarrisonOg HarrisonOg force-pushed the harrison/widget/chip-composable branch 4 times, most recently from 3d2a773 to c3a2a5b Compare December 6, 2022 22:34
gabrielluong
gabrielluong reviewed Dec 6, 2022
View reviewed changes
Copy link
Member

@gabrielluong gabrielluong left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I think this is looking good from my quick glance, but I think we're still in the draft phase even though I got the review ping. There's some code polish that needs to be done before I think a full review in earnest should be done. My recommendation is to look through the full changes yourselves and essentially do a mini review of your own changes. I will naturally point out any inconsistencies, areas where either the naming or docs could be improved or code that could be simplified further.

Also, a note about squashing/amending the typography commit into the main commit. It's okay to do multi-commits when we want to split up complex things, but each commit should still try to resolve an issue instead of a fixup.

app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt Outdated Show resolved Hide resolved
app/src/main/java/org/mozilla/fenix/compose/Chip.kt Outdated Show resolved Hide resolved
app/src/main/java/org/mozilla/fenix/compose/SelectableChip.kt Outdated Show resolved Hide resolved
app/src/main/java/org/mozilla/fenix/compose/SelectableChip.kt Outdated Show resolved Hide resolved
app/src/main/java/org/mozilla/fenix/compose/SelectableChip.kt Outdated Show resolved Hide resolved
@HarrisonOg HarrisonOg force-pushed the harrison/widget/chip-composable branch 2 times, most recently from dff2306 to fecfde0 Compare December 8, 2022 22:21
@HarrisonOg HarrisonOg force-pushed the harrison/widget/chip-composable branch 7 times, most recently from 4c0b4c1 to 737eb89 Compare December 15, 2022 23:28
@HarrisonOg HarrisonOg force-pushed the harrison/widget/chip-composable branch from 737eb89 to 26eab78 Compare December 19, 2022 21:49
@HarrisonOg HarrisonOg force-pushed the harrison/widget/chip-composable branch 4 times, most recently from 5e3e016 to 78bb387 Compare January 9, 2023 22:51
@HarrisonOg HarrisonOg removed the pr:work-in-progress PRs that are not ready to be reviewed yet and are actively being worked on label Jan 10, 2023
@HarrisonOg
Copy link
Contributor Author

@MozillaNoah I tried to fix the UI test but I'm marking it as @Ignore for the time being and adding the new ticket for the test Issue.
I fixed the shape call too.

MozillaNoah
MozillaNoah suggested changes Jan 10, 2023
View reviewed changes
Copy link
Contributor

@MozillaNoah MozillaNoah left a comment

Choose a reason for hiding this comment

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

2 quick nits. I unfortunately also discovered that the original component used to style the Pocket categories was for iOS and neither the Chip nor square Chip in the design system match up. I'm going to start a conversation with UX to align on this. This has to be blocked until that's resolved 😞

app/src/androidTest/java/org/mozilla/fenix/ui/HomeScreenTest.kt Outdated Show resolved Hide resolved
app/src/main/java/org/mozilla/fenix/compose/Chip.kt Outdated Show resolved Hide resolved
@HarrisonOg HarrisonOg force-pushed the harrison/widget/chip-composable branch 2 times, most recently from 5b4d5f9 to 3ccc21c Compare January 17, 2023 17:55
@HarrisonOg HarrisonOg force-pushed the harrison/widget/chip-composable branch 4 times, most recently from 5287a4e to 389aac6 Compare January 18, 2023 17:38
@HarrisonOg HarrisonOg force-pushed the harrison/widget/chip-composable branch 2 times, most recently from 94c846e to 3824920 Compare January 18, 2023 18:06
MozillaNoah
MozillaNoah approved these changes Jan 18, 2023
View reviewed changes
Copy link
Contributor

@MozillaNoah MozillaNoah left a comment

Choose a reason for hiding this comment

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

One last nit, but this looks good to me! 🎉

app/src/main/java/org/mozilla/fenix/compose/Chip.kt Outdated Show resolved Hide resolved
@HarrisonOg HarrisonOg force-pushed the harrison/widget/chip-composable branch 5 times, most recently from a9151a4 to dbda84d Compare January 23, 2023 18:26
@HarrisonOg HarrisonOg force-pushed the harrison/widget/chip-composable branch from dbda84d to fb12e4f Compare January 24, 2023 20:57
@HarrisonOg HarrisonOg added the pr:needs-landing PRs that are ready to land [Will be merged by Mergify] label Jan 24, 2023
@mergify mergify bot merged commit 7c5fc6a into mozilla-mobile:main Jan 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@gabrielluong gabrielluong gabrielluong left review comments

@MozillaNoah MozillaNoah MozillaNoah approved these changes

Assignees
No one assigned
Labels
pr:needs-landing PRs that are ready to land [Will be merged by Mergify]
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Refactor SelectableChip to be a top level Chip component
3 participants
@HarrisonOg @MozillaNoah @gabrielluong