From c84af60404f2efaa8155b00078b80fc2e97f16a6 Mon Sep 17 00:00:00 2001
From: MrMirDan <mirdan0@yandex.ru>
Date: Mon, 23 Sep 2024 12:01:58 +0300
Subject: [PATCH 1/3] added animation for 'continue' button on '+' page

---
 .gitignore                                           | 9 ++++++++-
 client/ui/qml/Pages2/PageSetupWizardConfigSource.qml | 7 ++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5b90fd55d..a4bfc6e06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@ deploy/build_64/*
 winbuild*.bat
 .cache/
 
+# Translations
+#translations
 
 # Qt-es
 /.qmake.cache
@@ -117,6 +119,9 @@ captures/
 *.iml
 .idea/
 
+# Visual Studio
+.vs/
+
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.
 #*.jks
@@ -133,4 +138,6 @@ client/3rd/ShadowSocks/ss_ios.xcconfig
 out/
 
 # CMake files
-CMakeFiles/
\ No newline at end of file
+CMakeFiles/
+CMakePresets.json
+CMakeUserPresets.json
\ No newline at end of file
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 7f7cf9e1f..c770c68f1 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -134,12 +134,17 @@ PageType {
                 id: continueButton
 
                 Layout.fillWidth: true
-                Layout.topMargin: 16
+                Layout.topMargin: visible ? 16 : -72
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
+                z: -1
 
                 visible: textKey.textFieldText !== ""
 
+                Behavior on Layout.topMargin {
+                    NumberAnimation { duration: 800 }
+                }
+
                 text: qsTr("Continue")
                 Keys.onTabPressed: lastItemTabClicked(focusItem)
 

From 5daa6c64b03529de9463de67488e6aaf30f1928b Mon Sep 17 00:00:00 2001
From: MrMirDan <mirdan0@yandex.ru>
Date: Mon, 23 Sep 2024 15:20:42 +0300
Subject: [PATCH 2/3] improved animation

---
 client/ui/qml/Pages2/PageSetupWizardConfigSource.qml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index c770c68f1..7d9b70875 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -134,13 +134,11 @@ PageType {
                 id: continueButton
 
                 Layout.fillWidth: true
-                Layout.topMargin: visible ? 16 : -72
+                Layout.topMargin: textKey.textFieldText !== "" ? 16 : -72
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
                 z: -1
 
-                visible: textKey.textFieldText !== ""
-
                 Behavior on Layout.topMargin {
                     NumberAnimation { duration: 800 }
                 }

From b43a689998beeb2e67c52aea529637c404da1e8d Mon Sep 17 00:00:00 2001
From: MrMirDan <mirdan0@yandex.ru>
Date: Mon, 23 Sep 2024 15:30:47 +0300
Subject: [PATCH 3/3] quicker animation (200ms)

---
 client/ui/qml/Pages2/PageSetupWizardConfigSource.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index 7d9b70875..21e90fb7c 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -140,7 +140,7 @@ PageType {
                 z: -1
 
                 Behavior on Layout.topMargin {
-                    NumberAnimation { duration: 800 }
+                    NumberAnimation { duration: 200 }
                 }
 
                 text: qsTr("Continue")