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

Merge branch 'develop' into renovate/org.maplibre.gl-android-sdk-11.x

Browse source
This commit is contained in:
ganfra 2024-05-29 15:43:25 +02:00 • committed by GitHub
commit 232c8de702
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1249 changed files with 18041 additions and 8127 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionDeniedDialog.kt
View file

@ -29,7 +29,7 @@ internal fun PermissionDeniedDialog(
) {
ConfirmationDialog(
content = stringResource(CommonStrings.error_missing_location_auth_android, appName),
onSubmitClicked = onContinue,
onSubmitClick = onContinue,
onDismiss = onDismiss,
submitText = stringResource(CommonStrings.action_continue),
cancelText = stringResource(CommonStrings.action_cancel),

2
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionRationaleDialog.kt
View file

@ -29,7 +29,7 @@ internal fun PermissionRationaleDialog(
) {
ConfirmationDialog(
content = stringResource(CommonStrings.error_missing_location_rationale_android, appName),
onSubmitClicked = onContinue,
onSubmitClick = onContinue,
onDismiss = onDismiss,
submitText = stringResource(CommonStrings.action_continue),
cancelText = stringResource(CommonStrings.action_cancel),

2
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationNode.kt
View file

@ -54,7 +54,7 @@ class ShowLocationNode @AssistedInject constructor(
ShowLocationView(
state = presenter.present(),
modifier = modifier,
onBackPressed = ::navigateUp
onBackClick = ::navigateUp
)
}
}

6
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
View file

@ -67,7 +67,7 @@ import org.maplibre.android.geometry.LatLng
@Composable
fun ShowLocationView(
state: ShowLocationState,
onBackPressed: () -> Unit,
onBackClick: () -> Unit,
modifier: Modifier = Modifier,
) {
when (state.permissionDialog) {
@ -121,7 +121,7 @@ fun ShowLocationView(
},
navigationIcon = {
BackButton(
onClick = onBackPressed,
onClick = onBackClick,
)
},
actions = {
@ -194,7 +194,7 @@ fun ShowLocationView(
internal fun ShowLocationViewPreview(@PreviewParameter(ShowLocationStateProvider::class) state: ShowLocationState) = ElementPreview {
ShowLocationView(
state = state,
onBackPressed = {},
onBackClick = {},
)
}