Skip to content

Move theme components to ui module #3597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreia-ferreira merged 2 commits into from
Mar 9, 2026
Merged

Move theme components to ui module #3597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8964da
move app theme to ui module
andreia-ferreira Mar 6, 2026
65fb44f
add copyright header to typography
andreia-ferreira Mar 9, 2026
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
1 change: 1 addition & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ configurations {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':core:domain')
implementation project(':core:ui')
implementation libs.androidx.multidex
implementation libs.androidx.preference.ktx

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/basemapselector/BasemapSelectorScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ import kotlinx.coroutines.launch
import org.groundplatform.android.R
import org.groundplatform.android.model.map.MapType
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

/**
* Screen containing a list of [MapType] for updating basemap layer.
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/components/ConfirmationDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun ConfirmationDialog(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/components/HtmlText.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import androidx.compose.ui.viewinterop.AndroidView
import androidx.core.text.HtmlCompat
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun HtmlText(html: String, modifier: Modifier = Modifier) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/groundplatform/android/ui/components/LoadingDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.android.ui.theme.sizes
import org.groundplatform.ui.theme.AppTheme
import org.groundplatform.ui.theme.sizes

@Composable
fun LoadingDialog(messageId: Int) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/components/MapFloatingActionButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

const val OPEN_NAV_DRAWER_TEST_TAG = "open_nav_drawer"
const val CHOOSE_MAP_TYPE_TEST_TAG = "choose_map_type"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/components/PermissionDeniedDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme
import timber.log.Timber

@Composable
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/components/RecenterButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun RecenterButton(modifier: Modifier = Modifier, onClick: () -> Unit) {
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/groundplatform/android/ui/datacollection/DataSubmissionConfirmationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun DataSubmissionConfirmationScreen(onDismissed: () -> Unit) {
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/org/groundplatform/android/ui/datacollection/components/InstructionsDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun InstructionsDialog(iconId: Int, stringId: Int) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/datacollection/components/TaskButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun TaskButton(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/datacollection/components/TaskFooter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.datacollection.tasks.location.LocationAccuracyCard
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun TaskFooter(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/datacollection/components/TextTaskInput.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.groundplatform.android.common.Constants
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun TextTaskInput(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/datacollection/components/UriImage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import coil.request.ImageRequest
import coil.size.Scale
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@VisibleForTesting const val MAX_IMAGE_SIZE = 2048

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/date/DateTaskScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import androidx.compose.ui.platform.testTag
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

const val DATE_TEXT_TEST_TAG: String = "date task input test tag"

Expand Down
2 changes: 1 addition & 1 deletion ...g/groundplatform/android/ui/datacollection/tasks/multiplechoice/MultipleChoiceItemView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import org.groundplatform.android.common.Constants
import org.groundplatform.android.model.task.MultipleChoice
import org.groundplatform.android.model.task.Option
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

const val MULTIPLE_CHOICE_ITEM_TEST_TAG = "multiple choice item test tag"
const val OTHER_INPUT_TEXT_TEST_TAG = "other input test tag"
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import androidx.core.net.toUri
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.datacollection.components.UriImage
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun PhotoTaskScreen(uri: Uri, onTakePhoto: () -> Unit, modifier: Modifier = Modifier) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/time/TimeTaskScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import androidx.compose.ui.platform.testTag
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

const val TIME_TEXT_TEST_TAG: String = "time task input test tag"

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/home/DataSharingTermsDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import org.groundplatform.android.R
import org.groundplatform.android.proto.Survey
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.components.HtmlText
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme
import org.intellij.markdown.flavours.commonmark.CommonMarkFlavourDescriptor
import org.intellij.markdown.html.HtmlGenerator
import org.intellij.markdown.parser.MarkdownParser
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/home/UserDetailsDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import androidx.compose.ui.tooling.preview.Preview
import org.groundplatform.android.R
import org.groundplatform.android.model.User
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun UserDetailsDialog(user: User, signOutCallback: () -> Unit, dismissCallback: () -> Unit) {
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/groundplatform/android/ui/home/mapcontainer/HomeScreenMapContainerScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import org.groundplatform.android.ui.home.mapcontainer.jobs.AdHocDataCollectionB
import org.groundplatform.android.ui.home.mapcontainer.jobs.JobMapComponent
import org.groundplatform.android.ui.home.mapcontainer.jobs.JobMapComponentAction
import org.groundplatform.android.ui.home.mapcontainer.jobs.JobMapComponentState
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun HomeScreenMapContainerScreen(
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/groundplatform/android/ui/home/mapcontainer/jobs/ActionButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.android.ui.theme.sizes
import org.groundplatform.ui.theme.AppTheme
import org.groundplatform.ui.theme.sizes

@Composable
fun ActionButton(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/home/mapcontainer/jobs/JobMapComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.home.mapcontainer.jobs.JobMapComponentAction.OnAddDataClicked
import org.groundplatform.android.ui.home.mapcontainer.jobs.JobMapComponentAction.OnDeleteSiteClicked
import org.groundplatform.android.ui.home.mapcontainer.jobs.JobMapComponentAction.OnJobSelected
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun JobMapComponent(state: JobMapComponentState, onAction: (JobMapComponentAction) -> Unit) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/home/mapcontainer/jobs/JobSelectionModal.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import org.groundplatform.android.R
import org.groundplatform.android.model.job.Job
import org.groundplatform.android.model.job.Style
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun JobSelectionModal(jobs: List<Job>, onJobClicked: (job: Job) -> Unit, onDismiss: () -> Unit) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/home/mapcontainer/jobs/JobSelectionRow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import org.groundplatform.android.model.job.Job
import org.groundplatform.android.model.job.Style
import org.groundplatform.android.model.job.getDefaultColor
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun JobSelectionRow(job: Job, onClick: () -> Unit) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/home/mapcontainer/jobs/LoiJobSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import org.groundplatform.android.model.task.Task
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.common.LocationOfInterestHelper
import org.groundplatform.android.ui.components.ConfirmationDialog
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/offlineareas/OfflineAreaListItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun OfflineAreaListItem(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/settings/SettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.core.os.LocaleListCompat
import dagger.hilt.android.AndroidEntryPoint
import org.groundplatform.android.ui.common.AbstractActivity
import org.groundplatform.android.ui.main.MainActivity
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@AndroidEntryPoint
class SettingsActivity : AbstractActivity() {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/settings/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import org.groundplatform.android.ui.settings.components.SettingsCategory
import org.groundplatform.android.ui.settings.components.SettingsItem
import org.groundplatform.android.ui.settings.components.SettingsSelectItem
import org.groundplatform.android.ui.settings.components.SettingsSwitchItem
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

/**
* Stateful composable for the settings screen.
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/settings/components/SettingsItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import androidx.compose.ui.semantics.Role
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

/**
* A reusable UI component representing a single row in a settings screen.
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/settings/components/SettingsSelectItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import androidx.compose.ui.unit.DpOffset
import androidx.compose.ui.unit.dp
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

/**
* A settings item that allows users to select a single value from a list of options.
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/settings/components/SettingsSwitchItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import androidx.compose.ui.semantics.Role
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

/**
* A reusable settings item component with a title, optional summary, and a switch toggle.
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/signin/SignInFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.compose.ui.platform.ViewCompositionStrategy
import dagger.hilt.android.AndroidEntryPoint
import org.groundplatform.android.ui.common.AbstractFragment
import org.groundplatform.android.ui.common.BackPressListener
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@AndroidEntryPoint
class SignInFragment : AbstractFragment(), BackPressListener {
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/org/groundplatform/android/ui/signin/SignInScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,12 @@ import com.google.firebase.firestore.FirebaseFirestoreException
import com.google.firebase.firestore.FirebaseFirestoreException.Code
import org.groundplatform.android.BuildConfig
import org.groundplatform.android.R
import org.groundplatform.android.proto.style
import org.groundplatform.android.system.auth.SignInState
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.components.LoadingDialog
import org.groundplatform.android.ui.components.PermissionDeniedDialog
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.android.util.isPermissionDeniedException
import org.groundplatform.ui.theme.AppTheme

const val BUTTON_TEST_TAG = "google_sign_in_button"

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/startup/StartupFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject
import org.groundplatform.android.ui.common.AbstractFragment
import org.groundplatform.android.ui.common.EphemeralPopups
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@AndroidEntryPoint
class StartupFragment : AbstractFragment() {
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/org/groundplatform/android/ui/surveyselector/SurveySelectorFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.navigation.fragment.findNavController
import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject
import kotlinx.coroutines.TimeoutCancellationException
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.AbstractFragment
import org.groundplatform.android.ui.common.BackPressListener
import org.groundplatform.android.ui.common.EphemeralPopups
import org.groundplatform.android.ui.home.HomeScreenFragmentDirections
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

/** User interface implementation of survey selector screen. */
@AndroidEntryPoint
Expand All @@ -52,7 +53,7 @@ class SurveySelectorFragment : AbstractFragment(), BackPressListener {
findNavController().navigate(HomeScreenFragmentDirections.showHomeScreen())
},
onError = { error ->
if (error is kotlinx.coroutines.TimeoutCancellationException) {
if (error is TimeoutCancellationException) {
ephemeralPopups.ErrorPopup().show(R.string.survey_load_timeout_error)
} else {
ephemeralPopups.ErrorPopup().unknownError()
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/groundplatform/android/ui/surveyselector/components/SurveyEmptyState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.groundplatform.android.R
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun SurveyEmptyState(onSignOut: () -> Unit) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/ui/syncstatus/SyncListItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import java.util.Date
import org.groundplatform.android.R
import org.groundplatform.android.model.mutation.Mutation
import org.groundplatform.android.ui.common.ExcludeFromJacocoGeneratedReport
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

@Composable
fun SyncListItem(modifier: Modifier, detail: SyncStatusDetail) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/groundplatform/android/util/ComposeExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.fragment.app.Fragment
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme

/**
* Renders a composable function within the root view of a Fragment.
Expand Down
2 changes: 1 addition & 1 deletion app/src/test/java/org/groundplatform/android/ui/settings/SettingsScreenTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import org.groundplatform.android.R
import org.groundplatform.android.getString
import org.groundplatform.android.model.settings.MeasurementUnits
import org.groundplatform.android.model.settings.UserSettings
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
Expand Down
2 changes: 1 addition & 1 deletion app/src/test/java/org/groundplatform/android/ui/signin/SignInScreenTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import com.google.firebase.firestore.FirebaseFirestoreException.Code
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.MutableStateFlow
import org.groundplatform.android.system.auth.SignInState
import org.groundplatform.android.ui.theme.AppTheme
import org.groundplatform.ui.theme.AppTheme
import org.junit.Before
import org.junit.Rule
import org.junit.Test
Expand Down
Binary file added core/ui/src/commonMain/composeResources/font/manrope_bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added core/ui/src/commonMain/composeResources/font/manrope_medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file added core/ui/src/commonMain/composeResources/font/urbanist_bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added core/ui/src/commonMain/composeResources/font/urbanist_medium.ttf
View file
Open in desktop
Binary file not shown.
Loading
Loading