From e0a3451bcb9f3bc91dd295df1d17aa9311f6a93d Mon Sep 17 00:00:00 2001 From: Grzegorz Orczykowski Date: Wed, 31 Jul 2024 22:10:36 +0200 Subject: [PATCH] Fixed imports --- .../android/formmanagement/formmap/FormMapViewModel.kt | 2 +- .../android/formmanagement/formmap/FormMapViewModelTest.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/collect_app/src/main/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModel.kt b/collect_app/src/main/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModel.kt index 720f070dd20..ab29a8644bd 100644 --- a/collect_app/src/main/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModel.kt +++ b/collect_app/src/main/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModel.kt @@ -179,7 +179,7 @@ class FormMapViewModel( .getBoolean(ProtectedProjectKeys.KEY_EDIT_SAVED) return IconifiedText( - if (canEditSaved) R.drawable.ic_edit else R.drawable.ic_visibility, + if (canEditSaved) org.odk.collect.icons.R.drawable.ic_edit else R.drawable.ic_visibility, resources.getString(if (canEditSaved) org.odk.collect.strings.R.string.edit_data else org.odk.collect.strings.R.string.view_data) ) } diff --git a/collect_app/src/test/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModelTest.kt b/collect_app/src/test/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModelTest.kt index 12324d344fb..039e6980075 100644 --- a/collect_app/src/test/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModelTest.kt +++ b/collect_app/src/test/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModelTest.kt @@ -113,7 +113,7 @@ class FormMapViewModelTest { smallIcon = R.drawable.ic_room_form_state_incomplete_24dp, largeIcon = R.drawable.ic_room_form_state_incomplete_48dp, action = IconifiedText( - R.drawable.ic_edit, + org.odk.collect.icons.R.drawable.ic_edit, application.getString(org.odk.collect.strings.R.string.edit_data) ), info = formatDate( @@ -152,7 +152,7 @@ class FormMapViewModelTest { smallIcon = R.drawable.ic_room_form_state_incomplete_24dp, largeIcon = R.drawable.ic_room_form_state_incomplete_48dp, action = IconifiedText( - R.drawable.ic_edit, + org.odk.collect.icons.R.drawable.ic_edit, application.getString(org.odk.collect.strings.R.string.edit_data) ), info = formatDate( @@ -191,7 +191,7 @@ class FormMapViewModelTest { smallIcon = R.drawable.ic_room_form_state_incomplete_24dp, largeIcon = R.drawable.ic_room_form_state_incomplete_48dp, action = IconifiedText( - R.drawable.ic_edit, + org.odk.collect.icons.R.drawable.ic_edit, application.getString(org.odk.collect.strings.R.string.edit_data) ), info = formatDate(