From bf2ac255670943ccd08d57b34e09b0d9dba46e26 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Fri, 17 Jun 2022 16:32:24 +0200 Subject: [PATCH 1/3] fix colors --- app/src/main/res/layout/channel_subscription_row.xml | 2 +- app/src/main/res/layout/fragment_channel.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/channel_subscription_row.xml b/app/src/main/res/layout/channel_subscription_row.xml index 9085e93b2..746ef9fd9 100644 --- a/app/src/main/res/layout/channel_subscription_row.xml +++ b/app/src/main/res/layout/channel_subscription_row.xml @@ -36,6 +36,6 @@ android:backgroundTint="?attr/colorOnPrimary" android:text="@string/unsubscribe" android:textSize="11dp" - android:textColor="@android:color/white" + android:textColor="?android:attr/textColorPrimary" app:cornerRadius="20dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml index a594e3de8..d37bc0a14 100644 --- a/app/src/main/res/layout/fragment_channel.xml +++ b/app/src/main/res/layout/fragment_channel.xml @@ -83,7 +83,7 @@ android:textColor="@android:color/white" android:textSize="11sp" android:drawableLeft="@drawable/ic_bell_small" - android:drawableTint="@android:color/white" /> + android:drawableTint="?android:attr/textColorPrimary" /> From fc9fbb0db2887daa062b7b0157cbe4094fc9cf19 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Fri, 17 Jun 2022 16:39:05 +0200 Subject: [PATCH 2/3] added missing translations --- .../java/com/github/libretube/DownloadService.kt | 14 +++++++------- .../com/github/libretube/dialogs/DownloadDialog.kt | 4 ++-- app/src/main/res/values/strings.xml | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/github/libretube/DownloadService.kt b/app/src/main/java/com/github/libretube/DownloadService.kt index 217a7f99a..4b3bfb70a 100644 --- a/app/src/main/java/com/github/libretube/DownloadService.kt +++ b/app/src/main/java/com/github/libretube/DownloadService.kt @@ -113,15 +113,15 @@ class DownloadService : Service() { "mux" -> { audioDir = File(tempDir, "$videoId-audio") videoDir = File(tempDir, "$videoId-video") - downloadId = downloadManagerRequest("Video", "Downloading", videoUrl, videoDir) + downloadId = downloadManagerRequest(getString(R.string.video), getString(R.string.downloading), videoUrl, videoDir) } "video" -> { videoDir = File(libretubeDir, "$videoId-video") - downloadId = downloadManagerRequest("Video", "Downloading", videoUrl, videoDir) + downloadId = downloadManagerRequest(getString(R.string.video), getString(R.string.downloading), videoUrl, videoDir) } "audio" -> { audioDir = File(libretubeDir, "$videoId-audio") - downloadId = downloadManagerRequest("Audio", "Downloading", audioUrl, audioDir) + downloadId = downloadManagerRequest(getString(R.string.audio), getString(R.string.downloading), audioUrl, audioDir) } } } catch (e: IllegalArgumentException) { @@ -136,7 +136,7 @@ class DownloadService : Service() { // Checking if the received broadcast is for our enqueued download by matching download id if (downloadId == id) { if (downloadType == "mux") { - downloadManagerRequest("Audio", "Downloading", audioUrl, audioDir) + downloadManagerRequest(getString(R.string.video), getString(R.string.downloading), audioUrl, audioDir) } else { downloadSucceededNotification() onDestroy() @@ -178,7 +178,7 @@ class DownloadService : Service() { NotificationCompat.Builder(this@DownloadService, "download_service") .setSmallIcon(R.drawable.ic_download) .setContentTitle("LibreTube") - .setContentText("Downloading") + .setContentText(getString(R.string.downloading)) .setPriority(NotificationCompat.PRIORITY_LOW) .setOngoing(true) .setOnlyAlertOnce(true) @@ -192,7 +192,7 @@ class DownloadService : Service() { val builder = NotificationCompat.Builder(this@DownloadService, "download_service") .setSmallIcon(R.drawable.ic_download) .setContentTitle(resources.getString(R.string.downloadfailed)) - .setContentText("failure") + .setContentText(getString(R.string.fail)) .setPriority(NotificationCompat.PRIORITY_HIGH) with(NotificationManagerCompat.from(this@DownloadService)) { // notificationId is a unique int for each notification that you must define @@ -205,7 +205,7 @@ class DownloadService : Service() { val builder = NotificationCompat.Builder(this@DownloadService, "download_service") .setSmallIcon(R.drawable.ic_download) .setContentTitle(resources.getString(R.string.success)) - .setContentText("success") + .setContentText(getString(R.string.fail)) .setPriority(NotificationCompat.PRIORITY_HIGH) with(NotificationManagerCompat.from(this@DownloadService)) { // notificationId is a unique int for each notification that you must define diff --git a/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt b/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt index d01b2ff1b..7e71a21e7 100644 --- a/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt +++ b/app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt @@ -71,7 +71,7 @@ class DownloadDialog : DialogFragment() { } } var vidName = arrayListOf() - vidName.add("No video") + vidName.add(getString(R.string.no_video)) var vidUrl = arrayListOf() vidUrl.add("") for (vid in streams.videoStreams!!) { @@ -80,7 +80,7 @@ class DownloadDialog : DialogFragment() { vidUrl.add(vid.url!!) } var audioName = arrayListOf() - audioName.add("No audio") + audioName.add(getString(R.string.no_audio)) var audioUrl = arrayListOf() audioUrl.add("") for (audio in streams.audioStreams!!) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 82603e8da..d0b43c9ff 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -184,4 +184,9 @@ Preloading Max. amount of seconds of video to buffer. Video format for player + No audio + No video + Audio + Video + Downloading From 9c32112dde51c37258f80c5bb3724de81f942f00 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Fri, 17 Jun 2022 16:50:48 +0200 Subject: [PATCH 3/3] ktlint --- .../com/github/libretube/DownloadService.kt | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/github/libretube/DownloadService.kt b/app/src/main/java/com/github/libretube/DownloadService.kt index 4b3bfb70a..db52515d6 100644 --- a/app/src/main/java/com/github/libretube/DownloadService.kt +++ b/app/src/main/java/com/github/libretube/DownloadService.kt @@ -113,15 +113,30 @@ class DownloadService : Service() { "mux" -> { audioDir = File(tempDir, "$videoId-audio") videoDir = File(tempDir, "$videoId-video") - downloadId = downloadManagerRequest(getString(R.string.video), getString(R.string.downloading), videoUrl, videoDir) + downloadId = downloadManagerRequest( + getString(R.string.video), + getString(R.string.downloading), + videoUrl, + videoDir + ) } "video" -> { videoDir = File(libretubeDir, "$videoId-video") - downloadId = downloadManagerRequest(getString(R.string.video), getString(R.string.downloading), videoUrl, videoDir) + downloadId = downloadManagerRequest( + getString(R.string.video), + getString(R.string.downloading), + videoUrl, + videoDir + ) } "audio" -> { audioDir = File(libretubeDir, "$videoId-audio") - downloadId = downloadManagerRequest(getString(R.string.audio), getString(R.string.downloading), audioUrl, audioDir) + downloadId = downloadManagerRequest( + getString(R.string.audio), + getString(R.string.downloading), + audioUrl, + audioDir + ) } } } catch (e: IllegalArgumentException) { @@ -136,7 +151,12 @@ class DownloadService : Service() { // Checking if the received broadcast is for our enqueued download by matching download id if (downloadId == id) { if (downloadType == "mux") { - downloadManagerRequest(getString(R.string.video), getString(R.string.downloading), audioUrl, audioDir) + downloadManagerRequest( + getString(R.string.video), + getString(R.string.downloading), + audioUrl, + audioDir + ) } else { downloadSucceededNotification() onDestroy()