Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.tasks.await
import kotlinx.coroutines.withContext
import org.groundplatform.android.BuildConfig.USE_EMULATORS
import org.groundplatform.android.coroutines.IoDispatcher
import org.groundplatform.android.data.remote.RemoteDataStore
import org.groundplatform.android.data.remote.firebase.schema.GroundFirestore
Expand All @@ -42,7 +43,7 @@ import org.groundplatform.android.model.mutation.SubmissionMutation
import org.groundplatform.android.model.toListItem
import timber.log.Timber

const val PROFILE_REFRESH_CLOUD_FUNCTION_NAME = "profile-refresh"
private const val PROFILE_REFRESH_CLOUD_FUNCTION_NAME = "profile-refresh"

@Singleton
class FirestoreDataStore
Expand Down Expand Up @@ -91,6 +92,7 @@ internal constructor(
withContext(ioDispatcher) { db().surveys().survey(survey.id).lois().fetchSharedLois(survey) }

override suspend fun subscribeToSurveyUpdates(surveyId: String) {
if (USE_EMULATORS) return
Timber.d("Subscribing to FCM topic $surveyId")
try {
Firebase.messaging.subscribeToTopic(surveyId).await()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,15 @@ import com.google.android.gms.maps.model.Marker
import com.google.android.gms.maps.model.MarkerOptions
import javax.inject.Inject
import org.groundplatform.android.R
import org.groundplatform.android.common.Constants.isReleaseBuild
import org.groundplatform.android.model.geometry.Point
import org.groundplatform.android.ui.IconFactory
import org.groundplatform.android.ui.map.Feature
import org.groundplatform.android.ui.map.gms.MARKER_Z
import org.groundplatform.android.ui.map.gms.toLatLng
import org.jetbrains.annotations.TestOnly

@TestOnly const val TEST_MARKER_TAG = "Test point"

class PointRenderer
@Inject
Expand Down Expand Up @@ -56,6 +60,9 @@ constructor(resources: Resources, private val markerIconFactory: IconFactory) :
icon(getMarkerIcon(style, selected))
zIndex(MARKER_Z)
visible(visible)
if (!isReleaseBuild()) {
contentDescription(TEST_MARKER_TAG)
}
}
val marker = map.addMarker(markerOptions) ?: error("Failed to create marker")
marker.tag = tag
Expand Down
1 change: 1 addition & 0 deletions e2eTest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ android {
}

dependencies {
implementation libs.androidx.compose.ui.test.junit4
androidTestUtil libs.androidx.orchestrator
implementation libs.androidx.appcompat
implementation libs.androidx.core.ktx
Expand Down

This file was deleted.

This file was deleted.

Loading