From a59ee7585195534267cbb1f1f3689d433dffc172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C3=87erri?= <64997243+deniscerri@users.noreply.github.com> Date: Fri, 3 Mar 2023 08:26:46 +0100 Subject: [PATCH] fixed topappbar having weird border on older androids --- .../ui/downloadLogs/DownloadLogActivity.kt | 24 ++++++++++++++----- .../downloadLogs/DownloadLogListActivity.kt | 21 ++++++++++++---- .../res/layout/activity_custom_command.xml | 2 +- .../res/layout/activity_download_log_list.xml | 2 +- .../res/layout/activity_download_queue.xml | 2 +- app/src/main/res/layout/fragment_history.xml | 2 +- 6 files changed, 38 insertions(+), 15 deletions(-) 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 591e19fb..6512c3ad 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 @@ -44,15 +44,27 @@ class DownloadLogActivity : AppCompatActivity() { topAppBar.title = file.name content.text = file.readText() - observer = object : FileObserver(file.absolutePath, MODIFY) { - override fun onEvent(event: Int, p: String?) { - runOnUiThread{ - content.text = File(path).readText() - content.scrollTo(0, content.height) + if(Build.VERSION.SDK_INT < 29){ + observer = object : FileObserver(file.absolutePath, MODIFY) { + override fun onEvent(event: Int, p: String?) { + runOnUiThread{ + content.text = File(path).readText() + content.scrollTo(0, content.height) + } } } + observer.startWatching(); + }else{ + observer = object : FileObserver(file, MODIFY) { + override fun onEvent(event: Int, p: String?) { + runOnUiThread{ + content.text = File(path).readText() + content.scrollTo(0, content.height) + } + } + } + observer.startWatching(); } - observer.startWatching(); } override fun onDestroy() { 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 1d30e232..28615c7a 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 @@ -54,14 +54,25 @@ class DownloadLogListActivity : AppCompatActivity(), DownloadLogsAdapter.OnItemC val logFolder = File(filesDir.absolutePath + "/logs") updateList(logFolder) - val observer: FileObserver = object : FileObserver(logFolder.absolutePath) { - override fun onEvent(event: Int, path: String?) { - when(event) { - CREATE, DELETE -> updateList(logFolder) + if(Build.VERSION.SDK_INT < 29){ + val observer: FileObserver = object : FileObserver(logFolder.absolutePath) { + override fun onEvent(event: Int, path: String?) { + when(event) { + CREATE, DELETE -> updateList(logFolder) + } + } + } + observer.startWatching() + }else{ + val observer: FileObserver = object : FileObserver(logFolder) { + override fun onEvent(event: Int, path: String?) { + when(event) { + CREATE, DELETE -> updateList(logFolder) + } } } + observer.startWatching() } - observer.startWatching(); initMenu(logFolder) } diff --git a/app/src/main/res/layout/activity_custom_command.xml b/app/src/main/res/layout/activity_custom_command.xml index ab3c1ad6..5319b4e2 100644 --- a/app/src/main/res/layout/activity_custom_command.xml +++ b/app/src/main/res/layout/activity_custom_command.xml @@ -57,7 +57,7 @@ diff --git a/app/src/main/res/layout/activity_download_log_list.xml b/app/src/main/res/layout/activity_download_log_list.xml index 660f6fe2..61afaf98 100644 --- a/app/src/main/res/layout/activity_download_log_list.xml +++ b/app/src/main/res/layout/activity_download_log_list.xml @@ -9,7 +9,7 @@ diff --git a/app/src/main/res/layout/activity_download_queue.xml b/app/src/main/res/layout/activity_download_queue.xml index 9342b836..88b5a0f8 100644 --- a/app/src/main/res/layout/activity_download_queue.xml +++ b/app/src/main/res/layout/activity_download_queue.xml @@ -9,7 +9,7 @@ diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml index beda84f1..8f3bb3e7 100644 --- a/app/src/main/res/layout/fragment_history.xml +++ b/app/src/main/res/layout/fragment_history.xml @@ -8,7 +8,7 @@