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

Proposed by Eran Uzan on 2017-06-02
Status: Needs review
Proposed branch: lp:~etherpulse/podbird/add_description_to_full_view
Merge into: lp:podbird
Diff against target: 79 lines (+26/-0)
3 files modified
app/podbird.qml (+3/-0)
app/podcasts.js (+9/-0)
app/ui/FullPlayingView.qml (+14/-0)
To merge this branch: bzr merge lp:~etherpulse/podbird/add_description_to_full_view
Reviewer Review Type Date Requested Status
Michael Sheldon 2017-06-02 Pending
Review via email: mp+325027@code.launchpad.net

Description of the change

Added description in the full player view.

To post a comment you must log in.

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/podbird.qml'
2--- app/podbird.qml 2017-01-03 00:02:16 +0000
3+++ app/podbird.qml 2017-06-02 21:52:14 +0000
4@@ -100,6 +100,7 @@
5 property string currentArtist
6 property string currentImage
7 property string currentGuid
8+ property string currentDescription
9 property url currentUrl: ""
10
11 Themes.ThemeManager {
12@@ -261,6 +262,7 @@
13 image: "",
14 guid: "",
15 position: 0,
16+ description:"",
17 }
18
19 source = source.toString()
20@@ -358,6 +360,7 @@
21 currentImage = meta.image
22 currentGuid = meta.guid
23 player.pendingSeek = meta.position
24+ currentDescription = meta.description
25 }
26 }
27
28
29=== modified file 'app/podcasts.js'
30--- app/podcasts.js 2017-01-03 00:02:16 +0000
31+++ app/podcasts.js 2017-06-02 21:52:14 +0000
32@@ -114,6 +114,7 @@
33 image: "",
34 guid: "",
35 position: 0,
36+ description:"",
37 }
38
39 db.transaction(function(tx) {
40@@ -125,6 +126,14 @@
41 meta.image = episode.image
42 meta.guid = episode.guid
43 meta.position = episode.position
44+
45+ if(meta.guid != "") {
46+ var rs2 = tx.executeSql("SELECT * FROM Episode WHERE guid = ?", [meta.guid]);
47+ if (rs2.rows.length > 0) {
48+ var episodeData = rs2.rows.item(0);
49+ meta.description = episodeData.description
50+ }
51+ }
52 }
53 });
54
55
56=== modified file 'app/ui/FullPlayingView.qml'
57--- app/ui/FullPlayingView.qml 2017-01-01 14:28:51 +0000
58+++ app/ui/FullPlayingView.qml 2017-06-02 21:52:14 +0000
59@@ -117,6 +117,20 @@
60 textSize: Label.Small
61 color: podbird.appTheme.baseSubText
62 }
63+ Text {
64+ id: description
65+ anchors.left: parent.left
66+ anchors.right: parent.right
67+ anchors.top: artist.bottom
68+ anchors.topMargin: units.gu(2)
69+ anchors.bottomMargin: units.gu(2)
70+ anchors.bottom: scrubber.top
71+ text: currentDescription
72+ elide: Text.ElideRight
73+ wrapMode: Text.WordWrap
74+ color: podbird.appTheme.baseSubText
75+ visible: currentDescription != ""
76+ }
77
78 Slider {
79 id: scrubber

Subscribers

People subscribed via source and target branches

to status/vote changes: