From 7eabba9c02016bf5c5b152383b7d5ad43bdfc118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C3=87erri?=
 <64997243+deniscerri@users.noreply.github.com>
Date: Sun, 26 Feb 2023 13:47:41 +0100
Subject: [PATCH] bug fixes

---
 app/build.gradle                              |  2 +-
 .../ytdlnis/adapter/DownloadLogsAdapter.kt    |  9 ++-
 .../database/viewmodel/HistoryViewModel.kt    |  2 +-
 .../deniscerri/ytdlnis/ui/HistoryFragment.kt  |  6 ++
 .../ui/downloadLogs/DownloadLogActivity.kt    | 16 ++++-
 .../downloadLogs/DownloadLogListActivity.kt   | 14 +++--
 .../deniscerri/ytdlnis/work/DownloadWorker.kt |  6 ++
 app/src/main/res/layout/download_log_item.xml | 59 ++++++++-----------
 .../res/layout/search_suggestion_item.xml     |  2 +
 9 files changed, 69 insertions(+), 47 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2eec33c0..b0c1397c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -120,7 +120,7 @@ dependencies {
 
     implementation "androidx.appcompat:appcompat:$appCompatVer"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.material:material:1.9.0-alpha02'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.core:core:1.9.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/adapter/DownloadLogsAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/adapter/DownloadLogsAdapter.kt
index 9b37d278..dc421416 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/DownloadLogsAdapter.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/DownloadLogsAdapter.kt
@@ -41,13 +41,16 @@ class DownloadLogsAdapter(onItemClickListener: OnItemClickListener, activity: Ac
         val item = getItem(position)
         val card = holder.item
 
-        card.findViewById<TextView>(R.id.title).text = item?.name
+        val title = card.findViewById<TextView>(R.id.title)
+        title.text = item?.name
 
-        card.findViewById<Button>(R.id.delete).setOnClickListener {
+        val delete = card.findViewById<Button>(R.id.delete)
+
+        delete.setOnClickListener {
             onItemClickListener.onDeleteClick(item!!)
         }
 
-        card.setOnClickListener {
+        title.setOnClickListener {
             onItemClickListener.onItemClick(item!!)
         }
     }
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 5145b12a..2727f4e0 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
@@ -14,7 +14,7 @@ import kotlinx.coroutines.launch
 class HistoryViewModel(application: Application) : AndroidViewModel(application) {
     private val repository : HistoryRepository
     val sortOrder = MutableLiveData(HistorySort.DESC)
-    private val sortType = MutableLiveData(HistorySortType.DATE)
+    val sortType = MutableLiveData(HistorySortType.DATE)
     private val websiteFilter = MutableLiveData("")
     private val queryFilter = MutableLiveData("")
     private val formatFilter = MutableLiveData("")
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/HistoryFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/HistoryFragment.kt
index 40bf1721..675dcb32 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/HistoryFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/HistoryFragment.kt
@@ -250,6 +250,12 @@ class HistoryFragment : Fragment(), HistoryAdapter.OnItemClickListener{
             val author = sortSheet!!.findViewById<LinearLayout>(R.id.author)
 
             val sortOptions = listOf(date!!, title!!, author!!)
+            sortOptions.forEach { it.getChildAt(0).visibility = INVISIBLE }
+            when(historyViewModel.sortType.value!!) {
+                HistoryRepository.HistorySortType.DATE -> changeSortIcon(date, historyViewModel.sortOrder.value!!)
+                HistoryRepository.HistorySortType.TITLE -> changeSortIcon(title, historyViewModel.sortOrder.value!!)
+                HistoryRepository.HistorySortType.AUTHOR -> changeSortIcon(author, historyViewModel.sortOrder.value!!)
+            }
 
             date.getChildAt(1).setOnClickListener {
                 sortOptions.forEach { it.getChildAt(0).visibility = INVISIBLE }
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadLogs/DownloadLogActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadLogs/DownloadLogActivity.kt
index dafe771a..9734e346 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadLogs/DownloadLogActivity.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadLogs/DownloadLogActivity.kt
@@ -18,6 +18,7 @@ class DownloadLogActivity : AppCompatActivity() {
     private lateinit var content: TextView
     private lateinit var contentScrollView : NestedScrollView
     private lateinit var topAppBar: MaterialToolbar
+    private lateinit var observer: FileObserver
     var context: Context? = null
 
     public override fun onCreate(savedInstanceState: Bundle?) {
@@ -26,19 +27,23 @@ class DownloadLogActivity : AppCompatActivity() {
         context = baseContext
 
         topAppBar = findViewById(R.id.title)
-        topAppBar.setNavigationOnClickListener { onBackPressedDispatcher.onBackPressed() }
+        topAppBar.setNavigationOnClickListener {
+            onBackPressedDispatcher.onBackPressed()
+        }
 
         content = findViewById(R.id.content)
         contentScrollView = findViewById(R.id.content_scrollview)
 
         val path = intent.getStringExtra("path")
-        if (path == null) onBackPressedDispatcher.onBackPressed()
+        if (path == null) {
+            onBackPressedDispatcher.onBackPressed()
+        }
 
         val file = File(path!!)
         topAppBar.title = file.name
         content.text = file.readText()
 
-        val observer: FileObserver = object : FileObserver(file, MODIFY) {
+        observer = object : FileObserver(file, MODIFY) {
             override fun onEvent(event: Int, p: String?) {
                 runOnUiThread{
                     content.text = File(path).readText()
@@ -49,6 +54,11 @@ class DownloadLogActivity : AppCompatActivity() {
         observer.startWatching();
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        observer.stopWatching()
+    }
+
     companion object {
         private const val TAG = "DownloadLogActivity"
     }
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadLogs/DownloadLogListActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadLogs/DownloadLogListActivity.kt
index a3b2307d..d6034dc9 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadLogs/DownloadLogListActivity.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadLogs/DownloadLogListActivity.kt
@@ -61,12 +61,14 @@ class DownloadLogListActivity : AppCompatActivity(), DownloadLogsAdapter.OnItemC
     private fun updateList(logFolder: File){
         fileList = mutableListOf()
         fileList.addAll(logFolder.listFiles()!!)
-        if (fileList.isNotEmpty()) {
-            fileList.reverse()
-            noResults.visibility = View.GONE
-            downloadLogAdapter.submitList(fileList.toList())
-        }else{
-            noResults.visibility = View.VISIBLE
+        fileList.reverse()
+        downloadLogAdapter.submitList(fileList.toList())
+        runOnUiThread{
+            if (fileList.isNotEmpty()) {
+                noResults.visibility = View.GONE
+            }else{
+                noResults.visibility = View.VISIBLE
+            }
         }
     }
 
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 66ff0f82..4304e6d8 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt
@@ -256,6 +256,12 @@ class DownloadWorker(
                 }
                 return Result.failure()
             }else{
+                val logDownloads = sharedPreferences.getBoolean("log_downloads", false)
+                if (logDownloads){
+                    val logFile = File(context.filesDir.absolutePath + """/logs/${downloadItem.id} - ${downloadItem.title}##${downloadItem.type}##${downloadItem.format.format_id}.log""")
+                    logFile.appendText("${it.message}\n")
+                }
+
                 tempFileDir.delete()
                 handler.postDelayed({
                     Toast.makeText(context, it.message, Toast.LENGTH_SHORT).show()
diff --git a/app/src/main/res/layout/download_log_item.xml b/app/src/main/res/layout/download_log_item.xml
index f1e7eb0b..7f631eee 100644
--- a/app/src/main/res/layout/download_log_item.xml
+++ b/app/src/main/res/layout/download_log_item.xml
@@ -1,40 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/download_log_item_constraint"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:padding="15dp">
+    android:orientation="horizontal"
+    android:padding="15dp"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/download_log_item_constraint"
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:layout_marginEnd="10dp"
+        android:padding="10dp"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/delete"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:padding="10dp"
-            android:textSize="18sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/delete"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <Button
+        android:id="@+id/delete"
+        style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+        android:layout_width="wrap_content"
+        android:padding="15dp"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_delete_all"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <Button
-            android:id="@+id/delete"
-            style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_delete_all"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/search_suggestion_item.xml b/app/src/main/res/layout/search_suggestion_item.xml
index 1974b505..98a6a6c4 100644
--- a/app/src/main/res/layout/search_suggestion_item.xml
+++ b/app/src/main/res/layout/search_suggestion_item.xml
@@ -33,6 +33,7 @@
                 <Button
                     style="?attr/materialIconButtonStyle"
                     android:layout_width="40dp"
+                    android:scrollbars="none"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.01"
                     app:icon="@drawable/ic_search"
@@ -54,6 +55,7 @@
                     style="?attr/materialIconButtonStyle"
                     android:id="@+id/set_search_query_button"
                     android:layout_width="40dp"
+                    android:scrollbars="none"
                     android:layout_height="match_parent"
                     app:icon="@drawable/ic_arrow_up"
                     android:layout_weight="0.01"