ubuntu-touch-coreapps-reviewers team mailing list archive

[Roman Shchekin <mrqtros@xxxxxxxxx>]

Roman Shchekin has proposed merging lp:~mrqtros/ubuntu-rssreader-app/uitk13-few-fixes into lp:ubuntu-rssreader-app.

Commit message:
* Manifest version fro PRO
* BottomEdgeTabs fixed
* Regex for image parsing

Requested reviews:
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
  Ubuntu Shorts Developers (ubuntu-rssreader-dev)

For more details, see:
https://code.launchpad.net/~mrqtros/ubuntu-rssreader-app/uitk13-few-fixes/+merge/275623

* Manifest version fro PRO
* BottomEdgeTabs fixed
* Regex for image parsing
-- 
Your team Ubuntu Shorts Developers is requested to review the proposed merge of lp:~mrqtros/ubuntu-rssreader-app/uitk13-few-fixes into lp:ubuntu-rssreader-app.

=== modified file 'manifest.json.4pro'
--- manifest.json.4pro	2015-07-21 19:41:58 +0000
+++ manifest.json.4pro	2015-10-24 11:39:00 +0000
@@ -11,5 +11,5 @@
     },
     "version": "1.0.6",
     "maintainer": "Roman Shchekin <mrqtros@xxxxxxxxx>",
-    "framework": "ubuntu-sdk-15.04"
+    "framework": "ubuntu-sdk-15.04.1-qml"
 }

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-07-17 14:42:42 +0000
+++ manifest.json.in	2015-10-24 11:39:00 +0000
@@ -1,7 +1,7 @@
 {
     "architecture": "@CLICK_ARCH@",
     "description": "Rss Reader application",
-    "framework": "ubuntu-sdk-15.04",
+    "framework": "ubuntu-sdk-15.04.1-qml",
     "hooks": {
         "shorts": {
             "apparmor": "shorts.apparmor",

=== modified file 'shorts.apparmor'
--- shorts.apparmor	2015-07-04 08:38:18 +0000
+++ shorts.apparmor	2015-10-24 11:39:00 +0000
@@ -4,4 +4,4 @@
         "content_exchange_source"
     ],
     "policy_version": 1.3
-}
\ No newline at end of file
+}

=== modified file 'shorts/po/com.ubuntu.shorts.pot'
--- shorts/po/com.ubuntu.shorts.pot	2015-08-11 12:07:22 +0000
+++ shorts/po/com.ubuntu.shorts.pot	2015-10-24 11:39:00 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 20:00+0800\n"
+"POT-Creation-Date: 2015-10-23 22:15+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -18,32 +18,32 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../qml/components/ArticleViewItem.qml:122
+#: ../qml/components/ArticleViewItem.qml:120
 msgid "Select article"
 msgstr ""
 
-#: ../qml/components/ReadingOptions.qml:40
+#: ../qml/components/ReadingOptions.qml:39
 msgid "Dark"
 msgstr ""
 
-#: ../qml/components/ReadingOptions.qml:50
+#: ../qml/components/ReadingOptions.qml:46
 msgid "Light"
 msgstr ""
 
-#: ../qml/components/ReadingOptions.qml:107
+#: ../qml/components/ReadingOptions.qml:96
 msgid "Small"
 msgstr ""
 
-#: ../qml/components/ReadingOptions.qml:109
-msgid "Mid"
+#: ../qml/components/ReadingOptions.qml:98
+msgid "Normal"
 msgstr ""
 
-#: ../qml/components/ReadingOptions.qml:110
+#: ../qml/components/ReadingOptions.qml:99
 msgid "Large"
 msgstr ""
 
-#: ../qml/pages/AppendFeedPage.qml:31 ../qml/shorts-app.qml:234
-#: ../qml/shorts-app.qml:369
+#: ../qml/pages/AppendFeedPage.qml:31 ../qml/shorts-app.qml:243
+#: ../qml/shorts-app.qml:378
 msgid "Add feeds"
 msgstr ""
 
