Skip to content
Snippets Groups Projects
Commit 0e01022e authored by Nicolas Pomepuy's avatar Nicolas Pomepuy Committed by Duncan McNamara
Browse files

Allow deleting videos in the main view, even when grouping is name of folder

Fixes #2690
parent 1ae09c4c
No related branches found
No related tags found
1 merge request!1549Allow deleting videos in the main view, even when grouping is name of folder
Pipeline #265401 passed with stage
in 34 minutes and 5 seconds
......@@ -16,4 +16,9 @@
android:title="@string/add_to_playlist"
android:icon="@drawable/ic_am_addtoplaylist"
app:showAsAction="always"/>
<item
android:id="@+id/action_video_delete"
android:title="@string/delete"
android:icon="@drawable/ic_am_trash"
app:showAsAction="ifRoom" />
</menu>
\ No newline at end of file
......@@ -31,6 +31,11 @@
android:title="@string/rename_group"
android:icon="@drawable/ic_edit"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_video_delete"
android:title="@string/delete"
android:icon="@drawable/ic_am_trash"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_group_similar"
......
......@@ -409,6 +409,7 @@ class VideoGridFragment : MediaBrowserFragment<VideosViewModel>(), SwipeRefreshL
R.id.action_folder_play -> viewModel.playFoldersSelection(selection)
R.id.action_folder_append -> viewModel.appendFoldersSelection(selection)
R.id.action_folder_add_playlist -> lifecycleScope.launch { requireActivity().addToPlaylist(withContext(Dispatchers.Default) { selection.getAll() }) }
R.id.action_video_delete -> removeItems(selection.getAll())
else -> return false
}
}
......@@ -423,6 +424,7 @@ class VideoGridFragment : MediaBrowserFragment<VideosViewModel>(), SwipeRefreshL
R.id.action_rename -> renameGroup(selection.first() as VideoGroup)
R.id.action_add_to_group -> addToGroup(selection)
R.id.action_mode_go_to_folder -> (selection.first() as? MediaWrapper)?.let { showParentFolder(it) }
R.id.action_video_delete -> removeItems(selection.getAll())
else -> return false
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment