mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-28 20:57:42 +00:00
Code Issues Releases Wiki Activity

Change Iterator argument to List

Browse Source
This commit is contained in:
Albert Vaca Cintora 2024-10-08 22:38:01 +02:00
parent c32e00bb47
commit a107796ec2
No known key found for this signature in database
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/org/kde/kdeconnect/UserInterface/DeviceFragment.kt
View File

@ -281,7 +281,7 @@ class DeviceFragment : Fragment() {
requirePairingBinding().pairingButtons.visibility = View.GONE requirePairingBinding().pairingButtons.visibility = View.GONE
if (device.isReachable) { if (device.isReachable) {
val context = requireContext() val context = requireContext()
val pluginsWithButtons = device.loadedPlugins.values.filter { it.displayAsButton(context) }.iterator() val pluginsWithButtons = device.loadedPlugins.values.filter { it.displayAsButton(context) }
val pluginsNeedPermissions = device.pluginsWithoutPermissions.values.filter { device.isPluginEnabled(it.pluginKey) } val pluginsNeedPermissions = device.pluginsWithoutPermissions.values.filter { device.isPluginEnabled(it.pluginKey) }
val pluginsNeedOptionalPermissions = device.pluginsWithoutOptionalPermissions.values.filter { device.isPluginEnabled(it.pluginKey) } val pluginsNeedOptionalPermissions = device.pluginsWithoutOptionalPermissions.values.filter { device.isPluginEnabled(it.pluginKey) }
requireErrorBinding().errorMessageContainer.visibility = View.GONE requireErrorBinding().errorMessageContainer.visibility = View.GONE
@ -377,7 +377,7 @@ class DeviceFragment : Fragment() {
fun PreviewCompose() { fun PreviewCompose() {
val plugins = listOf(MprisPlugin(), RunCommandPlugin(), PresenterPlugin()) val plugins = listOf(MprisPlugin(), RunCommandPlugin(), PresenterPlugin())
plugins.forEach { it.setContext(LocalContext.current, null) } plugins.forEach { it.setContext(LocalContext.current, null) }
PluginButtons(plugins.iterator(), 2) PluginButtons(plugins, 2)
} }
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@ -409,9 +409,10 @@ class DeviceFragment : Fragment() {
} }
@Composable @Composable
fun PluginButtons(plugins: Iterator<Plugin>, numColumns: Int) { fun PluginButtons(plugins: List<Plugin>, numColumns: Int) {
Column(modifier = Modifier.padding(horizontal = 16.dp)) { Column(modifier = Modifier.padding(horizontal = 16.dp)) {
while (plugins.hasNext()) { val pluginIter = plugins.iterator()
while (pluginIter.hasNext()) {
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
@ -419,9 +420,9 @@ class DeviceFragment : Fragment() {
horizontalArrangement = Arrangement.spacedBy(8.dp) horizontalArrangement = Arrangement.spacedBy(8.dp)
) { ) {
repeat(numColumns) { repeat(numColumns) {
if (plugins.hasNext()) { if (pluginIter.hasNext()) {
PluginButton( PluginButton(
plugin = plugins.next(), plugin = pluginIter.next(),
modifier = Modifier.weight(1f) modifier = Modifier.weight(1f)
) )
} else { } else {
@ -453,7 +454,7 @@ class DeviceFragment : Fragment() {
@Composable @Composable
fun PluginList( fun PluginList(
pluginsWithButtons: Iterator<Plugin>, pluginsWithButtons: List<Plugin>,
pluginsNeedPermissions: List<Plugin>, pluginsNeedPermissions: List<Plugin>,
pluginsNeedOptionalPermissions: List<Plugin> pluginsNeedOptionalPermissions: List<Plugin>
) { ) {