feat: customize Marker using Composable #355

mosmb · 2023-07-28T15:19:18Z

Create a Marker Composable that accepts a Composable content
Update BasicMapActivity to show the Composable Marker

Make sure to open a GitHub issue as a bug/feature request before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea
Ensure the tests and linter pass
Code coverage does not decrease (if any source code was changed)
Appropriate docs were updated (if necessary)

Fixes #41 🦕

maps-compose/src/main/java/com/google/maps/android/compose/Marker.kt

kikoso · 2023-07-31T14:10:51Z

maps-compose/src/main/java/com/google/maps/android/compose/RememberComposeBitmapDescriptor.kt

+    val compositionContext = rememberCompositionContext()
+    val currentContent by rememberUpdatedState(content)
+
+    return remember(parent, compositionContext, currentContent, *keys) {


We are having a funny error here since the vararg is not properly resolved, but does not seem to affect the compilation and we can probably live with it.

maps-compose/src/main/java/com/google/maps/android/compose/Marker.kt

kikoso · 2023-07-31T14:12:16Z

@mosmb , thanks for the contribution, it looks great! I left a couple of comments, let me know what you think.

mosmb · 2023-07-31T15:02:12Z

@kikoso
I updated based on what you suggest.
Feel free to suggest any other changes that you may think of :)

kikoso · 2023-07-31T15:09:38Z

LGTM! Thanks for the contribution, @mosmb !

app/src/main/java/com/google/maps/android/compose/BasicMapActivity.kt

mosmb · 2023-08-01T15:49:54Z

@kikoso
Feel free to tell me if you see other things to edit

mosmb · 2023-08-02T15:48:00Z

@kikoso
Is it possible to re-launch the instrumentation tests task please, as I think I don't have the permission to do that

kikoso · 2023-08-02T16:30:07Z

@kikoso Is it possible to re-launch the instrumentation tests task please, as I think I don't have the permission to do that

Hi @mosmb ! It is a topic more complex. The instrumentation tests are running on your branch, and you would need to set up the API Key for them to work.

