From bb702d28ef1c5573ca734bcc73d904643a17b9d4 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 10 Oct 2024 00:04:01 +0200 Subject: [PATCH] Make USB preview panel display test data --- .../EtchDroidUsbMassStorageDevice.kt | 11 ++++++++--- .../eu/depau/etchdroid/ui/MainActivity.kt | 19 +++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/massstorage/EtchDroidUsbMassStorageDevice.kt b/app/src/main/java/eu/depau/etchdroid/massstorage/EtchDroidUsbMassStorageDevice.kt index 72fa785..c4c0d40 100644 --- a/app/src/main/java/eu/depau/etchdroid/massstorage/EtchDroidUsbMassStorageDevice.kt +++ b/app/src/main/java/eu/depau/etchdroid/massstorage/EtchDroidUsbMassStorageDevice.kt @@ -103,6 +103,11 @@ data class PreviewUsbDevice( val vidpid: String, ) : Parcelable +interface IUsbMassStorageDeviceDescriptor { + val name: String + val vidpid: String +} + @Parcelize data class UsbMassStorageDeviceDescriptor( private val maybeUsbDevice: UsbDevice? = null, @@ -110,7 +115,7 @@ data class UsbMassStorageDeviceDescriptor( val inEndpoint: UsbEndpoint? = null, val outEndpoint: UsbEndpoint? = null, private val previewUsbDevice: PreviewUsbDevice? = null, -) : Parcelable { +) : Parcelable, IUsbMassStorageDeviceDescriptor { val usbDevice get() = maybeUsbDevice!! @@ -127,10 +132,10 @@ data class UsbMassStorageDeviceDescriptor( ) } - val name: String + override val name: String get() = maybeUsbDevice?.name ?: previewUsbDevice!!.name - val vidpid: String + override val vidpid: String get() = maybeUsbDevice?.vidpid ?: previewUsbDevice!!.vidpid infix fun matches(other: UsbMassStorageDeviceDescriptor): Boolean { diff --git a/app/src/main/java/eu/depau/etchdroid/ui/MainActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/MainActivity.kt index 8fc6645..d070833 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/MainActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/MainActivity.kt @@ -89,6 +89,7 @@ import eu.depau.etchdroid.AppSettings import eu.depau.etchdroid.R import eu.depau.etchdroid.ThemeMode import eu.depau.etchdroid.getConfirmOperationActivityIntent +import eu.depau.etchdroid.massstorage.IUsbMassStorageDeviceDescriptor import eu.depau.etchdroid.massstorage.UsbMassStorageDeviceDescriptor import eu.depau.etchdroid.ui.composables.MainView import eu.depau.etchdroid.ui.composables.coloredShadow @@ -238,7 +239,7 @@ class MainActivity : ComponentActivity() { }, selectDevice = { launchConfirmationActivity( - it, + it as UsbMassStorageDeviceDescriptor, mViewModel.state.value.openedImage!!, ) }, @@ -462,8 +463,8 @@ fun WindowsImageAlertDialog( @Composable fun UsbDevicePickerBottomSheet( onDismissRequest: () -> Unit, - selectDevice: (UsbMassStorageDeviceDescriptor) -> Unit, - availableDevices: () -> Set, + selectDevice: (IUsbMassStorageDeviceDescriptor) -> Unit, + availableDevices: () -> Set, skipHalfExpanded: Boolean = true, ) { val bottomSheetState = @@ -789,7 +790,13 @@ fun WindowsAlertDialogPreview() { @Composable fun UsbDevicePickerBottomSheetPreview() { val viewModel = remember { MainActivityViewModel() } - var openBottomSheet by rememberSaveable { mutableStateOf(false) } + var openBottomSheet by rememberSaveable { mutableStateOf(true) } + val availableDevices = setOf( + object : IUsbMassStorageDeviceDescriptor { + override val name: String = "USB Drive" + override val vidpid: String = "1234:5678" + } + ) MainView(viewModel) { Row( @@ -809,7 +816,7 @@ fun UsbDevicePickerBottomSheetPreview() { UsbDevicePickerBottomSheet( onDismissRequest = { openBottomSheet = false }, selectDevice = { }, - availableDevices = { viewModel.state.value.massStorageDevices } + availableDevices = { availableDevices } ) } } @@ -819,7 +826,7 @@ fun UsbDevicePickerBottomSheetPreview() { @Composable fun EmptyUsbDevicePickerBottomSheetPreview() { val viewModel = remember { MainActivityViewModel() } - var openBottomSheet by remember { mutableStateOf(false) } + var openBottomSheet by remember { mutableStateOf(true) } MainView(viewModel) { Row(