Merge lp:~roman2861/xda-developers-app/xda-developers-app into lp:xda-developers-app

[Roman Zonov]

Updated UI. Mostly for more usability.

[lp:~roman2861/xda-developers-app/xda-developers-app]

10. By Roman Zonov on 2013-11-30

No Tabs.

[Michael Hall (mhall119)]

Great improvements, thanks!

review: Approve

=== added file '.excludes'
=== added file 'Tabs.qml'
--- Tabs.qml	1970-01-01 00:00:00 +0000
+++ Tabs.qml	2013-11-30 19:34:24 +0000
@@ -0,0 +1,95 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "ui"
+
+Tabs {
+    id: tabs
+
+    Tab {
+        title: i18n.tr("XDA Forums")
+        Page {
+            anchors.fill: parent
+
+            /*
+              Stack for Category, Forum, Topic and Thread ListViews
+            */
+            PageStack {
+                anchors.fill: parent
+                id: navStack
+
+                // Start with the Category Page
+                Component.onCompleted: {
+                    navStack.push(categoryPage)
+                }
+
+                Page {
+                    id: categoryPage
+
+                    ForumList {
+                        id: categoryList
+                        anchors.fill: parent
+
+                        current_forum: 0
+                        onSelected_forumChanged: {
+                            if (selected_forum > 0) {
+                                forumsList.current_forum = selected_forum
+                                navStack.push(forumsPage)
+                            }
+                        }
+                    }
+                    Scrollbar {
+                        flickableItem: categoryList
+                        align: Qt.AlignTrailing
+                    }
+                }
+                Page {
+                    id: forumsPage
+                    ForumList {
+                        id: forumsList
+                        anchors.fill: parent
+
+                        onSelected_forumChanged: {
+                            if (selected_forum > 0) {
+                                topicList.current_forum = selected_forum
+                                navStack.push(topicPage)
+                            }
+                        }
+                    }
+                    Scrollbar {
+                        flickableItem: forumsList
+                        align: Qt.AlignTrailing
+                    }
+
+                }
+                Page {
+                    id: topicPage
+                    TopicList {
+                        id: topicList
+                        anchors.fill: parent
+
+                        onCurrent_topicChanged: {
+                            if (current_topic > 0) {
+                                threadList.current_topic = current_topic
+                                navStack.push(threadPage)
+                            }
+                        }
+                    }
+                    Scrollbar {
+                        flickableItem: topicList
+                        align: Qt.AlignTrailing
+                    }
+                }
+                Page {
+                    id: threadPage
+
+                    ThreadList {
+                        id: threadList
+                        anchors.fill: parent
+                    }
+                }
+            }
+
+        }
+
+    }
+}

=== added file 'graphics/xdaLogo.png'
Binary files graphics/xdaLogo.png	1970-01-01 00:00:00 +0000 and graphics/xdaLogo.png	2013-11-30 19:34:24 +0000 differ
=== added file 'manifest.json'
--- manifest.json	1970-01-01 00:00:00 +0000
+++ manifest.json	2013-11-30 19:34:24 +0000
@@ -0,0 +1,15 @@
+{
+    "architecture": "all",
+    "description": "description of xda-developers",
+    "framework": "ubuntu-sdk-13.10",
+    "hooks": {
+        "xda-developers": {
+            "apparmor": "xda-developers.json",
+            "desktop": "xda-developers.desktop"
+        }
+    },
+    "maintainer": "",
+    "name": "com.ubuntu.developer.username.xda-developers",
+    "title": "xda-developers",
+    "version": "0.1"
+}

=== modified file 'ui/ForumList.qml'
--- ui/ForumList.qml	2013-08-09 18:30:01 +0000
+++ ui/ForumList.qml	2013-11-30 19:34:24 +0000
@@ -18,6 +18,7 @@
         onTriggered: {
             selected_forum = -1
             selected_forum = model.id
+            loading.running=true;
         }
     }
 
