jo1042/StrassenSchadenPro2
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add GPS and map-based feature creation to CreatePage with attribute validation, MapViewModel enhancements for feature handling, and dependency updates.

Browse Source
This commit is contained in:
Jörn Ahlers
2025-12-04 11:02:45 +01:00
parent 56c61d38a1
commit bd66f298e0
4 changed files with 85 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/de/jadehs/strassenschadenpro2/pages/CreatePage.kt
View File

@@ -22,9 +22,12 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.unit.dp
import com.arcgismaps.geometry.Point
import com.arcgismaps.geometry.SpatialReference
import com.arcgismaps.location.LocationDisplayAutoPanMode
import com.arcgismaps.toolkit.geoviewcompose.MapView
import com.arcgismaps.toolkit.geoviewcompose.rememberLocationDisplay
import com.google.android.gms.location.LocationServices
import de.jadehs.strassenschadenpro2.MapViewModel
import de.jadehs.strassenschadenpro2.components.DropDownMenuBox
import kotlinx.coroutines.launch
@@ -38,6 +41,8 @@ fun CreatePage(modifier: Modifier = Modifier, mapViewModel: MapViewModel) {
var showModalBottomSheet = remember { mutableStateOf(false) }
var enableSaveButton = remember { mutableStateOf(false) }
val locationDisplay = rememberLocationDisplay().apply {
setAutoPanMode(LocationDisplayAutoPanMode.Off)
}
@@ -60,6 +65,8 @@ fun CreatePage(modifier: Modifier = Modifier, mapViewModel: MapViewModel) {
)
}
val fuesedLocationClient = remember { LocationServices.getFusedLocationProviderClient(context) }
Column(modifier = modifier.fillMaxSize()
.padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 16.dp),
verticalArrangement = Arrangement.Top,
@@ -69,6 +76,7 @@ fun CreatePage(modifier: Modifier = Modifier, mapViewModel: MapViewModel) {
value = beschreibungTextFieldValue.value,
onValueChange = {
beschreibungTextFieldValue.value = it
enableSaveButton.value = beschreibungTextFieldValue.value.text.isNotEmpty() && currentDamageType.value.isNotEmpty()
},
minLines = 5,
label = { Text("Beschreibung")}
@@ -81,15 +89,28 @@ fun CreatePage(modifier: Modifier = Modifier, mapViewModel: MapViewModel) {
dropDownItemList = mapViewModel.damageTypeList,
onIndexSelected = { index ->
currentDamageType.value = mapViewModel.damageTypeList[index]
Log.d("CreatePage", "Selected index: $index")
enableSaveButton.value = beschreibungTextFieldValue.value.text.isNotEmpty() && currentDamageType.value.isNotEmpty()
}
)
Row(modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceEvenly){
Button(onClick = {}){
Button(enabled = enableSaveButton.value,
onClick = {
fuesedLocationClient.lastLocation.addOnSuccessListener { location ->
location?.let { location->
val beschreibung = beschreibungTextFieldValue.value.text
val typ = currentDamageType.value
var point = Point(location.longitude,
location.latitude,
SpatialReference.wgs84())
mapViewModel.createFeatureWithAttributesAtPoint(point,beschreibung,typ)
}
}
}){
Text("GPS")
}
Button(onClick = {
Button(enabled = enableSaveButton.value,
onClick = {
showModalBottomSheet.value = !showModalBottomSheet.value
}){
Text("Karte")
@@ -98,6 +119,7 @@ fun CreatePage(modifier: Modifier = Modifier, mapViewModel: MapViewModel) {
}
if(showModalBottomSheet.value) {
ModalBottomSheet(
sheetGesturesEnabled = false,
onDismissRequest = {
showModalBottomSheet.value = false
}
@@ -107,7 +129,12 @@ fun CreatePage(modifier: Modifier = Modifier, mapViewModel: MapViewModel) {
arcGISMap = mapViewModel.map,
locationDisplay = locationDisplay,
mapViewProxy = mapViewModel.mapViewProxy,
onSingleTapConfirmed = mapViewModel::onTap,
onSingleTapConfirmed = { singleTapConfirmedEvent ->
val screenCoordinate = singleTapConfirmedEvent.screenCoordinate
val beschreibung = beschreibungTextFieldValue.value.text
val typ = currentDamageType.value
mapViewModel.createFeatureWithAttributesAt(screenCoordinate,beschreibung,typ)
},
)
}
}