Merge lp:~etherpulse/podbird/add_description_to_full_view into lp:podbird

[Eran Uzan]

Added description in the full player view.

Unmerged revisions

189. By Eran Uzan on 2017-06-02

Added episode description to the full player view.

188. By Launchpad Translations on behalf of michael-sheldon on 2017-05-31

Launchpad automatic translations update.

187. By Launchpad Translations on behalf of michael-sheldon on 2017-04-29

Launchpad automatic translations update.

186. By Launchpad Translations on behalf of michael-sheldon on 2017-04-28

Launchpad automatic translations update.

185. By Launchpad Translations on behalf of michael-sheldon on 2017-04-27

Launchpad automatic translations update.

184. By Launchpad Translations on behalf of michael-sheldon on 2017-03-14

Launchpad automatic translations update.

183. By Launchpad Translations on behalf of michael-sheldon on 2017-01-19

Launchpad automatic translations update.

182. By Launchpad Translations on behalf of michael-sheldon on 2017-01-18

Launchpad automatic translations update.

181. By Launchpad Translations on behalf of michael-sheldon on 2017-01-13

Launchpad automatic translations update.

180. By Launchpad Translations on behalf of michael-sheldon on 2017-01-06

Launchpad automatic translations update.

=== modified file 'app/podbird.qml'
--- app/podbird.qml	2017-01-03 00:02:16 +0000
+++ app/podbird.qml	2017-06-02 21:52:14 +0000
@@ -100,6 +100,7 @@
     property string currentArtist
     property string currentImage
     property string currentGuid
+    property string currentDescription
     property url currentUrl: ""
 
     Themes.ThemeManager {
@@ -261,6 +262,7 @@
                 image: "",
                 guid: "",
                 position: 0,
+                description:"",
             }
 
             source = source.toString()
@@ -358,6 +360,7 @@
                 currentImage = meta.image
                 currentGuid = meta.guid
                 player.pendingSeek = meta.position
+                currentDescription = meta.description
             }
         }
 
 
=== modified file 'app/podcasts.js'
--- app/podcasts.js	2017-01-03 00:02:16 +0000
+++ app/podcasts.js	2017-06-02 21:52:14 +0000
@@ -114,6 +114,7 @@
         image: "",
         guid: "",
         position: 0,
+        description:"",
     }
 
     db.transaction(function(tx) {
@@ -125,6 +126,14 @@
             meta.image = episode.image
             meta.guid = episode.guid
             meta.position = episode.position
+
+            if(meta.guid != "") {
+                var rs2 = tx.executeSql("SELECT * FROM Episode WHERE guid = ?", [meta.guid]);
+                if (rs2.rows.length > 0) {
+                    var episodeData = rs2.rows.item(0);
+                    meta.description = episodeData.description
+                }
+            }
         }
     });
 
 
=== modified file 'app/ui/FullPlayingView.qml'
--- app/ui/FullPlayingView.qml	2017-01-01 14:28:51 +0000
+++ app/ui/FullPlayingView.qml	2017-06-02 21:52:14 +0000
@@ -117,6 +117,20 @@
             textSize: Label.Small
             color: podbird.appTheme.baseSubText
         }
+        Text {
+            id: description
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.top: artist.bottom
+            anchors.topMargin: units.gu(2)
+            anchors.bottomMargin: units.gu(2)
+            anchors.bottom: scrubber.top
+            text: currentDescription
+            elide: Text.ElideRight
+            wrapMode: Text.WordWrap
+            color: podbird.appTheme.baseSubText
+            visible: currentDescription != ""
+        }
         
         Slider {
             id: scrubber