Skip to content

Commit

Permalink
Introduce MarkerComposable composable (#105)
Browse files Browse the repository at this point in the history 
* Introduce MarkerComposable composable

* fix spotless
  • Loading branch information
@fornewid
fornewid authored May 24, 2024
1 parent 18d3f69 commit b275d4c
Show file tree
Hide file tree
Showing 4 changed files with 303 additions and 0 deletions.
33 changes: 33 additions & 0 deletions app/src/main/java/com/naver/maps/map/compose/demo/overlay/MarkerScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,31 @@
*/
package com.naver.maps.map.compose.demo.overlay

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Scaffold
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.naver.maps.geometry.LatLng
import com.naver.maps.map.CameraPosition
import com.naver.maps.map.compose.Align
import com.naver.maps.map.compose.ExperimentalNaverMapApi
import com.naver.maps.map.compose.Marker
import com.naver.maps.map.compose.MarkerComposable
import com.naver.maps.map.compose.NaverMap
import com.naver.maps.map.compose.NaverMapConstants
import com.naver.maps.map.compose.demo.R
Expand Down Expand Up @@ -119,6 +132,26 @@ fun MarkerScreen(upPress: () -> Unit) {
iconTintColor = Color.Red,
alpha = 0.5f
)
MarkerComposable(
keys = arrayOf("hotel"),
state = rememberMarkerState(
position = LatLng(37.564378, 126.980058)
),
) {
Box(
modifier = Modifier
.width(88.dp)
.wrapContentHeight()
.clip(RoundedCornerShape(16.dp))
.background(Color.Green),
contentAlignment = Alignment.Center,
) {
Text(
text = "Compose Marker",
textAlign = TextAlign.Center,
)
}
}
}
}
}
5 changes: 5 additions & 0 deletions naver-map-compose/api/current.api
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ package com.naver.maps.map.compose {
enum_constant public static final com.naver.maps.map.compose.MapType Basic;
enum_constant public static final com.naver.maps.map.compose.MapType Hybrid;
enum_constant public static final com.naver.maps.map.compose.MapType Navi;
enum_constant public static final com.naver.maps.map.compose.MapType NaviHybrid;
enum_constant public static final com.naver.maps.map.compose.MapType None;
enum_constant public static final com.naver.maps.map.compose.MapType Satellite;
enum_constant public static final com.naver.maps.map.compose.MapType Terrain;
Expand Down Expand Up @@ -377,6 +378,7 @@ package com.naver.maps.map.compose {

public final class MarkerKt {
method @androidx.compose.runtime.Composable @com.naver.maps.map.compose.ExperimentalNaverMapApi @com.naver.maps.map.compose.NaverMapComposable public static void Marker(optional com.naver.maps.map.compose.MarkerState state, optional com.naver.maps.map.overlay.OverlayImage icon, optional long iconTintColor, optional float width, optional float height, optional long anchor, optional String? captionText, optional long captionTextSize, optional long captionColor, optional long captionHaloColor, optional float captionRequestedWidth, optional double captionMinZoom, optional double captionMaxZoom, optional String? subCaptionText, optional long subCaptionTextSize, optional long subCaptionColor, optional long subCaptionHaloColor, optional float subCaptionRequestedWidth, optional double subCaptionMinZoom, optional double subCaptionMaxZoom, optional com.naver.maps.map.compose.Align![] captionAligns, optional float captionOffset, optional float alpha, optional float angle, optional boolean isFlat, optional boolean isHideCollidedSymbols, optional boolean isHideCollidedMarkers, optional boolean isHideCollidedCaptions, optional boolean isForceShowIcon, optional boolean isForceShowCaption, optional boolean isIconPerspectiveEnabled, optional boolean isCaptionPerspectiveEnabled, optional Object? tag, optional boolean visible, optional double minZoom, optional boolean minZoomInclusive, optional double maxZoom, optional boolean maxZoomInclusive, optional int zIndex, optional int globalZIndex, optional kotlin.jvm.functions.Function1<? super com.naver.maps.map.overlay.Marker,java.lang.Boolean> onClick);
method @androidx.compose.runtime.Composable @com.naver.maps.map.compose.ExperimentalNaverMapApi @com.naver.maps.map.compose.NaverMapComposable public static void MarkerComposable(Object![] keys, optional com.naver.maps.map.compose.MarkerState state, optional long iconTintColor, optional float width, optional float height, optional long anchor, optional String? captionText, optional long captionTextSize, optional long captionColor, optional long captionHaloColor, optional float captionRequestedWidth, optional double captionMinZoom, optional double captionMaxZoom, optional String? subCaptionText, optional long subCaptionTextSize, optional long subCaptionColor, optional long subCaptionHaloColor, optional float subCaptionRequestedWidth, optional double subCaptionMinZoom, optional double subCaptionMaxZoom, optional com.naver.maps.map.compose.Align![] captionAligns, optional float captionOffset, optional float alpha, optional float angle, optional boolean isFlat, optional boolean isHideCollidedSymbols, optional boolean isHideCollidedMarkers, optional boolean isHideCollidedCaptions, optional boolean isForceShowIcon, optional boolean isForceShowCaption, optional boolean isIconPerspectiveEnabled, optional boolean isCaptionPerspectiveEnabled, optional Object? tag, optional boolean visible, optional double minZoom, optional boolean minZoomInclusive, optional double maxZoom, optional boolean maxZoomInclusive, optional int zIndex, optional int globalZIndex, optional kotlin.jvm.functions.Function1<? super com.naver.maps.map.overlay.Marker,java.lang.Boolean> onClick, kotlin.jvm.functions.Function0<kotlin.Unit> content);
method @androidx.compose.runtime.Composable @com.naver.maps.map.compose.ExperimentalNaverMapApi @com.naver.maps.map.compose.NaverMapComposable public static com.naver.maps.map.compose.MarkerState rememberMarkerState(optional String? key, optional com.naver.maps.geometry.LatLng position);
}

Expand Down Expand Up @@ -465,5 +467,8 @@ package com.naver.maps.map.compose {
method @androidx.compose.runtime.Composable @com.naver.maps.map.compose.NaverMapComposable public static void PolylineOverlay(java.util.List<com.naver.maps.geometry.LatLng> coords, optional float width, optional long color, optional androidx.compose.ui.unit.Dp![] pattern, optional com.naver.maps.map.compose.LineCap capType, optional com.naver.maps.map.compose.LineJoin joinType, optional Object? tag, optional boolean visible, optional double minZoom, optional boolean minZoomInclusive, optional double maxZoom, optional boolean maxZoomInclusive, optional int zIndex, optional int globalZIndex, optional kotlin.jvm.functions.Function1<? super com.naver.maps.map.overlay.PolylineOverlay,java.lang.Boolean> onClick);
}

public final class RememberComposeOverlayImageKt {
}

}

Loading

0 comments on commit b275d4c

Please sign in to comment.