aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-01-07Merge branch 'gpsList'Gravatar Dirk Hohndel
2016-01-07QML UI: show the available GPS fixesGravatar Dirk Hohndel
So far the user can't interact with these. We should implement an ability to visualize the GPS fix and to delete it. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07Populate the model with the GPS fixesGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07Set up model for GPS fixesGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07QML UI: trigger download of GPS fixesGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07Download gps locations in the mobile appGravatar Dirk Hohndel
This is not the same as the existing download to apply the gps fixes to the dive list. This allows us to download and store the GPS fixes in the settings. I may end up changing things around to have a shared implementation for downloading the GPS fixes, but for now this seemed easier. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07build.sh: don't build Grantlee for Subsurface-mobileGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07Create GpsListModel in order to be able to display GPS fixesGravatar Dirk Hohndel
This will allow us to visualize the GPS fixes that are currently stored in the QML UI. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07Assign lower number to a merged dive instead of higher oneGravatar Salvador Cuñat
At the moment, if we have, say, dives ... 100, 101 and 102 and we merge 101 and 102, we get a list numbered ... 99, 100, 102. This is, probably, an undesired behavior. The patch simple chooses lower of both dive numbers instead of higher one. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07Don't try to install Grantlee files when building Subsurface-mobile on MacGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07Remove plasma mobile components, pull from upstream at build timeGravatar Dirk Hohndel
This prevents us from constantly having to worry about keeping them in sync. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-06QML UI: edit notes in rich text modeGravatar Dirk Hohndel
This way we don't show <br> for line breaks. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-06QML UI: use the same units that Subsurface used when saving the dataGravatar Dirk Hohndel
We already keep those units around so the backend HTML exporter can match them. So it makes perfect sense to also apply them in the mobile app. Fixes #987 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-06QML UI: reimplement context menu for dive detailsGravatar Dirk Hohndel
With the mobile components fixed we can now simply switch between different menu content - no need to play games and redefine the actions on the fly. This also adds a cancel button for editing and cleans up when the user hits cancel. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-06Make sure that members are initialiedGravatar Dirk Hohndel
A couple of members could potentially have been used uninitialized - it's possible that this was the cause for people overwriting data in cloud storage with empty dive lists. See #985 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07sync with mobilecomponents 462b2b4Gravatar Sebastian Kügler
- Fixes blank pages when keyboard shows up, the margin computation was wrong, and apparently we get bogus info about the keyboard geometry. Signed-off-by: Sebastian Kügler <sebas@kde.org>
2016-01-07sync with mobilecomponents 9d179eb74a227Gravatar Sebastian Kügler
- Workaround for black squares is merged upstream - brings back the FAB button, additional - swipe interaction improvements in the same Signed-off-by: Sebastian Kügler <sebas@kde.org>
2016-01-05QML UI: switch UI to imperial units for users in the USGravatar Dirk Hohndel
This is overly simplistic and it would be better to be able to override this in the settings, but frankly fewer settings are better and in most cases this is what the user wants. Fixes #987 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-05Try harder to find the language name that includes country codeGravatar Dirk Hohndel
It seems that the first language in the list of languages isn't always the one that specifies the country code. So try the first three to see which one is the first to contain a country code. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-05QML UI: when manually adding a dive clear out all the fieldsGravatar Dirk Hohndel
Otherwise the data from the last dive dispayed (or added) will be shown. Fixes #983 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-05QML UI: refresh the dive list after editGravatar Dirk Hohndel
This fixes two issues. In general, after edits the dive list wasn't updated so it showed data inconsistent with what the dive details showed (clearly bogus). Even more annoyingly, when we change the date or time of a dive it could obviously move around in the dive list. So we need to resort the dive table and recreate the dive list. For really long dive lists this is possibly overkill, but in my testing this seemed very quick and much easier than trying to manually get this right, even in the case where the list wasn't resorted. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-05QML UI: allow edit of dive date and timeGravatar Dirk Hohndel
This is a bit more complicated because we are asking the user to edit the text field instead of giving them a date and time picker. This is not a great choice, but let's run with it for now. One downside is that the user is likely going to edit the date "Oct 29" -> "Oct 25" without adjusting the day of the week. And if we then try to parse that Qt correctly complains about an invalid date. So we hack around this by removing the day of the week from both the format and the date entered (which of course now will break things if the user did, in fact, adjust the day of the week). As I said, not a great solution. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-05QML UI: in dive details edit, put date on its own lineGravatar Dirk Hohndel
This way we can support a simple way for the user to edit the date. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-05Add BasicListItem.qml from plasma-mobileGravatar Dirk Hohndel
Sebastian forgot to add this file - so I grabbed the latest version from today, hoping this is the right one. This is from a85365111 which is the sha he referenced in his patch. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-06adjustments needed for latest mobilecomponentsGravatar Sebastian Kügler
- flickable is gone, Page now just takes the children items, meaning we can remove this assignment - BasicListItem is factored out, and we now need it in our qrc Signed-off-by: Sebastian Kügler <sebas@kde.org>
2016-01-06sync with mobilecomponents a85365111 + patchesGravatar Sebastian Kügler
This is the latest state of the upstream art from Plasma, plus our patches to disable the gamma effect on the icon, and the drawer removed. Signed-off-by: Sebastian Kügler <sebas@kde.org>
2016-01-06Allow faster scrolling in the dive listGravatar Sebastian Kügler
This increases the rather conservative value for the maximum velocity of the divelist to scroll at max 5 screens per second, meaning it's about 4 times faster. I've picked this value after a bit of testing, it can surely be tweaked, but feels nicer already. Signed-off-by: Sebastian Kügler <sebas@kde.org>
2016-01-05Small changes to the profileGravatar Joakim Bygdell
Due to the small screen of mobile devices, the positions of the temperature graph and the time axis needs to be shifted upwards a bit to prevent them from overlapping with the dive computer name. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-04QML UI: make top bar elements bigger for easier useGravatar Dirk Hohndel
Otherwise hitting those menu buttons is HARD. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-04Cloud storage: fix potential crash when avoiding reloading dive listGravatar Dirk Hohndel
If we loaded the dive list from cache and then try to figure out if the remote repository had anything different, we were being super stupid if the SHA was identical... we had already cleared the dive list by the time we decided that we didn't need to load things. Granted, the model was still populated (oops), but the backend data structure was cleared and accesses to it (e.g., when drawing the profile) would cause things to crash. The helper function duplicates some code, but trying to not duplicate the code made things even harder to read. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-04QML UI: hide action buttonGravatar Dirk Hohndel
So far this just comments out the code that enables the action button. Let's see feedback from the testers. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-04QML UI: add context menu buttonGravatar Dirk Hohndel
Right now this is an alternative to the magic action button - but the goal is to replace it completely. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-04QML UI: add main menu buttonGravatar Dirk Hohndel
Right now this is an alternative to the magic action button - but the goal is to replace it completely. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-04Enable BT_SUPPORT compilation flagGravatar Miika Turkia
We need to enable the BT_SUPPORT compilation flag to get the support built in. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-04Give the user more information on cloud credentialsGravatar Miika Turkia
This gives the user a bit more information about the progress of setting the cloud credentials. IMO, especially the information that the credentials are invalid is crucial for the user experience. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-04QML UI: make profile margin scale proportional to dimensionsGravatar Rick Walsh
The QMLProfile height is specified as ~2/3 (actually 0.66) width in DiveDetailsView.qml. In order to produce an even margin around the profile, the scaling factor reduction for height needs to be 3/2 times that for width. MarginFactor is specified as 0.013 to approximate the margin calculated by commits ef653b4 and 7e2898d for my Galaxy S6. MarginFactor = margin / width = 18 / 1365 = 0.132 Signed-off-by: Rick Walsh <rickmwalsh@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-01QML UI: use better Google maps linkGravatar Dirk Hohndel
This still isn't the user experience that I want, but at least now it's not a static map image anymore but an interactive map. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-01QML UI: add feature to add current position when editing diveGravatar Dirk Hohndel
This isn't quite perfect yet. If it takes too long to get the GPS fix (i.e., if you save it before you get the fix), this will simply fail and not store a position. But in normal conditions (you check the box, you edit the data, you save), especially when outside on a dive boat, this should work fine. For the other cases we need to implement some kind of callback to still collect the data. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-01Location service: get the current positionGravatar Dirk Hohndel
If we have a fix that is fewer than 5 minutes old, take it, otherwise trigger an update. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-01Location service: support the concept of waiting for a positionGravatar Dirk Hohndel
There may be reasons where we want to get the position even if the criteria aren't met. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-01Location service: restructure the way GpsSource is managedGravatar Dirk Hohndel
It makes much more sense to have this as a private member of the class instead of a static in one of the functions. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-01QML UI: allow the user to close the LogGravatar Dirk Hohndel
Same context menu idea. The reason for adding this is that the context menu always acts on the last page in the stack (so I guess the "right-most-one"). So if you edit a dive and then open the log, you can't save the dive until the dive edit is the last page which means you have to close the log, first. Not ideal, but better than nothing and it works well enough. I still think we might want to go back to a traditional "Save" button... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-01QML UI: consistency in namingGravatar Dirk Hohndel
Let's try to call it Subsurface-mobile everywhere. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-01QML UI: update context menu textGravatar Dirk Hohndel
The automagic update gets disabled once we overwrite the text with "Save" at some point, so instead we appear to have to do this manually. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-01QML UI: handle editing of depthGravatar Dirk Hohndel
Getting closer to being able to really edit / add dives in the mobile UI. This works for manually added dives - needs a bit more thought for dives downloaded from dive computers as we don't necessarily want to change the maxdepth in conflict with the samples. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-01QML UI: handle editing of durationGravatar Dirk Hohndel
I don't think these regular expressions are sufficiently exhaustive - but this is forward progress. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-31QML UI: refresh UI after editing / adding a diveGravatar Dirk Hohndel
This way the properties of the shown list element are updated based on what was edited. This feels weird and backwards - but it appears to be the way to do this - you literally update the elemnts in this specific instance of that QML page. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-31QML UI: we don't need those semicolonsGravatar Dirk Hohndel
The code is rather inconsistent when it comes to the use of semicolons in the JS code. Let's try to not have them... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-31QML UI: process air and water temp when editedGravatar Dirk Hohndel
This is a little hacky as it changes the units based on user input - a little crude but works in the typical cases. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-30Cmake: only need Marble/Grantlee/Manual for desktop versionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>