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

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

@@ -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),

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

@@ -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),

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

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

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

@@ -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 = {},
     )
 }
 

features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/FakePermissionsPresenter.kt

@@ -18,7 +18,7 @@ package io.element.android.features.location.impl.common.permissions
 
 import androidx.compose.runtime.Composable
 
-class PermissionsPresenterFake : PermissionsPresenter {
+class FakePermissionsPresenter : PermissionsPresenter {
     val events = mutableListOf<PermissionsEvents>()
 
     private fun handleEvent(event: PermissionsEvents) {

features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt

@@ -24,9 +24,9 @@ import im.vector.app.features.analytics.plan.Composer
 import io.element.android.features.location.api.Location
 import io.element.android.features.location.impl.aPermissionsState
 import io.element.android.features.location.impl.common.actions.FakeLocationActions
+import io.element.android.features.location.impl.common.permissions.FakePermissionsPresenter
 import io.element.android.features.location.impl.common.permissions.PermissionsEvents
 import io.element.android.features.location.impl.common.permissions.PermissionsPresenter
-import io.element.android.features.location.impl.common.permissions.PermissionsPresenterFake
 import io.element.android.features.location.impl.common.permissions.PermissionsState
 import io.element.android.features.messages.test.FakeMessageComposerContext
 import io.element.android.libraries.matrix.api.room.location.AssetType
@@ -45,7 +45,7 @@ class SendLocationPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
-    private val permissionsPresenterFake = PermissionsPresenterFake()
+    private val fakePermissionsPresenter = FakePermissionsPresenter()
     private val fakeMatrixRoom = FakeMatrixRoom()
     private val fakeAnalyticsService = FakeAnalyticsService()
     private val fakeMessageComposerContext = FakeMessageComposerContext()
@@ -53,7 +53,7 @@ class SendLocationPresenterTest {
     private val fakeBuildMeta = aBuildMeta(applicationName = "app name")
     private val sendLocationPresenter: SendLocationPresenter = SendLocationPresenter(
         permissionsPresenterFactory = object : PermissionsPresenter.Factory {
-            override fun create(permissions: List<String>): PermissionsPresenter = permissionsPresenterFake
+            override fun create(permissions: List<String>): PermissionsPresenter = fakePermissionsPresenter
         },
         room = fakeMatrixRoom,
         analyticsService = fakeAnalyticsService,
@@ -64,7 +64,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `initial state with permissions granted`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.AllGranted,
                 shouldShowRationale = false,
@@ -90,7 +90,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `initial state with permissions partially granted`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.SomeGranted,
                 shouldShowRationale = false,
@@ -116,7 +116,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `initial state with permissions denied`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
@@ -142,7 +142,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `initial state with permissions denied once`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = true,
@@ -168,7 +168,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `rationale dialog dismiss`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = true,
@@ -199,7 +199,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `rationale dialog continue`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = true,
@@ -221,13 +221,13 @@ class SendLocationPresenterTest {
 
             // Continue the dialog sends permission request to the permissions presenter
             myLocationState.eventSink(SendLocationEvents.RequestPermissions)
-            assertThat(permissionsPresenterFake.events.last()).isEqualTo(PermissionsEvents.RequestPermissions)
+            assertThat(fakePermissionsPresenter.events.last()).isEqualTo(PermissionsEvents.RequestPermissions)
         }
     }
 
     @Test
     fun `permission denied dialog dismiss`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
@@ -258,7 +258,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `share sender location`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.AllGranted,
                 shouldShowRationale = false,
@@ -314,7 +314,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `share pin location`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
@@ -370,7 +370,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `composer context passes through analytics`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
@@ -418,7 +418,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `open settings activity`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,

features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt

@@ -23,9 +23,9 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.location.api.Location
 import io.element.android.features.location.impl.aPermissionsState
 import io.element.android.features.location.impl.common.actions.FakeLocationActions
+import io.element.android.features.location.impl.common.permissions.FakePermissionsPresenter
 import io.element.android.features.location.impl.common.permissions.PermissionsEvents
 import io.element.android.features.location.impl.common.permissions.PermissionsPresenter
-import io.element.android.features.location.impl.common.permissions.PermissionsPresenterFake
 import io.element.android.features.location.impl.common.permissions.PermissionsState
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.tests.testutils.WarmUpRule
@@ -38,13 +38,13 @@ class ShowLocationPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
-    private val permissionsPresenterFake = PermissionsPresenterFake()
+    private val fakePermissionsPresenter = FakePermissionsPresenter()
     private val fakeLocationActions = FakeLocationActions()
     private val fakeBuildMeta = aBuildMeta(applicationName = "app name")
     private val location = Location(1.23, 4.56, 7.8f)
     private val presenter = ShowLocationPresenter(
         permissionsPresenterFactory = object : PermissionsPresenter.Factory {
-            override fun create(permissions: List<String>): PermissionsPresenter = permissionsPresenterFake
+            override fun create(permissions: List<String>): PermissionsPresenter = fakePermissionsPresenter
         },
         fakeLocationActions,
         fakeBuildMeta,
@@ -54,7 +54,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `emits initial state with no location permission`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
@@ -74,7 +74,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `emits initial state location permission denied once`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = true,
@@ -94,7 +94,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `emits initial state with location permission`() = runTest {
-        permissionsPresenterFake.givenState(aPermissionsState(permissions = PermissionsState.Permissions.AllGranted))
+        fakePermissionsPresenter.givenState(aPermissionsState(permissions = PermissionsState.Permissions.AllGranted))
 
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -109,7 +109,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `emits initial state with partial location permission`() = runTest {
-        permissionsPresenterFake.givenState(aPermissionsState(permissions = PermissionsState.Permissions.SomeGranted))
+        fakePermissionsPresenter.givenState(aPermissionsState(permissions = PermissionsState.Permissions.SomeGranted))
 
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -137,7 +137,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `centers on user location`() = runTest {
-        permissionsPresenterFake.givenState(aPermissionsState(permissions = PermissionsState.Permissions.AllGranted))
+        fakePermissionsPresenter.givenState(aPermissionsState(permissions = PermissionsState.Permissions.AllGranted))
 
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -165,7 +165,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `rationale dialog dismiss`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = true,
@@ -196,7 +196,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `rationale dialog continue`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = true,
@@ -218,13 +218,13 @@ class ShowLocationPresenterTest {
 
             // Continue the dialog sends permission request to the permissions presenter
             trackLocationState.eventSink(ShowLocationEvents.RequestPermissions)
-            assertThat(permissionsPresenterFake.events.last()).isEqualTo(PermissionsEvents.RequestPermissions)
+            assertThat(fakePermissionsPresenter.events.last()).isEqualTo(PermissionsEvents.RequestPermissions)
         }
     }
 
     @Test
     fun `permission denied dialog dismiss`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
@@ -255,7 +255,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `open settings activity`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,

features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationViewTest.kt

@@ -49,7 +49,7 @@ class ShowLocationViewTest {
                 state = aShowLocationState(
                     eventSink = eventsRecorder
                 ),
-                onBackPressed = callback,
+                onBackClick = callback,
             )
             rule.pressBack()
         }
@@ -62,7 +62,7 @@ class ShowLocationViewTest {
             aShowLocationState(
                 eventSink = eventsRecorder
             ),
-            onBackPressed = EnsureNeverCalled(),
+            onBackClick = EnsureNeverCalled(),
         )
         val shareContentDescription = rule.activity.getString(CommonStrings.action_share)
         rule.onNodeWithContentDescription(shareContentDescription).performClick()
@@ -76,7 +76,7 @@ class ShowLocationViewTest {
             aShowLocationState(
                 eventSink = eventsRecorder
             ),
-            onBackPressed = EnsureNeverCalled(),
+            onBackClick = EnsureNeverCalled(),
         )
         rule.onNodeWithTag(TestTags.floatingActionButton.value).performClick()
         eventsRecorder.assertSingle(ShowLocationEvents.TrackMyLocation(true))
@@ -90,7 +90,7 @@ class ShowLocationViewTest {
                 permissionDialog = ShowLocationState.Dialog.PermissionDenied,
                 eventSink = eventsRecorder
             ),
-            onBackPressed = EnsureNeverCalled(),
+            onBackClick = EnsureNeverCalled(),
         )
         rule.clickOn(CommonStrings.action_continue)
         eventsRecorder.assertSingle(ShowLocationEvents.OpenAppSettings)
@@ -104,7 +104,7 @@ class ShowLocationViewTest {
                 permissionDialog = ShowLocationState.Dialog.PermissionDenied,
                 eventSink = eventsRecorder
             ),
-            onBackPressed = EnsureNeverCalled(),
+            onBackClick = EnsureNeverCalled(),
         )
         rule.clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(ShowLocationEvents.DismissDialog)
@@ -118,7 +118,7 @@ class ShowLocationViewTest {
                 permissionDialog = ShowLocationState.Dialog.PermissionRationale,
                 eventSink = eventsRecorder
             ),
-            onBackPressed = EnsureNeverCalled(),
+            onBackClick = EnsureNeverCalled(),
         )
         rule.clickOn(CommonStrings.action_continue)
         eventsRecorder.assertSingle(ShowLocationEvents.RequestPermissions)
@@ -132,7 +132,7 @@ class ShowLocationViewTest {
                 permissionDialog = ShowLocationState.Dialog.PermissionRationale,
                 eventSink = eventsRecorder
             ),
-            onBackPressed = EnsureNeverCalled(),
+            onBackClick = EnsureNeverCalled(),
         )
         rule.clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(ShowLocationEvents.DismissDialog)
@@ -141,14 +141,14 @@ class ShowLocationViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setShowLocationView(
     state: ShowLocationState,
-    onBackPressed: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         // Simulate a LocalInspectionMode for MapLibreMap
         CompositionLocalProvider(LocalInspectionMode provides true) {
             ShowLocationView(
                 state = state,
-                onBackPressed = onBackPressed,
+                onBackClick = onBackClick,
             )
         }
     }