From 80e85bfffa5658d04131a274942985b887885866 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sun, 1 Jan 2023 12:28:23 -0700
Subject: [PATCH] replaygain: add reset button to pre-amp dialog

Add a button to reset the pre-amp to it's default setting.

This way, you don't have to specifically seek to the 0 dB value in the
dialog in order to reset it.
---
 CHANGELOG.md                                                | 1 +
 app/src/main/java/org/oxycblt/auxio/music/extractor/Tags.kt | 5 +----
 app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt | 3 +--
 .../auxio/playback/replaygain/PreAmpCustomizeDialog.kt      | 3 +++
 app/src/main/res/values/strings.xml                         | 6 ++++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4723ee80e..dc0f8d378 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Formalized whitespace handling
 - Value lists are now properly localized
 - Queue no longer primarily shows previous songs when opened
+- Added reset button to ReplayGain pre-amp configuration dialog 
 
 #### What's Changed
 - R128 Gain tags are now only used when playing OPUS files
diff --git a/app/src/main/java/org/oxycblt/auxio/music/extractor/Tags.kt b/app/src/main/java/org/oxycblt/auxio/music/extractor/Tags.kt
index 87af3fef6..03179a230 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/extractor/Tags.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/extractor/Tags.kt
@@ -24,7 +24,7 @@ import com.google.android.exoplayer2.metadata.vorbis.VorbisComment
 import org.oxycblt.auxio.music.parsing.correctWhitespace
 
 /**
- * Processing wrapper for [Metadata] that allows access to more organized metadata.
+ * Processing wrapper for [Metadata] that allows access to more organized music tags.
  * @param metadata The [Metadata] to wrap.
  * @author Alexander Capehart (OxygenCobalt)
  */
@@ -40,9 +40,6 @@ class Tags(metadata: Metadata) {
         get() = _vorbis
 
     init {
-        // ExoPlayer only exposes ID3v2 and Vorbis metadata, which constitutes the vast majority
-        // of audio formats. Load both of these types of tags into separate maps, letting the
-        // "source of truth" be the last of a particular tag in a file.
         for (i in 0 until metadata.length()) {
             when (val tag = metadata[i]) {
                 is TextInformationFrame -> {
diff --git a/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt b/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt
index ee987d57e..ba9e3c9a0 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/system/Indexer.kt
@@ -514,8 +514,7 @@ class Indexer private constructor() {
          * system to load audio.
          */
         val PERMISSION_READ_AUDIO =
-        // TODO: Move elsewhere.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 // READ_EXTERNAL_STORAGE was superseded by READ_MEDIA_AUDIO in Android 13
                 Manifest.permission.READ_MEDIA_AUDIO
             } else {
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/replaygain/PreAmpCustomizeDialog.kt b/app/src/main/java/org/oxycblt/auxio/playback/replaygain/PreAmpCustomizeDialog.kt
index b1666684a..5cada49e2 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/replaygain/PreAmpCustomizeDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/replaygain/PreAmpCustomizeDialog.kt
@@ -42,6 +42,9 @@ class PreAmpCustomizeDialog : ViewBindingDialogFragment<DialogPreAmpBinding>() {
                 Settings(requireContext()).replayGainPreAmp =
                     ReplayGainPreAmp(binding.withTagsSlider.value, binding.withoutTagsSlider.value)
             }
+            .setNeutralButton(R.string.lbl_reset) { _, _ ->
+                Settings(requireContext()).replayGainPreAmp = ReplayGainPreAmp(0f, 0f)
+            }
             .setNegativeButton(R.string.lbl_cancel, null)
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b03934ee..65d845e60 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -125,10 +125,12 @@
 
     <string name="lbl_ok">OK</string>
     <string name="lbl_cancel">Cancel</string>
+    <!-- As in to save a setting -->
+    <string name="lbl_save">Save</string>
+    <!-- as in to reset to a default setting -->
+    <string name="lbl_reset">Reset</string>
     <!-- As in to add a new folder in the "Music folders" setting -->
     <string name="lbl_add">Add</string>
-    <!-- As in to save the "Music folders" setting -->
-    <string name="lbl_save">Save</string>
 
     <!-- Referring to playback state -->
     <string name="lbl_state_saved">State saved</string>