There are a couple of approaches that can fix this, but they might pose a security risk (see https://securitylab.github.com/research/github-actions-preventing-pwn-requests/). We are currently exploring this.

In the meantime, adding the API Key as a secret in your repository should work out. What we generally do is to run the test before getting any PR merged, but this is something that we want to fix so any external PRs can properly report any failure on an instrumentation test.

mosmb · 2023-08-03T06:55:16Z

@kikoso
Yep I added the API key as a secret in my repository, so I think it should work

mosmb · 2023-08-03T13:41:53Z

@kikoso Tests seem to fail because of the API key
I added a secret ACTIONS_API_KEY to my rep but doesn't seem to work though

mosmb · 2023-08-07T12:22:32Z

@kikoso
Any news for this PR to be able to be merged?

kikoso · 2023-08-10T02:58:14Z

Hi @mosmb ! We have a couple of PRs that we want to merge first and release a new version, but this should happen rather imminently.

mosmb · 2023-08-10T07:32:20Z

@kikoso Ok! Thank you for the information!

wangela

Thank you for contributing this highly requested feature, @mosmb! Although the github action can't access the secrets to run tests on GitHub, would you still please add tests for the new functionality to keep our code coverage even? We'll be able to merge this PR when that task is done.

mosmb · 2023-08-15T09:02:56Z

Thank you @wangela for your feedback!
What kind of test do you expect?
As I can see, there's no test for now for Marker, except one testing that a state must not be reused.
Do you expect to do the same test but with MarkerComposable?

kikoso · 2023-08-17T10:07:00Z

Thank you @wangela for your feedback! What kind of test do you expect? As I can see, there's no test for now for Marker, except one testing that a state must not be reused. Do you expect to do the same test but with MarkerComposable?

I think this could be a good candidate, @mosmb !

mosmb · 2023-08-17T12:54:26Z

@kikoso @wangela
I added the test.
Might be good later to add more tests around Markers but it's a good start!
Feel free to send any feedback!

# [2.14.0](v2.13.1...v2.14.0) (2023-08-17) ### Features * customize Marker using MarkerComposable ([#355](#355)) ([51bb2bf](51bb2bf))

googlemaps-bot · 2023-08-17T18:12:22Z

🎉 This PR is included in version 2.14.0 🎉

The release is available on:

v2.14.0
GitHub release

Your semantic-release bot 📦🚀

WonderCsabo · 2023-08-30T15:42:23Z

@mosmb checking out your code, i stumbled upon this line:

composeView.draw(fakeCanvas)

I was wondering, why is this needed?

mosmb · 2023-08-31T08:55:49Z

@WonderCsabo In some cases, the ComposeView will not trigger the draw of its node. So in order to force that and not having a Composable that is not being drawn, we draw an empty canvas into the ComposeView to force it to enter into the drawing phase.
It's kinda of a hack but it works.
In Compose 1.5.0, they added some utility method to Picture to be able to draw Composable into bitmaps. But as this library is not based on this version of Compose yet, we stick with this hack

kikoso · 2023-08-31T10:52:17Z

@mosmb , which utility method do you mean?

We are working on some stuff for next month, but I would like to upgrade Compose as one of the next issues.

mosmb · 2023-08-31T12:56:17Z

@kikoso
The Canvas API that will have a drawPicture method that will enable us to record Composable with the drawWithCache modifier

WonderCsabo · 2023-09-01T07:16:23Z

@mosmb thanks for the info. Good to know there will be an official method to do this. Now i see it in the docs.

feat: customize Marker using Composable

8c2bcc5

blunderbuss-gcf bot assigned wangela Jul 28, 2023

wangela requested a review from kikoso July 28, 2023 16:27

kikoso reviewed Jul 31, 2023

View reviewed changes

maps-compose/src/main/java/com/google/maps/android/compose/Marker.kt Outdated Show resolved Hide resolved

kikoso reviewed Jul 31, 2023

View reviewed changes

maps-compose/src/main/java/com/google/maps/android/compose/Marker.kt Outdated Show resolved Hide resolved

mosmb added 2 commits July 31, 2023 16:53

Rename Marker into MarkerComposable

621c3ad

Update README to showcase MarkerComposable

5bb0af0

mosmb requested a review from kikoso July 31, 2023 15:02

kikoso approved these changes Jul 31, 2023

View reviewed changes

kikoso reviewed Jul 31, 2023

View reviewed changes

app/src/main/java/com/google/maps/android/compose/BasicMapActivity.kt Outdated Show resolved Hide resolved

Use MarkerComposable in BasicMapActivity

5a4b924

mosmb requested a review from kikoso August 1, 2023 07:38

Merge branch 'googlemaps:main' into composable-marker

fe4dcd7

kikoso approved these changes Aug 10, 2023

View reviewed changes

kikoso mentioned this pull request Aug 10, 2023

Option to always show info window? #300

Closed

wangela requested changes Aug 12, 2023

View reviewed changes

Instrumentation tests for MarkerComposable

8a669ff

mosmb requested review from wangela and kikoso August 17, 2023 12:54

wangela mentioned this pull request Aug 17, 2023

Add tests for Marker composables #381

Open

wangela approved these changes Aug 17, 2023

View reviewed changes

wangela merged commit 51bb2bf into googlemaps:main Aug 17, 2023
7 of 8 checks passed

googlemaps-bot pushed a commit that referenced this pull request Aug 17, 2023

chore(release): 2.14.0 [skip ci]

6a85b0a

# [2.14.0](v2.13.1...v2.14.0) (2023-08-17) ### Features * customize Marker using MarkerComposable ([#355](#355)) ([51bb2bf](51bb2bf))

googlemaps-bot added the released label Aug 17, 2023

mosmb deleted the composable-marker branch August 18, 2023 14:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: customize Marker using Composable #355

feat: customize Marker using Composable #355

mosmb commented Jul 28, 2023 •

edited

Loading

kikoso Jul 31, 2023

kikoso commented Jul 31, 2023

mosmb commented Jul 31, 2023

kikoso commented Jul 31, 2023

mosmb commented Aug 1, 2023

mosmb commented Aug 2, 2023

kikoso commented Aug 2, 2023 •

edited

Loading

mosmb commented Aug 3, 2023

mosmb commented Aug 3, 2023

mosmb commented Aug 7, 2023

kikoso commented Aug 10, 2023

mosmb commented Aug 10, 2023

wangela left a comment

mosmb commented Aug 15, 2023

kikoso commented Aug 17, 2023

mosmb commented Aug 17, 2023

googlemaps-bot commented Aug 17, 2023

WonderCsabo commented Aug 30, 2023

mosmb commented Aug 31, 2023

kikoso commented Aug 31, 2023

mosmb commented Aug 31, 2023

WonderCsabo commented Sep 1, 2023

feat: customize Marker using Composable #355

feat: customize Marker using Composable #355

Conversation

mosmb commented Jul 28, 2023 • edited Loading

kikoso Jul 31, 2023

Choose a reason for hiding this comment

kikoso commented Jul 31, 2023

mosmb commented Jul 31, 2023

kikoso commented Jul 31, 2023

mosmb commented Aug 1, 2023

mosmb commented Aug 2, 2023

kikoso commented Aug 2, 2023 • edited Loading

mosmb commented Aug 3, 2023

mosmb commented Aug 3, 2023

mosmb commented Aug 7, 2023

kikoso commented Aug 10, 2023

mosmb commented Aug 10, 2023

wangela left a comment

Choose a reason for hiding this comment

mosmb commented Aug 15, 2023

kikoso commented Aug 17, 2023

mosmb commented Aug 17, 2023

googlemaps-bot commented Aug 17, 2023

WonderCsabo commented Aug 30, 2023

mosmb commented Aug 31, 2023

kikoso commented Aug 31, 2023

mosmb commented Aug 31, 2023

WonderCsabo commented Sep 1, 2023

mosmb commented Jul 28, 2023 •

edited

Loading

kikoso commented Aug 2, 2023 •

edited

Loading