From 49fdf6c236f6cb55c52fd31e38eaea50599238db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=E2=89=A1ZRS?= <12814349+LZRS@users.noreply.github.com>
Date: Sat, 25 Oct 2025 01:33:20 +0300
Subject: [PATCH] Migrate AttachmentViewHolderFactory to compose

---
 ...AttachmentViewHolderFactoryEspressoTest.kt | 282 ++++--
 .../MoreQuestionnaireItemComponents.kt        |   2 +-
 .../attachment/CameraLauncherFragment.kt      |  69 --
 .../OpenDocumentLauncherFragment.kt           |  43 -
 .../datacapture/views/compose/ErrorText.kt    |  40 +
 .../factories/AttachmentViewHolderFactory.kt  | 839 ++++++++++--------
 .../res/layout/attachment_file_preview.xml    |  86 --
 .../res/layout/attachment_photo_preview.xml   |  72 --
 .../src/main/res/layout/attachment_view.xml   | 162 ----
 datacapture/src/main/res/values/strings.xml   |   6 +
 10 files changed, 701 insertions(+), 900 deletions(-)
 delete mode 100644 datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/CameraLauncherFragment.kt
 delete mode 100644 datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/OpenDocumentLauncherFragment.kt
 create mode 100644 datacapture/src/main/java/com/google/android/fhir/datacapture/views/compose/ErrorText.kt
 delete mode 100644 datacapture/src/main/res/layout/attachment_file_preview.xml
 delete mode 100644 datacapture/src/main/res/layout/attachment_photo_preview.xml
 delete mode 100644 datacapture/src/main/res/layout/attachment_view.xml

diff --git a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/views/AttachmentViewHolderFactoryEspressoTest.kt b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/views/AttachmentViewHolderFactoryEspressoTest.kt
index 07fbb2bc20..d9d4bf0877 100644
--- a/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/views/AttachmentViewHolderFactoryEspressoTest.kt
+++ b/datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/views/AttachmentViewHolderFactoryEspressoTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google LLC
+ * Copyright 2023-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,15 @@
 package com.google.android.fhir.datacapture.test.views
 
 import android.util.Base64
-import android.view.View
-import android.widget.Button
 import android.widget.FrameLayout
-import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotDisplayed
+import androidx.compose.ui.test.assertTextEquals
+import androidx.compose.ui.test.junit4.createEmptyComposeRule
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
@@ -29,9 +33,11 @@ import com.google.android.fhir.datacapture.R
 import com.google.android.fhir.datacapture.test.TestActivity
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import com.google.android.fhir.datacapture.views.factories.ATTACHMENT_MEDIA_PREVIEW_TAG
 import com.google.android.fhir.datacapture.views.factories.AttachmentViewHolderFactory
 import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
-import com.google.common.truth.Truth.assertThat
+import com.google.android.fhir.datacapture.views.factories.TAKE_PHOTO_BUTTON_TAG
+import com.google.android.fhir.datacapture.views.factories.UPLOAD_FILE_BUTTON_TAG
 import org.hl7.fhir.r4.model.Attachment
 import org.hl7.fhir.r4.model.CodeType
 import org.hl7.fhir.r4.model.Questionnaire
@@ -44,19 +50,22 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class AttachmentViewHolderFactoryEspressoTest {
 
-  @Rule
-  @JvmField
+  @get:Rule
   var activityScenarioRule: ActivityScenarioRule<TestActivity> =
     ActivityScenarioRule(TestActivity::class.java)
 
-  private lateinit var parent: FrameLayout
+  @get:Rule val composeTestRule = createEmptyComposeRule()
+
   private lateinit var viewHolder: QuestionnaireItemViewHolder
 
   @Before
   fun setup() {
-    activityScenarioRule.getScenario().onActivity { activity -> parent = FrameLayout(activity) }
-    viewHolder = AttachmentViewHolderFactory.create(parent)
-    setTestLayout(viewHolder.itemView)
+    activityScenarioRule.scenario.onActivity { activity ->
+      viewHolder = AttachmentViewHolderFactory.create(FrameLayout(activity))
+      activity.setContentView(viewHolder.itemView)
+    }
+
+    InstrumentationRegistry.getInstrumentation().waitForIdleSync()
   }
 
   @Test
@@ -74,16 +83,14 @@ class AttachmentViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    assertThat(viewHolder.itemView.findViewById<Button>(R.id.take_photo).visibility)
-      .isEqualTo(View.VISIBLE)
+    viewHolder.bind(questionnaireItemView)
 
-    assertThat(viewHolder.itemView.findViewById<Button>(R.id.upload_photo).visibility)
-      .isEqualTo(View.VISIBLE)
-
-    assertThat(viewHolder.itemView.findViewById<Button>(R.id.upload_photo).text)
-      .isEqualTo(parent.context.getString(R.string.upload_photo))
+    val context = viewHolder.itemView.context
+    composeTestRule.onNodeWithTag(TAKE_PHOTO_BUTTON_TAG).assertIsDisplayed()
+    composeTestRule.onNodeWithTag(UPLOAD_FILE_BUTTON_TAG).assertIsDisplayed()
+    composeTestRule
+      .onNodeWithTag(UPLOAD_FILE_BUTTON_TAG)
+      .assertTextEquals(context.getString(R.string.upload_photo))
   }
 
   @Test
@@ -101,13 +108,13 @@ class AttachmentViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    assertThat(viewHolder.itemView.findViewById<Button>(R.id.upload_audio).visibility)
-      .isEqualTo(View.VISIBLE)
+    viewHolder.bind(questionnaireItemView)
 
-    assertThat(viewHolder.itemView.findViewById<Button>(R.id.upload_audio).text)
-      .isEqualTo(parent.context.getString(R.string.upload_audio))
+    composeTestRule.onNodeWithTag(UPLOAD_FILE_BUTTON_TAG).assertIsDisplayed()
+    val context = viewHolder.itemView.context
+    composeTestRule
+      .onNodeWithTag(UPLOAD_FILE_BUTTON_TAG)
+      .assertTextEquals(context.getString(R.string.upload_audio))
   }
 
   @Test
@@ -125,13 +132,13 @@ class AttachmentViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemView) }
+    viewHolder.bind(questionnaireItemView)
 
-    assertThat(viewHolder.itemView.findViewById<Button>(R.id.upload_video).visibility)
-      .isEqualTo(View.VISIBLE)
-
-    assertThat(viewHolder.itemView.findViewById<Button>(R.id.upload_video).text)
-      .isEqualTo(parent.context.getString(R.string.upload_video))
+    composeTestRule.onNodeWithTag(UPLOAD_FILE_BUTTON_TAG).assertIsDisplayed()
+    val context = viewHolder.itemView.context
+    composeTestRule
+      .onNodeWithTag(UPLOAD_FILE_BUTTON_TAG)
+      .assertTextEquals(context.getString(R.string.upload_video))
   }
 
   @Test
@@ -149,13 +156,13 @@ class AttachmentViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    assertThat(viewHolder.itemView.findViewById<Button>(R.id.upload_document).visibility)
-      .isEqualTo(View.VISIBLE)
+    viewHolder.bind(questionnaireItemView)
 
-    assertThat(viewHolder.itemView.findViewById<Button>(R.id.upload_document).text)
-      .isEqualTo(parent.context.getString(R.string.upload_document))
+    composeTestRule.onNodeWithTag(UPLOAD_FILE_BUTTON_TAG).assertIsDisplayed()
+    val context = viewHolder.itemView.context
+    composeTestRule
+      .onNodeWithTag(UPLOAD_FILE_BUTTON_TAG)
+      .assertTextEquals(context.getString(R.string.upload_document))
   }
 
   @Test
@@ -177,16 +184,14 @@ class AttachmentViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemView) }
+    viewHolder.bind(questionnaireItemView)
 
-    assertThat(viewHolder.itemView.findViewById<Button>(R.id.take_photo).visibility)
-      .isEqualTo(View.VISIBLE)
-
-    assertThat(viewHolder.itemView.findViewById<Button>(R.id.upload_file).visibility)
-      .isEqualTo(View.VISIBLE)
-
-    assertThat(viewHolder.itemView.findViewById<Button>(R.id.upload_file).text)
-      .isEqualTo(parent.context.getString(R.string.upload_file))
+    val context = viewHolder.itemView.context
+    composeTestRule.onNodeWithTag(TAKE_PHOTO_BUTTON_TAG).assertIsDisplayed()
+    composeTestRule.onNodeWithTag(UPLOAD_FILE_BUTTON_TAG).assertIsDisplayed()
+    composeTestRule
+      .onNodeWithTag(UPLOAD_FILE_BUTTON_TAG)
+      .assertTextEquals(context.getString(R.string.upload_file))
   }
 
   @Test