@@ -63,28 +63,28 @@
 msgid "Type a keyword or URL"
 msgstr ""
 
-#: ../qml/pages/AppendFeedPage.qml:187
+#: ../qml/pages/AppendFeedPage.qml:185
 msgid "Search results"
 msgstr ""
 
-#: ../qml/pages/AppendFeedPage.qml:245 ../qml/pages/CreateTopicPage.qml:38
-#: ../qml/pages/TopicManagement.qml:239 ../qml/shorts-app.qml:447
+#: ../qml/pages/AppendFeedPage.qml:243 ../qml/pages/CreateTopicPage.qml:38
+#: ../qml/pages/TopicManagement.qml:239 ../qml/shorts-app.qml:456
 msgid "Cancel"
 msgstr ""
 
-#: ../qml/pages/AppendFeedPage.qml:278
+#: ../qml/pages/AppendFeedPage.qml:276
 msgid "Next"
 msgstr ""
 
-#: ../qml/pages/AppendFeedPage.qml:307 ../qml/pages/CreateTopicPage.qml:181
+#: ../qml/pages/AppendFeedPage.qml:305 ../qml/pages/CreateTopicPage.qml:181
 msgid "No feeds"
 msgstr ""
 
-#: ../qml/pages/ArticleViewPage.qml:44
+#: ../qml/pages/ArticleViewPage.qml:47
 msgid "Save"
 msgstr ""
 
-#: ../qml/pages/ArticleViewPage.qml:44
+#: ../qml/pages/ArticleViewPage.qml:47
 msgid "Remove"
 msgstr ""
 
@@ -161,7 +161,7 @@
 msgid "Topic: "
 msgstr ""
 
-#: ../qml/pages/TopicManagement.qml:13 ../qml/shorts-app.qml:218
+#: ../qml/pages/TopicManagement.qml:13 ../qml/shorts-app.qml:217
 msgid "Edit topics"
 msgstr ""
 
@@ -185,51 +185,59 @@
 msgid "List view"
 msgstr ""
 
-#: ../qml/shorts-app.qml:300
+#: ../qml/shorts-app.qml:227
+msgid "Disable night mode"
+msgstr ""
+
+#: ../qml/shorts-app.qml:227
+msgid "Enable night mode"
+msgstr ""
+
+#: ../qml/shorts-app.qml:309
 msgid "Saved"
 msgstr ""
 
-#: ../qml/shorts-app.qml:308 shorts.desktop.in.in.h:1
+#: ../qml/shorts-app.qml:317 shorts.desktop.in.in.h:1
 msgid "Shorts"
 msgstr ""
 
-#: ../qml/shorts-app.qml:439
+#: ../qml/shorts-app.qml:448
 msgid "Checking for new articles"
 msgstr ""
 
-#: ../qml/shorts-app.qml:463
+#: ../qml/shorts-app.qml:472
 msgid "Perhaps some of the channels have not been updated."
 msgstr ""
 
-#: ../qml/shorts-app.qml:464
+#: ../qml/shorts-app.qml:473
 msgid "Errors occurred during the update"
 msgstr ""
 
-#: ../qml/shorts-app.qml:482
+#: ../qml/shorts-app.qml:491
 msgid "+ Add feeds"
 msgstr ""
 
-#: ../qml/shorts-app.qml:494
+#: ../qml/shorts-app.qml:503
 msgid "Add online accounts"
 msgstr ""
 
-#: ../qml/shorts-app.qml:497
+#: ../qml/shorts-app.qml:506
 msgid "Online accounts are not available for now"
 msgstr ""
 
-#: ../qml/shorts-app.qml:498 ../qml/shorts-app.qml:507
+#: ../qml/shorts-app.qml:507 ../qml/shorts-app.qml:516
 msgid "We are sorry"
 msgstr ""
 
-#: ../qml/shorts-app.qml:503
+#: ../qml/shorts-app.qml:512
 msgid "Import subscriptions"
 msgstr ""
 
-#: ../qml/shorts-app.qml:506
+#: ../qml/shorts-app.qml:515
 msgid "Importing subscriptions is not available for now"
 msgstr ""
 