@@ -39,9 +40,11 @@
         //Component.onCompleted: __loadForums()
         function __loadForums() {
             var xhr = new XMLHttpRequest;
+            categoryModel.xml="";
             xhr.open("POST", xda_api_source);
             xhr.onreadystatechange = function() {
                 if (xhr.readyState == XMLHttpRequest.DONE) {
+                    logo.visible=false; loadingapp.visible=false; loading.running=false; categoryPage.title="Forums"
                     categoryModel.xml = xhr.responseText;
                     //console.log('Data: '+ categoryModel.xml)
                 }

=== modified file 'ui/ThreadList.qml'
--- ui/ThreadList.qml	2013-08-10 04:43:36 +0000
+++ ui/ThreadList.qml	2013-11-30 19:34:24 +0000
@@ -36,9 +36,12 @@
         //Component.onCompleted: __loadForums()
         function __loadForums() {
             var xhr = new XMLHttpRequest;
+            threadModel.xml="";
             xhr.open("POST", xda_api_source);
             xhr.onreadystatechange = function() {
                 if (xhr.readyState == XMLHttpRequest.DONE) {
+                    loading.running=false;
+                    console.log();
                     threadModel.xml = xhr.responseText;
                     //console.log('Data: '+ threadModel.xml)
                 }

=== modified file 'ui/TopicList.qml'
--- ui/TopicList.qml	2013-08-10 04:42:43 +0000
+++ ui/TopicList.qml	2013-11-30 19:34:24 +0000
@@ -19,6 +19,7 @@
         onTriggered: {
             current_topic = -1
             current_topic = model.id
+            loading.running=true;
         }
     }
 
@@ -45,9 +46,11 @@
             }
 
             var xhr = new XMLHttpRequest;
+            topicModel.xml="";
             xhr.open("POST", xda_api_source);
             xhr.onreadystatechange = function() {
                 if (xhr.readyState == XMLHttpRequest.DONE) {
+                    loading.running=false;
                     topicModel.xml = xhr.responseText;
                     //console.log('Data: '+ topicModel.xml)
                 }

=== added file 'xda-developers.json'
--- xda-developers.json	1970-01-01 00:00:00 +0000
+++ xda-developers.json	2013-11-30 19:34:24 +0000
@@ -0,0 +1,6 @@
+{
+    "policy_groups": [
+        "networking"
+    ],
+    "policy_version": 1
+}

=== modified file 'xda-developers.qml'
--- xda-developers.qml	2013-08-10 04:44:01 +0000
+++ xda-developers.qml	2013-11-30 19:34:24 +0000
@@ -9,6 +9,7 @@
 */
 
 MainView {
+    id: mainview
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "mainView"
     
@@ -28,97 +29,97 @@
     backgroundColor: "#9a4c02"
     footerColor: "#d76c02"
 
-    Tabs {
-        id: tabs
-        
-        Tab {
-            title: i18n.tr("XDA Forums")
-
-            Page {
-                anchors.fill: parent
-
-                /*
-                  Stack for Category, Forum, Topic and Thread ListViews
-                */
-                PageStack {
-                    anchors.fill: parent
-                    id: navStack
-
-                    // Start with the Category Page
-                    Component.onCompleted: {
-                        navStack.push(categoryPage)
-                    }
-
-                    Page {
-                        id: categoryPage
-
-                        ForumList {
-                            id: categoryList
-                            anchors.fill: parent
-
-                            current_forum: 0
-                            onSelected_forumChanged: {
-                                if (selected_forum > 0) {
-                                    forumsList.current_forum = selected_forum
-                                    navStack.push(forumsPage)
-                                }
-                            }
-                        }
-                        Scrollbar {
-                            flickableItem: categoryList
-                            align: Qt.AlignTrailing
-                        }
-                    }
-                    Page {
-                        id: forumsPage
-                        ForumList {
-                            id: forumsList
-                            anchors.fill: parent
-
-                            onSelected_forumChanged: {
-                                if (selected_forum > 0) {
-                                    topicList.current_forum = selected_forum
-                                    navStack.push(topicPage)
-                                }
-                            }
-                        }
-                        Scrollbar {
-                            flickableItem: forumsList
-                            align: Qt.AlignTrailing
-                        }
-
-                    }
-                    Page {
-                        id: topicPage
-                        TopicList {
-                            id: topicList
-                            anchors.fill: parent
-
-                            onCurrent_topicChanged: {
-                                if (current_topic > 0) {
-                                    threadList.current_topic = current_topic
-                                    navStack.push(threadPage)
-                                }
-                            }
-                        }
-                        Scrollbar {
-                            flickableItem: topicList
-                            align: Qt.AlignTrailing
-                        }
-                    }
-                    Page {
-                        id: threadPage
-
-                        ThreadList {
-                            id: threadList
-                            anchors.fill: parent
-                        }
-                    }
-                }
-
-            }
-
-        }
-
+    Image {
+        id: logo
+        source: "graphics/xdaLogo.png"
+        width: if(mainview.width*0.90<=315) { mainview.width*0.90 } else {315}
+        anchors.centerIn: parent
+    }
+    ActivityIndicator {
+        id: loadingapp
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: units.gu(10)
+        running: true
+    }
+    ActivityIndicator {
+        id: loading
+        anchors.centerIn: parent
+    }
+    PageStack {
+        anchors.fill: parent
+        id: navStack
+
+        // Start with the Category Page
+        Component.onCompleted: {
+            navStack.push(categoryPage)
+        }
+
+        Page {
+            id: categoryPage
+            ForumList {
+                id: categoryList
+                anchors.fill: parent
+
+                current_forum: 0
+                onSelected_forumChanged: {
+                    if (selected_forum > 0) {
+                        forumsList.current_forum = selected_forum
+                        navStack.push(forumsPage)
+                    }
+                }
+            }
+            Scrollbar {
+                flickableItem: categoryList
+                align: Qt.AlignTrailing
+            }
+        }
+        Page {
+            id: forumsPage
+            title: "Forums"
+            ForumList {
+                id: forumsList
+                anchors.fill: parent
+
+                onSelected_forumChanged: {
+                    if (selected_forum > 0) {
+                        topicList.current_forum = selected_forum
+                        navStack.push(topicPage)
+                    }
+                }
+            }
+            Scrollbar {
+                flickableItem: forumsList
+                align: Qt.AlignTrailing
+            }
+
+        }
+        Page {
+            id: topicPage
+            title: "Topics"
+            TopicList {
+                id: topicList
+                anchors.fill: parent
+
+                onCurrent_topicChanged: {
+                    if (current_topic > 0) {
+                        threadList.current_topic = current_topic
+                        navStack.push(threadPage)
+                    }
+                }
+            }
+            Scrollbar {
+                flickableItem: topicList
+                align: Qt.AlignTrailing
+            }
+        }
+        Page {
+            id: threadPage
+            title: "Thread"
+            ThreadList {
+                id: threadList
+                anchors.fill: parent
+            }
+        }
     }
 }

=== added file 'xda-developers.qmlproject.user'
--- xda-developers.qmlproject.user	1970-01-01 00:00:00 +0000
+++ xda-developers.qmlproject.user	2013-11-30 19:34:24 +0000
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 2.8.1, 2013-11-30T20:54:31. -->
+<qtcreator>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QString" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap"/>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{4e54895a-368d-48e4-a4e0-70929598ba68}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">-1</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">0</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Scene</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration.QmlScene</value>
+    <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value>
+    <value type="QString" key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"></value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">true</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
+  <value type="QByteArray">{7f679a69-b53d-40b7-b80f-beaebabb3963}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">14</value>
+ </data>
+</qtcreator>