Merge lp:~nik90/reminders-app/basic-structure into lp:reminders-app

[Nekhelesh Ramananthan]

This commits added the following,
- A basic pagestack + tabs structure. This should help provide both flat and deep navigation styles as can be seen in the wireframe designs.
- Fixed manifest.json file to be more generic and list the reminder dev team instead of an individual dev name
- Fixed application name to "com.ubuntu.reminders-app" which is followed by other core apps
- Created notes, notebooks and reminders pages.

This MP adds the following,
- A basic pagestack + tabs structure. This should help provide both flat and deep navigation styles as can be seen in the wireframe designs.
- Fixed manifest.json file to be more generic and list the reminder dev team instead of an individual dev name
- Fixed application name to "com.ubuntu.reminders-app" which is followed by other core apps
- Created notes, notebooks and reminders pages.

[Jordan Keyes (jkeyes0)]

I think Notes.qml might be missing from your latest commit. Just tried to run this locally, and I see "Notes is not a type".

[lp:~nik90/reminders-app/basic-structure]

4. By Nekhelesh Ramananthan on 2013-11-20

Added missing Notes.qml

[Nekhelesh Ramananthan (nik90)]

Thanks Jordan. I missed it ;) Fixed in commit rev 4.

[David Planella (dpm)]

Thanks Nekhelesh!

Just a couple of minor things:

1) $ qmlscene reminders-app.qml
file:///tmp/basic-structure/reminders-app.qml:39 Notes is not a type

It seems that the Notes component is not in the tree, perhaps you forgot to commit it?

2) I also noticed that you're using the "ui" folder to put the components in. In that case, it might be worth removing the "components" folder if it's unused.

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

Hey David, thnx for the review.

1. I added the Notes.qml file which I forgot to commmit.

2. I was thinking of using the component folder for generic widgets that we will use in several places. While the UI folder is mostly for pages, tabs etc.

=== removed file 'components/HelloComponent.qml'
--- components/HelloComponent.qml	2013-10-23 11:02:37 +0000
+++ components/HelloComponent.qml	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-UbuntuShape {
-    width: 200
-    height: width
-
-    property alias text : myText.text
-
-    Label {
-        id: myText
-        anchors.centerIn: parent
-    }
-}

=== modified file 'manifest.json'
--- manifest.json	2013-10-23 11:02:37 +0000
+++ manifest.json	2013-11-20 21:20:40 +0000
@@ -7,8 +7,8 @@
             "desktop": "reminders-app.desktop"
         }
     },
-    "maintainer": "David Planella <[e-mail]>",
-    "name": "com.ubuntu.developer.dpm.reminders-app",
+    "maintainer": "Ubuntu Reminders app developers <[e-mail]>",
+    "name": "com.ubuntu.reminders-app",
     "title": "reminders-app",
     "version": "0.1"
 }

=== modified file 'reminders-app.qml'
--- reminders-app.qml	2013-10-23 11:02:37 +0000
+++ reminders-app.qml	2013-11-20 21:20:40 +0000
@@ -1,6 +1,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import "components"
+import "ui"
 
 /*!
     \brief MainView with a Label and Button elements.
@@ -11,7 +12,7 @@
     objectName: "mainView"
 
     // Note! applicationName needs to match the "name" field of the click manifest
-    applicationName: "com.ubuntu.developer.dpm.reminders-app"
+    applicationName: "com.ubuntu.reminders-app"
 
     /*
      This property enables the application to change orientation
@@ -19,34 +20,38 @@
     */
     //automaticOrientation: true
 
-    width: units.gu(100)
+    width: units.gu(50)
     height: units.gu(75)
 
-    Page {
-        title: i18n.tr("Reminders")
-
-        Column {
-            spacing: units.gu(1)
-            anchors {
-                margins: units.gu(2)
-                fill: parent
-            }
-
-            HelloComponent {
-                id: label
-                objectName: "label"
-
-                text: i18n.tr("Hello..")
-            }
-
-            Button {
-                objectName: "button"
-                width: parent.width
-
-                text: i18n.tr("Tap me!")
-
-                onClicked: {
-                    label.text = i18n.tr("..world!")
+    // Temporary background color. This can be changed to other suitable backgrounds when we get official mockup designs
+    backgroundColor: UbuntuColors.coolGrey
+
+    PageStack {
+        id: pagestack
+
+        Tabs {
+            id: rootTabs
+
+            anchors.fill: parent
+
+            Tab {
+                title: i18n.tr("Notes")
+                page: Notes {
+                    id: notesPage
+                }
+            }
+
+            Tab {
+                title: i18n.tr("Notebook")
+                page: Notebooks {
+                    id: notebooksPage
+                }
+            }
+
+            Tab {
+                title: i18n.tr("Reminders")
+                page: Reminders {
+                    id: remindersPage
                 }
             }
         }

=== added directory 'ui'
=== added file 'ui/Notebooks.qml'
--- ui/Notebooks.qml	1970-01-01 00:00:00 +0000
+++ ui/Notebooks.qml	2013-11-20 21:20:40 +0000
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Page {
+    id: notebooksPage
+
+    Label {
+        id: developmentWarning
+        anchors.centerIn: parent
+        text: i18n.tr("This page is still in development")
+    }
+}

=== added file 'ui/Notes.qml'
--- ui/Notes.qml	1970-01-01 00:00:00 +0000
+++ ui/Notes.qml	2013-11-20 21:20:40 +0000
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Page {
+    id: notesPage
+
+    Label {
+        id: developmentWarning
+        anchors.centerIn: parent
+        text: i18n.tr("This page is still in development")
+    }
+}

=== added file 'ui/Reminders.qml'
--- ui/Reminders.qml	1970-01-01 00:00:00 +0000
+++ ui/Reminders.qml	2013-11-20 21:20:40 +0000
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Page {
+    id: remindersPage
+
+    Label {
+        id: developmentWarning
+        anchors.centerIn: parent
+        text: i18n.tr("This page is still in development")
+    }
+}