diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6b6c0830..5a40dc4d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -65,7 +65,7 @@ diff --git a/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt index 5abe9a09..ae84cf76 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt @@ -24,8 +24,8 @@ import androidx.work.WorkManager import com.deniscerri.ytdlnis.databinding.ActivityMainBinding import com.deniscerri.ytdlnis.service.IDownloaderListener import com.deniscerri.ytdlnis.service.IDownloaderService -import com.deniscerri.ytdlnis.ui.downloadqueue.DownloadQueueActivity -import com.deniscerri.ytdlnis.ui.HistoryFragment +import com.deniscerri.ytdlnis.ui.downloads.DownloadQueueActivity +import com.deniscerri.ytdlnis.ui.downloads.HistoryFragment import com.deniscerri.ytdlnis.ui.HomeFragment import com.deniscerri.ytdlnis.ui.more.MoreFragment import com.deniscerri.ytdlnis.ui.more.settings.SettingsActivity diff --git a/app/src/main/java/com/deniscerri/ytdlnis/adapter/GenericDownloadAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/adapter/GenericDownloadAdapter.kt index 1ee8ea49..da27af79 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/GenericDownloadAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/GenericDownloadAdapter.kt @@ -71,14 +71,6 @@ class GenericDownloadAdapter(onItemClickListener: OnItemClickListener, activity: val type = card.findViewById(R.id.type) type!!.text = item.type.toString().uppercase() - val formatNote = card.findViewById(R.id.format_note) - if (item.type == DownloadViewModel.Type.command){ - formatNote.visibility = View.GONE - }else{ - formatNote.text = item.format.format_note - } - - val codec = card.findViewById(R.id.codec) val codecText = if (item.format.encoding != "") { diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadVideoFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadVideoFragment.kt index 3185c2ec..15e7cffc 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadVideoFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadVideoFragment.kt @@ -9,6 +9,7 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.AutoCompleteTextView import android.widget.TextView @@ -135,6 +136,12 @@ class DownloadVideoFragment(private val resultItem: ResultItem) : Fragment() { containers ) ) + + (container!!.editText as AutoCompleteTextView?)!!.onItemClickListener = + AdapterView.OnItemClickListener { _: AdapterView<*>?, _: View?, index: Int, _: Long -> + downloadItem.format.container = containers[index] + } + val selectedContainer: String = downloadItem.format.container containerAutoCompleteTextView!!.setText(selectedContainer, false) diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/ActiveDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ActiveDownloadsFragment.kt similarity index 98% rename from app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/ActiveDownloadsFragment.kt rename to app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ActiveDownloadsFragment.kt index 483faff8..fa265c59 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/ActiveDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ActiveDownloadsFragment.kt @@ -1,4 +1,4 @@ -package com.deniscerri.ytdlnis.ui.downloadqueue +package com.deniscerri.ytdlnis.ui.downloads import android.app.Activity import android.content.res.Configuration diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/CancelledDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt similarity index 98% rename from app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/CancelledDownloadsFragment.kt rename to app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt index 5577586f..4b9d494a 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/CancelledDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt @@ -1,4 +1,4 @@ -package com.deniscerri.ytdlnis.ui.downloadqueue +package com.deniscerri.ytdlnis.ui.downloads import android.app.Activity import android.content.DialogInterface @@ -8,7 +8,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.Window -import android.widget.AdapterView.OnItemClickListener import android.widget.Button import android.widget.LinearLayout import android.widget.TextView @@ -27,9 +26,7 @@ import com.deniscerri.ytdlnis.util.FileUtil import com.deniscerri.ytdlnis.util.UiUtil import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.dialog.MaterialAlertDialogBuilder -import org.w3c.dom.Text import java.sql.Date -import java.sql.Timestamp import java.text.DateFormat import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/DownloadListFragmentAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadListFragmentAdapter.kt similarity index 68% rename from app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/DownloadListFragmentAdapter.kt rename to app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadListFragmentAdapter.kt index 2de5ce14..65c68494 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/DownloadListFragmentAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadListFragmentAdapter.kt @@ -1,14 +1,9 @@ -package com.deniscerri.ytdlnis.ui.downloadqueue +package com.deniscerri.ytdlnis.ui.downloads -import android.util.Log -import androidx.annotation.NonNull import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.lifecycle.Lifecycle import androidx.viewpager2.adapter.FragmentStateAdapter -import com.deniscerri.ytdlnis.database.models.DownloadItem -import com.deniscerri.ytdlnis.database.models.ResultItem -import com.google.gson.Gson class DownloadListFragmentAdapter ( fragmentManager : FragmentManager, diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/DownloadQueueActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt similarity index 98% rename from app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/DownloadQueueActivity.kt rename to app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt index 640c33a3..710f0a41 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/DownloadQueueActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt @@ -1,4 +1,4 @@ -package com.deniscerri.ytdlnis.ui.downloadqueue +package com.deniscerri.ytdlnis.ui.downloads import android.content.Context import android.os.Bundle diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/ErroredDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt similarity index 99% rename from app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/ErroredDownloadsFragment.kt rename to app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt index 2b180aba..4f6399ab 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadqueue/ErroredDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt @@ -1,4 +1,4 @@ -package com.deniscerri.ytdlnis.ui.downloadqueue +package com.deniscerri.ytdlnis.ui.downloads import android.app.Activity import android.content.DialogInterface diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/HistoryFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt similarity index 91% rename from app/src/main/java/com/deniscerri/ytdlnis/ui/HistoryFragment.kt rename to app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt index 3ba6762e..313882a6 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/HistoryFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt @@ -1,4 +1,4 @@ -package com.deniscerri.ytdlnis.ui +package com.deniscerri.ytdlnis.ui.downloads import android.app.Activity import android.content.* @@ -378,31 +378,61 @@ class HistoryFragment : Fragment(), HistoryAdapter.OnItemClickListener{ bottomSheet = BottomSheetDialog(fragmentContext!!) bottomSheet!!.requestWindowFeature(Window.FEATURE_NO_TITLE) bottomSheet!!.setContentView(R.layout.history_item_details_bottom_sheet) - val video = findItem(itemID) + val item = findItem(itemID) val title = bottomSheet!!.findViewById(R.id.bottom_sheet_title) - title!!.text = video!!.title + title!!.text = item!!.title val author = bottomSheet!!.findViewById(R.id.bottom_sheet_author) - author!!.text = video.author + author!!.text = item.author + + val type = bottomSheet!!.findViewById(R.id.type) + val formatNote = bottomSheet!!.findViewById(R.id.format_note) + val codec = bottomSheet!!.findViewById(R.id.codec) + val fileSize = bottomSheet!!.findViewById(R.id.file_size) + + type!!.text = item.type.toString().uppercase() + + if (item.format.format_note == "?") formatNote!!.visibility = View.GONE + else formatNote!!.text = item.format.format_note + + val codecText = + if (item.format.encoding != "") { + item.format.encoding.uppercase() + }else if (item.format.vcodec != "none" && item.format.vcodec != ""){ + item.format.vcodec.uppercase() + } else { + item.format.acodec.uppercase() + } + if (codecText == "" || codecText == "none"){ + codec!!.visibility = View.GONE + }else{ + codec!!.visibility = View.VISIBLE + codec.text = codecText + } + + val fileSizeReadable = fileUtil!!.convertFileSize(item.format.filesize) + if (fileSizeReadable == "?") fileSize!!.visibility = View.GONE + else fileSize!!.text = fileSizeReadable + val link = bottomSheet!!.findViewById