Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.CheckCircle
import androidx.compose.material.icons.filled.Home
import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
Expand All @@ -13,6 +14,7 @@ import androidx.compose.ui.Modifier
import androidx.lifecycle.viewmodel.compose.viewModel
import com.mapconductor.example.navigation.NavigationViewModel
import com.mapconductor.example.pages.circle.CircleMapPage
import com.mapconductor.example.pages.polyline.PolylineMapPage
import com.mapconductor.example.pages.stores.StoreMapPage
import com.mapconductor.example.ui.sidebar.Sidebar
import com.mapconductor.example.ui.sidebar.SidebarItem
Expand All @@ -38,6 +40,12 @@ fun DemoAppScreen() {
icon = Icons.Default.CheckCircle,
route = "circle",
),
SidebarItem(
id = "polyline",
title = "Polyline Demo",
icon = Icons.Default.PlayArrow,
route = "polyline",
),
// SidebarItem(
// id = "examples",
// title = "Map Examples",
Expand Down Expand Up @@ -67,6 +75,11 @@ fun DemoAppScreen() {
onToggleSidebar = navigationViewModel::toggleSidebar,
)
}
"polyline" -> {
PolylineMapPage(
onToggleSidebar = navigationViewModel::toggleSidebar,
)
}
"settings" -> {
// Placeholder for settings page
Box(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import com.mapconductor.core.circle.OnCircleEventHandler
import com.mapconductor.core.map.MapViewState
import com.mapconductor.core.map.OnMapEventHandler
import com.mapconductor.core.marker.OnMarkerEventHandler
import com.mapconductor.core.polyline.OnPolylineEventHandler
import com.mapconductor.googlemaps.GoogleMapViewState
import com.mapconductor.googlemaps.GoogleMapsView
import com.mapconductor.here.HereMapView
Expand All @@ -28,6 +29,7 @@ fun MapViewContainer(
onMarkerAnimateStart: OnMarkerEventHandler? = null,
onMarkerAnimateEnd: OnMarkerEventHandler? = null,
onCircleClick: OnCircleEventHandler? = null,
onPolylineClick: OnPolylineEventHandler? = null,
content: @Composable MapViewScope.() -> Unit,
) {
when (state) {
Expand All @@ -43,6 +45,7 @@ fun MapViewContainer(
onMarkerAnimateStart = onMarkerAnimateStart,
onMarkerAnimateEnd = onMarkerAnimateEnd,
onCircleClick = onCircleClick,
onPolylineClick = onPolylineClick,
content = content,
)

Expand All @@ -57,6 +60,8 @@ fun MapViewContainer(
onMarkerDragEnd = onMarkerDragEnd,
onMarkerAnimateStart = onMarkerAnimateStart,
onMarkerAnimateEnd = onMarkerAnimateEnd,
onCircleClick = onCircleClick,
onPolylineClick = onPolylineClick,
content = content,
)

Expand All @@ -72,6 +77,7 @@ fun MapViewContainer(
onMarkerAnimateStart = onMarkerAnimateStart,
onMarkerAnimateEnd = onMarkerAnimateEnd,
onCircleClick = onCircleClick,
onPolylineClick = onPolylineClick,
content = content,
)

Expand All @@ -87,6 +93,7 @@ fun MapViewContainer(
onMarkerAnimateStart = onMarkerAnimateStart,
onMarkerAnimateEnd = onMarkerAnimateEnd,
onCircleClick = onCircleClick,
onPolylineClick = onPolylineClick,
content = content,
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.lifecycle.ViewModel

class NavigationViewModel : ViewModel() {
private val _currentPage = mutableStateOf("map")
private val _currentPage = mutableStateOf("polyline")
val currentPage: State<String> = _currentPage

private val _isSidebarExpanded = mutableStateOf(false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ fun CircleMapComponent(
mapViewState: MapViewState<*>?,
viewModel: CirclePageViewModel,
modifier: Modifier = Modifier,
onMapClickHandler: OnMapEventHandler = {},
onMarkerClickHandler: OnMarkerEventHandler = {},
onCircleClickHandler: OnCircleEventHandler = {},
onMapClick: OnMapEventHandler = {},
onMarkerClick: OnMarkerEventHandler = {},
onCircleClick: OnCircleEventHandler = {},
onMarkerDrag: OnMarkerEventHandler = {},
) {
mapViewState?.let { mapViewState ->
mapViewState?.let { it ->
MapViewContainer(
modifier = modifier,
state = mapViewState,
onMapClick = onMapClickHandler,
onMarkerClick = onMarkerClickHandler,
onCircleClick = onCircleClickHandler,
state = it,
onMapClick = onMapClick,
onMarkerClick = onMarkerClick,
onCircleClick = onCircleClick,
onMarkerDrag = onMarkerDrag,
) {
// Circle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@ package com.mapconductor.example.pages.circle

import androidx.compose.foundation.layout.calculateEndPadding
import androidx.compose.foundation.layout.calculateStartPadding
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import com.mapconductor.example.R
import com.mapconductor.example.toast.ToastHost
import com.mapconductor.example.ui.DemoMapPageScaffold
import com.mapconductor.example.ui.MapViewStatePanel
import com.mapconductor.example.ui.MessageCard

@Composable
Expand All @@ -29,9 +32,9 @@ fun CircleMapPage(
CircleMapComponent(
mapViewState = mapViewState.value,
viewModel = viewModel,
onMapClickHandler = viewModel::onMapClick,
onMarkerClickHandler = viewModel::onMarkerClick,
onCircleClickHandler = viewModel::onCircleClick,
onMapClick = viewModel::onMapClick,
onMarkerClick = viewModel::onMarkerClick,
onCircleClick = viewModel::onCircleClick,
onMarkerDrag = viewModel::onMarkerDrag,
)

Expand All @@ -47,11 +50,9 @@ fun CircleMapPage(
),
title = "Messages",
) {
MapViewStatePanel(
mapViewState.value
?.mapCameraPosition
?.collectAsState()
?.value,
Text(
text = stringResource(R.string.circle_example_description),
modifier = Modifier.fillMaxSize(),
)
}

Expand Down
Loading
Loading