From 74883468046cb61218967396b556de5365c6109d Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Sun, 18 Feb 2024 17:14:41 +0100
Subject: [PATCH] feat: added optional information about audio quality for
 horizontal track adapters

---
 .../tempo/ui/adapter/SongHorizontalAdapter.java   | 15 ++++++++++++++-
 .../cappielloantonio/tempo/util/MusicUtil.java    | 11 +++++++++++
 .../cappielloantonio/tempo/util/Preferences.kt    |  6 ++++++
 app/src/main/res/values-de/strings.xml            |  2 +-
 app/src/main/res/values-fr/strings.xml            |  2 +-
 app/src/main/res/values-ko/strings.xml            |  2 +-
 app/src/main/res/values-pt/strings.xml            |  2 +-
 app/src/main/res/values/strings.xml               |  4 +++-
 app/src/main/res/xml/global_preferences.xml       |  6 ++++++
 9 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java
index 2fee0de1..da6caadf 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/SongHorizontalAdapter.java
@@ -49,7 +49,20 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
         Child song = songs.get(position);
 
         holder.item.searchResultSongTitleTextView.setText(MusicUtil.getReadableString(song.getTitle()));
-        holder.item.searchResultSongSubtitleTextView.setText(holder.itemView.getContext().getString(R.string.song_subtitle_formatter, MusicUtil.getReadableString(this.showAlbum ? song.getAlbum() : song.getArtist()), MusicUtil.getReadableDurationString(song.getDuration(), false)));
+
+        holder.item.searchResultSongSubtitleTextView.setText(
+                holder.itemView.getContext().getString(
+                        R.string.song_subtitle_formatter,
+                        MusicUtil.getReadableString(
+                                this.showAlbum ?
+                                        song.getAlbum() :
+                                        song.getArtist()
+                        ),
+                        MusicUtil.getReadableDurationString(song.getDuration(), false),
+                        MusicUtil.getReadableAudioQualityString(song)
+                )
+        );
+        
         holder.item.trackNumberTextView.setText(MusicUtil.getReadableTrackNumber(holder.itemView.getContext(), song.getTrack()));
 
         if (DownloadUtil.getDownloadTracker(holder.itemView.getContext()).isDownloaded(song.getId())) {
diff --git a/app/src/main/java/com/cappielloantonio/tempo/util/MusicUtil.java b/app/src/main/java/com/cappielloantonio/tempo/util/MusicUtil.java
index 9456422e..25278e89 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/util/MusicUtil.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/MusicUtil.java
@@ -156,6 +156,17 @@ public class MusicUtil {
         return getReadableDurationString(lenght, millis);
     }
 
+    public static String getReadableAudioQualityString(Child child) {
+        if (!Preferences.showAudioQuality()) return "";
+
+        return "•" +
+                " " +
+                child.getBitrate() +
+                "kbps" +
+                " " +
+                child.getSuffix();
+    }
+
     public static String getReadablePodcastDurationString(long duration) {
         long minutes = duration / 60;
 
diff --git a/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt b/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
index 718fba28..5e622cf4 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/Preferences.kt
@@ -54,6 +54,7 @@ object Preferences {
     private const val MIN_STAR_RATING = "min_star_rating"
     private const val ARTIST_ALBUM_LAYOUT = "artist_album_layout"
     private const val ALWAYS_ON_DISPLAY = "always_on_display"
+    private const val AUDIO_QUALITY_PER_ITEM = "audio_quality_per_item"
 
 
     @JvmStatic
@@ -390,4 +391,9 @@ object Preferences {
     fun isDisplayAlwaysOn(): Boolean {
         return App.getInstance().preferences.getBoolean(ALWAYS_ON_DISPLAY, false)
     }
+
+    @JvmStatic
+    fun showAudioQuality(): Boolean {
+        return App.getInstance().preferences.getBoolean(AUDIO_QUALITY_PER_ITEM, false)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index fe4c49fa..abe76469 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -313,7 +313,7 @@
     <string name="song_list_page_starred">Lieblingslieder</string>
     <string name="song_list_page_top">%1$s\'s Top Tracks</string>
     <string name="song_list_page_year">Jahr %1$d</string>
-    <string name="song_subtitle_formatter">%1$s  •  %2$s</string>
+    <string name="song_subtitle_formatter">%1$s  •  %2$s  %3$s</string>
     <string name="starred_sync_dialog_negative_button">Abbrechen</string>
     <string name="starred_sync_dialog_neutral_button">Weiter</string>
     <string name="starred_sync_dialog_positive_button">Weiter und Herunterladen</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a849813f..d6659fa5 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -328,7 +328,7 @@
     <string name="song_list_page_starred">Titres favoris</string>
     <string name="song_list_page_top">Les meilleurs titres de %1$s</string>
     <string name="song_list_page_year">Année %1$d</string>
-    <string name="song_subtitle_formatter">%1$s  •  %2$s</string>
+    <string name="song_subtitle_formatter">%1$s  •  %2$s  %3$s</string>
     <string name="starred_sync_dialog_negative_button">Annuler</string>
     <string name="starred_sync_dialog_neutral_button">Continuer</string>
     <string name="starred_sync_dialog_positive_button">Continuer et télécharger</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index d591929d..679f333a 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -331,7 +331,7 @@
     <string name="song_list_page_starred">즐겨찾기한 트랙</string>
     <string name="song_list_page_top">%1$s\의 top tracks</string>
     <string name="song_list_page_year">년도 %1$d</string>
-    <string name="song_subtitle_formatter">%1$s  •  %2$s</string>
+    <string name="song_subtitle_formatter">%1$s  •  %2$s  %3$s</string>
     <string name="starred_sync_dialog_negative_button">취소</string>
     <string name="starred_sync_dialog_neutral_button">계속</string>
     <string name="starred_sync_dialog_positive_button">계속해서 다운로드</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 8ff2832a..12f04a31 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -330,7 +330,7 @@
     <string name="song_list_page_starred">Músicas favoritas</string>
     <string name="song_list_page_top">Músicas preferidas de %1$s</string>
     <string name="song_list_page_year">Ano %1$d</string>
-    <string name="song_subtitle_formatter">%1$s  •  %2$s</string>
+    <string name="song_subtitle_formatter">%1$s  •  %2$s  %3$s</string>
     <string name="starred_sync_dialog_negative_button">Cancelar</string>
     <string name="starred_sync_dialog_neutral_button">Continuar</string>
     <string name="starred_sync_dialog_positive_button">Continuar e baixar</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eef9a835..11b45255 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -262,6 +262,8 @@
     <string name="settings_music_directory_summary">If enabled, show the music directory section. Please note that for folder navigation to work properly, the server must support this feature.</string>
     <string name="settings_podcast">Show podcast</string>
     <string name="settings_podcast_summary">If enabled, show the podcast section. Restart the app for it to take full effect.</string>
+    <string name="settings_audio_quality">Show audio quality</string>
+    <string name="settings_audio_quality_summary">The bitrate and audio format will be shown for each audio track</string>
     <string name="settings_queue_syncing_countdown">Sync timer</string>
     <string name="settings_queue_syncing_summary">If enabled, the user will have the ability to save their play queue and will have the ability to load state when opening the application.</string>
     <string name="settings_queue_syncing_title">Sync play queue for this user</string>
@@ -333,7 +335,7 @@
     <string name="song_list_page_starred">Starred tracks</string>
     <string name="song_list_page_top">%1$s\'s top tracks</string>
     <string name="song_list_page_year">Year %1$d</string>
-    <string name="song_subtitle_formatter">%1$s  •  %2$s</string>
+    <string name="song_subtitle_formatter">%1$s  •  %2$s  %3$s</string>
     <string name="starred_sync_dialog_negative_button">Cancel</string>
     <string name="starred_sync_dialog_neutral_button">Continue</string>
     <string name="starred_sync_dialog_positive_button">Continue and download</string>
diff --git a/app/src/main/res/xml/global_preferences.xml b/app/src/main/res/xml/global_preferences.xml
index 683247ca..40077d99 100644
--- a/app/src/main/res/xml/global_preferences.xml
+++ b/app/src/main/res/xml/global_preferences.xml
@@ -51,6 +51,12 @@
             app:title="@string/settings_rounded_corner_size"
             app:useSimpleSummaryProvider="true" />
 
+        <SwitchPreference
+            android:title="@string/settings_audio_quality"
+            android:defaultValue="false"
+            android:summary="@string/settings_audio_quality_summary"
+            android:key="audio_quality_per_item" />
+
         <SwitchPreference
             android:title="@string/settings_podcast"
             android:defaultValue="true"