Improved animation and added config module

Iktwo · Aug 27, 2016 · cdc22ce · cdc22ce
1 parent 7e6b86b
commit cdc22ce
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 19 deletions.
diff --git a/src/qml/ApplicationGrid.qml b/src/qml/ApplicationGrid.qml
@@ -72,7 +72,7 @@ ScrollView {
             text: model.name
 
             onClicked: PackageManager.launchApplication(model.packageName)
-            // onPressAndHold: root.pressAndHold(model)
+            onPressAndHold: root.pressAndHold(model)
         }
 
         onHeightChanged: {

diff --git a/src/qml/ExpandableItem.qml b/src/qml/ExpandableItem.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.5
 import com.iktwo.qutelauncher 1.0
+import config 1.0 as Config
 
 Item {
     default property alias content: itemContainer.data
@@ -39,7 +40,7 @@ Item {
     Rectangle {
         id: rectangleMinizedIndicator
 
-        color: "#f5f5f5"
+        color: Config.Theme.colorGridContainer
 
         width: minimizedWidth
         height: minimizedHeight
@@ -92,14 +93,14 @@ Item {
                 to: "opened"
                 reversible: true
                 ParallelAnimation {
-                    PropertyAnimation { property: "y"; duration: 350; easing.type: Easing.InOutCubic }
+                    PropertyAnimation { property: "y"; duration: 275; easing.type: Easing.InOutCubic }
 
                     SequentialAnimation {
-                        PauseAnimation { duration: 250 }
+                        PauseAnimation { duration: 50 }
                         ParallelAnimation {
-                            PropertyAnimation { target: rectangleMinizedIndicator; properties: "height, width"; easing.type: Easing.InOutCubic }
-                            PropertyAnimation { target: rectangleMinizedIndicator; property: "radius"; easing.type: Easing.InOutCubic }
-                            PropertyAnimation { target: rectangleMinizedIndicator; property: "x"; easing.type: Easing.InOutCubic }
+                            PropertyAnimation { target: rectangleMinizedIndicator; properties: "height, width"; easing.type: Easing.InOutCubic; duration: 250 }
+                            PropertyAnimation { target: rectangleMinizedIndicator; property: "radius"; easing.type: Easing.InOutCubic; duration: 250 }
+                            PropertyAnimation { target: rectangleMinizedIndicator; property: "x"; easing.type: Easing.InOutCubic; duration: 250 }
                             SequentialAnimation {
                                 PauseAnimation { duration: 150 }
                                 PropertyAnimation { target: itemContainer; property: "opacity"; easing.type: Easing.InOutCubic}
@@ -114,7 +115,10 @@ Item {
     Item {
         id: itemContainer
 
-        anchors.centerIn: rectangleMinizedIndicator
+        anchors {
+            right: rectangleMinizedIndicator.right; rightMargin: -ScreenValues.dp
+            verticalCenter: rectangleMinizedIndicator.verticalCenter
+        }
 
         width: targetWidth
         height: targetHeight

diff --git a/src/qml/IntroView.qml b/src/qml/IntroView.qml
@@ -83,6 +83,8 @@ FocusScope {
 
         snapMode: ListView.SnapToItem
 
+        boundsBehavior: Flickable.StopAtBounds
+
         onContentXChanged: {
             if (previousX > contentX)
                 movingLeft = true
@@ -95,7 +97,7 @@ FocusScope {
         highlightRangeMode: ListView.StrictlyEnforceRange
 
         preferredHighlightBegin: 0
-        preferredHighlightEnd: width / 2
+        preferredHighlightEnd: width
 
         delegate: Rectangle {
             height: ListView.view.height

diff --git a/src/qml/config/Dimensions.qml b/src/qml/config/Dimensions.qml
@@ -0,0 +1,7 @@
+pragma Singleton
+import QtQuick 2.0
+import com.iktwo.qutelauncher 1.0 as QL
+
+Item {
+    property int navbarShadowBorderSize: 5 * QL.ScreenValues.dp
+}
diff --git a/src/qml/config/Theme.qml b/src/qml/config/Theme.qml
@@ -0,0 +1,6 @@
+pragma Singleton
+import QtQuick 2.0
+
+Item {
+    property color colorGridContainer: "#f5f5f5"
+}
diff --git a/src/qml/config/qmldir b/src/qml/config/qmldir
@@ -0,0 +1,2 @@
+singleton Dimensions 1.0 Dimensions.qml
+singleton Theme 1.0 Theme.qml
diff --git a/src/qml/main.qml b/src/qml/main.qml
@@ -2,6 +2,7 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Window 2.2
 import com.iktwo.qutelauncher 1.0
+import config 1.0 as Config
 
 ApplicationWindow {
     id: applicationWindow
@@ -106,10 +107,10 @@ ApplicationWindow {
         height: ScreenValues.statusBarHeight
 
         border {
-            left: 5 * ScreenValues.dp
-            top: 5 * ScreenValues.dp
-            right: 5 * ScreenValues.dp
-            bottom: 5 * ScreenValues.dp
+            left: Config.Dimensions.navbarShadowBorderSize
+            top: Config.Dimensions.navbarShadowBorderSize
+            right: Config.Dimensions.navbarShadowBorderSize
+            bottom: Config.Dimensions.navbarShadowBorderSize
         }
 
         source: "qrc:/images/shadow"
@@ -128,10 +129,10 @@ ApplicationWindow {
         source: ScreenValues.navBarVisible ? "qrc:/images/shadow_navigationbar" : ""
 
         border {
-            left: 5 * ScreenValues.dp
-            top: 5 * ScreenValues.dp
-            right: 5 * ScreenValues.dp
-            bottom: 5 * ScreenValues.dp
+            left: Config.Dimensions.navbarShadowBorderSize
+            top: Config.Dimensions.navbarShadowBorderSize
+            right: Config.Dimensions.navbarShadowBorderSize
+            bottom: Config.Dimensions.navbarShadowBorderSize
         }
     }
 
@@ -154,8 +155,9 @@ ApplicationWindow {
                 anchors.fill: parent
 
                 onPressAndHold: {
-                    applicationTile.source = "image://icon/" + model.packageName
-                    applicationTile.text = model.name
+                    /// TODO: implement this
+                    // applicationTile.source = "image://icon/" + model.packageName
+                    // applicationTile.text = model.name
 
                     explandableItem.close()
                 }

diff --git a/src/resources.qrc b/src/resources.qrc
@@ -5,6 +5,9 @@
         <file>qml/ExpandableItem.qml</file>
         <file>qml/ApplicationTile.qml</file>
         <file>qml/IntroView.qml</file>
+        <file>qml/config/qmldir</file>
+        <file>qml/config/Theme.qml</file>
+        <file>qml/config/Dimensions.qml</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="test">resources/images/test.png</file>

diff --git a/src/src.pro b/src/src.pro
@@ -16,6 +16,8 @@ android {
         android/AndroidManifest.xml
 }
 
+QML_IMPORT_PATH = $$PWD/qml
+
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
 HEADERS += $$files($$PWD/src/*.h)

diff --git a/src/src/main.cpp b/src/src/main.cpp
@@ -64,6 +64,7 @@ int main(int argc, char *argv[])
     qmlRegisterSingletonType<Launcher>("com.iktwo.qutelauncher", 1, 0, "Launcher", launcher_provider);
 
     engine.addImageProvider(QLatin1String("icon"), new IconImageProvider());
+    engine.addImportPath("qrc:/qml/qml");
 
     engine.load(QUrl("qrc:/qml/qml/main.qml"));
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		singleton Dimensions 1.0 Dimensions.qml
		singleton Theme 1.0 Theme.qml