diff --git a/app/src/main/java/com/deniscerri/ytdlnis/adapter/ActiveDownloadAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/adapter/ActiveDownloadAdapter.kt index 327c50fb..e18bb6ac 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/ActiveDownloadAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/ActiveDownloadAdapter.kt @@ -20,6 +20,7 @@ import com.google.android.material.button.MaterialButton import com.google.android.material.card.MaterialCardView import com.google.android.material.progressindicator.LinearProgressIndicator import com.squareup.picasso.Picasso +import org.w3c.dom.Text import java.util.zip.GZIPOutputStream class ActiveDownloadAdapter(onItemClickListener: OnItemClickListener, activity: Activity) : ListAdapter(AsyncDifferConfig.Builder(DIFF_CALLBACK).build()) { @@ -84,6 +85,9 @@ class ActiveDownloadAdapter(onItemClickListener: OnItemClickListener, activity: } author.text = info + val type = card.findViewById(R.id.type) + type.text = item.type.toString().uppercase() + val formatNote = card.findViewById(R.id.format_note) formatNote.text = item.format.format_note val codec = card.findViewById(R.id.codec) diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt index 5c6a007f..6088b331 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt @@ -68,13 +68,13 @@ class DownloadViewModel(application: Application) : AndroidViewModel(application val audioContainer = sharedPreferences.getString("audio_format", "mp3") bestAudioFormat = Format( - "", + getApplication().resources.getString(R.string.best_quality), audioContainer!!, "", "", "", 0, - "" + getApplication().resources.getString(R.string.best_quality) ) } @@ -209,8 +209,9 @@ class DownloadViewModel(application: Application) : AndroidViewModel(application fun turnResultItemsToDownloadItems(items: List) : List { val list : MutableList = mutableListOf() + val preferredType = sharedPreferences.getString("preferred_download_type", "video"); items.forEach { - list.add(createDownloadItemFromResult(it!!, Type.video)) + list.add(createDownloadItemFromResult(it!!, Type.valueOf(preferredType!!))) } return list } diff --git a/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt b/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt index 5aa1ecc3..58156911 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt @@ -116,7 +116,7 @@ class DownloadWorker( DownloadViewModel.Type.audio -> { request.addOption("-x") var audioQualityId : String = downloadItem.format.format_id - if (audioQualityId.isEmpty() || audioQualityId == "0") audioQualityId = "" + if (audioQualityId.isEmpty() || audioQualityId == "0" || audioQualityId == context.getString(R.string.best_quality)) audioQualityId = "" if (audioQualityId.isNotEmpty()){ request.addOption("-f", audioQualityId) } diff --git a/app/src/main/res/layout/active_download_card.xml b/app/src/main/res/layout/active_download_card.xml index 414137d8..a46b8bce 100644 --- a/app/src/main/res/layout/active_download_card.xml +++ b/app/src/main/res/layout/active_download_card.xml @@ -50,7 +50,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:orientation="vertical" - app:layout_constraintBottom_toTopOf="@+id/linearLayout2" + app:layout_constraintBottom_toTopOf="@+id/linearlayout2_horizontalscrollview" app:layout_constraintEnd_toStartOf="@+id/active_download_cancel" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -96,47 +96,65 @@ - - - - - - - - - + android:paddingHorizontal="10dp" + android:layout_gravity="bottom" + android:orientation="horizontal"> + + + + + + + + + + + + +