@@ -219,12 +224,10 @@ class AttachmentViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemView) }
+    viewHolder.bind(questionnaireItemView)
 
-    assertThat(viewHolder.itemView.findViewById<ConstraintLayout>(R.id.photo_preview).visibility)
-      .isEqualTo(View.VISIBLE)
-
-    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.photo_title).text).isEqualTo("IMG_1")
+    composeTestRule.onNodeWithTag(ATTACHMENT_MEDIA_PREVIEW_TAG).assertIsDisplayed()
+    composeTestRule.onNodeWithText("IMG_1").assertIsDisplayed()
   }
 
   @Test
@@ -257,13 +260,10 @@ class AttachmentViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    assertThat(viewHolder.itemView.findViewById<ConstraintLayout>(R.id.file_preview).visibility)
-      .isEqualTo(View.VISIBLE)
+    viewHolder.bind(questionnaireItemView)
 
-    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.file_title).text)
-      .isEqualTo("Audio File")
+    composeTestRule.onNodeWithTag(ATTACHMENT_MEDIA_PREVIEW_TAG).assertIsDisplayed()
+    composeTestRule.onNodeWithText("Audio File").assertIsDisplayed()
   }
 
   @Test
@@ -296,13 +296,10 @@ class AttachmentViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemView) }
+    viewHolder.bind(questionnaireItemView)
 
-    assertThat(viewHolder.itemView.findViewById<ConstraintLayout>(R.id.file_preview).visibility)
-      .isEqualTo(View.VISIBLE)
-
-    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.file_title).text)
-      .isEqualTo("Video File")
+    composeTestRule.onNodeWithTag(ATTACHMENT_MEDIA_PREVIEW_TAG).assertIsDisplayed()
+    composeTestRule.onNodeWithText("Video File").assertIsDisplayed()
   }
 
   @Test
@@ -335,13 +332,10 @@ class AttachmentViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    assertThat(viewHolder.itemView.findViewById<ConstraintLayout>(R.id.file_preview).visibility)
-      .isEqualTo(View.VISIBLE)
+    viewHolder.bind(questionnaireItemView)
 
-    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.file_title).text)
-      .isEqualTo("Document File")
+    composeTestRule.onNodeWithTag(ATTACHMENT_MEDIA_PREVIEW_TAG).assertIsDisplayed()
+    composeTestRule.onNodeWithText("Document File").assertIsDisplayed()
   }
 
   @Test
@@ -363,13 +357,12 @@ class AttachmentViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemView) }
-
-    assertThat(viewHolder.itemView.findViewById<ConstraintLayout>(R.id.photo_preview).visibility)
-      .isEqualTo(View.GONE)
+    viewHolder.bind(questionnaireItemView)
 
-    assertThat(viewHolder.itemView.findViewById<ConstraintLayout>(R.id.file_preview).visibility)
-      .isEqualTo(View.GONE)
+    composeTestRule
+      .onNodeWithTag(ATTACHMENT_MEDIA_PREVIEW_TAG)
+      .assertIsNotDisplayed()
+      .assertDoesNotExist()
   }
 
   @Test
@@ -406,10 +399,9 @@ class AttachmentViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItem) }
+    viewHolder.bind(questionnaireItem)
 
-    assertThat(viewHolder.itemView.findViewById<ConstraintLayout>(R.id.photo_preview).visibility)
-      .isEqualTo(View.VISIBLE)
+    composeTestRule.onNodeWithTag(ATTACHMENT_MEDIA_PREVIEW_TAG).assertIsDisplayed()
 
     val questionnaireItemWithNullAnswer =
       QuestionnaireViewItem(
@@ -428,20 +420,130 @@ class AttachmentViewHolderFactoryEspressoTest {
         answersChangedCallback = { _, _, _, _ -> },
       )
 
-    runOnUI { viewHolder.bind(questionnaireItemWithNullAnswer) }
+    viewHolder.bind(questionnaireItemWithNullAnswer)
 
-    assertThat(viewHolder.itemView.findViewById<ConstraintLayout>(R.id.photo_preview).visibility)
-      .isEqualTo(View.GONE)
+    composeTestRule
+      .onNodeWithTag(ATTACHMENT_MEDIA_PREVIEW_TAG)
+      .assertIsNotDisplayed()
+      .assertDoesNotExist()
   }
 
-  /** Method to run code snippet on UI/main thread */
-  private fun runOnUI(action: () -> Unit) {
-    activityScenarioRule.scenario.onActivity { activity -> action() }
+  @Test
+  fun showPreviewReplacesPreviewOfPreviousAnswerAttachmentForCurrentAnswerItem() {
+    val questionnaireItem =
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          addExtension().apply {
+            url = "http://hl7.org/fhir/StructureDefinition/mimeType"
+            setValue(CodeType("image/*"))
+          }
+          addExtension().apply {
+            url = "http://hl7.org/fhir/StructureDefinition/mimeType"
+            setValue(CodeType("application/pdf"))
+          }
+        },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+          addAnswer(
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+              value =
+                Attachment().apply {
+                  title = "IMG_1.jpeg"
+                  data =
+                    Base64.decode(
+                      "R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",
+                      Base64.DEFAULT,
+                    )
+                  contentType = "image/jpeg"
+                }
+            },
+          )
+        },
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+
+    viewHolder.bind(questionnaireItem)
+
+    composeTestRule.onNodeWithTag(ATTACHMENT_MEDIA_PREVIEW_TAG).assertIsDisplayed()
+    composeTestRule.onNodeWithText("IMG_1.jpeg").assertIsDisplayed()
+
+    val questionnaireItemWithDocumentAnswer =
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          addExtension().apply {
+            url = "http://hl7.org/fhir/StructureDefinition/mimeType"
+            setValue(CodeType("image/*"))
+          }
+          addExtension().apply {
+            url = "http://hl7.org/fhir/StructureDefinition/mimeType"
+            setValue(CodeType("application/pdf"))
+          }
+        },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+          addAnswer(
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+              value =
+                Attachment().apply {
+                  title = "Yellow Doc"
+                  data =
+                    Base64.decode(
+                      "R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",
+                      Base64.DEFAULT,
+                    )
+                  contentType = "application/pdf"
+                }
+            },
+          )
+        },
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+
+    viewHolder.bind(questionnaireItemWithDocumentAnswer)
+
+    composeTestRule.onNodeWithTag(ATTACHMENT_MEDIA_PREVIEW_TAG).assertIsDisplayed()
+    composeTestRule.onNodeWithText("IMG_1.jpeg").assertIsNotDisplayed().assertDoesNotExist()
+    composeTestRule.onNodeWithText("Yellow Doc").assertIsDisplayed()
   }
 
-  /** Method to set content view for test activity */
-  private fun setTestLayout(view: View) {
-    activityScenarioRule.scenario.onActivity { activity -> activity.setContentView(view) }
-    InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+  @Test
+  fun deleteRemovesPreviewOfAnswerAttachment() {
+    val questionnaireItem =
+      QuestionnaireViewItem(
+        Questionnaire.QuestionnaireItemComponent().apply {
+          addExtension().apply {
+            url = "http://hl7.org/fhir/StructureDefinition/mimeType"
+            setValue(CodeType("image/*"))
+          }
+        },
+        QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+          addAnswer(
+            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+              value =
+                Attachment().apply {
+                  title = "IMG_1.jpeg"
+                  data =
+                    Base64.decode(
+                      "R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",
+                      Base64.DEFAULT,
+                    )
+                  contentType = "image/jpeg"
+                }
+            },
+          )
+        },
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+
+    viewHolder.bind(questionnaireItem)
+    val deleteText = viewHolder.itemView.context.getString(R.string.delete)
+
+    composeTestRule.onNodeWithTag(ATTACHMENT_MEDIA_PREVIEW_TAG).assertIsDisplayed()
+    composeTestRule.onNodeWithText("IMG_1.jpeg").assertIsDisplayed()
+    composeTestRule.onNodeWithContentDescription(deleteText).assertIsDisplayed().performClick()
+
+    composeTestRule.onNodeWithTag(ATTACHMENT_MEDIA_PREVIEW_TAG).assertIsNotDisplayed()
+    composeTestRule.onNodeWithContentDescription(deleteText).assertIsNotDisplayed()
   }
 }
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
index 31b41287a3..056e67b2bc 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt
@@ -579,7 +579,7 @@ internal val QuestionnaireItemComponent.maxSizeInMiBs: BigDecimal?
   get() = maxSizeInBytes?.div(BYTES_PER_MIB)
 
 /** The default maximum size of an attachment is 1 Mebibytes. */
