From 2b3383a1639b7f1d0c5e04e6b02818c858fb038b Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Thu, 14 Sep 2023 15:21:35 +0500
Subject: [PATCH] removed the transition animation between tabs in the main
 menu - fixed Drawer freezing when importing files from outside the
 application

---
 client/amnezia_application.cpp     | 27 +++++++++++++++------------
 client/ui/qml/Pages2/PageStart.qml |  4 ++--
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index de75db85..efdb9221 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -105,23 +105,26 @@ void AmneziaApplication::init()
         return;
     }
 
-    connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, m_importController.get(),
-            &ImportController::extractConfigFromData);
-    connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, m_pageController.get(),
-            &PageController::goToPageViewConfig);
+    connect(AndroidController::instance(), &AndroidController::importConfigFromOutside, [this](QString data) {
+        m_pageController->replaceStartPage();
+        m_importController->extractConfigFromData(data);
+        m_pageController->goToPageViewConfig();
+    });
 #endif
 
 #ifdef Q_OS_IOS
     IosController::Instance()->initialize();
-    connect(IosController::Instance(), &IosController::importConfigFromOutside, m_importController.get(),
-            &ImportController::extractConfigFromData);
-    connect(IosController::Instance(), &IosController::importConfigFromOutside, m_pageController.get(),
-            &PageController::goToPageViewConfig);
+    connect(IosController::Instance(), &IosController::importConfigFromOutside, [this](QString data) {
+        m_pageController->replaceStartPage();
+        m_importController->extractConfigFromData(data);
+        m_pageController->goToPageViewConfig();
+    });
 
-    connect(IosController::Instance(), &IosController::importBackupFromOutside, m_pageController.get(),
-            &PageController::goToPageSettingsBackup);
-    connect(IosController::Instance(), &IosController::importBackupFromOutside, m_settingsController.get(),
-            &SettingsController::importBackupFromOutside);
+    connect(IosController::Instance(), &IosController::importBackupFromOutside, [this](QString filePath) {
+        m_pageController->replaceStartPage();
+        m_pageController->goToPageSettingsBackup();
+        m_settingsController->importBackupFromOutside(filePath);
+    });
 #endif
 
     m_notificationHandler.reset(NotificationHandler::create(nullptr));
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 31474c12..7f9cb212 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -97,8 +97,8 @@ PageType {
 
         function goToTabBarPage(page) {
             var pagePath = PageController.getPagePath(page)
-            tabBarStackView.clear(StackView.PopTransition)
-            tabBarStackView.replace(pagePath, { "objectName" : pagePath })
+            tabBarStackView.clear(StackView.Immediate)
+            tabBarStackView.replace(pagePath, { "objectName" : pagePath }, StackView.Immediate)
         }
 
         Component.onCompleted: {