From d4a71938a9073bb3895c8009c59ed9a378b1a132 Mon Sep 17 00:00:00 2001 From: andreia Date: Fri, 30 Jan 2026 12:13:02 +0100 Subject: [PATCH 1/2] move di files to sepparate package --- .../android/data/local/LocalValueStore.kt | 7 ++++--- .../data/remote/firebase/FirestoreDataStore.kt | 2 +- .../android/data/sync/LocalMutationSyncWorker.kt | 2 +- .../android/data/sync/MediaUploadWorker.kt | 2 +- .../android/data/sync/SurveySyncWorker.kt | 2 +- .../{system/auth => di}/AuthenticationModule.kt | 15 ++++++++------- .../android/{util => di}/FirebaseModule.kt | 2 +- .../android/{ => di}/GroundApplicationModule.kt | 3 +-- .../{data/local => di}/LocalDataStoreModule.kt | 2 +- .../android/{ => di}/LocalDatabaseModule.kt | 4 ++-- .../android/{ui/map => di}/MapProviderModule.kt | 3 ++- .../{ui/map/gms/mog => di}/MogProviderModule.kt | 8 ++++++-- .../remote => di}/RemotePersistenceModule.kt | 4 +++- .../{data/local => di}/SharedPreferencesModule.kt | 2 +- .../android/{system => di}/SystemModule.kt | 3 +-- .../android/{ui/common => di}/ViewModelModule.kt | 5 ++++- .../coroutines/CoroutineDispatchersModule.kt | 2 +- .../{ => di}/coroutines/CoroutineScopesModule.kt | 7 +++---- .../android/repository/SurveyRepository.kt | 2 +- .../android/system/ActivityStreams.kt | 2 +- .../android/system/GeocodingManager.kt | 2 +- .../android/system/LocationManager.kt | 2 +- .../system/auth/AnonymousAuthenticationManager.kt | 2 +- .../system/auth/GoogleAuthenticationManager.kt | 2 +- .../ui/datacollection/DataCollectionViewModel.kt | 4 ++-- .../tasks/photo/PhotoTaskFragment.kt | 6 +++--- .../android/ui/main/MainViewModel.kt | 2 +- .../android/ui/map/gms/features/FeatureManager.kt | 2 +- .../selector/OfflineAreaSelectorViewModel.kt | 2 +- .../viewer/OfflineAreaViewerViewModel.kt | 2 +- .../ui/surveyselector/SurveySelectorViewModel.kt | 4 ++-- .../android/TestAuthenticationModule.kt | 2 +- .../android/TestCoroutineDispatchersModule.kt | 6 +++--- .../android/TestCoroutineScopesModule.kt | 6 +++--- .../groundplatform/android/TestFirebaseModule.kt | 2 +- .../android/TestLocalDatabaseModule.kt | 1 + .../android/TestRemoteStorageModule.kt | 2 +- .../data/sync/LocalMutationSyncWorkerTest.kt | 2 +- .../android/data/sync/MediaUploadWorkerTest.kt | 2 +- .../android/data/sync/SurveySyncServiceTest.kt | 2 +- .../android/data/sync/SurveySyncWorkerTest.kt | 2 +- .../android/system/GeocodingManagerTest.kt | 1 + .../system/auth/FakeAuthenticationManager.kt | 2 +- 43 files changed, 75 insertions(+), 64 deletions(-) rename app/src/main/java/org/groundplatform/android/{system/auth => di}/AuthenticationModule.kt (72%) rename app/src/main/java/org/groundplatform/android/{util => di}/FirebaseModule.kt (97%) rename app/src/main/java/org/groundplatform/android/{ => di}/GroundApplicationModule.kt (94%) rename app/src/main/java/org/groundplatform/android/{data/local => di}/LocalDataStoreModule.kt (99%) rename app/src/main/java/org/groundplatform/android/{ => di}/LocalDatabaseModule.kt (95%) rename app/src/main/java/org/groundplatform/android/{ui/map => di}/MapProviderModule.kt (91%) rename app/src/main/java/org/groundplatform/android/{ui/map/gms/mog => di}/MogProviderModule.kt (77%) rename app/src/main/java/org/groundplatform/android/{data/remote => di}/RemotePersistenceModule.kt (94%) rename app/src/main/java/org/groundplatform/android/{data/local => di}/SharedPreferencesModule.kt (96%) rename app/src/main/java/org/groundplatform/android/{system => di}/SystemModule.kt (96%) rename app/src/main/java/org/groundplatform/android/{ui/common => di}/ViewModelModule.kt (96%) rename app/src/main/java/org/groundplatform/android/{ => di}/coroutines/CoroutineDispatchersModule.kt (96%) rename app/src/main/java/org/groundplatform/android/{ => di}/coroutines/CoroutineScopesModule.kt (89%) diff --git a/app/src/main/java/org/groundplatform/android/data/local/LocalValueStore.kt b/app/src/main/java/org/groundplatform/android/data/local/LocalValueStore.kt index 5e5409475a..7fc7b9a8bc 100644 --- a/app/src/main/java/org/groundplatform/android/data/local/LocalValueStore.kt +++ b/app/src/main/java/org/groundplatform/android/data/local/LocalValueStore.kt @@ -29,9 +29,10 @@ import org.groundplatform.android.util.allowThreadDiskWrites import timber.log.Timber /** - * Simple value store persisted locally on device. Unlike [LocalDataStoreModule], this class - * provides a concrete implementation using the Android SDK, and therefore does not require a - * database-specific implementation. + * Simple value store persisted locally on device. Unlike + * [org.groundplatform.android.di.LocalDataStoreModule], this class provides a concrete + * implementation using the Android SDK, and therefore does not require a database-specific + * implementation. */ @Singleton class LocalValueStore diff --git a/app/src/main/java/org/groundplatform/android/data/remote/firebase/FirestoreDataStore.kt b/app/src/main/java/org/groundplatform/android/data/remote/firebase/FirestoreDataStore.kt index 428b7ef2c2..6e138d9013 100644 --- a/app/src/main/java/org/groundplatform/android/data/remote/firebase/FirestoreDataStore.kt +++ b/app/src/main/java/org/groundplatform/android/data/remote/firebase/FirestoreDataStore.kt @@ -30,9 +30,9 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.tasks.await import kotlinx.coroutines.withContext import org.groundplatform.android.BuildConfig.USE_EMULATORS -import org.groundplatform.android.coroutines.IoDispatcher import org.groundplatform.android.data.remote.RemoteDataStore import org.groundplatform.android.data.remote.firebase.schema.GroundFirestore +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.model.Survey import org.groundplatform.android.model.SurveyListItem import org.groundplatform.android.model.TermsOfService diff --git a/app/src/main/java/org/groundplatform/android/data/sync/LocalMutationSyncWorker.kt b/app/src/main/java/org/groundplatform/android/data/sync/LocalMutationSyncWorker.kt index 4d1259cd39..f1658aa545 100644 --- a/app/src/main/java/org/groundplatform/android/data/sync/LocalMutationSyncWorker.kt +++ b/app/src/main/java/org/groundplatform/android/data/sync/LocalMutationSyncWorker.kt @@ -25,8 +25,8 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext -import org.groundplatform.android.coroutines.IoDispatcher import org.groundplatform.android.data.remote.RemoteDataStore +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.model.mutation.Mutation import org.groundplatform.android.repository.MutationRepository import org.groundplatform.android.util.priority diff --git a/app/src/main/java/org/groundplatform/android/data/sync/MediaUploadWorker.kt b/app/src/main/java/org/groundplatform/android/data/sync/MediaUploadWorker.kt index e59d152d5e..9dfab31845 100644 --- a/app/src/main/java/org/groundplatform/android/data/sync/MediaUploadWorker.kt +++ b/app/src/main/java/org/groundplatform/android/data/sync/MediaUploadWorker.kt @@ -26,8 +26,8 @@ import dagger.assisted.AssistedInject import java.io.FileNotFoundException import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext -import org.groundplatform.android.coroutines.IoDispatcher import org.groundplatform.android.data.remote.RemoteStorageManager +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.model.mutation.SubmissionMutation import org.groundplatform.android.model.submission.PhotoTaskData import org.groundplatform.android.repository.MutationRepository diff --git a/app/src/main/java/org/groundplatform/android/data/sync/SurveySyncWorker.kt b/app/src/main/java/org/groundplatform/android/data/sync/SurveySyncWorker.kt index 36a6c7d254..2a6777784d 100644 --- a/app/src/main/java/org/groundplatform/android/data/sync/SurveySyncWorker.kt +++ b/app/src/main/java/org/groundplatform/android/data/sync/SurveySyncWorker.kt @@ -28,7 +28,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedInject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext -import org.groundplatform.android.coroutines.IoDispatcher +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.usecases.survey.SyncSurveyUseCase import timber.log.Timber diff --git a/app/src/main/java/org/groundplatform/android/system/auth/AuthenticationModule.kt b/app/src/main/java/org/groundplatform/android/di/AuthenticationModule.kt similarity index 72% rename from app/src/main/java/org/groundplatform/android/system/auth/AuthenticationModule.kt rename to app/src/main/java/org/groundplatform/android/di/AuthenticationModule.kt index 64373551e6..1e7f9aeec6 100644 --- a/app/src/main/java/org/groundplatform/android/system/auth/AuthenticationModule.kt +++ b/app/src/main/java/org/groundplatform/android/di/AuthenticationModule.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.groundplatform.android.system.auth +package org.groundplatform.android.di import com.google.firebase.auth.FirebaseAuth import dagger.Module @@ -21,9 +21,10 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import javax.inject.Singleton -import org.groundplatform.android.BuildConfig.AUTH_EMULATOR_PORT -import org.groundplatform.android.BuildConfig.EMULATOR_HOST -import org.groundplatform.android.BuildConfig.USE_EMULATORS +import org.groundplatform.android.BuildConfig +import org.groundplatform.android.system.auth.AnonymousAuthenticationManager +import org.groundplatform.android.system.auth.AuthenticationManager +import org.groundplatform.android.system.auth.GoogleAuthenticationManager @InstallIn(SingletonComponent::class) @Module @@ -35,14 +36,14 @@ class AuthenticationModule { anonymousAuthenticationManager: AnonymousAuthenticationManager, googleAuthenticationManager: GoogleAuthenticationManager, ): AuthenticationManager = - if (USE_EMULATORS) anonymousAuthenticationManager else googleAuthenticationManager + if (BuildConfig.USE_EMULATORS) anonymousAuthenticationManager else googleAuthenticationManager @Provides fun firebaseAuth(): FirebaseAuth { val auth = FirebaseAuth.getInstance() - if (USE_EMULATORS) { + if (BuildConfig.USE_EMULATORS) { // Use the auth emulator so we can sign-in anonymously during dev. - auth.useEmulator(EMULATOR_HOST, AUTH_EMULATOR_PORT) + auth.useEmulator(BuildConfig.EMULATOR_HOST, BuildConfig.AUTH_EMULATOR_PORT) } return auth } diff --git a/app/src/main/java/org/groundplatform/android/util/FirebaseModule.kt b/app/src/main/java/org/groundplatform/android/di/FirebaseModule.kt similarity index 97% rename from app/src/main/java/org/groundplatform/android/util/FirebaseModule.kt rename to app/src/main/java/org/groundplatform/android/di/FirebaseModule.kt index 1b9b617f77..f92753b761 100644 --- a/app/src/main/java/org/groundplatform/android/util/FirebaseModule.kt +++ b/app/src/main/java/org/groundplatform/android/di/FirebaseModule.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.groundplatform.android.util +package org.groundplatform.android.di import android.content.Context import com.google.firebase.Firebase diff --git a/app/src/main/java/org/groundplatform/android/GroundApplicationModule.kt b/app/src/main/java/org/groundplatform/android/di/GroundApplicationModule.kt similarity index 94% rename from app/src/main/java/org/groundplatform/android/GroundApplicationModule.kt rename to app/src/main/java/org/groundplatform/android/di/GroundApplicationModule.kt index 027dbce3a9..5f016b6dc3 100644 --- a/app/src/main/java/org/groundplatform/android/GroundApplicationModule.kt +++ b/app/src/main/java/org/groundplatform/android/di/GroundApplicationModule.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.groundplatform.android +package org.groundplatform.android.di import android.content.Context import android.content.res.Resources @@ -26,7 +26,6 @@ import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent import java.util.Locale import javax.inject.Singleton -import org.groundplatform.android.ui.common.ViewModelModule @InstallIn(SingletonComponent::class) @Module(includes = [ViewModelModule::class]) diff --git a/app/src/main/java/org/groundplatform/android/data/local/LocalDataStoreModule.kt b/app/src/main/java/org/groundplatform/android/di/LocalDataStoreModule.kt similarity index 99% rename from app/src/main/java/org/groundplatform/android/data/local/LocalDataStoreModule.kt rename to app/src/main/java/org/groundplatform/android/di/LocalDataStoreModule.kt index 297a5f715b..729e3928a7 100644 --- a/app/src/main/java/org/groundplatform/android/data/local/LocalDataStoreModule.kt +++ b/app/src/main/java/org/groundplatform/android/di/LocalDataStoreModule.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.groundplatform.android.data.local +package org.groundplatform.android.di import dagger.Binds import dagger.Module diff --git a/app/src/main/java/org/groundplatform/android/LocalDatabaseModule.kt b/app/src/main/java/org/groundplatform/android/di/LocalDatabaseModule.kt similarity index 95% rename from app/src/main/java/org/groundplatform/android/LocalDatabaseModule.kt rename to app/src/main/java/org/groundplatform/android/di/LocalDatabaseModule.kt index 94305a58c8..ddc2e2ac7f 100644 --- a/app/src/main/java/org/groundplatform/android/LocalDatabaseModule.kt +++ b/app/src/main/java/org/groundplatform/android/di/LocalDatabaseModule.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.groundplatform.android +package org.groundplatform.android.di import android.content.Context import androidx.room.Room @@ -27,10 +27,10 @@ import javax.inject.Singleton import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.asExecutor import org.groundplatform.android.common.Constants -import org.groundplatform.android.coroutines.IoDispatcher import org.groundplatform.android.data.local.room.LocalDatabase import org.groundplatform.android.data.local.room.migration.Migration_124_125 import org.groundplatform.android.data.local.room.migration.Migration_125_126 +import org.groundplatform.android.di.coroutines.IoDispatcher @InstallIn(SingletonComponent::class) @Module diff --git a/app/src/main/java/org/groundplatform/android/ui/map/MapProviderModule.kt b/app/src/main/java/org/groundplatform/android/di/MapProviderModule.kt similarity index 91% rename from app/src/main/java/org/groundplatform/android/ui/map/MapProviderModule.kt rename to app/src/main/java/org/groundplatform/android/di/MapProviderModule.kt index fd096d562a..d7a4863761 100644 --- a/app/src/main/java/org/groundplatform/android/ui/map/MapProviderModule.kt +++ b/app/src/main/java/org/groundplatform/android/di/MapProviderModule.kt @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.groundplatform.android.ui.map +package org.groundplatform.android.di import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent +import org.groundplatform.android.ui.map.MapFragment import org.groundplatform.android.ui.map.gms.GoogleMapsFragment @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/org/groundplatform/android/ui/map/gms/mog/MogProviderModule.kt b/app/src/main/java/org/groundplatform/android/di/MogProviderModule.kt similarity index 77% rename from app/src/main/java/org/groundplatform/android/ui/map/gms/mog/MogProviderModule.kt rename to app/src/main/java/org/groundplatform/android/di/MogProviderModule.kt index 52bc9171d6..0d45f74779 100644 --- a/app/src/main/java/org/groundplatform/android/ui/map/gms/mog/MogProviderModule.kt +++ b/app/src/main/java/org/groundplatform/android/di/MogProviderModule.kt @@ -13,15 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.groundplatform.android.ui.map.gms.mog +package org.groundplatform.android.di import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import kotlinx.coroutines.CoroutineDispatcher -import org.groundplatform.android.coroutines.IoDispatcher import org.groundplatform.android.data.remote.RemoteStorageManager +import org.groundplatform.android.di.coroutines.IoDispatcher +import org.groundplatform.android.ui.map.gms.mog.MogClient +import org.groundplatform.android.ui.map.gms.mog.MogCollection +import org.groundplatform.android.ui.map.gms.mog.MogSourceProvider +import org.groundplatform.android.ui.map.gms.mog.MogTileProvider @InstallIn(SingletonComponent::class) @Module diff --git a/app/src/main/java/org/groundplatform/android/data/remote/RemotePersistenceModule.kt b/app/src/main/java/org/groundplatform/android/di/RemotePersistenceModule.kt similarity index 94% rename from app/src/main/java/org/groundplatform/android/data/remote/RemotePersistenceModule.kt rename to app/src/main/java/org/groundplatform/android/di/RemotePersistenceModule.kt index 22023bb89f..6fa55fb4a4 100644 --- a/app/src/main/java/org/groundplatform/android/data/remote/RemotePersistenceModule.kt +++ b/app/src/main/java/org/groundplatform/android/di/RemotePersistenceModule.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.groundplatform.android.data.remote +package org.groundplatform.android.di import com.google.firebase.firestore.FirebaseFirestoreSettings import com.google.firebase.functions.FirebaseFunctions @@ -30,6 +30,8 @@ import javax.inject.Singleton import org.groundplatform.android.BuildConfig.EMULATOR_HOST import org.groundplatform.android.BuildConfig.FIRESTORE_EMULATOR_PORT import org.groundplatform.android.BuildConfig.USE_EMULATORS +import org.groundplatform.android.data.remote.RemoteDataStore +import org.groundplatform.android.data.remote.RemoteStorageManager import org.groundplatform.android.data.remote.firebase.FirebaseStorageManager import org.groundplatform.android.data.remote.firebase.FirestoreDataStore import org.groundplatform.android.data.remote.firebase.FirestoreUuidGenerator diff --git a/app/src/main/java/org/groundplatform/android/data/local/SharedPreferencesModule.kt b/app/src/main/java/org/groundplatform/android/di/SharedPreferencesModule.kt similarity index 96% rename from app/src/main/java/org/groundplatform/android/data/local/SharedPreferencesModule.kt rename to app/src/main/java/org/groundplatform/android/di/SharedPreferencesModule.kt index d418e02b38..9f4f1d6383 100644 --- a/app/src/main/java/org/groundplatform/android/data/local/SharedPreferencesModule.kt +++ b/app/src/main/java/org/groundplatform/android/di/SharedPreferencesModule.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.groundplatform.android.data.local +package org.groundplatform.android.di import android.content.Context import android.content.SharedPreferences diff --git a/app/src/main/java/org/groundplatform/android/system/SystemModule.kt b/app/src/main/java/org/groundplatform/android/di/SystemModule.kt similarity index 96% rename from app/src/main/java/org/groundplatform/android/system/SystemModule.kt rename to app/src/main/java/org/groundplatform/android/di/SystemModule.kt index 2bacbee106..3d3047de88 100644 --- a/app/src/main/java/org/groundplatform/android/system/SystemModule.kt +++ b/app/src/main/java/org/groundplatform/android/di/SystemModule.kt @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package org.groundplatform.android.system +package org.groundplatform.android.di import android.content.Context import android.location.Geocoder diff --git a/app/src/main/java/org/groundplatform/android/ui/common/ViewModelModule.kt b/app/src/main/java/org/groundplatform/android/di/ViewModelModule.kt similarity index 96% rename from app/src/main/java/org/groundplatform/android/ui/common/ViewModelModule.kt rename to app/src/main/java/org/groundplatform/android/di/ViewModelModule.kt index 003ab7158e..f23f754faf 100644 --- a/app/src/main/java/org/groundplatform/android/ui/common/ViewModelModule.kt +++ b/app/src/main/java/org/groundplatform/android/di/ViewModelModule.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.groundplatform.android.ui.common +package org.groundplatform.android.di import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -22,6 +22,9 @@ import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import dagger.multibindings.IntoMap +import org.groundplatform.android.ui.common.BaseMapViewModel +import org.groundplatform.android.ui.common.ViewModelFactory +import org.groundplatform.android.ui.common.ViewModelKey import org.groundplatform.android.ui.datacollection.tasks.date.DateTaskViewModel import org.groundplatform.android.ui.datacollection.tasks.instruction.InstructionTaskViewModel import org.groundplatform.android.ui.datacollection.tasks.location.CaptureLocationTaskViewModel diff --git a/app/src/main/java/org/groundplatform/android/coroutines/CoroutineDispatchersModule.kt b/app/src/main/java/org/groundplatform/android/di/coroutines/CoroutineDispatchersModule.kt similarity index 96% rename from app/src/main/java/org/groundplatform/android/coroutines/CoroutineDispatchersModule.kt rename to app/src/main/java/org/groundplatform/android/di/coroutines/CoroutineDispatchersModule.kt index d2559406b4..12b9c9dfc9 100644 --- a/app/src/main/java/org/groundplatform/android/coroutines/CoroutineDispatchersModule.kt +++ b/app/src/main/java/org/groundplatform/android/di/coroutines/CoroutineDispatchersModule.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.groundplatform.android.coroutines +package org.groundplatform.android.di.coroutines import dagger.Module import dagger.Provides diff --git a/app/src/main/java/org/groundplatform/android/coroutines/CoroutineScopesModule.kt b/app/src/main/java/org/groundplatform/android/di/coroutines/CoroutineScopesModule.kt similarity index 89% rename from app/src/main/java/org/groundplatform/android/coroutines/CoroutineScopesModule.kt rename to app/src/main/java/org/groundplatform/android/di/coroutines/CoroutineScopesModule.kt index e4bd39006b..46260c2877 100644 --- a/app/src/main/java/org/groundplatform/android/coroutines/CoroutineScopesModule.kt +++ b/app/src/main/java/org/groundplatform/android/di/coroutines/CoroutineScopesModule.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.groundplatform.android.coroutines +package org.groundplatform.android.di.coroutines import dagger.Module import dagger.Provides @@ -24,6 +24,7 @@ import javax.inject.Qualifier import javax.inject.Singleton import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.MainScope import kotlinx.coroutines.SupervisorJob @InstallIn(SingletonComponent::class) @@ -36,9 +37,7 @@ object CoroutinesScopesModule { return CoroutineScope(SupervisorJob() + Dispatchers.Default) } - @MainScope - @Provides - fun provideMainCoroutineScope(): CoroutineScope = kotlinx.coroutines.MainScope() + @MainScope @Provides fun provideMainCoroutineScope(): CoroutineScope = MainScope() } /** diff --git a/app/src/main/java/org/groundplatform/android/repository/SurveyRepository.kt b/app/src/main/java/org/groundplatform/android/repository/SurveyRepository.kt index 4b108c0e42..75467b6b00 100644 --- a/app/src/main/java/org/groundplatform/android/repository/SurveyRepository.kt +++ b/app/src/main/java/org/groundplatform/android/repository/SurveyRepository.kt @@ -32,10 +32,10 @@ import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.withTimeout import org.groundplatform.android.FirebaseCrashLogger -import org.groundplatform.android.coroutines.ApplicationScope import org.groundplatform.android.data.local.LocalValueStore import org.groundplatform.android.data.local.stores.LocalSurveyStore import org.groundplatform.android.data.remote.RemoteDataStore +import org.groundplatform.android.di.coroutines.ApplicationScope import org.groundplatform.android.model.Survey import org.groundplatform.android.model.SurveyListItem import org.groundplatform.android.model.User diff --git a/app/src/main/java/org/groundplatform/android/system/ActivityStreams.kt b/app/src/main/java/org/groundplatform/android/system/ActivityStreams.kt index 9f66cac826..ecd44f397f 100644 --- a/app/src/main/java/org/groundplatform/android/system/ActivityStreams.kt +++ b/app/src/main/java/org/groundplatform/android/system/ActivityStreams.kt @@ -27,7 +27,7 @@ import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.first import kotlinx.coroutines.launch -import org.groundplatform.android.coroutines.ApplicationScope +import org.groundplatform.android.di.coroutines.ApplicationScope /** Bridge between the [Activity] and various `Manager` classes. */ @Singleton diff --git a/app/src/main/java/org/groundplatform/android/system/GeocodingManager.kt b/app/src/main/java/org/groundplatform/android/system/GeocodingManager.kt index 657303bb04..9d8cc13679 100644 --- a/app/src/main/java/org/groundplatform/android/system/GeocodingManager.kt +++ b/app/src/main/java/org/groundplatform/android/system/GeocodingManager.kt @@ -24,7 +24,7 @@ import javax.inject.Singleton import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext import org.groundplatform.android.R -import org.groundplatform.android.coroutines.IoDispatcher +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.model.geometry.Coordinates import org.groundplatform.android.model.map.Bounds import org.groundplatform.android.ui.map.gms.GmsExt.center diff --git a/app/src/main/java/org/groundplatform/android/system/LocationManager.kt b/app/src/main/java/org/groundplatform/android/system/LocationManager.kt index d46963ee5e..2d7e5b1b8e 100644 --- a/app/src/main/java/org/groundplatform/android/system/LocationManager.kt +++ b/app/src/main/java/org/groundplatform/android/system/LocationManager.kt @@ -23,7 +23,7 @@ import javax.inject.Singleton import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow -import org.groundplatform.android.coroutines.ApplicationScope +import org.groundplatform.android.di.coroutines.ApplicationScope import org.groundplatform.android.system.channel.LocationSharedFlowCallback private const val UPDATE_INTERVAL: Long = 1000 /* 1 sec */ diff --git a/app/src/main/java/org/groundplatform/android/system/auth/AnonymousAuthenticationManager.kt b/app/src/main/java/org/groundplatform/android/system/auth/AnonymousAuthenticationManager.kt index 4b4ddd37d0..b37fd82290 100644 --- a/app/src/main/java/org/groundplatform/android/system/auth/AnonymousAuthenticationManager.kt +++ b/app/src/main/java/org/groundplatform/android/system/auth/AnonymousAuthenticationManager.kt @@ -25,7 +25,7 @@ import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import kotlinx.coroutines.tasks.await -import org.groundplatform.android.coroutines.ApplicationScope +import org.groundplatform.android.di.coroutines.ApplicationScope import org.groundplatform.android.model.User private val anonymousUser = User("nobody", "nobody", "Anonymous user ", null, true) diff --git a/app/src/main/java/org/groundplatform/android/system/auth/GoogleAuthenticationManager.kt b/app/src/main/java/org/groundplatform/android/system/auth/GoogleAuthenticationManager.kt index 703991997a..3b1875991c 100644 --- a/app/src/main/java/org/groundplatform/android/system/auth/GoogleAuthenticationManager.kt +++ b/app/src/main/java/org/groundplatform/android/system/auth/GoogleAuthenticationManager.kt @@ -36,7 +36,7 @@ import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import org.groundplatform.android.R -import org.groundplatform.android.coroutines.ApplicationScope +import org.groundplatform.android.di.coroutines.ApplicationScope import org.groundplatform.android.model.User import org.groundplatform.android.system.ActivityResult import org.groundplatform.android.system.ActivityStreams diff --git a/app/src/main/java/org/groundplatform/android/ui/datacollection/DataCollectionViewModel.kt b/app/src/main/java/org/groundplatform/android/ui/datacollection/DataCollectionViewModel.kt index c05c2a8974..6c049c4a23 100644 --- a/app/src/main/java/org/groundplatform/android/ui/datacollection/DataCollectionViewModel.kt +++ b/app/src/main/java/org/groundplatform/android/ui/datacollection/DataCollectionViewModel.kt @@ -27,10 +27,10 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import org.groundplatform.android.coroutines.ApplicationScope -import org.groundplatform.android.coroutines.IoDispatcher import org.groundplatform.android.data.local.room.converter.SubmissionDeltasConverter import org.groundplatform.android.data.uuid.OfflineUuidGenerator +import org.groundplatform.android.di.coroutines.ApplicationScope +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.model.job.Job import org.groundplatform.android.model.submission.TaskData import org.groundplatform.android.model.submission.ValueDelta diff --git a/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskFragment.kt b/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskFragment.kt index abbac7ecb4..2d0be92efe 100644 --- a/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskFragment.kt +++ b/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskFragment.kt @@ -30,10 +30,10 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import org.groundplatform.android.R -import org.groundplatform.android.coroutines.ApplicationScope -import org.groundplatform.android.coroutines.IoDispatcher -import org.groundplatform.android.coroutines.MainScope import org.groundplatform.android.databinding.PhotoTaskFragBinding +import org.groundplatform.android.di.coroutines.ApplicationScope +import org.groundplatform.android.di.coroutines.IoDispatcher +import org.groundplatform.android.di.coroutines.MainScope import org.groundplatform.android.repository.UserMediaRepository import org.groundplatform.android.system.PermissionDeniedException import org.groundplatform.android.system.PermissionsManager diff --git a/app/src/main/java/org/groundplatform/android/ui/main/MainViewModel.kt b/app/src/main/java/org/groundplatform/android/ui/main/MainViewModel.kt index 62d754ec07..88247f2506 100644 --- a/app/src/main/java/org/groundplatform/android/ui/main/MainViewModel.kt +++ b/app/src/main/java/org/groundplatform/android/ui/main/MainViewModel.kt @@ -30,7 +30,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.groundplatform.android.BuildConfig import org.groundplatform.android.common.Constants.SURVEY_PATH_SEGMENT -import org.groundplatform.android.coroutines.IoDispatcher +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.model.User import org.groundplatform.android.repository.TermsOfServiceRepository import org.groundplatform.android.repository.UserRepository diff --git a/app/src/main/java/org/groundplatform/android/ui/map/gms/features/FeatureManager.kt b/app/src/main/java/org/groundplatform/android/ui/map/gms/features/FeatureManager.kt index 403c812890..ed19a1466f 100644 --- a/app/src/main/java/org/groundplatform/android/ui/map/gms/features/FeatureManager.kt +++ b/app/src/main/java/org/groundplatform/android/ui/map/gms/features/FeatureManager.kt @@ -27,7 +27,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.launch -import org.groundplatform.android.coroutines.MainScope +import org.groundplatform.android.di.coroutines.MainScope import org.groundplatform.android.ui.map.Feature import timber.log.Timber diff --git a/app/src/main/java/org/groundplatform/android/ui/offlineareas/selector/OfflineAreaSelectorViewModel.kt b/app/src/main/java/org/groundplatform/android/ui/offlineareas/selector/OfflineAreaSelectorViewModel.kt index df67ca51f8..4c1253f5ab 100644 --- a/app/src/main/java/org/groundplatform/android/ui/offlineareas/selector/OfflineAreaSelectorViewModel.kt +++ b/app/src/main/java/org/groundplatform/android/ui/offlineareas/selector/OfflineAreaSelectorViewModel.kt @@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.flow.catch import kotlinx.coroutines.launch import org.groundplatform.android.R -import org.groundplatform.android.coroutines.IoDispatcher +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.model.imagery.RemoteMogTileSource import org.groundplatform.android.model.imagery.TileSource import org.groundplatform.android.model.map.Bounds diff --git a/app/src/main/java/org/groundplatform/android/ui/offlineareas/viewer/OfflineAreaViewerViewModel.kt b/app/src/main/java/org/groundplatform/android/ui/offlineareas/viewer/OfflineAreaViewerViewModel.kt index e00e0caa2a..78a553e8c2 100644 --- a/app/src/main/java/org/groundplatform/android/ui/offlineareas/viewer/OfflineAreaViewerViewModel.kt +++ b/app/src/main/java/org/groundplatform/android/ui/offlineareas/viewer/OfflineAreaViewerViewModel.kt @@ -22,7 +22,7 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.asSharedFlow import kotlinx.coroutines.launch -import org.groundplatform.android.coroutines.IoDispatcher +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.model.imagery.OfflineArea import org.groundplatform.android.repository.LocationOfInterestRepository import org.groundplatform.android.repository.MapStateRepository diff --git a/app/src/main/java/org/groundplatform/android/ui/surveyselector/SurveySelectorViewModel.kt b/app/src/main/java/org/groundplatform/android/ui/surveyselector/SurveySelectorViewModel.kt index a1588837bf..8dedd171ea 100644 --- a/app/src/main/java/org/groundplatform/android/ui/surveyselector/SurveySelectorViewModel.kt +++ b/app/src/main/java/org/groundplatform/android/ui/surveyselector/SurveySelectorViewModel.kt @@ -27,8 +27,8 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch -import org.groundplatform.android.coroutines.ApplicationScope -import org.groundplatform.android.coroutines.IoDispatcher +import org.groundplatform.android.di.coroutines.ApplicationScope +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.model.SurveyListItem import org.groundplatform.android.proto.Survey import org.groundplatform.android.repository.UserRepository diff --git a/app/src/test/java/org/groundplatform/android/TestAuthenticationModule.kt b/app/src/test/java/org/groundplatform/android/TestAuthenticationModule.kt index 1a0590195b..b20460f3ca 100644 --- a/app/src/test/java/org/groundplatform/android/TestAuthenticationModule.kt +++ b/app/src/test/java/org/groundplatform/android/TestAuthenticationModule.kt @@ -20,8 +20,8 @@ import dagger.Module import dagger.hilt.components.SingletonComponent import dagger.hilt.testing.TestInstallIn import javax.inject.Singleton +import org.groundplatform.android.di.AuthenticationModule import org.groundplatform.android.system.auth.AuthenticationManager -import org.groundplatform.android.system.auth.AuthenticationModule import org.groundplatform.android.system.auth.FakeAuthenticationManager @Module diff --git a/app/src/test/java/org/groundplatform/android/TestCoroutineDispatchersModule.kt b/app/src/test/java/org/groundplatform/android/TestCoroutineDispatchersModule.kt index a249343d69..b3d10f22e1 100644 --- a/app/src/test/java/org/groundplatform/android/TestCoroutineDispatchersModule.kt +++ b/app/src/test/java/org/groundplatform/android/TestCoroutineDispatchersModule.kt @@ -22,9 +22,9 @@ import dagger.hilt.testing.TestInstallIn import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.TestDispatcher -import org.groundplatform.android.coroutines.CoroutineDispatchersModule -import org.groundplatform.android.coroutines.IoDispatcher -import org.groundplatform.android.coroutines.MainDispatcher +import org.groundplatform.android.di.coroutines.CoroutineDispatchersModule +import org.groundplatform.android.di.coroutines.IoDispatcher +import org.groundplatform.android.di.coroutines.MainDispatcher @Module @TestInstallIn( diff --git a/app/src/test/java/org/groundplatform/android/TestCoroutineScopesModule.kt b/app/src/test/java/org/groundplatform/android/TestCoroutineScopesModule.kt index 526c003178..1279f46f39 100644 --- a/app/src/test/java/org/groundplatform/android/TestCoroutineScopesModule.kt +++ b/app/src/test/java/org/groundplatform/android/TestCoroutineScopesModule.kt @@ -23,9 +23,9 @@ import javax.inject.Singleton import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.test.TestDispatcher import kotlinx.coroutines.test.TestScope -import org.groundplatform.android.coroutines.ApplicationScope -import org.groundplatform.android.coroutines.CoroutinesScopesModule -import org.groundplatform.android.coroutines.MainScope +import org.groundplatform.android.di.coroutines.ApplicationScope +import org.groundplatform.android.di.coroutines.CoroutinesScopesModule +import org.groundplatform.android.di.coroutines.MainScope @Module @TestInstallIn(components = [SingletonComponent::class], replaces = [CoroutinesScopesModule::class]) diff --git a/app/src/test/java/org/groundplatform/android/TestFirebaseModule.kt b/app/src/test/java/org/groundplatform/android/TestFirebaseModule.kt index a3e5c30933..12173cc2e1 100644 --- a/app/src/test/java/org/groundplatform/android/TestFirebaseModule.kt +++ b/app/src/test/java/org/groundplatform/android/TestFirebaseModule.kt @@ -20,7 +20,7 @@ import dagger.Module import dagger.Provides import dagger.hilt.components.SingletonComponent import dagger.hilt.testing.TestInstallIn -import org.groundplatform.android.util.FirebaseModule +import org.groundplatform.android.di.FirebaseModule import org.mockito.Mockito @Module diff --git a/app/src/test/java/org/groundplatform/android/TestLocalDatabaseModule.kt b/app/src/test/java/org/groundplatform/android/TestLocalDatabaseModule.kt index 2124c4086f..4e3125358c 100644 --- a/app/src/test/java/org/groundplatform/android/TestLocalDatabaseModule.kt +++ b/app/src/test/java/org/groundplatform/android/TestLocalDatabaseModule.kt @@ -24,6 +24,7 @@ import dagger.hilt.components.SingletonComponent import dagger.hilt.testing.TestInstallIn import javax.inject.Singleton import org.groundplatform.android.data.local.room.LocalDatabase +import org.groundplatform.android.di.LocalDatabaseModule @Module @TestInstallIn(components = [SingletonComponent::class], replaces = [LocalDatabaseModule::class]) diff --git a/app/src/test/java/org/groundplatform/android/TestRemoteStorageModule.kt b/app/src/test/java/org/groundplatform/android/TestRemoteStorageModule.kt index 53271ef39d..35e83f586a 100644 --- a/app/src/test/java/org/groundplatform/android/TestRemoteStorageModule.kt +++ b/app/src/test/java/org/groundplatform/android/TestRemoteStorageModule.kt @@ -23,10 +23,10 @@ import javax.inject.Singleton import org.groundplatform.android.data.remote.FakeRemoteDataStore import org.groundplatform.android.data.remote.FakeRemoteStorageManager import org.groundplatform.android.data.remote.RemoteDataStore -import org.groundplatform.android.data.remote.RemotePersistenceModule import org.groundplatform.android.data.remote.RemoteStorageManager import org.groundplatform.android.data.uuid.FakeUuidGenerator import org.groundplatform.android.data.uuid.OfflineUuidGenerator +import org.groundplatform.android.di.RemotePersistenceModule @Module @TestInstallIn( diff --git a/app/src/test/java/org/groundplatform/android/data/sync/LocalMutationSyncWorkerTest.kt b/app/src/test/java/org/groundplatform/android/data/sync/LocalMutationSyncWorkerTest.kt index 1212b2618b..a975c5bb09 100644 --- a/app/src/test/java/org/groundplatform/android/data/sync/LocalMutationSyncWorkerTest.kt +++ b/app/src/test/java/org/groundplatform/android/data/sync/LocalMutationSyncWorkerTest.kt @@ -32,12 +32,12 @@ import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import org.groundplatform.android.BaseHiltTest import org.groundplatform.android.FakeData -import org.groundplatform.android.coroutines.IoDispatcher import org.groundplatform.android.data.local.stores.LocalLocationOfInterestStore import org.groundplatform.android.data.local.stores.LocalSubmissionStore import org.groundplatform.android.data.local.stores.LocalSurveyStore import org.groundplatform.android.data.local.stores.LocalUserStore import org.groundplatform.android.data.remote.FakeRemoteDataStore +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.model.geometry.Point import org.groundplatform.android.model.mutation.LocationOfInterestMutation import org.groundplatform.android.model.mutation.Mutation diff --git a/app/src/test/java/org/groundplatform/android/data/sync/MediaUploadWorkerTest.kt b/app/src/test/java/org/groundplatform/android/data/sync/MediaUploadWorkerTest.kt index be82ed1ac6..edddb97682 100644 --- a/app/src/test/java/org/groundplatform/android/data/sync/MediaUploadWorkerTest.kt +++ b/app/src/test/java/org/groundplatform/android/data/sync/MediaUploadWorkerTest.kt @@ -29,13 +29,13 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.first import org.groundplatform.android.BaseHiltTest import org.groundplatform.android.FakeData -import org.groundplatform.android.coroutines.IoDispatcher import org.groundplatform.android.data.local.stores.LocalLocationOfInterestStore import org.groundplatform.android.data.local.stores.LocalSubmissionStore import org.groundplatform.android.data.local.stores.LocalSurveyStore import org.groundplatform.android.data.local.stores.LocalUserStore import org.groundplatform.android.data.remote.FakeRemoteDataStore import org.groundplatform.android.data.remote.FakeRemoteStorageManager +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.model.mutation.Mutation import org.groundplatform.android.model.mutation.Mutation.SyncStatus.COMPLETED import org.groundplatform.android.model.mutation.Mutation.SyncStatus.FAILED diff --git a/app/src/test/java/org/groundplatform/android/data/sync/SurveySyncServiceTest.kt b/app/src/test/java/org/groundplatform/android/data/sync/SurveySyncServiceTest.kt index 3c46f8a460..9be84e9559 100644 --- a/app/src/test/java/org/groundplatform/android/data/sync/SurveySyncServiceTest.kt +++ b/app/src/test/java/org/groundplatform/android/data/sync/SurveySyncServiceTest.kt @@ -37,7 +37,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.advanceUntilIdle import org.groundplatform.android.BaseHiltTest import org.groundplatform.android.FakeData.SURVEY -import org.groundplatform.android.coroutines.IoDispatcher +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.usecases.survey.SyncSurveyUseCase import org.junit.Before import org.junit.Test diff --git a/app/src/test/java/org/groundplatform/android/data/sync/SurveySyncWorkerTest.kt b/app/src/test/java/org/groundplatform/android/data/sync/SurveySyncWorkerTest.kt index 4a846e6e6d..4da7d51806 100644 --- a/app/src/test/java/org/groundplatform/android/data/sync/SurveySyncWorkerTest.kt +++ b/app/src/test/java/org/groundplatform/android/data/sync/SurveySyncWorkerTest.kt @@ -31,8 +31,8 @@ import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import org.groundplatform.android.BaseHiltTest import org.groundplatform.android.FakeData.SURVEY -import org.groundplatform.android.coroutines.IoDispatcher import org.groundplatform.android.data.sync.SurveySyncWorker.Companion.SURVEY_ID_PARAM_KEY +import org.groundplatform.android.di.coroutines.IoDispatcher import org.groundplatform.android.usecases.survey.SyncSurveyUseCase import org.junit.Before import org.junit.Test diff --git a/app/src/test/java/org/groundplatform/android/system/GeocodingManagerTest.kt b/app/src/test/java/org/groundplatform/android/system/GeocodingManagerTest.kt index 339424f3cf..94fd22235e 100644 --- a/app/src/test/java/org/groundplatform/android/system/GeocodingManagerTest.kt +++ b/app/src/test/java/org/groundplatform/android/system/GeocodingManagerTest.kt @@ -23,6 +23,7 @@ import dagger.hilt.android.testing.UninstallModules import javax.inject.Inject import kotlin.test.assertEquals import org.groundplatform.android.BaseHiltTest +import org.groundplatform.android.di.SystemModule import org.groundplatform.android.model.geometry.Coordinates import org.groundplatform.android.model.map.Bounds import org.groundplatform.android.ui.map.gms.GmsExt.center diff --git a/app/src/test/java/org/groundplatform/android/system/auth/FakeAuthenticationManager.kt b/app/src/test/java/org/groundplatform/android/system/auth/FakeAuthenticationManager.kt index cfd0319c9a..e5eb5e7b63 100644 --- a/app/src/test/java/org/groundplatform/android/system/auth/FakeAuthenticationManager.kt +++ b/app/src/test/java/org/groundplatform/android/system/auth/FakeAuthenticationManager.kt @@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.launch import org.groundplatform.android.FakeData -import org.groundplatform.android.coroutines.ApplicationScope +import org.groundplatform.android.di.coroutines.ApplicationScope import org.groundplatform.android.model.User @Singleton From 43a3958ec2674d4f745e0e899746b4b9e9211f54 Mon Sep 17 00:00:00 2001 From: Shobhit Agarwal Date: Fri, 30 Jan 2026 18:34:34 +0530 Subject: [PATCH 2/2] Apply suggestion from @gemini-code-assist[bot] Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- .../groundplatform/android/data/local/LocalValueStore.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/groundplatform/android/data/local/LocalValueStore.kt b/app/src/main/java/org/groundplatform/android/data/local/LocalValueStore.kt index 7fc7b9a8bc..5e5409475a 100644 --- a/app/src/main/java/org/groundplatform/android/data/local/LocalValueStore.kt +++ b/app/src/main/java/org/groundplatform/android/data/local/LocalValueStore.kt @@ -29,10 +29,9 @@ import org.groundplatform.android.util.allowThreadDiskWrites import timber.log.Timber /** - * Simple value store persisted locally on device. Unlike - * [org.groundplatform.android.di.LocalDataStoreModule], this class provides a concrete - * implementation using the Android SDK, and therefore does not require a database-specific - * implementation. + * Simple value store persisted locally on device. Unlike [LocalDataStoreModule], this class + * provides a concrete implementation using the Android SDK, and therefore does not require a + * database-specific implementation. */ @Singleton class LocalValueStore