Skip to content
Snippets Groups Projects
Commit acf9e12e authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Fix add to group for 1 media and remove useless info

parent 68ec4703
No related branches found
No related tags found
1 merge request!555Manual groups
Pipeline #16398 passed with stage
in 23 minutes and 32 seconds
......@@ -30,10 +30,6 @@
<import type="android.view.View" />
<variable
name="filesText"
type="String" />
<variable
name="isLoading"
type="Boolean" />
......@@ -60,19 +56,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/medias"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:fontFamily="sans-serif-light"
android:text="@{filesText}"
android:textSize="12sp"
android:visibility="@{isLoading ? View.GONE : View.VISIBLE}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView8"
tools:text="65 medias" />
<ProgressBar
android:id="@+id/progressBar2"
style="?android:attr/progressBarStyle"
......@@ -88,10 +71,10 @@
android:id="@+id/dialog_list_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/medias">
app:layout_constraintTop_toBottomOf="@+id/textView8">
<androidx.recyclerview.widget.RecyclerView
android:id="@android:id/list"
......
......@@ -56,11 +56,6 @@ class AddToGroupDialog : VLCBottomSheetDialogFragment(), SimpleAdapter.ClickHand
field = value
if (::binding.isInitialized) binding.isLoading = value
}
private var filesText: String = ""
set(value) {
field = value
if (::binding.isInitialized) binding.filesText = value
}
private lateinit var binding: DialogAddToGroupBinding
private lateinit var adapter: SimpleAdapter
private lateinit var newTrack: Array<MediaWrapper>
......@@ -82,7 +77,6 @@ class AddToGroupDialog : VLCBottomSheetDialogFragment(), SimpleAdapter.ClickHand
newTrack = try {
@Suppress("UNCHECKED_CAST")
val tracks = requireArguments().getParcelableArray(KEY_TRACKS) as Array<MediaWrapper>
filesText = resources.getQuantityString(R.plurals.media_quantity, tracks.size, tracks.size)
tracks
} catch (e: Exception) {
emptyArray()
......@@ -92,7 +86,6 @@ class AddToGroupDialog : VLCBottomSheetDialogFragment(), SimpleAdapter.ClickHand
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
binding = DialogAddToGroupBinding.inflate(layoutInflater, container, false)
binding.isLoading = isLoading
binding.filesText = filesText
return binding.root
}
......
......@@ -386,9 +386,11 @@ class VideoGridFragment : MediaBrowserFragment<VideosViewModel>(), SwipeRefreshL
R.id.action_ungroup -> viewModel.ungroup(selection.first() as VideoGroup)
R.id.action_rename -> renameGroup(selection.first() as VideoGroup)
R.id.action_add_to_group -> lifecycleScope.launch {
viewModel.createGroup(selection.getAll())?.let {
activity?.open(it)
}
if (selection.size > 1) {
viewModel.createGroup(selection.getAll())?.let {
activity?.open(it)
}
} else requireActivity().addToGroup(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