-private val DEFAULT_SIZE = BigDecimal(1048576)
+internal val DEFAULT_SIZE = BigDecimal(1048576)
 
 /** Returns true if given size is above maximum size allowed. */
 internal fun QuestionnaireItemComponent.isGivenSizeOverLimit(
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/CameraLauncherFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/CameraLauncherFragment.kt
deleted file mode 100644
index db9e8ff567..0000000000
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/CameraLauncherFragment.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2022-2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.fhir.datacapture.views.attachment
-
-import android.Manifest
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Bundle
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
-import androidx.core.os.bundleOf
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.setFragmentResult
-import com.google.android.fhir.datacapture.views.factories.AttachmentViewHolderFactory
-import timber.log.Timber
-
-/** Used for launching camera activity */
-class CameraLauncherFragment : DialogFragment() {
-
-  private lateinit var cameraLauncher: ActivityResultLauncher<Uri>
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    val uri = arguments?.get(AttachmentViewHolderFactory.EXTRA_SAVED_PHOTO_URI_KEY) as Uri
-
-    cameraLauncher =
-      registerForActivityResult(ActivityResultContracts.TakePicture()) { isSaved ->
-        setFragmentResult(CAMERA_RESULT_KEY, bundleOf(CAMERA_RESULT_KEY to isSaved))
-        dismiss()
-      }
-
-    if (
-      ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.CAMERA) ==
-        PackageManager.PERMISSION_DENIED
-    ) {
-      registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
-          if (isGranted) {
-            Timber.d("Camera permission granted")
-            cameraLauncher.launch(uri)
-          } else {
-            Timber.d("Camera permission not granted")
-            dismiss()
-          }
-        }
-        .launch(Manifest.permission.CAMERA)
-    } else {
-      cameraLauncher.launch(uri)
-    }
-  }
-
-  companion object {
-    const val CAMERA_RESULT_KEY = "camera_result"
-  }
-}
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/OpenDocumentLauncherFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/OpenDocumentLauncherFragment.kt
deleted file mode 100644
index b3c4f663b5..0000000000
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/attachment/OpenDocumentLauncherFragment.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.fhir.datacapture.views.attachment
-
-import android.os.Bundle
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.os.bundleOf
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.setFragmentResult
-import com.google.android.fhir.datacapture.views.factories.AttachmentViewHolderFactory
-
-/** Used for launching open document activity */
-class OpenDocumentLauncherFragment : DialogFragment() {
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    val mimeTypes = arguments?.getStringArray(AttachmentViewHolderFactory.EXTRA_MIME_TYPE_KEY)
-
-    registerForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
-        setFragmentResult(OPEN_DOCUMENT_RESULT_KEY, bundleOf(OPEN_DOCUMENT_RESULT_KEY to uri))
-        dismiss()
-      }
-      .launch(mimeTypes)
-  }
-
-  companion object {
-    const val OPEN_DOCUMENT_RESULT_KEY = "open_document_result"
-  }
-}
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/compose/ErrorText.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/compose/ErrorText.kt
new file mode 100644
index 0000000000..2bc56bc587
--- /dev/null
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/compose/ErrorText.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.datacapture.views.compose
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.dimensionResource
+import com.google.android.fhir.datacapture.R
+
+@Composable
+internal fun ErrorText(validationMessage: String) {
+  Text(
+    text = validationMessage,
+    style = MaterialTheme.typography.bodySmall,
+    color = MaterialTheme.colorScheme.error,
+    modifier =
+      Modifier.padding(start = dimensionResource(R.dimen.error_text_margin_horizontal))
+        .testTag(ERROR_TEXT_TAG),
+  )
+}
+
+const val ERROR_TEXT_TAG = "error_text"
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AttachmentViewHolderFactory.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AttachmentViewHolderFactory.kt
index 207cb3efa1..e4534d87e4 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AttachmentViewHolderFactory.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/views/factories/AttachmentViewHolderFactory.kt
@@ -16,443 +16,521 @@
 
 package com.google.android.fhir.datacapture.views.factories
 
+import android.Manifest
+import android.content.ContentResolver
 import android.content.Context
+import android.content.pm.PackageManager
+import android.graphics.BitmapFactory
 import android.net.Uri
 import android.provider.OpenableColumns
-import android.view.View
-import android.widget.Button
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
-import androidx.appcompat.app.AppCompatActivity
-import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
-import androidx.core.os.bundleOf
-import androidx.lifecycle.lifecycleScope
-import com.bumptech.glide.Glide
 import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.extensions.DEFAULT_SIZE
 import com.google.android.fhir.datacapture.extensions.MimeType
 import com.google.android.fhir.datacapture.extensions.hasMimeType
 import com.google.android.fhir.datacapture.extensions.hasMimeTypeOnly
-import com.google.android.fhir.datacapture.extensions.isGivenSizeOverLimit
-import com.google.android.fhir.datacapture.extensions.maxSizeInMiBs
+import com.google.android.fhir.datacapture.extensions.itemMedia
+import com.google.android.fhir.datacapture.extensions.maxSizeInBytes
 import com.google.android.fhir.datacapture.extensions.mimeTypes
-import com.google.android.fhir.datacapture.extensions.tryUnwrapContext
 import com.google.android.fhir.datacapture.validation.Invalid
-import com.google.android.fhir.datacapture.validation.NotValidated
-import com.google.android.fhir.datacapture.validation.Valid
-import com.google.android.fhir.datacapture.validation.ValidationResult
-import com.google.android.fhir.datacapture.views.HeaderView
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
-import com.google.android.fhir.datacapture.views.attachment.CameraLauncherFragment
-import com.google.android.fhir.datacapture.views.attachment.OpenDocumentLauncherFragment
-import com.google.android.material.divider.MaterialDivider
-import com.google.android.material.snackbar.Snackbar
+import com.google.android.fhir.datacapture.views.compose.ErrorText
+import com.google.android.fhir.datacapture.views.compose.Header
+import com.google.android.fhir.datacapture.views.compose.MediaItem
 import java.io.File
+import java.math.BigDecimal
 import java.util.Date
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.hl7.fhir.r4.model.Attachment
-import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemComponent
 import org.hl7.fhir.r4.model.QuestionnaireResponse
+import timber.log.Timber
 
