Skip to content

Conversation

DurankGts
Copy link

Conflict solved

GoogleMapLibs
-----------------------
1-fix title and snippet it not showing in android and in simulator
2-fix icon no added in simulator
GoogleMaptest
-----------------------
1-fix title and snippet it not showing in android and in simulator
2-fix icon no added in simulator
------------------------------
1-label in IOS fixed
------------------------------
1-adding markert label in android and IOS
2-Fixing bug returning marker instance
3-adding some log in android to check some possible bug creating instance of MapContainer() method
------------------------------
1-wating time to simulator
------------------------------
1- Some method it was add from AndroidImplementation.java to native library to avoid compile in build server
…od it was add from AndroidImplementation.java to native library to avoid compile in build server"

This reverts commit 1e11f7a.
Conflicts:
	GoogleMaps/native/android/com/codename1/googlemaps/InternalNativeMapsImpl.java
	GoogleMaps/src/com/codename1/googlemaps/MapContainer.java
	GoogleMapsTest/src/com/codename1/test/googlemaps/GoogleMapsTestApp.java
@shannah
Copy link
Collaborator

shannah commented Jul 18, 2017

Can you provide a description of what this pull request solves. It spans multiple commits, and changes many files including build scripts. Does it add a feature? Does it fix a bug? If so which bug? (Provide link to issue in issue tracker).

@DurankGts
Copy link
Author

GoogleMapLibs

1-fix title and snippet it not showing in android, simulator and ios
2-fix icon no added in simulator
3-Fixing bug returning marker instance
4-adding some log in android to check some possible bug creating instance of MapContainer() method

@DurankGts
Copy link
Author

Excuse me with this files. I just applied changes to this files

GoogleMaps/native/android/com/codename1/googlemaps/InternalNativeMapsImpl.java
GoogleMaps/native/ios/com_codename1_googlemaps_InternalNativeMapsImpl.m
GoogleMaps/src/com/codename1/googlemaps/MapContainer.java
GoogleMapsTest/src/com/codename1/test/googlemaps/GoogleMapsTestApp.java

it seems my netbeans settings IDE that cause this issue in the other files

GoogleMaps/nbproject/project.properties
GoogleMapsTest/codenameone_settings.properties
GoogleMapsTest/nbproject/build-impl.xml
GoogleMapsTest/nbproject/genfiles.properties
GoogleMapsTest/nbproject/project.properties
GoogleMapsTest/nbproject/project.xml

Conflicts:
	GoogleMaps/native/android/com/codename1/googlemaps/InternalNativeMapsImpl.java
@shai-almog shai-almog requested a review from shannah October 25, 2022 02:28
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.

2 participants