From 7898f9bc2103d92f40d4b2b561af6b07359b1107 Mon Sep 17 00:00:00 2001
From: Materight <matteo.est@gmail.com>
Date: Sun, 19 Mar 2017 14:57:32 +0100
Subject: [PATCH] Add lyrics editor in SongTagEditorActivity

---
 .../tageditor/AbsTagEditorActivity.java         |  9 +++++++++
 .../tageditor/SongTagEditorActivity.java        |  5 +++++
 .../res/layout/activity_song_tag_editor.xml     | 17 +++++++++++++++++
 app/src/main/res/values/strings.xml             |  1 +
 4 files changed, 32 insertions(+)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
index f0e89573..cf9ab563 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
@@ -507,6 +507,15 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
         }
     }
 
+    @Nullable
+    protected String getLyrics() {
+        try {
+            return getAudioFile(songPaths.get(0)).getTagOrCreateAndSetDefault().getFirst(FieldKey.LYRICS);
+        } catch (Exception ignored) {
+            return null;
+        }
+    }
+
     @Nullable
     protected Bitmap getAlbumArt() {
         try {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java
index 40134c87..a48224b2 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java
@@ -37,6 +37,8 @@ public class SongTagEditorActivity extends AbsTagEditorActivity implements TextW
     EditText year;
     @BindView(R.id.image_text)
     EditText trackNumber;
+    @BindView(R.id.lyrics)
+    EditText lyrics;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -58,6 +60,7 @@ public class SongTagEditorActivity extends AbsTagEditorActivity implements TextW
         genre.addTextChangedListener(this);
         year.addTextChangedListener(this);
         trackNumber.addTextChangedListener(this);
+        lyrics.addTextChangedListener(this);
     }
 
     private void fillViewsWithFileTags() {
@@ -67,6 +70,7 @@ public class SongTagEditorActivity extends AbsTagEditorActivity implements TextW
         genre.setText(getGenreName());
         year.setText(getSongYear());
         trackNumber.setText(getTrackNumber());
+        lyrics.setText(getLyrics());
     }
 
     @Override
@@ -98,6 +102,7 @@ public class SongTagEditorActivity extends AbsTagEditorActivity implements TextW
         fieldKeyValueMap.put(FieldKey.GENRE, genre.getText().toString());
         fieldKeyValueMap.put(FieldKey.YEAR, year.getText().toString());
         fieldKeyValueMap.put(FieldKey.TRACK, trackNumber.getText().toString());
+        fieldKeyValueMap.put(FieldKey.LYRICS, lyrics.getText().toString());
         writeValuesToFiles(fieldKeyValueMap, null);
     }
 
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 3c11c92c..8a8a553f 100644
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -157,6 +157,23 @@
 
                 </android.support.design.widget.TextInputLayout>
 
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <EditText
+                        android:id="@+id/lyrics"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:fontFamily="sans-serif"
+                        android:gravity="center_vertical"
+                        android:hint="@string/lyrics"
+                        android:inputType="textMultiLine"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+
+                </android.support.design.widget.TextInputLayout>
+
             </LinearLayout>
 
         </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a094d29..2160388e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,6 +48,7 @@
     <string name="year">Year</string>
     <string name="track">Track</string>
     <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
+    <string name="lyrics">Lyrics</string>
     <string name="album_or_artist_empty">The title or artist is empty.</string>
     <string name="saving_changes">Saving changes</string>
     <string name="saving_to_file">Saving to file…</string>