Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show location replies per the designs

Browse source
This commit is contained in:
Chris Smith 2023-06-29 16:15:15 +01:00
parent 9e44a9eb8c
commit f5e57f1645
14 changed files with 167 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt
View file

@ -39,9 +39,9 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import io.element.android.features.location.api.R
import io.element.android.features.location.impl.map.MapView
import io.element.android.features.location.impl.map.rememberMapState
import io.element.android.libraries.designsystem.components.button.BackButton
@ -52,6 +52,7 @@ import io.element.android.libraries.designsystem.theme.components.CenterAlignedT
import io.element.android.libraries.designsystem.theme.components.Icon
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.ui.strings.CommonStrings
import io.element.android.libraries.matrix.ui.R as MatrixUIR
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
@Composable
@ -115,9 +116,15 @@ fun SendLocationView(
mapState = mapState,
)
Icon(
resourceId = R.drawable.pin,
resourceId = MatrixUIR.drawable.pin,
contentDescription = null,
tint = Color.Unspecified
tint = Color.Unspecified,
modifier = Modifier.align { size, space, _ ->
IntOffset(
x = (space.width - size.width) / 2,
y = (space.height / 2) - size.height,
)
}
)
}
}

7
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/map/MapView.kt
View file

@ -44,7 +44,6 @@ import com.mapbox.mapboxsdk.maps.MapboxMap
import com.mapbox.mapboxsdk.maps.Style
import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager
import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
import io.element.android.features.location.api.R
import io.element.android.features.location.api.internal.buildTileServerUrl
import io.element.android.features.location.impl.location.Location
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
@ -55,6 +54,7 @@ import kotlinx.collections.immutable.toImmutableList
import timber.log.Timber
import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
import io.element.android.libraries.matrix.ui.R as MatrixUIR
/**
* Composable wrapper around MapLibre's [MapView].
@ -149,12 +149,13 @@ fun MapView(
LaunchedEffect(mapRefs, mapState.location) {
mapRefs?.let { mapRefs ->
mapState.location?.let { location ->
context.getDrawable(R.drawable.pin)?.let { mapRefs.style.addImage("pin", it) }
context.getDrawable(MatrixUIR.drawable.pin)?.let { mapRefs.style.addImage("pin", it) }
mapRefs.symbolManager.create(
SymbolOptions()
.withLatLng(LatLng(location.lat, location.lon))
.withIconImage("pin")
.withIconSize(1.3f)
.withIconOffset(arrayOf(0f, 0.5f))
)
Timber.d("Shown pin at location: $location")
}
@ -275,7 +276,7 @@ private fun ContentToPreview() {
),
markers = listOf(
MapState.Marker(
drawable = R.drawable.pin,
drawable = MatrixUIR.drawable.pin,
lat = 0.0,
lon = 0.0,
)