diff --git a/app/build.gradle b/app/build.gradle index 5f327079..82cc0363 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,3 @@ -import com.android.build.gradle.internal.dsl.ManagedVirtualDevice - - plugins { id 'com.android.application' id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' @@ -126,7 +123,7 @@ dependencies { implementation "androidx.appcompat:appcompat:$appCompatVer" implementation "androidx.constraintlayout:constraintlayout:2.1.4" - implementation 'com.google.android.material:material:1.7.0' + implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.core:core:1.9.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' diff --git a/app/src/main/java/com/deniscerri/ytdlnis/App.kt b/app/src/main/java/com/deniscerri/ytdlnis/App.kt index f269e3af..67e42664 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/App.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/App.kt @@ -2,8 +2,6 @@ package com.deniscerri.ytdlnis import android.app.Application import android.widget.Toast -import androidx.appcompat.app.AppCompatDelegate -import androidx.core.os.LocaleListCompat import androidx.preference.PreferenceManager import androidx.work.Configuration import androidx.work.WorkManager diff --git a/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt index cee184bc..89572b94 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt @@ -8,7 +8,6 @@ import android.content.pm.PackageManager import android.content.res.Configuration import android.net.Uri import android.os.Build -import android.os.Build.VERSION_CODES import android.os.Bundle import android.provider.Settings import android.util.Log @@ -24,9 +23,9 @@ 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.HomeFragment 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 import com.deniscerri.ytdlnis.util.UpdateUtil diff --git a/app/src/main/java/com/deniscerri/ytdlnis/adapter/ConfigureMultipleDownloadsAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/adapter/ConfigureMultipleDownloadsAdapter.kt index 957ecd87..70c81d6c 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/ConfigureMultipleDownloadsAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/ConfigureMultipleDownloadsAdapter.kt @@ -4,12 +4,10 @@ import android.app.Activity import android.graphics.Color import android.os.Handler import android.os.Looper -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ImageView -import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.AsyncDifferConfig @@ -18,14 +16,11 @@ import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView 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.DownloadViewModel import com.deniscerri.ytdlnis.util.FileUtil 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 okhttp3.internal.format import java.util.* class ConfigureMultipleDownloadsAdapter(onItemClickListener: OnItemClickListener, activity: Activity) : ListAdapter(AsyncDifferConfig.Builder(DIFF_CALLBACK).build()) { 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 19dc6035..9efb31e9 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/GenericDownloadAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/GenericDownloadAdapter.kt @@ -9,7 +9,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.AsyncDifferConfig import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter @@ -17,17 +16,11 @@ import androidx.recyclerview.widget.RecyclerView import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.database.models.DownloadItem import com.deniscerri.ytdlnis.database.repository.DownloadRepository -import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel -import com.deniscerri.ytdlnis.ui.downloadcard.DownloadVideoFragment import com.deniscerri.ytdlnis.util.FileUtil import com.google.android.material.button.MaterialButton import com.google.android.material.card.MaterialCardView import com.squareup.picasso.Picasso -import okhttp3.internal.format import java.io.File -import java.text.DateFormat -import java.text.SimpleDateFormat -import java.util.* class GenericDownloadAdapter(onItemClickListener: OnItemClickListener, activity: Activity) : ListAdapter(AsyncDifferConfig.Builder(DIFF_CALLBACK).build()) { private val onItemClickListener: OnItemClickListener diff --git a/app/src/main/java/com/deniscerri/ytdlnis/adapter/PlaylistAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/adapter/PlaylistAdapter.kt index 32ea0531..55bbdf96 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/PlaylistAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/PlaylistAdapter.kt @@ -5,12 +5,10 @@ import android.app.Activity import android.graphics.Color import android.os.Handler import android.os.Looper -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.CheckBox -import android.widget.CompoundButton import android.widget.ImageView import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout diff --git a/app/src/main/java/com/deniscerri/ytdlnis/adapter/TemplatesAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/adapter/TemplatesAdapter.kt index 5f386642..9bce5544 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/TemplatesAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/TemplatesAdapter.kt @@ -4,7 +4,6 @@ import android.app.Activity import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Button import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.AsyncDifferConfig diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/Converters.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/Converters.kt index 01ecc909..4bfb77c4 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/Converters.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/Converters.kt @@ -8,7 +8,6 @@ import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import java.lang.reflect.Type -import java.util.Calendar class Converters { diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/dao/CommandTemplateDao.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/dao/CommandTemplateDao.kt index 6a930f84..6143432a 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/dao/CommandTemplateDao.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/dao/CommandTemplateDao.kt @@ -3,10 +3,7 @@ package com.deniscerri.ytdlnis.database.dao import androidx.lifecycle.LiveData import androidx.room.* import com.deniscerri.ytdlnis.database.models.CommandTemplate -import com.deniscerri.ytdlnis.database.models.DownloadItem -import com.deniscerri.ytdlnis.database.models.HistoryItem import com.deniscerri.ytdlnis.database.models.TemplateShortcut -import com.deniscerri.ytdlnis.util.FileUtil @Dao interface CommandTemplateDao { diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/models/DownloadItem.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/models/DownloadItem.kt index a378c1dc..bf2416a2 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/models/DownloadItem.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/models/DownloadItem.kt @@ -4,7 +4,6 @@ import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel -import java.util.* @Entity(tableName = "downloads") data class DownloadItem( diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/models/ResultItem.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/models/ResultItem.kt index 22981e6d..5a57b69a 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/models/ResultItem.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/models/ResultItem.kt @@ -2,9 +2,6 @@ package com.deniscerri.ytdlnis.database.models import androidx.room.Entity import androidx.room.PrimaryKey -import androidx.room.TypeConverters -import com.deniscerri.ytdlnis.database.Converters -import java.util.* @Entity(tableName = "results") data class ResultItem( diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/models/SearchHistoryItem.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/models/SearchHistoryItem.kt index e7dfbd02..7376005a 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/models/SearchHistoryItem.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/models/SearchHistoryItem.kt @@ -2,7 +2,6 @@ package com.deniscerri.ytdlnis.database.models import androidx.room.Entity import androidx.room.PrimaryKey -import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel @Entity(tableName = "searchHistory") data class SearchHistoryItem( diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/repository/HistoryRepository.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/repository/HistoryRepository.kt index cfa91390..affaae60 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/repository/HistoryRepository.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/repository/HistoryRepository.kt @@ -1,15 +1,9 @@ package com.deniscerri.ytdlnis.database.repository -import android.util.Log import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.room.Transaction -import com.deniscerri.ytdlnis.database.dao.DownloadDao import com.deniscerri.ytdlnis.database.dao.HistoryDao -import com.deniscerri.ytdlnis.database.models.DownloadItem import com.deniscerri.ytdlnis.database.models.HistoryItem import com.deniscerri.ytdlnis.util.FileUtil -import java.io.File class HistoryRepository(private val historyDao: HistoryDao) { val items : LiveData> = historyDao.getAllHistory() diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/repository/ResultRepository.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/repository/ResultRepository.kt index 4953040c..45fd02cf 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/repository/ResultRepository.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/repository/ResultRepository.kt @@ -7,7 +7,6 @@ import androidx.lifecycle.MutableLiveData import com.deniscerri.ytdlnis.database.dao.CommandTemplateDao import com.deniscerri.ytdlnis.database.dao.ResultDao import com.deniscerri.ytdlnis.database.models.CommandTemplate -import com.deniscerri.ytdlnis.database.models.Format import com.deniscerri.ytdlnis.database.models.ResultItem import com.deniscerri.ytdlnis.util.InfoUtil diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/CommandTemplateViewModel.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/CommandTemplateViewModel.kt index 5e1ad861..325a7c95 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/CommandTemplateViewModel.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/CommandTemplateViewModel.kt @@ -1,27 +1,18 @@ package com.deniscerri.ytdlnis.database.viewmodel import android.app.Application -import android.content.ClipData import android.content.ClipboardManager import android.content.Context.CLIPBOARD_SERVICE -import android.widget.Toast -import androidx.core.content.ContextCompat.getSystemService -import androidx.lifecycle.* +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.LiveData +import androidx.lifecycle.viewModelScope import com.deniscerri.ytdlnis.database.DBManager import com.deniscerri.ytdlnis.database.models.CommandTemplate import com.deniscerri.ytdlnis.database.models.CommandTemplateExport -import com.deniscerri.ytdlnis.database.models.HistoryItem import com.deniscerri.ytdlnis.database.models.TemplateShortcut import com.deniscerri.ytdlnis.database.repository.CommandTemplateRepository -import com.deniscerri.ytdlnis.database.repository.HistoryRepository -import com.deniscerri.ytdlnis.database.repository.HistoryRepository.HistorySort -import com.deniscerri.ytdlnis.database.repository.HistoryRepository.HistorySortType -import com.deniscerri.ytdlnis.util.FileUtil -import com.google.gson.Gson -import com.google.gson.JsonObject import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext import kotlinx.serialization.decodeFromString import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json 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 5c8e15b6..8770783f 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 @@ -3,7 +3,6 @@ package com.deniscerri.ytdlnis.database.viewmodel import android.app.Activity import android.app.Application import android.content.SharedPreferences -import android.util.Log import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -22,7 +21,6 @@ import com.deniscerri.ytdlnis.work.DownloadWorker import com.google.gson.Gson import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import java.util.* import java.util.concurrent.TimeUnit class DownloadViewModel(application: Application) : AndroidViewModel(application) { diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/ResultViewModel.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/ResultViewModel.kt index f32f421a..2cb9759a 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/ResultViewModel.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/ResultViewModel.kt @@ -2,7 +2,10 @@ package com.deniscerri.ytdlnis.database.viewmodel import android.app.Application import android.util.Log -import androidx.lifecycle.* +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.viewModelScope import com.deniscerri.ytdlnis.App import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.database.DBManager diff --git a/app/src/main/java/com/deniscerri/ytdlnis/receiver/CancelDownloadNotificationReceiver.kt b/app/src/main/java/com/deniscerri/ytdlnis/receiver/CancelDownloadNotificationReceiver.kt index a82cd233..7d8c229d 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/receiver/CancelDownloadNotificationReceiver.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/receiver/CancelDownloadNotificationReceiver.kt @@ -1,16 +1,11 @@ package com.deniscerri.ytdlnis.receiver -import android.content.* -import androidx.lifecycle.ViewModelProvider -import androidx.lifecycle.lifecycleScope +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent import androidx.work.WorkManager -import com.deniscerri.ytdlnis.database.DBManager -import com.deniscerri.ytdlnis.database.repository.DownloadRepository -import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel import com.deniscerri.ytdlnis.util.NotificationUtil import com.yausername.youtubedl_android.YoutubeDL -import kotlinx.coroutines.launch -import kotlinx.coroutines.runBlocking class CancelDownloadNotificationReceiver : BroadcastReceiver() { override fun onReceive(c: Context, intent: Intent) { diff --git a/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt index b87956dc..2b5358be 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt @@ -14,11 +14,8 @@ import android.os.Build import android.os.Build.VERSION_CODES import android.os.Bundle import android.provider.Settings -import android.view.View -import android.view.ViewGroup import android.view.Window import android.view.WindowManager -import android.widget.Button import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity @@ -27,11 +24,8 @@ import androidx.core.view.ViewCompat import androidx.core.view.WindowCompat import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView import com.deniscerri.ytdlnis.MainActivity import com.deniscerri.ytdlnis.R -import com.deniscerri.ytdlnis.adapter.PlaylistAdapter import com.deniscerri.ytdlnis.database.models.DownloadItem import com.deniscerri.ytdlnis.database.models.ResultItem import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel @@ -40,7 +34,6 @@ import com.deniscerri.ytdlnis.ui.downloadcard.DownloadBottomSheetDialog import com.deniscerri.ytdlnis.ui.downloadcard.SelectPlaylistItemsBottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.dialog.MaterialAlertDialogBuilder -import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -82,7 +75,6 @@ class ShareActivity : AppCompatActivity() { downloadViewModel = ViewModelProvider(this)[DownloadViewModel::class.java] sharedPreferences = getSharedPreferences("root_preferences", Activity.MODE_PRIVATE) - askPermissions() val intent = intent handleIntents(intent) } @@ -93,6 +85,8 @@ class ShareActivity : AppCompatActivity() { } private fun handleIntents(intent: Intent) { + askPermissions() + val action = intent.action val type = intent.type if (Intent.ACTION_SEND == action && type != null) { @@ -163,16 +157,23 @@ class ShareActivity : AppCompatActivity() { } private fun askPermissions() { - if (Build.VERSION.SDK_INT < VERSION_CODES.TIRAMISU && !checkFilePermission()) { + val permissions = arrayListOf() + if (!checkFilePermission()) { + if (Build.VERSION.SDK_INT >= 33){ + permissions.add(Manifest.permission.READ_MEDIA_AUDIO) + permissions.add(Manifest.permission.READ_MEDIA_VIDEO) + }else{ + permissions.add(Manifest.permission.WRITE_EXTERNAL_STORAGE) + } + } + if (!checkNotificationPermission()){ + permissions.add(Manifest.permission.POST_NOTIFICATIONS) + } + + if (permissions.isNotEmpty()){ ActivityCompat.requestPermissions( this, - arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), - 1 - ) - }else if (!checkNotificationPermission()){ - ActivityCompat.requestPermissions( - this, - arrayOf(Manifest.permission.POST_NOTIFICATIONS), + permissions.toTypedArray(), 1 ) } diff --git a/app/src/main/java/com/deniscerri/ytdlnis/service/DownloadInfo.kt b/app/src/main/java/com/deniscerri/ytdlnis/service/DownloadInfo.kt index 54233507..463009a1 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/service/DownloadInfo.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/service/DownloadInfo.kt @@ -1,7 +1,6 @@ package com.deniscerri.ytdlnis.service import com.deniscerri.ytdlnis.database.models.ResultItem -import java.util.* class DownloadInfo { var video: ResultItem? = null diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt index ec7d38f1..67f5dcd4 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt @@ -2,9 +2,7 @@ package com.deniscerri.ytdlnis.ui import android.annotation.SuppressLint import android.app.Activity -import android.content.ClipboardManager import android.content.Context -import android.content.Context.CLIPBOARD_SERVICE import android.content.Intent import android.content.SharedPreferences import android.content.res.Configuration @@ -40,10 +38,8 @@ import com.deniscerri.ytdlnis.util.InfoUtil import com.facebook.shimmer.ShimmerFrameLayout import com.google.android.material.appbar.AppBarLayout import com.google.android.material.appbar.MaterialToolbar -import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.button.MaterialButton import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton -import com.google.android.material.snackbar.Snackbar import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/BackgroundToForegroundPageTransformer.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/BackgroundToForegroundPageTransformer.kt index cd267643..1a4fbd98 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/BackgroundToForegroundPageTransformer.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/BackgroundToForegroundPageTransformer.kt @@ -2,7 +2,6 @@ package com.deniscerri.ytdlnis.ui.downloadcard import android.view.View import androidx.viewpager2.widget.ViewPager2 -import kotlin.math.abs class BackgroundToForegroundPageTransformer : ViewPager2.PageTransformer { diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/ConfigureDownloadBottomSheetDialog.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/ConfigureDownloadBottomSheetDialog.kt index aa0d26dd..21407655 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/ConfigureDownloadBottomSheetDialog.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/ConfigureDownloadBottomSheetDialog.kt @@ -21,7 +21,6 @@ import com.deniscerri.ytdlnis.database.models.ResultItem import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel.Type import com.deniscerri.ytdlnis.database.viewmodel.ResultViewModel -import com.google.android.exoplayer2.Player import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.tabs.TabLayout diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadAudioFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadAudioFragment.kt index 1b13d74a..b59de53b 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadAudioFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadAudioFragment.kt @@ -15,11 +15,9 @@ import android.widget.AutoCompleteTextView import android.widget.TextView import androidx.activity.result.contract.ActivityResultContracts import androidx.constraintlayout.widget.ConstraintLayout -import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.fragment.app.Fragment 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.Format diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt index 77c20edf..2249b742 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt @@ -1,21 +1,14 @@ package com.deniscerri.ytdlnis.ui.downloadcard import android.annotation.SuppressLint -import android.app.DatePickerDialog import android.app.Dialog -import android.app.TimePickerDialog import android.content.DialogInterface import android.os.Bundle import android.util.DisplayMetrics -import android.view.Display import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Adapter import android.widget.Button -import androidx.coordinatorlayout.widget.CoordinatorLayout -import androidx.core.view.get -import androidx.core.view.size import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -33,7 +26,6 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.button.MaterialButton import com.google.android.material.datepicker.CalendarConstraints -import com.google.android.material.datepicker.DateValidatorPointBackward import com.google.android.material.datepicker.DateValidatorPointForward import com.google.android.material.datepicker.MaterialDatePicker import com.google.android.material.tabs.TabLayout diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadFragmentAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadFragmentAdapter.kt index e347c940..665928bc 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadFragmentAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadFragmentAdapter.kt @@ -1,14 +1,10 @@ package com.deniscerri.ytdlnis.ui.downloadcard -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 DownloadFragmentAdapter ( private val resultItem: ResultItem, 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 7c0091ef..57bb1463 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 @@ -12,7 +12,6 @@ import android.view.LayoutInflater import android.view.MenuItem import android.view.View import android.widget.Button -import android.widget.TextView import android.widget.Toast import androidx.activity.result.contract.ActivityResultContracts import androidx.lifecycle.ViewModelProvider @@ -22,7 +21,6 @@ import androidx.recyclerview.widget.RecyclerView import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.adapter.ConfigureMultipleDownloadsAdapter import com.deniscerri.ytdlnis.database.models.DownloadItem -import com.deniscerri.ytdlnis.database.models.Format import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel import com.deniscerri.ytdlnis.database.viewmodel.ResultViewModel import com.deniscerri.ytdlnis.receiver.ShareActivity @@ -40,7 +38,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.util.* -import kotlin.collections.ArrayList class DownloadMultipleBottomSheetDialog(private val items: MutableList) : BottomSheetDialogFragment(), ConfigureMultipleDownloadsAdapter.OnItemClickListener, View.OnClickListener, ConfigureDownloadBottomSheetDialog.OnDownloadItemUpdateListener { 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 545e18cd..5dbbfb05 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 @@ -5,7 +5,6 @@ import android.content.Intent import android.os.Bundle import android.text.Editable import android.text.TextWatcher -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup 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 8d176187..202abc91 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 @@ -1,43 +1,24 @@ package com.deniscerri.ytdlnis.ui.downloadcard import android.annotation.SuppressLint -import android.app.DatePickerDialog import android.app.Dialog -import android.app.TimePickerDialog import android.content.DialogInterface import android.os.Bundle import android.util.DisplayMetrics -import android.util.Log -import android.view.Display import android.view.LayoutInflater import android.view.View import android.widget.* import androidx.constraintlayout.widget.ConstraintLayout -import androidx.coordinatorlayout.widget.CoordinatorLayout -import androidx.core.view.get -import androidx.core.view.size -import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope -import androidx.viewpager2.widget.ViewPager2 import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.database.models.DownloadItem import com.deniscerri.ytdlnis.database.models.Format -import com.deniscerri.ytdlnis.database.models.ResultItem -import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel.Type import com.deniscerri.ytdlnis.util.FileUtil import com.deniscerri.ytdlnis.util.InfoUtil import com.deniscerri.ytdlnis.util.UiUtil import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import com.google.android.material.button.MaterialButton -import com.google.android.material.datepicker.CalendarConstraints -import com.google.android.material.datepicker.DateValidatorPointBackward -import com.google.android.material.datepicker.DateValidatorPointForward -import com.google.android.material.datepicker.MaterialDatePicker -import com.google.android.material.tabs.TabLayout -import com.google.android.material.timepicker.MaterialTimePicker -import com.google.android.material.timepicker.TimeFormat import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/SelectPlaylistItemsBottomSheetDialog.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/SelectPlaylistItemsBottomSheetDialog.kt index 3d74e52c..1b004565 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/SelectPlaylistItemsBottomSheetDialog.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/SelectPlaylistItemsBottomSheetDialog.kt @@ -5,7 +5,6 @@ import android.app.Dialog import android.content.DialogInterface import android.os.Bundle import android.util.DisplayMetrics -import android.util.Log import android.view.LayoutInflater import android.view.View import android.widget.Button @@ -15,7 +14,6 @@ import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.deniscerri.ytdlnis.R -import com.deniscerri.ytdlnis.adapter.ConfigureMultipleDownloadsAdapter import com.deniscerri.ytdlnis.adapter.PlaylistAdapter import com.deniscerri.ytdlnis.database.models.DownloadItem import com.deniscerri.ytdlnis.database.models.ResultItem @@ -24,15 +22,8 @@ import com.deniscerri.ytdlnis.database.viewmodel.ResultViewModel import com.deniscerri.ytdlnis.receiver.ShareActivity import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import com.google.android.material.button.MaterialButton -import com.google.android.material.datepicker.CalendarConstraints -import com.google.android.material.datepicker.DateValidatorPointForward -import com.google.android.material.datepicker.MaterialDatePicker -import com.google.android.material.timepicker.MaterialTimePicker -import com.google.android.material.timepicker.TimeFormat import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext import java.util.* class SelectPlaylistItemsBottomSheetDialog(private val items: List, private val type: DownloadViewModel.Type) : BottomSheetDialogFragment(), PlaylistAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt index fb132bef..02388884 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt @@ -1,7 +1,8 @@ package com.deniscerri.ytdlnis.ui.downloads import android.app.Activity -import android.content.* +import android.content.Context +import android.content.DialogInterface import android.content.res.Configuration import android.os.Bundle import android.os.Handler diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/CommandTemplatesActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/CommandTemplatesActivity.kt index b923c9bd..0438dec5 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/CommandTemplatesActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/CommandTemplatesActivity.kt @@ -2,9 +2,9 @@ package com.deniscerri.ytdlnis.ui.more import android.content.Context import android.content.DialogInterface -import android.os.* +import android.os.Bundle import android.view.MenuItem -import android.widget.* +import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/MoreFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/MoreFragment.kt index 49116cc3..f56e6916 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/MoreFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/MoreFragment.kt @@ -1,7 +1,6 @@ package com.deniscerri.ytdlnis.ui.more import android.app.Activity -import android.app.Application import android.content.SharedPreferences import android.os.Bundle import androidx.preference.Preference 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 cd3dd53d..cffec76b 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 @@ -32,7 +32,6 @@ import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers import kotlinx.coroutines.launch import java.io.File -import java.util.regex.Pattern class TerminalActivity : AppCompatActivity() { @@ -178,9 +177,9 @@ class TerminalActivity : AppCompatActivity() { .subscribeOn(Schedulers.newThread()) .observeOn(AndroidSchedulers.mainThread()) .subscribe({ - scrollView!!.scrollTo(0, scrollView!!.maxScrollAmount); - input!!.setText("yt-dlp "); - input!!.isEnabled = true; + scrollView!!.scrollTo(0, scrollView!!.maxScrollAmount) + input!!.setText("yt-dlp ") + input!!.isEnabled = true cancelFab!!.visibility = View.GONE fab!!.visibility = View.VISIBLE diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/downloadLogs/DownloadLogActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/downloadLogs/DownloadLogActivity.kt index 5a519fe6..8e1a74d3 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/downloadLogs/DownloadLogActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/downloadLogs/DownloadLogActivity.kt @@ -1,12 +1,10 @@ package com.deniscerri.ytdlnis.ui.more.downloadLogs -import android.content.ClipData import android.content.ClipboardManager import android.content.Context import android.os.Build import android.os.Bundle import android.os.FileObserver -import android.text.method.ScrollingMovementMethod import android.view.View import android.widget.ScrollView import android.widget.TextView diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/downloadLogs/DownloadLogListActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/downloadLogs/DownloadLogListActivity.kt index 7bf084cf..40698a64 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/downloadLogs/DownloadLogListActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/downloadLogs/DownloadLogListActivity.kt @@ -3,7 +3,9 @@ package com.deniscerri.ytdlnis.ui.more.downloadLogs import android.content.Context import android.content.DialogInterface import android.content.Intent -import android.os.* +import android.os.Build +import android.os.Bundle +import android.os.FileObserver import android.view.MenuItem import android.view.View import android.widget.RelativeLayout diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsFragment.kt index 717f410f..d9cdd173 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsFragment.kt @@ -1,20 +1,15 @@ package com.deniscerri.ytdlnis.ui.more.settings -import android.Manifest import android.app.Activity import android.content.Intent -import android.content.pm.PackageManager -import android.content.res.Configuration import android.net.Uri import android.os.Build import android.os.Bundle import android.os.Environment import android.provider.Settings -import android.util.Log import android.widget.Toast import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatDelegate -import androidx.core.app.ActivityCompat import androidx.core.os.LocaleListCompat import androidx.preference.* import com.deniscerri.ytdlnis.BuildConfig diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/FileUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/FileUtil.kt index 14d092f8..b95f2ce5 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/util/FileUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/util/FileUtil.kt @@ -1,23 +1,16 @@ package com.deniscerri.ytdlnis.util -import android.Manifest import android.content.Context -import android.content.pm.PackageManager import android.media.MediaScannerConnection import android.net.Uri import android.os.Build import android.provider.DocumentsContract -import android.util.Log import android.webkit.MimeTypeMap -import androidx.core.app.ActivityCompat -import androidx.documentfile.provider.DocumentFile import com.deniscerri.ytdlnis.R import okhttp3.internal.closeQuietly -import okio.Path.Companion.toPath import java.io.File import java.net.URLDecoder import java.nio.charset.StandardCharsets -import java.nio.file.CopyOption import java.nio.file.Files import java.nio.file.StandardCopyOption import java.text.DecimalFormat 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 68418173..6fa711f0 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt @@ -21,7 +21,6 @@ import java.net.HttpURLConnection import java.net.URL import java.util.* import java.util.regex.Pattern -import kotlin.collections.ArrayList class InfoUtil(context: Context) { private var searchHistoryRepository = SearchHistoryRepository(DBManager.getInstance(context).searchHistoryDao) 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 26c6cfc0..b013faec 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt @@ -25,7 +25,6 @@ import com.yausername.youtubedl_android.YoutubeDL import com.yausername.youtubedl_android.YoutubeDLRequest import kotlinx.coroutines.runBlocking import java.io.File -import java.util.regex.Pattern class DownloadWorker( diff --git a/app/src/main/res/layout/active_download_card.xml b/app/src/main/res/layout/active_download_card.xml index a30fa40d..e5b6209a 100644 --- a/app/src/main/res/layout/active_download_card.xml +++ b/app/src/main/res/layout/active_download_card.xml @@ -1,6 +1,5 @@ + android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/errored_download_card.xml b/app/src/main/res/layout/errored_download_card.xml index bac8d5fc..118c4ec6 100644 --- a/app/src/main/res/layout/errored_download_card.xml +++ b/app/src/main/res/layout/errored_download_card.xml @@ -1,6 +1,5 @@ diff --git a/app/src/main/res/layout/fragment_download_video.xml b/app/src/main/res/layout/fragment_download_video.xml index 8a01e1c0..83a83a36 100644 --- a/app/src/main/res/layout/fragment_download_video.xml +++ b/app/src/main/res/layout/fragment_download_video.xml @@ -1,6 +1,5 @@ + diff --git a/app/src/test/java/com/deniscerri/ytdlnis/ExampleUnitTest.java b/app/src/test/java/com/deniscerri/ytdlnis/ExampleUnitTest.java index 24ff8463..73a186e8 100644 --- a/app/src/test/java/com/deniscerri/ytdlnis/ExampleUnitTest.java +++ b/app/src/test/java/com/deniscerri/ytdlnis/ExampleUnitTest.java @@ -1,8 +1,8 @@ package com.deniscerri.ytdlnis; -import org.junit.Test; +import static org.junit.Assert.assertEquals; -import static org.junit.Assert.*; +import org.junit.Test; /** * Example local unit test, which will execute on the development machine (host).