From aabd0367b9a45f8bba939cf9dc81d4b9a18a080c Mon Sep 17 00:00:00 2001
From: tkashkin <tkashkin@gmail.com>
Date: Fri, 14 Jul 2017 14:05:21 +0300
Subject: [PATCH] Trim newlines at start/end of lyrics Collapse more than one
 empty lines into one

---
 .../gramophone/model/lyrics/AbsSynchronizedLyrics.java        | 4 ++--
 .../java/com/kabouzeid/gramophone/model/lyrics/Lyrics.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/lyrics/AbsSynchronizedLyrics.java b/app/src/main/java/com/kabouzeid/gramophone/model/lyrics/AbsSynchronizedLyrics.java
index 99a5328f..b41d6daa 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/lyrics/AbsSynchronizedLyrics.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/lyrics/AbsSynchronizedLyrics.java
@@ -44,10 +44,10 @@ public abstract class AbsSynchronizedLyrics extends Lyrics {
 
             for (int i = 0; i < lines.size(); i++) {
                 String line = lines.valueAt(i);
-                sb.append(line).append('\n');
+                sb.append(line).append("\r\n");
             }
 
-            return sb.toString();
+            return sb.toString().trim().replaceAll("(\r?\n){3,}", "\r\n\r\n");
         }
 
         return super.getText();
diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/lyrics/Lyrics.java b/app/src/main/java/com/kabouzeid/gramophone/model/lyrics/Lyrics.java
index 1ed589b8..734e9015 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/model/lyrics/Lyrics.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/model/lyrics/Lyrics.java
@@ -59,7 +59,7 @@ public class Lyrics {
     }
 
     public String getText() {
-        return this.data;
+        return this.data.trim().replaceAll("(\r?\n){3,}", "\r\n\r\n");
     }
 
     static {