From a429195cbccf604fb79f4363bf0b697c9e7108c8 Mon Sep 17 00:00:00 2001 From: Marco Romano Date: Wed, 26 Jul 2023 05:27:56 +0200 Subject: [PATCH] Move AndroidLocationActions to impl package --- .../features/location/impl/{ => common}/MapDefaults.kt | 2 +- .../{ => common/actions}/AndroidLocationActions.kt | 3 +-- .../impl/{show => common/actions}/LocationActions.kt | 2 +- .../impl/{ => common}/permissions/PermissionsEvents.kt | 2 +- .../{ => common}/permissions/PermissionsPresenter.kt | 2 +- .../permissions/PermissionsPresenterImpl.kt | 2 +- .../impl/{ => common}/permissions/PermissionsState.kt | 2 +- .../location/impl/send/SendLocationPresenter.kt | 10 +++++----- .../features/location/impl/send/SendLocationView.kt | 2 +- .../location/impl/show/ShowLocationPresenter.kt | 9 +++++---- .../features/location/impl/show/ShowLocationView.kt | 2 +- .../actions}/AndroidLocationActionsTest.kt | 4 ++-- .../{show => common/actions}/FakeLocationActions.kt | 3 ++- .../permissions/PermissionsPresenterFake.kt | 5 ++++- .../location/impl/send/SendLocationPresenterTest.kt | 8 ++++---- .../location/impl/show/ShowLocationPresenterTest.kt | 5 +++-- 16 files changed, 34 insertions(+), 29 deletions(-) rename features/location/impl/src/main/kotlin/io/element/android/features/location/impl/{ => common}/MapDefaults.kt (97%) rename features/location/impl/src/main/kotlin/io/element/android/features/location/impl/{ => common/actions}/AndroidLocationActions.kt (95%) rename features/location/impl/src/main/kotlin/io/element/android/features/location/impl/{show => common/actions}/LocationActions.kt (92%) rename features/location/impl/src/main/kotlin/io/element/android/features/location/impl/{ => common}/permissions/PermissionsEvents.kt (90%) rename features/location/impl/src/main/kotlin/io/element/android/features/location/impl/{ => common}/permissions/PermissionsPresenter.kt (92%) rename features/location/impl/src/main/kotlin/io/element/android/features/location/impl/{ => common}/permissions/PermissionsPresenterImpl.kt (97%) rename features/location/impl/src/main/kotlin/io/element/android/features/location/impl/{ => common}/permissions/PermissionsState.kt (94%) rename features/location/impl/src/test/kotlin/io/element/android/features/location/impl/{show => common/actions}/AndroidLocationActionsTest.kt (93%) rename features/location/impl/src/test/kotlin/io/element/android/features/location/impl/{show => common/actions}/FakeLocationActions.kt (88%) rename features/location/impl/src/test/kotlin/io/element/android/features/location/impl/{ => common}/permissions/PermissionsPresenterFake.kt (77%) diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/MapDefaults.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/MapDefaults.kt similarity index 97% rename from features/location/impl/src/main/kotlin/io/element/android/features/location/impl/MapDefaults.kt rename to features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/MapDefaults.kt index 4709c78538..6fa74f04f0 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/MapDefaults.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/MapDefaults.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.location.impl +package io.element.android.features.location.impl.common import android.Manifest import android.view.Gravity diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/AndroidLocationActions.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActions.kt similarity index 95% rename from features/location/impl/src/main/kotlin/io/element/android/features/location/impl/AndroidLocationActions.kt rename to features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActions.kt index da88598251..b548f5c782 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/AndroidLocationActions.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActions.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.location.impl +package io.element.android.features.location.impl.common.actions import android.content.Context import android.content.Intent @@ -22,7 +22,6 @@ import android.net.Uri import androidx.annotation.VisibleForTesting import com.squareup.anvil.annotations.ContributesBinding import io.element.android.features.location.api.Location -import io.element.android.features.location.impl.show.LocationActions import io.element.android.libraries.androidutils.system.openAppSettingsPage import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.ApplicationContext diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/LocationActions.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/LocationActions.kt similarity index 92% rename from features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/LocationActions.kt rename to features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/LocationActions.kt index d93b15e5c5..319f332f6b 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/LocationActions.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/actions/LocationActions.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.location.impl.show +package io.element.android.features.location.impl.common.actions import io.element.android.features.location.api.Location diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/permissions/PermissionsEvents.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsEvents.kt similarity index 90% rename from features/location/impl/src/main/kotlin/io/element/android/features/location/impl/permissions/PermissionsEvents.kt rename to features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsEvents.kt index 194bf31df7..fc18ec6ede 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/permissions/PermissionsEvents.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.location.impl.permissions +package io.element.android.features.location.impl.common.permissions sealed interface PermissionsEvents { object RequestPermissions : PermissionsEvents diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/permissions/PermissionsPresenter.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenter.kt similarity index 92% rename from features/location/impl/src/main/kotlin/io/element/android/features/location/impl/permissions/PermissionsPresenter.kt rename to features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenter.kt index ccff16159e..1a3cd6677b 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/permissions/PermissionsPresenter.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.location.impl.permissions +package io.element.android.features.location.impl.common.permissions import io.element.android.libraries.architecture.Presenter diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/permissions/PermissionsPresenterImpl.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenterImpl.kt similarity index 97% rename from features/location/impl/src/main/kotlin/io/element/android/features/location/impl/permissions/PermissionsPresenterImpl.kt rename to features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenterImpl.kt index 85941ab7d3..1a334212a2 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/permissions/PermissionsPresenterImpl.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenterImpl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.location.impl.permissions +package io.element.android.features.location.impl.common.permissions import androidx.compose.runtime.Composable import com.google.accompanist.permissions.ExperimentalPermissionsApi diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/permissions/PermissionsState.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsState.kt similarity index 94% rename from features/location/impl/src/main/kotlin/io/element/android/features/location/impl/permissions/PermissionsState.kt rename to features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsState.kt index 626cf93c23..76b786c638 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/permissions/PermissionsState.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.location.impl.permissions +package io.element.android.features.location.impl.common.permissions data class PermissionsState( val permissions: Permissions = Permissions.NoneGranted, diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationPresenter.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationPresenter.kt index 595e26e32e..2ea7dc20e1 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationPresenter.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationPresenter.kt @@ -25,11 +25,11 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import im.vector.app.features.analytics.plan.Composer -import io.element.android.features.location.impl.MapDefaults -import io.element.android.features.location.impl.permissions.PermissionsEvents -import io.element.android.features.location.impl.permissions.PermissionsPresenter -import io.element.android.features.location.impl.permissions.PermissionsState -import io.element.android.features.location.impl.show.LocationActions +import io.element.android.features.location.impl.common.MapDefaults +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.PermissionsState +import io.element.android.features.location.impl.common.actions.LocationActions import io.element.android.features.messages.api.MessageComposerContext import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.core.meta.BuildMeta diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt index cfb30a5523..5bf4354f24 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt @@ -47,7 +47,7 @@ import com.mapbox.mapboxsdk.camera.CameraPosition import io.element.android.features.location.api.Location import io.element.android.features.location.api.internal.centerBottomEdge import io.element.android.features.location.api.internal.rememberTileStyleUrl -import io.element.android.features.location.impl.MapDefaults +import io.element.android.features.location.impl.common.MapDefaults import io.element.android.features.location.impl.R import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt index 267f9e2dde..150a314ce7 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt @@ -27,10 +27,11 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import io.element.android.features.location.api.Location -import io.element.android.features.location.impl.MapDefaults -import io.element.android.features.location.impl.permissions.PermissionsEvents -import io.element.android.features.location.impl.permissions.PermissionsPresenter -import io.element.android.features.location.impl.permissions.PermissionsState +import io.element.android.features.location.impl.common.MapDefaults +import io.element.android.features.location.impl.common.actions.LocationActions +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.PermissionsState import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.core.meta.BuildMeta diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt index 0e114a43b9..fb4f3ac1f8 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt @@ -39,7 +39,7 @@ import androidx.compose.ui.unit.dp import com.mapbox.mapboxsdk.camera.CameraPosition import com.mapbox.mapboxsdk.geometry.LatLng import io.element.android.features.location.api.internal.rememberTileStyleUrl -import io.element.android.features.location.impl.MapDefaults +import io.element.android.features.location.impl.common.MapDefaults import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewLight diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/AndroidLocationActionsTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActionsTest.kt similarity index 93% rename from features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/AndroidLocationActionsTest.kt rename to features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActionsTest.kt index 29c0ba4d58..3bfa963664 100644 --- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/AndroidLocationActionsTest.kt +++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActionsTest.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.element.android.features.location.impl.show +package io.element.android.features.location.impl.common.actions import com.google.common.truth.Truth.assertThat import io.element.android.features.location.api.Location -import io.element.android.features.location.impl.buildUrl +import io.element.android.features.location.impl.common.actions.buildUrl import org.junit.Test import java.net.URLEncoder diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/FakeLocationActions.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/FakeLocationActions.kt similarity index 88% rename from features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/FakeLocationActions.kt rename to features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/FakeLocationActions.kt index c54aab6f28..a412d4e5ca 100644 --- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/FakeLocationActions.kt +++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/FakeLocationActions.kt @@ -14,9 +14,10 @@ * limitations under the License. */ -package io.element.android.features.location.impl.show +package io.element.android.features.location.impl.common.actions import io.element.android.features.location.api.Location +import io.element.android.features.location.impl.common.actions.LocationActions class FakeLocationActions : LocationActions { diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/permissions/PermissionsPresenterFake.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenterFake.kt similarity index 77% rename from features/location/impl/src/test/kotlin/io/element/android/features/location/impl/permissions/PermissionsPresenterFake.kt rename to features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenterFake.kt index a18e4cf2bf..cf2140a7a5 100644 --- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/permissions/PermissionsPresenterFake.kt +++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenterFake.kt @@ -14,9 +14,12 @@ * limitations under the License. */ -package io.element.android.features.location.impl.permissions +package io.element.android.features.location.impl.common.permissions import androidx.compose.runtime.Composable +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.PermissionsState class PermissionsPresenterFake : PermissionsPresenter { diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt index 0aa89e89ba..02306b8d7e 100644 --- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt +++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt @@ -23,11 +23,11 @@ import com.google.common.truth.Truth import im.vector.app.features.analytics.plan.Composer import io.element.android.features.analytics.test.FakeAnalyticsService import io.element.android.features.location.api.Location -import io.element.android.features.location.impl.permissions.PermissionsEvents -import io.element.android.features.location.impl.permissions.PermissionsPresenter +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.permissions.PermissionsPresenterFake -import io.element.android.features.location.impl.permissions.PermissionsState -import io.element.android.features.location.impl.show.FakeLocationActions +import io.element.android.features.location.impl.common.permissions.PermissionsState +import io.element.android.features.location.impl.common.actions.FakeLocationActions import io.element.android.features.messages.test.MessageComposerContextFake import io.element.android.libraries.matrix.api.room.location.AssetType import io.element.android.libraries.matrix.test.core.aBuildMeta diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt index 633d60b960..e3a0d6db2a 100644 --- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt +++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt @@ -21,9 +21,10 @@ import app.cash.molecule.moleculeFlow import app.cash.turbine.test import com.google.common.truth.Truth import io.element.android.features.location.api.Location -import io.element.android.features.location.impl.permissions.PermissionsPresenter +import io.element.android.features.location.impl.common.actions.FakeLocationActions +import io.element.android.features.location.impl.common.permissions.PermissionsPresenter import io.element.android.features.location.impl.permissions.PermissionsPresenterFake -import io.element.android.features.location.impl.permissions.PermissionsState +import io.element.android.features.location.impl.common.permissions.PermissionsState import io.element.android.libraries.matrix.test.core.aBuildMeta import kotlinx.coroutines.delay import kotlinx.coroutines.test.runTest