18881 #2
Closed
18881 #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merging changes from Master to My Fenix branch 4/19/21
Syncing My Master to Base Master.
…nsions for the margin and text size.
… the recyclerview for the manage saved cards fragment.
…oller.kt and CreditCardsManagementInteractor.kt to handle adding a credit card and navigating to an empty CreditCardEditor.
Syncing merge changes 4/25/2021
…nsions for the margin and text size.
… the recyclerview for the manage saved cards fragment.
…oller.kt and CreditCardsManagementInteractor.kt to handle adding a credit card and navigating to an empty CreditCardEditor.
� Conflicts: � app/src/main/java/org/mozilla/fenix/settings/creditcards/controller/CreditCardsManagementController.kt � app/src/main/java/org/mozilla/fenix/settings/creditcards/view/AddCreditCardButtonAdapter.kt � app/src/main/java/org/mozilla/fenix/settings/creditcards/view/AddCreditCardButtonViewHolder.kt
…d some stuff to follow conventions.
…AddCreditCardButtonViewHolder.kt
eliserichards
pushed a commit
that referenced
this pull request
Jun 10, 2021
# This is the 1st commit message: View holders and interactors for recently saved bookmarks # This is the commit message #2: Recent bookmark item view holder binding # This is the commit message mozilla-mobile#3: Create adapter for recent bookmarks. Implement controller methods. Implement view holder bindings for items # This is the commit message mozilla-mobile#4: Top level adapter for recent bookmarks section # This is the commit message mozilla-mobile#5: Retrieve list of recent bookmarks on home
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request checklist
To download an APK when reviewing a PR: