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

Migrated nearby parent fragment file to kotlin #6152

Open
wants to merge 11 commits into
base: main
Choose a base branch
from

Conversation

Sujal-Gupta-SG
Copy link
Contributor

@Sujal-Gupta-SG Sujal-Gupta-SG commented Jan 23, 2025

parent issue : #5928
Migrated nearby parent fragment file to kotlin

@Sujal-Gupta-SG
Copy link
Contributor Author

Sujal-Gupta-SG commented Jan 23, 2025

@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

@Sujal-Gupta-SG
Copy link
Contributor Author

@nicolas-raoul @misaochan can you check this pr also

@Sujal-Gupta-SG
Copy link
Contributor Author

@nicolas-raoul @psh @misaochan Please check this pr also

Copy link
Member

@nicolas-raoul nicolas-raoul left a 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!

@Sujal-Gupta-SG
Copy link
Contributor Author

Sujal-Gupta-SG commented Feb 1, 2025

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

@Sujal-Gupta-SG Sujal-Gupta-SG force-pushed the Migrated-NearbyParentFragment-file-to-Kotlin branch from 2932e45 to 54f66fd Compare February 3, 2025 12:18
@Sujal-Gupta-SG Sujal-Gupta-SG marked this pull request as draft February 3, 2025 12:26
@Sujal-Gupta-SG Sujal-Gupta-SG force-pushed the Migrated-NearbyParentFragment-file-to-Kotlin branch from 54f66fd to 0293b86 Compare February 3, 2025 12:30
@Sujal-Gupta-SG Sujal-Gupta-SG reopened this Feb 3, 2025
@Sujal-Gupta-SG Sujal-Gupta-SG marked this pull request as ready for review February 3, 2025 12:40
@Sujal-Gupta-SG Sujal-Gupta-SG marked this pull request as draft February 3, 2025 12:45
Sujal-Gupta-SG and others added 6 commits February 3, 2025 18:16
…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
@Sujal-Gupta-SG Sujal-Gupta-SG marked this pull request as ready for review February 3, 2025 13:02
@Sujal-Gupta-SG
Copy link
Contributor Author

Sujal-Gupta-SG commented Feb 3, 2025

Would you mind fixing the conflict? Thanks!

@nicolas-raoul I have completed the migration and resolved the conflicts in the NearbyParentFragment file.
Please check it as soon as possible so that any future commits will be in Kotlin.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants