Merge lp:~nik90/permy/update-permy-1.3 into lp:permy

[Nekhelesh Ramananthan]

- Updated to QtQuick 2.4 (UC 1.3 requires this)
- Updated to Ubuntu.Components 1.3
- Switched to the new ListItem{} instead of the deprecated ListItem.Subtitled{}.
- Switched to PageHeader{}
- Updated framework to ubuntu-sdk-15.04.3

Hi jdstrand, I figured I would bring Permy up to date with the latest SDK :). This MP does the following,

- Updated to QtQuick 2.4 (UC 1.3 requires this)
- Updated to Ubuntu.Components 1.3
- Switched to the new ListItem{} instead of the deprecated ListItem.Subtitled{}.
- Switched to PageHeader{}
- Updated framework to ubuntu-sdk-15.04.3

Once OTA-10 lands, the framework can be bumped again to ubuntu-sdk-15.04.4. I wasn't sure when you would release an update, so I stuck to .3.

Switching to UC 1.3 also means that we can switch to SuruDark theme since the subtitle text color bug has been fixed!

[Nekhelesh Ramananthan (nik90)]

Mandatory screenshots -> http://imgur.com/a/YiLVd

[Jamie Strandboge (jdstrand)]

Oh my, this got mis-filed-- sorry for the delay!

This looks great-- thank you for the MP! :)

review: Approve

=== modified file 'main.qml'
--- main.qml	2015-08-14 17:34:41 +0000
+++ main.qml	2016-03-24 01:25:18 +0000
@@ -1,32 +1,21 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "ui"
 
 MainView {
-    useDeprecatedToolbar: false
+    id: mainView
 
-    // objectName for functional testing purposes (autopilot-qt5)
     objectName: "mainView"
-    // Note! applicationName needs to match the "name" field of the click
-    // manifest
     applicationName: "com.ubuntu.developer.jdstrand.permy"
-    id: mainView
-
-    /*
-     This property enables the application to change orientation
-     when the device is rotated. The default is false.
-    */
-    automaticOrientation: true
 
     width: units.gu(40)
     height: units.gu(71)
 
-    // Don't use this until LP: #1372011 is fixed
-//    Component.onCompleted: Theme.name = 'Ubuntu.Components.Themes.SuruDark'
+    Component.onCompleted: Theme.name = 'Ubuntu.Components.Themes.SuruDark'
 
     PageStack {
         id: pageStack
+
         anchors.fill: parent
 
         Component.onCompleted: {
@@ -36,44 +25,50 @@
 
         Page {
             id: apps
-            title: "Applications"
-
-            state: "default"
-            states: [
-                PageHeadState {
-                    name: "default"
-                    head: apps.head
-
-                    actions: [
-                        Action {
-                            id: aboutAction
-                            text: "About"
-                            iconSource: "image://theme/help"
-                            onTriggered: {
-                                pageStack.push(Qt.resolvedUrl("./ui/AboutPage.qml"))
-                            }
-                        }
-                    ]
-                }
-            ]
+
+            header: PageHeader {
+                title: i18n.tr("Applications")
+                flickable: appsList
+                leadingActionBar {
+                    width: 0
+                    visible: false
+                }
+                trailingActionBar.actions: Action {
+                    id: aboutAction
+                    text: i18n.tr("About")
+                    iconName: "help"
+                    onTriggered: {
+                        pageStack.push(Qt.resolvedUrl("./ui/AboutPage.qml"))
+                    }
+                }
+            }
 
             ListView {
                 id: appsList
                 objectName: "appsList"
+
                 anchors.fill: parent
-                visible: true
+                model: appEntry.model
 
                 AppListModel {
                     id: appEntry
                     //folder: "file://./app/tests/data"
                     folder: "file:///var/lib/apparmor/clicks"
                 }
-                model: appEntry.model
-
-                delegate: ListItem.Subtitled {
-                    text: model.appname
-                    subText: 'Version: ' + model.version + '\nPackage: ' + model.pkgname
-                    progression: true
+
+                delegate: ListItem {
+                    id: appDelegate
+
+                    height: appDelegateLayout.height + divider.height
+
+                    ListItemLayout {
+                        id: appDelegateLayout
+                        title.text: model.appname
+                        subtitle.text: 'Version: ' + model.version
+                        summary.text: 'Package: ' + model.pkgname
+                        ProgressionSlot{}
+                    }
+
                     onClicked: {
                         permsList.appid = model.appid
                         permsList.profile = model.filename
@@ -86,7 +81,12 @@
 
         Page {
             id: permsView
-            title: "Permissions"
+
+            header: PageHeader {
+                title: i18n.tr("Permissions")
+                flickable: permsList
+            }
+
             visible: false
 
             ListView {
@@ -121,26 +121,35 @@
                     id: column
                     width: parent.width
 
-                    ListItem.Subtitled {
-                        text: "APP ID: "
-                        subText: appid
-                    }
-                    ListItem.Subtitled {
-                        text: "Policy vendor:"
-                        subText: policy_vendor
-                    }
-                    ListItem.Subtitled {
-                        text: "Policy version:"
-                        subText: policy_version
-                    }
-                    ListItem.Subtitled {
-                        text: "Policy template:"
-                        subText: template
-                    }
-                    ListItem.Subtitled {
-                        text: "Policy groups:"
-                        subText: policy_groups
-                        progression: (policy_groups !== "None")
+                    SubtitledListItem {
+                        title.text: "APP ID: "
+                        subtitle.text: appid
+                    }
+                    SubtitledListItem {
+                        title.text: "Policy vendor:"
+                        subtitle.text: policy_vendor
+                    }
+                    SubtitledListItem {
+                        title.text: "Policy version:"
+                        subtitle.text: policy_version
+                    }
+                    SubtitledListItem {
+                        title.text: "Policy template:"
+                        subtitle.text: template
+                    }
+                    ListItem {
+                        id: policyDelegate
+
+                        height: policyDelegateLayout.height + divider.height
+
+                        ListItemLayout {
+                            id: policyDelegateLayout
+                            title.text: "Policy groups:"
+                            subtitle.text: policy_groups
+                            subtitle.maximumLineCount: 3
+                            ProgressionSlot{}
+                        }
+
                         onClicked: {
                             policyGroupsList.vendor = policy_vendor
                             policyGroupsList.version = policy_version
@@ -150,17 +159,17 @@
                             pageStack.push(policyGroupsView)
                         }
                     }
-                    ListItem.Subtitled {
-                        text: "Additional abstractions:"
-                        subText: abstractions
-                    }
-                    ListItem.Subtitled {
-                        text: "Additional read paths:"
-                        subText: read_path
-                    }
-                    ListItem.Subtitled {
-                        text: "Additional write paths:"
-                        subText: write_path
+                    SubtitledListItem {
+                        title.text: "Additional abstractions:"
+                        subtitle.text: abstractions
+                    }
+                    SubtitledListItem {
+                        title.text: "Additional read paths:"
+                        subtitle.text: read_path
+                    }
+                    SubtitledListItem {
+                        title.text: "Additional write paths:"
+                        subtitle.text: write_path
                     }
                 }
             }
@@ -168,7 +177,12 @@
 
         Page {
             id: policyGroupsView
-            title: "Policy Groups"
+
+            header: PageHeader {
+                title: i18n.tr("Policy Groups")
+                flickable: policyGroupsList
+            }
+
             visible: false
 
             ListView {
@@ -209,9 +223,9 @@
                     id: column
                     width: parent.width
 
-                    ListItem.Subtitled {
-                        text: group + " (" + usage + ")"
-                        subText: description
+                    SubtitledListItem {
+                        title.text: group + " (" + usage + ")"
+                        summary.text: description
                     }
                 }
             }

=== modified file 'manifest.json'
--- manifest.json	2015-08-14 17:34:41 +0000
+++ manifest.json	2016-03-24 01:25:18 +0000
@@ -1,6 +1,7 @@
 {
+    "architecture": "all",
     "description": "Easily see app permissions with Permy",
-    "framework": "ubuntu-sdk-15.04",
+    "framework": "ubuntu-sdk-15.04.3-qml",
     "hooks": {
         "permy": {
             "apparmor": "permy.apparmor",

=== modified file 'ui/AboutPage.qml'
--- ui/AboutPage.qml	2015-08-14 17:34:41 +0000
+++ ui/AboutPage.qml	2016-03-24 01:25:18 +0000
@@ -1,13 +1,19 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Page {
-    title: "About"
     id: about
+
+    header: PageHeader {
+        title: i18n.tr("About")
+        flickable: flickable
+    }
+
     anchors.fill: parent
-    width: parent.width
 
     Flickable {
+        id: flickable
+
         anchors.fill: parent
         contentHeight: aboutColumn.height + units.gu(6)
 

=== modified file 'ui/AppListModel.qml'
--- ui/AppListModel.qml	2014-09-21 01:54:10 +0000
+++ ui/AppListModel.qml	2016-03-24 01:25:18 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.4
 import Qt.labs.folderlistmodel 2.1
 
 Item {

=== modified file 'ui/AppModel.qml'
--- ui/AppModel.qml	2014-09-21 04:49:50 +0000
+++ ui/AppModel.qml	2016-03-24 01:25:18 +0000
@@ -6,7 +6,7 @@
  * (http://opensource.org/licenses/mit-license.php)
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "jsonpath.js" as JSONPath
 
 Item {

=== modified file 'ui/PolicyGroupsModel.qml'
--- ui/PolicyGroupsModel.qml	2014-08-16 18:36:21 +0000
+++ ui/PolicyGroupsModel.qml	2016-03-24 01:25:18 +0000
@@ -6,7 +6,7 @@
  * (http://opensource.org/licenses/mit-license.php)
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "jsonpath.js" as JSONPath
 
 Item {

=== added file 'ui/SubtitledListItem.qml'
--- ui/SubtitledListItem.qml	1970-01-01 00:00:00 +0000
+++ ui/SubtitledListItem.qml	2016-03-24 01:25:18 +0000
@@ -0,0 +1,20 @@
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+ListItem {
+    id: listItem
+
+    property alias title: layout.title
+    property alias subtitle: layout.subtitle
+    property alias summary: layout.summary
+
+    height: layout.height + divider.height
+
+    ListItemLayout {
+        id: layout
+        subtitle.maximumLineCount: 2
+        summary.wrapMode: Text.WordWrap
+        summary.maximumLineCount: 5
+    }
+}
+