mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/mobile-widgets/qmlmanager.h

315 lines
11 KiB
C
Raw Normal View History

Add SPDX header to mobile widgets and QML files Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-04-27 18:30:36 +00:00
// SPDX-License-Identifier: GPL-2.0
Add QMLManager class Add a QMLManager class. This class will be used as a link between the C++ and QML aspects of the mobile application. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-04 10:29:50 +00:00
#ifndef QMLMANAGER_H
#define QMLMANAGER_H
#include <QObject>
#include <QString>
QML-UI: re-architect the way we access network resources We really need to verify that the credentials are valid before trying to access our backend resources. Trying to do so in a clean manner caused quite a bit of changes to how we retrieve the webservice userid and how we load the dive list from cloud storage. So instead of accessing the network resources directly, this adds a handler function that first checks the validity of the credentials (by using the rederict handler on the cloud server), and only calls the function that does the actual work (looks up the web service userid, loads the dives) if that succeeds. Right now there is no good user feedback mechanism - this just gets logged on the log page. But this is a massive improvement if there are issues with network connectivity or if the user mistyped their credentials. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-05 03:34:59 +00:00
#include <QNetworkAccessManager>
QMLManager: helper function for devivePixelRatio This allows us to use the single manager object to keep track of the dpr of the screen and to pass it on if it changes (or when it first becomes known). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-09 03:31:05 +00:00
#include <QScreen>
QML UI: don't immediately save data after we make changes Much as this felt like the prudent thing to do, it makes the UI painful to use. In bad network conditions, with a large dive log, on a phone, the save operation can take more than a minute - which is just completely ludicrous. So instead we mark the dive list changed when we make changes and wait for the app to not be in the foreground. Once the OS tells us that we are hidden (on the desktop that generally means we don't have focus, on a mobile device it usually does mean that the app is not on the screen), we check if there are data to be saved and do so. There is of course a major problem with this logic. If the user switches away from Subsurface-mobile but comes back fairly quickly (just reacting to a notification or briefly checking something, changing a song, something... then the app may still be non-responsive for quite a while. So we need to do something about the time it takes us to save the git tree locally, and then figure out if we can move at least some of the network traffic to another thread. And we need to make sure the user immediately notices that the app is not crashed but is actually saving their data. But that's for another commit. tl;dr: CAREFUL, don't kill Subsurface-mobile before it had time to save your data or your changes may be gone. In typical use that shouldn't be an issue, but it is something that we need to tell the user about. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-04 00:37:17 +00:00
#include <QElapsedTimer>
QML UI: color the status bar on Android This code is based on code from Marco Martin from the Kirigami Android sample app. In order to simplify the QML code the QMLManager function is there for all OSs, but it's a no-op on anything but Android. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-23 14:31:44 +00:00
#include <QColor>
Cleanup: fold core/helpers.h into core/qthelper.h helpers.h included qthelper.h and all functions declared in helpers.h were defined in qthelper.h. Therefore fold the former into the latter, since the split seems completely arbitrary. While doing so, change the return-type of get_dc_nichname from "const QString" to "QString". Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-06-03 20:15:19 +00:00
#include <QFile>
mobile: save changes from main event loop When autosync to cloud was enabled, the old code would crash, because it synced to cloud from a signal handler, which executed the main loop when checking the cloud connection, which deleted the object which was causing the original signal. Or something like that. See discussion in #4119. To avoid such problems, send a signal via a 'QueuedConnection' from QMLManager to itself. The slot will be called once the signal handler terminates and the main event loop retakes control. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-03-30 20:55:22 +00:00
#include <QTimer>
Add QMLManager class Add a QMLManager class. This class will be used as a link between the C++ and QML aspects of the mobile application. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-04 10:29:50 +00:00
QML UI: move BT handling into core code This shouldn't be part of the UI (qmlmanager), but part of our overall handling of dive computers and BT devices. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-06 02:41:57 +00:00
#include "core/btdiscovery.h"
QML UI: do not crash on selecting dive computers For reasons unknown to me, the DCDeviceData instance was freed way too early, and used afterwards, obviously resulting in a SIGSEGV. This commit creates the DCDeviceData as a direct child of the QMLManager instance, ensuring it does not get freed prematurely. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-08 11:38:52 +00:00
#include "core/downloadfromdcthread.h"
mobile cleanup: unduplicate code and do not loop over dives (1) This is the first of a set of commits that are (very) similar. It appeared that a number of more or less static lists, which are constructed by a loop over all dives in the logbook, were executed when changing focus to a next dive. For example, the in this commit addressed list of used dive suits. What was wrong was that the suitList was linked to a dive. There is only a need to construct the list of used suits when data is changed (and obviously, once on startup of the app). Further, it appeared that a lot of code was duplicated and that we can use (in this case) the same code from the desktop completionmodels.cpp. Basically, this commit involves the following changes: - include completionmodels.cpp in mobile and desktop (so move it from the desktop only category to the generic category). - remove double code from DiveObjectHelper.cpp - Do not differentiate in the init phase and the normal refresh of the list - the per dive logic is now only the getting of a previously constructed list (in init or update of the divelist). There are no visible changes in the UI, other than a better performance when scrolling over dive details. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-28 08:52:51 +00:00
#include "qt-models/completionmodels.h"
mobile cleanup: restyle construction of locationlist See also e6e1473e6. The construction of the locationlist was not the same as the 3 previous lists, and it needs the inclusion of a new model file (divelocationmodel.cpp) in the mobile app. In addition, as the mobile app is mainly interested in a simple stringList (model) to populate a HintsText field (or maybe later a combobox), this stringlist is added to the model, to easy interfacing with QML. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-28 14:21:28 +00:00
#include "qt-models/divelocationmodel.h"
mobile-widgets: add oldStatus variable to qmlmanager oldStatus() is kept in qmlPrefs during the login process to allow for a couple of special cases: - if a user have added dives in NO_CLOUD mode and changes to use the cloud these dives are copied to the Cloud, instead of being lost. - if a user does a bailout from the login process (this should not happen anymore) the old status is restored. The pure solution would be to have oldStatus at the top level (e.g. a property in qml) and only change it when actually being in the login process, however due to way the qmlmanager is written it proved very difficult and not worth the effort. In order to be able to remove qmlPrefs, oldStatus are moved to qmlManager. This commit only contain the creation of the variable and the supporting code. Signed-off-by: Jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-29 11:29:05 +00:00
#include "core/settings/qPrefCloudStorage.h"
debug: try to capture changes that don't invalidate git cache At least in those cases where we are sending a divesChanged signal we can easily check if the cache was properly invalidated. Of course this won't help in cases where we don't notify the dive list about changes, either. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-02-18 01:16:11 +00:00
#include "core/subsurface-qt/divelistnotifier.h"
Location service: toggle the service from the main menu That way we don't track the user's location until explicitly asked to do so. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-11 20:34:56 +00:00
android/usb: parse the usbDevice when responding to intent This vastly simplifies our handling of devive information as we simply use what is already in the descriptor. This way we do not duplicate information about USB devices in the QMLManager. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-15 01:05:06 +00:00
#if defined(Q_OS_ANDROID)
#include "core/serial_usb_android.h"
mobile: send logfiles as attachments on iOS as well This was added for Android a while ago, but now this works on iOS as well which is a very welcome addition for the recipient of these support emails (i.e. me). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2022-08-29 23:46:58 +00:00
#elif defined(Q_OS_IOS)
#include "ios/ios-share.h"
android/usb: parse the usbDevice when responding to intent This vastly simplifies our handling of devive information as we simply use what is already in the descriptor. This way we do not duplicate information about USB devices in the QMLManager. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-15 01:05:06 +00:00
#endif
mobile/undo: create undo-action and connect to undo of dive deletion Still buggy: Removing a dive followed by undo shows the wrong dive in the list. But clicking on it gives the correct dive. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-11-14 21:19:58 +00:00
class QAction;
cleanup: remove struct/class confusion DiveSiteChange is defined as a struct, not as a class. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-10-26 17:56:45 +00:00
struct DiveSiteChange; // An obscure implementation artifact - remove in due course.
mobile/undo: create undo-action and connect to undo of dive deletion Still buggy: Removing a dive followed by undo shows the wrong dive in the list. But clicking on it gives the correct dive. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-11-14 21:19:58 +00:00
Revert the singleton PR It turns out that this isn't working the way it was intended to. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-09-27 23:26:54 +00:00
class QMLManager : public QObject {
Add QMLManager class Add a QMLManager class. This class will be used as a link between the C++ and QML aspects of the mobile application. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-04 10:29:50 +00:00
Q_OBJECT
Remove redundant QML getter functions QMLManager was full of redundant getter functions of the type bool QMLManager::locationServiceAvailable() const { return m_locationServiceAvailable; } These can be removed changing READ keywords to MEMBER keywords in the QPROPERTY declarations. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-01-17 20:15:43 +00:00
Q_PROPERTY(bool loadFromCloud MEMBER m_loadFromCloud WRITE setLoadFromCloud NOTIFY loadFromCloudChanged)
Q_PROPERTY(QString startPageText MEMBER m_startPageText WRITE setStartPageText NOTIFY startPageTextChanged)
Q_PROPERTY(bool verboseEnabled MEMBER m_verboseEnabled WRITE setVerboseEnabled NOTIFY verboseEnabledChanged)
Q_PROPERTY(QString notificationText MEMBER m_notificationText WRITE setNotificationText NOTIFY notificationTextChanged)
mobile cleanup: unduplicate code and do not loop over dives (1) This is the first of a set of commits that are (very) similar. It appeared that a number of more or less static lists, which are constructed by a loop over all dives in the logbook, were executed when changing focus to a next dive. For example, the in this commit addressed list of used dive suits. What was wrong was that the suitList was linked to a dive. There is only a need to construct the list of used suits when data is changed (and obviously, once on startup of the app). Further, it appeared that a lot of code was duplicated and that we can use (in this case) the same code from the desktop completionmodels.cpp. Basically, this commit involves the following changes: - include completionmodels.cpp in mobile and desktop (so move it from the desktop only category to the generic category). - remove double code from DiveObjectHelper.cpp - Do not differentiate in the init phase and the normal refresh of the list - the per dive logic is now only the getting of a previously constructed list (in init or update of the divelist). There are no visible changes in the UI, other than a better performance when scrolling over dive details. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-28 08:52:51 +00:00
Q_PROPERTY(QStringList suitList READ suitList NOTIFY suitListChanged)
mobile cleanup: unduplicate code and do not loop over dives (2) See e6e1473e6. Exact same commit but here for the list of buddies. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-28 09:26:45 +00:00
Q_PROPERTY(QStringList buddyList READ buddyList NOTIFY buddyListChanged)
core: replace dive master by dive guide In general, replace "dive master" by "dive guide". However, do not change written dive logs for now. On reading, accept both versions. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-02-12 13:03:18 +00:00
Q_PROPERTY(QStringList diveguideList READ diveguideList NOTIFY diveguideListChanged)
mobile cleanup: restyle construction of locationlist See also e6e1473e6. The construction of the locationlist was not the same as the 3 previous lists, and it needs the inclusion of a new model file (divelocationmodel.cpp) in the mobile app. In addition, as the mobile app is mainly interested in a simple stringList (model) to populate a HintsText field (or maybe later a combobox), this stringlist is added to the model, to easy interfacing with QML. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-28 14:21:28 +00:00
Q_PROPERTY(QStringList locationList READ locationList NOTIFY locationListChanged)
mobile: fix broken cylinder name tracking in dive edit Prior to this change, we had two different cylinder lists as models for drop down boxes - one that prepends the "no default cylinder" entry (which we need for setting up no default cylinder to be used in the app), and another one that only includes actual cylinders. The problem occured if a dive is created before the first time we edit an existing dive: in this case we are applying indices across the two models, but the indices are of course off by one; this results in actually picking the wrong cylinder. So each time we try to edit a dive, we end up with the previous cylinder in the list. This commit simplifies the code by having only one place where we create list of cylinder names (which is then used as the model for the combo box). It also uses more logical names for the two 'flavors' of this list to make it clear which one is supposed to be used (the regular list when editing or adding dives, the one with the "no default cylinder" entry prependet for the Settings page). Reported-by: Brian Fransen Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2021-09-01 21:35:48 +00:00
Q_PROPERTY(QStringList cylinderListInit READ cylinderListInit CONSTANT)
Q_PROPERTY(QStringList defaultCylinderListInit READ defaultCylinderListInit CONSTANT)
mobile: make list of local cloud cache directories available This way QML can show those to the user. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-06-06 16:51:40 +00:00
Q_PROPERTY(QStringList cloudCacheList READ cloudCacheList NOTIFY cloudCacheListChanged)
Remove redundant QML getter functions QMLManager was full of redundant getter functions of the type bool QMLManager::locationServiceAvailable() const { return m_locationServiceAvailable; } These can be removed changing READ keywords to MEMBER keywords in the QPROPERTY declarations. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-01-17 20:15:43 +00:00
Q_PROPERTY(QString progressMessage MEMBER m_progressMessage WRITE setProgressMessage NOTIFY progressMessageChanged)
Q_PROPERTY(bool btEnabled MEMBER m_btEnabled WRITE setBtEnabled NOTIFY btEnabledChanged)
QML UI: new property to tell the UI that we are accessing cloud storage This can then be used to give the user visual feedback (instead of them just thinking the app is hung). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-03 01:13:42 +00:00
mobile: add DCDeviceData properties to qmlmanager add DCDeviceData qml properties etc. to qmlmanager Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09 11:14:54 +00:00
Q_PROPERTY(QString DC_vendor READ DC_vendor WRITE DC_setVendor)
Q_PROPERTY(QString DC_product READ DC_product WRITE DC_setProduct)
Q_PROPERTY(QString DC_devName READ DC_devName WRITE DC_setDevName)
Q_PROPERTY(QString DC_devBluetoothName READ DC_devBluetoothName WRITE DC_setDevBluetoothName)
Q_PROPERTY(QString descriptor READ DC_descriptor)
Mobile: make sure QML gets notified when value changes This addresses the following warning when running the mobile app: INFO: QQmlExpression: Expression qrc:/qml/DownloadFromDiveComputer.qml:339:5 depends on non-NOTIFYable properties: INFO: QMLManager::DC_forceDownload Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-09-21 23:31:27 +00:00
Q_PROPERTY(bool DC_forceDownload READ DC_forceDownload WRITE DC_setForceDownload NOTIFY DC_ForceDownloadChanged)
mobile: add DCDeviceData properties to qmlmanager add DCDeviceData qml properties etc. to qmlmanager Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09 11:14:54 +00:00
Q_PROPERTY(bool DC_bluetoothMode READ DC_bluetoothMode WRITE DC_setBluetoothMode)
Q_PROPERTY(bool DC_saveDump READ DC_saveDump WRITE DC_setSaveDump)
QML UI: add property to pass detected device name to UI If the user plugs in a device on Android we get a device string that should allow us to figure out which dive computer was plugged in. Make that string available to the QML UI. Right now all we do is log it. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-08-06 13:24:51 +00:00
Q_PROPERTY(QString pluggedInDeviceName MEMBER m_pluggedInDeviceName NOTIFY pluggedInDeviceNameChanged)
Mobile: only show dive computers in the Bluetooth connection list And offer an option to show all devices in the settings. This is intentionally not stored in the preferences as this should never be needed. We don't support BT or BLE dive computers that we don't recognize. This is a last resort in case a new firmware were to change the name or some other weird issue causes us not to recognize a dive computer - and that should be fixed instead of worked around. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-14 06:48:50 +00:00
Q_PROPERTY(bool showNonDiveComputers MEMBER m_showNonDiveComputers WRITE setShowNonDiveComputers NOTIFY showNonDiveComputersChanged)
mobile-widgets: add oldStatus variable to qmlmanager oldStatus() is kept in qmlPrefs during the login process to allow for a couple of special cases: - if a user have added dives in NO_CLOUD mode and changes to use the cloud these dives are copied to the Cloud, instead of being lost. - if a user does a bailout from the login process (this should not happen anymore) the old status is restored. The pure solution would be to have oldStatus at the top level (e.g. a property in qml) and only change it when actually being in the login process, however due to way the qmlmanager is written it proved very difficult and not worth the effort. In order to be able to remove qmlPrefs, oldStatus are moved to qmlManager. This commit only contain the creation of the variable and the supporting code. Signed-off-by: Jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-29 11:29:05 +00:00
Q_PROPERTY(qPrefCloudStorage::cloud_status oldStatus MEMBER m_oldStatus WRITE setOldStatus NOTIFY oldStatusChanged)
mobile UI: make the text of the undo/redo action available to QML Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-01-11 23:26:13 +00:00
Q_PROPERTY(QString undoText READ getUndoText NOTIFY undoTextChanged) // this is a read-only property
Q_PROPERTY(QString redoText READ getRedoText NOTIFY redoTextChanged) // this is a read-only property
mobile/dive-list: add indicator that dive list is being processed This should deal with the rather confusing 'No dive in dive list' shown while loading and processing the dive list. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-29 19:53:01 +00:00
Q_PROPERTY(bool diveListProcessing MEMBER m_diveListProcessing WRITE setDiveListProcessing NOTIFY diveListProcessingChanged)
mobile: add indication if the app has finished initializing This will help us to ensure that notifications are actually shown on the UI during the startup phase. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-04-01 13:10:18 +00:00
Q_PROPERTY(bool initialized MEMBER m_initialized NOTIFY initializedChanged)
mobile: add status text for cloud sync state This allows the mobile UI to reflect the three states that the dive list can be in: - changes that haven't been written to local storage - there potentially are changes in local storage that were not synced with the cloud - dive list is in sync with cloud storage The last state could be misleading if the user access the cloud from a different device and makes changes to the cloud storage from there, but from the point of view of this device, the states are consistent. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-06-13 20:52:04 +00:00
Q_PROPERTY(QString syncState READ getSyncState NOTIFY syncStateChanged)
mobile: show incorrect cloud password state While the startup flow should make it obvious when a user is not correctly logged into the cloud, we still do see fairly frequent situations where a user has an incorrect password on a mobile device and is confused about why their data isn't syncing with their PC. Now this is clearly shown in the main menu. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2024-02-24 00:21:17 +00:00
Q_PROPERTY(QString passwordState READ getPasswordState NOTIFY passwordStateChanged)
Add QMLManager class Add a QMLManager class. This class will be used as a link between the C++ and QML aspects of the mobile application. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-04 10:29:50 +00:00
public:
QMLManager();
~QMLManager();
mobile-widgets: add export functionality to qmlmanager Add enum with different export types (used to signal which type of export QML desires). Add QML export functions (one for file and one for upload to web) Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-11-19 18:27:20 +00:00
enum export_types {
EX_DIVES_XML,
EX_DIVE_SITES_XML,
EX_DIVELOGS_DE,
mobile/export: remove most of the export options A tablet or phone is not a computer. What would you do with a CSV or TeX/LaTeX file on a phone. Yeah, I get it, feature parity. This should never have been merged. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-02-15 19:44:14 +00:00
EX_DIVESHARE
mobile-widgets: add export functionality to qmlmanager Add enum with different export types (used to signal which type of export QML desires). Add QML export functions (one for file and one for upload to web) Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-11-19 18:27:20 +00:00
};
Q_ENUM(export_types)
mobile/export: remove most of the export options A tablet or phone is not a computer. What would you do with a CSV or TeX/LaTeX file on a phone. Yeah, I get it, feature parity. This should never have been merged. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-02-15 19:44:14 +00:00
#if !defined(Q_OS_ANDROID)
mobile-widgets: add export functionality to qmlmanager Add enum with different export types (used to signal which type of export QML desires). Add QML export functions (one for file and one for upload to web) Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-11-19 18:27:20 +00:00
Q_INVOKABLE void exportToFile(export_types type, QString directory, bool anonymize);
mobile/export: remove most of the export options A tablet or phone is not a computer. What would you do with a CSV or TeX/LaTeX file on a phone. Yeah, I get it, feature parity. This should never have been merged. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-02-15 19:44:14 +00:00
#endif
mobile-widgets: add export functionality to qmlmanager Add enum with different export types (used to signal which type of export QML desires). Add QML export functions (one for file and one for upload to web) Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-11-19 18:27:20 +00:00
Q_INVOKABLE void exportToWEB(export_types type, QString userId, QString password, bool anonymize);
mobile: allow sharing files via email This will allow the user of the mobile app to export dive and dive site data from their mobile device without using the Subsurface cloud. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2022-08-30 18:53:02 +00:00
Q_INVOKABLE void shareViaEmail(export_types type, bool anonymize);
mobile-widgets: add export functionality to qmlmanager Add enum with different export types (used to signal which type of export QML desires). Add QML export functions (one for file and one for upload to web) Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-11-19 18:27:20 +00:00
mobile: add DCDeviceData properties to qmlmanager add DCDeviceData qml properties etc. to qmlmanager Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09 11:14:54 +00:00
QString DC_vendor() const;
void DC_setVendor(const QString& vendor);
QString DC_product() const;
void DC_setProduct(const QString& product);
QString DC_devName() const;
void DC_setDevName(const QString& devName);
Mobile: add helper function to fill in the BT name For some devices the BT device name is different from the product name. Make sure that name is available to the mobile UI. This helper fills it in from the scan data (based on the device address). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-12-21 22:52:02 +00:00
Q_INVOKABLE void retrieveBluetoothName();
mobile: add DCDeviceData properties to qmlmanager add DCDeviceData qml properties etc. to qmlmanager Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09 11:14:54 +00:00
QString DC_devBluetoothName() const;
void DC_setDevBluetoothName(const QString& devBluetoothName);
QString DC_descriptor() const;
bool DC_forceDownload() const;
void DC_setForceDownload(bool force);
bool DC_bluetoothMode() const;
void DC_setBluetoothMode(bool mode);
bool DC_saveDump() const;
void DC_setSaveDump(bool dumpMode);
mobile UI: make the text of the undo/redo action available to QML Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-01-11 23:26:13 +00:00
QString getUndoText() const;
QString getRedoText() const;
mobile: add DCDeviceData properties to qmlmanager add DCDeviceData qml properties etc. to qmlmanager Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09 11:14:54 +00:00
Q_INVOKABLE QStringList getProductListFromVendor(const QString& vendor);
Q_INVOKABLE int getMatchingAddress(const QString &vendor, const QString &product);
Q_INVOKABLE int getDetectedVendorIndex();
Q_INVOKABLE int getDetectedProductIndex(const QString &currentVendorText);
Mobile/remember DCs: try to match device names We only store the address part of the connection name, so don't try to find an exact match, try to find the sub-string. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-23 05:53:43 +00:00
Q_INVOKABLE int getConnectionIndex(const QString &deviceSubstr);
Mobile: factor out syncToCloud [3/3] After the previous commits, we now have a preference that nicely preserves the state of the UI, and we have the well known git_local_only global, that is used to denote whether we want to use to local repo only, or we want to interact with the online cloud as well. This commit gets rid of the now superfluous syncToCloud logic. Instead we simply set the git_local_only directly. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-10-09 08:23:24 +00:00
Q_INVOKABLE void setGitLocalOnly(const bool &value);
filter: introduce people- and tags-filtering in the mobile UI Add a combo-box where the user can switch between "fulltext", "people" and "tags" filtering. Connect the combobox to the already existing filter-code. Dirk: make combo-box smaller by using a smaller font and restricting the width. Setting both maximum and preferred widths gives more consistent results. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-02-19 20:39:23 +00:00
Q_INVOKABLE void setFilter(const QString filterText, int mode);
mobile/divelist: when clicking on a row, use select_single_dive() This is a small step in unifying mobile and desktop. I'm unsure whether it is correct to play this via the QMLManager or whether we should call form QML directly into the model? Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-06 13:14:00 +00:00
Q_INVOKABLE void selectRow(int row);
mobile/divelist: select dive after swipe After swiping through the dive list, select the currently visible dive. Thus, the dive is highlighted in the overview pane. The connection with the QMLManager feels atrocious, but I would prefer to have as little logic in QML as possible. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-12-21 19:41:06 +00:00
Q_INVOKABLE void selectSwipeRow(int row);
mobile: add helper to import data from local cloud cache If you pass in the repo name, it isn't treated as cloud storage, but simply as local git storage and imported (i.e., added) to the current dive list. This allows the user to work around failed no-cloud->cloud transitions, merge different accounts, and most importantly deal with situations were conflicts on the server caused us to move a cache out of the way and potentially make dives that were on the mobile device inaccessible to the user. Once a UI is added, this allows the user to recover those dives (realistically this is not really all that potentially 'dangerous' to do, but it's definitely something that would best be done after talking to someone who understands the cloud storage and can guide the user...). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-06-06 16:55:49 +00:00
Q_INVOKABLE void importCacheRepo(QString repo);
QML UI: add property to pass detected device name to UI If the user plugs in a device on Android we get a device string that should allow us to figure out which dive computer was plugged in. Make that string available to the QML UI. Right now all we do is log it. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-08-06 13:24:51 +00:00
Revert the singleton PR It turns out that this isn't working the way it was intended to. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-09-27 23:26:54 +00:00
static QMLManager *instance();
Mobile: pass QString as value to registerError() registerError() may be called from a different thread context. Passing the message as a const-reference may lead to a dangling reference. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-03-12 09:55:26 +00:00
Q_INVOKABLE void registerError(QString error);
Use error callback to log errors in QMLManager Instead of manually logging errors after each potentially error-producing function, use the error-callback. The error texts are accumulated in the QMLManager object for further use. The text is transported to the QMLManager object via a queued connection. Thus, errors can be reported from other threads without having to deal with manual locking. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-01-24 21:56:52 +00:00
QString consumeError();
QML-UI: replace the two ways to log progress with one The logging to the UI didn't work anymore since the message area had been removed in commit 8646934ba351 ("Simple DiveList as initial Page"). This way all the updates simply land on the Log page. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-03 23:59:40 +00:00
QML-UI: allow toggling verbose mode from the UI Hidden in the Developer menu. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20 02:41:10 +00:00
bool verboseEnabled() const;
void setVerboseEnabled(bool verboseMode);
QML-UI: refuse to save to cloud unless you loaded from cloud, first This prevents people from overwriting a perfectly fine repository with an empty one. Typically happens when you first enter your cloud credentials and then don't Load Dives right away. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-03 02:49:02 +00:00
void setLoadFromCloud(bool done);
Remember status of specific cloud account in settings What matters is that the cloud storage for a specific email address has successfully been synced - and we need to remember this across restarts of the app. This way Subsurface-mobile can work with different accounts, even if offline. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-02-08 19:08:49 +00:00
void syncLoadFromCloud();
QML-UI: refuse to save to cloud unless you loaded from cloud, first This prevents people from overwriting a perfectly fine repository with an empty one. Typically happens when you first enter your cloud credentials and then don't Load Dives right away. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-03 02:49:02 +00:00
QML UI: show better message about dive list at start Now the message should make more sense. First it tells you that it's looking for dives. Then you get some progress during the git download, and error messages if things failed. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-15 07:00:19 +00:00
QString startPageText() const;
Correct usage of QString on qmlmanager Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-26 15:02:42 +00:00
void setStartPageText(const QString& text);
QML UI: show better message about dive list at start Now the message should make more sense. First it tells you that it's looking for dives. Then you get some progress during the git download, and error messages if things failed. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-15 07:00:19 +00:00
QML UI: redesign the user notification The old system of cloud access updates with fake percentages just wasn't helpful. Even worse, it hid a lot important information from the user. This should be more useful (but it will require that we localize the messages sent from the git progress notifications and make them more 'user ready'). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-18 06:22:37 +00:00
QString notificationText() const;
void setNotificationText(QString text);
QML UI: new property to tell the UI that we are accessing cloud storage This can then be used to give the user visual feedback (instead of them just thinking the app is hung). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-03 01:13:42 +00:00
QML UI: add progress message variable To be shared between C/C++ and QML code in order to show the updates and potential error messages from libdivecomputer. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 22:07:16 +00:00
QString progressMessage() const;
void setProgressMessage(QString text);
mobile: enable switching BT on/off during session. This commit implements possible switching BT on and off during a session, so not needing a restart of the app when the user forgot to switch it on when starting the app. For this, the following needed to be done: 1) create a handler that reacts on local BT device status changes. 2) repopulate the connection list in the download screen when a BT status change is detected. Notice the subtile change of the Q_INVOKABLE btEnabled() function to a Q_PROPERTY. This gives a nice dynamic behaviour when switching BT on/off with the app open. Fixes: #556 Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-10-12 07:43:40 +00:00
bool btEnabled() const;
void setBtEnabled(bool value);
Mobile: only show dive computers in the Bluetooth connection list And offer an option to show all devices in the settings. This is intentionally not stored in the preferences as this should never be needed. We don't support BT or BLE dive computers that we don't recognize. This is a last resort in case a new firmware were to change the name or some other weird issue causes us not to recognize a dive computer - and that should be fixed instead of worked around. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-14 06:48:50 +00:00
void setShowNonDiveComputers(bool show);
cleanup: un-slotify QMLManager functions Some slots in QMLManager were not called from the outside, some only directly from C++-code. Make the former private and the latter public member functions. The idea here is to document which functions are actually called from the outside and which are called from QML or connected to signals. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-03-30 18:31:28 +00:00
qreal lastDevicePixelRatio();
void setDevicePixelRatio(qreal dpr, QScreen *screen);
Mobile: only show dive computers in the Bluetooth connection list And offer an option to show all devices in the settings. This is intentionally not stored in the preferences as this should never be needed. We don't support BT or BLE dive computers that we don't recognize. This is a last resort in case a new firmware were to change the name or some other weird issue causes us not to recognize a dive computer - and that should be fixed instead of worked around. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-14 06:48:50 +00:00
mobile/dive-list: add indicator that dive list is being processed This should deal with the rather confusing 'No dive in dive list' shown while loading and processing the dive list. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-29 19:53:01 +00:00
void setDiveListProcessing(bool value);
mobile cleanup: unduplicate code and do not loop over dives (1) This is the first of a set of commits that are (very) similar. It appeared that a number of more or less static lists, which are constructed by a loop over all dives in the logbook, were executed when changing focus to a next dive. For example, the in this commit addressed list of used dive suits. What was wrong was that the suitList was linked to a dive. There is only a need to construct the list of used suits when data is changed (and obviously, once on startup of the app). Further, it appeared that a lot of code was duplicated and that we can use (in this case) the same code from the desktop completionmodels.cpp. Basically, this commit involves the following changes: - include completionmodels.cpp in mobile and desktop (so move it from the desktop only category to the generic category). - remove double code from DiveObjectHelper.cpp - Do not differentiate in the init phase and the normal refresh of the list - the per dive logic is now only the getting of a previously constructed list (in init or update of the divelist). There are no visible changes in the UI, other than a better performance when scrolling over dive details. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-28 08:52:51 +00:00
QStringList suitList() const;
mobile cleanup: unduplicate code and do not loop over dives (2) See e6e1473e6. Exact same commit but here for the list of buddies. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-28 09:26:45 +00:00
QStringList buddyList() const;
core: replace dive master by dive guide In general, replace "dive master" by "dive guide". However, do not change written dive logs for now. On reading, accept both versions. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-02-12 13:03:18 +00:00
QStringList diveguideList() const;
mobile cleanup: restyle construction of locationlist See also e6e1473e6. The construction of the locationlist was not the same as the 3 previous lists, and it needs the inclusion of a new model file (divelocationmodel.cpp) in the mobile app. In addition, as the mobile app is mainly interested in a simple stringList (model) to populate a HintsText field (or maybe later a combobox), this stringlist is added to the model, to easy interfacing with QML. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-28 14:21:28 +00:00
QStringList locationList() const;
mobile: fix broken cylinder name tracking in dive edit Prior to this change, we had two different cylinder lists as models for drop down boxes - one that prepends the "no default cylinder" entry (which we need for setting up no default cylinder to be used in the app), and another one that only includes actual cylinders. The problem occured if a dive is created before the first time we edit an existing dive: in this case we are applying indices across the two models, but the indices are of course off by one; this results in actually picking the wrong cylinder. So each time we try to edit a dive, we end up with the previous cylinder in the list. This commit simplifies the code by having only one place where we create list of cylinder names (which is then used as the model for the combo box). It also uses more logical names for the two 'flavors' of this list to make it clear which one is supposed to be used (the regular list when editing or adding dives, the one with the "no default cylinder" entry prependet for the Settings page). Reported-by: Brian Fransen Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2021-09-01 21:35:48 +00:00
QStringList cylinderListInit() const;
QStringList defaultCylinderListInit() const;
mobile: make list of local cloud cache directories available This way QML can show those to the user. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-06-06 16:51:40 +00:00
QStringList cloudCacheList() const;
QML UI: color the status bar on Android This code is based on code from Marco Martin from the Kirigami Android sample app. In order to simplify the QML code the QMLManager function is there for all OSs, but it's a no-op on anything but Android. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-23 14:31:44 +00:00
Q_INVOKABLE void setStatusbarColor(QColor color);
mobile: enable switching BT on/off during session. This commit implements possible switching BT on and off during a session, so not needing a restart of the app when the user forgot to switch it on when starting the app. For this, the following needed to be done: 1) create a handler that reacts on local BT device status changes. 2) repopulate the connection list in the download screen when a BT status change is detected. Notice the subtile change of the Q_INVOKABLE btEnabled() function to a Q_PROPERTY. This gives a nice dynamic behaviour when switching BT on/off with the app open. Fixes: #556 Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-10-12 07:43:40 +00:00
void btHostModeChange(QBluetoothLocalDevice::HostMode state);
QML UI: make the QML window object part of the QMLManager class This way we can access it from that code (which we'll need to invoke methods in QML code from C++). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-10-20 15:53:36 +00:00
QObject *qmlWindow;
QML UI: make BT state available to QML Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-12 11:14:24 +00:00
iOS: log messages So far we only wrote messages to subsurface.log on Android (since we couldn't figure out how to make that file user accessible on iOS). Now that that's fixed, we also need to actually write to the file in the first place. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-13 23:53:51 +00:00
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
Android: write appLog to file The trick is to pick a path that is accessible from other applications. In theory QStandardPaths::GenericDataLocation should provide that. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-10 00:03:57 +00:00
void writeToAppLogFile(QString logText);
#endif
mobile-widgets: add oldStatus variable to qmlmanager oldStatus() is kept in qmlPrefs during the login process to allow for a couple of special cases: - if a user have added dives in NO_CLOUD mode and changes to use the cloud these dives are copied to the Cloud, instead of being lost. - if a user does a bailout from the login process (this should not happen anymore) the old status is restored. The pure solution would be to have oldStatus at the top level (e.g. a property in qml) and only change it when actually being in the login process, however due to way the qmlmanager is written it proved very difficult and not worth the effort. In order to be able to remove qmlPrefs, oldStatus are moved to qmlManager. This commit only contain the creation of the variable and the supporting code. Signed-off-by: Jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-29 11:29:05 +00:00
qPrefCloudStorage::cloud_status oldStatus() const;
void setOldStatus(const qPrefCloudStorage::cloud_status value);
mobile/cleanup: create helper function to hide verbose casts The strange enum casts (that apparently we needed in order to have strongly typed enums in QML) are really ugly and confusing in the code. Since we had this three times it seemed worth to create a little helper that hides this nonsense. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-04-04 21:23:39 +00:00
void rememberOldStatus();
QML UI: prepare to enter the cloud PIN on mobile UI This just creates the properties to connect QML and C++ code. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-06-13 23:41:26 +00:00
mobile: add status text for cloud sync state This allows the mobile UI to reflect the three states that the dive list can be in: - changes that haven't been written to local storage - there potentially are changes in local storage that were not synced with the cloud - dive list is in sync with cloud storage The last state could be misleading if the user access the cloud from a different device and makes changes to the cloud storage from there, but from the point of view of this device, the states are consistent. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-06-13 20:52:04 +00:00
QString getSyncState() const;
mobile: show incorrect cloud password state While the startup flow should make it obvious when a user is not correctly logged into the cloud, we still do see fairly frequent situations where a user has an incorrect password on a mobile device and is confused about why their data isn't syncing with their PC. Now this is clearly shown in the main menu. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2024-02-24 00:21:17 +00:00
QString getPasswordState() const;
mobile: add status text for cloud sync state This allows the mobile UI to reflect the three states that the dive list can be in: - changes that haven't been written to local storage - there potentially are changes in local storage that were not synced with the cloud - dive list is in sync with cloud storage The last state could be misleading if the user access the cloud from a different device and makes changes to the cloud storage from there, but from the point of view of this device, the states are consistent. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-06-13 20:52:04 +00:00
Add QMLManager class Add a QMLManager class. This class will be used as a link between the C++ and QML aspects of the mobile application. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-04 10:29:50 +00:00
public slots:
QML UI: add callback to run after app is fully initialized And then use that to check for pending Intents on Android. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-08-09 14:12:32 +00:00
void appInitialized();
QML UI: don't immediately save data after we make changes Much as this felt like the prudent thing to do, it makes the UI painful to use. In bad network conditions, with a large dive log, on a phone, the save operation can take more than a minute - which is just completely ludicrous. So instead we mark the dive list changed when we make changes and wait for the app to not be in the foreground. Once the OS tells us that we are hidden (on the desktop that generally means we don't have focus, on a mobile device it usually does mean that the app is not on the screen), we check if there are data to be saved and do so. There is of course a major problem with this logic. If the user switches away from Subsurface-mobile but comes back fairly quickly (just reacting to a notification or briefly checking something, changing a song, something... then the app may still be non-responsive for quite a while. So we need to do something about the time it takes us to save the git tree locally, and then figure out if we can move at least some of the network traffic to another thread. And we need to make sure the user immediately notices that the app is not crashed but is actually saving their data. But that's for another commit. tl;dr: CAREFUL, don't kill Subsurface-mobile before it had time to save your data or your changes may be gone. In typical use that shouldn't be an issue, but it is something that we need to tell the user about. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-04 00:37:17 +00:00
void applicationStateChanged(Qt::ApplicationState state);
mobile-widgets: make saveCredentials() an atom Add pin parameter to saveCredentials() thereby having all info about credentials in one function call. Add "" as pin in saveCredentials() - main.qml, when verifying credentials. replace verifyCredentials() with saveCredentials() in the register button on the pin page. Signed-off-by: Jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-27 12:56:33 +00:00
void saveCloudCredentials(const QString &email, const QString &password, const QString &pin);
Mobile: allow editing dive number No checks regarding duplicate numbers - we trust the user knows what they are doing. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-21 00:13:59 +00:00
void commitChanges(QString diveId, QString number, QString date, QString location, QString gps,
QML UI: Enable cylinder edit This adds the option to select a cylinder when adding or editing a dive. Due to limited screen size we restrict the editing to the first cylinder only. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-30 14:24:19 +00:00
QString duration, QString depth, QString airtemp,
QString watertemp, QString suit, QString buddy,
core: replace dive master by dive guide In general, replace "dive master" by "dive guide". However, do not change written dive logs for now. On reading, accept both versions. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-02-12 13:03:18 +00:00
QString diveGuide, QString tags, QString weight, QString notes, QStringList startpressure,
Mobile: fix saving new dive With the new setup we need to know which state we are coming from when we are saving cylinder related info. When we are adding a new dive we explicitly should save cylinder data to the first cylinder. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-29 13:42:56 +00:00
QStringList endpressure, QStringList gasmix, QStringList usedCylinder, int rating, int visibility, QString state);
mobile: add ability to update trip details This creates up to two undo events. This seems like such a small issue that it's not worth creating yet another undo command for this. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-02-22 22:05:13 +00:00
void updateTripDetails(QString tripIdString, QString tripLocation, QString tripNotes);
mobile UI: add ability to remove dive from its trip If we remove the newest dive from its trip, it becomes inaccessible in the app, but the dive data saved to disk appears to be correct. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-02-19 22:06:03 +00:00
void removeDiveFromTrip(int id);
mobile/dive-list: add ability to create trip This adds a context menu entry for top level dives that allows the user to create a trip for that dive. Unfortunately this creates a new string to translate right before a release... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-26 19:12:38 +00:00
void addTripForDive(int id);
mobile/trip-handling: add helper to add dive to a trip This again uses an undo command and should be completely symmetrical to removing a dive from a trip. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-02-20 21:24:38 +00:00
void addDiveToTrip(int id, int tripId);
mobile/UI: show notification with changes made after save Since we save after every operation in the mobile app, this allows us to tell the user what we actually saved - and we can remind the user that they can undo/redo the last operation. The code gets more complicated because in the case that the operation that triggered this change was an undo, we need to show the redo text to describe what we are saving, and must point the user to the redo operation. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2021-01-17 21:09:01 +00:00
void changesNeedSaving(bool fromUndo = false);
mobile: No cloud repo creation more explicit Before this change, there was only one way to create the local no cloud repo on the device. The user needed to add at least one dive to the no cloud account (so that there is something to save). While this worked in some scenarios, it could also get things in an inconsistent state: credential status = CS_NOCLOUD but no local repo. This was a dead end. In this commit, the creation of the no cloud repo is made more explicit. When asking for no cloud mode, just create an (empty) repo for it when it does not yet exist, and otherwise, just open the existing (possibly empty) repo. Now, a user can have no cloud repo, next to (any number of) cloud accounts. This leaves one functional aspect left: how does a user abandon the no cloud repo, by merging his data into a true cloud account. This is code for this, that tries to do this merge in a smart way. This seems to be broken (too). To be clear: this is no part of this commit. Fixes: #667 Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-10-17 07:51:00 +00:00
void openNoCloudRepo();
mobile: pull undo/redo notification text up When changes need saving, the notification text was set quite deep in the calltree in "saveChangesLocal()". I don't know why this was put so deep in the call tree. In any case, it prevents asynchronous saving of the data. Therefore, pull it up to chnagesNeedSaving(). Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-03-30 20:39:08 +00:00
void saveChangesCloud(bool forceRemoteSync);
Mobile: add helper function to keep selection in sync Without this the core data structure never gets updated to reflect which dive is currently selected. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-08 03:37:31 +00:00
void selectDive(int id);
Add helper to delete dive from QML Once again we make this save the changes to the local cache without being prompted. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-02-23 12:39:40 +00:00
void deleteDive(int id);
mobile: add ability to delete cloud account Apple store rules require this. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2022-08-08 00:11:05 +00:00
void deleteAccount();
mobile/divelist: add UI to toggle dive invalid flag This reuses the corresponding undo command. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-20 22:59:38 +00:00
void toggleDiveInvalid(int id);
Support for copy-pasting specific fields on mobile Initial implementation/prototype of copy-paste support for Subsurface-mobile. The UI part is really lacking; right now the copy button is initially visible and paste is achieved by long press on a dive and clicking the paste button when it appears. Delete is currently not possible at all, as I just failed to layout the buttons properly using QML. It just sounds so simple, to put all the copy-paste-delete buttons next to each other... The data to be copied is currently hard-coded. A dialog to choose inteded fields would be nice, but it'll take quite a bit effort to get used to QML enough to be able to hack something together. Anyway, this seems to work, even though the UI is not always reflecting the paste without switching dives (when testing on laptop). Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-10-27 07:21:40 +00:00
void copyDiveData(int id);
void pasteDiveData(int id);
Mobile: UI for selecting what to copy-paste Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-11-18 05:42:15 +00:00
bool toggleDiveSite(bool toggle);
bool toggleNotes(bool toggle);
core: replace dive master by dive guide In general, replace "dive master" by "dive guide". However, do not change written dive logs for now. On reading, accept both versions. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-02-12 13:03:18 +00:00
bool toggleDiveGuide(bool toggle);
Mobile: UI for selecting what to copy-paste Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-11-18 05:42:15 +00:00
bool toggleBuddy(bool toggle);
bool toggleSuit(bool toggle);
bool toggleRating(bool toggle);
bool toggleVisibility(bool toggle);
bool toggleTags(bool toggle);
bool toggleCylinders(bool toggle);
bool toggleWeights(bool toggle);
mobile: replace undoDelete() with generic undo() Since we are using the existing command infrastructure, this isn't specific to undoing a delete. This commit renames the function and removes its use in the UI, the next commit will then add the generic undo to the UI. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-01-11 23:29:45 +00:00
void undo();
mobile UI: make the text of the undo/redo action available to QML Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-01-11 23:26:13 +00:00
void redo();
mobile UI: use undo-command for adding dive. Instead of using the model, copy the code we have in the desktop version which manually creates a 15m/40min dive and passes that to the addDive undo command. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-01-01 22:45:52 +00:00
int addDive();
QML UI: Allow cancel of ongoing download This commit adds the capability to cancel a running download from DC. The actual cancel is fully handled in the underlying libdivecomputer code. As the user may be interested in the dives downloaded up to the moment of cancel, do not just close the download screen (as it was before this commit). Now, the <quit> button changes to <cancel> when the download is started, and pressing cancel, only cancels the download and does not close the download screen, but presents the so far downloaded data. When no download is running, the <quit> button just quits the screen as before. Fixes: #485 Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-07-19 07:16:47 +00:00
void cancelDownloadDC();
Mobile: add ability to directly open support email This is even easier and more obvious than copying the logs on the About page and then manually creating an email and pasting those logs. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-11-09 18:14:15 +00:00
QString getCombinedLogs();
mobile: add "Copy log to clipboard" button on iOS it is practically impossible to copy the App log to e.g. a mail! in iOS 11 the log file is stored within the subsurface container and you first need to copy (actually using the clipboard) out from there to the "normal" document shared space, before it can be used. At least iOS users (and I believe Android users) are not really used to work with files, so the process is not easy to document in an understandable way. The alternative is to provide a button, which simply puts the log on the general clipboard, allowing it to be pasted in a multitud of applications. Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-16 14:50:17 +00:00
void copyAppLogToClipboard();
Mobile: add ability to directly open support email This is even easier and more obvious than copying the logs on the About page and then manually creating an email and pasting those logs. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-11-09 18:14:15 +00:00
bool createSupportEmail();
QML-UI: re-architect the way we access network resources We really need to verify that the credentials are valid before trying to access our backend resources. Trying to do so in a clean manner caused quite a bit of changes to how we retrieve the webservice userid and how we load the dive list from cloud storage. So instead of accessing the network resources directly, this adds a handler function that first checks the validity of the credentials (by using the rederict handler on the cloud server), and only calls the function that does the actual work (looks up the web service userid, loads the dives) if that succeeds. Right now there is no good user feedback mechanism - this just gets logged on the log page. But this is a massive improvement if there are issues with network connectivity or if the user mistyped their credentials. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-05 03:34:59 +00:00
void finishSetup();
Correct usage of QString on qmlmanager Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-26 15:02:42 +00:00
QString getNumber(const QString& diveId);
QString getDate(const QString& diveId);
mobile: get GPS data from dive site name When the user entered a dive site using autocompletion, it is a known site, of which we might have a GPS location already. Just fill the known site coordinates. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-11-22 18:22:02 +00:00
QString getGpsFromSiteName(const QString& siteName);
Support function to print version string Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-02-10 20:53:58 +00:00
QString getVersion() const;
QML UI: refresh divelist after GPS data was successfully applied And create a helper to do so to make the code simpler. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-11 03:34:21 +00:00
void refreshDiveList();
QMLManager: helper function for devivePixelRatio This allows us to use the single manager object to keep track of the dpr of the screen and to pass it on if it changes (or when it first becomes known). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-09 03:31:05 +00:00
void screenChanged(QScreen *screen);
QML UI: allow writing to App log from QML Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-27 04:31:41 +00:00
void appendTextToLog(const QString &newText);
QML UI: quit on back key while showing dive list Make sure you save first, though. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-15 21:42:08 +00:00
void quit();
Add button to rescan BT devices Otherwise the divecomputer has to be in pairing mode at app start time. Unfortunately, this leaves less space for the progress message. My time/qml knowledge does not suffice to move that to the next line (when moving that out of the RowLayout it overlaps with the buttons). Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-12-05 19:58:54 +00:00
void btRescan();
mobile UI: rescan button on DC Download page rescans BT/BLE/USB This way even if a USB device wasn't added through an Android intent, we still have a way to scan for it and select it. This is especially important in case a user has a cable that we haven't seen yet (i.e. with a VID/PID that we haven't added to Subsurface-mobile), but that nevertheless works with the android usb serial drivers. This also makes the flow a little more logical / consistent when deciding which connections to show. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-15 01:52:45 +00:00
void usbRescan();
void rescanConnections();
android/usb: parse the usbDevice when responding to intent This vastly simplifies our handling of devive information as we simply use what is already in the descriptor. This way we do not duplicate information about USB devices in the QMLManager. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-15 01:05:06 +00:00
#if defined(Q_OS_ANDROID)
void showDownloadPage(QAndroidJniObject usbDevice);
android/usb: simply restart the download after receiving permission If the user tries to download from a device that he hasn't given the app permission to read from, Android will pop up a dialogue asking for that permission. With this after giving the permission we continue (well, technically, restart) the download which is likely the expected behavior. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-15 19:27:10 +00:00
void restartDownload(QAndroidJniObject usbDevice);
mobile UI: rescan button on DC Download page rescans BT/BLE/USB This way even if a USB device wasn't added through an Android intent, we still have a way to scan for it and select it. This is especially important in case a user has a cable that we haven't seen yet (i.e. with a VID/PID that we haven't added to Subsurface-mobile), but that nevertheless works with the android usb serial drivers. This also makes the flow a little more logical / consistent when deciding which connections to show. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-15 01:52:45 +00:00
void androidUsbPopoulateConnections();
android/usb: pass in the UsbDevice when downloading This finally allows us to download from not just the first device, but specifically the device that the user picks. Passing the object through a void pointer is not nice - but since this traverses C code other solutions (like passing an index into the list) seemed even worse. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-15 01:11:46 +00:00
QString getProductVendorConnectionIdx(android_usb_serial_device_descriptor descriptor);
android/usb: parse the usbDevice when responding to intent This vastly simplifies our handling of devive information as we simply use what is already in the descriptor. This way we do not duplicate information about USB devices in the QMLManager. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-15 01:05:06 +00:00
#endif
debug: try to capture changes that don't invalidate git cache At least in those cases where we are sending a divesChanged signal we can easily check if the cache was properly invalidated. Of course this won't help in cases where we don't notify the dive list about changes, either. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-02-18 01:16:11 +00:00
void divesChanged(const QVector<dive *> &dives, DiveField field);
Location service: toggle the service from the main menu That way we don't track the user's location until explicitly asked to do so. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-11 20:34:56 +00:00
Add QMLManager class Add a QMLManager class. This class will be used as a link between the C++ and QML aspects of the mobile application. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-04 10:29:50 +00:00
private:
mobile cleanup: unduplicate code and do not loop over dives (1) This is the first of a set of commits that are (very) similar. It appeared that a number of more or less static lists, which are constructed by a loop over all dives in the logbook, were executed when changing focus to a next dive. For example, the in this commit addressed list of used dive suits. What was wrong was that the suitList was linked to a dive. There is only a need to construct the list of used suits when data is changed (and obviously, once on startup of the app). Further, it appeared that a lot of code was duplicated and that we can use (in this case) the same code from the desktop completionmodels.cpp. Basically, this commit involves the following changes: - include completionmodels.cpp in mobile and desktop (so move it from the desktop only category to the generic category). - remove double code from DiveObjectHelper.cpp - Do not differentiate in the init phase and the normal refresh of the list - the per dive logic is now only the getting of a previously constructed list (in init or update of the divelist). There are no visible changes in the UI, other than a better performance when scrolling over dive details. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-28 08:52:51 +00:00
BuddyCompletionModel buddyModel;
SuitCompletionModel suitModel;
core: replace dive master by dive guide In general, replace "dive master" by "dive guide". However, do not change written dive logs for now. On reading, accept both versions. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-02-12 13:03:18 +00:00
DiveGuideCompletionModel diveguideModel;
Dive site: introduce proxy model DiveSiteSortedModel The LocationInformationModel used to sort its entries and was completely rebuilt after every change. This makes it rather complex to support incremental changes. Instead, keep LocationInformationModel sorted by UUID so that indexes are consistent with indices in the core dive site table. Implement sorting by other columns than name and enable sorting in the dive site view. Finally, don't cache the list of dive site names for the mobile app, since that would also need some rather convoluted methods of keeping the list up to date. Calculate it on the fly. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-03-12 16:28:43 +00:00
DiveSiteSortedModel locationModel;
QML UI: show better message about dive list at start Now the message should make more sense. First it tells you that it's looking for dives. Then you get some progress during the git download, and error messages if things failed. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-15 07:00:19 +00:00
QString m_startPageText;
Use error callback to log errors in QMLManager Instead of manually logging errors after each potentially error-producing function, use the error-callback. The error texts are accumulated in the QMLManager object for further use. The text is transported to the QMLManager object via a queued connection. Thus, errors can be reported from other threads without having to deal with manual locking. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-01-24 21:56:52 +00:00
QString m_lastError;
QML-UI: allow toggling verbose mode from the UI Hidden in the Developer menu. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20 02:41:10 +00:00
bool m_verboseEnabled;
mobile/dive-list: add indicator that dive list is being processed This should deal with the rather confusing 'No dive in dive list' shown while loading and processing the dive list. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-29 19:53:01 +00:00
bool m_diveListProcessing;
mobile: add indication if the app has finished initializing This will help us to ensure that notifications are actually shown on the UI during the startup phase. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-04-01 13:10:18 +00:00
bool m_initialized;
QML-UI: refuse to save to cloud unless you loaded from cloud, first This prevents people from overwriting a perfectly fine repository with an empty one. Typically happens when you first enter your cloud credentials and then don't Load Dives right away. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-03 02:49:02 +00:00
bool m_loadFromCloud;
Revert the singleton PR It turns out that this isn't working the way it was intended to. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-09-27 23:26:54 +00:00
static QMLManager *m_instance;
QML UI: redesign the user notification The old system of cloud access updates with fake percentages just wasn't helpful. Even worse, it hid a lot important information from the user. This should be more useful (but it will require that we localize the messages sent from the git progress notifications and make them more 'user ready'). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-18 06:22:37 +00:00
QString m_notificationText;
QMLManager: helper function for devivePixelRatio This allows us to use the single manager object to keep track of the dpr of the screen and to pass it on if it changes (or when it first becomes known). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-09 03:31:05 +00:00
qreal m_lastDevicePixelRatio;
QML UI: don't immediately save data after we make changes Much as this felt like the prudent thing to do, it makes the UI painful to use. In bad network conditions, with a large dive log, on a phone, the save operation can take more than a minute - which is just completely ludicrous. So instead we mark the dive list changed when we make changes and wait for the app to not be in the foreground. Once the OS tells us that we are hidden (on the desktop that generally means we don't have focus, on a mobile device it usually does mean that the app is not on the screen), we check if there are data to be saved and do so. There is of course a major problem with this logic. If the user switches away from Subsurface-mobile but comes back fairly quickly (just reacting to a notification or briefly checking something, changing a song, something... then the app may still be non-responsive for quite a while. So we need to do something about the time it takes us to save the git tree locally, and then figure out if we can move at least some of the network traffic to another thread. And we need to make sure the user immediately notices that the app is not crashed but is actually saving their data. But that's for another commit. tl;dr: CAREFUL, don't kill Subsurface-mobile before it had time to save your data or your changes may be gone. In typical use that shouldn't be an issue, but it is something that we need to tell the user about. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-04 00:37:17 +00:00
QElapsedTimer timer;
mobile: remove DiveObjectHelper code When editing a dive, a DiveObjectHelper of the unmodified dive was created to compare the edited with the old values. Since the DiveObjectHelper is used here only as a pointless wrapper around the formatting functions, call these functions directly. However, note that the code is in principle wrong since the change to the mobile-models, which do not use the DiveObjectHelper. The real fix would be to reload the data from the model to prevent going out-of-sync with respect to the formatting routines! Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-12-15 15:10:08 +00:00
bool checkDate(struct dive *d, QString date);
bool checkLocation(DiveSiteChange &change, struct dive *d, QString location, QString gps);
bool checkDuration(struct dive *d, QString duration);
bool checkDepth(struct dive *d, QString depth);
QML UI: when first entering cloud credentials, force cloud connection With offline the default now, we need to force a connection at least once so that the repos are in sync. And then of course we need to return to the correct state, regardless on whether this connection succeeded or failed. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-30 18:08:33 +00:00
bool currentGitLocalOnly;
mobile: track if we have changes that aren't synced to cloud If we haven't connected at all to the cloud server we assume that there are local changes. And whenever we save changes only locally, we also set that flag. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-06-13 20:45:06 +00:00
bool localChanges;
QML UI: add progress message variable To be shared between C/C++ and QML code in order to show the updates and potential error messages from libdivecomputer. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 22:07:16 +00:00
QString m_progressMessage;
QML UI: make BT state available to QML Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-12 11:14:24 +00:00
bool m_btEnabled;
mobile: introduce simple private helper updateAllGlobalLists() As we need to update our new stringlist models on multiple locations, just refactor them into a new function. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-28 16:39:01 +00:00
void updateAllGlobalLists();
mobile: track if we have changes that aren't synced to cloud If we haven't connected at all to the cloud server we assume that there are local changes. And whenever we save changes only locally, we also set that flag. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-06-13 20:45:06 +00:00
void updateHaveLocalChanges(bool status);
mobile/undo: create EditDive command Command that just swaps two dives. This is rather complex, as for example a dive site might be created. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-01-10 00:25:37 +00:00
location_t getGps(QString &gps);
QML UI: add property to pass detected device name to UI If the user plugs in a device on Android we get a device string that should allow us to figure out which dive computer was plugged in. Make that string available to the QML UI. Right now all we do is log it. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-08-06 13:24:51 +00:00
QString m_pluggedInDeviceName;
Mobile: only show dive computers in the Bluetooth connection list And offer an option to show all devices in the settings. This is intentionally not stored in the preferences as this should never be needed. We don't support BT or BLE dive computers that we don't recognize. This is a last resort in case a new firmware were to change the name or some other weird issue causes us not to recognize a dive computer - and that should be fixed instead of worked around. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-14 06:48:50 +00:00
bool m_showNonDiveComputers;
Verify that copy is done Naturally the paste button should be disabled, if this is the case, but it still makes sense to do this check. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-10-27 09:00:12 +00:00
struct dive *m_copyPasteDive = NULL;
Support for copy-pasting specific fields on mobile Initial implementation/prototype of copy-paste support for Subsurface-mobile. The UI part is really lacking; right now the copy button is initially visible and paste is achieved by long press on a dive and clicking the paste button when it appears. Delete is currently not possible at all, as I just failed to layout the buttons properly using QML. It just sounds so simple, to put all the copy-paste-delete buttons next to each other... The data to be copied is currently hard-coded. A dialog to choose inteded fields would be nice, but it'll take quite a bit effort to get used to QML enough to be able to hack something together. Anyway, this seems to work, even though the UI is not always reflecting the paste without switching dives (when testing on laptop). Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-10-27 07:21:40 +00:00
struct dive_components what;
mobile/undo: create undo-action and connect to undo of dive deletion Still buggy: Removing a dive followed by undo shows the wrong dive in the list. But clicking on it gives the correct dive. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-11-14 21:19:58 +00:00
QAction *undoAction;
QML UI: make BT state available to QML Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-12 11:14:24 +00:00
mobile-widgets: make verifyCredentials() an internal function Move verifyCredentials() from public slots to private, eliminating the need to MOC and making the C++/QML interface on function less complicated. Signed-off-by: Jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-27 13:05:47 +00:00
bool verifyCredentials(QString email, QString password, QString pin);
cleanup: un-slotify QMLManager functions Some slots in QMLManager were not called from the outside, some only directly from C++-code. Make the former private and the latter public member functions. The idea here is to document which functions are actually called from the outside and which are called from QML or connected to signals. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-03-30 18:31:28 +00:00
void loadDivesWithValidCredentials();
void revertToNoCloudIfNeeded();
void consumeFinishedLoad();
cleanup: make QMLManager member functions private The - mergeLocalRepo() - openLocalThenRemote() functions were not invoked from outside QMLManager. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-03-31 07:51:14 +00:00
void mergeLocalRepo();
void openLocalThenRemote(QString url);
mobile: pull undo/redo notification text up When changes need saving, the notification text was set quite deep in the calltree in "saveChangesLocal()". I don't know why this was put so deep in the call tree. In any case, it prevents asynchronous saving of the data. Therefore, pull it up to chnagesNeedSaving(). Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-03-30 20:39:08 +00:00
void saveChangesLocal();
mobile-widgets: make verifyCredentials() an internal function Move verifyCredentials() from public slots to private, eliminating the need to MOC and making the C++/QML interface on function less complicated. Signed-off-by: Jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-27 13:05:47 +00:00
iOS: always create subsurface.log file Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-13 06:05:23 +00:00
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
Android: write appLog to file The trick is to pick a path that is accessible from other applications. In theory QStandardPaths::GenericDataLocation should provide that. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-10 00:03:57 +00:00
QString appLogFileName;
QFile appLogFile;
bool appLogFileOpen;
mobile: send logfiles as attachments on iOS as well This was added for Android a while ago, but now this works on iOS as well which is a very welcome addition for the recipient of these support emails (i.e. me). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2022-08-29 23:46:58 +00:00
#endif
#if defined(Q_OS_IOS)
IosShare iosshare;
Android: write appLog to file The trick is to pick a path that is accessible from other applications. In theory QStandardPaths::GenericDataLocation should provide that. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-10 00:03:57 +00:00
#endif
mobile-widgets: add oldStatus variable to qmlmanager oldStatus() is kept in qmlPrefs during the login process to allow for a couple of special cases: - if a user have added dives in NO_CLOUD mode and changes to use the cloud these dives are copied to the Cloud, instead of being lost. - if a user does a bailout from the login process (this should not happen anymore) the old status is restored. The pure solution would be to have oldStatus at the top level (e.g. a property in qml) and only change it when actually being in the login process, however due to way the qmlmanager is written it proved very difficult and not worth the effort. In order to be able to remove qmlPrefs, oldStatus are moved to qmlManager. This commit only contain the creation of the variable and the supporting code. Signed-off-by: Jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-29 11:29:05 +00:00
qPrefCloudStorage::cloud_status m_oldStatus;
Android BT: pull the pairing data from a device As Qt is not able to pull the pairing data from a device, a lengthy discovery process is needed to see what devices are paired. On https://forum.qt.io/topic/46075/solved-bluetooth-list-paired-devices user s.frings74 does, however, present a solution to this using JNI. Currently, this code is taken "as is". Currently, only for Android (so not mobile-on-desktop, or even desktop). And only generating logging data in the logcat. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-06-01 18:07:19 +00:00
Add QMLManager class Add a QMLManager class. This class will be used as a link between the C++ and QML aspects of the mobile application. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-04 10:29:50 +00:00
signals:
QML-UI: allow toggling verbose mode from the UI Hidden in the Developer menu. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20 02:41:10 +00:00
void verboseEnabledChanged();
mobile/dive-list: add indicator that dive list is being processed This should deal with the rather confusing 'No dive in dive list' shown while loading and processing the dive list. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-29 19:53:01 +00:00
void diveListProcessingChanged();
mobile: add indication if the app has finished initializing This will help us to ensure that notifications are actually shown on the UI during the startup phase. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-04-01 13:10:18 +00:00
void initializedChanged();
QML-UI: refuse to save to cloud unless you loaded from cloud, first This prevents people from overwriting a perfectly fine repository with an empty one. Typically happens when you first enter your cloud credentials and then don't Load Dives right away. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-03 02:49:02 +00:00
void loadFromCloudChanged();
QML UI: show better message about dive list at start Now the message should make more sense. First it tells you that it's looking for dives. Then you get some progress during the git download, and error messages if things failed. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-15 07:00:19 +00:00
void startPageTextChanged();
QML UI: redesign the user notification The old system of cloud access updates with fake percentages just wasn't helpful. Even worse, it hid a lot important information from the user. This should be more useful (but it will require that we localize the messages sent from the git progress notifications and make them more 'user ready'). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-18 06:22:37 +00:00
void notificationTextChanged();
QMLManager: helper function for devivePixelRatio This allows us to use the single manager object to keep track of the dpr of the screen and to pass it on if it changes (or when it first becomes known). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-09 03:31:05 +00:00
void sendScreenChanged(QScreen *screen);
QML UI: add progress message variable To be shared between C/C++ and QML code in order to show the updates and potential error messages from libdivecomputer. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-09 22:07:16 +00:00
void progressMessageChanged();
mobile: enable switching BT on/off during session. This commit implements possible switching BT on and off during a session, so not needing a restart of the app when the user forgot to switch it on when starting the app. For this, the following needed to be done: 1) create a handler that reacts on local BT device status changes. 2) repopulate the connection list in the download screen when a BT status change is detected. Notice the subtile change of the Q_INVOKABLE btEnabled() function to a Q_PROPERTY. This gives a nice dynamic behaviour when switching BT on/off with the app open. Fixes: #556 Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-10-12 07:43:40 +00:00
void btEnabledChanged();
mobile cleanup: unduplicate code and do not loop over dives (1) This is the first of a set of commits that are (very) similar. It appeared that a number of more or less static lists, which are constructed by a loop over all dives in the logbook, were executed when changing focus to a next dive. For example, the in this commit addressed list of used dive suits. What was wrong was that the suitList was linked to a dive. There is only a need to construct the list of used suits when data is changed (and obviously, once on startup of the app). Further, it appeared that a lot of code was duplicated and that we can use (in this case) the same code from the desktop completionmodels.cpp. Basically, this commit involves the following changes: - include completionmodels.cpp in mobile and desktop (so move it from the desktop only category to the generic category). - remove double code from DiveObjectHelper.cpp - Do not differentiate in the init phase and the normal refresh of the list - the per dive logic is now only the getting of a previously constructed list (in init or update of the divelist). There are no visible changes in the UI, other than a better performance when scrolling over dive details. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-28 08:52:51 +00:00
void suitListChanged();
mobile cleanup: unduplicate code and do not loop over dives (2) See e6e1473e6. Exact same commit but here for the list of buddies. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-28 09:26:45 +00:00
void buddyListChanged();
core: replace dive master by dive guide In general, replace "dive master" by "dive guide". However, do not change written dive logs for now. On reading, accept both versions. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-02-12 13:03:18 +00:00
void diveguideListChanged();
mobile cleanup: restyle construction of locationlist See also e6e1473e6. The construction of the locationlist was not the same as the 3 previous lists, and it needs the inclusion of a new model file (divelocationmodel.cpp) in the mobile app. In addition, as the mobile app is mainly interested in a simple stringList (model) to populate a HintsText field (or maybe later a combobox), this stringlist is added to the model, to easy interfacing with QML. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-01-28 14:21:28 +00:00
void locationListChanged();
mobile: make list of local cloud cache directories available This way QML can show those to the user. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-06-06 16:51:40 +00:00
void cloudCacheListChanged();
QML UI: if we don't have a current position, update it later Once we get a new fix we asynchronously update the text. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-14 18:12:07 +00:00
void waitingForPositionChanged();
QML UI: add property to pass detected device name to UI If the user plugs in a device on Android we get a device string that should allow us to figure out which dive computer was plugged in. Make that string available to the QML UI. Right now all we do is log it. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-08-06 13:24:51 +00:00
void pluggedInDeviceNameChanged();
Mobile: only show dive computers in the Bluetooth connection list And offer an option to show all devices in the settings. This is intentionally not stored in the preferences as this should never be needed. We don't support BT or BLE dive computers that we don't recognize. This is a last resort in case a new firmware were to change the name or some other weird issue causes us not to recognize a dive computer - and that should be fixed instead of worked around. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-14 06:48:50 +00:00
void showNonDiveComputersChanged();
Mobile: make sure QML gets notified when value changes This addresses the following warning when running the mobile app: INFO: QQmlExpression: Expression qrc:/qml/DownloadFromDiveComputer.qml:339:5 depends on non-NOTIFYable properties: INFO: QMLManager::DC_forceDownload Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-09-21 23:31:27 +00:00
void DC_ForceDownloadChanged();
mobile-widgets: add oldStatus variable to qmlmanager oldStatus() is kept in qmlPrefs during the login process to allow for a couple of special cases: - if a user have added dives in NO_CLOUD mode and changes to use the cloud these dives are copied to the Cloud, instead of being lost. - if a user does a bailout from the login process (this should not happen anymore) the old status is restored. The pure solution would be to have oldStatus at the top level (e.g. a property in qml) and only change it when actually being in the login process, however due to way the qmlmanager is written it proved very difficult and not worth the effort. In order to be able to remove qmlPrefs, oldStatus are moved to qmlManager. This commit only contain the creation of the variable and the supporting code. Signed-off-by: Jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-29 11:29:05 +00:00
void oldStatusChanged();
mobile UI: make the text of the undo/redo action available to QML Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-01-11 23:26:13 +00:00
void undoTextChanged();
void redoTextChanged();
android/usb: simply restart the download after receiving permission If the user tries to download from a device that he hasn't given the app permission to read from, Android will pop up a dialogue asking for that permission. With this after giving the permission we continue (well, technically, restart) the download which is likely the expected behavior. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-15 19:27:10 +00:00
void restartDownloadSignal();
mobile: add status text for cloud sync state This allows the mobile UI to reflect the three states that the dive list can be in: - changes that haven't been written to local storage - there potentially are changes in local storage that were not synced with the cloud - dive list is in sync with cloud storage The last state could be misleading if the user access the cloud from a different device and makes changes to the cloud storage from there, but from the point of view of this device, the states are consistent. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-06-13 20:52:04 +00:00
void syncStateChanged();
mobile: show incorrect cloud password state While the startup flow should make it obvious when a user is not correctly logged into the cloud, we still do see fairly frequent situations where a user has an incorrect password on a mobile device and is confused about why their data isn't syncing with their PC. Now this is clearly shown in the main menu. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2024-02-24 00:21:17 +00:00
void passwordStateChanged();
mobile: save changes from main event loop When autosync to cloud was enabled, the old code would crash, because it synced to cloud from a signal handler, which executed the main loop when checking the cloud connection, which deleted the object which was causing the original signal. Or something like that. See discussion in #4119. To avoid such problems, send a signal via a 'QueuedConnection' from QMLManager to itself. The slot will be called once the signal handler terminates and the main event loop retakes control. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-03-30 20:55:22 +00:00
void changesNeedSavingSignal();
mobile-widgets: make upload signals available to QML Connect signal to signal in QMLManager to avoid registring the upload class. Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-12-08 08:23:45 +00:00
// From upload process
void uploadFinish(bool success, const QString &text);
void uploadProgress(qreal percentage);
mobile-widgets: activate uploadDiveShare in qmlmanager Remove "TO BE IMPLEMENTED" and add call doUpload Connect signal to signal in QMLManager to avoid registring the upload class. Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-12-08 10:52:38 +00:00
private slots:
void uploadFinishSlot(bool success, const QString &text, const QByteArray &html);
mobile: save changes from main event loop When autosync to cloud was enabled, the old code would crash, because it synced to cloud from a signal handler, which executed the main loop when checking the cloud connection, which deleted the object which was causing the original signal. Or something like that. See discussion in #4119. To avoid such problems, send a signal via a 'QueuedConnection' from QMLManager to itself. The slot will be called once the signal handler terminates and the main event loop retakes control. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-03-30 20:55:22 +00:00
void saveUnsaved();
Add QMLManager class Add a QMLManager class. This class will be used as a link between the C++ and QML aspects of the mobile application. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-04 10:29:50 +00:00
};
#endif
Reference in a new issue Copy permalink