Merge pull request #642 from Subsurface-divelog/editStartsOnTop

Edit starts on top

CMakeLists.txt

@@ -262,9 +262,6 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
 		mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp
 		mobile-widgets/qml/kirigami/src/settings.cpp
 		mobile-widgets/qml/kirigami/src/enums.cpp
-		mobile-widgets/qml/kirigami/src/libkirigami/basictheme.cpp
-		mobile-widgets/qml/kirigami/src/libkirigami/kirigamipluginfactory.cpp
-		mobile-widgets/qml/kirigami/src/libkirigami/platformtheme.cpp
 		subsurface-mobile-main.cpp
 		subsurface-mobile-helper.cpp
 	)

mobile-widgets/qml/DiveDetails.qml

@@ -84,19 +84,29 @@ Kirigami.Page {
 		Transition {
 			from: "view"
 			to: "*"
-			SequentialAnimation {
+			ParallelAnimation {
+				SequentialAnimation {
+					NumberAnimation {
+						target: detailsEditFlickable
+						properties: "visible"
+						from: 0
+						to: 1
+						duration: 10
+					}
+					ScaleAnimator {
+						target: detailsEditFlickable
+						from: 0.3
+						to: 1
+						duration: 400
+						easing.type: Easing.InOutQuad
+					}
+				}
+
 				NumberAnimation {
 					target: detailsEditFlickable
-					properties: "visible"
+					property: "contentY"
-					from: 0
+					to: 0
-					to: 1
+					duration: 200
-					duration: 10
-				}
-				ScaleAnimator {
-					target: detailsEditFlickable
-					from: 0.3
-					to: 1
-					duration: 400
 					easing.type: Easing.InOutQuad
 				}
 			}

scripts/mobilecomponents.sh

@@ -33,7 +33,7 @@ if [ "$NOPULL" = "" ] ; then
 	git checkout master
 	git pull origin master
 	# if we want to pin a specific Kirigami version, we can do this here
-	# git checkout v2.2.0
+	git checkout 23ca2077027b214189ba72ca8dab1590a163c955
 	popd
 fi
 if [ ! -d breeze-icons ] ; then