Merge pull request #346 from onuralpszr/fix/dialog-radio-indicator

fix: render radio buttons in single choice dialogs

Author: onuralpszr

README.md

@@ -19,8 +19,9 @@
 [![snyk-security](https://snyk.io/test/github/onuralpszr/CvCamera-Mobile/badge.svg)](https://snyk.io/test/github/onuralpszr/CvCamera-Mobile)
 [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commit-1.0.0-FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
 
-<img src="appPreview/appOverview.png" width="220" alt="Live preview with the FPS overlay"/>
-<img src="appPreview/appOverview2.png" width="220" alt="Canny edge detection on the live preview"/>
+<img src="appPreview/appOverview.png" width="220" alt="Live camera preview with the FPS overlay"/>
+<img src="appPreview/appOverview2.png" width="220" alt="Bottom bar menu"/>
+<img src="appPreview/appOverview3.png" width="220" alt="Effect picker"/>
 
 </div>
 

app/src/main/java/com/os/cvCamera/features/FeatureUi.kt

@@ -1,9 +1,11 @@
 package com.os.cvCamera.features
 
 import android.app.Activity
+import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.annotation.StringRes
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.os.cvCamera.R
 
 // Small helpers shared by the features, so each one does not repeat the same toast and dialog
 // boilerplate.
@@ -25,9 +27,14 @@ internal fun Activity.showSingleChoiceDialog(
     checked: Int,
     onPicked: (Int) -> Unit,
 ) {
+    // A custom row layout is used because Material3 leaves android:listChoiceIndicatorSingle
+    // unset, and the default single choice layout resolves its check mark from that attribute,
+    // so the built in overload draws no radio button at all.
+    val adapter = ArrayAdapter(this, R.layout.item_single_choice, labels)
+
     MaterialAlertDialogBuilder(this)
         .setTitle(title)
-        .setSingleChoiceItems(labels, checked) { dialog, which ->
+        .setSingleChoiceItems(adapter, checked) { dialog, which ->
             dialog.dismiss()
             if (which != checked) onPicked(which)
         }.setNegativeButton(android.R.string.cancel, null)

app/src/main/res/drawable/ic_radio_checked.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" android:tint="?attr/colorPrimary">
+    <path android:fillColor="@android:color/white" android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>

app/src/main/res/drawable/ic_radio_unchecked.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" android:tint="?attr/colorOnSurfaceVariant">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>

app/src/main/res/drawable/radio_choice_indicator.xml

@@ -0,0 +1,4 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_radio_checked" android:state_checked="true"/>
+    <item android:drawable="@drawable/ic_radio_unchecked"/>
+</selector>

app/src/main/res/layout/item_single_choice.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Single choice row with the radio indicator set directly on the view. Material3 leaves
+     android:listChoiceIndicatorSingle unset, so relying on the theme attribute renders no
+     indicator at all. -->
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    style="?attr/textAppearanceBodyLarge"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="48dp"
+    android:gravity="center_vertical"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
+    android:drawablePadding="20dp"
+    android:textColor="?attr/colorOnSurface"
+    android:checkMark="@drawable/radio_choice_indicator"
+    android:ellipsize="marquee"
+    android:singleLine="true"/>