aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-06-22Merge branch 'master' of git://github.com/torvalds/subsurface-for-dirkGravatar Dirk Hohndel
2017-06-22Update translation source stringsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-23Typo of translated stringGravatar Jan Mulder
Trivial typo. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-06-22QML UI: switch to Kirigami masterGravatar Dirk Hohndel
That way we'll get access to the colored Action Button. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-22QML UI: add missing go-up iconGravatar Dirk Hohndel
Now the 'Reachability' feature should be more obvious. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-22Convert to new libdivecomputer custom IO modelGravatar Linus Torvalds
Instead of being "custom serial", it's a IO model that allows serial or packet modes, independently of each other (ie you can have a bluetooth device that does serial over BT rfcomm and packet-based communication over BLE GATT with the same serial operations that describe both cases). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2017-06-22Update plural translationsGravatar Dirk Hohndel
Including the fake en_US translation. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-22Latest translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-22Update translation source stringsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-22Use plural form for cloud connection waitGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-22Add en_US translation for pluralsGravatar Dirk Hohndel
This way in the en_US locale we no longer get shown the odd "dive(s)" and instead get correct singular and plural forms. Most of the patch is just a reindentation as it removes the if clause that used to do the special case of NOT loading a translation for the en_US case. Right now we start with a trivial en_US translation file. My guess is that this will be overwritten once we do the next round of "new strings, new translations". Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-22QML UI: correctly build plural translationGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-22QML UI: DiveList: allow trip header to wrapGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-22QML UI: turn off spinner if pull-down-to-refresh failsGravatar Rick Walsh
Signed-off-by: Rick Walsh <rickmwalsh@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-22mobile: prune DC list to download fromGravatar Jan Mulder
Currently, only a small number of dive computers can be downloaded from the mobile app. Only present the supported ones to the user. So, currently restricted to classic BT. Not sure about FTDI support at this point. Version 2 of the same commit after review from Dirk. Fundamentally, support is as follows: Android: BT, BLE, and FTDI. iOS: BLE only. For all other OSses, this commit has no changes. As the BLE backend is not yet ready, no support on iOS yet. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-06-21Android build: work around odd build problem with missing rand()Gravatar Dirk Hohndel
I don't quite understand why this isn't correctly substituted to lrand48() by the header file, but patching it in the source is easy enough. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21Android build: match versions between wrapper and build scriptGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21Upgrade 3pp for android and testingGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-06-21Remove old duplicated codeGravatar Anton Lundin
Way back in time this code was copied from downloadfromdcthread, so de-duplicate and call that code instead. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-06-21Flag more minified javascript as binaryGravatar Anton Lundin
This is so that crap doesn't show up when doing ex. git grep Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-06-22smtk-import: partially revert and complete 6963b52dGravatar Salvador Cuñat
6963b52d introduced a cmake option, COMMANDLINE to enable building a pure command line version of smtk2ssrf importer, but then the #define COMMANDLINE=1 forces building CLI mode. This patch allows building GUI or CLI versions depending on selection of the COMMANDLINE option. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-06-22Preserve VPM-B state in profile displayGravatar Robert C. Helling
This fixes a but reported by Willem in the display of VPMB ceilings for logged dives. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-06-22Translate the strings "planned dive" and "manually added dive" in the profileGravatar Stefan Fuchs
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-06-21QML UI: DiveDetails: add more space at bottomGravatar Dirk Hohndel
This way the user can scroll up the page to see all of the notes without having them covered by the action button. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: don't access dive without modelDataGravatar Dirk Hohndel
Occasionally I see errors in the log where we would access modelData.dive with modelData = null. This patch addresses a couple of the spaces where this happens, but also simplifies the code by using the existing alias. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: DiveList: implement pull down to refreshGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: attempt to add dark themeGravatar Dirk Hohndel
This isn't great, yet, but a first step to show that this is possible (and in doing so I found quite a few spots where the colors weren't correctly propagating, yet). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: simple attempt to allow color scheme switchingGravatar Dirk Hohndel
By making the assignments to the Kirigami Theme colors Qt bindings things get correctly updated when switching. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: Linus requested Hot Pink as color schemeGravatar Dirk Hohndel
He started the project, he gets to have his color preference. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: don't reduce opacity for background of selected diveGravatar Dirk Hohndel
Now that we have distinct colors for trip header and selected dive, this is actually counter productive. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: DiveList: always show current trip at the topGravatar Dirk Hohndel
This is especially nice for very long dive trips. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: redo all the colorsGravatar Dirk Hohndel
Naming them the same way Davide named them in his emails and assigning the color values he proposed. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: DiveList: fix position of delete buttonGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: DiveList: turn the color blob into a thin lineGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: make title bar taller again on AndroidGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21QML UI: DiveList distinguish trip and selected diveGravatar Dirk Hohndel
Making the selected dive's background less opaque prevents confusion. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: use Android palette colorsGravatar Dirk Hohndel
These were picked from https://material.io/guidelines/style/color.html#color-color-system One could argue that we should use different colors for iOS. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: remove files we no longer useGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveList: playing with different colorsGravatar Dirk Hohndel
Make the accent color much lighter, don't have a solid bar on the left for dives that are part of a trip. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: disable the MouseAreaGravatar Dirk Hohndel
Visible doesn't even make sense... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveDetailsView add button for mapGravatar Dirk Hohndel
Implementing another suggestion from Davide. A button to get the map (as well as just tapping on the location name). Fixes #431 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveDetailsView: make key dive info consistent with dive listGravatar Dirk Hohndel
Remove the grid layout and replace it with code that is derived from the delegate that we use in the dive list. In order to look proportional I ended up using a larger font for the location and therefore decided to allow that text to wrap instead of forcing single line. This implements a good chunk of another one of Davide's great suggestions. See #431 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveDetailsView: make the lower section less busyGravatar Dirk Hohndel
This removes fairly redundant text (yes, we know those are the Dive Details) and makes the label for the Notes consistent with all the other labels. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveDetailsView: move profile into bottom layoutGravatar Dirk Hohndel
Then we can remove the main layout and create a similar look as we now have in the dive list. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveDetailsView: don't underline locationGravatar Dirk Hohndel
Davide points out that this is not a commonly understood way in an app to indicate that a text is also a link. So let's just remove that (but tapping on the location will still work to get you to the map if there is GPS information available). See #431 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: log the font in useGravatar Dirk Hohndel
This shows that we are, indeed, using Roboto on Android. Which means I can close the first of Davide's design issues: Fixes #427 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveList: some fine tuning of sizes and spacingGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveList: remove space below trip headingGravatar Dirk Hohndel
That made sense before we had the shaded background, now it just looks terrible. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveList: don't show empty trip heading for dives without tripGravatar Dirk Hohndel
We need to hide the left bar and background rectangle as well. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-20QML UI: DiveList: show left bar on dives that are part of a tripGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>