diff --git a/build.gradle b/build.gradle index 5e4a9d498e..5fa2d353b6 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ buildscript { plugins { id "org.jetbrains.kotlin.android" version "$kotlinVersion" apply false id "org.jetbrains.kotlin.plugin.serialization" version "$kotlinVersion" - id "com.ncorti.ktfmt.gradle" version "0.17.0" + id "com.ncorti.ktfmt.gradle" version "0.18.0" id "com.google.dagger.hilt.android" version "$hiltVersion" apply false id "io.gitlab.arturbosch.detekt" version "1.23.5" } diff --git a/e2eTest/src/main/java/com/google/android/ground/e2etest/AutomatorRunner.kt b/e2eTest/src/main/java/com/google/android/ground/e2etest/AutomatorRunner.kt index a1a6b36e84..a55b6da5c6 100644 --- a/e2eTest/src/main/java/com/google/android/ground/e2etest/AutomatorRunner.kt +++ b/e2eTest/src/main/java/com/google/android/ground/e2etest/AutomatorRunner.kt @@ -34,17 +34,14 @@ interface AutomatorRunner { fun stringResource( @StringRes resId: Int, - context: Context = InstrumentationRegistry.getInstrumentation().targetContext + context: Context = InstrumentationRegistry.getInstrumentation().targetContext, ): String = context.getString(resId) fun byText(@StringRes resId: Int): BySelector = By.text(stringResource(resId)) fun byClass(kclass: KClass): BySelector = By.clazz(kclass.java.name) - fun waitClickGone( - selector: BySelector, - timeout: Long = SHORT_TIMEOUT, - ): Boolean { + fun waitClickGone(selector: BySelector, timeout: Long = SHORT_TIMEOUT): Boolean { device.wait(Until.hasObject(selector), timeout) device.findObject(selector)?.click() return device.wait(Until.gone(selector), timeout) diff --git a/ground/src/androidTest/java/com/google/android/ground/SetPreferencesRule.kt b/ground/src/androidTest/java/com/google/android/ground/SetPreferencesRule.kt index 2749fc7e50..4e6a283846 100644 --- a/ground/src/androidTest/java/com/google/android/ground/SetPreferencesRule.kt +++ b/ground/src/androidTest/java/com/google/android/ground/SetPreferencesRule.kt @@ -41,7 +41,7 @@ class SetPreferencesRule : TestWatcher() { super.starting(description) EntryPointAccessors.fromApplication( getApplicationContext(), - SetPreferencesRuleEntryPoint::class.java + SetPreferencesRuleEntryPoint::class.java, ) .preferenceStorage() .apply { diff --git a/ground/src/androidTest/java/com/google/android/ground/TestRemoteStorageModule.kt b/ground/src/androidTest/java/com/google/android/ground/TestRemoteStorageModule.kt index 2072e1f502..abb589c781 100644 --- a/ground/src/androidTest/java/com/google/android/ground/TestRemoteStorageModule.kt +++ b/ground/src/androidTest/java/com/google/android/ground/TestRemoteStorageModule.kt @@ -31,7 +31,7 @@ import javax.inject.Singleton @Module @TestInstallIn( components = [SingletonComponent::class], - replaces = [RemotePersistenceModule::class] + replaces = [RemotePersistenceModule::class], ) abstract class TestRemoteStorageModule { @Binds diff --git a/ground/src/main/java/com/google/android/ground/MainViewModel.kt b/ground/src/main/java/com/google/android/ground/MainViewModel.kt index 27da61223e..3c9e12525e 100644 --- a/ground/src/main/java/com/google/android/ground/MainViewModel.kt +++ b/ground/src/main/java/com/google/android/ground/MainViewModel.kt @@ -83,7 +83,7 @@ constructor( else -> null } }, - { onUserSignInError(it) } + { onUserSignInError(it) }, ) } diff --git a/ground/src/main/java/com/google/android/ground/domain/usecases/submission/SubmitDataUseCase.kt b/ground/src/main/java/com/google/android/ground/domain/usecases/submission/SubmitDataUseCase.kt index 0946493428..517c6cf516 100644 --- a/ground/src/main/java/com/google/android/ground/domain/usecases/submission/SubmitDataUseCase.kt +++ b/ground/src/main/java/com/google/android/ground/domain/usecases/submission/SubmitDataUseCase.kt @@ -33,7 +33,7 @@ class SubmitDataUseCase constructor( private val locationOfInterestRepository: LocationOfInterestRepository, private val submissionRepository: SubmissionRepository, - private val userRepository: UserRepository + private val userRepository: UserRepository, ) { /** diff --git a/ground/src/main/java/com/google/android/ground/domain/usecases/survey/ActivateSurveyUseCase.kt b/ground/src/main/java/com/google/android/ground/domain/usecases/survey/ActivateSurveyUseCase.kt index b3a108448a..45fb301128 100644 --- a/ground/src/main/java/com/google/android/ground/domain/usecases/survey/ActivateSurveyUseCase.kt +++ b/ground/src/main/java/com/google/android/ground/domain/usecases/survey/ActivateSurveyUseCase.kt @@ -23,7 +23,7 @@ class ActivateSurveyUseCase @Inject constructor( private val surveyRepository: SurveyRepository, - private val makeSurveyAvailableOffline: MakeSurveyAvailableOfflineUseCase + private val makeSurveyAvailableOffline: MakeSurveyAvailableOfflineUseCase, ) { /** * Sets the survey with the specified ID as the currently active. First attempts to load the diff --git a/ground/src/main/java/com/google/android/ground/domain/usecases/survey/MakeSurveyAvailableOfflineUseCase.kt b/ground/src/main/java/com/google/android/ground/domain/usecases/survey/MakeSurveyAvailableOfflineUseCase.kt index fe452ffe68..f4e4cc5cfe 100644 --- a/ground/src/main/java/com/google/android/ground/domain/usecases/survey/MakeSurveyAvailableOfflineUseCase.kt +++ b/ground/src/main/java/com/google/android/ground/domain/usecases/survey/MakeSurveyAvailableOfflineUseCase.kt @@ -24,7 +24,7 @@ class MakeSurveyAvailableOfflineUseCase @Inject constructor( private val surveyRepository: SurveyRepository, - private val syncSurvey: SyncSurveyUseCase + private val syncSurvey: SyncSurveyUseCase, ) { /** * Makes the survey with the specified ID and related LOIs available offline. Subscribes to diff --git a/ground/src/main/java/com/google/android/ground/domain/usecases/survey/ReactivateLastSurveyUseCase.kt b/ground/src/main/java/com/google/android/ground/domain/usecases/survey/ReactivateLastSurveyUseCase.kt index 0244bca2db..e945845c05 100644 --- a/ground/src/main/java/com/google/android/ground/domain/usecases/survey/ReactivateLastSurveyUseCase.kt +++ b/ground/src/main/java/com/google/android/ground/domain/usecases/survey/ReactivateLastSurveyUseCase.kt @@ -23,7 +23,7 @@ class ReactivateLastSurveyUseCase @Inject constructor( private val surveyRepository: SurveyRepository, - private val activateSurvey: ActivateSurveyUseCase + private val activateSurvey: ActivateSurveyUseCase, ) { suspend operator fun invoke() { // Do nothing if never activated. diff --git a/ground/src/main/java/com/google/android/ground/domain/usecases/survey/SyncSurveyUseCase.kt b/ground/src/main/java/com/google/android/ground/domain/usecases/survey/SyncSurveyUseCase.kt index c66f2c39de..6dd71345cf 100644 --- a/ground/src/main/java/com/google/android/ground/domain/usecases/survey/SyncSurveyUseCase.kt +++ b/ground/src/main/java/com/google/android/ground/domain/usecases/survey/SyncSurveyUseCase.kt @@ -25,7 +25,7 @@ class SyncSurveyUseCase @Inject constructor( private val surveyRepository: SurveyRepository, - private val loiRepository: LocationOfInterestRepository + private val loiRepository: LocationOfInterestRepository, ) { /** * Downloads the survey with the specified ID and related LOIs from remote and inserts and/or diff --git a/ground/src/main/java/com/google/android/ground/model/AuditInfo.kt b/ground/src/main/java/com/google/android/ground/model/AuditInfo.kt index 25734d6b08..68a92efba4 100644 --- a/ground/src/main/java/com/google/android/ground/model/AuditInfo.kt +++ b/ground/src/main/java/com/google/android/ground/model/AuditInfo.kt @@ -30,5 +30,5 @@ import java.util.Date data class AuditInfo( val user: User, val clientTimestamp: Date = Date(), - val serverTimestamp: Date? = null + val serverTimestamp: Date? = null, ) diff --git a/ground/src/main/java/com/google/android/ground/model/Survey.kt b/ground/src/main/java/com/google/android/ground/model/Survey.kt index a6b433d876..c2f77aed51 100644 --- a/ground/src/main/java/com/google/android/ground/model/Survey.kt +++ b/ground/src/main/java/com/google/android/ground/model/Survey.kt @@ -26,7 +26,7 @@ data class Survey( val jobMap: Map, // TODO(#1730): Remove tileSources from survey. val tileSources: List = listOf(), - val acl: Map = mapOf() + val acl: Map = mapOf(), ) { val jobs: Collection get() = jobMap.values diff --git a/ground/src/main/java/com/google/android/ground/model/SurveyListItem.kt b/ground/src/main/java/com/google/android/ground/model/SurveyListItem.kt index 1b51fdef8d..cfda2dc405 100644 --- a/ground/src/main/java/com/google/android/ground/model/SurveyListItem.kt +++ b/ground/src/main/java/com/google/android/ground/model/SurveyListItem.kt @@ -20,7 +20,7 @@ data class SurveyListItem( val id: String, val title: String, val description: String, - val availableOffline: Boolean + val availableOffline: Boolean, ) fun Survey.toListItem(availableOffline: Boolean): SurveyListItem = diff --git a/ground/src/main/java/com/google/android/ground/model/User.kt b/ground/src/main/java/com/google/android/ground/model/User.kt index df2b086688..5acda7b888 100644 --- a/ground/src/main/java/com/google/android/ground/model/User.kt +++ b/ground/src/main/java/com/google/android/ground/model/User.kt @@ -22,5 +22,5 @@ constructor( val email: String, val displayName: String, val photoUrl: String? = null, - val isAnonymous: Boolean = false + val isAnonymous: Boolean = false, ) diff --git a/ground/src/main/java/com/google/android/ground/model/imagery/OfflineArea.kt b/ground/src/main/java/com/google/android/ground/model/imagery/OfflineArea.kt index e93f642608..da0679bf4c 100644 --- a/ground/src/main/java/com/google/android/ground/model/imagery/OfflineArea.kt +++ b/ground/src/main/java/com/google/android/ground/model/imagery/OfflineArea.kt @@ -25,7 +25,7 @@ data class OfflineArea( val bounds: Bounds, val name: String, /** The range of zoom levels downloaded. */ - val zoomRange: IntRange + val zoomRange: IntRange, ) { val tiles get() = zoomRange.flatMap { TileCoordinates.withinBounds(bounds, it) } @@ -34,6 +34,6 @@ data class OfflineArea( PENDING, IN_PROGRESS, DOWNLOADED, - FAILED + FAILED, } } diff --git a/ground/src/main/java/com/google/android/ground/model/job/Job.kt b/ground/src/main/java/com/google/android/ground/model/job/Job.kt index 08458b9e55..36b6b43824 100644 --- a/ground/src/main/java/com/google/android/ground/model/job/Job.kt +++ b/ground/src/main/java/com/google/android/ground/model/job/Job.kt @@ -24,13 +24,13 @@ data class Job( val style: Style? = null, val name: String? = null, val tasks: Map = mapOf(), - val strategy: DataCollectionStrategy = DataCollectionStrategy.UNKNOWN + val strategy: DataCollectionStrategy = DataCollectionStrategy.UNKNOWN, ) { enum class DataCollectionStrategy { PREDEFINED, AD_HOC, MIXED, - UNKNOWN + UNKNOWN, } class TaskNotFoundException(taskId: String) : Throwable(message = "unknown task $taskId") diff --git a/ground/src/main/java/com/google/android/ground/model/mutation/Mutation.kt b/ground/src/main/java/com/google/android/ground/model/mutation/Mutation.kt index a54af6487d..594f3befa3 100644 --- a/ground/src/main/java/com/google/android/ground/model/mutation/Mutation.kt +++ b/ground/src/main/java/com/google/android/ground/model/mutation/Mutation.kt @@ -43,7 +43,7 @@ sealed class Mutation { DELETE, /** Indicates database skew or an implementation bug. */ - UNKNOWN + UNKNOWN, } /** Status of mutation being applied to remote data store. */ @@ -73,7 +73,7 @@ sealed class Mutation { COMPLETED, /** Failed indicates all retries have failed. */ - FAILED + FAILED, } override fun toString(): String = "$syncStatus $type $clientTimestamp" diff --git a/ground/src/main/java/com/google/android/ground/model/mutation/SubmissionMutation.kt b/ground/src/main/java/com/google/android/ground/model/mutation/SubmissionMutation.kt index 602e80c0dc..4cfdd688f2 100644 --- a/ground/src/main/java/com/google/android/ground/model/mutation/SubmissionMutation.kt +++ b/ground/src/main/java/com/google/android/ground/model/mutation/SubmissionMutation.kt @@ -31,7 +31,7 @@ data class SubmissionMutation( override val lastError: String = "", val job: Job, val submissionId: String = "", - val deltas: List = listOf() + val deltas: List = listOf(), ) : Mutation() { override fun toString(): String = super.toString() + "deltas= $deltas" diff --git a/ground/src/main/java/com/google/android/ground/model/submission/MultipleChoiceTaskData.kt b/ground/src/main/java/com/google/android/ground/model/submission/MultipleChoiceTaskData.kt index e70fad766a..07e1f03bdd 100644 --- a/ground/src/main/java/com/google/android/ground/model/submission/MultipleChoiceTaskData.kt +++ b/ground/src/main/java/com/google/android/ground/model/submission/MultipleChoiceTaskData.kt @@ -23,7 +23,7 @@ import kotlinx.serialization.Serializable @Serializable class MultipleChoiceTaskData( private val multipleChoice: MultipleChoice?, - val selectedOptionIds: List + val selectedOptionIds: List, ) : TaskData { // TODO: Make these inner classes non-static and access Task directly. diff --git a/ground/src/main/java/com/google/android/ground/model/submission/Submission.kt b/ground/src/main/java/com/google/android/ground/model/submission/Submission.kt index ff69ea4225..7d1fce5e41 100644 --- a/ground/src/main/java/com/google/android/ground/model/submission/Submission.kt +++ b/ground/src/main/java/com/google/android/ground/model/submission/Submission.kt @@ -35,5 +35,5 @@ constructor( val job: Job, val created: AuditInfo, val lastModified: AuditInfo, - val data: SubmissionData = SubmissionData() + val data: SubmissionData = SubmissionData(), ) diff --git a/ground/src/main/java/com/google/android/ground/model/task/Condition.kt b/ground/src/main/java/com/google/android/ground/model/task/Condition.kt index dc7b899f24..daacb82287 100644 --- a/ground/src/main/java/com/google/android/ground/model/task/Condition.kt +++ b/ground/src/main/java/com/google/android/ground/model/task/Condition.kt @@ -20,6 +20,7 @@ import com.google.android.ground.model.submission.TaskData /** The task ID. */ typealias TaskId = String + /** The selected values keyed by task ID. */ typealias TaskSelections = Map diff --git a/ground/src/main/java/com/google/android/ground/model/task/MultipleChoice.kt b/ground/src/main/java/com/google/android/ground/model/task/MultipleChoice.kt index 7ce9b844f6..1e6a046d39 100644 --- a/ground/src/main/java/com/google/android/ground/model/task/MultipleChoice.kt +++ b/ground/src/main/java/com/google/android/ground/model/task/MultipleChoice.kt @@ -30,7 +30,7 @@ constructor( ) { enum class Cardinality { SELECT_ONE, - SELECT_MULTIPLE + SELECT_MULTIPLE, } fun getOptionById(id: String): Option? = options.firstOrNull { it.id == id } diff --git a/ground/src/main/java/com/google/android/ground/model/task/Task.kt b/ground/src/main/java/com/google/android/ground/model/task/Task.kt index da6f1f3e8f..26b423501b 100644 --- a/ground/src/main/java/com/google/android/ground/model/task/Task.kt +++ b/ground/src/main/java/com/google/android/ground/model/task/Task.kt @@ -49,6 +49,6 @@ constructor( TIME, DROP_PIN, DRAW_AREA, - CAPTURE_LOCATION + CAPTURE_LOCATION, } } diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/LocalDatabase.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/LocalDatabase.kt index 1209c3533c..78a853ea81 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/LocalDatabase.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/LocalDatabase.kt @@ -91,7 +91,7 @@ import com.google.android.ground.persistence.local.room.fields.TileSetEntityStat ExpressionEntity::class, ], version = Config.DB_VERSION, - exportSchema = false + exportSchema = false, ) @TypeConverters( TaskEntityType::class, diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/converter/SubmissionDeltasConverter.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/converter/SubmissionDeltasConverter.kt index 3328c04ec0..dc5ff35781 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/converter/SubmissionDeltasConverter.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/converter/SubmissionDeltasConverter.kt @@ -43,7 +43,7 @@ object SubmissionDeltasConverter { delta.taskId, JSONObject() .put(KEY_TASK_TYPE, delta.taskType.name) - .put(KEY_NEW_VALUE, ValueJsonConverter.toJsonObject(delta.newTaskData)) + .put(KEY_NEW_VALUE, ValueJsonConverter.toJsonObject(delta.newTaskData)), ) } catch (e: JSONException) { Timber.e(e, "Error building JSON") @@ -70,7 +70,7 @@ object SubmissionDeltasConverter { ValueDelta( taskId, toEnum(Task.Type::class.java, jsonDelta.getString(KEY_TASK_TYPE)), - ValueJsonConverter.toResponse(task, jsonDelta[KEY_NEW_VALUE]) + ValueJsonConverter.toResponse(task, jsonDelta[KEY_NEW_VALUE]), ) ) } catch (e: LocalDataConsistencyException) { diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/LocationOfInterestMutationDao.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/LocationOfInterestMutationDao.kt index 87d1fdd82d..9f249fb6ee 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/LocationOfInterestMutationDao.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/LocationOfInterestMutationDao.kt @@ -37,6 +37,6 @@ interface LocationOfInterestMutationDao : BaseDao? } diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/SubmissionDao.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/SubmissionDao.kt index 363f5441a6..b1b13ab9f4 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/SubmissionDao.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/SubmissionDao.kt @@ -38,6 +38,6 @@ interface SubmissionDao : BaseDao { suspend fun findByLocationOfInterestId( locationOfInterestId: String, jobId: String, - state: EntityState + state: EntityState, ): List? } diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/SubmissionMutationDao.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/SubmissionMutationDao.kt index d42c3b9797..b50f76f98c 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/SubmissionMutationDao.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/dao/SubmissionMutationDao.kt @@ -34,7 +34,7 @@ interface SubmissionMutationDao : BaseDao { ) suspend fun findByLocationOfInterestId( locationOfInterestId: String, - vararg allowedStates: MutationEntitySyncStatus + vararg allowedStates: MutationEntitySyncStatus, ): List @Query( @@ -45,7 +45,7 @@ interface SubmissionMutationDao : BaseDao { suspend fun getSubmissionMutationCount( loiId: String, mutationType: MutationEntityType, - vararg allowedStates: MutationEntitySyncStatus + vararg allowedStates: MutationEntitySyncStatus, ): Int @Query( @@ -54,7 +54,7 @@ interface SubmissionMutationDao : BaseDao { ) suspend fun findBySubmissionId( submissionId: String, - vararg allowedStates: MutationEntitySyncStatus + vararg allowedStates: MutationEntitySyncStatus, ): List? @Query( @@ -63,6 +63,6 @@ interface SubmissionMutationDao : BaseDao { ) fun findByLoiIdFlow( locationOfInterestId: String, - vararg allowedStates: MutationEntitySyncStatus + vararg allowedStates: MutationEntitySyncStatus, ): Flow> } diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/AuditInfoEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/AuditInfoEntity.kt index a1dd36a201..443b2dc908 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/AuditInfoEntity.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/AuditInfoEntity.kt @@ -33,5 +33,5 @@ data class AuditInfoEntity( * Returns the time at which the server received the requested change according to the server's * internal clock, or null if the updated server time was not yet received. */ - val serverTimestamp: Long? = null + val serverTimestamp: Long? = null, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/ConditionEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/ConditionEntity.kt index 13b7cf8836..ee296386a9 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/ConditionEntity.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/ConditionEntity.kt @@ -30,10 +30,10 @@ import com.google.android.ground.persistence.local.room.fields.MatchEntityType entity = TaskEntity::class, parentColumns = ["id"], childColumns = ["parent_task_id"], - onDelete = ForeignKey.CASCADE + onDelete = ForeignKey.CASCADE, ) ], - indices = [Index("parent_task_id")] + indices = [Index("parent_task_id")], ) data class ConditionEntity( @ColumnInfo(name = "parent_task_id") @PrimaryKey val parentTaskId: String, diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/ExpressionEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/ExpressionEntity.kt index c5e16c05ff..e5dd4e5965 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/ExpressionEntity.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/ExpressionEntity.kt @@ -30,10 +30,10 @@ import com.google.android.ground.persistence.local.room.fields.ExpressionEntityT entity = ConditionEntity::class, parentColumns = ["parent_task_id"], childColumns = ["parent_task_id"], - onDelete = ForeignKey.CASCADE + onDelete = ForeignKey.CASCADE, ) ], - indices = [Index("parent_task_id")] + indices = [Index("parent_task_id")], ) data class ExpressionEntity( @ColumnInfo(name = "parent_task_id") @PrimaryKey val parentTaskId: String, diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/JobEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/JobEntity.kt index dfd87e1785..f7878ee1aa 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/JobEntity.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/JobEntity.kt @@ -25,15 +25,15 @@ import androidx.room.* entity = SurveyEntity::class, parentColumns = ["id"], childColumns = ["survey_id"], - onDelete = ForeignKey.CASCADE + onDelete = ForeignKey.CASCADE, ) ], - indices = [Index("survey_id")] + indices = [Index("survey_id")], ) data class JobEntity( @PrimaryKey @ColumnInfo(name = "id") val id: String, @ColumnInfo(name = "name") val name: String?, @ColumnInfo(name = "survey_id") val surveyId: String?, @ColumnInfo(name = "strategy") val strategy: String, - @Embedded(prefix = "style_") val style: StyleEntity? + @Embedded(prefix = "style_") val style: StyleEntity?, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/MultipleChoiceEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/MultipleChoiceEntity.kt index 167dfbb5ec..338d6379e7 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/MultipleChoiceEntity.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/MultipleChoiceEntity.kt @@ -26,13 +26,13 @@ import com.google.android.ground.persistence.local.room.fields.MultipleChoiceEnt entity = TaskEntity::class, parentColumns = ["id"], childColumns = ["task_id"], - onDelete = ForeignKey.CASCADE + onDelete = ForeignKey.CASCADE, ) ], - indices = [Index("task_id")] + indices = [Index("task_id")], ) data class MultipleChoiceEntity( @ColumnInfo(name = "task_id") @PrimaryKey val taskId: String, @ColumnInfo(name = "type") val type: MultipleChoiceEntityType, - @ColumnInfo(name = "has_other_option") val hasOtherOption: Boolean + @ColumnInfo(name = "has_other_option") val hasOtherOption: Boolean, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/OfflineAreaEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/OfflineAreaEntity.kt index 3912abd021..52612b04d0 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/OfflineAreaEntity.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/OfflineAreaEntity.kt @@ -32,5 +32,5 @@ data class OfflineAreaEntity( @ColumnInfo(name = "east") val east: Double, @ColumnInfo(name = "west") val west: Double, @ColumnInfo(name = "min_zoom") val minZoom: Int, - @ColumnInfo(name = "max_zoom") val maxZoom: Int + @ColumnInfo(name = "max_zoom") val maxZoom: Int, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/OptionEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/OptionEntity.kt index e5f8304411..e67b3e83a2 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/OptionEntity.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/OptionEntity.kt @@ -25,15 +25,15 @@ import androidx.room.* entity = TaskEntity::class, parentColumns = ["id"], childColumns = ["task_id"], - onDelete = ForeignKey.CASCADE + onDelete = ForeignKey.CASCADE, ) ], indices = [Index("task_id")], - primaryKeys = ["id"] + primaryKeys = ["id"], ) data class OptionEntity( @ColumnInfo(name = "id") val id: String, @ColumnInfo(name = "code") val code: String, @ColumnInfo(name = "label") val label: String, - @ColumnInfo(name = "task_id") val taskId: String + @ColumnInfo(name = "task_id") val taskId: String, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/SubmissionEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/SubmissionEntity.kt index 239b653fff..d463a093cd 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/SubmissionEntity.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/SubmissionEntity.kt @@ -27,11 +27,11 @@ import com.google.android.ground.persistence.local.room.fields.EntityState entity = LocationOfInterestEntity::class, parentColumns = ["id"], childColumns = ["location_of_interest_id"], - onDelete = ForeignKey.CASCADE + onDelete = ForeignKey.CASCADE, ) ], tableName = "submission", - indices = [Index("location_of_interest_id", "job_id", "state")] + indices = [Index("location_of_interest_id", "job_id", "state")], ) data class SubmissionEntity( @ColumnInfo(name = "id") @PrimaryKey val id: String, diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/SubmissionMutationEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/SubmissionMutationEntity.kt index 59eb093fcd..e27e197a0c 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/SubmissionMutationEntity.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/SubmissionMutationEntity.kt @@ -30,16 +30,16 @@ import java.util.* entity = LocationOfInterestEntity::class, parentColumns = ["id"], childColumns = ["location_of_interest_id"], - onDelete = ForeignKey.CASCADE + onDelete = ForeignKey.CASCADE, ), ForeignKey( entity = SubmissionEntity::class, parentColumns = ["id"], childColumns = ["submission_id"], - onDelete = ForeignKey.CASCADE - ) + onDelete = ForeignKey.CASCADE, + ), ], - indices = [Index("location_of_interest_id"), Index("submission_id")] + indices = [Index("location_of_interest_id"), Index("submission_id")], ) data class SubmissionMutationEntity( @ColumnInfo(name = "id") @PrimaryKey(autoGenerate = true) val id: Long? = 0, @@ -60,5 +60,5 @@ data class SubmissionMutationEntity( * * This method returns `null` for mutation type [MutationEntityType.DELETE]. */ - @ColumnInfo(name = "deltas") val deltas: String? + @ColumnInfo(name = "deltas") val deltas: String?, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/SurveyEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/SurveyEntity.kt index bcff05b61f..bca08486ba 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/SurveyEntity.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/SurveyEntity.kt @@ -25,5 +25,5 @@ data class SurveyEntity( @ColumnInfo(name = "id") @PrimaryKey val id: String, @ColumnInfo(name = "title") val title: String?, @ColumnInfo(name = "description") val description: String?, - @ColumnInfo(name = "acl") val acl: JSONObject? + @ColumnInfo(name = "acl") val acl: JSONObject?, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/TaskEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/TaskEntity.kt index 38a227e630..e3cfe16635 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/TaskEntity.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/TaskEntity.kt @@ -30,10 +30,10 @@ import com.google.android.ground.persistence.local.room.fields.TaskEntityType entity = JobEntity::class, parentColumns = ["id"], childColumns = ["job_id"], - onDelete = ForeignKey.CASCADE + onDelete = ForeignKey.CASCADE, ) ], - indices = [Index("job_id")] + indices = [Index("job_id")], ) data class TaskEntity( @ColumnInfo(name = "id") @PrimaryKey val id: String, diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/TileSourceEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/TileSourceEntity.kt index 5d3ef6d04a..1d1f871de5 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/TileSourceEntity.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/TileSourceEntity.kt @@ -29,22 +29,22 @@ import androidx.room.PrimaryKey entity = SurveyEntity::class, parentColumns = ["id"], childColumns = ["survey_id"], - onDelete = ForeignKey.CASCADE + onDelete = ForeignKey.CASCADE, ) ], - indices = [Index("survey_id")] + indices = [Index("survey_id")], ) data class TileSourceEntity( @ColumnInfo(name = "id") @PrimaryKey(autoGenerate = true) val id: Int = 0, @ColumnInfo(name = "survey_id") val surveyId: String, @ColumnInfo(name = "url") val url: String, - @ColumnInfo(name = "type") val type: TileSourceEntityType + @ColumnInfo(name = "type") val type: TileSourceEntityType, ) { enum class TileSourceEntityType { GEOJSON, IMAGE, MOG, - UNKNOWN + UNKNOWN, } } diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/UserEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/UserEntity.kt index abfc4e0a6a..08d904e2de 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/UserEntity.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/UserEntity.kt @@ -25,5 +25,5 @@ data class UserEntity( @ColumnInfo(name = "email") val email: String, @ColumnInfo(name = "display_name") val displayName: String, // TODO(https://github.com/google/ground-android/issues/964): Save to remote db - @ColumnInfo(name = "photo_url") val photoUrl: String? + @ColumnInfo(name = "photo_url") val photoUrl: String?, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/fields/TaskEntityType.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/fields/TaskEntityType.kt index 90a49edc46..7e7db5416d 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/fields/TaskEntityType.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/fields/TaskEntityType.kt @@ -46,7 +46,7 @@ enum class TaskEntityType(private val intValue: Int) : IntEnum { Pair(TIME, Task.Type.TIME), Pair(POINT, Task.Type.DROP_PIN), Pair(POLYGON, Task.Type.DRAW_AREA), - Pair(CAPTURE_LOCATION, Task.Type.CAPTURE_LOCATION) + Pair(CAPTURE_LOCATION, Task.Type.CAPTURE_LOCATION), ) private val REVERSE_TASK_TYPES: Map = TASK_TYPES.entries.associateBy({ it.value }) { it.key } diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/fields/UserDetails.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/fields/UserDetails.kt index 8d70bbfc96..a48c70eb4e 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/fields/UserDetails.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/fields/UserDetails.kt @@ -22,7 +22,7 @@ import com.google.android.ground.model.User data class UserDetails( @ColumnInfo(name = "id") val id: String, @ColumnInfo(name = "email") val email: String, - @ColumnInfo(name = "display_name") val displayName: String + @ColumnInfo(name = "display_name") val displayName: String, ) { companion object { fun fromUser(user: User) = UserDetails(user.id, user.email, user.displayName) diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/ConditionEntityAndRelations.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/ConditionEntityAndRelations.kt index 8571b79c8c..4034d0ab8d 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/ConditionEntityAndRelations.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/ConditionEntityAndRelations.kt @@ -31,7 +31,7 @@ data class ConditionEntityAndRelations( @Relation( parentColumn = "parent_task_id", entityColumn = "parent_task_id", - entity = ExpressionEntity::class + entity = ExpressionEntity::class, ) - val expressionEntities: List + val expressionEntities: List, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/JobEntityAndRelations.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/JobEntityAndRelations.kt index 2cdda8868c..a6a24e58fb 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/JobEntityAndRelations.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/JobEntityAndRelations.kt @@ -28,5 +28,5 @@ import com.google.android.ground.persistence.local.room.entity.TaskEntity data class JobEntityAndRelations( @Embedded val jobEntity: JobEntity, @Relation(parentColumn = "id", entityColumn = "job_id", entity = TaskEntity::class) - val taskEntityAndRelations: List + val taskEntityAndRelations: List, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/SurveyEntityAndRelations.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/SurveyEntityAndRelations.kt index d0ed377ebc..1bd9fa29c7 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/SurveyEntityAndRelations.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/SurveyEntityAndRelations.kt @@ -31,5 +31,5 @@ data class SurveyEntityAndRelations( @Relation(parentColumn = "id", entityColumn = "survey_id", entity = JobEntity::class) val jobEntityAndRelations: List, @Relation(parentColumn = "id", entityColumn = "survey_id", entity = TileSourceEntity::class) - val tileSourceEntityAndRelations: List + val tileSourceEntityAndRelations: List, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/TaskEntityAndRelations.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/TaskEntityAndRelations.kt index c991a02339..c617500fe2 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/TaskEntityAndRelations.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/relations/TaskEntityAndRelations.kt @@ -35,5 +35,5 @@ data class TaskEntityAndRelations( @Relation(parentColumn = "id", entityColumn = "task_id", entity = OptionEntity::class) val optionEntities: List, @Relation(parentColumn = "id", entityColumn = "parent_task_id", entity = ConditionEntity::class) - val conditionEntityAndRelations: List + val conditionEntityAndRelations: List, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/stores/RoomLocationOfInterestStore.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/stores/RoomLocationOfInterestStore.kt index 4e7dbe727e..f2b7df6886 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/room/stores/RoomLocationOfInterestStore.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/room/stores/RoomLocationOfInterestStore.kt @@ -60,7 +60,7 @@ class RoomLocationOfInterestStore @Inject internal constructor() : LocalLocation */ override suspend fun getLocationOfInterest( survey: Survey, - locationOfInterestId: String + locationOfInterestId: String, ): LocationOfInterest? = locationOfInterestDao.findById(locationOfInterestId)?.toModelObject(survey) @@ -102,7 +102,7 @@ class RoomLocationOfInterestStore @Inject internal constructor() : LocalLocation private fun toLocationsOfInterest( survey: Survey, - locationOfInterestEntities: List + locationOfInterestEntities: List, ): Set = locationOfInterestEntities.mapNotNull { logOnFailure { it.toModelObject(survey) } }.toSet() @@ -122,7 +122,7 @@ class RoomLocationOfInterestStore @Inject internal constructor() : LocalLocation override suspend fun findByLocationOfInterestId( id: String, - vararg states: MutationEntitySyncStatus + vararg states: MutationEntitySyncStatus, ): List = locationOfInterestMutationDao.getMutations(id, *states) ?: listOf() diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/stores/LocalLocationOfInterestStore.kt b/ground/src/main/java/com/google/android/ground/persistence/local/stores/LocalLocationOfInterestStore.kt index 2b05782f3c..ea8e318be3 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/local/stores/LocalLocationOfInterestStore.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/local/stores/LocalLocationOfInterestStore.kt @@ -33,7 +33,7 @@ interface LocalLocationOfInterestStore : /** Returns the LOI with the specified UUID from the local data store, if found. */ suspend fun getLocationOfInterest( survey: Survey, - locationOfInterestId: String + locationOfInterestId: String, ): LocationOfInterest? /** Deletes LOI from local database. */ @@ -48,7 +48,7 @@ interface LocalLocationOfInterestStore : suspend fun findByLocationOfInterestId( id: String, - vararg states: MutationEntitySyncStatus + vararg states: MutationEntitySyncStatus, ): List suspend fun insertOrUpdate(loi: LocationOfInterest) diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/FirebaseMessagingService.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/FirebaseMessagingService.kt index 79059a3cb6..60848d230e 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/FirebaseMessagingService.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/FirebaseMessagingService.kt @@ -33,6 +33,7 @@ const val TOPIC_PREFIX = "/topics/" class FirebaseMessagingService : FirebaseMessagingService() { @Inject lateinit var surveySyncService: SurveySyncService + /** * Processes new messages, enqueuing a worker to sync the survey with the id specified in the * message topic. diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/FirestoreDataStore.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/FirestoreDataStore.kt index 3ec593bb0a..0383d62b59 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/FirestoreDataStore.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/FirestoreDataStore.kt @@ -51,7 +51,7 @@ class FirestoreDataStore internal constructor( private val firebaseFunctions: FirebaseFunctions, private val firestoreProvider: FirebaseFirestoreProvider, - @IoDispatcher private val ioDispatcher: CoroutineDispatcher + @IoDispatcher private val ioDispatcher: CoroutineDispatcher, ) : RemoteDataStore { private suspend fun db() = GroundFirestore(firestoreProvider.get()) @@ -113,7 +113,7 @@ internal constructor( private suspend fun addLocationOfInterestMutationToBatch( mutation: LocationOfInterestMutation, user: User, - batch: WriteBatch + batch: WriteBatch, ) { db() .surveys() @@ -126,7 +126,7 @@ internal constructor( private suspend fun addSubmissionMutationToBatch( mutation: SubmissionMutation, user: User, - batch: WriteBatch + batch: WriteBatch, ) { db() .surveys() diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/AuditInfoConverter.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/AuditInfoConverter.kt index 22d80bc779..846171d091 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/AuditInfoConverter.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/AuditInfoConverter.kt @@ -31,7 +31,7 @@ internal object AuditInfoConverter { return AuditInfo( UserConverter.toUser(doc.user), doc.clientTimestamp!!.toDate(), - doc.serverTimestamp?.toDate() + doc.serverTimestamp?.toDate(), ) } @@ -40,6 +40,6 @@ internal object AuditInfoConverter { AuditInfoNestedObject( UserConverter.toNestedObject(user), Timestamp(mutation.clientTimestamp), - null + null, ) } diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/AuditInfoNestedObject.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/AuditInfoNestedObject.kt index e21f7ac325..de97563090 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/AuditInfoNestedObject.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/AuditInfoNestedObject.kt @@ -39,7 +39,7 @@ data class AuditInfoNestedObject( * details. This will be null until the server updates the write time and syncs it back to the * client. */ - @ServerTimestamp val serverTimestamp: Timestamp? = null + @ServerTimestamp val serverTimestamp: Timestamp? = null, ) { companion object { private val EPOCH = Timestamp(0, 0) diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/CaptureLocationResultConverter.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/CaptureLocationResultConverter.kt index e5e7751e23..d23206b7ea 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/CaptureLocationResultConverter.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/CaptureLocationResultConverter.kt @@ -29,7 +29,7 @@ object CaptureLocationResultConverter { mapOf( ACCURACY_KEY to result.accuracy!!, ALTITUDE_KEY to result.altitude!!, - GEOMETRY_KEY to GeometryConverter.toFirestoreMap(result.geometry!!).getOrThrow() + GEOMETRY_KEY to GeometryConverter.toFirestoreMap(result.geometry!!).getOrThrow(), ) } diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/ConditionConverter.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/ConditionConverter.kt index ff62401373..2cbac46897 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/ConditionConverter.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/ConditionConverter.kt @@ -30,10 +30,7 @@ internal object ConditionConverter { Timber.e("Unsupported matchType: $matchType") return null } - return Condition( - matchType = matchType, - expressions = (expressions ?: listOf()).toExpressions(), - ) + return Condition(matchType = matchType, expressions = (expressions ?: listOf()).toExpressions()) } // Note: Key value must be in sync with web app. diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/ConditionNestedObject.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/ConditionNestedObject.kt index 979ceaebc5..846a293095 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/ConditionNestedObject.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/ConditionNestedObject.kt @@ -30,5 +30,5 @@ data class ConditionNestedObject( data class ExpressionNestedObject( val expressionType: String? = null, val taskId: String? = null, - val optionIds: List? = null + val optionIds: List? = null, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/GeometryConverter.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/GeometryConverter.kt index 94f2a2703a..db94e4279f 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/GeometryConverter.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/GeometryConverter.kt @@ -110,7 +110,7 @@ object GeometryConverter { val rings = indexedMapToList(ringsMap) return Polygon( indexedMapToLinearRing(rings.first()), - rings.drop(1).map(this::indexedMapToLinearRing) + rings.drop(1).map(this::indexedMapToLinearRing), ) } diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/JobConverter.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/JobConverter.kt index d937e79886..c7f4d68b42 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/JobConverter.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/JobConverter.kt @@ -36,7 +36,7 @@ internal object JobConverter { style = obj.defaultStyle?.toStyle(), name = obj.name, strategy = TaskConverter.toStrategy(obj.strategy), - tasks = taskMap.toPersistentMap() + tasks = taskMap.toPersistentMap(), ) } } diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/JobNestedObject.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/JobNestedObject.kt index 400dd59dba..6cb675c74b 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/JobNestedObject.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/JobNestedObject.kt @@ -25,5 +25,5 @@ data class JobNestedObject( val defaultStyle: StyleNestedObject? = null, val name: String? = null, val tasks: Map? = null, - val strategy: String = MIXED.toString() + val strategy: String = MIXED.toString(), ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/OptionNestedObject.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/OptionNestedObject.kt index e1ed2d0deb..a0e134dabc 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/OptionNestedObject.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/OptionNestedObject.kt @@ -20,5 +20,5 @@ package com.google.android.ground.persistence.remote.firebase.schema data class OptionNestedObject( val index: Int? = -1, val code: String? = null, - val label: String? = null + val label: String? = null, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionConverter.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionConverter.kt index ffac594a30..42359d25cc 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionConverter.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionConverter.kt @@ -146,7 +146,7 @@ internal object SubmissionConverter { private fun putCaptureLocationResult( taskId: String, obj: Any, - data: MutableMap + data: MutableMap, ) = CaptureLocationResultConverter.fromFirestoreMap(obj as Map).onSuccess { data[taskId] = it diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionDocument.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionDocument.kt index 111ee861eb..f69325794a 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionDocument.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionDocument.kt @@ -29,5 +29,5 @@ data class SubmissionDocument( val lastModified: AuditInfoNestedObject? = null, // TODO(#2058): Remove after dev databases are updated to use `data` field. val data: SubmissionDataNestedMap? = null, - val responses: SubmissionDataNestedMap? = null + val responses: SubmissionDataNestedMap? = null, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionMutationConverter.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionMutationConverter.kt index fadf150c9d..74936f63b5 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionMutationConverter.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionMutationConverter.kt @@ -20,7 +20,6 @@ import com.google.android.ground.model.User import com.google.android.ground.model.mutation.Mutation import com.google.android.ground.model.mutation.SubmissionMutation import com.google.android.ground.model.submission.* -import com.google.android.ground.model.submission.CaptureLocationTaskData import com.google.android.ground.persistence.remote.DataStoreException import com.google.android.ground.persistence.remote.firebase.schema.AuditInfoConverter.fromMutationAndUser import com.google.firebase.firestore.FieldValue diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyConverter.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyConverter.kt index 77224e7223..758bc5c72b 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyConverter.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyConverter.kt @@ -51,7 +51,7 @@ internal object SurveyConverter { pd.description.orEmpty(), jobMap.toPersistentMap(), tileSources.toPersistentList(), - pd.acl ?: mapOf() + pd.acl ?: mapOf(), ) } diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyDocument.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyDocument.kt index b60dc720c9..5d300e557c 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyDocument.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/SurveyDocument.kt @@ -25,5 +25,5 @@ data class SurveyDocument( val description: String? = null, val jobs: Map? = null, val acl: Map? = null, - val tileSources: List? = null + val tileSources: List? = null, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/TaskConverter.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/TaskConverter.kt index 46db23cc9d..bd9f8b134e 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/TaskConverter.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/TaskConverter.kt @@ -43,7 +43,7 @@ internal object TaskConverter { em.required != null && em.required, multipleChoice, em.addLoiTask ?: false, - em.condition?.toCondition() + em.condition?.toCondition(), ) } diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/TileSourceNestedObject.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/TileSourceNestedObject.kt index e83014af67..1b8ace52e8 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/TileSourceNestedObject.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/TileSourceNestedObject.kt @@ -20,5 +20,5 @@ data class TileSourceNestedObject( val url: String? = null, val type: String? = null, val minHiResZoom: Int? = null, - val maxHiResZoom: Int? = null + val maxHiResZoom: Int? = null, ) diff --git a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/UserNestedObject.kt b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/UserNestedObject.kt index c72326d91c..cf26e9c2cb 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/UserNestedObject.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/UserNestedObject.kt @@ -20,7 +20,7 @@ package com.google.android.ground.persistence.remote.firebase.schema data class UserNestedObject( val id: String? = null, val email: String? = null, - val displayName: String? = null + val displayName: String? = null, ) { companion object { /** Fallback value when reading invalid or legacy schemas. */ diff --git a/ground/src/main/java/com/google/android/ground/persistence/sync/LocalMutationSyncWorker.kt b/ground/src/main/java/com/google/android/ground/persistence/sync/LocalMutationSyncWorker.kt index 928a259412..f8f607f776 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/sync/LocalMutationSyncWorker.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/sync/LocalMutationSyncWorker.kt @@ -50,7 +50,7 @@ constructor( private val mutationRepository: MutationRepository, private val localUserStore: LocalUserStore, private val remoteDataStore: RemoteDataStore, - private val mediaUploadWorkManager: MediaUploadWorkManager + private val mediaUploadWorkManager: MediaUploadWorkManager, ) : CoroutineWorker(context, params) { private val locationOfInterestId: String = diff --git a/ground/src/main/java/com/google/android/ground/persistence/sync/MediaUploadWorker.kt b/ground/src/main/java/com/google/android/ground/persistence/sync/MediaUploadWorker.kt index 5ff01f90fa..1ad1cf3ec3 100644 --- a/ground/src/main/java/com/google/android/ground/persistence/sync/MediaUploadWorker.kt +++ b/ground/src/main/java/com/google/android/ground/persistence/sync/MediaUploadWorker.kt @@ -69,7 +69,7 @@ constructor( mutationRepository.getSubmissionMutations( loiId, MutationEntitySyncStatus.MEDIA_UPLOAD_PENDING, - MutationEntitySyncStatus.MEDIA_UPLOAD_AWAITING_RETRY + MutationEntitySyncStatus.MEDIA_UPLOAD_AWAITING_RETRY, ) val results = uploadMedia(mutations) return if (results.any { it.mediaUploadPending() }) Result.retry() else Result.success() @@ -108,7 +108,7 @@ constructor( syncStatus = Mutation.SyncStatus.MEDIA_UPLOAD_AWAITING_RETRY, lastError = cause, ) - } + }, ) private suspend fun uploadPhotos(mutation: SubmissionMutation): kotlin.Result = diff --git a/ground/src/main/java/com/google/android/ground/repository/LocationOfInterestRepository.kt b/ground/src/main/java/com/google/android/ground/repository/LocationOfInterestRepository.kt index 8db337e10b..10db460ab6 100644 --- a/ground/src/main/java/com/google/android/ground/repository/LocationOfInterestRepository.kt +++ b/ground/src/main/java/com/google/android/ground/repository/LocationOfInterestRepository.kt @@ -53,7 +53,7 @@ constructor( private val remoteDataStore: RemoteDataStore, private val mutationSyncWorkManager: MutationSyncWorkManager, private val uuidGenerator: OfflineUuidGenerator, - private val authenticationManager: AuthenticationManager + private val authenticationManager: AuthenticationManager, ) { /** Mirrors locations of interest in the specified survey from the remote db into the local db. */ suspend fun syncLocationsOfInterest(survey: Survey) { @@ -97,7 +97,7 @@ constructor( lastModified = auditInfo, ownerEmail = user.email, properties = generateProperties(loiName), - isPredefined = false + isPredefined = false, ) } diff --git a/ground/src/main/java/com/google/android/ground/repository/MutationRepository.kt b/ground/src/main/java/com/google/android/ground/repository/MutationRepository.kt index 8f8ccb1bb6..632b584170 100644 --- a/ground/src/main/java/com/google/android/ground/repository/MutationRepository.kt +++ b/ground/src/main/java/com/google/android/ground/repository/MutationRepository.kt @@ -62,7 +62,7 @@ constructor( */ suspend fun getSubmissionMutations( loiId: String, - vararg entitySyncStatus: MutationEntitySyncStatus + vararg entitySyncStatus: MutationEntitySyncStatus, ) = getMutations(loiId, *entitySyncStatus).filterIsInstance() /** @@ -71,7 +71,7 @@ constructor( */ suspend fun getMutations( loiId: String, - vararg entitySyncStatus: MutationEntitySyncStatus + vararg entitySyncStatus: MutationEntitySyncStatus, ): List { val loiMutations = localLocationOfInterestStore @@ -139,7 +139,7 @@ constructor( private fun combineAndSortMutations( locationOfInterestMutations: List, - submissionMutations: List + submissionMutations: List, ): List = (locationOfInterestMutations + submissionMutations).sortedWith( Mutation.byDescendingClientTimestamp() @@ -164,7 +164,7 @@ constructor( // exclude/include them in further processing runs. private fun List.updateMutationStatus( syncStatus: Mutation.SyncStatus, - error: Throwable? = null + error: Throwable? = null, ): List = map { val hasSyncFailed = syncStatus == Mutation.SyncStatus.FAILED val retryCount = if (hasSyncFailed) it.retryCount + 1 else it.retryCount diff --git a/ground/src/main/java/com/google/android/ground/repository/SurveyRepository.kt b/ground/src/main/java/com/google/android/ground/repository/SurveyRepository.kt index ef98262c09..28ba22f558 100644 --- a/ground/src/main/java/com/google/android/ground/repository/SurveyRepository.kt +++ b/ground/src/main/java/com/google/android/ground/repository/SurveyRepository.kt @@ -62,7 +62,7 @@ constructor( private val remoteDataStore: RemoteDataStore, private val localValueStore: LocalValueStore, private val networkManager: NetworkManager, - @ApplicationScope private val externalScope: CoroutineScope + @ApplicationScope private val externalScope: CoroutineScope, ) { private val _selectedSurveyIdFlow = MutableStateFlow(null) var selectedSurveyId: String? diff --git a/ground/src/main/java/com/google/android/ground/repository/TermsOfServiceRepository.kt b/ground/src/main/java/com/google/android/ground/repository/TermsOfServiceRepository.kt index 704972f775..47640b5303 100644 --- a/ground/src/main/java/com/google/android/ground/repository/TermsOfServiceRepository.kt +++ b/ground/src/main/java/com/google/android/ground/repository/TermsOfServiceRepository.kt @@ -33,7 +33,7 @@ class TermsOfServiceRepository constructor( private val networkManager: NetworkManager, private val remoteDataStore: RemoteDataStore, - private val localValueStore: LocalValueStore + private val localValueStore: LocalValueStore, ) { var isTermsOfServiceAccepted: Boolean by localValueStore::isTermsOfServiceAccepted diff --git a/ground/src/main/java/com/google/android/ground/repository/UserMediaRepository.kt b/ground/src/main/java/com/google/android/ground/repository/UserMediaRepository.kt index 0f99c6db70..00b98f7312 100644 --- a/ground/src/main/java/com/google/android/ground/repository/UserMediaRepository.kt +++ b/ground/src/main/java/com/google/android/ground/repository/UserMediaRepository.kt @@ -42,7 +42,7 @@ class UserMediaRepository constructor( @ApplicationContext private val context: Context, private val remoteStorageManager: RemoteStorageManager, - private val uuidGenerator: OfflineUuidGenerator + private val uuidGenerator: OfflineUuidGenerator, ) { private var strFilePattern = Regex("^[a-zA-Z0-9._ -]+\\.(png|jpg)$") diff --git a/ground/src/main/java/com/google/android/ground/system/FusedLocationProviderClient.kt b/ground/src/main/java/com/google/android/ground/system/FusedLocationProviderClient.kt index 7c81d7a6f9..aaedc95eb6 100644 --- a/ground/src/main/java/com/google/android/ground/system/FusedLocationProviderClient.kt +++ b/ground/src/main/java/com/google/android/ground/system/FusedLocationProviderClient.kt @@ -46,7 +46,7 @@ class FusedLocationProviderClient @Inject constructor(@ApplicationContext contex @SuppressLint("MissingPermission") suspend fun requestLocationUpdates( locationRequest: LocationRequest, - locationCallback: LocationSharedFlowCallback + locationCallback: LocationSharedFlowCallback, ) { fusedLocationProviderClient .requestLocationUpdates(locationRequest, locationCallback, Looper.myLooper()) diff --git a/ground/src/main/java/com/google/android/ground/system/GeocodingManager.kt b/ground/src/main/java/com/google/android/ground/system/GeocodingManager.kt index bde5aa00fc..bcc06bf289 100644 --- a/ground/src/main/java/com/google/android/ground/system/GeocodingManager.kt +++ b/ground/src/main/java/com/google/android/ground/system/GeocodingManager.kt @@ -37,7 +37,7 @@ class GeocodingManager constructor( private val geocoder: Geocoder, @IoDispatcher private val ioDispatcher: CoroutineDispatcher, - resources: Resources + resources: Resources, ) { private val defaultAreaName: String = resources.getString(R.string.unnamed_area) private val multipleRegionsLabel: String = resources.getString(R.string.multiple_regions) @@ -60,7 +60,7 @@ constructor( Address::getCountryName, Address::getAdminArea, Address::getSubAdminArea, - Address::getLocality + Address::getLocality, ) return when (nameComponents.size) { 0 -> defaultAreaName @@ -77,7 +77,7 @@ constructor( */ private fun findCommonComponents( samplePointAddresses: List>, - vararg getters: (Address) -> String? + vararg getters: (Address) -> String?, ): MutableList { val commonComponents = mutableListOf() for (getter in getters) { diff --git a/ground/src/main/java/com/google/android/ground/system/GoogleApiManager.kt b/ground/src/main/java/com/google/android/ground/system/GoogleApiManager.kt index 75c1cef8a1..685d871705 100644 --- a/ground/src/main/java/com/google/android/ground/system/GoogleApiManager.kt +++ b/ground/src/main/java/com/google/android/ground/system/GoogleApiManager.kt @@ -30,7 +30,7 @@ class GoogleApiManager constructor( @ApplicationContext private val context: Context, private val googleApiAvailability: GoogleApiAvailability, - private val activityStreams: ActivityStreams + private val activityStreams: ActivityStreams, ) { /** diff --git a/ground/src/main/java/com/google/android/ground/system/NetworkManager.kt b/ground/src/main/java/com/google/android/ground/system/NetworkManager.kt index 916d2f6190..ac87d27c45 100644 --- a/ground/src/main/java/com/google/android/ground/system/NetworkManager.kt +++ b/ground/src/main/java/com/google/android/ground/system/NetworkManager.kt @@ -31,8 +31,9 @@ import kotlinx.coroutines.flow.callbackFlow enum class NetworkStatus { AVAILABLE, - UNAVAILABLE + UNAVAILABLE, } + /** Abstracts access to network state. */ @Singleton class NetworkManager @Inject constructor(@ApplicationContext private val context: Context) { diff --git a/ground/src/main/java/com/google/android/ground/system/SettingsManager.kt b/ground/src/main/java/com/google/android/ground/system/SettingsManager.kt index c5c03259ef..40805c7653 100644 --- a/ground/src/main/java/com/google/android/ground/system/SettingsManager.kt +++ b/ground/src/main/java/com/google/android/ground/system/SettingsManager.kt @@ -35,7 +35,7 @@ class SettingsManager @Inject constructor( private val activityStreams: ActivityStreams, - private val settingsClient: SettingsClient + private val settingsClient: SettingsClient, ) { /** diff --git a/ground/src/main/java/com/google/android/ground/system/auth/AuthenticationModule.kt b/ground/src/main/java/com/google/android/ground/system/auth/AuthenticationModule.kt index 734cfdf244..e4bf7bd524 100644 --- a/ground/src/main/java/com/google/android/ground/system/auth/AuthenticationModule.kt +++ b/ground/src/main/java/com/google/android/ground/system/auth/AuthenticationModule.kt @@ -33,7 +33,7 @@ class AuthenticationModule { @Singleton fun authenticationManager( anonymousAuthenticationManager: AnonymousAuthenticationManager, - googleAuthenticationManager: GoogleAuthenticationManager + googleAuthenticationManager: GoogleAuthenticationManager, ): AuthenticationManager = if (USE_EMULATORS) anonymousAuthenticationManager else googleAuthenticationManager diff --git a/ground/src/main/java/com/google/android/ground/system/auth/SignInState.kt b/ground/src/main/java/com/google/android/ground/system/auth/SignInState.kt index 78e26c325b..8df6c0802f 100644 --- a/ground/src/main/java/com/google/android/ground/system/auth/SignInState.kt +++ b/ground/src/main/java/com/google/android/ground/system/auth/SignInState.kt @@ -23,7 +23,7 @@ data class SignInState(val state: State, val result: Result) { SIGNED_OUT, SIGNING_IN, SIGNED_IN, - ERROR + ERROR, } companion object { diff --git a/ground/src/main/java/com/google/android/ground/system/channel/LocationSharedFlowCallback.kt b/ground/src/main/java/com/google/android/ground/system/channel/LocationSharedFlowCallback.kt index 4d66aff04d..a6d82eb189 100644 --- a/ground/src/main/java/com/google/android/ground/system/channel/LocationSharedFlowCallback.kt +++ b/ground/src/main/java/com/google/android/ground/system/channel/LocationSharedFlowCallback.kt @@ -28,7 +28,7 @@ import timber.log.Timber /** Implementation of [LocationCallback] linked to a [MutableStateFlow]. */ class LocationSharedFlowCallback( private val locationUpdates: MutableSharedFlow, - private val coroutineScope: CoroutineScope + private val coroutineScope: CoroutineScope, ) : LocationCallback() { override fun onLocationResult(locationResult: LocationResult) { coroutineScope.launch { diff --git a/ground/src/main/java/com/google/android/ground/ui/common/AbstractDialogFragment.kt b/ground/src/main/java/com/google/android/ground/ui/common/AbstractDialogFragment.kt index 826a04fde1..7899b2183a 100644 --- a/ground/src/main/java/com/google/android/ground/ui/common/AbstractDialogFragment.kt +++ b/ground/src/main/java/com/google/android/ground/ui/common/AbstractDialogFragment.kt @@ -48,7 +48,7 @@ abstract class AbstractDialogFragment : AppCompatDialogFragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View? { Debug.logLifecycleEvent(this) return super.onCreateView(inflater, container, savedInstanceState) diff --git a/ground/src/main/java/com/google/android/ground/ui/common/BaseMapViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/common/BaseMapViewModel.kt index 95edab2375..b631b6ea75 100644 --- a/ground/src/main/java/com/google/android/ground/ui/common/BaseMapViewModel.kt +++ b/ground/src/main/java/com/google/android/ground/ui/common/BaseMapViewModel.kt @@ -70,7 +70,7 @@ constructor( private val offlineAreaRepository: OfflineAreaRepository, private val permissionsManager: PermissionsManager, private val surveyRepository: SurveyRepository, - private val locationOfInterestRepository: LocationOfInterestRepository + private val locationOfInterestRepository: LocationOfInterestRepository, ) : AbstractViewModel() { val locationLock: MutableStateFlow> = @@ -148,7 +148,7 @@ constructor( if (statusCode == SETTINGS_CHANGE_UNAVAILABLE) { Timber.e( throwable, - "User is offline, so fallback to user's current permission, which may also fail." + "User is offline, so fallback to user's current permission, which may also fail.", ) } else { throw throwable @@ -196,7 +196,7 @@ constructor( fun getCameraUpdateRequests(): SharedFlow = merge( getCameraUpdateRequestsForSurveyActivations(), - getCameraUpdateRequestsForDeviceLocationChanges() + getCameraUpdateRequestsForDeviceLocationChanges(), ) .shareIn(viewModelScope, SharingStarted.Eagerly, replay = 0) diff --git a/ground/src/main/java/com/google/android/ground/ui/common/Navigator.kt b/ground/src/main/java/com/google/android/ground/ui/common/Navigator.kt index a2c1b53383..37d2e6d384 100644 --- a/ground/src/main/java/com/google/android/ground/ui/common/Navigator.kt +++ b/ground/src/main/java/com/google/android/ground/ui/common/Navigator.kt @@ -40,7 +40,7 @@ class Navigator @Inject constructor( @MainDispatcher private val dispatcher: CoroutineDispatcher, - @MainScope private val coroutineScope: CoroutineScope + @MainScope private val coroutineScope: CoroutineScope, ) { private val _navigateRequests = MutableSharedFlow() diff --git a/ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionFragment.kt b/ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionFragment.kt index c38da1cd9f..ceea9ef739 100644 --- a/ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionFragment.kt +++ b/ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionFragment.kt @@ -96,7 +96,7 @@ class DataCollectionFragment : AbstractFragment(), BackPressListener { // close. setProgressBarPosition(view) }, - 100 + 100, ) } } diff --git a/ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionViewModel.kt index 739f0f9c9e..e4713d7445 100644 --- a/ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionViewModel.kt +++ b/ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionViewModel.kt @@ -256,6 +256,7 @@ internal constructor( } return tasks.indexOf(tasks.first { it.id == currentTaskId.value }) } + /** Persists the collected data as draft to local storage. */ private fun saveDraft() { externalScope.launch(ioDispatcher) { diff --git a/ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionViewPagerAdapterFactory.kt b/ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionViewPagerAdapterFactory.kt index 4a540a72e8..59b63cb812 100644 --- a/ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionViewPagerAdapterFactory.kt +++ b/ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionViewPagerAdapterFactory.kt @@ -21,8 +21,5 @@ import dagger.assisted.AssistedFactory @AssistedFactory interface DataCollectionViewPagerAdapterFactory { - fun create( - fragment: Fragment, - tasks: List, - ): DataCollectionViewPagerAdapter + fun create(fragment: Fragment, tasks: List): DataCollectionViewPagerAdapter } diff --git a/ground/src/main/java/com/google/android/ground/ui/datacollection/components/TaskViewFactory.kt b/ground/src/main/java/com/google/android/ground/ui/datacollection/components/TaskViewFactory.kt index 89edd35f8c..5a73631824 100644 --- a/ground/src/main/java/com/google/android/ground/ui/datacollection/components/TaskViewFactory.kt +++ b/ground/src/main/java/com/google/android/ground/ui/datacollection/components/TaskViewFactory.kt @@ -32,7 +32,7 @@ object TaskViewFactory { fun createWithCombinedHeader( layoutInflater: LayoutInflater, @DrawableRes iconResId: Int? = null, - @StringRes labelResId: Int? = null + @StringRes labelResId: Int? = null, ): TaskView { val binding = TaskFragWithCombinedHeaderBinding.inflate(layoutInflater) iconResId?.let { diff --git a/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/date/DateTaskFragment.kt b/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/date/DateTaskFragment.kt index 3ec2f2cad4..ba28c00a63 100644 --- a/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/date/DateTaskFragment.kt +++ b/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/date/DateTaskFragment.kt @@ -58,7 +58,7 @@ class DateTaskFragment : AbstractTaskFragment() { }, year, month, - day + day, ) .apply { show() diff --git a/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/location/CaptureLocationTaskMapViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/location/CaptureLocationTaskMapViewModel.kt index 64116f790e..2b8717f80e 100644 --- a/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/location/CaptureLocationTaskMapViewModel.kt +++ b/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/location/CaptureLocationTaskMapViewModel.kt @@ -35,7 +35,7 @@ internal constructor( mapStateRepository: MapStateRepository, settingsManager: SettingsManager, permissionsManager: PermissionsManager, - locationOfInterestRepository: LocationOfInterestRepository + locationOfInterestRepository: LocationOfInterestRepository, ) : BaseMapViewModel( locationManager, @@ -44,7 +44,7 @@ internal constructor( offlineAreaRepository, permissionsManager, surveyRepository, - locationOfInterestRepository + locationOfInterestRepository, ) { override val mapConfig: MapConfig diff --git a/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/multiplechoice/MultipleChoiceTaskViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/multiplechoice/MultipleChoiceTaskViewModel.kt index 7145e0b8e7..1822a574eb 100644 --- a/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/multiplechoice/MultipleChoiceTaskViewModel.kt +++ b/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/multiplechoice/MultipleChoiceTaskViewModel.kt @@ -75,11 +75,7 @@ class MultipleChoiceTaskViewModel @Inject constructor(resources: Resources) : updateMultipleChoiceItems() } - fun setItem( - item: MultipleChoiceItem, - selection: Boolean, - canSelectMultiple: Boolean, - ) { + fun setItem(item: MultipleChoiceItem, selection: Boolean, canSelectMultiple: Boolean) { if (!canSelectMultiple && selection) { selectedIds.clear() } @@ -92,10 +88,7 @@ class MultipleChoiceTaskViewModel @Inject constructor(resources: Resources) : updateMultipleChoiceItems() } - fun toggleItem( - item: MultipleChoiceItem, - canSelectMultiple: Boolean, - ) { + fun toggleItem(item: MultipleChoiceItem, canSelectMultiple: Boolean) { val wasSelected = selectedIds.contains(item.option.id) setItem(item, !wasSelected, canSelectMultiple) } @@ -131,7 +124,7 @@ class MultipleChoiceTaskViewModel @Inject constructor(resources: Resources) : multipleChoice.cardinality, selectedIds.contains(it.id), true, - otherText + otherText, ) ) } diff --git a/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/time/TimeTaskFragment.kt b/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/time/TimeTaskFragment.kt index 0bd47bd744..b328359746 100644 --- a/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/time/TimeTaskFragment.kt +++ b/ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/time/TimeTaskFragment.kt @@ -57,7 +57,7 @@ class TimeTaskFragment : AbstractTaskFragment() { }, hour, minute, - DateFormat.is24HourFormat(requireContext()) + DateFormat.is24HourFormat(requireContext()), ) .apply { show() diff --git a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/MapTypeAdapter.kt b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/MapTypeAdapter.kt index 3a6fd821d1..6b5aa8781e 100644 --- a/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/MapTypeAdapter.kt +++ b/ground/src/main/java/com/google/android/ground/ui/home/mapcontainer/MapTypeAdapter.kt @@ -34,7 +34,7 @@ class MapTypeAdapter( private val context: Context, private val itemsList: List, private var selectedIndex: Int, - private val callback: (Int) -> Unit + private val callback: (Int) -> Unit, ) : RecyclerView.Adapter() { /** Creates a new [ViewHolder] item without any data. */ @@ -58,7 +58,7 @@ class MapTypeAdapter( R.attr.colorPrimary } else { R.attr.colorOnSurface - } + }, ) ) holder.binding.card.apply { diff --git a/ground/src/main/java/com/google/android/ground/ui/map/Bounds.kt b/ground/src/main/java/com/google/android/ground/ui/map/Bounds.kt index 93a4ca8c48..0115855936 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/Bounds.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/Bounds.kt @@ -28,7 +28,7 @@ data class Bounds(val southwest: Coordinates, val northeast: Coordinates) { south: Double, west: Double, north: Double, - east: Double + east: Double, ) : this(Coordinates(south, west), Coordinates(north, east)) val north @@ -48,6 +48,7 @@ data class Bounds(val southwest: Coordinates, val northeast: Coordinates) { val southeast get() = Coordinates(south, east) + /** * The corners of the bounds in counterclockwise order starting from the northwestern most vertex. */ @@ -63,7 +64,7 @@ data class Bounds(val southwest: Coordinates, val northeast: Coordinates) { val lngOffset = (east - west) * factor * 0.5 return Bounds( Coordinates(south + latOffset, west + lngOffset), - Coordinates(north - latOffset, east - lngOffset) + Coordinates(north - latOffset, east - lngOffset), ) } } diff --git a/ground/src/main/java/com/google/android/ground/ui/map/CameraPosition.kt b/ground/src/main/java/com/google/android/ground/ui/map/CameraPosition.kt index f4c6a7f061..1a0e5edb6d 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/CameraPosition.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/CameraPosition.kt @@ -22,7 +22,7 @@ import timber.log.Timber data class CameraPosition( val target: Coordinates? = null, val zoomLevel: Float? = null, - val bounds: Bounds? = null + val bounds: Bounds? = null, ) { fun serialize(): String = diff --git a/ground/src/main/java/com/google/android/ground/ui/map/CameraUpdateRequest.kt b/ground/src/main/java/com/google/android/ground/ui/map/CameraUpdateRequest.kt index 47a76721fe..0299e1327f 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/CameraUpdateRequest.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/CameraUpdateRequest.kt @@ -18,5 +18,5 @@ package com.google.android.ground.ui.map data class CameraUpdateRequest( val cameraPosition: CameraPosition, val shouldAnimate: Boolean = false, - val isAllowZoomOut: Boolean = false + val isAllowZoomOut: Boolean = false, ) diff --git a/ground/src/main/java/com/google/android/ground/ui/map/Feature.kt b/ground/src/main/java/com/google/android/ground/ui/map/Feature.kt index c180c075cf..b0a7eb4ba3 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/Feature.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/Feature.kt @@ -24,7 +24,7 @@ data class Feature( val geometry: Geometry, val style: Style, val clusterable: Boolean, - val selected: Boolean = false + val selected: Boolean = false, ) { constructor( id: String, @@ -33,7 +33,7 @@ data class Feature( flag: Boolean = false, style: Style, clusterable: Boolean, - selected: Boolean = false + selected: Boolean = false, ) : this(Tag(id, type, flag), geometry, style, clusterable, selected) /** Tag used to uniquely identifier a feature on the map. */ @@ -47,7 +47,7 @@ data class Feature( val type: Int, /** An arbitrary slot for boolean flag. The interpretation of this field is type-dependent. */ // TODO: This is not part of the unique identifier for the feature - should not live in Tag! - val flag: Boolean = false + val flag: Boolean = false, ) data class Style(@ColorInt val color: Int, val vertexStyle: VertexStyle? = VertexStyle.NONE) diff --git a/ground/src/main/java/com/google/android/ground/ui/map/MapFragment.kt b/ground/src/main/java/com/google/android/ground/ui/map/MapFragment.kt index 4e1c9fb695..df2f18fd51 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/MapFragment.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/MapFragment.kt @@ -54,7 +54,7 @@ interface MapFragment { fun attachToParent( containerFragment: AbstractFragment, @IdRes containerId: Int, - onMapReadyCallback: (MapFragment) -> Unit + onMapReadyCallback: (MapFragment) -> Unit, ) /** Enables map gestures like pan and zoom. */ diff --git a/ground/src/main/java/com/google/android/ground/ui/map/MapType.kt b/ground/src/main/java/com/google/android/ground/ui/map/MapType.kt index a350b3148c..b39cb5aa2b 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/MapType.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/MapType.kt @@ -28,7 +28,7 @@ import kotlinx.parcelize.Parcelize @Parcelize enum class MapType( @field:StringRes @StringRes val labelId: Int, - @field:DrawableRes @DrawableRes val imageId: Int + @field:DrawableRes @DrawableRes val imageId: Int, ) : Parcelable { ROAD(R.string.road_map, R.drawable.map_type_roadmap), TERRAIN(R.string.terrain, R.drawable.map_type_terrain), diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/ClippingTileProvider.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/ClippingTileProvider.kt index ad23a9ef58..d78eff8743 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/ClippingTileProvider.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/ClippingTileProvider.kt @@ -29,7 +29,7 @@ private const val MAX_ZOOM = 19 class ClippingTileProvider( private val sourceTileProvider: TileProvider, - clipBounds: List + clipBounds: List, ) : TileProvider { private val pixelBounds = clipBounds.map { it.toPixelBounds(MAX_ZOOM) } diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/features/FeatureClusterRenderer.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/features/FeatureClusterRenderer.kt index 4858e37a48..50f2d5f7bc 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/features/FeatureClusterRenderer.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/features/FeatureClusterRenderer.kt @@ -41,7 +41,7 @@ class FeatureClusterRenderer( context: Context, map: GoogleMap, clusterManager: ClusterManager, - var zoom: Float + var zoom: Float, ) : DefaultClusterRenderer(context, map, clusterManager) { /** * Called when the cluster balloon is shown so that implementations can unhide related map items. @@ -80,7 +80,7 @@ class FeatureClusterRenderer( */ override fun onBeforeClusterRendered( cluster: Cluster, - markerOptions: MarkerOptions + markerOptions: MarkerOptions, ) { // Hide cluster's items when clustered. cluster.items.forEach { onClusterRendered(it.feature.tag) } diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/features/LineStringRenderer.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/features/LineStringRenderer.kt index 2f8c8274f2..540652e7d1 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/features/LineStringRenderer.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/features/LineStringRenderer.kt @@ -50,7 +50,7 @@ constructor(private val resources: Resources, private val bitmapUtil: BitmapUtil geometry: LineString, style: Feature.Style, selected: Boolean, - visible: Boolean + visible: Boolean, ): Polyline { val options = PolylineOptions() with(options) { diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/features/MapsItemManager.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/features/MapsItemManager.kt index 3015b26946..eddb8bf528 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/features/MapsItemManager.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/features/MapsItemManager.kt @@ -33,7 +33,7 @@ class MapsItemManager( private val map: GoogleMap, private val pointRenderer: PointRenderer, private val polygonRenderer: PolygonRenderer, - private val lineStringRenderer: LineStringRenderer + private val lineStringRenderer: LineStringRenderer, ) { private val itemsByTag = mutableMapOf>() diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/features/MapsItemRenderer.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/features/MapsItemRenderer.kt index d59e783b77..0aa9b60e95 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/features/MapsItemRenderer.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/features/MapsItemRenderer.kt @@ -26,6 +26,6 @@ interface MapsItemRenderer { geometry: T, style: Feature.Style, selected: Boolean, - visible: Boolean + visible: Boolean, ): U } diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/features/PointRenderer.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/features/PointRenderer.kt index ab5e228d3d..77e844a57a 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/features/PointRenderer.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/features/PointRenderer.kt @@ -46,7 +46,7 @@ constructor(resources: Resources, private val markerIconFactory: IconFactory) : geometry: Point, style: Feature.Style, selected: Boolean, - visible: Boolean + visible: Boolean, ): Marker { val markerOptions = MarkerOptions() with(markerOptions) { diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/features/PolygonRenderer.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/features/PolygonRenderer.kt index 8b35241e32..7a71ca159e 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/features/PolygonRenderer.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/features/PolygonRenderer.kt @@ -39,7 +39,7 @@ class PolygonRenderer @Inject constructor(resources: Resources) : geometry: Polygon, style: Feature.Style, selected: Boolean, - visible: Boolean + visible: Boolean, ): MapsPolygon { val strokeScale = if (selected) 2f else 1f val options = PolygonOptions() diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/ImageEditor.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/ImageEditor.kt index 40c75a1903..b98f6fe726 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/ImageEditor.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/ImageEditor.kt @@ -29,7 +29,7 @@ object ImageEditor { */ fun setTransparentIf( sourceImage: ByteArray, - isTransparent: (bitmap: Bitmap, x: Int, y: Int) -> Boolean + isTransparent: (bitmap: Bitmap, x: Int, y: Int) -> Boolean, ): ByteArray { val opts = BitmapFactory.Options() opts.inMutable = true diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogClient.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogClient.kt index 0ec877efa9..ef3a4a5d64 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogClient.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogClient.kt @@ -28,6 +28,7 @@ import timber.log.Timber /** Aliases a relative path or a URL to a MOG. */ typealias MogPathOrUrl = String + /** Aliases a fetch-able URL to a MOG. */ typealias MogUrl = String diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogImageMetadata.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogImageMetadata.kt index d3af392fac..e7e042b8fe 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogImageMetadata.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogImageMetadata.kt @@ -26,7 +26,7 @@ data class MogImageMetadata( val imageWidth: Int, val imageLength: Int, val jpegTables: ByteArray, - val noDataValue: Int? = null + val noDataValue: Int? = null, ) { private val tileCountX = imageWidth / tileWidth private val tileCountY = imageLength / tileLength @@ -88,7 +88,7 @@ data class MogImageMetadata( (tiffTagToValue[TiffTag.JPEGTables] as? List<*>) ?.map { (it as Int).toByte() } ?.toByteArray() ?: byteArrayOf(), - (tiffTagToValue[TiffTag.GdalNodata] as? String)?.toIntOrNull() + (tiffTagToValue[TiffTag.GdalNodata] as? String)?.toIntOrNull(), ) } } diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogMetadata.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogMetadata.kt index 32a630b408..0007f6e9f1 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogMetadata.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogMetadata.kt @@ -37,7 +37,7 @@ data class MogMetadata( val sourceUrl: String, /** The web mercator tile coordinates corresponding to the bounding box of the source MOG. */ val bounds: TileCoordinates, - val imageMetadata: List + val imageMetadata: List, ) { private val imageMetadataByZoom = imageMetadata.associateBy { it.zoom } diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogMetadataReader.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogMetadataReader.kt index 5aa7587917..dc7e14e2a6 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogMetadataReader.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogMetadataReader.kt @@ -24,6 +24,7 @@ import java.nio.charset.StandardCharsets import java.util.* private const val NULL_CHAR = 0.toChar() + // TODO(#1596): Add unit tests. /** Instances of this class are not thread-safe. */ class MogMetadataReader(private val seekable: SeekableInputStream) { diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogSource.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogSource.kt index a204be4cc7..fd896f09a5 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogSource.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogSource.kt @@ -32,10 +32,7 @@ package com.google.android.ground.ui.map.gms.mog * val region = MogSource(8..14, "/offline-imagery/default/{z}/{x}/{y}.tif") * ``` */ -data class MogSource( - val zoomRange: IntRange, - val pathTemplate: String, -) { +data class MogSource(val zoomRange: IntRange, val pathTemplate: String) { /** Returns the bounds of the MOG containing the tile with the specified coordinates. */ fun getMogBoundsForTile(tileCoordinates: TileCoordinates): TileCoordinates { check(zoomRange.contains(tileCoordinates.zoom)) { diff --git a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogTileMetadata.kt b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogTileMetadata.kt index ae0014da33..c958ca32b4 100644 --- a/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogTileMetadata.kt +++ b/ground/src/main/java/com/google/android/ground/ui/map/gms/mog/MogTileMetadata.kt @@ -23,7 +23,7 @@ data class MogTileMetadata( val height: Int, val jpegTables: ByteArray, val byteRange: LongRange, - val noDataValue: Int? = null + val noDataValue: Int? = null, ) { // Default [equals] and [hashCode] behavior doesn't take array members into account. Defend // against accidental usage by throwing exception if called. diff --git a/ground/src/main/java/com/google/android/ground/ui/offlineareas/OfflineAreaListItemViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/offlineareas/OfflineAreaListItemViewModel.kt index f6f94616e7..096da8f231 100644 --- a/ground/src/main/java/com/google/android/ground/ui/offlineareas/OfflineAreaListItemViewModel.kt +++ b/ground/src/main/java/com/google/android/ground/ui/offlineareas/OfflineAreaListItemViewModel.kt @@ -22,7 +22,7 @@ import com.google.android.ground.ui.common.Navigator class OfflineAreaListItemViewModel( private val navigator: Navigator, val area: OfflineArea, - val sizeOnDisk: String + val sizeOnDisk: String, ) { val areaName = area.name diff --git a/ground/src/main/java/com/google/android/ground/ui/offlineareas/OfflineAreasFragment.kt b/ground/src/main/java/com/google/android/ground/ui/offlineareas/OfflineAreasFragment.kt index f9da4c1134..efcdff090e 100644 --- a/ground/src/main/java/com/google/android/ground/ui/offlineareas/OfflineAreasFragment.kt +++ b/ground/src/main/java/com/google/android/ground/ui/offlineareas/OfflineAreasFragment.kt @@ -45,7 +45,7 @@ class OfflineAreasFragment : AbstractFragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View { super.onCreateView(inflater, container, savedInstanceState) val binding = OfflineAreasFragBinding.inflate(inflater, container, false) diff --git a/ground/src/main/java/com/google/android/ground/ui/offlineareas/viewer/OfflineAreaViewerViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/offlineareas/viewer/OfflineAreaViewerViewModel.kt index 93bafe6703..196f1183df 100644 --- a/ground/src/main/java/com/google/android/ground/ui/offlineareas/viewer/OfflineAreaViewerViewModel.kt +++ b/ground/src/main/java/com/google/android/ground/ui/offlineareas/viewer/OfflineAreaViewerViewModel.kt @@ -53,7 +53,7 @@ constructor( permissionsManager: PermissionsManager, surveyRepository: SurveyRepository, locationOfInterestRepository: LocationOfInterestRepository, - @IoDispatcher private val ioDispatcher: CoroutineDispatcher + @IoDispatcher private val ioDispatcher: CoroutineDispatcher, ) : BaseMapViewModel( locationManager, @@ -62,7 +62,7 @@ constructor( offlineAreaRepository, permissionsManager, surveyRepository, - locationOfInterestRepository + locationOfInterestRepository, ) { /** Returns the offline area associated with this view model. */ @@ -78,7 +78,7 @@ constructor( super.mapConfig.copy( showOfflineImagery = true, overrideMapType = MapType.TERRAIN, - allowGestures = false + allowGestures = false, ) /** Initialize the view model with the given arguments. */ diff --git a/ground/src/main/java/com/google/android/ground/ui/signin/SignInFragment.kt b/ground/src/main/java/com/google/android/ground/ui/signin/SignInFragment.kt index 4fdfe70b9b..9841d4dd85 100644 --- a/ground/src/main/java/com/google/android/ground/ui/signin/SignInFragment.kt +++ b/ground/src/main/java/com/google/android/ground/ui/signin/SignInFragment.kt @@ -44,7 +44,7 @@ class SignInFragment : AbstractFragment(), BackPressListener { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View { binding = SignInFragBinding.inflate(inflater, container, false) binding.viewModel = viewModel @@ -68,7 +68,7 @@ class SignInFragment : AbstractFragment(), BackPressListener { Snackbar.make( requireView(), getString(R.string.network_error_when_signing_in), - Snackbar.LENGTH_LONG + Snackbar.LENGTH_LONG, ) .show() } diff --git a/ground/src/main/java/com/google/android/ground/ui/signin/SignInViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/signin/SignInViewModel.kt index ced07fd04a..04f4350a3c 100644 --- a/ground/src/main/java/com/google/android/ground/ui/signin/SignInViewModel.kt +++ b/ground/src/main/java/com/google/android/ground/ui/signin/SignInViewModel.kt @@ -34,7 +34,7 @@ class SignInViewModel @Inject internal constructor( private val networkManager: NetworkManager, - private val userRepository: UserRepository + private val userRepository: UserRepository, ) : AbstractViewModel() { @OptIn(ExperimentalCoroutinesApi::class) diff --git a/ground/src/main/java/com/google/android/ground/ui/startup/StartupViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/startup/StartupViewModel.kt index 75f7c4e9fc..cff41bdee6 100644 --- a/ground/src/main/java/com/google/android/ground/ui/startup/StartupViewModel.kt +++ b/ground/src/main/java/com/google/android/ground/ui/startup/StartupViewModel.kt @@ -24,7 +24,7 @@ class StartupViewModel @Inject internal constructor( private val googleApiManager: GoogleApiManager, - private val userRepository: UserRepository + private val userRepository: UserRepository, ) : AbstractViewModel() { /** Checks & installs Google Play Services and initializes the login flow. */ diff --git a/ground/src/main/java/com/google/android/ground/ui/surveyselector/SurveyListAdapter.kt b/ground/src/main/java/com/google/android/ground/ui/surveyselector/SurveyListAdapter.kt index 5508da90b4..5e73076c0f 100644 --- a/ground/src/main/java/com/google/android/ground/ui/surveyselector/SurveyListAdapter.kt +++ b/ground/src/main/java/com/google/android/ground/ui/surveyselector/SurveyListAdapter.kt @@ -29,7 +29,7 @@ import com.google.android.ground.ui.surveyselector.SurveyListAdapter.ViewHolder */ class SurveyListAdapter( private val viewModel: SurveySelectorViewModel, - private val fragment: SurveySelectorFragment + private val fragment: SurveySelectorFragment, ) : RecyclerView.Adapter() { private val surveys: MutableList = mutableListOf() diff --git a/ground/src/main/java/com/google/android/ground/ui/surveyselector/SurveySelectorViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/surveyselector/SurveySelectorViewModel.kt index 53caa6fcc5..85ca583f75 100644 --- a/ground/src/main/java/com/google/android/ground/ui/surveyselector/SurveySelectorViewModel.kt +++ b/ground/src/main/java/com/google/android/ground/ui/surveyselector/SurveySelectorViewModel.kt @@ -52,7 +52,7 @@ internal constructor( private val activateSurveyUseCase: ActivateSurveyUseCase, @ApplicationScope private val externalScope: CoroutineScope, @IoDispatcher private val ioDispatcher: CoroutineDispatcher, - private val userRepository: UserRepository + private val userRepository: UserRepository, ) : AbstractViewModel() { // TODO(#2081): Expose non-mutable state flow. diff --git a/ground/src/main/java/com/google/android/ground/ui/syncstatus/SyncStatusFragment.kt b/ground/src/main/java/com/google/android/ground/ui/syncstatus/SyncStatusFragment.kt index b6c5d57c89..b230447078 100644 --- a/ground/src/main/java/com/google/android/ground/ui/syncstatus/SyncStatusFragment.kt +++ b/ground/src/main/java/com/google/android/ground/ui/syncstatus/SyncStatusFragment.kt @@ -41,7 +41,7 @@ class SyncStatusFragment : AbstractFragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View { super.onCreateView(inflater, container, savedInstanceState) val binding = SyncStatusFragBinding.inflate(inflater, container, false) diff --git a/ground/src/main/java/com/google/android/ground/ui/syncstatus/SyncStatusListAdapter.kt b/ground/src/main/java/com/google/android/ground/ui/syncstatus/SyncStatusListAdapter.kt index 6ace95c9a7..15d0ab3c05 100644 --- a/ground/src/main/java/com/google/android/ground/ui/syncstatus/SyncStatusListAdapter.kt +++ b/ground/src/main/java/com/google/android/ground/ui/syncstatus/SyncStatusListAdapter.kt @@ -85,6 +85,6 @@ internal class SyncStatusListAdapter(private val context: Context) : null, null, drawable, - null + null, ) } diff --git a/ground/src/main/java/com/google/android/ground/ui/tos/TermsOfServiceViewModel.kt b/ground/src/main/java/com/google/android/ground/ui/tos/TermsOfServiceViewModel.kt index 0ca64a4142..8a74bacca8 100644 --- a/ground/src/main/java/com/google/android/ground/ui/tos/TermsOfServiceViewModel.kt +++ b/ground/src/main/java/com/google/android/ground/ui/tos/TermsOfServiceViewModel.kt @@ -28,7 +28,7 @@ class TermsOfServiceViewModel @Inject constructor( private val navigator: Navigator, - private val termsOfServiceRepository: TermsOfServiceRepository + private val termsOfServiceRepository: TermsOfServiceRepository, ) : AbstractViewModel() { val agreeCheckboxChecked: MutableLiveData = MutableLiveData() diff --git a/ground/src/main/java/com/google/android/ground/ui/util/BitmapUtil.kt b/ground/src/main/java/com/google/android/ground/ui/util/BitmapUtil.kt index f02c748a31..40d38a4b7e 100644 --- a/ground/src/main/java/com/google/android/ground/ui/util/BitmapUtil.kt +++ b/ground/src/main/java/com/google/android/ground/ui/util/BitmapUtil.kt @@ -40,7 +40,7 @@ class BitmapUtil @Inject internal constructor(@ApplicationContext private val co Bitmap.createBitmap( vectorDrawable.intrinsicWidth, vectorDrawable.intrinsicHeight, - Bitmap.Config.ARGB_8888 + Bitmap.Config.ARGB_8888, ) val canvas = Canvas(bitmap) vectorDrawable.draw(canvas) diff --git a/ground/src/test/java/com/google/android/ground/HiltExt.kt b/ground/src/test/java/com/google/android/ground/HiltExt.kt index 7a16d48969..f6f8c9d082 100644 --- a/ground/src/test/java/com/google/android/ground/HiltExt.kt +++ b/ground/src/test/java/com/google/android/ground/HiltExt.kt @@ -51,7 +51,7 @@ inline fun launchFragmentWithNavController( @StyleRes themeResId: Int = R.style.FragmentScenarioEmptyFragmentActivityTheme, destId: Int, crossinline preTransactionAction: Fragment.() -> Unit = {}, - crossinline postTransactionAction: Fragment.() -> Unit = {} + crossinline postTransactionAction: Fragment.() -> Unit = {}, ): ActivityScenario = hiltActivityScenario(themeResId).launchFragment( fragmentArgs, @@ -69,20 +69,20 @@ inline fun launchFragmentWithNavController( Navigation.setViewNavController(requireView(), navController) } } - } + }, ) { this.postTransactionAction() } /** Instantiates a new activity scenario with Hilt support. */ fun hiltActivityScenario( - @StyleRes themeResId: Int = R.style.FragmentScenarioEmptyFragmentActivityTheme, + @StyleRes themeResId: Int = R.style.FragmentScenarioEmptyFragmentActivityTheme ): ActivityScenario { val startActivityIntent = Intent.makeMainActivity(ComponentName(getApplicationContext(), HiltTestActivity::class.java)) .putExtra( "androidx.fragment.app.testing.FragmentScenario.EmptyFragmentActivity.THEME_EXTRAS_BUNDLE_KEY", - themeResId + themeResId, ) return ActivityScenario.launch(startActivityIntent) @@ -95,13 +95,13 @@ fun hiltActivityScenario( inline fun ActivityScenario.launchFragment( fragmentArgs: Bundle? = null, crossinline preTransactionAction: Fragment.() -> Unit = {}, - crossinline postTransactionAction: Fragment.() -> Unit = {} + crossinline postTransactionAction: Fragment.() -> Unit = {}, ): ActivityScenario = this.onActivity { activity -> val fragment: Fragment = activity.supportFragmentManager.fragmentFactory.instantiate( Preconditions.checkNotNull(T::class.java.classLoader), - T::class.java.name + T::class.java.name, ) fragment.arguments = fragmentArgs diff --git a/ground/src/test/java/com/google/android/ground/MainViewModelTest.kt b/ground/src/test/java/com/google/android/ground/MainViewModelTest.kt index 33cf008aaf..539980f705 100644 --- a/ground/src/test/java/com/google/android/ground/MainViewModelTest.kt +++ b/ground/src/test/java/com/google/android/ground/MainViewModelTest.kt @@ -128,7 +128,7 @@ class MainViewModelTest : BaseHiltTest() { testNavigateTo( navigator.getNavigateRequests(), - SignInFragmentDirections.showSurveySelectorScreen(true) + SignInFragmentDirections.showSurveySelectorScreen(true), ) { fakeAuthenticationManager.signIn() } @@ -145,13 +145,13 @@ class MainViewModelTest : BaseHiltTest() { Result.failure( FirebaseFirestoreException( "permission denied", - FirebaseFirestoreException.Code.PERMISSION_DENIED + FirebaseFirestoreException.Code.PERMISSION_DENIED, ) ) testNavigateTo( navigator.getNavigateRequests(), - SignInFragmentDirections.showPermissionDeniedDialogFragment() + SignInFragmentDirections.showPermissionDeniedDialogFragment(), ) { fakeAuthenticationManager.signIn() } diff --git a/ground/src/test/java/com/google/android/ground/NavigationTestHelper.kt b/ground/src/test/java/com/google/android/ground/NavigationTestHelper.kt index b8273e0906..8691057257 100644 --- a/ground/src/test/java/com/google/android/ground/NavigationTestHelper.kt +++ b/ground/src/test/java/com/google/android/ground/NavigationTestHelper.kt @@ -37,19 +37,19 @@ import kotlinx.coroutines.test.advanceUntilIdle suspend fun TestScope.testNavigateTo( testSharedFlow: SharedFlow, expectedNavDirections: NavDirections, - runOnSubscription: () -> Unit + runOnSubscription: () -> Unit, ) { testNavigateTo( testSharedFlow, { navDirections -> assertThat(navDirections).isEqualTo(expectedNavDirections) }, - runOnSubscription + runOnSubscription, ) } suspend fun TestScope.testNavigateTo( testSharedFlow: SharedFlow, validate: (NavDirections) -> Unit, - runOnSubscription: () -> Unit + runOnSubscription: () -> Unit, ) { testNavigate( testSharedFlow, @@ -57,7 +57,7 @@ suspend fun TestScope.testNavigateTo( assertThat(navigationRequest).isInstanceOf(NavigateTo::class.java) validate((navigationRequest as NavigateTo).directions) }, - runOnSubscription + runOnSubscription, ) } @@ -65,7 +65,7 @@ suspend fun TestScope.testNavigateTo( suspend fun TestScope.testNavigate( testSharedFlow: SharedFlow, validate: (NavigationRequest) -> Unit, - runOnSubscription: () -> Unit + runOnSubscription: () -> Unit, ) { testSharedFlow .onSubscription { @@ -78,7 +78,7 @@ suspend fun TestScope.testNavigate( @OptIn(ExperimentalCoroutinesApi::class) suspend fun TestScope.testNoNavigation( testSharedFlow: SharedFlow, - runOnSubscription: () -> Unit + runOnSubscription: () -> Unit, ) { testSharedFlow .onSubscription { @@ -95,7 +95,7 @@ suspend fun TestScope.testNoNavigation( suspend fun TestScope.testMaybeNavigateTo( testSharedFlow: SharedFlow, expectedNavDirections: NavDirections?, - runOnSubscription: () -> Unit + runOnSubscription: () -> Unit, ) { if (expectedNavDirections == null) { testNoNavigation(testSharedFlow, runOnSubscription) diff --git a/ground/src/test/java/com/google/android/ground/TestCoroutineDispatchersModule.kt b/ground/src/test/java/com/google/android/ground/TestCoroutineDispatchersModule.kt index 7b76ec8ac6..2f8115c926 100644 --- a/ground/src/test/java/com/google/android/ground/TestCoroutineDispatchersModule.kt +++ b/ground/src/test/java/com/google/android/ground/TestCoroutineDispatchersModule.kt @@ -31,7 +31,7 @@ import kotlinx.coroutines.test.TestDispatcher @Module @TestInstallIn( components = [SingletonComponent::class], - replaces = [CoroutineDispatchersModule::class] + replaces = [CoroutineDispatchersModule::class], ) object TestCoroutineDispatchersModule { private val testDispatcher = StandardTestDispatcher() diff --git a/ground/src/test/java/com/google/android/ground/model/SurveyTest.kt b/ground/src/test/java/com/google/android/ground/model/SurveyTest.kt index 109a35aa7d..607318888b 100644 --- a/ground/src/test/java/com/google/android/ground/model/SurveyTest.kt +++ b/ground/src/test/java/com/google/android/ground/model/SurveyTest.kt @@ -39,8 +39,8 @@ class SurveyTest { Pair(viewerEmail, Role.VIEWER.toString()), Pair(dataCollectorEmail, Role.DATA_COLLECTOR.toString()), Pair(surveyOrganizerEmail, Role.SURVEY_ORGANIZER.toString()), - Pair(badRoleEmail, "UNKNOWN_ROLE") - ) + Pair(badRoleEmail, "UNKNOWN_ROLE"), + ), ) @Test diff --git a/ground/src/test/java/com/google/android/ground/model/geometry/GeometryTest.kt b/ground/src/test/java/com/google/android/ground/model/geometry/GeometryTest.kt index 7a3e5c30c6..b85edf47c8 100644 --- a/ground/src/test/java/com/google/android/ground/model/geometry/GeometryTest.kt +++ b/ground/src/test/java/com/google/android/ground/model/geometry/GeometryTest.kt @@ -31,7 +31,7 @@ class GeometryTest { -89.63659134 to 41.88937530, -89.62886658 to 41.88956698, -89.62800827 to 41.89544507, - -89.63410225 to 41.89729784 + -89.63410225 to 41.89729784, ) private val path2 = arrayOf( @@ -39,7 +39,7 @@ class GeometryTest { -89.63118400 to 41.89090878, -89.63066902 to 41.89397560, -89.63358726 to 41.89480618, - -89.63453141 to 41.89193106 + -89.63453141 to 41.89193106, ) private val path3 = arrayOf( @@ -47,7 +47,7 @@ class GeometryTest { -89.61479034 to 41.89832003, -89.61719360 to 41.89455062, -89.61521950 to 41.89154771, - -89.61006966 to 41.89333669 + -89.61006966 to 41.89333669, ) private val path4 = arrayOf( @@ -55,7 +55,7 @@ class GeometryTest { -89.61290207 to 41.89429505, -89.61418953 to 41.89538118, -89.61513367 to 41.89416727, - -89.61393204 to 41.89320891 + -89.61393204 to 41.89320891, ) @Test diff --git a/ground/src/test/java/com/google/android/ground/model/task/ConditionTest.kt b/ground/src/test/java/com/google/android/ground/model/task/ConditionTest.kt index 106dda37ff..9d4787aeaa 100644 --- a/ground/src/test/java/com/google/android/ground/model/task/ConditionTest.kt +++ b/ground/src/test/java/com/google/android/ground/model/task/ConditionTest.kt @@ -39,13 +39,13 @@ val TASK_A_EXPRESSION = Expression( expressionType = Expression.ExpressionType.ANY_OF_SELECTED, taskId = TASK_A_ID, - optionIds = setOf(TASK_A_OPTION_X) + optionIds = setOf(TASK_A_OPTION_X), ) val Task_B_EXPRESSION = Expression( expressionType = Expression.ExpressionType.ANY_OF_SELECTED, taskId = TASK_B_ID, - optionIds = setOf(TASK_B_OPTION_X) + optionIds = setOf(TASK_B_OPTION_X), ) fun makeValue(vararg selectedOptions: String) = @@ -57,7 +57,7 @@ class ConditionTest { val condition = Condition( matchType = Condition.MatchType.MATCH_ALL, - listOf(TASK_A_EXPRESSION, Task_B_EXPRESSION) + listOf(TASK_A_EXPRESSION, Task_B_EXPRESSION), ) listOf( // Expressions evaluate to [true, true]. @@ -81,7 +81,7 @@ class ConditionTest { val condition = Condition( matchType = Condition.MatchType.MATCH_ALL, - listOf(TASK_A_EXPRESSION, Task_B_EXPRESSION) + listOf(TASK_A_EXPRESSION, Task_B_EXPRESSION), ) listOf( // Expressions evaluate to [true, true]. @@ -105,7 +105,7 @@ class ConditionTest { val condition = Condition( matchType = Condition.MatchType.MATCH_ONE, - listOf(TASK_A_EXPRESSION, Task_B_EXPRESSION) + listOf(TASK_A_EXPRESSION, Task_B_EXPRESSION), ) listOf( // Expressions evaluate to [true, true]. @@ -129,7 +129,7 @@ class ConditionTest { val condition = Condition( matchType = Condition.MatchType.UNKNOWN, - listOf(TASK_A_EXPRESSION, Task_B_EXPRESSION) + listOf(TASK_A_EXPRESSION, Task_B_EXPRESSION), ) assertFailsWith { condition.fulfilledBy(mapOf(TASK_A_ID to makeValue(TASK_A_OPTION_X))) @@ -142,7 +142,7 @@ class ConditionTest { Expression( expressionType = Expression.ExpressionType.ANY_OF_SELECTED, taskId = TASK_A_ID, - optionIds = setOf(TASK_A_OPTION_X, TASK_A_OPTION_Y) + optionIds = setOf(TASK_A_OPTION_X, TASK_A_OPTION_Y), ) listOf( true to (TASK_A_ID to makeValue(TASK_A_OPTION_X)), @@ -160,7 +160,7 @@ class ConditionTest { Expression( expressionType = Expression.ExpressionType.ALL_OF_SELECTED, taskId = TASK_A_ID, - optionIds = setOf(TASK_A_OPTION_X, TASK_A_OPTION_Y) + optionIds = setOf(TASK_A_OPTION_X, TASK_A_OPTION_Y), ) listOf( false to (TASK_A_ID to makeValue(TASK_A_OPTION_X)), @@ -178,7 +178,7 @@ class ConditionTest { Expression( expressionType = Expression.ExpressionType.ONE_OF_SELECTED, taskId = TASK_A_ID, - optionIds = setOf(TASK_A_OPTION_X, TASK_A_OPTION_Y) + optionIds = setOf(TASK_A_OPTION_X, TASK_A_OPTION_Y), ) listOf( true to (TASK_A_ID to makeValue(TASK_A_OPTION_X)), @@ -196,7 +196,7 @@ class ConditionTest { Expression( expressionType = Expression.ExpressionType.UNKNOWN, taskId = TASK_A_ID, - optionIds = setOf(TASK_A_OPTION_X, TASK_A_OPTION_Y) + optionIds = setOf(TASK_A_OPTION_X, TASK_A_OPTION_Y), ) assertFailsWith { expression.fulfilledBy(mapOf(TASK_A_ID to makeValue(TASK_A_OPTION_X))) diff --git a/ground/src/test/java/com/google/android/ground/persistence/local/LocalDataStoreTests.kt b/ground/src/test/java/com/google/android/ground/persistence/local/LocalDataStoreTests.kt index 9ed096fdb3..cfe0a03278 100644 --- a/ground/src/test/java/com/google/android/ground/persistence/local/LocalDataStoreTests.kt +++ b/ground/src/test/java/com/google/android/ground/persistence/local/LocalDataStoreTests.kt @@ -217,7 +217,7 @@ class LocalDataStoreTests : BaseHiltTest() { .getSubmissionMutationsByLoiIdFlow( TEST_SURVEY, TEST_LOI_MUTATION.locationOfInterestId, - MutationEntitySyncStatus.PENDING + MutationEntitySyncStatus.PENDING, ) .test { assertThat(expectMostRecentItem()).isEqualTo(listOf(TEST_SUBMISSION_MUTATION)) } val loi = localLoiStore.getLocationOfInterest(TEST_SURVEY, FakeData.LOI_ID)!! @@ -230,7 +230,7 @@ class LocalDataStoreTests : BaseHiltTest() { ValueDelta( "task id", Task.Type.TEXT, - TextTaskData.fromString("value for the really new task") + TextTaskData.fromString("value for the really new task"), ) ) val mutation = @@ -242,7 +242,7 @@ class LocalDataStoreTests : BaseHiltTest() { .getSubmissionMutationsByLoiIdFlow( TEST_SURVEY, TEST_LOI_MUTATION.locationOfInterestId, - MutationEntitySyncStatus.PENDING + MutationEntitySyncStatus.PENDING, ) .test { assertThat(expectMostRecentItem()).isEqualTo(listOf(TEST_SUBMISSION_MUTATION, mutation)) @@ -386,7 +386,7 @@ class LocalDataStoreTests : BaseHiltTest() { tileSources = listOf( TileSource(url = "dummy URL", type = TileSource.Type.TILED_WEB_MAP), - TileSource(url = "other dummy URL", type = TileSource.Type.TILED_WEB_MAP) + TileSource(url = "other dummy URL", type = TileSource.Type.TILED_WEB_MAP), ) ) private val TEST_POINT = Point(Coordinates(110.0, -23.1)) @@ -398,7 +398,7 @@ class LocalDataStoreTests : BaseHiltTest() { Coordinates(49.872919, 8.651628), Coordinates(49.873164, 8.653515), Coordinates(49.874343, 8.653038), - Coordinates(49.874502, 8.655993) + Coordinates(49.874502, 8.655993), ) private val TEST_POLYGON_2 = listOf( @@ -407,7 +407,7 @@ class LocalDataStoreTests : BaseHiltTest() { Coordinates(49.864664, 8.650387), Coordinates(49.863102, 8.650445), Coordinates(49.863051, 8.647306), - Coordinates(49.865374, 8.646920) + Coordinates(49.865374, 8.646920), ) private val TEST_LOI_MUTATION = FakeData.newLoiMutation(TEST_POINT) private val TEST_POLYGON_LOI_MUTATION = FakeData.newAoiMutation(TEST_POLYGON_1) @@ -422,7 +422,7 @@ class LocalDataStoreTests : BaseHiltTest() { syncStatus = SyncStatus.PENDING, surveyId = FakeData.SURVEY_ID, locationOfInterestId = FakeData.LOI_ID, - userId = FakeData.USER_ID + userId = FakeData.USER_ID, ) private val TEST_OFFLINE_AREA = OfflineArea("id_1", OfflineArea.State.PENDING, Bounds(0.0, 0.0, 0.0, 0.0), "Test Area", 0..14) @@ -436,7 +436,7 @@ class LocalDataStoreTests : BaseHiltTest() { assertThat(mutation.userId).isEqualTo(submission.created.user.id) MatcherAssert.assertThat( SubmissionData().copyWithDeltas(mutation.deltas), - Matchers.samePropertyValuesAs(submission.data) + Matchers.samePropertyValuesAs(submission.data), ) } } diff --git a/ground/src/test/java/com/google/android/ground/persistence/local/room/converter/ValueJsonConverterTest.kt b/ground/src/test/java/com/google/android/ground/persistence/local/room/converter/ValueJsonConverterTest.kt index 5edebcf12c..824fd32aed 100644 --- a/ground/src/test/java/com/google/android/ground/persistence/local/room/converter/ValueJsonConverterTest.kt +++ b/ground/src/test/java/com/google/android/ground/persistence/local/room/converter/ValueJsonConverterTest.kt @@ -46,7 +46,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner class ValueJsonConverterTest( private val task: Task, private val taskData: TaskData, - private val input: Any + private val input: Any, ) : BaseHiltTest() { @Test @@ -75,7 +75,7 @@ class ValueJsonConverterTest( private val singleChoiceResponse = MultipleChoiceTaskData.fromList( MultipleChoice(multipleChoiceOptions, MultipleChoice.Cardinality.SELECT_ONE), - listOf("option id 1") + listOf("option id 1"), ) private val singleChoiceResponseJson = JSONArray().apply { put("option id 1") } @@ -83,7 +83,7 @@ class ValueJsonConverterTest( private val multipleChoiceTaskData = MultipleChoiceTaskData.fromList( MultipleChoice(multipleChoiceOptions, MultipleChoice.Cardinality.SELECT_MULTIPLE), - listOf("option id 1", "option id 2") + listOf("option id 1", "option id 2"), ) private val multipleChoiceResponseJson = @@ -105,7 +105,7 @@ class ValueJsonConverterTest( Coordinates(10.0, 20.0), Coordinates(20.0, 30.0), Coordinates(30.0, 40.0), - Coordinates(10.0, 20.0) + Coordinates(10.0, 20.0), ) ) ) @@ -122,34 +122,34 @@ class ValueJsonConverterTest( arrayOf( FakeData.newTask(type = Task.Type.TEXT), TextTaskData.fromString("sample text"), - "sample text" + "sample text", ), arrayOf( FakeData.newTask(type = Task.Type.MULTIPLE_CHOICE), singleChoiceResponse, - singleChoiceResponseJson + singleChoiceResponseJson, ), arrayOf( FakeData.newTask(type = Task.Type.MULTIPLE_CHOICE), multipleChoiceTaskData, - multipleChoiceResponseJson + multipleChoiceResponseJson, ), arrayOf( FakeData.newTask(type = Task.Type.NUMBER), NumberTaskData.fromNumber("12345.0"), - 12345.0 + 12345.0, ), arrayOf(FakeData.newTask(type = Task.Type.DATE), DateTaskData.fromDate(DATE), DATE_STRING), arrayOf(FakeData.newTask(type = Task.Type.TIME), TimeTaskData.fromDate(DATE), DATE_STRING), arrayOf( FakeData.newTask(type = Task.Type.DROP_PIN), dropPinTaskResponse, - dropPinGeometryTaskResponseString + dropPinGeometryTaskResponseString, ), arrayOf( FakeData.newTask(type = Task.Type.DRAW_AREA), drawAreaTaskResponse, - polygonGeometryTaskResponseString + polygonGeometryTaskResponseString, ), ) } diff --git a/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/ConditionConverterTest.kt b/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/ConditionConverterTest.kt index a06c0d15eb..5960942029 100644 --- a/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/ConditionConverterTest.kt +++ b/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/ConditionConverterTest.kt @@ -36,7 +36,7 @@ class ConditionConverterTest { listOf( "MATCH_ANY" to Condition.MatchType.MATCH_ANY, "MATCH_ALL" to Condition.MatchType.MATCH_ALL, - "MATCH_ONE" to Condition.MatchType.MATCH_ONE + "MATCH_ONE" to Condition.MatchType.MATCH_ONE, ) .forEach { assertThat(ConditionNestedObject(matchType = it.first).toCondition()?.matchType) @@ -63,9 +63,9 @@ class ConditionConverterTest { ExpressionNestedObject( expressionType = "ANY_OF_SELECTED", taskId = TASK_ID, - optionIds = TEST_OPTION_IDS + optionIds = TEST_OPTION_IDS, ) - ) + ), ) .toCondition() ?.expressions @@ -90,7 +90,7 @@ class ConditionConverterTest { taskId = TASK_ID, optionIds = TEST_OPTION_IDS, ) - ) + ), ) } listOf( @@ -116,7 +116,7 @@ class ConditionConverterTest { ExpressionNestedObject(expressionType = "TWO_OF_SELECTED", taskId = TASK_ID), // Case sensitive. ExpressionNestedObject(expressionType = "any_of_selected", taskId = TASK_ID), - ) + ), ) .toCondition() ?.expressions @@ -141,7 +141,7 @@ class ConditionConverterTest { expressionType = "ANY_OF_SELECTED", optionIds = TEST_OPTION_IDS, ), - ) + ), ) .toCondition() ?.expressions @@ -163,11 +163,8 @@ class ConditionConverterTest { optionIds = TEST_OPTION_IDS, ), // Missing option IDs. - ExpressionNestedObject( - expressionType = "ANY_OF_SELECTED", - taskId = TASK_ID, - ), - ) + ExpressionNestedObject(expressionType = "ANY_OF_SELECTED", taskId = TASK_ID), + ), ) .toCondition() ?.expressions diff --git a/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/GeometryConverterTest.kt b/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/GeometryConverterTest.kt index 3104d96f14..afeff4db3a 100644 --- a/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/GeometryConverterTest.kt +++ b/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/GeometryConverterTest.kt @@ -38,7 +38,7 @@ class GeometryConverterTest { -89.63659134 to 41.88937530, -89.62886658 to 41.88956698, -89.62800827 to 41.89544507, - -89.63410225 to 41.89729784 + -89.63410225 to 41.89729784, ) private val path2 = arrayOf( @@ -46,7 +46,7 @@ class GeometryConverterTest { -89.63118400 to 41.89090878, -89.63066902 to 41.89397560, -89.63358726 to 41.89480618, - -89.63453141 to 41.89193106 + -89.63453141 to 41.89193106, ) private val path3 = arrayOf( @@ -54,7 +54,7 @@ class GeometryConverterTest { -89.61479034 to 41.89832003, -89.61719360 to 41.89455062, -89.61521950 to 41.89154771, - -89.61006966 to 41.89333669 + -89.61006966 to 41.89333669, ) private val path4 = arrayOf( @@ -62,14 +62,14 @@ class GeometryConverterTest { -89.61290207 to 41.89429505, -89.61418953 to 41.89538118, -89.61513367 to 41.89416727, - -89.61393204 to 41.89320891 + -89.61393204 to 41.89320891, ) @Test fun toFirestoreMap_point() { assertIsSuccessWith( mapOf("type" to "Point", "coordinates" to GeoPoint(x, y)), - GeometryConverter.toFirestoreMap(point(x, y)) + GeometryConverter.toFirestoreMap(point(x, y)), ) } @@ -78,9 +78,9 @@ class GeometryConverterTest { assertIsSuccessWith( mapOf( "type" to "Polygon", - "coordinates" to mapOf("0" to indexedGeoPointMap(path1), "1" to indexedGeoPointMap(path2)) + "coordinates" to mapOf("0" to indexedGeoPointMap(path1), "1" to indexedGeoPointMap(path2)), ), - GeometryConverter.toFirestoreMap(polygon(path1, path2)) + GeometryConverter.toFirestoreMap(polygon(path1, path2)), ) } @@ -92,10 +92,10 @@ class GeometryConverterTest { "coordinates" to mapOf( "0" to mapOf("0" to indexedGeoPointMap(path1), "1" to indexedGeoPointMap(path2)), - "1" to mapOf("0" to indexedGeoPointMap(path3), "1" to indexedGeoPointMap(path4)) - ) + "1" to mapOf("0" to indexedGeoPointMap(path3), "1" to indexedGeoPointMap(path4)), + ), ), - GeometryConverter.toFirestoreMap(multiPolygon(polygon(path1, path2), polygon(path3, path4))) + GeometryConverter.toFirestoreMap(multiPolygon(polygon(path1, path2), polygon(path3, path4))), ) } @@ -103,7 +103,7 @@ class GeometryConverterTest { fun fromFirestoreMap_point() { assertIsSuccessWith( point(x, y), - GeometryConverter.fromFirestoreMap(mapOf("type" to "Point", "coordinates" to GeoPoint(x, y))) + GeometryConverter.fromFirestoreMap(mapOf("type" to "Point", "coordinates" to GeoPoint(x, y))), ) } @@ -145,9 +145,9 @@ class GeometryConverterTest { GeometryConverter.fromFirestoreMap( mapOf( "type" to "Polygon", - "coordinates" to mapOf("0" to indexedGeoPointMap(path1), "1" to indexedGeoPointMap(path2)) + "coordinates" to mapOf("0" to indexedGeoPointMap(path1), "1" to indexedGeoPointMap(path2)), ) - ) + ), ) } @@ -157,7 +157,7 @@ class GeometryConverterTest { GeometryConverter.fromFirestoreMap( mapOf( "type" to "Polygon", - "coordinates" to mapOf("0" to indexedGeoPointMap(path1), "2" to indexedGeoPointMap(path2)) + "coordinates" to mapOf("0" to indexedGeoPointMap(path1), "2" to indexedGeoPointMap(path2)), ) ) ) @@ -169,7 +169,7 @@ class GeometryConverterTest { GeometryConverter.fromFirestoreMap( mapOf( "type" to "Polygon", - "coordinates" to mapOf("1" to indexedGeoPointMap(path1), "2" to indexedGeoPointMap(path2)) + "coordinates" to mapOf("1" to indexedGeoPointMap(path1), "2" to indexedGeoPointMap(path2)), ) ) ) @@ -181,7 +181,7 @@ class GeometryConverterTest { GeometryConverter.fromFirestoreMap( mapOf( "type" to "Polygon", - "coordinates" to mapOf("1" to indexedGeoPointMap(path1), "2" to indexedGeoPointMap(path2)) + "coordinates" to mapOf("1" to indexedGeoPointMap(path1), "2" to indexedGeoPointMap(path2)), ) ) ) @@ -197,10 +197,10 @@ class GeometryConverterTest { "coordinates" to mapOf( "0" to mapOf("0" to indexedGeoPointMap(path1), "1" to indexedGeoPointMap(path2)), - "1" to mapOf("0" to indexedGeoPointMap(path3), "1" to indexedGeoPointMap(path4)) - ) + "1" to mapOf("0" to indexedGeoPointMap(path3), "1" to indexedGeoPointMap(path4)), + ), ) - ) + ), ) } diff --git a/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/LoiConverterTest.kt b/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/LoiConverterTest.kt index 72c6a81278..379e4f8e0b 100644 --- a/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/LoiConverterTest.kt +++ b/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/LoiConverterTest.kt @@ -50,10 +50,10 @@ class LoiConverterTest { newTask( "task2", Task.Type.MULTIPLE_CHOICE, - MultipleChoice(persistentListOf(), MultipleChoice.Cardinality.SELECT_ONE) + MultipleChoice(persistentListOf(), MultipleChoice.Cardinality.SELECT_ONE), ), newTask("task3", Task.Type.MULTIPLE_CHOICE), - newTask("task4", Task.Type.PHOTO) + newTask("task4", Task.Type.PHOTO), ) mockLoiDocumentSnapshot( "loi001", @@ -64,8 +64,8 @@ class LoiConverterTest { /* geoJson */ null, /* geometry */ null, /* created */ AUDIT_INFO_1_NESTED_OBJECT, - /* lastModified */ AUDIT_INFO_2_NESTED_OBJECT - ) + /* lastModified */ AUDIT_INFO_2_NESTED_OBJECT, + ), ) assertThat(toLocationOfInterest().isFailure).isTrue() } @@ -79,10 +79,10 @@ class LoiConverterTest { newTask( "task2", Task.Type.MULTIPLE_CHOICE, - MultipleChoice(persistentListOf(), MultipleChoice.Cardinality.SELECT_ONE) + MultipleChoice(persistentListOf(), MultipleChoice.Cardinality.SELECT_ONE), ), newTask("task3", Task.Type.MULTIPLE_CHOICE), - newTask("task4", Task.Type.PHOTO) + newTask("task4", Task.Type.PHOTO), ) mockLoiDocumentSnapshot( "loi001", @@ -93,8 +93,8 @@ class LoiConverterTest { null, noVerticesGeometry, AUDIT_INFO_1_NESTED_OBJECT, - AUDIT_INFO_2_NESTED_OBJECT - ) + AUDIT_INFO_2_NESTED_OBJECT, + ), ) assertThat(toLocationOfInterest().isFailure).isTrue() } @@ -126,13 +126,13 @@ class LoiConverterTest { AuditInfoNestedObject( UserNestedObject("user1", null, null), Timestamp(Date(100)), - Timestamp(Date(101)) + Timestamp(Date(101)), ) private val AUDIT_INFO_2_NESTED_OBJECT = AuditInfoNestedObject( UserNestedObject("user2", null, null), Timestamp(Date(200)), - Timestamp(Date(201)) + Timestamp(Date(201)), ) } } diff --git a/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionConverterTest.kt b/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionConverterTest.kt index b81f261058..a1bba0eeb9 100644 --- a/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionConverterTest.kt +++ b/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionConverterTest.kt @@ -65,7 +65,7 @@ class SubmissionConverterTest { newTask( "task2", Task.Type.MULTIPLE_CHOICE, - MultipleChoice(persistentListOf(), MultipleChoice.Cardinality.SELECT_ONE) + MultipleChoice(persistentListOf(), MultipleChoice.Cardinality.SELECT_ONE), ), newTask("task3", Task.Type.MULTIPLE_CHOICE), newTask("task4", Task.Type.PHOTO), @@ -83,7 +83,7 @@ class SubmissionConverterTest { job, AUDIT_INFO_1, AUDIT_INFO_2, - TEST_SUBMISSION_DATA + TEST_SUBMISSION_DATA, ) ) } @@ -98,8 +98,8 @@ class SubmissionConverterTest { "task001", AUDIT_INFO_1_NESTED_OBJECT, AUDIT_INFO_2_NESTED_OBJECT, - mapOf(Pair("task1", "")) - ) + mapOf(Pair("task1", "")), + ), ) Assert.assertThrows(DataStoreException::class.java) { this.toSubmission() } } @@ -114,8 +114,8 @@ class SubmissionConverterTest { "task001", AUDIT_INFO_1_NESTED_OBJECT, AUDIT_INFO_2_NESTED_OBJECT, - null - ) + null, + ), ) assertThat(toSubmission()) .isEqualTo( @@ -125,7 +125,7 @@ class SubmissionConverterTest { locationOfInterest, job, AUDIT_INFO_1, - AUDIT_INFO_2 + AUDIT_INFO_2, ) ) } @@ -140,8 +140,8 @@ class SubmissionConverterTest { "task001", AUDIT_INFO_1_NESTED_OBJECT, AUDIT_INFO_2_NESTED_OBJECT, - mapOf(Pair("task1", "")) - ) + mapOf(Pair("task1", "")), + ), ) assertThat(toSubmission()) .isEqualTo( @@ -151,7 +151,7 @@ class SubmissionConverterTest { locationOfInterest, job, AUDIT_INFO_1, - AUDIT_INFO_2 + AUDIT_INFO_2, ) ) } @@ -166,8 +166,8 @@ class SubmissionConverterTest { "task001", AUDIT_INFO_1_NESTED_OBJECT, AUDIT_INFO_2_NESTED_OBJECT, - mapOf(Pair("task1", listOf())) - ) + mapOf(Pair("task1", listOf())), + ), ) assertThat(toSubmission()) .isEqualTo( @@ -177,7 +177,7 @@ class SubmissionConverterTest { locationOfInterest, job, AUDIT_INFO_1, - AUDIT_INFO_2 + AUDIT_INFO_2, ) ) } @@ -192,8 +192,8 @@ class SubmissionConverterTest { "task001", AUDIT_INFO_1_NESTED_OBJECT, AUDIT_INFO_2_NESTED_OBJECT, - mapOf(Pair("task1", "Unknown"), Pair("task2", "Text response")) - ) + mapOf(Pair("task1", "Unknown"), Pair("task2", "Text response")), + ), ) assertThat(toSubmission()) .isEqualTo( @@ -205,7 +205,7 @@ class SubmissionConverterTest { AUDIT_INFO_1, AUDIT_INFO_2, // Field "task1" with unknown field type ignored. - SubmissionData(mapOf(Pair("task2", TextTaskData("Text response")))) + SubmissionData(mapOf(Pair("task2", TextTaskData("Text response")))), ) ) } @@ -234,13 +234,13 @@ class SubmissionConverterTest { AuditInfoNestedObject( UserNestedObject("user1", null, null), Timestamp(Date(100)), - Timestamp(Date(101)) + Timestamp(Date(101)), ) private val AUDIT_INFO_2_NESTED_OBJECT = AuditInfoNestedObject( UserNestedObject("user2", null, null), Timestamp(Date(200)), - Timestamp(Date(201)) + Timestamp(Date(201)), ) private const val SUBMISSION_ID = "submission123" private const val TEST_SURVEY_ID = "survey001" @@ -252,12 +252,12 @@ class SubmissionConverterTest { "task2" to MultipleChoiceTaskData( MultipleChoice(persistentListOf(), MultipleChoice.Cardinality.SELECT_ONE), - listOf("option2") + listOf("option2"), ), "task3" to MultipleChoiceTaskData( MultipleChoice(persistentListOf(), MultipleChoice.Cardinality.SELECT_ONE), - listOf("optionA", "optionB") + listOf("optionA", "optionB"), ), "task4" to TextTaskData("Photo URL"), "task5" to DropPinTaskData(Point(Coordinates(10.0, 20.0))), @@ -269,11 +269,11 @@ class SubmissionConverterTest { Coordinates(10.0, 20.0), Coordinates(20.0, 30.0), Coordinates(30.0, 20.0), - Coordinates(10.0, 20.0) + Coordinates(10.0, 20.0), ) ) ) - ) + ), ) ) private val TEST_SUBMISSION_DOCUMENT = @@ -298,11 +298,11 @@ class SubmissionConverterTest { "0" to GeoPoint(10.0, 20.0), "1" to GeoPoint(20.0, 30.0), "2" to GeoPoint(30.0, 20.0), - "3" to GeoPoint(10.0, 20.0) + "3" to GeoPoint(10.0, 20.0), ) - ) - ) - ) + ), + ), + ), ) } } diff --git a/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionMutationConverterTest.kt b/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionMutationConverterTest.kt index c883be40d9..7a598312d1 100644 --- a/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionMutationConverterTest.kt +++ b/ground/src/test/java/com/google/android/ground/persistence/remote/firebase/schema/SubmissionMutationConverterTest.kt @@ -59,9 +59,9 @@ class SubmissionMutationConverterTest { Option("option id 1", "code1", "Option 1"), Option("option id 2", "code2", "Option 2"), ), - MultipleChoice.Cardinality.SELECT_ONE + MultipleChoice.Cardinality.SELECT_ONE, ), - ids = listOf("option id 1") + ids = listOf("option id 1"), ) private val multipleChoiceTaskData = @@ -71,9 +71,9 @@ class SubmissionMutationConverterTest { Option("option id 1", "code1", "Option 1"), Option("option id 2", "code2", "Option 2"), ), - MultipleChoice.Cardinality.SELECT_MULTIPLE + MultipleChoice.Cardinality.SELECT_MULTIPLE, ), - ids = listOf("option id 1", "option id 2") + ids = listOf("option id 1", "option id 2"), ) private val numberTaskData = NumberTaskData.fromNumber("123") @@ -88,7 +88,7 @@ class SubmissionMutationConverterTest { Coordinates(10.0, 20.0), Coordinates(20.0, 30.0), Coordinates(30.0, 20.0), - Coordinates(10.0, 20.0) + Coordinates(10.0, 20.0), ) ) ) @@ -108,29 +108,29 @@ class SubmissionMutationConverterTest { ValueDelta( taskId = "single_choice_task", taskType = Task.Type.MULTIPLE_CHOICE, - newTaskData = singleChoiceResponse + newTaskData = singleChoiceResponse, ), ValueDelta( taskId = "multiple_choice_task", taskType = Task.Type.MULTIPLE_CHOICE, - newTaskData = multipleChoiceTaskData + newTaskData = multipleChoiceTaskData, ), ValueDelta( taskId = "number_task", taskType = Task.Type.NUMBER, - newTaskData = numberTaskData + newTaskData = numberTaskData, ), ValueDelta( taskId = "drop_pin_task", taskType = Task.Type.DROP_PIN, - newTaskData = dropPinTaskResult + newTaskData = dropPinTaskResult, ), ValueDelta( taskId = "draw_area_task", taskType = Task.Type.DRAW_AREA, - newTaskData = drawAreaTaskResult - ) - ) + newTaskData = drawAreaTaskResult, + ), + ), ) private val expected = @@ -141,7 +141,7 @@ class SubmissionMutationConverterTest { Pair("number_task", 123.0), Pair( "drop_pin_task", - mapOf(Pair("type", "Point"), Pair("coordinates", GeoPoint(10.0, 20.0))) + mapOf(Pair("type", "Point"), Pair("coordinates", GeoPoint(10.0, 20.0))), ), Pair( "draw_area_task", @@ -156,13 +156,13 @@ class SubmissionMutationConverterTest { Pair("0", GeoPoint(10.0, 20.0)), Pair("1", GeoPoint(20.0, 30.0)), Pair("2", GeoPoint(30.0, 20.0)), - Pair("3", GeoPoint(10.0, 20.0)) - ) + Pair("3", GeoPoint(10.0, 20.0)), + ), ) - ) - ) - ) - ) + ), + ), + ), + ), ) private val auditInfoObject = AuditInfoConverter.fromMutationAndUser(submissionMutation, user) @@ -172,7 +172,7 @@ class SubmissionMutationConverterTest { assertThat( SubmissionMutationConverter.toMap( submissionMutation.copy(type = Mutation.Type.CREATE), - user + user, ) ) .isEqualTo( @@ -181,7 +181,7 @@ class SubmissionMutationConverterTest { Pair("lastModified", auditInfoObject), Pair("loiId", loiId), Pair("jobId", job.id), - Pair("data", expected) + Pair("data", expected), ) ) } @@ -191,7 +191,7 @@ class SubmissionMutationConverterTest { assertThat( SubmissionMutationConverter.toMap( submissionMutation.copy(type = Mutation.Type.UPDATE), - user + user, ) ) .isEqualTo( @@ -199,7 +199,7 @@ class SubmissionMutationConverterTest { Pair("lastModified", auditInfoObject), Pair("loiId", loiId), Pair("jobId", job.id), - Pair("data", expected) + Pair("data", expected), ) ) } diff --git a/ground/src/test/java/com/google/android/ground/persistence/sync/LocalMutationSyncWorkerTest.kt b/ground/src/test/java/com/google/android/ground/persistence/sync/LocalMutationSyncWorkerTest.kt index ee7191adcc..cd68f0fbd2 100644 --- a/ground/src/test/java/com/google/android/ground/persistence/sync/LocalMutationSyncWorkerTest.kt +++ b/ground/src/test/java/com/google/android/ground/persistence/sync/LocalMutationSyncWorkerTest.kt @@ -78,7 +78,7 @@ class LocalMutationSyncWorkerTest : BaseHiltTest() { override fun createWorker( appContext: Context, workerClassName: String, - workerParameters: WorkerParameters + workerParameters: WorkerParameters, ): ListenableWorker = LocalMutationSyncWorker( appContext, @@ -86,7 +86,7 @@ class LocalMutationSyncWorkerTest : BaseHiltTest() { mutationRepository, localUserStore, fakeRemoteDataStore, - mockMediaUploadWorkManager + mockMediaUploadWorkManager, ) } @@ -136,7 +136,7 @@ class LocalMutationSyncWorkerTest : BaseHiltTest() { assertMutationsState( failed = 2, retryCount = listOf(1, 1), - lastErrors = listOf(ERROR_MESSAGE, ERROR_MESSAGE) + lastErrors = listOf(ERROR_MESSAGE, ERROR_MESSAGE), ) } @@ -155,7 +155,7 @@ class LocalMutationSyncWorkerTest : BaseHiltTest() { assertMutationsState( failed = 2, retryCount = listOf(i, i), - lastErrors = listOf(ERROR_MESSAGE, ERROR_MESSAGE) + lastErrors = listOf(ERROR_MESSAGE, ERROR_MESSAGE), ) } @@ -168,7 +168,7 @@ class LocalMutationSyncWorkerTest : BaseHiltTest() { assertMutationsState( failed = 2, retryCount = listOf(retryCount, retryCount), - lastErrors = listOf(ERROR_MESSAGE, ERROR_MESSAGE) + lastErrors = listOf(ERROR_MESSAGE, ERROR_MESSAGE), ) } @@ -178,7 +178,7 @@ class LocalMutationSyncWorkerTest : BaseHiltTest() { complete: Int = 0, failed: Int = 0, retryCount: List = listOf(), - lastErrors: List = listOf() + lastErrors: List = listOf(), ) { assertWithMessage("Unknown mutations count incorrect") .that(mutationRepository.getMutations(TEST_LOI_ID, UNKNOWN)) @@ -211,7 +211,7 @@ class LocalMutationSyncWorkerTest : BaseHiltTest() { locationOfInterestId = TEST_LOI_ID, userId = TEST_USER_ID, surveyId = TEST_SURVEY_ID, - geometry = TEST_GEOMETRY + geometry = TEST_GEOMETRY, ) private fun createSubmissionMutation() = @@ -221,13 +221,13 @@ class LocalMutationSyncWorkerTest : BaseHiltTest() { locationOfInterestId = TEST_LOI_ID, userId = TEST_USER_ID, job = TEST_JOB, - surveyId = TEST_SURVEY_ID + surveyId = TEST_SURVEY_ID, ) private suspend fun createAndDoWork(context: Context, loiId: String?): ListenableWorker.Result = TestListenableWorkerBuilder( context, - inputData = workDataOf(Pair(LOCATION_OF_INTEREST_ID_PARAM_KEY, loiId)) + inputData = workDataOf(Pair(LOCATION_OF_INTEREST_ID_PARAM_KEY, loiId)), ) .setWorkerFactory(factory) .build() diff --git a/ground/src/test/java/com/google/android/ground/persistence/sync/MediaUploadWorkerTest.kt b/ground/src/test/java/com/google/android/ground/persistence/sync/MediaUploadWorkerTest.kt index badbb2518c..7dc6c8e662 100644 --- a/ground/src/test/java/com/google/android/ground/persistence/sync/MediaUploadWorkerTest.kt +++ b/ground/src/test/java/com/google/android/ground/persistence/sync/MediaUploadWorkerTest.kt @@ -69,14 +69,14 @@ class MediaUploadWorkerTest : BaseHiltTest() { override fun createWorker( appContext: Context, workerClassName: String, - workerParameters: WorkerParameters + workerParameters: WorkerParameters, ): ListenableWorker = MediaUploadWorker( context, workerParameters, fakeRemoteStorageManager, mutationRepository, - userMediaRepository + userMediaRepository, ) } @@ -128,7 +128,7 @@ class MediaUploadWorkerTest : BaseHiltTest() { val updatedMutation = mutation.copy( deltas = delt, - syncStatus = Mutation.SyncStatus.MEDIA_UPLOAD_PENDING + syncStatus = Mutation.SyncStatus.MEDIA_UPLOAD_PENDING, ) // add an additional non-existent photo to the mutation localUserStore.insertOrUpdateUser(FakeData.USER) @@ -168,7 +168,7 @@ class MediaUploadWorkerTest : BaseHiltTest() { private suspend fun createAndDoWork(context: Context, loiId: String) { TestListenableWorkerBuilder( context, - MediaUploadWorker.createInputData(loiId) + MediaUploadWorker.createInputData(loiId), ) .setWorkerFactory(factory) .build() @@ -177,12 +177,7 @@ class MediaUploadWorkerTest : BaseHiltTest() { // Assert a given number of mutations of the specified status exist. private suspend fun assertThatMutationCountEquals(status: MutationEntitySyncStatus, count: Int) { - assertThat( - mutationRepository.getMutations( - FakeData.LOCATION_OF_INTEREST.id, - status, - ) - ) + assertThat(mutationRepository.getMutations(FakeData.LOCATION_OF_INTEREST.id, status)) .hasSize(count) } @@ -193,13 +188,13 @@ class MediaUploadWorkerTest : BaseHiltTest() { val photo = userMediaRepository.savePhoto( Bitmap.createBitmap(1, 1, Bitmap.Config.HARDWARE), - TEST_PHOTO_TASK.id + TEST_PHOTO_TASK.id, ) return SUBMISSION_MUTATION.copy( job = TEST_JOB, deltas = - listOf(ValueDelta(PHOTO_TASK_ID, Task.Type.PHOTO, TextTaskData(photoName ?: photo.name))) + listOf(ValueDelta(PHOTO_TASK_ID, Task.Type.PHOTO, TextTaskData(photoName ?: photo.name))), ) } @@ -229,7 +224,7 @@ class MediaUploadWorkerTest : BaseHiltTest() { job = FakeData.JOB, surveyId = FakeData.SURVEY.id, deltas = - listOf(ValueDelta(PHOTO_TASK_ID, Task.Type.PHOTO, TextTaskData("foo/$PHOTO_TASK_ID.jpg"))) + listOf(ValueDelta(PHOTO_TASK_ID, Task.Type.PHOTO, TextTaskData("foo/$PHOTO_TASK_ID.jpg"))), ) } } diff --git a/ground/src/test/java/com/google/android/ground/persistence/sync/SurveySyncServiceTest.kt b/ground/src/test/java/com/google/android/ground/persistence/sync/SurveySyncServiceTest.kt index a415f6565f..796d5acfb1 100644 --- a/ground/src/test/java/com/google/android/ground/persistence/sync/SurveySyncServiceTest.kt +++ b/ground/src/test/java/com/google/android/ground/persistence/sync/SurveySyncServiceTest.kt @@ -61,7 +61,7 @@ class SurveySyncServiceTest : BaseHiltTest() { override fun createWorker( appContext: Context, workerClassName: String, - workerParameters: WorkerParameters + workerParameters: WorkerParameters, ) = SurveySyncWorker(context, workerParameters, syncSurvey) } ) diff --git a/ground/src/test/java/com/google/android/ground/persistence/sync/SurveySyncWorkerTest.kt b/ground/src/test/java/com/google/android/ground/persistence/sync/SurveySyncWorkerTest.kt index 80dcc6996c..c072afa1b8 100644 --- a/ground/src/test/java/com/google/android/ground/persistence/sync/SurveySyncWorkerTest.kt +++ b/ground/src/test/java/com/google/android/ground/persistence/sync/SurveySyncWorkerTest.kt @@ -51,7 +51,7 @@ class SurveySyncWorkerTest : BaseHiltTest() { override fun createWorker( appContext: Context, workerClassName: String, - workerParameters: WorkerParameters + workerParameters: WorkerParameters, ) = SurveySyncWorker(appContext, workerParameters, syncSurvey) } diff --git a/ground/src/test/java/com/google/android/ground/repository/LocationOfInterestRepositoryTest.kt b/ground/src/test/java/com/google/android/ground/repository/LocationOfInterestRepositoryTest.kt index 530525c782..f0ca1b5279 100644 --- a/ground/src/test/java/com/google/android/ground/repository/LocationOfInterestRepositoryTest.kt +++ b/ground/src/test/java/com/google/android/ground/repository/LocationOfInterestRepositoryTest.kt @@ -83,7 +83,7 @@ class LocationOfInterestRepositoryTest : BaseHiltTest() { LOCATION_OF_INTEREST.copy( customId = "", // TODO(#1562): Remove once creation time is preserved in local db. - lastModified = LOCATION_OF_INTEREST.created + lastModified = LOCATION_OF_INTEREST.created, ) locationOfInterestRepository.applyAndEnqueue(loi.toMutation(CREATE, TEST_USER.id)) @@ -157,7 +157,7 @@ class LocationOfInterestRepositoryTest : BaseHiltTest() { TEST_POINT_OF_INTEREST_2, TEST_POINT_OF_INTEREST_3, TEST_AREA_OF_INTEREST_1, - TEST_AREA_OF_INTEREST_2 + TEST_AREA_OF_INTEREST_2, ) ) } @@ -187,7 +187,7 @@ class LocationOfInterestRepositoryTest : BaseHiltTest() { TEST_POINT_OF_INTEREST_2, TEST_POINT_OF_INTEREST_3, TEST_AREA_OF_INTEREST_1, - TEST_AREA_OF_INTEREST_2 + TEST_AREA_OF_INTEREST_2, ) private fun createPoint(id: String, coordinate: Coordinates) = @@ -195,7 +195,7 @@ class LocationOfInterestRepositoryTest : BaseHiltTest() { id = id, geometry = Point(coordinate), surveyId = TEST_SURVEY.id, - customId = "" + customId = "", ) private fun createPolygon(id: String, coordinates: List) = @@ -203,7 +203,7 @@ class LocationOfInterestRepositoryTest : BaseHiltTest() { id = id, geometry = Polygon(LinearRing(coordinates)), surveyId = TEST_SURVEY.id, - customId = "" + customId = "", ) } } diff --git a/ground/src/test/java/com/google/android/ground/repository/UserMediaRepositoryTest.kt b/ground/src/test/java/com/google/android/ground/repository/UserMediaRepositoryTest.kt index 4695624f27..42d4ddda12 100644 --- a/ground/src/test/java/com/google/android/ground/repository/UserMediaRepositoryTest.kt +++ b/ground/src/test/java/com/google/android/ground/repository/UserMediaRepositoryTest.kt @@ -48,11 +48,7 @@ class UserMediaRepositoryTest : BaseHiltTest() { @Test fun getLocalFileFromRemotePath_validImageFilename() { - for (path in - listOf( - "/some/path/filename.png", - "/some/path/filename.jpg", - )) { + for (path in listOf("/some/path/filename.png", "/some/path/filename.jpg")) { val localFile = userMediaRepository.getLocalFileFromRemotePath(path) assertThat(localFile).isNotNull() } diff --git a/ground/src/test/java/com/google/android/ground/system/GeocodingManagerTest.kt b/ground/src/test/java/com/google/android/ground/system/GeocodingManagerTest.kt index f7f33546dc..992351da75 100644 --- a/ground/src/test/java/com/google/android/ground/system/GeocodingManagerTest.kt +++ b/ground/src/test/java/com/google/android/ground/system/GeocodingManagerTest.kt @@ -91,7 +91,7 @@ class GeocodingManagerTest( countryName: String? = null, adminArea: String? = null, subAdminArea: String? = null, - locality: String? = null + locality: String? = null, ) = mock
{ whenever(it.countryName).thenReturn(countryName) @@ -108,52 +108,52 @@ class GeocodingManagerTest( "$MULTIPLE_REGIONS, $COUNTRY1", "Points with matching country-only addresses", addresses(NE, level1Address1), - addresses(CENTER, level1Address1) + addresses(CENTER, level1Address1), ), testCase( UNNAMED_AREA, "Points with distinct countries", addresses(CENTER, level1Address1), - addresses(SW, level1Address2) + addresses(SW, level1Address2), ), testCase( "$ADMIN_AREA1, $COUNTRY1", "Points with matching admin areas", addresses(NE, level2Address1), - addresses(NW, level2Address1) + addresses(NW, level2Address1), ), testCase( "$SUB_ADMIN_AREA, $ADMIN_AREA1, $COUNTRY1", "Points with matching sub-admin areas", addresses(NE, level3Address), - addresses(SE, level3Address) + addresses(SE, level3Address), ), testCase( "$LOCALITY, $SUB_ADMIN_AREA, $ADMIN_AREA1, $COUNTRY1", "Points with matching localities", addresses(NE, level4Address), - addresses(SE, level4Address) + addresses(SE, level4Address), ), testCase( "$ADMIN_AREA1, $COUNTRY1", "Points with multiple admin area names: return shortest", addresses(NE, level2Address2, level2Address1), - addresses(SW, level2Address1, level2Address2) + addresses(SW, level2Address1, level2Address2), ), testCase( "$ADMIN_AREA1, $COUNTRY1", "Ignore null addresses", addresses(NE, level2Address2, nullLevel2Address, level2Address1), - addresses(SE, level2Address1, level2Address2, nullLevel2Address) + addresses(SE, level2Address1, level2Address2, nullLevel2Address), ), testCase(UNNAMED_AREA, "Only one point with address", addresses(NE, level2Address1)), - testCase(UNNAMED_AREA, "All points with no address") + testCase(UNNAMED_AREA, "All points with no address"), ) private fun testCase( expectedAreaName: String, message: String, - vararg areas: Pair> + vararg areas: Pair>, ) = arrayOf(expectedAreaName, message, areas.toList()) private fun addresses(coordinates: Coordinates, vararg addresses: Address) = diff --git a/ground/src/test/java/com/google/android/ground/system/PermissionsManagerTest.kt b/ground/src/test/java/com/google/android/ground/system/PermissionsManagerTest.kt index ca2ccdc23a..1bd3cef952 100644 --- a/ground/src/test/java/com/google/android/ground/system/PermissionsManagerTest.kt +++ b/ground/src/test/java/com/google/android/ground/system/PermissionsManagerTest.kt @@ -76,7 +76,7 @@ class PermissionsManagerTest : BaseHiltTest() { arrayOf(testPermission), intArrayOf( if (granted) PackageManager.PERMISSION_GRANTED else PackageManager.PERMISSION_DENIED - ) + ), ) ) } diff --git a/ground/src/test/java/com/google/android/ground/ui/common/LocationOfInterestHelperTest.kt b/ground/src/test/java/com/google/android/ground/ui/common/LocationOfInterestHelperTest.kt index ad1a17e393..b8c376dd8e 100644 --- a/ground/src/test/java/com/google/android/ground/ui/common/LocationOfInterestHelperTest.kt +++ b/ground/src/test/java/com/google/android/ground/ui/common/LocationOfInterestHelperTest.kt @@ -87,7 +87,7 @@ class LocationOfInterestHelperTest : BaseHiltTest() { loiHelper.getDisplayLoiName( TEST_LOI.copy( customId = "some value", - properties = mapOf(LOI_NAME_PROPERTY to "custom name") + properties = mapOf(LOI_NAME_PROPERTY to "custom name"), ) ) ) diff --git a/ground/src/test/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskViewModelTest.kt b/ground/src/test/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskViewModelTest.kt index 57646fb123..02cb53577c 100644 --- a/ground/src/test/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskViewModelTest.kt +++ b/ground/src/test/java/com/google/android/ground/ui/datacollection/tasks/polygon/DrawAreaTaskViewModelTest.kt @@ -154,7 +154,7 @@ class DrawAreaTaskViewModelTest : BaseHiltTest() { expectedVerticesCount: Int, isLineString: Boolean = false, isLinearRing: Boolean = false, - isPolygon: Boolean = false + isPolygon: Boolean = false, ) { val geometry = featureTestObserver.value()?.geometry if (expectedVerticesCount == 0) { diff --git a/ground/src/test/java/com/google/android/ground/ui/home/HomeScreenFragmentTest.kt b/ground/src/test/java/com/google/android/ground/ui/home/HomeScreenFragmentTest.kt index fbfc1834c9..e22d744c1f 100644 --- a/ground/src/test/java/com/google/android/ground/ui/home/HomeScreenFragmentTest.kt +++ b/ground/src/test/java/com/google/android/ground/ui/home/HomeScreenFragmentTest.kt @@ -126,7 +126,7 @@ class HomeScreenFragmentTest : AbstractHomeScreenFragmentTest() { "Test survey description", mapOf(FakeData.JOB.id to FakeData.JOB), listOf(), - mapOf(Pair(FakeData.USER.email, "data-collector")) + mapOf(Pair(FakeData.USER.email, "data-collector")), ) @Test @@ -147,7 +147,7 @@ class NavigationDrawerItemClickTest( private val survey: Survey, private val expectedNavDirection: NavDirections?, private val shouldDrawerCloseAfterClick: Boolean, - private val testLabel: String + private val testLabel: String, ) : AbstractHomeScreenFragmentTest() { @Inject lateinit var navigator: Navigator @@ -186,7 +186,7 @@ class NavigationDrawerItemClickTest( TEST_SURVEY_WITHOUT_OFFLINE_TILES, HomeScreenFragmentDirections.showSyncStatus(), true, - "Clicking 'Sync status' should navigate to fragment" + "Clicking 'Sync status' should navigate to fragment", ) ) } diff --git a/ground/src/test/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragmentTest.kt b/ground/src/test/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragmentTest.kt index 9012faaca7..32df9e7eac 100644 --- a/ground/src/test/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragmentTest.kt +++ b/ground/src/test/java/com/google/android/ground/ui/home/mapcontainer/HomeScreenMapContainerFragmentTest.kt @@ -52,7 +52,7 @@ class HomeScreenMapContainerFragmentTest : BaseHiltTest() { val actualRequest = it as ShowMapTypeDialogFragment assertThat(actualRequest.mapTypes).isEqualTo(MapType.values()) }, - { onView(withId(R.id.map_type_btn)).perform(click()).check(matches(isEnabled())) } + { onView(withId(R.id.map_type_btn)).perform(click()).check(matches(isEnabled())) }, ) } } diff --git a/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/MogImageMetadataTest.kt b/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/MogImageMetadataTest.kt index 3dd2fa8023..d00353aac9 100644 --- a/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/MogImageMetadataTest.kt +++ b/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/MogImageMetadataTest.kt @@ -31,7 +31,7 @@ class MogImageMetadataTest { byteCounts = listOf(), imageWidth = 1024, imageLength = 1024, - jpegTables = ByteArray(10) + jpegTables = ByteArray(10), ) @Test diff --git a/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/MogTileRequestTest.kt b/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/MogTileRequestTest.kt index 028845596d..53de74191d 100644 --- a/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/MogTileRequestTest.kt +++ b/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/MogTileRequestTest.kt @@ -77,6 +77,6 @@ class MogTileRequestTest { 256, 256, byteArrayOf(), - LongRange(byteRange.first.toLong(), byteRange.last.toLong()) + LongRange(byteRange.first.toLong(), byteRange.last.toLong()), ) } diff --git a/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/MogTileTest.kt b/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/MogTileTest.kt index 511cee2ee0..2e917b3668 100644 --- a/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/MogTileTest.kt +++ b/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/MogTileTest.kt @@ -38,7 +38,7 @@ class MogTileTest { width = WIDTH, height = HEIGHT, jpegTables = byteArrayOf(100, 101, 102, 103, 104), - byteRange = LongRange(0, 10) + byteRange = LongRange(0, 10), ) private val EXPECTED_DATA = byteArrayOf( @@ -67,7 +67,7 @@ class MogTileTest { 3, 4, -1, - -39 + -39, ) } } diff --git a/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/TiffTagDataTypeTest.kt b/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/TiffTagDataTypeTest.kt index 7200e01200..f890abb154 100644 --- a/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/TiffTagDataTypeTest.kt +++ b/ground/src/test/java/com/google/android/ground/ui/map/gms/mog/TiffTagDataTypeTest.kt @@ -24,7 +24,7 @@ import org.junit.runners.Parameterized class TiffTagDataTypeTest( private val dataType: TiffTagDataType, private val sizeInBytes: Int, - private val position: Int + private val position: Int, ) { @Test diff --git a/ground/src/test/java/com/google/android/ground/ui/surveyselector/SurveySelectorFragmentTest.kt b/ground/src/test/java/com/google/android/ground/ui/surveyselector/SurveySelectorFragmentTest.kt index 7fa21f45d0..942c20403c 100644 --- a/ground/src/test/java/com/google/android/ground/ui/surveyselector/SurveySelectorFragmentTest.kt +++ b/ground/src/test/java/com/google/android/ground/ui/surveyselector/SurveySelectorFragmentTest.kt @@ -214,7 +214,7 @@ class SurveySelectorFragmentTest : BaseHiltTest() { .perform( actionOnItemAtPosition( 1, - recyclerChildAction