
* Up Gradle to 8.10 * Update Android dependencies * Up Qt to 6.7.2 * Up qtkeychain to 0.14.3 * Move function of changing the color of the navigation bar to the android side * Fix splashscreen and recent apps thumbnail backgrounds * Android authentication refactoring * Fix GitHub action * Fix the extra circle around the connect button on Android * Fix keyboard popup * Increase the amount of requestNetwork attempts on Android 11
158 lines
4.1 KiB
C++
158 lines
4.1 KiB
C++
#include "pageController.h"
|
|
#include "utils/converter.h"
|
|
#include "core/errorstrings.h"
|
|
|
|
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
|
|
#include <QGuiApplication>
|
|
#else
|
|
#include <QApplication>
|
|
#endif
|
|
|
|
#ifdef Q_OS_ANDROID
|
|
#include "platforms/android/android_controller.h"
|
|
#endif
|
|
#if defined Q_OS_MAC
|
|
#include "ui/macos_util.h"
|
|
#endif
|
|
|
|
PageController::PageController(const QSharedPointer<ServersModel> &serversModel,
|
|
const std::shared_ptr<Settings> &settings, QObject *parent)
|
|
: QObject(parent), m_serversModel(serversModel), m_settings(settings)
|
|
{
|
|
#ifdef Q_OS_ANDROID
|
|
auto initialPageNavigationBarColor = getInitialPageNavigationBarColor();
|
|
AndroidController::instance()->setNavigationBarColor(initialPageNavigationBarColor);
|
|
#endif
|
|
|
|
#if defined Q_OS_MACX
|
|
connect(this, &PageController::raiseMainWindow, []() { setDockIconVisible(true); });
|
|
connect(this, &PageController::hideMainWindow, []() { setDockIconVisible(false); });
|
|
#endif
|
|
|
|
connect(this, qOverload<ErrorCode>(&PageController::showErrorMessage), this, &PageController::onShowErrorMessage);
|
|
|
|
m_isTriggeredByConnectButton = false;
|
|
}
|
|
|
|
bool PageController::isStartPageVisible()
|
|
{
|
|
if (m_serversModel->getServersCount()) {
|
|
if (m_serversModel->getDefaultServerIndex() < 0) {
|
|
auto defaultServerIndex = m_serversModel->index(0);
|
|
m_serversModel->setData(defaultServerIndex, true, ServersModel::Roles::IsDefaultRole);
|
|
}
|
|
return false;
|
|
} else {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
QString PageController::getPagePath(PageLoader::PageEnum page)
|
|
{
|
|
QMetaEnum metaEnum = QMetaEnum::fromType<PageLoader::PageEnum>();
|
|
QString pageName = metaEnum.valueToKey(static_cast<int>(page));
|
|
return "qrc:/ui/qml/Pages2/" + pageName + ".qml";
|
|
}
|
|
|
|
void PageController::closeWindow()
|
|
{
|
|
#ifdef Q_OS_ANDROID
|
|
qApp->quit();
|
|
#else
|
|
if (m_serversModel->getServersCount() == 0) {
|
|
qApp->quit();
|
|
} else {
|
|
emit hideMainWindow();
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void PageController::hideWindow()
|
|
{
|
|
#ifdef Q_OS_ANDROID
|
|
AndroidController::instance()->minimizeApp();
|
|
#endif
|
|
}
|
|
|
|
void PageController::keyPressEvent(Qt::Key key)
|
|
{
|
|
switch (key) {
|
|
case Qt::Key_Back:
|
|
case Qt::Key_Escape: {
|
|
if (m_drawerDepth) {
|
|
emit closeTopDrawer();
|
|
setDrawerDepth(getDrawerDepth() - 1);
|
|
} else {
|
|
emit escapePressed();
|
|
}
|
|
break;
|
|
}
|
|
default: return;
|
|
}
|
|
}
|
|
|
|
unsigned int PageController::getInitialPageNavigationBarColor()
|
|
{
|
|
if (m_serversModel->getServersCount()) {
|
|
return 0xFF1C1D21;
|
|
} else {
|
|
return 0xFF0E0E11;
|
|
}
|
|
}
|
|
|
|
void PageController::updateNavigationBarColor(const int color)
|
|
{
|
|
#ifdef Q_OS_ANDROID
|
|
AndroidController::instance()->setNavigationBarColor(color);
|
|
#endif
|
|
}
|
|
|
|
void PageController::showOnStartup()
|
|
{
|
|
if (!m_settings->isStartMinimized()) {
|
|
emit raiseMainWindow();
|
|
} else {
|
|
#if defined(Q_OS_WIN) || defined(Q_OS_LINUX)
|
|
emit hideMainWindow();
|
|
#elif defined Q_OS_MACX
|
|
setDockIconVisible(false);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
bool PageController::isTriggeredByConnectButton()
|
|
{
|
|
return m_isTriggeredByConnectButton;
|
|
}
|
|
|
|
void PageController::setTriggeredByConnectButton(bool trigger)
|
|
{
|
|
m_isTriggeredByConnectButton = trigger;
|
|
}
|
|
|
|
void PageController::closeApplication()
|
|
{
|
|
qApp->quit();
|
|
}
|
|
|
|
void PageController::setDrawerDepth(const int depth)
|
|
{
|
|
if (depth >= 0) {
|
|
m_drawerDepth = depth;
|
|
}
|
|
}
|
|
|
|
int PageController::getDrawerDepth()
|
|
{
|
|
return m_drawerDepth;
|
|
}
|
|
|
|
void PageController::onShowErrorMessage(ErrorCode errorCode)
|
|
{
|
|
const auto fullErrorMessage = errorString(errorCode);
|
|
const auto errorMessage = fullErrorMessage.mid(fullErrorMessage.indexOf(". ") + 1); // remove ErrorCode %1.
|
|
const auto errorUrl = QStringLiteral("https://docs.amnezia.org/troubleshooting/error-codes/#error-%1-%2").arg(static_cast<int>(errorCode)).arg(utils::enumToString(errorCode).toLower());
|
|
const auto fullMessage = QStringLiteral("<a href=\"%1\" style=\"color: #FBB26A;\">ErrorCode: %2</a>. %3").arg(errorUrl).arg(static_cast<int>(errorCode)).arg(errorMessage);
|
|
|
|
emit showErrorMessage(fullMessage);
|
|
}
|