diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9035a745..0e89ffa6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -116,7 +116,7 @@ android:exported="true" android:label="@string/terminal" android:parentActivityName=".MainActivity" - android:theme="@style/AppDefaultTheme"> + android:theme="@style/AppTheme"> 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 4191bb73..e2e16efe 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 @@ -13,7 +13,7 @@ interface DownloadDao { @Query("SELECT * FROM downloads WHERE status='Active'") fun getActiveDownloads() : LiveData> - @Query("SELECT * FROM downloads WHERE status='Queued'") + @Query("SELECT * FROM downloads WHERE status='Queued' ORDER BY downloadStartTime, id") fun getQueuedDownloads() : LiveData> @Query("SELECT * FROM downloads WHERE status='Cancelled' ORDER BY id DESC") 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 fee1f914..f168ff0e 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,9 @@ package com.deniscerri.ytdlnis.database.viewmodel import android.app.Activity import android.app.Application import android.content.SharedPreferences +import android.text.format.DateFormat import android.util.Log +import android.widget.Toast import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -22,7 +24,11 @@ import com.deniscerri.ytdlnis.work.DownloadWorker import com.google.gson.Gson import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import java.sql.Date +import java.text.SimpleDateFormat +import java.util.* import java.util.concurrent.TimeUnit +import kotlin.collections.ArrayList class DownloadViewModel(application: Application) : AndroidViewModel(application) { private val repository : DownloadRepository 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 21407655..175d6d51 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 @@ -72,6 +72,7 @@ class ConfigureDownloadBottomSheetDialog(private val resultItem: ResultItem, pri fragments.add(DownloadCommandFragment(resultItem, downloadItem)) }else{ (tabLayout.getChildAt(0) as? ViewGroup)?.getChildAt(2)?.isEnabled = false + (tabLayout.getChildAt(0) as? ViewGroup)?.getChildAt(2)?.alpha = 0.3f } } } 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 d8ab7e87..eaef4f7e 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 @@ -4,11 +4,13 @@ import android.annotation.SuppressLint import android.app.Dialog import android.content.DialogInterface import android.os.Bundle +import android.text.format.DateFormat import android.util.DisplayMetrics import android.view.LayoutInflater 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 @@ -38,6 +40,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext import java.io.File +import java.text.SimpleDateFormat import java.util.* @@ -150,6 +153,8 @@ class DownloadBottomSheetDialog(private val resultItem: ResultItem, private val item.downloadStartTime = it.timeInMillis runBlocking { downloadViewModel.queueDownloads(listOf(item)) + val date = SimpleDateFormat(DateFormat.getBestDateTimePattern(Locale.getDefault(), "ddMMMyyyy - HHmm"), Locale.getDefault()).format(item.downloadStartTime) + Toast.makeText(context, getString(R.string.download_rescheduled_to) + " " + date, Toast.LENGTH_LONG).show() } dismiss() } 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 7e62edc6..fce35733 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 @@ -6,6 +6,7 @@ import android.app.Dialog import android.content.DialogInterface import android.content.Intent import android.os.Bundle +import android.text.format.DateFormat import android.util.DisplayMetrics import android.util.Log import android.view.* @@ -40,6 +41,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext +import java.text.SimpleDateFormat import java.util.* class DownloadMultipleBottomSheetDialog(private var items: MutableList) : BottomSheetDialogFragment(), ConfigureMultipleDownloadsAdapter.OnItemClickListener, View.OnClickListener, @@ -101,6 +103,9 @@ class DownloadMultipleBottomSheetDialog(private var items: MutableList(R.id.bottom_sheet_subtitle)!!.text = content.resources.getString(R.string.update_template) ok.text = content.resources.getString(R.string.update) ok.isEnabled = true + content.endIconDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_delete_all) }else{ ok.isEnabled = false + content.endIconDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_clipboard) } title.editText!!.addTextChangedListener(object : TextWatcher { diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index daddfe04..632b560f 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -20,7 +20,7 @@ diff --git a/app/src/main/res/layout/command_template_item.xml b/app/src/main/res/layout/command_template_item.xml index 2dce8a69..284a9764 100644 --- a/app/src/main/res/layout/command_template_item.xml +++ b/app/src/main/res/layout/command_template_item.xml @@ -25,6 +25,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="15dp" android:maxLines="2" + android:ellipsize="end" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/create_command_template.xml b/app/src/main/res/layout/create_command_template.xml index 53c790c9..ce48776a 100644 --- a/app/src/main/res/layout/create_command_template.xml +++ b/app/src/main/res/layout/create_command_template.xml @@ -92,7 +92,7 @@ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 522e20e1..6551f6b9 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -17,7 +17,6 @@ @null -