From a30076a2ab73c30bd0d34071b1d0a6bcdbbcd11c Mon Sep 17 00:00:00 2001 From: Maxime NATUREL Date: Mon, 1 Aug 2022 14:48:15 +0200 Subject: [PATCH] Creating location.preview package --- .../src/main/java/im/vector/app/core/di/FragmentModule.kt | 2 +- .../im/vector/app/core/di/MavericksViewModelModule.kt | 2 +- .../app/features/location/LocationSharingActivity.kt | 1 + .../location/{ => preview}/LocationPreviewAction.kt | 4 ++-- .../location/{ => preview}/LocationPreviewFragment.kt | 8 ++++++-- .../location/{ => preview}/LocationPreviewViewModel.kt | 2 +- .../location/{ => preview}/LocationPreviewViewState.kt | 2 +- 7 files changed, 13 insertions(+), 8 deletions(-) rename vector/src/main/java/im/vector/app/features/location/{ => preview}/LocationPreviewAction.kt (89%) rename vector/src/main/java/im/vector/app/features/location/{ => preview}/LocationPreviewFragment.kt (94%) rename vector/src/main/java/im/vector/app/features/location/{ => preview}/LocationPreviewViewModel.kt (97%) rename vector/src/main/java/im/vector/app/features/location/{ => preview}/LocationPreviewViewState.kt (93%) diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt index 3cdc8a1afe..99c4324b00 100644 --- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt +++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt @@ -64,7 +64,7 @@ import im.vector.app.features.home.room.detail.search.SearchFragment import im.vector.app.features.home.room.list.RoomListFragment import im.vector.app.features.home.room.list.home.HomeRoomListFragment import im.vector.app.features.home.room.threads.list.views.ThreadListFragment -import im.vector.app.features.location.LocationPreviewFragment +import im.vector.app.features.location.preview.LocationPreviewFragment import im.vector.app.features.location.LocationSharingFragment import im.vector.app.features.login.LoginCaptchaFragment import im.vector.app.features.login.LoginFragment diff --git a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt index 3936b9eef7..3078d01da9 100644 --- a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt +++ b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt @@ -54,7 +54,7 @@ import im.vector.app.features.home.room.list.RoomListViewModel import im.vector.app.features.home.room.list.home.HomeRoomListViewModel import im.vector.app.features.homeserver.HomeServerCapabilitiesViewModel import im.vector.app.features.invite.InviteUsersToRoomViewModel -import im.vector.app.features.location.LocationPreviewViewModel +import im.vector.app.features.location.preview.LocationPreviewViewModel import im.vector.app.features.location.LocationSharingViewModel import im.vector.app.features.location.live.map.LiveLocationMapViewModel import im.vector.app.features.login.LoginViewModel diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt index 169af4a5a2..9eddcad649 100644 --- a/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt +++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt @@ -23,6 +23,7 @@ import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.extensions.addFragment import im.vector.app.core.platform.VectorBaseActivity import im.vector.app.databinding.ActivityLocationSharingBinding +import im.vector.app.features.location.preview.LocationPreviewFragment import kotlinx.parcelize.Parcelize @Parcelize diff --git a/vector/src/main/java/im/vector/app/features/location/LocationPreviewAction.kt b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewAction.kt similarity index 89% rename from vector/src/main/java/im/vector/app/features/location/LocationPreviewAction.kt rename to vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewAction.kt index 75474c3f34..38f6952f67 100644 --- a/vector/src/main/java/im/vector/app/features/location/LocationPreviewAction.kt +++ b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewAction.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 New Vector Ltd + * Copyright (c) 2022 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.app.features.location +package im.vector.app.features.location.preview import im.vector.app.core.platform.VectorViewModelAction diff --git a/vector/src/main/java/im/vector/app/features/location/LocationPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewFragment.kt similarity index 94% rename from vector/src/main/java/im/vector/app/features/location/LocationPreviewFragment.kt rename to vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewFragment.kt index e8443afbc3..8285d0156b 100644 --- a/vector/src/main/java/im/vector/app/features/location/LocationPreviewFragment.kt +++ b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewFragment.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 New Vector Ltd + * Copyright (c) 2022 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.app.features.location +package im.vector.app.features.location.preview import android.os.Bundle import android.view.LayoutInflater @@ -33,6 +33,10 @@ import im.vector.app.core.platform.VectorMenuProvider import im.vector.app.core.utils.openLocation import im.vector.app.databinding.FragmentLocationPreviewBinding import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider +import im.vector.app.features.location.DEFAULT_PIN_ID +import im.vector.app.features.location.LocationSharingArgs +import im.vector.app.features.location.MapState +import im.vector.app.features.location.UrlMapProvider import java.lang.ref.WeakReference import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/app/features/location/LocationPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/app/features/location/LocationPreviewViewModel.kt rename to vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewModel.kt index 5987bd22f8..f0698249ce 100644 --- a/vector/src/main/java/im/vector/app/features/location/LocationPreviewViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.app.features.location +package im.vector.app.features.location.preview import com.airbnb.mvrx.MavericksViewModelFactory import dagger.assisted.Assisted diff --git a/vector/src/main/java/im/vector/app/features/location/LocationPreviewViewState.kt b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewState.kt similarity index 93% rename from vector/src/main/java/im/vector/app/features/location/LocationPreviewViewState.kt rename to vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewState.kt index c3bc86b704..96e8316323 100644 --- a/vector/src/main/java/im/vector/app/features/location/LocationPreviewViewState.kt +++ b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.app.features.location +package im.vector.app.features.location.preview import com.airbnb.mvrx.MavericksState