Move di files to dedicated package

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

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

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

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
 

app/src/main/java/org/groundplatform/android/system/auth/AuthenticationModule.kt → app/src/main/java/org/groundplatform/android/di/AuthenticationModule.kt

@@ -13,17 +13,18 @@
  * 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
 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
   }

app/src/main/java/org/groundplatform/android/util/FirebaseModule.kt → 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

app/src/main/java/org/groundplatform/android/GroundApplicationModule.kt → 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])

app/src/main/java/org/groundplatform/android/data/local/LocalDataStoreModule.kt → 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

app/src/main/java/org/groundplatform/android/LocalDatabaseModule.kt → 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

app/src/main/java/org/groundplatform/android/ui/map/MapProviderModule.kt → 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)

app/src/main/java/org/groundplatform/android/ui/map/gms/mog/MogProviderModule.kt → 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

app/src/main/java/org/groundplatform/android/data/remote/RemotePersistenceModule.kt → 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

app/src/main/java/org/groundplatform/android/data/local/SharedPreferencesModule.kt → 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

app/src/main/java/org/groundplatform/android/system/SystemModule.kt → 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

app/src/main/java/org/groundplatform/android/ui/common/ViewModelModule.kt → 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

app/src/main/java/org/groundplatform/android/coroutines/CoroutineDispatchersModule.kt → 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

app/src/main/java/org/groundplatform/android/coroutines/CoroutineScopesModule.kt → 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()
 }
 
 /**

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

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

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

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 */

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)

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

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

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

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

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
 

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

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

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