diff --git a/app/build.gradle b/app/build.gradle index 3a36f398..18d64c4f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -134,6 +134,7 @@ dependencies { implementation 'androidx.preference:preference:1.2.0' implementation "androidx.navigation:navigation-fragment-ktx:$navVer" implementation "androidx.navigation:navigation-ui-ktx:$navVer" + implementation "androidx.navigation:navigation-dynamic-features-fragment:$navVer" implementation 'androidx.core:core-ktx:1.10.0' implementation 'androidx.test.ext:junit-ktx:1.1.5' implementation 'androidx.benchmark:benchmark-macro:1.1.1' @@ -141,13 +142,13 @@ dependencies { androidTestImplementation "junit:junit:$junitVer" androidTestImplementation "androidx.test.ext:junit:$androidJunitVer" androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVer" - androidTestImplementation "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha13" + androidTestImplementation "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha14" androidTestImplementation "androidx.test:runner:1.5.2" androidTestImplementation "androidx.test:core:1.5.0" androidTestImplementation "androidx.test:rules:1.5.0" androidTestImplementation "androidx.navigation:navigation-testing:$navVer" - implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' + implementation "io.reactivex.rxjava2:rxandroid:2.1.1" implementation "com.devbrackets.android:exomedia:4.3.0" implementation("androidx.cardview:cardview:1.0.0") @@ -173,9 +174,9 @@ dependencies { implementation "com.squareup.retrofit2:retrofit:$retrofitVer" implementation "com.squareup.retrofit2:converter-gson:$retrofitVer" implementation "com.squareup.okhttp3:okhttp:5.0.0-alpha.10" - implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.11' + implementation "com.squareup.okhttp3:logging-interceptor:4.7.2" - implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0' + implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0" implementation "com.google.android.exoplayer:exoplayer:2.18.6" implementation 'it.xabaras.android:recyclerview-swipedecorator:1.4' implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1" diff --git a/app/src/main/java/com/deniscerri/ytdlnis/App.kt b/app/src/main/java/com/deniscerri/ytdlnis/App.kt index 79049a63..0ff29621 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/App.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/App.kt @@ -1,19 +1,13 @@ package com.deniscerri.ytdlnis import android.app.Application -import android.app.UiModeManager.MODE_NIGHT_NO -import android.app.UiModeManager.MODE_NIGHT_YES import android.widget.Toast -import androidx.appcompat.app.AppCompatDelegate -import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM import androidx.core.content.edit import androidx.preference.PreferenceManager import androidx.work.Configuration import androidx.work.WorkManager import com.deniscerri.ytdlnis.util.NotificationUtil import com.deniscerri.ytdlnis.util.UpdateUtil -import com.google.android.material.color.DynamicColors -import com.google.android.material.snackbar.Snackbar import com.yausername.aria2c.Aria2c import com.yausername.ffmpeg.FFmpeg import com.yausername.youtubedl_android.YoutubeDL diff --git a/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt index 2af3cfdc..f3ed793f 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt @@ -175,6 +175,16 @@ class MainActivity : BaseActivity() { } } cookieViewModel.updateCookiesFile() +// lifecycleScope.launch(Dispatchers.IO){ +// val active = downloadViewModel.getActiveDownloads() +// if (active.isNotEmpty()){ +// val wm = WorkManager.getInstance(this@MainActivity) +// active.forEach { +// if (wm.getWorkInfosByTag()) +// } +// WorkManager.getInstance(this@MainActivity).get +// } +// } val intent = intent handleIntents(intent) } 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 d4e5788a..f6e96d88 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/ActiveDownloadAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/ActiveDownloadAdapter.kt @@ -22,7 +22,6 @@ import com.google.android.material.card.MaterialCardView import com.google.android.material.chip.Chip import com.google.android.material.progressindicator.LinearProgressIndicator import com.google.android.material.shape.CornerFamily -import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.shape.ShapeAppearanceModel import com.squareup.picasso.Picasso 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 a94433fb..9631c147 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/ConfigureMultipleDownloadsAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/ConfigureMultipleDownloadsAdapter.kt @@ -19,7 +19,7 @@ import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel import com.deniscerri.ytdlnis.util.FileUtil import com.google.android.material.button.MaterialButton import com.squareup.picasso.Picasso -import java.util.* +import java.util.Locale class ConfigureMultipleDownloadsAdapter(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/GenericDownloadAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/adapter/GenericDownloadAdapter.kt index f3d1f57d..bba3c438 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/GenericDownloadAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/GenericDownloadAdapter.kt @@ -7,7 +7,6 @@ import android.os.Looper import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.FrameLayout import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.AsyncDifferConfig @@ -16,13 +15,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.HistoryItem import com.deniscerri.ytdlnis.database.repository.DownloadRepository 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 java.util.ArrayList 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/HistoryAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt index 9f69d3ab..d47d8f98 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/HistoryAdapter.kt @@ -19,7 +19,6 @@ import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.database.models.HistoryItem -import com.deniscerri.ytdlnis.database.models.ResultItem import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel import com.google.android.material.button.MaterialButton import com.google.android.material.card.MaterialCardView 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 c403270d..a8a0bf28 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/PlaylistAdapter.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/PlaylistAdapter.kt @@ -17,7 +17,6 @@ import androidx.recyclerview.widget.DiffUtil 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.squareup.picasso.Picasso import java.util.* diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/dao/DownloadDao.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/dao/DownloadDao.kt index aa74ab16..b2d7a258 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/dao/DownloadDao.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/dao/DownloadDao.kt @@ -1,6 +1,5 @@ package com.deniscerri.ytdlnis.database.dao -import androidx.lifecycle.LiveData import androidx.room.* import com.deniscerri.ytdlnis.database.models.DownloadItem import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/dao/ResultDao.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/dao/ResultDao.kt index f0abe2f0..5bebde4f 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/dao/ResultDao.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/dao/ResultDao.kt @@ -1,6 +1,5 @@ package com.deniscerri.ytdlnis.database.dao -import androidx.lifecycle.LiveData import androidx.room.* import com.deniscerri.ytdlnis.database.models.ResultItem import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/repository/DownloadRepository.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/repository/DownloadRepository.kt index 654b83dc..01c28485 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/repository/DownloadRepository.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/repository/DownloadRepository.kt @@ -1,10 +1,8 @@ package com.deniscerri.ytdlnis.database.repository -import androidx.lifecycle.LiveData import com.deniscerri.ytdlnis.database.Converters import com.deniscerri.ytdlnis.database.dao.DownloadDao import com.deniscerri.ytdlnis.database.models.DownloadItem -import com.deniscerri.ytdlnis.database.models.ResultItem import kotlinx.coroutines.flow.Flow class DownloadRepository(private val downloadDao: DownloadDao) { 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 96336ba4..d6186dde 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 @@ -2,7 +2,6 @@ package com.deniscerri.ytdlnis.database.repository import android.content.Context import android.util.Log -import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.deniscerri.ytdlnis.database.dao.CommandTemplateDao import com.deniscerri.ytdlnis.database.dao.ResultDao 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 14492c2d..7af2889c 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 @@ -1,6 +1,5 @@ package com.deniscerri.ytdlnis.database.viewmodel -import android.app.Activity import android.app.Application import android.content.Context import android.content.SharedPreferences @@ -11,12 +10,23 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.asLiveData import androidx.lifecycle.viewModelScope import androidx.preference.PreferenceManager -import androidx.work.* +import androidx.work.Constraints +import androidx.work.Data +import androidx.work.ExistingWorkPolicy +import androidx.work.NetworkType +import androidx.work.OneTimeWorkRequestBuilder +import androidx.work.WorkManager import com.deniscerri.ytdlnis.App import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.database.DBManager import com.deniscerri.ytdlnis.database.dao.CommandTemplateDao -import com.deniscerri.ytdlnis.database.models.* +import com.deniscerri.ytdlnis.database.models.AudioPreferences +import com.deniscerri.ytdlnis.database.models.CommandTemplate +import com.deniscerri.ytdlnis.database.models.DownloadItem +import com.deniscerri.ytdlnis.database.models.Format +import com.deniscerri.ytdlnis.database.models.HistoryItem +import com.deniscerri.ytdlnis.database.models.ResultItem +import com.deniscerri.ytdlnis.database.models.VideoPreferences import com.deniscerri.ytdlnis.database.repository.DownloadRepository import com.deniscerri.ytdlnis.work.DownloadWorker import com.google.gson.Gson diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/HistoryViewModel.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/HistoryViewModel.kt index 093c217c..81ac3e25 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/HistoryViewModel.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/HistoryViewModel.kt @@ -1,7 +1,11 @@ package com.deniscerri.ytdlnis.database.viewmodel import android.app.Application -import androidx.lifecycle.* +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.LiveData +import androidx.lifecycle.MediatorLiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.viewModelScope import com.deniscerri.ytdlnis.database.DBManager import com.deniscerri.ytdlnis.database.models.HistoryItem import com.deniscerri.ytdlnis.database.repository.HistoryRepository 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 7d833175..c02b10dc 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 @@ -1,6 +1,5 @@ package com.deniscerri.ytdlnis.database.viewmodel -import android.app.Activity import android.app.Application import android.content.SharedPreferences import android.util.Log 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 9c152538..23ab5bed 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/receiver/CancelDownloadNotificationReceiver.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/receiver/CancelDownloadNotificationReceiver.kt @@ -3,7 +3,6 @@ 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.NotificationUtil import com.yausername.youtubedl_android.YoutubeDL @@ -13,9 +12,8 @@ class CancelDownloadNotificationReceiver : BroadcastReceiver() { val id = intent.getIntExtra("workID", 0) if (message != null) { val notificationUtil = NotificationUtil(c) - - YoutubeDL.getInstance().destroyProcessById(id.toString()) notificationUtil.cancelDownloadNotification(id) + YoutubeDL.getInstance().destroyProcessById(id.toString()) } } } \ No newline at end of file diff --git a/app/src/main/java/com/deniscerri/ytdlnis/receiver/PauseDownloadNotificationReceiver.kt b/app/src/main/java/com/deniscerri/ytdlnis/receiver/PauseDownloadNotificationReceiver.kt index 3074d80c..f999afb2 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/receiver/PauseDownloadNotificationReceiver.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/receiver/PauseDownloadNotificationReceiver.kt @@ -3,7 +3,6 @@ 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.NotificationUtil import com.yausername.youtubedl_android.YoutubeDL @@ -13,9 +12,8 @@ class PauseDownloadNotificationReceiver : BroadcastReceiver() { if (id != 0) { val title = intent.getStringExtra("title") val notificationUtil = NotificationUtil(c) - YoutubeDL.getInstance().destroyProcessById(id.toString()) - notificationUtil.cancelDownloadNotification(id) + YoutubeDL.getInstance().destroyProcessById(id.toString()) notificationUtil.createResumeDownload(id, title, NotificationUtil.DOWNLOAD_SERVICE_CHANNEL_ID) } } diff --git a/app/src/main/java/com/deniscerri/ytdlnis/receiver/ResumeActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/receiver/ResumeActivity.kt index 7b127149..1492c117 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/receiver/ResumeActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/receiver/ResumeActivity.kt @@ -7,7 +7,6 @@ import android.os.Build import android.os.Bundle import android.view.Window import android.view.WindowManager -import android.widget.TextView import android.widget.Toast import androidx.core.view.ViewCompat import androidx.core.view.WindowCompat @@ -22,7 +21,6 @@ import com.google.android.material.bottomsheet.BottomSheetDialog import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import kotlin.system.exitProcess class ResumeActivity : BaseActivity() { 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 3def4713..8a5a11d3 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt @@ -1,7 +1,6 @@ package com.deniscerri.ytdlnis.receiver import android.Manifest -import android.app.Activity import android.content.Context import android.content.DialogInterface import android.content.Intent @@ -16,10 +15,8 @@ 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 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 63205efb..e5296db2 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt @@ -15,7 +15,6 @@ import android.util.Log import android.view.* import android.view.View.* import android.widget.* -import androidx.activity.OnBackPressedCallback import androidx.activity.addCallback import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.view.ActionMode @@ -27,7 +26,6 @@ import androidx.core.widget.doAfterTextChanged import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope -import androidx.navigation.fragment.findNavController import androidx.preference.PreferenceManager import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView 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 6bea2317..71594ac2 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 @@ -11,7 +11,6 @@ import android.view.View import android.view.ViewGroup import android.widget.Button import android.widget.Toast -import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.RecyclerView 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 8106d306..e2f29ca5 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 @@ -3,7 +3,6 @@ package com.deniscerri.ytdlnis.ui.downloadcard import android.app.Activity import android.content.DialogInterface import android.content.Intent -import android.net.Uri import android.os.Bundle import android.text.Editable import android.text.TextWatcher 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 5e7e2590..d99503aa 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 @@ -27,7 +27,6 @@ import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel.Type import com.deniscerri.ytdlnis.database.viewmodel.ResultViewModel import com.deniscerri.ytdlnis.receiver.ShareActivity -import com.deniscerri.ytdlnis.ui.downloads.DownloadQueueActivity import com.deniscerri.ytdlnis.util.FileUtil import com.deniscerri.ytdlnis.util.UiUtil import com.google.android.material.bottomsheet.BottomSheetBehavior 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 81ec5f0d..f5006aff 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 @@ -10,7 +10,11 @@ import android.graphics.Color import android.os.Bundle import android.text.format.DateFormat import android.util.DisplayMetrics -import android.view.* +import android.view.LayoutInflater +import android.view.MenuItem +import android.view.View +import android.view.ViewGroup +import android.view.Window import android.widget.Button import android.widget.TextView import android.widget.Toast @@ -45,7 +49,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext import java.text.SimpleDateFormat -import java.util.* +import java.util.Locale class DownloadMultipleBottomSheetDialog(private var results: List, private var 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 5cbfeb8a..692e0c94 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 @@ -12,7 +12,11 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.inputmethod.InputMethodManager -import android.widget.* +import android.widget.AdapterView +import android.widget.ArrayAdapter +import android.widget.AutoCompleteTextView +import android.widget.EditText +import android.widget.TextView import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity 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 17758019..01ac225b 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,44 +1,31 @@ package com.deniscerri.ytdlnis.ui.downloadcard import android.annotation.SuppressLint -import android.app.Activity import android.app.Dialog import android.content.* import android.os.Bundle -import android.os.Looper -import android.text.format.DateFormat import android.util.DisplayMetrics -import android.util.Log import android.view.LayoutInflater import android.view.View -import android.view.ViewGroup -import android.view.Window import android.widget.* import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.content.ContextCompat import androidx.core.view.isVisible import androidx.lifecycle.lifecycleScope import androidx.preference.PreferenceManager import com.deniscerri.ytdlnis.R 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.DownloadViewModel.Type import com.deniscerri.ytdlnis.util.FileUtil import com.deniscerri.ytdlnis.util.InfoUtil import com.deniscerri.ytdlnis.util.UiUtil import com.facebook.shimmer.ShimmerFrameLayout import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import com.google.android.material.button.MaterialButton import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext -import java.text.SimpleDateFormat import java.util.* -import kotlin.collections.ArrayList class FormatSelectionBottomSheetDialog(private val items: List, private var formats: List>, private val listener: OnFormatClickListener) : BottomSheetDialogFragment() { 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 cafc15f5..5b6d6a3b 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 @@ -2,7 +2,6 @@ package com.deniscerri.ytdlnis.ui.downloadcard import android.annotation.SuppressLint import android.app.Dialog -import android.content.ClipboardManager import android.content.DialogInterface import android.os.Bundle import android.util.DisplayMetrics @@ -11,7 +10,6 @@ import android.view.MenuItem import android.view.View import android.widget.Button import android.widget.TextView -import androidx.appcompat.app.AppCompatActivity import androidx.core.widget.doAfterTextChanged import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -28,7 +26,6 @@ import com.google.android.material.bottomappbar.BottomAppBar import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton -import com.google.android.material.floatingactionbutton.FloatingActionButton import com.google.android.material.textfield.TextInputLayout import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ActiveDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ActiveDownloadsFragment.kt index 81115b3f..50fb6ee4 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ActiveDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ActiveDownloadsFragment.kt @@ -13,7 +13,6 @@ import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.GridLayoutManager -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.work.WorkManager import com.deniscerri.ytdlnis.R @@ -27,7 +26,6 @@ import com.deniscerri.ytdlnis.util.FileUtil import com.deniscerri.ytdlnis.util.NotificationUtil import com.google.android.material.progressindicator.LinearProgressIndicator import com.yausername.youtubedl_android.YoutubeDL -import kotlinx.coroutines.runBlocking class ActiveDownloadsFragment() : Fragment(), ActiveDownloadAdapter.OnItemClickListener, OnClickListener { diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt index f8cbe5a2..c1b93bec 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt @@ -7,25 +7,26 @@ import android.graphics.Canvas import android.graphics.Color import android.os.Bundle import android.util.DisplayMetrics -import android.view.* +import android.view.LayoutInflater +import android.view.Menu +import android.view.MenuItem +import android.view.View +import android.view.ViewGroup +import android.view.Window import android.widget.Button import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.view.ActionMode import androidx.core.content.ContextCompat -import androidx.core.view.forEach import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView -import com.deniscerri.ytdlnis.MainActivity import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.adapter.GenericDownloadAdapter import com.deniscerri.ytdlnis.database.models.DownloadItem -import com.deniscerri.ytdlnis.database.models.HistoryItem import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel import com.deniscerri.ytdlnis.databinding.FragmentHomeBinding import com.deniscerri.ytdlnis.ui.downloadcard.DownloadBottomSheetDialog @@ -38,11 +39,7 @@ import com.google.android.material.color.MaterialColors import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar import it.xabaras.android.recyclerview.swipedecorator.RecyclerViewSwipeDecorator -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking -import kotlinx.coroutines.withContext -import java.util.ArrayList class CancelledDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt index 87d09eec..d9585244 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt @@ -6,13 +6,11 @@ import android.os.Bundle import android.view.MenuItem import android.view.View import android.widget.Toast -import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.ViewPager2 import androidx.work.WorkManager -import androidx.work.await import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.database.repository.DownloadRepository import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt index aa8783e6..1772ad85 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt @@ -8,7 +8,12 @@ import android.graphics.Canvas import android.graphics.Color import android.os.Bundle import android.util.DisplayMetrics -import android.view.* +import android.view.LayoutInflater +import android.view.Menu +import android.view.MenuItem +import android.view.View +import android.view.ViewGroup +import android.view.Window import android.widget.AdapterView import android.widget.AdapterView.OnItemClickListener import android.widget.Button @@ -20,7 +25,6 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.ItemTouchHelper -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.adapter.GenericDownloadAdapter @@ -39,7 +43,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar import it.xabaras.android.recyclerview.swipedecorator.RecyclerViewSwipeDecorator import kotlinx.coroutines.runBlocking -import java.util.ArrayList class ErroredDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickListener, 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 04d69a9a..fd3a2e6c 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 @@ -13,10 +13,19 @@ import android.os.Looper import android.text.InputType import android.util.DisplayMetrics import android.util.Log -import android.view.* +import android.view.LayoutInflater +import android.view.Menu +import android.view.MenuItem +import android.view.View import android.view.View.GONE import android.view.View.VISIBLE -import android.widget.* +import android.view.ViewGroup +import android.view.Window +import android.widget.Button +import android.widget.LinearLayout +import android.widget.RelativeLayout +import android.widget.TextView +import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.view.ActionMode import androidx.appcompat.widget.SearchView @@ -26,7 +35,6 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.ItemTouchHelper -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.deniscerri.ytdlnis.MainActivity import com.deniscerri.ytdlnis.R @@ -48,12 +56,12 @@ import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipGroup import com.google.android.material.color.MaterialColors import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.google.android.material.snackbar.Snackbar import it.xabaras.android.recyclerview.swipedecorator.RecyclerViewSwipeDecorator import kotlinx.coroutines.runBlocking import java.io.File import java.text.SimpleDateFormat -import java.util.* +import java.util.Calendar +import java.util.Locale /** * A fragment representing a list of Items. diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt index 1df92f41..28fbe473 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt @@ -21,7 +21,6 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.ItemTouchHelper -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.work.WorkManager import com.deniscerri.ytdlnis.R @@ -43,9 +42,9 @@ import it.xabaras.android.recyclerview.swipedecorator.RecyclerViewSwipeDecorator import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking -import kotlinx.coroutines.withContext import java.text.SimpleDateFormat -import java.util.* +import java.util.Calendar +import java.util.Locale class QueuedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickListener { 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 69829fbc..11b93dd1 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 @@ -8,8 +8,6 @@ import android.os.Bundle import android.view.MenuItem import android.view.View import android.widget.RelativeLayout -import android.widget.Toast -import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ItemTouchHelper diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/CookiesActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/CookiesActivity.kt index 622e9119..76afaab9 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/CookiesActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/CookiesActivity.kt @@ -12,7 +12,6 @@ import android.view.inputmethod.InputMethodManager import android.widget.EditText import android.widget.RelativeLayout import androidx.appcompat.app.AlertDialog -import androidx.appcompat.app.AppCompatActivity import androidx.core.widget.doOnTextChanged import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -24,12 +23,10 @@ import com.deniscerri.ytdlnis.adapter.CookieAdapter import com.deniscerri.ytdlnis.database.models.CookieItem import com.deniscerri.ytdlnis.database.viewmodel.CookieViewModel import com.deniscerri.ytdlnis.ui.BaseActivity -import com.deniscerri.ytdlnis.ui.downloadcard.DownloadBottomSheetDialog import com.deniscerri.ytdlnis.util.FileUtil import com.deniscerri.ytdlnis.util.UiUtil import com.google.android.material.appbar.MaterialToolbar import com.google.android.material.chip.Chip -import com.google.android.material.color.MaterialColors import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar import com.google.android.material.textfield.TextInputLayout 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 f5ebc7ba..f13a7a31 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,6 +1,5 @@ package com.deniscerri.ytdlnis.ui.more -import android.app.Activity import android.content.DialogInterface import android.content.Intent import android.content.SharedPreferences @@ -109,11 +108,13 @@ class MoreFragment : Fragment() { mainSharedPreferencesEditor.commit() } mainActivity.finishAndRemoveTask() + mainActivity.finishAffinity() exitProcess(0) } terminateDialog.show() }else{ mainActivity.finishAndRemoveTask() + mainActivity.finishAffinity() exitProcess(0) } 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 a7c0d887..4ba4ee92 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 @@ -8,23 +8,26 @@ import android.content.SharedPreferences import android.os.Build import android.os.Bundle import android.os.FileObserver -import android.os.Looper import android.util.Log import android.view.MenuItem import android.view.View import android.view.ViewGroup import android.view.Window import android.view.inputmethod.InputMethodManager -import android.widget.* +import android.widget.EditText +import android.widget.ScrollView +import android.widget.TextView +import android.widget.Toast 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.preference.PreferenceManager -import androidx.work.* +import androidx.work.Data +import androidx.work.ExistingWorkPolicy +import androidx.work.OneTimeWorkRequestBuilder +import androidx.work.WorkInfo +import androidx.work.WorkManager import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.database.viewmodel.CommandTemplateViewModel import com.deniscerri.ytdlnis.ui.BaseActivity diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/WebViewActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/WebViewActivity.kt index 847a229a..062bbe49 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/WebViewActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/WebViewActivity.kt @@ -6,7 +6,6 @@ import android.webkit.CookieManager import android.webkit.WebView import android.webkit.WebViewClient import android.widget.Toast -import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import com.deniscerri.ytdlnis.R 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 f2033766..16f32a2b 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 @@ -8,7 +8,6 @@ import android.os.FileObserver import android.view.View import android.widget.ScrollView import android.widget.TextView -import androidx.appcompat.app.AppCompatActivity import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.ui.BaseActivity import com.google.android.material.appbar.MaterialToolbar 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 86032af0..ad328e57 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 @@ -10,7 +10,6 @@ import android.view.MenuItem import android.view.View import android.widget.RelativeLayout import android.widget.Toast -import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.deniscerri.ytdlnis.R diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/AppearanceSettingsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/AppearanceSettingsFragment.kt index 3e098762..29fcc650 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/AppearanceSettingsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/AppearanceSettingsFragment.kt @@ -1,65 +1,22 @@ package com.deniscerri.ytdlnis.ui.more.settings -import android.annotation.SuppressLint -import android.app.Activity -import android.content.Context.POWER_SERVICE -import android.content.DialogInterface import android.content.Intent -import android.content.SharedPreferences -import android.net.Uri import android.os.Build.VERSION import android.os.Build.VERSION_CODES import android.os.Bundle -import android.os.Environment -import android.os.PowerManager -import android.provider.Settings -import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate import androidx.core.os.LocaleListCompat -import androidx.lifecycle.ViewModelProvider -import androidx.lifecycle.lifecycleScope -import androidx.preference.EditTextPreference import androidx.preference.ListPreference import androidx.preference.Preference -import androidx.preference.PreferenceFragmentCompat -import androidx.preference.PreferenceManager -import androidx.preference.SeekBarPreference import androidx.preference.SwitchPreferenceCompat import androidx.work.WorkInfo import androidx.work.WorkManager -import com.deniscerri.ytdlnis.BuildConfig import com.deniscerri.ytdlnis.MainActivity import com.deniscerri.ytdlnis.R -import com.deniscerri.ytdlnis.database.models.CommandTemplate -import com.deniscerri.ytdlnis.database.models.CookieItem -import com.deniscerri.ytdlnis.database.models.DownloadItem -import com.deniscerri.ytdlnis.database.models.HistoryItem -import com.deniscerri.ytdlnis.database.models.SearchHistoryItem -import com.deniscerri.ytdlnis.database.models.TemplateShortcut -import com.deniscerri.ytdlnis.database.viewmodel.CommandTemplateViewModel -import com.deniscerri.ytdlnis.database.viewmodel.CookieViewModel -import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel -import com.deniscerri.ytdlnis.database.viewmodel.HistoryViewModel -import com.deniscerri.ytdlnis.database.viewmodel.ResultViewModel import com.deniscerri.ytdlnis.util.FileUtil import com.deniscerri.ytdlnis.util.ThemeUtil import com.deniscerri.ytdlnis.util.UpdateUtil -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.google.android.material.snackbar.Snackbar -import com.google.gson.Gson -import com.google.gson.JsonArray -import com.google.gson.JsonObject -import com.google.gson.JsonParser -import com.yausername.youtubedl_android.YoutubeDL -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -import kotlinx.serialization.json.Json -import java.io.BufferedReader -import java.io.File -import java.io.InputStreamReader -import java.time.LocalDateTime import java.util.Locale @@ -88,7 +45,6 @@ class AppearanceSettingsFragment : BaseSettingsFragment() { } } - val preferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) language = findPreference("app_language") theme = findPreference("ytdlnis_theme") accent = findPreference("theme_accent") diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/BaseSettingsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/BaseSettingsFragment.kt index 4b3c9950..e6b5b7ad 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/BaseSettingsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/BaseSettingsFragment.kt @@ -1,6 +1,14 @@ package com.deniscerri.ytdlnis.ui.more.settings +import android.content.DialogInterface +import androidx.preference.EditTextPreference +import androidx.preference.ListPreference +import androidx.preference.MultiSelectListPreference +import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat +import com.deniscerri.ytdlnis.R +import com.deniscerri.ytdlnis.databinding.DialogTextPreferenceBinding +import com.google.android.material.dialog.MaterialAlertDialogBuilder abstract class BaseSettingsFragment : PreferenceFragmentCompat() { @@ -10,4 +18,76 @@ abstract class BaseSettingsFragment : PreferenceFragmentCompat() { super.onStart() (activity as? SettingsActivity)?.changeTopAppbarTitle(getString(title)) } + + //Thanks libretube + override fun onDisplayPreferenceDialog(preference: Preference) { + when (preference) { + /** + * Show a [MaterialAlertDialogBuilder] when the preference is a [ListPreference] + */ + is ListPreference -> { + // get the index of the previous selected item + val prefIndex = preference.entryValues.indexOf(preference.value) + MaterialAlertDialogBuilder(requireContext()) + .setTitle(preference.title) + .setSingleChoiceItems(preference.entries, prefIndex) { dialog, index -> + // get the new ListPreference value + val newValue = preference.entryValues[index].toString() + // invoke the on change listeners + if (preference.callChangeListener(newValue)) { + preference.value = newValue + } + dialog.dismiss() + } + .setNegativeButton(R.string.cancel, null) + .show() + } + is EditTextPreference -> { + val binding = DialogTextPreferenceBinding.inflate(layoutInflater) + binding.input.setText(preference.text) + MaterialAlertDialogBuilder(requireContext()) + .setTitle(preference.title) + .setView(binding.root) + .setPositiveButton(android.R.string.ok) { _, _ -> + val newValue = binding.input.text.toString() + if (preference.callChangeListener(newValue)) { + preference.text = newValue + } + } + .setNegativeButton(R.string.cancel, null) + .show() + } + is MultiSelectListPreference -> { + val values = preference.entryValues + val entries = preference.entries + val checkedItems : ArrayList = arrayListOf() + values.forEach { + if (preference.values.contains(it)) { + checkedItems.add(true) + }else{ + checkedItems.add(false) + } + } + MaterialAlertDialogBuilder(requireContext()) + .setTitle(preference.title) + .setMultiChoiceItems(entries, checkedItems.toBooleanArray()) { _, which, isChecked -> + checkedItems[which] = isChecked + } + .setNegativeButton(R.string.cancel, null) + .setPositiveButton(R.string.ok) { _: DialogInterface?, _: Int -> + preference.values.clear() + for (i in 0 until checkedItems.size) { + if (checkedItems[i]) { + preference.values.add(values[i].toString()) + } + } + } + .show() + } + /** + * Otherwise show the normal dialog, dialogs for other preference types are not supported yet + */ + else -> super.onDisplayPreferenceDialog(preference) + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/FolderSettingsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/FolderSettingsFragment.kt index 4747d587..669746f5 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/FolderSettingsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/FolderSettingsFragment.kt @@ -12,7 +12,6 @@ import androidx.preference.Preference import androidx.preference.PreferenceManager import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.util.FileUtil -import com.deniscerri.ytdlnis.util.UpdateUtil import com.google.android.material.snackbar.Snackbar import java.io.File diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/MainSettingsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/MainSettingsFragment.kt index 179d5f7b..5d5ae5ff 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/MainSettingsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/MainSettingsFragment.kt @@ -7,6 +7,8 @@ import android.content.SharedPreferences import android.os.Bundle import android.os.Environment import androidx.activity.result.contract.ActivityResultContracts +import androidx.appcompat.app.AppCompatDelegate +import androidx.core.os.LocaleListCompat import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController @@ -363,6 +365,8 @@ class MainSettingsFragment : PreferenceFragmentCompat() { } finalMessage.append("${getString(R.string.settings)}: ${prefs.count()}\n") } + editor.commit() + //history restore if(json.has("downloads")){ val items = json.getAsJsonArray("downloads") @@ -399,6 +403,9 @@ class MainSettingsFragment : PreferenceFragmentCompat() { val item = Gson().fromJson(it.toString().replace("^\"|\"$", ""), DownloadItem::class.java) item.id = 0L cancelled.add(item) + withContext(Dispatchers.IO){ + downloadViewModel.insert(item) + } } if(cancelled.isNotEmpty()){ finalMessage.append("${getString(R.string.cancelled)}: ${cancelled.count()}\n") @@ -476,16 +483,21 @@ class MainSettingsFragment : PreferenceFragmentCompat() { val intent = Intent(context, MainActivity::class.java) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) requireContext().startActivity(intent) - if (context is Activity) { - (context as Activity).finish() + if(json.has("settings")){ + AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(preferences.getString("app_language", "en"))) } + activity?.finishAffinity() Runtime.getRuntime().exit(0) } // handle the negative button of the alert dialog builder.setNegativeButton( getString(R.string.cancel) - ) { _: DialogInterface?, _: Int -> } + ) { _: DialogInterface?, _: Int -> + if(json.has("settings")){ + AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(preferences.getString("app_language", "en"))) + } + } val dialog = builder.create() dialog.show() diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/ProcessingSettingsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/ProcessingSettingsFragment.kt index 12e6e979..39d11c4f 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/ProcessingSettingsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/ProcessingSettingsFragment.kt @@ -2,7 +2,6 @@ package com.deniscerri.ytdlnis.ui.more.settings import android.os.Bundle import androidx.preference.EditTextPreference -import androidx.preference.Preference import com.deniscerri.ytdlnis.R diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsActivity.kt index f89ca12f..06f489c6 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsActivity.kt @@ -1,20 +1,14 @@ package com.deniscerri.ytdlnis.ui.more.settings import android.content.Context -import android.content.SharedPreferences import android.os.Bundle import androidx.activity.addCallback -import androidx.fragment.app.FragmentManager -import androidx.fragment.app.commit -import androidx.fragment.app.replace import androidx.navigation.NavController import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.findNavController -import com.deniscerri.ytdlnis.MainActivity import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.databinding.ActivitySettingsBinding import com.deniscerri.ytdlnis.ui.BaseActivity -import com.google.android.material.appbar.MaterialToolbar class SettingsActivity : BaseActivity() { 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 144fdd03..4dfdc5e5 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt @@ -1,6 +1,5 @@ package com.deniscerri.ytdlnis.util -import android.app.Activity import android.content.Context import android.content.SharedPreferences import android.os.Looper @@ -23,7 +22,6 @@ import java.net.HttpURLConnection import java.net.URL import java.util.* import java.util.regex.Pattern -import kotlin.collections.ArrayList class InfoUtil(private val context: Context) { private var items: ArrayList 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 26fa2582..c4689fea 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt @@ -1,6 +1,10 @@ package com.deniscerri.ytdlnis.util -import android.app.* +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.app.TaskStackBuilder import android.content.Context import android.content.Intent import android.graphics.BitmapFactory diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/ThemeUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/ThemeUtil.kt index 1358173a..db9d2a29 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/util/ThemeUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/util/ThemeUtil.kt @@ -1,7 +1,5 @@ package com.deniscerri.ytdlnis.util -import android.app.Application -import android.util.Log import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate import androidx.preference.PreferenceManager diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/UiUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/UiUtil.kt index 353f3af5..589641b1 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/util/UiUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/util/UiUtil.kt @@ -1,6 +1,5 @@ package com.deniscerri.ytdlnis.util -import android.annotation.SuppressLint import android.app.Activity import android.content.ClipData import android.content.ClipboardManager @@ -11,12 +10,10 @@ import android.text.Editable import android.text.TextWatcher import android.util.DisplayMetrics import android.util.Log -import android.view.MotionEvent import android.view.View import android.view.ViewGroup import android.view.Window import android.widget.Button -import android.widget.EditText import android.widget.LinearLayout import android.widget.TextView import android.widget.Toast @@ -26,7 +23,6 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.FileProvider import androidx.fragment.app.FragmentManager import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.lifecycleScope import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.database.models.CommandTemplate import com.deniscerri.ytdlnis.database.models.Format @@ -43,10 +39,9 @@ import com.google.android.material.textfield.TextInputLayout 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.io.File -import java.util.* +import java.util.Calendar class UiUtil(private val fileUtil: FileUtil) { fun populateFormatCard(formatCard : ConstraintLayout, chosenFormat: Format){ diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/UpdateUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/UpdateUtil.kt index e29265c9..7a89a505 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/util/UpdateUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/util/UpdateUtil.kt @@ -1,6 +1,5 @@ package com.deniscerri.ytdlnis.util -import android.app.Activity import android.app.DownloadManager import android.content.Context import android.content.DialogInterface 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 605fb995..f0de08b2 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt @@ -1,7 +1,6 @@ package com.deniscerri.ytdlnis.work import android.app.PendingIntent -import android.app.Service import android.content.Context import android.content.Intent import android.os.Handler @@ -9,7 +8,11 @@ import android.os.Looper import android.util.Log import android.widget.Toast import androidx.preference.PreferenceManager -import androidx.work.* +import androidx.work.Data +import androidx.work.ForegroundInfo +import androidx.work.Worker +import androidx.work.WorkerParameters +import androidx.work.workDataOf import com.deniscerri.ytdlnis.MainActivity import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.database.DBManager @@ -17,20 +20,13 @@ import com.deniscerri.ytdlnis.database.models.DownloadItem import com.deniscerri.ytdlnis.database.models.HistoryItem 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 -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.async -import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.runBlocking -import kotlinx.coroutines.withContext import java.io.File -import java.util.* -import kotlin.collections.ArrayList class DownloadWorker( @@ -59,7 +55,6 @@ class DownloadWorker( e.printStackTrace() return Result.failure() } - if (downloadItem.status != DownloadRepository.Status.Queued.toString()) return Result.failure() Log.e(TAG, downloadItem.toString()) @@ -135,7 +130,7 @@ class DownloadWorker( } if (sponsorBlockFilters.isNotEmpty()) { - val filters = java.lang.String.join(",", sponsorBlockFilters) + val filters = java.lang.String.join(",", sponsorBlockFilters.filter { it.isNotBlank() }) request.addOption("--sponsorblock-remove", filters) } @@ -302,7 +297,6 @@ class DownloadWorker( "Format: ${downloadItem.format}\n\n" + "Command: ${java.lang.String.join(" ", request.buildCommand())}\n\n") } - runCatching { YoutubeDL.getInstance().execute(request, downloadItem.id.toString()){ progress, _, line -> setProgressAsync(workDataOf("progress" to progress.toInt(), "output" to line.chunked(5000).first().toString(), "id" to downloadItem.id, "log" to logDownloads)) @@ -413,7 +407,6 @@ class DownloadWorker( super.onStopped() } - companion object { var itemId: Long = 0 const val TAG = "DownloadWorker" diff --git a/app/src/main/java/com/deniscerri/ytdlnis/work/TerminalDownloadWorker.kt b/app/src/main/java/com/deniscerri/ytdlnis/work/TerminalDownloadWorker.kt index 300dd86a..b57227af 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/work/TerminalDownloadWorker.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/work/TerminalDownloadWorker.kt @@ -1,7 +1,6 @@ package com.deniscerri.ytdlnis.work import android.app.PendingIntent -import android.app.Service import android.content.Context import android.content.Intent import android.os.Handler @@ -9,7 +8,10 @@ import android.os.Looper import android.util.Log import android.widget.Toast import androidx.preference.PreferenceManager -import androidx.work.* +import androidx.work.ForegroundInfo +import androidx.work.Worker +import androidx.work.WorkerParameters +import androidx.work.workDataOf import com.deniscerri.ytdlnis.MainActivity import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.util.FileUtil @@ -17,7 +19,6 @@ import com.deniscerri.ytdlnis.util.NotificationUtil import com.yausername.youtubedl_android.YoutubeDL import com.yausername.youtubedl_android.YoutubeDLRequest import java.io.File -import java.util.* class TerminalDownloadWorker( diff --git a/app/src/main/res/drawable/baseline_star_half_24.xml b/app/src/main/res/drawable/baseline_star_half_24.xml new file mode 100644 index 00000000..a7866282 --- /dev/null +++ b/app/src/main/res/drawable/baseline_star_half_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/baseline_translate_24.xml b/app/src/main/res/drawable/baseline_translate_24.xml new file mode 100644 index 00000000..4b88381f --- /dev/null +++ b/app/src/main/res/drawable/baseline_translate_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/image_gradient_shape.xml b/app/src/main/res/drawable/image_gradient_shape.xml deleted file mode 100644 index e542c492..00000000 --- a/app/src/main/res/drawable/image_gradient_shape.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-sw1600dp-land/fragment_home.xml b/app/src/main/res/layout-sw1600dp-land/fragment_home.xml index d0a8f938..457e1655 100644 --- a/app/src/main/res/layout-sw1600dp-land/fragment_home.xml +++ b/app/src/main/res/layout-sw1600dp-land/fragment_home.xml @@ -3,7 +3,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/homecoordinator" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/app/src/main/res/layout/create_command_template.xml b/app/src/main/res/layout/create_command_template.xml index 140fdce1..14cc17dc 100644 --- a/app/src/main/res/layout/create_command_template.xml +++ b/app/src/main/res/layout/create_command_template.xml @@ -7,7 +7,6 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/download_multiple_bottom_sheet.xml b/app/src/main/res/layout/download_multiple_bottom_sheet.xml index 2bde2b2f..396aeeee 100644 --- a/app/src/main/res/layout/download_multiple_bottom_sheet.xml +++ b/app/src/main/res/layout/download_multiple_bottom_sheet.xml @@ -23,7 +23,6 @@ app:menu="@menu/download_multiple_menu" /> - @@ -60,7 +57,6 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/header_navigation_drawer.xml b/app/src/main/res/layout/header_navigation_drawer.xml index 735d26b3..d8cd1656 100644 --- a/app/src/main/res/layout/header_navigation_drawer.xml +++ b/app/src/main/res/layout/header_navigation_drawer.xml @@ -1,5 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/history_item_details_bottom_sheet.xml b/app/src/main/res/layout/history_item_details_bottom_sheet.xml index 02a80f29..2c37683f 100644 --- a/app/src/main/res/layout/history_item_details_bottom_sheet.xml +++ b/app/src/main/res/layout/history_item_details_bottom_sheet.xml @@ -1,6 +1,5 @@ - - - diff --git a/app/src/main/res/layout/select_playlist_items.xml b/app/src/main/res/layout/select_playlist_items.xml index 6cf5a9ec..7ae673d1 100644 --- a/app/src/main/res/layout/select_playlist_items.xml +++ b/app/src/main/res/layout/select_playlist_items.xml @@ -46,7 +46,6 @@ + android:id="@+id/activitySettings"/> \ No newline at end of file diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 7c753dd0..fcc26f60 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -2,7 +2,6 @@ @@ -40,6 +39,9 @@ + + \ No newline at end of file diff --git a/app/src/main/res/navigation/settings_nav.xml b/app/src/main/res/navigation/settings_nav.xml index e04ff973..94104c7f 100644 --- a/app/src/main/res/navigation/settings_nav.xml +++ b/app/src/main/res/navigation/settings_nav.xml @@ -1,8 +1,6 @@ إظهار بطاقة تخصيص التحميل إعدادات لكيفية تحميل العناصر فتح - إزالة المحدَدة الحذف من الجهاز أيضًا الحذف من الجهاز أيضًا إزالة بعض العناصر… @@ -167,7 +166,6 @@ السماح بالوصول إلى كل المجلدات السماح بتنزيل التطبيق على المجلدات المقيدة إفتراضيًا إعادة التحميل - نسخ الرابط المنتظرة تنظيف الملغاة تنظيف المتعطلة @@ -186,14 +184,11 @@ قص قصٌ آخر يجب إنشاء قالب يحتوي أمر واحد على الأقل! - تم نسخ معرف التنسيق إلى الحافظة مقترحة تحديد الكل مشاركة ملفات تعريف الارتباط (الكوكيز) كوكيز جديدة - ملف تعريف ارتباط - إنشاء الكوكيز الحصول على الكوكيز حذف كل الكوكيز حذف كل الكوكيز، نهائيًا diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 23f771de..635bafc5 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -82,7 +82,6 @@ Yükləmə üçün seçimlər göstər Elementləri yükləmək üçün tənzimləmələr Faylı Aç - Seçiləni Sil Çoxlu element silinir… Faylı cihazdan sil Faylları cihazdan sil @@ -151,7 +150,6 @@ Seçildi Bütün kataloqlara girişə icazə ver Təkrar yüklə - URL-i Köçür Növbədə Ləğv ediləni təmizlə Tətbiqin standart olaraq məhdudlaşdırılan qovluqlarda yükləməsinə icazə ver @@ -185,7 +183,6 @@ Batareya Optimallaşdırmasına Məhəl Qoyma Kəs Yeni Kəsik - Format ID buferə nüsxələndi Təklif edilən Heç olmasa, bir əmr şablonu yaratmalısınız! Hamısın Seç @@ -193,8 +190,6 @@ Paylaş Məlumat Bazaları Yeni Məlumat Baza - Məlumat Bazası - Məlumat Bazası Yarat Məlumatlar Əldə Et Bütün bazaları həmişəlik sil Ölçülən Şəbəkələrlə yüklə diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 59a1d8a3..60214de7 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -57,7 +57,6 @@ ডাউনলোড ভিডিও এর ধরন সাবটাইটেল এম্বেড করুন - নির্বাচিতগুলি মুছুন একাধিক আইটেম মুছে ফেলা হচ্ছে… ডিভাইস থেকে ফাইল মুছুন ডিভাইস থেকে ফাইল মুছুন @@ -162,7 +161,6 @@ সমস্ত আইটেম নির্বাচিত সমস্ত ডিরেক্টরিতে অ্যাক্সেসের অনুমতি দিন পুনরায় ডাউনলোড করুন - URL কপি করুন কিউ তে আছে সাফ করুন বাতিলগুলি পরিষ্কার ত্রুটি @@ -186,14 +184,11 @@ আপনার কমপক্ষে একটি কমান্ড টেমপ্লেট তৈরি করা দরকার! প্রস্তাবিত সব নির্বাচন করুন - ফর্ম্যাট আইডি ক্লিপবোর্ডে কপি করা হয়েছে ফর্ম্যাট কার্ডে ক্লিক করার সময় স্বয়ংক্রিয়ভাবে অনুপস্থিত ফর্ম্যাটগুলির জন্য অনুসন্ধান করুন৷ ব্যাটারি অপ্টিমাইজেশান উপেক্ষা করুন শেয়ার করুন কুকি নতুন কুকি - কুকি - কুকি তৈরি করুন সমস্ত কুকি মুছুন সব কুকি স্থায়ীভাবে মুছুন কুকিজ পান diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d9256058..56a75a09 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -56,7 +56,6 @@ Kapitel hinzufügen Optionen für das Herunterladen anzeigen Einstellungen für das Herunterladen von Einträgen - Ausgewählte löschen Mehrere Objekte löschen… Löschen der Datei vom Gerät Löschen der Dateien vom Gerät @@ -170,7 +169,6 @@ Frag nicht nochmal Ende Start - URL kopieren Zugriff auf alle Verzeichnisse zulassen Lassen Sie die App in Verzeichnisse herunterladen, die standardmäßig eingeschränkt sind Neu herunterladen @@ -186,14 +184,11 @@ Schnitt Neuer Schnitt Sie müssen mindestens eine Befehlsvorlage erstellt haben! - Format-ID in die Zwischenablage kopiert Empfohlen Teile Cookies Alles Wählen Neuer Cookie - Cookie - Cookie Erstellen Cookie Erhalten Alle Cookies Löschen Alle Cookies löschen, dauerhaft diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8dda9ed5..1158116b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -83,7 +83,6 @@ Descargar sin agregar al historial Autor Abrir Archivo - Eliminar Selección Advertencia Mostrar Opciones de Descarga Ajustes de descargas @@ -146,7 +145,6 @@ Elementos importados Ayuda a la traducción Volver a descargar - Copiar la URL En espera Borrardo Cancelado Error al borrar @@ -184,12 +182,9 @@ Busca automáticamente los formatos que faltan al hacer clic en la tarjeta de formato Ignorar la optimización de la batería Cortar - El identificador del formato se copió en el portapapeles Sugerido Seleccionar todo Compartir - Cookie - Crear una Cookie Nueva Cookie Borrar permanentemente toda las cookies ¡Necesitas tener al menos una plantilla de comando creada! diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 29dd354f..33f9181b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -82,7 +82,6 @@ Afficher les options de téléchargement Paramètres de téléchargement des éléments Ouvrir le fichier - Supprimer la sélection Suppression de plusieurs éléments… Supprimer le fichier de l\'appareil Supprimer les fichiers de l\'appareil @@ -147,15 +146,12 @@ Exporter vers le presse-papiers Importer depuis le presse-papiers Traduisez cette application dans votre langue en utilisant Weblate - Cookie Ne plus le redemander Commencer Limitez les noms de fichiers aux caractères ASCII et évitez les \"&\" et les espaces dans les noms de fichiers Obtenir des cookies - Format ID copié dans le presse-papiers Partager Cookies - Créer un cookie Nouveau Cookie Nouveau modèle Ajuster les modèles @@ -191,7 +187,6 @@ Télécharger à nouveau Onglet par défaut dans lequel la carte de téléchargement s\'ouvrira Supprimez définitivement la liste complète des journaux. - Copier l\'URL Effacer les fichiers temporaires Version d\'yt-dlp Ignorer l’optimisation de la batterie diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6500a17d..794847cf 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -84,7 +84,6 @@ Gunakan Kunci API Versi yt-dlp Buka Berkas - Hapus yang Dipilih Menghapus beberapa butir… Hapus berkas dari perangkat Hapus berkas-berkas dari perangkat @@ -154,7 +153,6 @@ Dipilih Semua butir dipilih Unduh Ulang - Salin URL Di Antrean Perbolehkan pengaksesan semua direktori Kosongkan yang Dibatalkan @@ -183,11 +181,8 @@ Abaikan Pengoptimalan Baterai Potong Potongan Baru - ID format disalin ke papan klip Dianjurkan Hapus Semua Kuki - Buat Kuki - Kuki Kuki Baru Kuki Bagikan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7d0e502e..14dd677a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -19,7 +19,6 @@ Mostra opzioni per il download Impostazioni su come scaricare gli elementi Apri il file - Elimina selezionato Elimina i file dal dispositivo Introduzione Selezionare Filtraggio SponsorBlock diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2596545f..d87c171f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -62,7 +62,6 @@ チャプターを追加 ダウンロードオプションを表示 アイテムをダウンロードする方法の設定 - 選択項目を削除 新しいバージョンをダウンロード中… 複数のアイテムを削除中… デバイスからファイルを削除する @@ -129,7 +128,6 @@ 優先ダウンロード形式 選択された 再ダウンロード - コピーURL この設定を有効にする、アプリを再起動しアクティブなダウンロードがない状態にする必要があります！ 選択 ログリスト全体を永久に削除する。 diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index fb47f8e1..e79c3c8c 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -112,7 +112,6 @@ Atļaut piekļuvi visiem direktorijiem Ļaut lietotnei lejupielādēt no direktorijiem, kas pēc noklusējuma ir ierobežoti Atkārtoti Lejupielādēt - Kopēt URL Rindā Notīrīt Atceltos Sadalīt Pēc Sadaļām @@ -156,7 +155,6 @@ Atvērt Failu Rādīt Lejupielādes Opcijas Iestatījumi, kā lejupielādēt vienumus - Dzēst Atlasīto Rediģēt atlasīto Dzēš vairākus elementus… Noklusējums @@ -191,12 +189,9 @@ Koplietot Sīkfaili Jauns Sīkfails - Sīkfails - Izveidot Sīkfailu Iegūt Sīkfailus Dzēst Visus Sīkfailus Neatgriezeniski dzēst visas sīkdatnes - Formāta ID kopēts starpliktuvē Lejupielādes strādnieks sāks pēc tam, kad būsiet pieslēgti neierobežotam tīklam Invertēt Atlasīto Saglabāt Subtitrus diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 98f9f928..2a2de1e4 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -1,6 +1,5 @@ - Slett valgte Mapper Musikkmappe Videomappe @@ -126,7 +125,6 @@ Sett «HTTP Last-Modified»-hode som siste endringstid Kjører Opprett mal - Kopier nettadresse I kø Kansellert Feilaktig @@ -183,7 +181,6 @@ Lenke du kopierte Klipp ut Nytt utklipp - Format-ID kopiert til utklippstavlen Velg alle Del Avslutt program @@ -191,8 +188,6 @@ Foreslått Informasjonskapsler Ny informasjonskapsel - Informasjonskapsel - Opprett informasjonskapsel Slett informasjonskapslene for godt Nedlasting på kvotebaserte nettverk Inverter utvalg diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 854b7e6b..ac9155b3 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -95,10 +95,13 @@ @color/yellow_md_theme_dark_onErrorContainer @color/yellow_md_theme_dark_background @color/yellow_md_theme_dark_onBackground + @color/yellow_md_theme_dark_surface @color/yellow_md_theme_dark_onSurface + @color/yellow_md_theme_dark_surfaceVariant @color/yellow_md_theme_dark_onSurfaceVariant @color/yellow_md_theme_dark_outline @color/yellow_md_theme_dark_inverseOnSurface + @color/yellow_md_theme_dark_inverseSurface @color/yellow_md_theme_dark_inversePrimary diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 198e1c9f..655f2e49 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -43,7 +43,6 @@ Instalowanie nowszej wersji… Anuluj Pobieranie nowszej wersji… - Usuń zaznaczone OK Usuń całą historię, permanentnie. Liczba fragmentów natywnego wideo DASH/HLS do jednoczesnego pobrania diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 0728a4fa..1b9668a7 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -55,7 +55,6 @@ Mostrar Opções para Baixar Configurações para como baixar items Abrir Arquivo - Deletar Selecionado Deletando vários items… Deletar o arquivo do dispositivo Esse aplicativo necessita de Permissões de Arquivo para salvar os arquivos no dispositivo @@ -146,7 +145,6 @@ Todos os items selecionados Permitir acesso a todos os diretórios Permitir o aplicativo fazer download em diretórios restritos por padrão - Copiar URL Em Fila Limpar Cancelado Limpar Falhas diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4a30c435..e98f92ea 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -93,7 +93,6 @@ Удалить файлы с устройства Открыть файл Удаление нескольких элементов… - Удалить выбранное Удалить файл с устройства Приложению необходим доступ к файлам для сохранения загрузок на устройстве Уведомление показывает процесс загрузки аудио- и видеофайлов @@ -104,7 +103,6 @@ Дать доступ ко всем каталогам Разрешить приложению загружать контент в каталоги, которые по умолчанию ограничены Загрузить заново - Копировать URL В очереди Очистить отмененные О приложении @@ -170,13 +168,10 @@ Свободное место Скопированная ссылка Вам необходимо создать хотя бы один шаблон команды! - ID формата скопирован в буфер обмена Предложено Выбрать все Cookies Новый Cookie - Cookie - Создать Cookie Получить Cookie Удалить все Cookie Сохранять отчеты о загрузках diff --git a/app/src/main/res/values-sq-rAL/strings.xml b/app/src/main/res/values-sq-rAL/strings.xml index c6515f88..428bcde6 100644 --- a/app/src/main/res/values-sq-rAL/strings.xml +++ b/app/src/main/res/values-sq-rAL/strings.xml @@ -98,7 +98,6 @@ Shfaq Opsionet e Shkarkimit Konfiguro përpara se sa ta shkarkosh Hap Skedarin - Fshi të zgjedhurat Fshi disa elementë… Fshi skedarët nga paisja Ky aplikacion ka nevojë për lejen e Skedarëve për të ruajtur shkarkimet në paisje @@ -155,7 +154,6 @@ Lejo akses te të gjithë direktoritë Ler aplikacionin të shkarkojë në direktori të pasuportuara Rishkarko - Kopjo URL Në Rradhë Fshi Të Anulluarit Fshi Me Probleme @@ -185,7 +183,6 @@ Kërko automatikishit për formatet e munugara kur klikon kartën e formatit Prit Prerje e Re - ID e Formatit u kopjua Sygjerime Duhet të keni të paktën një model komande të krijuar! Zgjidhi të gjithë @@ -193,8 +190,6 @@ Fshi të gjitha Biskotat Biskotë e Re Shpërnda - Biskotë - Krijo Biskotë Merr Biskotat Fshi të gjitha biskotat, përgjithmonë Shkarko me Rrjetet Celulare diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 2ff5e19c..ffda20d6 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -86,7 +86,6 @@ İndirme Seçeneklerini Göster Öğelerin nasıl indirileceğine ilişkin ayarlar Dosya Aç - Seçileni Sil Birden fazla öğe silme… Dosyayı cihazdan sil Dosyaları cihazdan sil @@ -157,7 +156,6 @@ İndirmeyi yeniden başlatmaya çalışırken hata oluştu Tüm günlük listesini kalıcı olarak sil. Uygulamanın varsayılan olarak kısıtlanmış dizinlerde indirilmesine izin ver - Url\'yi kopyala İptal edileni temizle Çeviriye Yardım Et Tüm öğeler seçildi @@ -188,14 +186,11 @@ Kes Yeni Kesim Oluşturulmuş en az bir komut şablonuna sahip olmanız gerekir! - Biçim kimliği panoya kopyalandı Önerildi Tümünü Seç Paylaş Veritabanlar Yeni Veritabanı - Veritabanı - Veritabanı Oluştur Verileri al Tüm Verileri Sil Tüm verileri kalıcı olarak sil diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 4828a4e1..7f6b3e26 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -92,7 +92,6 @@ Додати розділи Налаштування завантаження елементів Автор - Видалити вибране Вступ Зберегти каталог Видалення кількох елементів… @@ -161,7 +160,6 @@ Розмір файлу Очистити тимчасові файли Видалення кешованих файлів зі збійних/помилкових/скасованих завантажень - Копіювати URL Очистити скасоване Розподіл за розділами Щоб це налаштування набуло чинності, вам потрібно перезапустити застосунок і не мати активних завантажень! @@ -185,7 +183,6 @@ Ігноруйте оптимізацію батареї Вирізати Новий виріз - Ідентифікатор формату скопійовано до буфера обміну Вам потрібно створити принаймні один шаблон команди! Запропоновано Cookies @@ -195,8 +192,6 @@ Видалити всі cookie назавжди Видалити всі cookie Нові cookie - Cookie - Створити cookie Завантаження почнеться, як тільки ви підключитесь до безлімітної мережі Інвертувати вибране Зберегти субтитри diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 09cd5eac..932be4e6 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -60,7 +60,6 @@ Sắp xếp URL Mở tệp - Xóa đã chọn Xóa các tệp tin khỏi thiết bị Ứng dụng này cần có Quyền truy cập tệp để lưu các bản tải xuống trên thiết bị Thoát ứng dụng diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 6585272c..5ca66ae7 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -8,10 +8,6 @@ #d43c3c - #AA000000 - #EEFFFFFF - #0061A6 - #0058CB #FFFFFF #D9E2FF @@ -38,9 +34,6 @@ #F2F0F4 #303034 #B0C6FF - #000000 - #0058CB - #0058CB #B0C6FF #002D6F #00429B @@ -67,9 +60,6 @@ #1B1B1F #E3E2E6 #0058CB - #000000 - #B0C6FF - #B0C6FF #9F4034 #FFFFFF @@ -97,9 +87,6 @@ #FBEEEC #362F2E #FFB4A9 - #000000 - #9F4034 - #9F4034 #FFB4A9 #61120C #7F291F @@ -126,9 +113,6 @@ #201A19 #EDE0DE #9F4034 - #000000 - #FFB4A9 - #FFB4A9 #745B00 #FFFFFF @@ -156,9 +140,6 @@ #F7F0E7 #33302A #EBC248 - #000000 - #745B00 - #745B00 #EBC248 #3D2F00 #584400 @@ -185,9 +166,6 @@ #1E1B16 #E8E1D9 #745B00 - #000000 - #EBC248 - #EBC248 #3E6A00 #FFFFFF @@ -215,9 +193,6 @@ #F2F1E9 #30312C #9ED75B - #000000 - #3E6A00 - #3E6A00 #9ED75B #1E3700 #2E4F00 @@ -244,9 +219,6 @@ #1B1C18 #E3E3DB #3E6A00 - #000000 - #9ED75B - #9ED75B #9B3489 #FFFFFF @@ -274,9 +246,6 @@ #F8EEF1 #342F32 #FFACE7 - #000000 - #9B3489 - #9B3489 #FFACE7 #5E0052 #7E186F @@ -303,9 +272,6 @@ #1F1A1D #EAE0E3 #9B3489 - #000000 - #FFACE7 - #FFACE7 // Colors without comments seem to be not used #616161 @@ -347,9 +313,6 @@ #DCDCDC #606060 #C1C1C1 - #000000 - #717171 - #717171 #959595 // LibreTube Logo, Hyperlinks and on-off switch (on status: filling) (also influence on the navbar colour) @@ -389,66 +352,5 @@ #404040 #C3C3C3 #707070 - #000000 - #C3C3C3 - #C3C3C3 - #714AAA - #FFFFFF - #EDDCFF - #290055 - #714AAA - #FFFFFF - #EDDCFF - #290055 - #714AAA - #FFFFFF - #EDDCFF - #290055 - #BA1A1A - #FFDAD6 - #FFFFFF - #410002 - #FFFBFF - #2B0052 - #FFFBFF - #2B0052 - #E8E0EB - #4A454E - #7B757F - #F9ECFF - #421A6C - #D7BAFF - #000000 - #714AAA - #714AAA - #D7BAFF - #411478 - #593090 - #EDDCFF - #D7BAFF - #411478 - #593090 - #EDDCFF - #D7BAFF - #411478 - #593090 - #EDDCFF - #FFB4AB - #93000A - #690005 - #FFDAD6 - #2B0052 - #EFDBFF - #2B0052 - #EFDBFF - #4A454E - #CCC4CF - #958E99 - #2B0052 - #EFDBFF - #714AAA - #000000 - #D7BAFF - #D7BAFF diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 52a28341..5fa1362c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -91,7 +91,6 @@ Show Options for Downloading Settings for how to download items Open File - Delete Selected Deleting multiple items… Delete the file from the device Delete the files from the device @@ -162,7 +161,6 @@ Allow access to all directories Let the app download on directories that are restricted by default Redownload - Copy URL In Queue Clear Cancelled Clear Errored @@ -193,14 +191,11 @@ Cut New Cut You need to have at least one command template created! - Format ID copied to clipboard Suggested Select All Share Cookies New Cookie - Cookie - Create Cookie Get Cookies Delete All Cookies Delete all the cookies, permanently diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9ac9fe8c..80419eb1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -7,15 +7,6 @@ @null - - - - @@ -73,5 +64,4 @@ slide - diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index b73bb0cf..d58d66f1 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -42,19 +42,6 @@ - -