AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed the transition animation between tabs in the main menu

Browse source 
- fixed Drawer freezing when importing files from outside the application
This commit is contained in:
vladimir.kuznetsov 2023-09-14 15:21:35 +05:00
parent d93b5a7b5c
commit 2b3383a163
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
client/amnezia_application.cpp
View file

@ -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));

4
client/ui/qml/Pages2/PageStart.qml
View file

@ -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: {