-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Migrated nearby parent fragment file to kotlin #6152
base: main
Are you sure you want to change the base?
Migrated nearby parent fragment file to kotlin #6152
Conversation
@nicolas-raoul Can you check this PR in Last PR other PR also getting attached maybe because of that the error is coming else if it comes again let me know and also the checks is correct may be the commit before has error but i have solved it kindly check it |
@nicolas-raoul @misaochan can you check this pr also |
@nicolas-raoul @psh @misaochan Please check this pr also |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would you mind fixing the conflict? Thanks!
I have changed that file code into kotlin which is showing in conflict may be because of that it showing that conflict error |
2932e45
to
54f66fd
Compare
54f66fd
to
0293b86
Compare
…ts/NearbyParentFragment.kt
…ts/NearbyParentFragment.kt
…ts/NearbyParentFragment.kt
…mons-app#6164) * Nearby: Add 'Show in Explore' 3-dots menu item * MainActivity: Add methods to pass extras between Nearby and Explore * MainActivity: Extend loadFragment() to support passing fragment arguments * Nearby: Add ability to navigate to Explore fragment on 'Show in Explore' click * Explore: Read fragment arguments for Nearby map data and update Explore map if present * Explore: Add 'Show in Nearby' 3-dots menu item. Only visible when Map tab is selected * Explore: On 'Show in Nearby' click, navigate to Nearby fragment, passing map data as fragment args * Nearby: Read fragment arguments for Explore map data and update Nearby map if present * MainActivity: Fix memory leaks when navigating between bottom nav destinations * Explore: Fix crashes caused by unattached map fragment * Refactor code to pass unit tests * Explore: Format javadocs --------- Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
…le-to-Kotlin' into Migrated-NearbyParentFragment-file-to-Kotlin # Conflicts: # app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt
@nicolas-raoul I have completed the migration and resolved the conflicts in the |
parent issue : #5928
Migrated nearby parent fragment file to kotlin