-#: ../qml/shorts-app.qml:521
+#: ../qml/shorts-app.qml:530
 msgid "Ok"
 msgstr ""
 

=== modified file 'shorts/qml/components/ArticleViewItem.qml'
--- shorts/qml/components/ArticleViewItem.qml	2015-10-10 11:24:04 +0000
+++ shorts/qml/components/ArticleViewItem.qml	2015-10-24 11:39:00 +0000
@@ -8,9 +8,9 @@
 
 import QtQuick 2.4
 import QtQuick.XmlListModel 2.0
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 import "../utils/dateutils.js" as DateUtils
 import "../utils/databasemodule_v2.js" as DB

=== modified file 'shorts/qml/components/BottomEdgeTabs.qml'
--- shorts/qml/components/BottomEdgeTabs.qml	2015-07-04 08:38:18 +0000
+++ shorts/qml/components/BottomEdgeTabs.qml	2015-10-24 11:39:00 +0000
@@ -73,7 +73,7 @@
 */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Tabs {
     id: page
@@ -164,7 +164,7 @@
         z: 1
         width: tipLabel.paintedWidth + units.gu(6)
         height: bottomEdge.tipHeight + units.gu(1)
-        color: bottomEdgeTipColor //color: "#C9C9C9"
+        backgroundColor: bottomEdgeTipColor //color: "#C9C9C9"
 
         Label {
             id: tipLabel

=== modified file 'shorts/qml/components/FakeHeader.qml'
--- shorts/qml/components/FakeHeader.qml	2015-07-04 08:38:18 +0000
+++ shorts/qml/components/FakeHeader.qml	2015-10-24 11:39:00 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Column {
     id: fakeHeader

=== modified file 'shorts/qml/components/GridModeItem.qml'
--- shorts/qml/components/GridModeItem.qml	2015-07-04 08:38:18 +0000
+++ shorts/qml/components/GridModeItem.qml	2015-10-24 11:39:00 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 Item {
     id: gridPage

=== modified file 'shorts/qml/components/ListModeItem.qml'
--- shorts/qml/components/ListModeItem.qml	2015-10-10 11:24:04 +0000
+++ shorts/qml/components/ListModeItem.qml	2015-10-24 11:39:00 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItems
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
+import Ubuntu.Components.Popups 1.3
 
 import "../utils/dateutils.js" as DateUtils
 

=== modified file 'shorts/qml/components/NetworkManager.qml'
--- shorts/qml/components/NetworkManager.qml	2015-07-04 08:38:18 +0000
+++ shorts/qml/components/NetworkManager.qml	2015-10-24 11:39:00 +0000
@@ -1,9 +1,9 @@
 import QtQuick 2.4
 import QtQuick.XmlListModel 2.0
 
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItems
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
+import Ubuntu.Components.Popups 1.3
 
 import "../utils/databasemodule_v2.js" as DB
 import "../utils/imgSeparator.js" as ImageUtils

=== modified file 'shorts/qml/components/OrganicGrid.qml'
--- shorts/qml/components/OrganicGrid.qml	2015-10-10 11:24:04 +0000
+++ shorts/qml/components/OrganicGrid.qml	2015-10-24 11:39:00 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.4
 import QtGraphicalEffects 1.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: organicGridRoot

=== modified file 'shorts/qml/components/ReadingOptions.qml'
--- shorts/qml/components/ReadingOptions.qml	2015-10-10 11:24:04 +0000
+++ shorts/qml/components/ReadingOptions.qml	2015-10-24 11:39:00 +0000
@@ -8,9 +8,9 @@
 
 import QtQuick 2.4
 import QtQuick.XmlListModel 2.0
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 Popover {
     id: readingOptionsPopover

=== modified file 'shorts/qml/content/SharePage.qml'
--- shorts/qml/content/SharePage.qml	2015-07-04 08:38:18 +0000
+++ shorts/qml/content/SharePage.qml	2015-10-24 11:39:00 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Content 1.1
 
 Page {

=== modified file 'shorts/qml/delegates/ArticleFullImg.qml'
--- shorts/qml/delegates/ArticleFullImg.qml	2015-10-10 11:24:04 +0000
+++ shorts/qml/delegates/ArticleFullImg.qml	2015-10-24 11:39:00 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 import "../utils/dateutils.js" as DateUtils
 

=== modified file 'shorts/qml/delegates/ArticleOneImgA.qml'
--- shorts/qml/delegates/ArticleOneImgA.qml	2015-10-10 11:24:04 +0000
+++ shorts/qml/delegates/ArticleOneImgA.qml	2015-10-24 11:39:00 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 import "../utils/dateutils.js" as DateUtils
 

=== modified file 'shorts/qml/delegates/ArticleTextA.qml'
--- shorts/qml/delegates/ArticleTextA.qml	2015-10-10 11:24:04 +0000
+++ shorts/qml/delegates/ArticleTextA.qml	2015-10-24 11:39:00 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 import "../utils/dateutils.js" as DateUtils
 

=== modified file 'shorts/qml/delegates/ArticleTextB.qml'
--- shorts/qml/delegates/ArticleTextB.qml	2015-10-10 11:24:04 +0000
+++ shorts/qml/delegates/ArticleTextB.qml	2015-10-24 11:39:00 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 import "../utils/dateutils.js" as DateUtils
 

=== modified file 'shorts/qml/pages/AppendFeedPage.qml'
--- shorts/qml/pages/AppendFeedPage.qml	2015-10-10 11:24:04 +0000
+++ shorts/qml/pages/AppendFeedPage.qml	2015-10-24 11:39:00 +0000
@@ -16,9 +16,9 @@
 
 import QtQuick 2.4
 import QtQuick.XmlListModel 2.0
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 import "../components"
 import "../utils/databasemodule_v2.js" as DB

=== modified file 'shorts/qml/pages/ArticleViewPage.qml'
--- shorts/qml/pages/ArticleViewPage.qml	2015-10-10 11:24:04 +0000
+++ shorts/qml/pages/ArticleViewPage.qml	2015-10-24 11:39:00 +0000
@@ -8,9 +8,9 @@
 
 import QtQuick 2.4
 import QtQuick.XmlListModel 2.0
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 import "../components"
 import "../utils/dateutils.js" as DateUtils

=== modified file 'shorts/qml/pages/ChooseTopicPage.qml'
--- shorts/qml/pages/ChooseTopicPage.qml	2015-07-04 08:38:18 +0000
+++ shorts/qml/pages/ChooseTopicPage.qml	2015-10-24 11:39:00 +0000
@@ -1,8 +1,8 @@
 import QtQuick 2.4
 import QtQuick.XmlListModel 2.0
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 import "../utils/databasemodule_v2.js" as DB
 

=== modified file 'shorts/qml/pages/CreateTopicPage.qml'
--- shorts/qml/pages/CreateTopicPage.qml	2015-07-04 08:38:18 +0000
+++ shorts/qml/pages/CreateTopicPage.qml	2015-10-24 11:39:00 +0000
@@ -1,8 +1,8 @@
 import QtQuick 2.4
 import QtQuick.XmlListModel 2.0
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 import "../utils/databasemodule_v2.js" as DB
 

=== modified file 'shorts/qml/pages/EditFeedPage.qml'
--- shorts/qml/pages/EditFeedPage.qml	2015-07-04 08:38:18 +0000
+++ shorts/qml/pages/EditFeedPage.qml	2015-10-24 11:39:00 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Layouts 1.0
 
 import "../utils/databasemodule_v2.js" as DB
@@ -11,7 +11,7 @@
     objectName: "editfeedpage"
     title: i18n.tr("Edit Feed")
     flickable: null/*content*/
-    tools: null
+//    tools: null
 
     head.actions: [
                 Action {
@@ -68,7 +68,7 @@
     }
 
     function reloadPageContent() {
-        editPage.tools = toolbar
+//        editPage.tools = toolbar
     }
 
     Flickable {

=== modified file 'shorts/qml/pages/FeedComponent.qml'
--- shorts/qml/pages/FeedComponent.qml	2015-07-21 19:42:29 +0000
+++ shorts/qml/pages/FeedComponent.qml	2015-10-24 11:39:00 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "../utils/databasemodule_v2.js" as DB
 
 ListItem {

=== modified file 'shorts/qml/pages/TopicComponent.qml'
--- shorts/qml/pages/TopicComponent.qml	2015-10-10 11:24:04 +0000
+++ shorts/qml/pages/TopicComponent.qml	2015-10-24 11:39:00 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItems
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
 
 import "../utils/databasemodule_v2.js" as DB
 

=== modified file 'shorts/qml/pages/TopicManagement.qml'
--- shorts/qml/pages/TopicManagement.qml	2015-07-21 19:42:29 +0000
+++ shorts/qml/pages/TopicManagement.qml	2015-10-24 11:39:00 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Layouts 1.0
 
 import "../utils/databasemodule_v2.js" as DB

=== modified file 'shorts/qml/shorts-app.qml'
--- shorts/qml/shorts-app.qml	2015-10-10 11:24:04 +0000
+++ shorts/qml/shorts-app.qml	2015-10-24 11:39:00 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 import "./pages"
 import "./tabs"

=== modified file 'shorts/qml/tabs/BaseTab.qml'
--- shorts/qml/tabs/BaseTab.qml	2015-07-04 08:38:18 +0000
+++ shorts/qml/tabs/BaseTab.qml	2015-10-24 11:39:00 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 import "../components"
 import "../utils/databasemodule_v2.js" as DB

=== modified file 'shorts/qml/tabs/SavedTab.qml'
--- shorts/qml/tabs/SavedTab.qml	2015-07-04 08:38:18 +0000
+++ shorts/qml/tabs/SavedTab.qml	2015-10-24 11:39:00 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 import "../utils/databasemodule_v2.js" as DB
 

=== modified file 'shorts/qml/tabs/ShortsTab.qml'
--- shorts/qml/tabs/ShortsTab.qml	2015-07-04 08:38:18 +0000
+++ shorts/qml/tabs/ShortsTab.qml	2015-10-24 11:39:00 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 import "../utils/databasemodule_v2.js" as DB
 

=== modified file 'shorts/qml/tabs/TopicTab.qml'
--- shorts/qml/tabs/TopicTab.qml	2015-07-04 08:38:18 +0000
+++ shorts/qml/tabs/TopicTab.qml	2015-10-24 11:39:00 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 import "../utils/databasemodule_v2.js" as DB
 

=== modified file 'shorts/qml/utils/imgSeparator.js'
--- shorts/qml/utils/imgSeparator.js	2015-07-04 08:38:18 +0000
+++ shorts/qml/utils/imgSeparator.js	2015-10-24 11:39:00 +0000
@@ -1,31 +1,25 @@
-function separate(rss_content) {
-    var image_array = []
-
-
-    image_array = rss_content.split("<img")
-    // console.log("SPLIT");
-
-    image_array.shift() ;
-
-    for (var i=0; i<image_array.length; i++)
-    {
-        try {
-            image_array[i] = image_array[i].split('src=')[1].split(/"|"/)[1]
-            if (image_array[i].indexOf("//") === 0)
-                image_array[i] = "http:" + image_array[i]
-        }
-        catch(err) {
-            ; // do nothing
-        }
+.pragma library
+
+function separate(content) {
+    var result = []
+    var rx = /<img.*?src="(.*?)"/g
+
+    var e = rx.exec(content)
+    while (e) {
+        // Some simple checks here.
+        if (e[1].indexOf("http") === 0)
+            result.push(e[1])
+
+        e = rx.exec(content)
     }
 
-    return image_array
+    return result
 }
 
 function getFirstImage(content) {
     var imgArr = separate(content)
 
-    if (imgArr.length > 0)
+    if (imgArr.length)
         return imgArr[0]
 
     return null