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,
var writeSubs: Boolean = false,
- var subsLanguages: String = "en.*,.*-orig"
+ var subsLanguages: String = "en.*,.*-orig",
+ var removeAudio: Boolean = false
)
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/receiver/BlankActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/receiver/BlankActivity.kt
new file mode 100644
index 00000000..7235a476
--- /dev/null
+++ b/app/src/main/java/com/deniscerri/ytdlnis/receiver/BlankActivity.kt
@@ -0,0 +1,83 @@
+package com.deniscerri.ytdlnis.receiver
+
+import android.Manifest
+import android.app.Activity
+import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
+import android.content.SharedPreferences
+import android.content.pm.PackageManager
+import android.content.res.Configuration
+import android.graphics.drawable.ColorDrawable
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import android.util.Log
+import android.view.Window
+import android.view.WindowManager
+import android.widget.FrameLayout
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import com.deniscerri.ytdlnis.MainActivity
+import com.deniscerri.ytdlnis.R
+import com.deniscerri.ytdlnis.database.models.DownloadItem
+import com.deniscerri.ytdlnis.database.models.ResultItem
+import com.deniscerri.ytdlnis.database.viewmodel.CookieViewModel
+import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel
+import com.deniscerri.ytdlnis.database.viewmodel.ResultViewModel
+import com.deniscerri.ytdlnis.ui.BaseActivity
+import com.deniscerri.ytdlnis.ui.downloadcard.DownloadBottomSheetDialog
+import com.deniscerri.ytdlnis.ui.downloadcard.SelectPlaylistItemsBottomSheetDialog
+import com.deniscerri.ytdlnis.util.FileUtil
+import com.deniscerri.ytdlnis.util.NotificationUtil
+import com.deniscerri.ytdlnis.util.ThemeUtil
+import com.deniscerri.ytdlnis.util.UiUtil
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.File
+import kotlin.properties.Delegates
+import kotlin.system.exitProcess
+
+class BlankActivity : BaseActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.blank)
+ val intent = intent
+ handleIntents(intent)
+ }
+
+ override fun onNewIntent(intent: Intent) {
+ super.onNewIntent(intent)
+ handleIntents(intent)
+ }
+
+ private fun handleIntents(intent: Intent) {
+ val message = intent.getStringExtra("message")
+ val path = intent.getStringExtra("path")
+ val notificationId = intent.getIntExtra("notificationID", 0)
+ if (message != null && path != null) {
+ if (notificationId != 0) NotificationUtil(this).cancelDownloadNotification(notificationId)
+ val uiUtil = UiUtil(FileUtil())
+ when(message) {
+ "share" -> {
+ uiUtil.shareFileIntent(this, listOf(path))
+ }
+ "open" -> {
+ uiUtil.openFileIntent(this, path)
+ }
+ }
+
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/receiver/OpenDownloadNotificationReceiver.kt b/app/src/main/java/com/deniscerri/ytdlnis/receiver/OpenDownloadNotificationReceiver.kt
deleted file mode 100644
index d3be13c7..00000000
--- a/app/src/main/java/com/deniscerri/ytdlnis/receiver/OpenDownloadNotificationReceiver.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.deniscerri.ytdlnis.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import androidx.work.WorkManager
-import com.deniscerri.ytdlnis.util.FileUtil
-import com.deniscerri.ytdlnis.util.NotificationUtil
-import com.deniscerri.ytdlnis.util.UiUtil
-import com.yausername.youtubedl_android.YoutubeDL
-
-class OpenDownloadNotificationReceiver : BroadcastReceiver() {
- override fun onReceive(c: Context, intent: Intent) {
- val message = intent.getStringExtra("open")
- val path = intent.getStringExtra("path")
- val notificationId = intent.getIntExtra("notificationID", 0)
- if (message != null && path != null) {
- if (notificationId != 0) NotificationUtil(c).cancelDownloadNotification(notificationId)
- val uiUtil = UiUtil(FileUtil())
- uiUtil.openFileIntent(c, path)
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/receiver/SharedDownloadNotificationReceiver.kt b/app/src/main/java/com/deniscerri/ytdlnis/receiver/SharedDownloadNotificationReceiver.kt
deleted file mode 100644
index 4c5fb25d..00000000
--- a/app/src/main/java/com/deniscerri/ytdlnis/receiver/SharedDownloadNotificationReceiver.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.deniscerri.ytdlnis.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.deniscerri.ytdlnis.util.FileUtil
-import com.deniscerri.ytdlnis.util.NotificationUtil
-import com.deniscerri.ytdlnis.util.UiUtil
-
-class SharedDownloadNotificationReceiver : BroadcastReceiver() {
- override fun onReceive(c: Context, intent: Intent) {
- val message = intent.getStringExtra("share")
- val path = intent.getStringExtra("path")
- val notificationId = intent.getIntExtra("notificationID", 0)
- if (message != null && path != null) {
- if (notificationId != 0) NotificationUtil(c).cancelDownloadNotification(notificationId)
- val uiUtil = UiUtil(FileUtil())
- uiUtil.shareFileIntent(c, listOf(path))
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/receiver/SharedNotificationReceiver.kt b/app/src/main/java/com/deniscerri/ytdlnis/receiver/SharedNotificationReceiver.kt
new file mode 100644
index 00000000..488e42b6
--- /dev/null
+++ b/app/src/main/java/com/deniscerri/ytdlnis/receiver/SharedNotificationReceiver.kt
@@ -0,0 +1,25 @@
+package com.deniscerri.ytdlnis.receiver
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.deniscerri.ytdlnis.R
+import com.deniscerri.ytdlnis.util.FileUtil
+import com.deniscerri.ytdlnis.util.NotificationUtil
+import com.deniscerri.ytdlnis.util.UiUtil
+
+class SharedDownloadNotificationReceiver : AppCompatActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.blank)
+ val intent = intent
+ val message = intent.getStringExtra("share")
+ val path = intent.getStringExtra("path")
+ val notificationId = intent.getIntExtra("notificationID", 0)
+ if (message != null && path != null) {
+ if (notificationId != 0) NotificationUtil(this).cancelDownloadNotification(notificationId)
+ val uiUtil = UiUtil(FileUtil())
+ uiUtil.shareFileIntent(this, listOf(path))
+ this.finishAffinity()
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadMultipleBottomSheetDialog.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadMultipleBottomSheetDialog.kt
index d56cc89e..d38b228c 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadMultipleBottomSheetDialog.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadMultipleBottomSheetDialog.kt
@@ -148,7 +148,7 @@ class DownloadMultipleBottomSheetDialog(private var results: List,
}
items.forEachIndexed { index, it ->
it.allFormats.clear()
- it.allFormats.addAll(formatCollection[index])
+ if (formatCollection.isNotEmpty() && formatCollection[index].isNotEmpty()) it.allFormats.addAll(formatCollection[index])
it.format = selectedFormats[index]
}
listAdapter.submitList(items.toList())
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 03c7755f..ec5fbfd7 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
@@ -360,6 +360,11 @@ class DownloadVideoFragment(private val resultItem: ResultItem, private var curr
dialog.getButton(AlertDialog.BUTTON_NEUTRAL).gravity = Gravity.START
}
+ val removeAudio = view.findViewById(R.id.remove_audio)
+ removeAudio.setOnCheckedChangeListener { compoundButton, b ->
+ downloadItem.videoPreferences.removeAudio = removeAudio.isChecked
+ }
+
} catch (e: Exception) {
e.printStackTrace()
}
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/FormatSelectionBottomSheetDialog.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/FormatSelectionBottomSheetDialog.kt
index b239dacb..05272e0a 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/FormatSelectionBottomSheetDialog.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/FormatSelectionBottomSheetDialog.kt
@@ -199,6 +199,11 @@ class FormatSelectionBottomSheetDialog(private val items: List, p
formatCollection.forEach {
selectedFormats.add(it.first{ f -> f.format_id == format.format_id})
}
+ if (selectedFormats.isEmpty()) {
+ items.forEach {
+ selectedFormats.add(format)
+ }
+ }
listener.onFormatClick(formatCollection, selectedFormats)
}
dismiss()
@@ -220,7 +225,7 @@ class FormatSelectionBottomSheetDialog(private val items: List, p
else {
formatIdParent?.findViewById(R.id.format_id_value)?.text = format.format_id
formatIdParent?.setOnClickListener {
- copyToClipboard(format.format_note)
+ copyToClipboard(format.format_id)
}
}
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/TerminalActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/TerminalActivity.kt
index 07c8870e..7f27226f 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/TerminalActivity.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/TerminalActivity.kt
@@ -15,14 +15,12 @@ import android.view.View
import android.view.ViewGroup
import android.view.Window
import android.view.inputmethod.InputMethodManager
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.ScrollView
-import android.widget.TextView
+import android.widget.*
import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AppCompatActivity
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.view.forEach
+import androidx.core.view.get
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
import androidx.work.*
@@ -86,31 +84,49 @@ class TerminalActivity : BaseActivity() {
bottomAppBar = findViewById(R.id.bottomAppBar)
+ var templateCount = 0
+ var shortcutCount = 0
lifecycleScope.launch {
- val templateCount = withContext(Dispatchers.IO){
+ templateCount = withContext(Dispatchers.IO){
commandTemplateViewModel.getTotalNumber()
}
- if (templateCount == 0) bottomAppBar.menu.getItem(0).isEnabled = false
+ if (templateCount == 0){
+ bottomAppBar.menu.getItem(0).icon?.alpha = 30
+ }else{
+ bottomAppBar.menu.getItem(0).icon?.alpha = 255
+ }
- val shortcutCount = withContext(Dispatchers.IO){
+ shortcutCount = withContext(Dispatchers.IO){
commandTemplateViewModel.getTotalShortcutNumber()
}
- if (shortcutCount == 0) bottomAppBar.menu.getItem(1).isEnabled = false
+ if (shortcutCount == 0) {
+ bottomAppBar.menu.getItem(1).icon?.alpha = 30
+ }else{
+ bottomAppBar.menu.getItem(1).icon?.alpha = 255
+ }
}
bottomAppBar.setOnMenuItemClickListener {
when(it.itemId){
R.id.command_templates -> {
- lifecycleScope.launch {
- uiUtil.showCommandTemplates(this@TerminalActivity, commandTemplateViewModel){ template ->
- input!!.text.insert(input!!.selectionStart, template.content + " ")
- input!!.postDelayed({
- input!!.requestFocus()
- imm.showSoftInput(input!!, 0)
- }, 200)
+ if (templateCount == 0){
+ Toast.makeText(context, getString(R.string.add_template_first), Toast.LENGTH_SHORT).show()
+ }else{
+ lifecycleScope.launch {
+ uiUtil.showCommandTemplates(this@TerminalActivity, commandTemplateViewModel){ template ->
+ input!!.text.insert(input!!.selectionStart, template.content + " ")
+ input!!.postDelayed({
+ input!!.requestFocus()
+ imm.showSoftInput(input!!, 0)
+ }, 200)
+ }
}
}
}
- R.id.shortcuts -> showShortcuts()
+ R.id.shortcuts -> {
+ if (shortcutCount > 0){
+ showShortcuts()
+ }
+ }
R.id.folder -> {
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt
index 2a7b10a3..6080a5b8 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt
@@ -310,7 +310,23 @@ class InfoUtil(private val context: Context) {
for (f in 0 until formatsInJSON.length()){
val format = formatsInJSON.getJSONObject(f)
if(!format.has("container")) continue
- formats.add(Gson().fromJson(format.toString(), Format::class.java))
+ val formatObj = Gson().fromJson(format.toString(), Format::class.java)
+ try{
+ if (!formatObj.format_note.contains("audio", ignoreCase = true)){
+ val codecs = "\"([^\"]*)\"".toRegex().find(format.getString("type").split(";")[1])!!.value.split(",")
+ if (codecs.size > 1){
+ formatObj.vcodec = codecs[0].replace("\"", "")
+ formatObj.acodec = codecs[1].replace("\"", "")
+ }else if (codecs.size == 1){
+ formatObj.vcodec = codecs[0].replace("\"", "")
+ formatObj.acodec = "none"
+ }
+ }
+ }catch (e: Exception) {
+ e.printStackTrace()
+ }
+
+ formats.add(formatObj)
}
}
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt
index bf48aea5..3c4a714b 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt
@@ -6,14 +6,20 @@ import android.app.NotificationManager
import android.app.PendingIntent
import android.content.Context
import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ResolveInfo
import android.graphics.BitmapFactory
+import android.net.Uri
import android.os.Build
import androidx.core.app.NotificationCompat
+import androidx.core.content.ContextCompat.startActivity
+import androidx.core.content.FileProvider
import com.deniscerri.ytdlnis.R
import com.deniscerri.ytdlnis.receiver.CancelDownloadNotificationReceiver
-import com.deniscerri.ytdlnis.receiver.OpenDownloadNotificationReceiver
import com.deniscerri.ytdlnis.receiver.SharedDownloadNotificationReceiver
import com.deniscerri.ytdlnis.ui.more.downloadLogs.DownloadLogActivity
+import java.io.File
+
class NotificationUtil(var context: Context) {
private val downloadNotificationBuilder: NotificationCompat.Builder = NotificationCompat.Builder(context, DOWNLOAD_SERVICE_CHANNEL_ID)
@@ -108,41 +114,42 @@ class NotificationUtil(var context: Context) {
) {
val notificationBuilder = getBuilder(channel)
- val openIntent = Intent(context, OpenDownloadNotificationReceiver::class.java)
- openIntent.putExtra("open", "")
- openIntent.putExtra("path", filepath)
- openIntent.putExtra("notificationID", DOWNLOAD_FINISHED_NOTIFICATION_ID)
- val openNotificationPendingIntent = PendingIntent.getBroadcast(
- context,
- 1,
- openIntent,
- PendingIntent.FLAG_IMMUTABLE
- )
-
- val shareIntent = Intent(context, SharedDownloadNotificationReceiver::class.java)
- shareIntent.putExtra("share", "")
- shareIntent.putExtra("path", filepath)
- openIntent.putExtra("notificationID", DOWNLOAD_FINISHED_NOTIFICATION_ID)
- val shareNotificationPendingIntent = PendingIntent.getBroadcast(
- context,
- 1,
- shareIntent,
- PendingIntent.FLAG_IMMUTABLE
- )
-
notificationBuilder
.setContentTitle("${context.getString(R.string.downloaded)} $title")
- .setSmallIcon(R.drawable.ic_app_icon)
+ .setSmallIcon(R.drawable.ic_launcher_foreground_large)
.setLargeIcon(
BitmapFactory.decodeResource(
context.resources,
- R.drawable.ic_app_icon
+ R.drawable.ic_launcher_foreground_large
)
)
.setPriority(NotificationCompat.PRIORITY_MAX)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.clearActions()
if (filepath != null){
+ val file = File(filepath)
+ val uri = FileProvider.getUriForFile(
+ context,
+ "com.deniscerri.ytdl.fileprovider",
+ file
+ )
+
+ //open intent
+ val intent = Intent()
+ intent.action = Intent.ACTION_VIEW
+ intent.setDataAndType(uri, "*/*")
+ intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+ val openNotificationPendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)
+
+ //share intent
+ val shareIntent = Intent(context, SharedDownloadNotificationReceiver::class.java)
+ shareIntent.putExtra("share", "")
+ shareIntent.putExtra("path", filepath)
+ shareIntent.putExtra("notificationID", DOWNLOAD_FINISHED_NOTIFICATION_ID)
+ shareIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+ val shareNotificationPendingIntent = PendingIntent.getActivity(context, 0, shareIntent, PendingIntent.FLAG_IMMUTABLE)
+
+
notificationBuilder.addAction(0, context.getString(R.string.Open_File), openNotificationPendingIntent)
notificationBuilder.addAction(0, context.getString(R.string.share), shareNotificationPendingIntent)
}
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 e1c775cf..39c701d7 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt
@@ -18,6 +18,7 @@ import com.deniscerri.ytdlnis.database.repository.DownloadRepository
import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel
import com.deniscerri.ytdlnis.ui.more.downloadLogs.DownloadLogActivity
import com.deniscerri.ytdlnis.util.FileUtil
+import com.deniscerri.ytdlnis.util.InfoUtil
import com.deniscerri.ytdlnis.util.NotificationUtil
import com.yausername.youtubedl_android.YoutubeDL
import com.yausername.youtubedl_android.YoutubeDLRequest
@@ -25,6 +26,8 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import java.io.File
+import java.util.*
+import kotlin.collections.ArrayList
class DownloadWorker(
@@ -37,6 +40,7 @@ class DownloadWorker(
val notificationUtil = NotificationUtil(context)
val fileUtil = FileUtil()
+ val infoUtil = InfoUtil(context)
val dbManager = DBManager.getInstance(context)
val dao = dbManager.downloadDao
val repository = DownloadRepository(dao)
@@ -209,12 +213,12 @@ class DownloadWorker(
var videoFormatID = downloadItem.format.format_id
Log.e(TAG, videoFormatID)
- var formatArgument = "bestvideo+bestaudio/best"
+ var formatArgument = if (downloadItem.videoPreferences.removeAudio) "bestvideo" else "bestvideo+bestaudio/best"
if (videoFormatID.isNotEmpty()) {
if (videoFormatID == context.resources.getString(R.string.best_quality)) videoFormatID = "bestvideo"
else if (videoFormatID == context.resources.getString(R.string.worst_quality)) videoFormatID = "worst"
else if (defaultFormats.contains(videoFormatID)) videoFormatID = "bestvideo[height<="+videoFormatID.substring(0, videoFormatID.length -1)+"]"
- formatArgument = "$videoFormatID+bestaudio/best/$videoFormatID"
+ if (!downloadItem.videoPreferences.removeAudio) formatArgument = "$videoFormatID+bestaudio/best/$videoFormatID"
}
Log.e(TAG, formatArgument)
request.addOption("-f", formatArgument)
@@ -237,6 +241,11 @@ class DownloadWorker(
request.addOption("--sub-langs", downloadItem.videoPreferences.subsLanguages)
}
+ if (downloadItem.videoPreferences.removeAudio &&
+ (downloadItem.format.acodec.isNotEmpty() && downloadItem.format.acodec != "none")){
+ request.addOption("--ppa", "ffmpeg:-an")
+ }
+
if (downloadItem.videoPreferences.splitByChapters && downloadItem.downloadSections.isBlank()){
request.addOption("--split-chapters")
request.addOption("-P", tempFileDir.absolutePath)
@@ -280,6 +289,7 @@ class DownloadWorker(
if (downloadItem.title.isEmpty()) downloadItem.title = info.title.toString()
if (downloadItem.author.isEmpty()) downloadItem.author = info.uploader.toString()
if (downloadItem.thumb.isEmpty()) downloadItem.thumb = info.thumbnail.toString()
+ downloadItem.duration = infoUtil.formatIntegerDuration(info.duration, Locale.US)
runBlocking {
dao.update(downloadItem)
}
diff --git a/app/src/main/res/drawable/ic_launcher_foreground_large.xml b/app/src/main/res/drawable/ic_launcher_foreground_large.xml
new file mode 100644
index 00000000..49c10894
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground_large.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/active_download_card.xml b/app/src/main/res/layout/active_download_card.xml
index 1d82499b..ec4882e8 100644
--- a/app/src/main/res/layout/active_download_card.xml
+++ b/app/src/main/res/layout/active_download_card.xml
@@ -38,6 +38,7 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_download_video.xml b/app/src/main/res/layout/fragment_download_video.xml
index de48731d..8830bd8c 100644
--- a/app/src/main/res/layout/fragment_download_video.xml
+++ b/app/src/main/res/layout/fragment_download_video.xml
@@ -249,6 +249,19 @@
android:checked="false"
android:text="@string/subtitle_languages"/>
+
+
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index bbd3e021..50ec8862 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 50ec8862..bbd3e021 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,5 +2,4 @@
-
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 9e095cd9cc063c1db539e6bbb901526a77877a1d..9116b296c3ce187074cd51388895fecc515eb0f2 100644
GIT binary patch
literal 3824
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
UapwdY-~a#s07*qoM6N<$f`ZNP82|tP
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 9e095cd9cc063c1db539e6bbb901526a77877a1d..9116b296c3ce187074cd51388895fecc515eb0f2 100644
GIT binary patch
literal 3824
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