Extract shared TextWidgetAnswer

Author: grzesiek2010

collect_app/src/main/java/org/odk/collect/android/widgets/arbitraryfile/ArbitraryFileWidgetAnswer.kt renamed to collect_app/src/main/java/org/odk/collect/android/widgets/TextWidgetAnswer.kt

@@ -1,57 +1,51 @@
-package org.odk.collect.android.widgets.arbitraryfile
+package org.odk.collect.android.widgets
 
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AttachFile
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.dimensionResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.sp
-import androidx.lifecycle.ViewModelProvider
 import org.odk.collect.androidshared.R.dimen
 import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickGuard
-import org.odk.collect.strings.R
 
 @Composable
-fun ArbitraryFileWidgetAnswer(
+fun TextWidgetAnswer(
     modifier: Modifier,
+    icon: ImageVector,
     answer: String,
     fontSize: Int,
-    viewModelProvider: ViewModelProvider,
-    onLongClick: () -> Unit
+    onLongClick: () -> Unit,
+    onClickLabel: String? = null,
+    onClick: () -> Unit = {}
 ) {
-    val context = LocalContext.current
-    val viewModel = viewModelProvider[ArbitraryFileWidgetAnswerViewModel::class]
-
     Row(
         modifier = modifier
             .fillMaxWidth()
             .combinedClickable(
                 onClick = {
                     if (MultiClickGuard.allowClick()) {
-                        viewModel.openFile(context, answer)
+                        onClick()
                     }
                 },
                 onLongClick = onLongClick,
-                onClickLabel = stringResource(R.string.open_file)
+                onClickLabel = onClickLabel
             ),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.Center
     ) {
         Icon(
-            imageVector = Icons.Default.AttachFile,
+            imageVector = icon,
             contentDescription = null,
             tint = MaterialTheme.colorScheme.onSurface
         )

collect_app/src/main/java/org/odk/collect/android/widgets/WidgetAnswer.kt

@@ -1,13 +1,19 @@
 package org.odk.collect.android.widgets
 
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AttachFile
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.lifecycle.ViewModelProvider
 import org.javarosa.core.model.Constants
 import org.javarosa.form.api.FormEntryPrompt
-import org.odk.collect.android.widgets.arbitraryfile.ArbitraryFileWidgetAnswer
-import org.odk.collect.android.widgets.barcode.BarcodeWidgetAnswer
+import org.odk.collect.android.widgets.arbitraryfile.ArbitraryFileWidgetAnswerViewModel
 import org.odk.collect.android.widgets.video.VideoWidgetAnswer
+import org.odk.collect.icons.R
 
 @Composable
 fun WidgetAnswer(
@@ -22,22 +28,29 @@ fun WidgetAnswer(
         when (prompt.controlType) {
             Constants.CONTROL_INPUT -> {
                 when (prompt.dataType) {
-                    Constants.DATATYPE_BARCODE -> BarcodeWidgetAnswer(
+                    Constants.DATATYPE_BARCODE -> TextWidgetAnswer(
                         modifier,
+                        ImageVector.vectorResource(R.drawable.ic_baseline_barcode_scanner_white_24),
                         answer,
                         fontSize,
                         onLongClick
                     )
                 }
             }
             Constants.CONTROL_VIDEO_CAPTURE -> VideoWidgetAnswer(modifier, answer, viewModelProvider!!, onLongClick)
-            Constants.CONTROL_FILE_CAPTURE -> ArbitraryFileWidgetAnswer(
-                modifier,
-                answer,
-                fontSize,
-                viewModelProvider!!,
-                onLongClick
-            )
+            Constants.CONTROL_FILE_CAPTURE -> {
+                val context = LocalContext.current
+                val viewModel = viewModelProvider!![ArbitraryFileWidgetAnswerViewModel::class]
+
+                TextWidgetAnswer(
+                    modifier,
+                    Icons.Default.AttachFile,
+                    answer,
+                    fontSize,
+                    onLongClick,
+                    stringResource(org.odk.collect.strings.R.string.open_file)
+                ) { viewModel.openFile(context, answer) }
+            }
             else -> throw IllegalArgumentException("Unsupported control type: ${prompt.controlType}")
         }
     }