-internal object AttachmentViewHolderFactory :
-  QuestionnaireItemAndroidViewHolderFactory(R.layout.attachment_view) {
+internal object AttachmentViewHolderFactory : QuestionnaireItemComposeViewHolderFactory {
   override fun getQuestionnaireItemViewHolderDelegate() =
-    object : QuestionnaireItemAndroidViewHolderDelegate {
-      override lateinit var questionnaireViewItem: QuestionnaireViewItem
-      private lateinit var header: HeaderView
-      private lateinit var errorTextView: TextView
-      private lateinit var takePhotoButton: Button
-      private lateinit var uploadPhotoButton: Button
-      private lateinit var uploadAudioButton: Button
-      private lateinit var uploadVideoButton: Button
-      private lateinit var uploadDocumentButton: Button
-      private lateinit var uploadFileButton: Button
-      private lateinit var divider: MaterialDivider
-      private lateinit var labelUploaded: TextView
-      private lateinit var photoPreview: ConstraintLayout
-      private lateinit var photoThumbnail: ImageView
-      private lateinit var photoTitle: TextView
-      private lateinit var photoDeleteButton: Button
-      private lateinit var filePreview: ConstraintLayout
-      private lateinit var fileIcon: ImageView
-      private lateinit var fileTitle: TextView
-      private lateinit var fileDeleteButton: Button
-      private lateinit var context: AppCompatActivity
-
-      override fun init(itemView: View) {
-        header = itemView.findViewById(R.id.header)
-        errorTextView = itemView.findViewById(R.id.error)
-        takePhotoButton = itemView.findViewById(R.id.take_photo)
-        uploadPhotoButton = itemView.findViewById(R.id.upload_photo)
-        uploadAudioButton = itemView.findViewById(R.id.upload_audio)
-        uploadVideoButton = itemView.findViewById(R.id.upload_video)
-        uploadDocumentButton = itemView.findViewById(R.id.upload_document)
-        uploadFileButton = itemView.findViewById(R.id.upload_file)
-        divider = itemView.findViewById(R.id.divider)
-        labelUploaded = itemView.findViewById(R.id.label_uploaded)
-        photoPreview = itemView.findViewById(R.id.photo_preview)
-        photoThumbnail = itemView.findViewById(R.id.photo_thumbnail)
-        photoTitle = itemView.findViewById(R.id.photo_title)
-        photoDeleteButton = itemView.findViewById(R.id.photo_delete)
-        filePreview = itemView.findViewById(R.id.file_preview)
-        fileIcon = itemView.findViewById(R.id.file_icon)
-        fileTitle = itemView.findViewById(R.id.file_title)
-        fileDeleteButton = itemView.findViewById(R.id.file_delete)
-        context = itemView.context.tryUnwrapContext()!!
-      }
-
-      override fun bind(questionnaireViewItem: QuestionnaireViewItem) {
-        this.questionnaireViewItem = questionnaireViewItem
-        header.bind(questionnaireViewItem, showRequiredOrOptionalText = true)
-        val questionnaireItem = questionnaireViewItem.questionnaireItem
-        displayOrClearInitialPreview()
-        displayTakePhotoButton(questionnaireItem)
-        displayUploadButton(questionnaireItem)
-        takePhotoButton.setOnClickListener { view -> onTakePhotoClicked(view, questionnaireItem) }
-        uploadPhotoButton.setOnClickListener { view -> onUploadClicked(view, questionnaireItem) }
-        uploadAudioButton.setOnClickListener { view -> onUploadClicked(view, questionnaireItem) }
-        uploadVideoButton.setOnClickListener { view -> onUploadClicked(view, questionnaireItem) }
-        uploadDocumentButton.setOnClickListener { view -> onUploadClicked(view, questionnaireItem) }
-        uploadFileButton.setOnClickListener { view -> onUploadClicked(view, questionnaireItem) }
-        photoDeleteButton.setOnClickListener { view -> onDeleteClicked(view) }
-        fileDeleteButton.setOnClickListener { view -> onDeleteClicked(view) }
-        displayValidationResult(questionnaireViewItem.validationResult)
-      }
-
-      private fun displayValidationResult(validationResult: ValidationResult) {
-        when (validationResult) {
-          is NotValidated,
-          Valid, -> errorTextView.visibility = View.GONE
-          is Invalid -> {
-            errorTextView.text = validationResult.getSingleStringValidationMessage()
-            errorTextView.visibility = View.VISIBLE
+    object : QuestionnaireItemComposeViewHolderDelegate {
+
+      @Composable
+      override fun Content(questionnaireViewItem: QuestionnaireViewItem) {
+        val context = LocalContext.current
+        val coroutineScope = rememberCoroutineScope { Dispatchers.Main }
+        val validationResult =
+          remember(questionnaireViewItem.validationResult) {
+            questionnaireViewItem.validationResult
           }
-        }
-      }
-
-      override fun setReadOnly(isReadOnly: Boolean) {
-        takePhotoButton.isEnabled = !isReadOnly
-        uploadPhotoButton.isEnabled = !isReadOnly
-        uploadAudioButton.isEnabled = !isReadOnly
-        uploadVideoButton.isEnabled = !isReadOnly
-        uploadDocumentButton.isEnabled = !isReadOnly
-        uploadFileButton.isEnabled = !isReadOnly
-        photoDeleteButton.isEnabled = !isReadOnly
-        fileDeleteButton.isEnabled = !isReadOnly
-      }
-
-      private fun displayOrClearInitialPreview() {
-        val answer = questionnaireViewItem.answers.firstOrNull()
-
-        // Clear preview if there is no answer to prevent showing old previews in views that have
-        // been recycled.
-        if (answer == null) {
-          clearPhotoPreview()
-          clearFilePreview()
-          return
-        }
-
-        answer.valueAttachment?.let { attachment ->
-          displayPreview(
-            attachmentType = getMimeType(attachment.contentType),
-            attachmentTitle = attachment.title,
-            attachmentByteArray = attachment.data,
-          )
-        }
-      }
-
-      private fun displayTakePhotoButton(questionnaireItem: QuestionnaireItemComponent) {
-        if (questionnaireItem.hasMimeType(MimeType.IMAGE.value)) {
-          takePhotoButton.visibility = View.VISIBLE
-        }
-      }
-
-      private fun displayUploadButton(questionnaireItem: QuestionnaireItemComponent) {
-        when {
-          questionnaireItem.hasMimeTypeOnly(MimeType.AUDIO.value) -> {
-            uploadAudioButton.visibility = View.VISIBLE
+        var errorMessage by
+          remember(validationResult) {
+            mutableStateOf((validationResult as? Invalid)?.getSingleStringValidationMessage())
           }
-          questionnaireItem.hasMimeTypeOnly(MimeType.DOCUMENT.value) -> {
-            uploadDocumentButton.visibility = View.VISIBLE
+        val questionnaireItem =
+          remember(questionnaireViewItem.questionnaireItem) {
+            questionnaireViewItem.questionnaireItem
           }
-          questionnaireItem.hasMimeTypeOnly(MimeType.IMAGE.value) -> {
-            uploadPhotoButton.visibility = View.VISIBLE
+        val readOnly = remember(questionnaireItem) { questionnaireItem.readOnly }
+        val fileMimeTypes =
+          remember(questionnaireItem) { questionnaireItem.mimeTypes.toTypedArray() }
+        var currentAttachment by
+          remember(questionnaireViewItem.answers) {
+            mutableStateOf(questionnaireViewItem.answers.singleOrNull()?.valueAttachment)
           }
-          questionnaireItem.hasMimeTypeOnly(MimeType.VIDEO.value) -> {
-            uploadVideoButton.visibility = View.VISIBLE
-          }
-          else -> {
-            uploadFileButton.visibility = View.VISIBLE
-          }
-        }
-      }
-
-      private fun onTakePhotoClicked(view: View, questionnaireItem: QuestionnaireItemComponent) {
-        val file = File.createTempFile("IMG_", ".jpeg", context.cacheDir)
-        val attachmentUri =
-          FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)
-
-        context.supportFragmentManager.setFragmentResultListener(
-          CameraLauncherFragment.CAMERA_RESULT_KEY,
-          context,
-        ) { _, result ->
-          val isSaved = result.getBoolean(CameraLauncherFragment.CAMERA_RESULT_KEY)
-          if (!isSaved) return@setFragmentResultListener
-
-          if (questionnaireItem.isGivenSizeOverLimit(file.length().toBigDecimal())) {
-            displayError(
-              R.string.max_size_image_above_limit_validation_error_msg,
-              questionnaireItem.maxSizeInMiBs,
-            )
-            displaySnackbar(view, R.string.upload_failed)
-            file.delete()
-            return@setFragmentResultListener
+        val displayTakePhoto =
+          remember(questionnaireItem) { questionnaireItem.hasMimeType(MimeType.IMAGE.value) }
+        val uploadButtonTextResId =
+          remember(questionnaireItem) {
+            when {
+              questionnaireItem.hasMimeTypeOnly(MimeType.AUDIO.value) -> R.string.upload_audio
+              questionnaireItem.hasMimeTypeOnly(MimeType.DOCUMENT.value) -> R.string.upload_document
+              questionnaireItem.hasMimeTypeOnly(MimeType.IMAGE.value) -> R.string.upload_photo
+              questionnaireItem.hasMimeTypeOnly(MimeType.VIDEO.value) -> R.string.upload_video
+              else -> R.string.upload_file
+            }
           }
-
-          val attachmentMimeTypeWithSubType = context.getMimeTypeFromUri(attachmentUri)
-          val attachmentMimeType = getMimeType(attachmentMimeTypeWithSubType)
-          if (!questionnaireItem.hasMimeType(attachmentMimeType)) {
-            displayError(R.string.mime_type_wrong_media_format_validation_error_msg)
-            displaySnackbar(view, R.string.upload_failed)
-            file.delete()
-            return@setFragmentResultListener
+        val uploadButtonIconResId =
+          remember(questionnaireItem) {
+            when {
+              questionnaireItem.hasMimeTypeOnly(MimeType.AUDIO.value) -> R.drawable.ic_audio_file
+              questionnaireItem.hasMimeTypeOnly(MimeType.DOCUMENT.value) ->
+                R.drawable.ic_document_file
+              questionnaireItem.hasMimeTypeOnly(MimeType.IMAGE.value) -> R.drawable.ic_image_file
+              questionnaireItem.hasMimeTypeOnly(MimeType.VIDEO.value) -> R.drawable.ic_video_file
+              else -> R.drawable.ic_file
+            }
           }
-
-          val attachmentByteArray = context.readBytesFromUri(attachmentUri)
-          val answer =
-            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
-              value =
-                Attachment().apply {
-                  contentType = attachmentMimeTypeWithSubType
-                  data = attachmentByteArray
-                  title = file.name
-                  creation = Date()
+        var displayUploadedText by
+          remember(questionnaireViewItem.questionnaireItem) { mutableStateOf(false) }
+
+        Column(
+          modifier =
+            Modifier.padding(
+              horizontal = dimensionResource(R.dimen.item_margin_horizontal),
+              vertical = dimensionResource(R.dimen.item_margin_vertical),
+            ),
+        ) {
+          Header(questionnaireViewItem, showRequiredOrOptionalText = true)
+          questionnaireViewItem.questionnaireItem.itemMedia?.let { MediaItem(it) }
+
+          errorMessage?.takeIf { it.isNotBlank() }?.let { ErrorText(it) }
+
+          Row(
+            modifier = Modifier.padding(top = dimensionResource(R.dimen.header_margin_bottom)),
+            horizontalArrangement =
+              Arrangement.spacedBy(dimensionResource(R.dimen.attachment_action_button_margin_end)),
+          ) {
+            if (displayTakePhoto) {
+              TakePhotoButton(
+                context,
+                enabled = !readOnly,
+                maxFileSizeLimitInBytes = questionnaireItem.maxSizeInBytes ?: DEFAULT_SIZE,
+                supportedMimeType = questionnaireItem::hasMimeType,
+                onFailure = { errorMessage = it },
+              ) { uri, fileName ->
+                coroutineScope.launch {
+                  val attachmentMimeTypeWithSubType = context.getMimeTypeFromUri(uri)
+                  val attachmentByteArray = context.readBytesFromUri(uri)
+                  currentAttachment =
+                    Attachment().apply {
+                      contentType = attachmentMimeTypeWithSubType
+                      data = attachmentByteArray
+                      title = fileName
+                      creation = Date()
+                    }
+
+                  val answer =
+                    QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+                      value = currentAttachment
+                    }
+                  questionnaireViewItem.setAnswer(answer)
+
+                  displayUploadedText = true
                 }
+              }
             }
-          context.lifecycleScope.launch {
-            questionnaireViewItem.setAnswer(answer)
-
-            divider.visibility = View.VISIBLE
-            labelUploaded.visibility = View.VISIBLE
-            displayPreview(
-              attachmentType = attachmentMimeType,
-              attachmentTitle = file.name,
-              attachmentUri = attachmentUri,
-            )
-            displaySnackbarOnUpload(view, attachmentMimeType)
-            file.delete()
-          }
-        }
-
-        CameraLauncherFragment()
-          .apply { arguments = bundleOf(EXTRA_SAVED_PHOTO_URI_KEY to attachmentUri) }
-          .show(context.supportFragmentManager, AttachmentViewHolderFactory.javaClass.simpleName)
-      }
 
-      private fun onUploadClicked(view: View, questionnaireItem: QuestionnaireItemComponent) {
-        context.supportFragmentManager.setFragmentResultListener(
-          OpenDocumentLauncherFragment.OPEN_DOCUMENT_RESULT_KEY,
-          context,
-        ) { _, result ->
-          val attachmentUri =
-            (result.get(OpenDocumentLauncherFragment.OPEN_DOCUMENT_RESULT_KEY)
-              ?: return@setFragmentResultListener)
-              as Uri
-
-          val attachmentByteArray = context.readBytesFromUri(attachmentUri)
-          if (questionnaireItem.isGivenSizeOverLimit(attachmentByteArray.size.toBigDecimal())) {
-            displayError(
-              R.string.max_size_file_above_limit_validation_error_msg,
-              questionnaireItem.maxSizeInMiBs,
-            )
-            displaySnackbar(view, R.string.upload_failed)
-            return@setFragmentResultListener
+            UploadFileButton(
+              context,
+              enabled = !readOnly,
+              uploadButtonIconResId,
+              uploadButtonTextResId,
+              fileMimeTypes,
+              maxFileSizeLimitInBytes = questionnaireItem.maxSizeInBytes ?: DEFAULT_SIZE,
+              supportedMimeType = questionnaireItem::hasMimeType,
+              onFailure = { errorMessage = it },
+            ) {
+              coroutineScope.launch {
+                val attachmentMimeTypeWithSubType = context.getMimeTypeFromUri(it)
+                val attachmentByteArray = context.readBytesFromUri(it)
+                currentAttachment =
+                  Attachment().apply {
+                    contentType = attachmentMimeTypeWithSubType
+                    data = attachmentByteArray
+                    title = getFileName(context.contentResolver, it)
+                    creation = Date()
+                  }
+
+                val answer =
+                  QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+                    value = currentAttachment
+                  }
+                questionnaireViewItem.setAnswer(answer)
+
+                displayUploadedText = true
+              }
+            }
           }
 
-          val attachmentMimeTypeWithSubType = context.getMimeTypeFromUri(attachmentUri)
-          val attachmentMimeType = getMimeType(attachmentMimeTypeWithSubType)
-          if (!questionnaireItem.hasMimeType(attachmentMimeType)) {
-            displayError(R.string.mime_type_wrong_media_format_validation_error_msg)
-            displaySnackbar(view, R.string.upload_failed)
-            return@setFragmentResultListener
+          if (displayUploadedText) {
+            Spacer(
+              modifier = Modifier.height(dimensionResource(R.dimen.attachment_divider_margin_top)),
+            )
+            HorizontalDivider()
+            Spacer(
+              modifier =
+                Modifier.height(dimensionResource(R.dimen.attachment_uploaded_label_margin_top)),
+            )
+            Text(stringResource(R.string.uploaded), style = MaterialTheme.typography.titleSmall)
           }
 
-          val attachmentTitle = getFileName(attachmentUri)
-          val answer =
-            QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
-              value =
-                Attachment().apply {
-                  contentType = attachmentMimeTypeWithSubType
-                  data = attachmentByteArray
-                  title = attachmentTitle
-                  creation = Date()
-                }
+          currentAttachment?.let {
+            Spacer(modifier = Modifier.height(8.dp))
+            AttachmentPreview(
+              it,
+              deleteEnabled = !readOnly,
+            ) {
+              currentAttachment = null
+              displayUploadedText = false
+              coroutineScope.launch { questionnaireViewItem.clearAnswer() }
             }
-          context.lifecycleScope.launch {
-            questionnaireViewItem.setAnswer(answer)
-
-            divider.visibility = View.VISIBLE
-            labelUploaded.visibility = View.VISIBLE
-            displayPreview(
-              attachmentType = attachmentMimeType,
-              attachmentTitle = attachmentTitle,
-              attachmentUri = attachmentUri,
+
+            Spacer(
+              modifier =
+                Modifier.height(dimensionResource(R.dimen.attachment_preview_divider_margin_top)),
             )
-            displaySnackbarOnUpload(view, attachmentMimeType)
+            HorizontalDivider()
           }
         }
+      }
 
-        OpenDocumentLauncherFragment()
-          .apply {
-            arguments = bundleOf(EXTRA_MIME_TYPE_KEY to questionnaireItem.mimeTypes.toTypedArray())
+      private fun getFileName(contentResolver: ContentResolver, uri: Uri): String {
+        var fileName = ""
+        val columns = arrayOf(OpenableColumns.DISPLAY_NAME)
+        contentResolver.query(uri, columns, null, null, null)?.use { cursor ->
+          val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+          if (cursor.moveToFirst() && nameIndex >= 0) {
+            fileName = cursor.getString(nameIndex) ?: ""
           }
-          .show(context.supportFragmentManager, AttachmentViewHolderFactory.javaClass.simpleName)
+        }
+        return fileName
       }
+    }
+}
 
-      private fun displayPreview(
-        attachmentType: String,
-        attachmentTitle: String,
-        attachmentByteArray: ByteArray? = null,
-        attachmentUri: Uri? = null,
-      ) {
-        when (attachmentType) {
-          MimeType.AUDIO.value -> {
-            loadFilePreview(R.drawable.ic_audio_file, attachmentTitle)
-            clearPhotoPreview()
+@Composable
+private fun TakePhotoButton(
+  context: Context,
+  enabled: Boolean,
+  maxFileSizeLimitInBytes: BigDecimal,
+  supportedMimeType: (String) -> Boolean,
+  onFailure: (String) -> Unit,
+  onSuccess: (Uri, String) -> Unit,
+) {
+  val file = remember { File.createTempFile("IMG_", ".jpeg", context.cacheDir) }
+  var attachmentUri by remember(file) { mutableStateOf<Uri?>(null) }
+
+  DisposableEffect(file) {
+    onDispose {
+      if (file.exists()) {
+        file.delete()
+      }
+    }
+  }
+
+  val bytesInMB = remember { BigDecimal(BYTES_IN_MB) }
+  val mediaNotSavedError = stringResource(R.string.media_not_saved_validation_error_msg)
+  val maxSizeImageLimitErrorMessage =
+    stringResource(
+      R.string.max_size_image_above_limit_validation_error_msg,
+      maxFileSizeLimitInBytes.div(bytesInMB),
+    )
+  val wrongMediaFormatErrorMessage =
+    stringResource(R.string.mime_type_wrong_media_format_validation_error_msg)
+
+  val takePictureLauncher =
+    rememberLauncherForActivityResult(
+      contract = ActivityResultContracts.TakePicture(),
+      onResult = { success ->
+        when {
+          !success -> {
+            onFailure(mediaNotSavedError)
           }
-          MimeType.DOCUMENT.value -> {
-            loadFilePreview(R.drawable.ic_document_file, attachmentTitle)
-            clearPhotoPreview()
+          file.length().toBigDecimal() > maxFileSizeLimitInBytes -> {
+            onFailure(maxSizeImageLimitErrorMessage)
           }
-          MimeType.IMAGE.value -> {
-            if (attachmentByteArray != null) {
-              loadPhotoPreview(attachmentByteArray, attachmentTitle)
-            } else if (attachmentUri != null) {
-              loadPhotoPreview(attachmentUri, attachmentTitle)
-            }
-            clearFilePreview()
+          !supportedMimeType(getMimeType(context.getMimeTypeFromUri(attachmentUri!!))) -> {
+            onFailure(wrongMediaFormatErrorMessage)
           }
-          MimeType.VIDEO.value -> {
-            loadFilePreview(R.drawable.ic_video_file, attachmentTitle)
-            clearPhotoPreview()
+          else -> {
+            onSuccess(attachmentUri!!, file.name)
           }
         }
+      },
+    )
+
+  val cameraPermissionDeniedError = stringResource(R.string.camera_permission_denied_error_msg)
+
+  val requestPermissionLauncher =
+    rememberLauncherForActivityResult(
+      ActivityResultContracts.RequestPermission(),
+    ) { isGranted: Boolean ->
+      if (isGranted) {
+        Timber.d("Camera permission granted")
+        attachmentUri =
+          FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)
+        takePictureLauncher.launch(attachmentUri!!)
+      } else {
+        Timber.d("Camera permission not granted")
+        onFailure(cameraPermissionDeniedError)
       }
+    }
 
-      private fun loadFilePreview(@DrawableRes iconResource: Int, title: String) {
-        filePreview.visibility = View.VISIBLE
-        Glide.with(context).load(iconResource).into(fileIcon)
-        fileTitle.text = title
-      }
-
-      private fun clearFilePreview() {
-        filePreview.visibility = View.GONE
-        Glide.with(context).clear(fileIcon)
-        fileTitle.text = ""
-      }
-
-      private fun loadPhotoPreview(byteArray: ByteArray, title: String) {
-        photoPreview.visibility = View.VISIBLE
-        Glide.with(context).load(byteArray).into(photoThumbnail)
-        photoTitle.text = title
-      }
+  val launcherAction = {
+    if (
+      ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) ==
+        PackageManager.PERMISSION_GRANTED
+    ) {
+      attachmentUri =
+        FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)
+      takePictureLauncher.launch(attachmentUri!!)
+    } else {
+      requestPermissionLauncher.launch(Manifest.permission.CAMERA)
+    }
+  }
+
+  OutlinedButton(
+    modifier = Modifier.testTag(TAKE_PHOTO_BUTTON_TAG),
+    onClick = { launcherAction.invoke() },
+    enabled = enabled,
+    colors =
+      ButtonDefaults.outlinedButtonColors().copy(contentColor = MaterialTheme.colorScheme.primary),
+  ) {
+    val takePhotoText = stringResource(R.string.take_photo)
+    Icon(
+      painterResource(R.drawable.ic_camera),
+      tint = MaterialTheme.colorScheme.primary,
+      contentDescription = takePhotoText,
+      modifier = Modifier.size(dimensionResource(R.dimen.attachment_action_button_icon_size)),
+    )
+    Spacer(modifier = Modifier.width(BUTTON_ICON_SPACING.dp))
+    Text(takePhotoText)
+  }
+}
 
-      private fun loadPhotoPreview(uri: Uri, title: String) {
-        photoPreview.visibility = View.VISIBLE
-        Glide.with(context).load(uri).into(photoThumbnail)
-        photoTitle.text = title
-      }
+@Composable
+private fun UploadFileButton(
+  context: Context,
+  enabled: Boolean,
+  uploadButtonIconResId: Int,
+  uploadButtonTextResId: Int,
+  mimeTypes: Array<String>,
+  maxFileSizeLimitInBytes: BigDecimal,
+  supportedMimeType: (String) -> Boolean,
+  onFailure: (String) -> Unit,
+  onSuccess: (Uri) -> Unit,
+) {
+  val bytesInMB = remember { BigDecimal(BYTES_IN_MB) }
+  val maxSizeImageLimitErrorMessage =
+    stringResource(
+      R.string.max_size_file_above_limit_validation_error_msg,
+      maxFileSizeLimitInBytes.div(bytesInMB),
+    )
+  val wrongMediaFormatErrorMessage =
+    stringResource(R.string.mime_type_wrong_media_format_validation_error_msg)
+
+  val openDocumentLauncher =
+    rememberLauncherForActivityResult(
+      contract = ActivityResultContracts.OpenDocument(),
+      onResult = { uri ->
+        if (uri == null) {
+          return@rememberLauncherForActivityResult
+        }
 
-      private fun clearPhotoPreview() {
-        photoPreview.visibility = View.GONE
-        Glide.with(context).clear(photoThumbnail)
-        photoTitle.text = ""
-      }
+        val attachmentByteArray = context.readBytesFromUri(uri)
+        if (attachmentByteArray.size.toBigDecimal() > maxFileSizeLimitInBytes) {
+          onFailure(maxSizeImageLimitErrorMessage)
+          return@rememberLauncherForActivityResult
+        }
 
-      private fun onDeleteClicked(view: View) {
-        context.lifecycleScope.launch {
-          questionnaireViewItem.clearAnswer()
-          divider.visibility = View.GONE
-          labelUploaded.visibility = View.GONE
-          clearPhotoPreview()
-          clearFilePreview()
-          displaySnackbarOnDelete(
-            view,
-            getMimeType(questionnaireViewItem.answers.first().valueAttachment.contentType),
-          )
+        val attachmentMimeTypeWithSubType = context.getMimeTypeFromUri(uri)
+        val attachmentMimeType = getMimeType(attachmentMimeTypeWithSubType)
+        if (!supportedMimeType(attachmentMimeType)) {
+          onFailure(wrongMediaFormatErrorMessage)
+          return@rememberLauncherForActivityResult
         }
-      }
 
-      private fun displaySnackbar(view: View, @StringRes textResource: Int) {
-        Snackbar.make(view, context.getString(textResource), Snackbar.LENGTH_SHORT).show()
-      }
+        onSuccess(uri)
+      },
+    )
+
+  OutlinedButton(
+    modifier = Modifier.testTag(UPLOAD_FILE_BUTTON_TAG),
+    onClick = { openDocumentLauncher.launch(mimeTypes) },
+    enabled = enabled,
+    colors =
+      ButtonDefaults.outlinedButtonColors().copy(contentColor = MaterialTheme.colorScheme.primary),
+  ) {
+    Icon(
+      painterResource(uploadButtonIconResId),
+      contentDescription = stringResource(uploadButtonTextResId),
+      tint = MaterialTheme.colorScheme.primary,
+      modifier = Modifier.size(dimensionResource(R.dimen.attachment_action_button_icon_size)),
+    )
+    Spacer(modifier = Modifier.width(BUTTON_ICON_SPACING.dp))
+    Text(stringResource(uploadButtonTextResId))
+  }
+}
 
-      private fun displaySnackbarOnUpload(view: View, attachmentType: String) {
-        when (attachmentType) {
-          MimeType.AUDIO.value -> {
-            displaySnackbar(view, R.string.audio_uploaded)
-          }
-          MimeType.DOCUMENT.value -> {
-            displaySnackbar(view, R.string.file_uploaded)
-          }
-          MimeType.IMAGE.value -> {
-            displaySnackbar(view, R.string.image_uploaded)
-          }
-          MimeType.VIDEO.value -> {
-            displaySnackbar(view, R.string.video_uploaded)
+@Composable
+private fun AttachmentPreview(
+  attachment: Attachment,
+  deleteEnabled: Boolean,
+  onDeleteClick: () -> Unit,
+) {
+  Row(
+    modifier = Modifier.testTag(ATTACHMENT_MEDIA_PREVIEW_TAG).fillMaxWidth(),
+    horizontalArrangement = Arrangement.SpaceBetween,
+    verticalAlignment = Alignment.CenterVertically,
+  ) {
+    Row(
+      modifier = Modifier.weight(1f),
+      horizontalArrangement = Arrangement.spacedBy(8.dp),
+      verticalAlignment = Alignment.CenterVertically,
+    ) {
+      val mimeType = remember(attachment.contentType) { getMimeType(attachment.contentType) }
+
+      when (mimeType) {
+        MimeType.AUDIO.value,
+        MimeType.DOCUMENT.value,
+        MimeType.VIDEO.value, -> {
+          val iconRes =
+            remember(mimeType) {
+              when (mimeType) {
+                MimeType.AUDIO.value -> R.drawable.ic_audio_file
+                MimeType.DOCUMENT.value -> R.drawable.ic_document_file
+                MimeType.VIDEO.value -> R.drawable.ic_video_file
+                else -> R.drawable.ic_file
+              }
+            }
+          Box(
+            modifier =
+              Modifier.size(
+                  dimensionResource(
+                    R.dimen.attachment_preview_photo_and_preview_file_icon_background_width,
+                  ),
+                )
+                .background(
+                  color = MaterialTheme.colorScheme.primaryContainer,
+                  shape = RoundedCornerShape(8.dp),
+                ),
+            contentAlignment = Alignment.Center,
+          ) {
+            Icon(
+              painterResource(iconRes),
+              contentDescription = stringResource(R.string.cd_file_icon_preview),
+              modifier =
+                Modifier.padding(dimensionResource(R.dimen.attachment_preview_file_icon_margin)),
+            )
           }
         }
-      }
-
-      private fun displaySnackbarOnDelete(view: View, attachmentType: String) {
-        when (attachmentType) {
-          MimeType.AUDIO.value -> {
-            displaySnackbar(view, R.string.audio_deleted)
-          }
-          MimeType.DOCUMENT.value -> {
-            displaySnackbar(view, R.string.file_deleted)
-          }
-          MimeType.IMAGE.value -> {
-            displaySnackbar(view, R.string.image_deleted)
-          }
-          MimeType.VIDEO.value -> {
-            displaySnackbar(view, R.string.video_deleted)
+        MimeType.IMAGE.value -> {
+          val bitmap =
+            remember(attachment.data) {
+              BitmapFactory.decodeByteArray(
+                attachment.data,
+                0,
+                attachment.data.size,
+              )
+            }
+          bitmap?.let {
+            Image(
+              bitmap = bitmap.asImageBitmap(),
+              contentDescription = stringResource(R.string.cd_photo_preview),
+              modifier =
+                Modifier.size(
+                    dimensionResource(
+                      R.dimen.attachment_preview_photo_and_preview_file_icon_background_width,
+                    ),
+                  )
+                  .clip(
+                    RoundedCornerShape(8.dp),
+                  ),
+              contentScale = ContentScale.Crop,
+            )
           }
         }
       }
 
-      private fun displayError(@StringRes textResource: Int) {
-        displayValidationResult(
-          Invalid(
-            listOf(
-              context.getString(
-                textResource,
-              ),
-            ),
-          ),
-        )
-      }
-
-      private fun displayError(@StringRes textResource: Int, vararg formatArgs: Any?) {
-        displayValidationResult(Invalid(listOf(context.getString(textResource, *formatArgs))))
-      }
-
-      private fun getFileName(uri: Uri): String {
-        var fileName = ""
-        val columns = arrayOf(OpenableColumns.DISPLAY_NAME)
-        context.contentResolver.query(uri, columns, null, null, null)?.use { cursor ->
-          val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-          cursor.moveToFirst()
-          fileName = cursor.getString(nameIndex)
-        }
-        return fileName
-      }
+      Text(
+        text = attachment.title,
+        style = MaterialTheme.typography.bodyLarge,
+        overflow = TextOverflow.Ellipsis,
+        maxLines = 1,
+        modifier = Modifier.weight(1f),
+      )
     }
 
-  const val EXTRA_MIME_TYPE_KEY = "mime_type"
-  const val EXTRA_SAVED_PHOTO_URI_KEY = "saved_photo_uri"
+    OutlinedButton(
+      onClick = { onDeleteClick.invoke() },
+      enabled = deleteEnabled,
+    ) {
+      Icon(
+        painter = painterResource(R.drawable.ic_delete),
+        tint = MaterialTheme.colorScheme.error,
+        contentDescription = stringResource(R.string.delete),
+      )
+      Spacer(modifier = Modifier.width(BUTTON_ICON_SPACING.dp))
+      Text(stringResource(R.string.delete), color = MaterialTheme.colorScheme.error)
+    }
+  }
 }
 
 /** Returns the main MIME type of a MIME type string (e.g. image/png returns image). */
@@ -465,3 +543,10 @@ private fun Context.readBytesFromUri(uri: Uri): ByteArray {
 private fun Context.getMimeTypeFromUri(uri: Uri): String {
   return contentResolver.getType(uri) ?: "*/*"
 }
+
+private const val BYTES_IN_MB = 1048576L
+private const val BUTTON_ICON_SPACING = 4
+
+const val TAKE_PHOTO_BUTTON_TAG = "TakePhotoButton"
+const val UPLOAD_FILE_BUTTON_TAG = "UploadFileButton"
+const val ATTACHMENT_MEDIA_PREVIEW_TAG = "photo_preview"
diff --git a/datacapture/src/main/res/layout/attachment_file_preview.xml b/datacapture/src/main/res/layout/attachment_file_preview.xml
deleted file mode 100644
index a83b20d08c..0000000000
--- a/datacapture/src/main/res/layout/attachment_file_preview.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
- Copyright 2023 Google LLC
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/item_margin_horizontal"
-    android:layout_marginTop="@dimen/attachment_preview_margin_top"
->
-
-    <View
-        android:id="@+id/file_icon_background"
-        style="?attr/questionnaireAttachmentPreviewIconBackgroundStyle"
-        android:layout_width="@dimen/attachment_preview_photo_and_preview_file_icon_background_width"
-        android:layout_height="@dimen/attachment_preview_photo_and_preview_file_icon_background_height"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:background="@drawable/rounded_corner_preview_icon_bg_filled"
-    />
-
-    <ImageView
-        android:id="@+id/file_icon"
-        style="?attr/questionnaireAttachmentPreviewIconStyle"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="@dimen/attachment_preview_file_icon_margin"
-        android:contentDescription="@string/cd_file_icon_preview"
-        app:layout_constraintBottom_toBottomOf="@id/file_icon_background"
-        app:layout_constraintEnd_toEndOf="@id/file_icon_background"
-        app:layout_constraintStart_toStartOf="@id/file_icon_background"
-        app:layout_constraintTop_toTopOf="@id/file_icon_background"
-        tools:src="@drawable/ic_video_file"
-        tools:tint="#1453D0"
-    />
-
-    <com.google.android.material.divider.MaterialDivider
-        android:id="@+id/divider"
-        style="?attr/questionnaireAttachmentDividerStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/attachment_preview_divider_margin_top"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/file_icon_background"
-    />
-
-    <TextView
-        android:id="@+id/file_title"
-        style="?attr/questionnaireAttachmentPreviewTitleStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/attachment_preview_title_margin_horizontal"
-        app:layout_constraintBottom_toBottomOf="@id/file_icon_background"
-        app:layout_constraintEnd_toStartOf="@id/file_delete"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toEndOf="@id/file_icon_background"
-        app:layout_constraintTop_toTopOf="@id/file_icon_background"
-        tools:text="sample-video.mov"
-    />
-
-    <Button
-        android:id="@+id/file_delete"
-        style="?attr/questionnaireAttachmentDeleteButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="@id/file_icon_background"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/file_icon_background"
-    />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/datacapture/src/main/res/layout/attachment_photo_preview.xml b/datacapture/src/main/res/layout/attachment_photo_preview.xml
deleted file mode 100644
index dde864ed61..0000000000
--- a/datacapture/src/main/res/layout/attachment_photo_preview.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
- Copyright 2023 Google LLC
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginHorizontal="@dimen/item_margin_horizontal"
-    android:layout_marginTop="@dimen/attachment_preview_margin_top"
->
-
-    <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/photo_thumbnail"
-        android:layout_width="@dimen/attachment_preview_photo_and_preview_file_icon_background_width"
-        android:layout_height="@dimen/attachment_preview_photo_and_preview_file_icon_background_height"
-        android:contentDescription="@string/cd_photo_preview"
-        android:scaleType="centerCrop"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:shapeAppearance="@style/Questionnaire.ShapeAppearance.AttachmentPreviewPhoto"
-    />
-
-    <com.google.android.material.divider.MaterialDivider
-        android:id="@+id/divider"
-        style="?attr/questionnaireAttachmentDividerStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/attachment_preview_divider_margin_top"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/photo_thumbnail"
-    />
-
-    <TextView
-        android:id="@+id/photo_title"
-        style="?attr/questionnaireAttachmentPreviewTitleStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/attachment_preview_title_margin_horizontal"
-        app:layout_constraintBottom_toBottomOf="@id/photo_thumbnail"
-        app:layout_constraintEnd_toStartOf="@id/photo_delete"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toEndOf="@id/photo_thumbnail"
-        app:layout_constraintTop_toTopOf="@id/photo_thumbnail"
-        tools:text="sample-image.jpeg"
-    />
-
-    <Button
-        android:id="@+id/photo_delete"
-        style="?attr/questionnaireAttachmentDeleteButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="@id/photo_thumbnail"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/photo_thumbnail"
-    />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/datacapture/src/main/res/layout/attachment_view.xml b/datacapture/src/main/res/layout/attachment_view.xml
deleted file mode 100644
index 94b2ab2bba..0000000000
--- a/datacapture/src/main/res/layout/attachment_view.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
- Copyright 2020 Google LLC
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginVertical="@dimen/item_margin_vertical"
-    android:orientation="vertical"
->
-
-    <com.google.android.fhir.datacapture.views.HeaderView
-        android:id="@+id/header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/item_margin_horizontal"
-    />
-
-    <com.google.android.fhir.datacapture.views.MediaView
-        android:id="@+id/item_media"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-    />
-
-    <include
-        android:id="@+id/error"
-        layout="@layout/input_error_text_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/item_margin_horizontal"
-        android:layout_marginTop="@dimen/attachment_error_margin_top"
-    />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/item_margin_horizontal"
-        android:layout_marginTop="@dimen/header_margin_bottom"
-        android:orientation="horizontal"
-    >
-
-        <Button
-            android:id="@+id/take_photo"
-            style="?attr/questionnaireAttachmentTakePhotoButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/attachment_action_button_margin_end"
-            android:paddingHorizontal="@dimen/attachment_action_button_padding_horizontal"
-            android:visibility="gone"
-        />
-
-        <Button
-            android:id="@+id/upload_photo"
-            style="?attr/questionnaireAttachmentUploadButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/attachment_action_button_margin_end"
-            android:paddingHorizontal="@dimen/attachment_action_button_padding_horizontal"
-            android:text="@string/upload_photo"
-            android:visibility="gone"
-            app:icon="@drawable/ic_image_file"
-        />
-
-        <Button
-            android:id="@+id/upload_audio"
-            style="?attr/questionnaireAttachmentUploadButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/attachment_action_button_margin_end"
-            android:paddingHorizontal="@dimen/attachment_action_button_padding_horizontal"
-            android:text="@string/upload_audio"
-            android:visibility="gone"
-            app:icon="@drawable/ic_audio_file"
-        />
-
-        <Button
-            android:id="@+id/upload_video"
-            style="?attr/questionnaireAttachmentUploadButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/attachment_action_button_margin_end"
-            android:paddingHorizontal="@dimen/attachment_action_button_padding_horizontal"
-            android:text="@string/upload_video"
-            android:visibility="gone"
-            app:icon="@drawable/ic_video_file"
-        />
-
-        <Button
-            android:id="@+id/upload_document"
-            style="?attr/questionnaireAttachmentUploadButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/attachment_action_button_margin_end"
-            android:paddingHorizontal="@dimen/attachment_action_button_padding_horizontal"
-            android:text="@string/upload_document"
-            android:visibility="gone"
-            app:icon="@drawable/ic_document_file"
-        />
-
-        <Button
-            android:id="@+id/upload_file"
-            style="?attr/questionnaireAttachmentUploadButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/attachment_action_button_margin_end"
-            android:paddingHorizontal="@dimen/attachment_action_button_padding_horizontal"
-            android:text="@string/upload_file"
-            android:visibility="gone"
-            app:icon="@drawable/ic_file"
-        />
-
-    </LinearLayout>
-
-    <com.google.android.material.divider.MaterialDivider
-        android:id="@+id/divider"
-        style="?attr/questionnaireAttachmentDividerStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/item_margin_horizontal"
-        android:layout_marginTop="@dimen/attachment_divider_margin_top"
-        android:visibility="gone"
-    />
-
-    <TextView
-        android:id="@+id/label_uploaded"
-        style="?attr/questionnaireAttachmentUploadedLabelStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/item_margin_horizontal"
-        android:layout_marginTop="@dimen/attachment_uploaded_label_margin_top"
-        android:layout_marginBottom="@dimen/attachment_uploaded_label_margin_bottom"
-        android:text="@string/uploaded"
-        android:visibility="gone"
-    />
-
-    <include
-        android:id="@+id/photo_preview"
-        layout="@layout/attachment_photo_preview"
-        android:visibility="gone"
-    />
-
-    <include
-        android:id="@+id/file_preview"
-        layout="@layout/attachment_file_preview"
-        android:visibility="gone"
-    />
-
-</LinearLayout>
diff --git a/datacapture/src/main/res/values/strings.xml b/datacapture/src/main/res/values/strings.xml
index 9944225995..7cf9eef022 100644
--- a/datacapture/src/main/res/values/strings.xml
+++ b/datacapture/src/main/res/values/strings.xml
@@ -82,6 +82,12 @@
     <string
         name="mime_type_wrong_media_format_validation_error_msg"
     >Error: Wrong media format</string>
+    <string
+        name="media_not_saved_validation_error_msg"
+    >Error: Media not saved</string>
+    <string
+        name="camera_permission_denied_error_msg"
+    >Error: Camera permission not granted</string>
     <string name="uploaded">Uploaded</string>
     <string name="image_uploaded">Image uploaded</string>
     <string name="file_uploaded">File uploaded</string>