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

Search in settings #20016

Open
wants to merge 215 commits into
base: master
Choose a base branch
from
Open

Conversation

KnollFrank
Copy link

My first attempt for ticket "Search in settings #13973"

@KnollFrank KnollFrank marked this pull request as draft June 5, 2024 15:54
@KnollFrank KnollFrank marked this pull request as ready for review June 5, 2024 16:24
@RZR-UA
Copy link
Contributor

RZR-UA commented Jun 9, 2024

Please follow original formatting to avoid the huge amount of changes lines: +1,598 −1,490

@KnollFrank
Copy link
Author

KnollFrank commented Jun 9, 2024

Please follow original formatting to avoid the huge amount of changes lines: +1,598 −1,490

Where is the formatter I can use in Android Studio?

@vshcherb
Copy link
Member

Probably it's tab vs spaces, we use tabs by default

# Conflicts:
#	OsmAnd/src/net/osmand/plus/plugins/development/DevelopmentSettingsFragment.java
#	OsmAnd/src/net/osmand/plus/settings/bottomsheets/VehicleParametersBottomSheet.java
#	OsmAnd/src/net/osmand/plus/settings/fragments/GeneralProfileSettingsFragment.java
#	OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
#	OsmAnd/src/net/osmand/plus/settings/fragments/SettingsScreenType.java
#	OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java
#	gradle.properties
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.

4 participants