From d82ebd4225e7028d6ba7a1e10a836ff080bba4d8 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Sat, 18 Dec 2021 21:30:27 +0530
Subject: [PATCH] Added Disc number to Song tag editor

---
 .../tageditor/AbsTagEditorActivity.kt         |  9 +++
 .../tageditor/SongTagEditorActivity.kt        |  4 ++
 .../layout-land/activity_song_tag_editor.xml  | 58 ++++++++++++-----
 .../res/layout/activity_song_tag_editor.xml   | 62 ++++++++++++++-----
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 103 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
index cadbe840b..8cf8cbd40 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
@@ -174,6 +174,15 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
             }
         }
 
+    protected val discNumber: String?
+        get() {
+            return try {
+                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.DISC_NO)
+            } catch (ignored: Exception) {
+                null
+            }
+        }
+
     protected val lyrics: String?
         get() {
             return try {
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
index 069d43813..bf8220104 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
@@ -80,6 +80,7 @@ class SongTagEditorActivity : AbsTagEditorActivity<ActivitySongTagEditorBinding>
         binding.yearContainer.setTint(false)
         binding.genreContainer.setTint(false)
         binding.trackNumberContainer.setTint(false)
+        binding.discNumberContainer.setTint(false)
         binding.lyricsContainer.setTint(false)
 
         binding.songText.appHandleColor().addTextChangedListener(this)
@@ -89,6 +90,7 @@ class SongTagEditorActivity : AbsTagEditorActivity<ActivitySongTagEditorBinding>
         binding.genreText.appHandleColor().addTextChangedListener(this)
         binding.yearText.appHandleColor().addTextChangedListener(this)
         binding.trackNumberText.appHandleColor().addTextChangedListener(this)
+        binding.discNumberText.appHandleColor().addTextChangedListener(this)
         binding.lyricsText.appHandleColor().addTextChangedListener(this)
         binding.songComposerText.appHandleColor().addTextChangedListener(this)
     }
@@ -101,6 +103,7 @@ class SongTagEditorActivity : AbsTagEditorActivity<ActivitySongTagEditorBinding>
         binding.genreText.setText(genreName)
         binding.yearText.setText(songYear)
         binding.trackNumberText.setText(trackNumber)
+        binding.discNumberText.setText(discNumber)
         binding.lyricsText.setText(lyrics)
         binding.songComposerText.setText(composer)
         println(songTitle + songYear)
@@ -150,6 +153,7 @@ class SongTagEditorActivity : AbsTagEditorActivity<ActivitySongTagEditorBinding>
         fieldKeyValueMap[FieldKey.GENRE] = binding.genreText.text.toString()
         fieldKeyValueMap[FieldKey.YEAR] = binding.yearText.text.toString()
         fieldKeyValueMap[FieldKey.TRACK] = binding.trackNumberText.text.toString()
+        fieldKeyValueMap[FieldKey.DISC_NO] = binding.discNumberText.text.toString()
         fieldKeyValueMap[FieldKey.LYRICS] = binding.lyricsText.text.toString()
         fieldKeyValueMap[FieldKey.ALBUM_ARTIST] = binding.albumArtistText.text.toString()
         fieldKeyValueMap[FieldKey.COMPOSER] = binding.songComposerText.text.toString()
diff --git a/app/src/main/res/layout-land/activity_song_tag_editor.xml b/app/src/main/res/layout-land/activity_song_tag_editor.xml
index a55cd55a9..482f18305 100644
--- a/app/src/main/res/layout-land/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout-land/activity_song_tag_editor.xml
@@ -211,26 +211,56 @@
                         </com.google.android.material.textfield.TextInputLayout>
                     </LinearLayout>
 
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/trackNumberContainer"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        app:hintEnabled="true">
+                        android:baselineAligned="false"
+                        android:orientation="horizontal">
 
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/trackNumberText"
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/trackNumberContainer"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:gravity="center_vertical"
-                            android:hint="@string/track_hint"
-                            android:inputType="text|number"
-                            android:maxLines="1" />
+                            android:layout_marginTop="8dp"
+                            android:layout_weight="1"
+                            app:hintEnabled="true">
 
-                    </com.google.android.material.textfield.TextInputLayout>
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/trackNumberText"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center_vertical"
+                                android:hint="@string/track_hint"
+                                android:inputType="text|number"
+                                android:maxLines="1" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/discNumberContainer"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="8dp"
+                            android:layout_marginTop="8dp"
+                            android:layout_weight="1"
+                            app:hintEnabled="true">
+
+                            <com.google.android.material.textfield.TextInputEditText
+                                android:id="@+id/discNumberText"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center_vertical"
+                                android:hint="@string/disc_hint"
+                                android:inputType="text|number"
+                                android:maxLines="1" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+                    </LinearLayout>
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/lyricsContainer"
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index a6abea9ec..dacd1ce84 100755
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -1,8 +1,8 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:fitsSystemWindows="true"
     android:focusable="true"
     android:focusableInTouchMode="true">
@@ -166,7 +166,6 @@
                     android:layout_weight="1"
                     app:hintEnabled="true">
 
-
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/genreText"
                         android:layout_width="match_parent"
@@ -189,7 +188,6 @@
                     android:layout_weight="1"
                     app:hintEnabled="true">
 
-
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/yearText"
                         android:layout_width="match_parent"
@@ -203,26 +201,56 @@
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/trackNumberContainer"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                app:hintEnabled="true">
+                android:baselineAligned="false"
+                android:orientation="horizontal">
 
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/trackNumberText"
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/trackNumberContainer"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center_vertical"
-                    android:hint="@string/track_hint"
-                    android:inputType="text|number"
-                    android:maxLines="1" />
+                    android:layout_marginTop="8dp"
+                    android:layout_weight="1"
+                    app:hintEnabled="true">
 
-            </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/trackNumberText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center_vertical"
+                        android:hint="@string/track_hint"
+                        android:inputType="text|number"
+                        android:maxLines="1" />
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/discNumberContainer"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_weight="1"
+                    app:hintEnabled="true">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/discNumberText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:gravity="center_vertical"
+                        android:hint="@string/disc_hint"
+                        android:inputType="text|number"
+                        android:maxLines="1" />
+
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/lyricsContainer"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 229596627..4ba9ea8e8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -519,4 +519,5 @@
     <string name="title_new_backup">New Backup</string>
     <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
     <string name="app_widget_md3_name">MD3</string>
+    <string name="disc_hint">Disc Number</string>
 </resources>