From dbdd8ef8d21f8f7a833f0584a8b2a82a53508ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C3=87erri?= <64997243+deniscerri@users.noreply.github.com> Date: Tue, 10 Jan 2023 12:17:20 +0100 Subject: [PATCH] changed downloads logo and fixed custom commands --- .gitignore | 8 +-- .idea/assetWizardSettings.xml | 4 +- app/build.gradle | 4 +- .../deniscerri/ytdlnis/DownloaderService.java | 2 +- .../ytdlnis/page/CustomCommandActivity.java | 2 +- .../ytdlnis/work/FileTransferWorker.kt | 55 ------------------- app/src/main/res/drawable/ic_downloads.xml | 2 +- .../res/layout/activity_custom_command.xml | 1 + 8 files changed, 9 insertions(+), 69 deletions(-) delete mode 100644 app/src/main/java/com/deniscerri/ytdlnis/work/FileTransferWorker.kt diff --git a/.gitignore b/.gitignore index 93d25cf2..09b993d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,7 @@ *.iml .gradle /local.properties -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/caches -/.idea/tasks.xml -/.idea/gradle.xml -/.idea/dictionaries +/.idea .DS_Store /build /captures diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index 41f999de..617fae3e 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -320,7 +320,7 @@ @@ -331,7 +331,7 @@ diff --git a/app/build.gradle b/app/build.gradle index 524e3b39..71dfe50c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,7 +30,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" archivesBaseName = "YTDLnis-$versionName" ndk { - abiFilters 'armeabi-v7a', 'arm64-v8a' + abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' } vectorDrawables { useSupportLibrary true @@ -75,7 +75,7 @@ android { abi { enable true reset() - include 'armeabi-v7a', 'arm64-v8a' + include 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' universalApk true } } diff --git a/app/src/main/java/com/deniscerri/ytdlnis/DownloaderService.java b/app/src/main/java/com/deniscerri/ytdlnis/DownloaderService.java index 12a592be..bb533b27 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/DownloaderService.java +++ b/app/src/main/java/com/deniscerri/ytdlnis/DownloaderService.java @@ -428,7 +428,7 @@ public class DownloaderService extends Service { } private void startCommandDownload(String text){ - if(!text.startsWith("yt-dlp ")){ + if(text.startsWith("yt-dlp ")){ text = text.substring(6).trim(); } diff --git a/app/src/main/java/com/deniscerri/ytdlnis/page/CustomCommandActivity.java b/app/src/main/java/com/deniscerri/ytdlnis/page/CustomCommandActivity.java index dceb26d9..9121f8e2 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/page/CustomCommandActivity.java +++ b/app/src/main/java/com/deniscerri/ytdlnis/page/CustomCommandActivity.java @@ -120,7 +120,7 @@ public class CustomCommandActivity extends AppCompatActivity { topAppBar = findViewById(R.id.custom_command_toolbar); topAppBar.setNavigationOnClickListener(view -> onBackPressed()); output = findViewById(R.id.custom_command_output); - output.setMovementMethod(new ScrollingMovementMethod()); + output.setTextIsSelectable(true); input = findViewById(R.id.command_edittext); input.requestFocus(); diff --git a/app/src/main/java/com/deniscerri/ytdlnis/work/FileTransferWorker.kt b/app/src/main/java/com/deniscerri/ytdlnis/work/FileTransferWorker.kt deleted file mode 100644 index 47f1a480..00000000 --- a/app/src/main/java/com/deniscerri/ytdlnis/work/FileTransferWorker.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.deniscerri.ytdlnis.work - -import android.app.PendingIntent -import android.content.Context -import android.content.Intent -import android.net.Uri -import android.os.SystemClock -import android.provider.DocumentsContract -import androidx.work.CoroutineWorker -import androidx.work.ForegroundInfo -import androidx.work.WorkerParameters -import com.deniscerri.ytdlnis.MainActivity -import com.deniscerri.ytdlnis.page.CustomCommandActivity -import com.deniscerri.ytdlnis.util.FileUtil -import com.deniscerri.ytdlnis.util.NotificationUtil -import java.io.File - -class FileTransferWorker( - private val context: Context, - workerParams: WorkerParameters -) : CoroutineWorker(context, workerParams) { - - override suspend fun doWork(): Result { - val originDir = File(inputData.getString(originDir)!!) - val downLocation = inputData.getString(downLocation) - val fileTitle = inputData.getString(title) ?: "" - val destDir = Uri.parse(downLocation).run { - DocumentsContract.buildChildDocumentsUriUsingTree(this, DocumentsContract.getTreeDocumentId(this)) - } - - val fileUtil = FileUtil() - - val notificationUtil = NotificationUtil(context) - val intent = Intent(context, MainActivity::class.java) - val pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE) - val title = "Moving $fileTitle to ${fileUtil.formatPath(downLocation!!)}" - val id : Int = SystemClock.uptimeMillis().toInt() - val notification = notificationUtil.createFileTransferNotification(pendingIntent, title) - val foregroundInfo = ForegroundInfo(id, notification) - setForeground(foregroundInfo) - - fileUtil.moveFile(originDir, context, destDir){ progress -> - notificationUtil.updateFileTransferNotification(id, progress) - } - - return Result.success() - } - - - companion object { - const val downLocation = "downLocation" - const val originDir = "originDir" - const val title = "title" - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_downloads.xml b/app/src/main/res/drawable/ic_downloads.xml index ad08ddb0..e69407e0 100644 --- a/app/src/main/res/drawable/ic_downloads.xml +++ b/app/src/main/res/drawable/ic_downloads.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/layout/activity_custom_command.xml b/app/src/main/res/layout/activity_custom_command.xml index b33e759f..8625428b 100644 --- a/app/src/main/res/layout/activity_custom_command.xml +++ b/app/src/main/res/layout/activity_custom_command.xml @@ -43,6 +43,7 @@