danvics/ytdlnis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

touchups

Browse source
This commit is contained in:
deniscerri 2023-04-21 11:21:40 +02:00
parent e1f8ed9989
commit bdf91c8a12
No known key found for this signature in database
GPG key ID: 95C43D517D830350
4 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/FormatSelectionBottomSheetDialog.kt
View file

@ -76,12 +76,12 @@ class FormatSelectionBottomSheetDialog(private val items: List<DownloadItem?>, p
val linearLayout = view.findViewById<LinearLayout>(R.id.format_list_linear_layout) val linearLayout = view.findViewById<LinearLayout>(R.id.format_list_linear_layout)
val shimmers = view.findViewById<ShimmerFrameLayout>(R.id.format_list_shimmer) val shimmers = view.findViewById<ShimmerFrameLayout>(R.id.format_list_shimmer)
shimmers.visibility = View.GONE shimmers.visibility = View.GONE
val hasGenericFormats = when(items.first()!!.type){
Type.audio -> formats.first().size == resources.getStringArray(R.array.audio_formats).size
else -> formats.first().size == resources.getStringArray(R.array.video_formats).size
}
if (items.size > 1){ if (items.size > 1){
val hasGenericFormats = when(items.first()!!.type){
Type.audio -> formats.first().size == resources.getStringArray(R.array.audio_formats).size
else -> formats.first().size == resources.getStringArray(R.array.video_formats).size
}
if (!hasGenericFormats){ if (!hasGenericFormats){
formatCollection.addAll(formats) formatCollection.addAll(formats)
val flattenFormats = formats.flatten() val flattenFormats = formats.flatten()
@ -102,9 +102,11 @@ class FormatSelectionBottomSheetDialog(private val items: List<DownloadItem?>, p
addFormatsToView(linearLayout) addFormatsToView(linearLayout)
}else{ }else{
chosenFormats = formats.flatten() chosenFormats = formats.flatten()
chosenFormats = when(items.first()?.type){ if(!hasGenericFormats){
Type.audio -> chosenFormats.filter { it.format_note.contains("audio", ignoreCase = true) } chosenFormats = when(items.first()?.type){
else -> chosenFormats.filter { !it.format_note.contains("audio", ignoreCase = true) } Type.audio -> chosenFormats.filter { it.format_note.contains("audio", ignoreCase = true) }
else -> chosenFormats.filter { !it.format_note.contains("audio", ignoreCase = true) }
}
} }
addFormatsToView(linearLayout) addFormatsToView(linearLayout)
} }

2
app/src/main/res/layout/format_details_sheet.xml
View file

@ -140,7 +140,7 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:text="@string/title" android:text="@string/format"
android:layout_weight="50" android:layout_weight="50"
android:textSize="18sp" android:textSize="18sp"
android:layout_margin="10dp" android:layout_margin="10dp"

4
build.gradle
View file

@ -4,8 +4,8 @@
buildscript { buildscript {
def versionMajor = 1 def versionMajor = 1
def versionMinor = 5 def versionMinor = 6
def versionPatch = 1 def versionPatch = 0
def versionBuild = 0 // bump for dogfood builds, public betas, etc. def versionBuild = 0 // bump for dogfood builds, public betas, etc.
ext { ext {

16
fastlane/metadata/android/en-US/changelogs/10600.txt Normal file
View file

@ -0,0 +1,16 @@
New features:
restrict filenames
share files
sponsor block filters in the download card
tablet ui
make multiple cuts in a video based on time span or chapter
range picker in playlist card
get a common format for all playlist items
automatic format updates preference
multiple search engines
stack search queries
contextual menus for batch deletion or other actions
swipe right/left for download cards for certain actions
download subtitle files and choose sub language
metered networks preference