Skip to content

Use consistent image answer view in summary and widget #7279

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
grzesiek2010 merged 2 commits into from
Jun 30, 2026
+26 −30
Merged

Use consistent image answer view in summary and widget #7279

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
694834a
Use consistent image answer view in summary and widget
grzesiek2010 Jun 24, 2026
54342e2
Match image appearance in not-yet-refactored image widgets to basic i…
grzesiek2010 Jun 24, 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
20 changes: 1 addition & 19 deletions collect_app/src/main/java/org/odk/collect/android/widgets/WidgetAnswer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
package org.odk.collect.android.widgets

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.AttachFile
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.unit.dp
import org.javarosa.core.model.Constants
import org.javarosa.form.api.FormEntryPrompt
import org.odk.collect.android.widgets.image.ImageWidgetAnswer
Expand Down Expand Up @@ -57,19 +51,7 @@ fun WidgetAnswer(
)
}
}
Constants.CONTROL_IMAGE_CHOOSE -> ImageWidgetAnswer(
if (compact) {
modifier
.height(200.dp)
.wrapContentWidth(Alignment.Start)
} else {
modifier.fillMaxWidth()
},
answer,
if (compact) ContentScale.Fit else ContentScale.FillWidth,
mediaWidgetAnswerViewModel,
onLongClick
)
Constants.CONTROL_IMAGE_CHOOSE -> ImageWidgetAnswer(modifier, answer, mediaWidgetAnswerViewModel, onLongClick)
Constants.CONTROL_VIDEO_CAPTURE -> VideoWidgetAnswer(modifier, answer, mediaWidgetAnswerViewModel, onLongClick)
Constants.CONTROL_FILE_CAPTURE -> {
val context = LocalContext.current
Expand Down
9 changes: 7 additions & 2 deletions collect_app/src/main/java/org/odk/collect/android/widgets/image/ImageWidgetAnswer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
package org.odk.collect.android.widgets.image

import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
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.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import coil3.compose.AsyncImage
import org.odk.collect.android.widgets.MediaWidgetAnswerViewModel
import org.odk.collect.androidshared.system.ContextExt.getActivity
Expand All @@ -22,7 +26,6 @@ import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickGuard
fun ImageWidgetAnswer(
modifier: Modifier,
answer: String,
contentScale: ContentScale,
mediaWidgetAnswerViewModel: MediaWidgetAnswerViewModel,
onLongClick: () -> Unit
) {
Expand All @@ -41,10 +44,12 @@ fun ImageWidgetAnswer(
} else {
AsyncImage(
model = it,
contentScale = contentScale,
contentScale = ContentScale.Fit,
contentDescription = null,
onError = { isError = true },
modifier = modifier
.height(200.dp)
.wrapContentWidth(Alignment.Start)
.clip(MaterialTheme.shapes.large)
.combinedClickable(
onClick = {
Expand Down
9 changes: 6 additions & 3 deletions collect_app/src/main/res/layout/annotate_widget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,18 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/annotate_button" />

<ImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_height="200dp"
android:layout_marginTop="@dimen/margin_small"
android:tag="ImageView"
android:adjustViewBounds="true"
app:shapeAppearance="?attr/shapeAppearanceLargeComponent"
app:layout_constrainedWidth="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintTop_toBottomOf="@id/error_message"
tools:src="@drawable/notes"/>
</androidx.constraintlayout.widget.ConstraintLayout>
9 changes: 6 additions & 3 deletions collect_app/src/main/res/layout/draw_widget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,18 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/draw_button" />

<ImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_height="200dp"
android:layout_marginTop="@dimen/margin_small"
android:tag="ImageView"
android:adjustViewBounds="true"
app:shapeAppearance="?attr/shapeAppearanceLargeComponent"
app:layout_constrainedWidth="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintTop_toBottomOf="@id/error_message"
tools:src="@drawable/notes"/>
</androidx.constraintlayout.widget.ConstraintLayout>
9 changes: 6 additions & 3 deletions collect_app/src/main/res/layout/signature_widget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,18 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/sign_button" />

<ImageView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_height="200dp"
android:layout_marginTop="@dimen/margin_small"
android:tag="ImageView"
android:adjustViewBounds="true"
app:shapeAppearance="?attr/shapeAppearanceLargeComponent"
app:layout_constrainedWidth="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintTop_toBottomOf="@id/error_message"
tools:src="@drawable/notes"/>
</androidx.constraintlayout.widget.ConstraintLayout>