Update font size according to the settings

Author: grzesiek2010

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

@@ -20,13 +20,15 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import org.odk.collect.androidshared.R.dimen
 import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickGuard
 
 @Composable
 fun WidgetIconButton(
     icon: ImageVector,
     text: String,
+    fontSize: Int,
     onClick: () -> Unit,
     onLongClick: () -> Unit,
     modifier: Modifier,
@@ -72,6 +74,7 @@ fun WidgetIconButton(
         Text(
             text = text,
             color = contentColor,
+            fontSize = fontSize.sp,
             style = MaterialTheme.typography.bodyLarge
         )
     }

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

@@ -20,6 +20,7 @@ import org.odk.collect.android.widgets.QuestionWidget
 import org.odk.collect.android.widgets.interfaces.FileWidget
 import org.odk.collect.android.widgets.interfaces.WidgetDataReceiver
 import org.odk.collect.android.widgets.utilities.FileRequester
+import org.odk.collect.android.widgets.utilities.QuestionFontSizeUtils
 import org.odk.collect.android.widgets.utilities.WaitingForDataRegistry
 import org.odk.collect.androidshared.ui.ComposeThemeProvider.Companion.setContextThemedContent
 import org.odk.collect.androidshared.ui.ToastUtils.showLongToast
@@ -44,13 +45,15 @@ class ExVideoWidget(
 
     override fun onCreateWidgetView(context: Context, prompt: FormEntryPrompt, answerFontSize: Int): View {
         val readOnly = questionDetails.isReadOnly
+        val buttonFontSize = QuestionFontSizeUtils.getFontSize(settings, QuestionFontSizeUtils.FontSize.BODY_LARGE)
 
         return ComposeView(context).apply {
             setContextThemedContent {
                 ExVideoWidgetContent(
                     questionMediaManager.getAnswerFile(binaryName)?.toUri(),
                     mediaUtils,
                     readOnly,
+                    buttonFontSize,
                     onLaunchClick = { launchExternalApp() },
                     onLongClick = { this.showContextMenu() }
                 )

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

@@ -23,6 +23,7 @@ fun ExVideoWidgetContent(
     videoUri: Uri?,
     mediaUtils: MediaUtils?,
     readOnly: Boolean,
+    fontSize: Int,
     onLaunchClick: () -> Unit,
     onLongClick: () -> Unit
 ) {
@@ -31,6 +32,7 @@ fun ExVideoWidgetContent(
             WidgetIconButton(
                 Icons.AutoMirrored.Filled.OpenInNew,
                 stringResource(string.launch_app),
+                fontSize,
                 onLaunchClick,
                 onLongClick,
                 Modifier.testTag("record_video_button")
@@ -52,6 +54,7 @@ private fun ExVideoWidgetContentPreview() {
             null,
             null,
             false,
+            10,
             {},
             {}
         )
@@ -66,6 +69,7 @@ private fun ExVideoWidgetContentReadOnlyPreview() {
             null,
             null,
             true,
+            10,
             {},
             {}
         )

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

@@ -23,6 +23,7 @@ import org.odk.collect.android.utilities.QuestionMediaManager
 import org.odk.collect.android.widgets.QuestionWidget
 import org.odk.collect.android.widgets.interfaces.FileWidget
 import org.odk.collect.android.widgets.interfaces.WidgetDataReceiver
+import org.odk.collect.android.widgets.utilities.QuestionFontSizeUtils
 import org.odk.collect.android.widgets.utilities.WaitingForDataRegistry
 import org.odk.collect.androidshared.ui.ComposeThemeProvider.Companion.setContextThemedContent
 import org.odk.collect.permissions.PermissionListener
@@ -48,6 +49,7 @@ class VideoWidget(
     override fun onCreateWidgetView(context: Context, prompt: FormEntryPrompt, answerFontSize: Int): View {
         val readOnly = questionDetails.isReadOnly
         val newVideoOnly = formEntryPrompt.appearanceHint?.lowercase()?.contains(Appearances.NEW) ?: false
+        val buttonFontSize = QuestionFontSizeUtils.getFontSize(settings, QuestionFontSizeUtils.FontSize.BODY_LARGE)
 
         return ComposeView(context).apply {
             setContextThemedContent {
@@ -56,6 +58,7 @@ class VideoWidget(
                     mediaUtils,
                     readOnly,
                     newVideoOnly,
+                    buttonFontSize,
                     onRecordClick = {
                         getPermissionsProvider().requestCameraPermission(
                             context as Activity,

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

@@ -25,6 +25,7 @@ fun VideoWidgetContent(
     mediaUtils: MediaUtils?,
     readOnly: Boolean,
     newVideoOnly: Boolean,
+    fontSize: Int,
     onRecordClick: () -> Unit,
     onChooseClick: () -> Unit,
     onLongClick: () -> Unit
@@ -34,6 +35,7 @@ fun VideoWidgetContent(
             WidgetIconButton(
                 Icons.Default.Videocam,
                 stringResource(string.capture_video),
+                fontSize,
                 onRecordClick,
                 onLongClick,
                 Modifier.testTag("record_video_button")
@@ -46,6 +48,7 @@ fun VideoWidgetContent(
             WidgetIconButton(
                 Icons.Default.VideoLibrary,
                 stringResource(string.choose_video),
+                fontSize,
                 onChooseClick,
                 onLongClick,
                 Modifier.testTag("choose_video_button")
@@ -68,6 +71,7 @@ private fun VideoWidgetContentPreview() {
             null,
             false,
             false,
+            10,
             {},
             {},
             {}
@@ -84,6 +88,7 @@ private fun VideoWidgetContentReadOnlyPreview() {
             null,
             true,
             false,
+            10,
             {},
             {},
             {}
@@ -100,6 +105,7 @@ private fun VideoWidgetContentNewVideoOnlyPreview() {
             null,
             false,
             true,
+            10,
             {},
             {},
             {}