1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
|
// SPDX-License-Identifier: GPL-2.0
import QtQuick 2.6
import QtQuick.Controls 2.0
import QtQuick.Controls.Material 2.1
import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick.Window 2.2
import org.subsurfacedivelog.mobile 1.0
import org.kde.kirigami 2.2 as Kirigami
Kirigami.ApplicationWindow {
id: rootItem
title: qsTr("Subsurface-mobile")
reachableModeEnabled: false // while it's a good idea, it seems to confuse more than help
wideScreen: false // workaround for probably Kirigami bug. See commits.
header: Kirigami.ApplicationHeader {
minimumHeight: 0
preferredHeight: Math.round(Kirigami.Units.gridUnit * (Qt.platform.os == "ios" ? 2 : 1.5))
maximumHeight: Kirigami.Units.gridUnit * 2
background: Rectangle { color: subsurfaceTheme.primaryColor }
}
property alias oldStatus: manager.oldStatus
property alias notificationText: manager.notificationText
property alias syncToCloud: manager.syncToCloud
property alias locationServiceEnabled: manager.locationServiceEnabled
property alias showPin: manager.showPin
onNotificationTextChanged: {
if (notificationText != "") {
// there's a risk that we have a >5 second gap in update events;
// still, keep the timeout at 5s to avoid odd unchanging notifications
showPassiveNotification(notificationText, 5000)
} else {
// hiding the notification right away may be a mistake as it hides the last warning / error
hidePassiveNotification();
}
}
FontMetrics {
id: fontMetrics
Component.onCompleted: {
console.log("Using the following font: " + fontMetrics.font.family)
}
/* this shouldn't be needed anymore
Component.onCompleted: {
if (Math.round(rootItem.width / Kirigami.Units.gridUnit) < 20) {
fontMetrics.font.pointSize = fontMetrics.font.pointSize * 2 / 3
Kirigami.Theme.defaultFont.pointSize = fontMetrics.font.pointSize
console.log("Reduce font size for narrow screens: " + fontMetrics.font.pointSize)
}
}
*/
}
visible: false
// TODO: Verify where the opacity went to.
// opacity: 0
function returnTopPage() {
for (var i=stackView.depth; i>1; i--) {
stackView.pop()
}
detailsWindow.endEditMode()
}
function scrollToTop() {
diveList.scrollToTop()
}
function showMap() {
globalDrawer.close()
returnTopPage()
stackView.push(mapPage)
}
function startAddDive() {
detailsWindow.state = "add"
detailsWindow.dive_id = manager.addDive();
detailsWindow.number = manager.getNumber(detailsWindow.dive_id)
detailsWindow.date = manager.getDate(detailsWindow.dive_id)
detailsWindow.airtemp = ""
detailsWindow.watertemp = ""
detailsWindow.buddyModel = manager.buddyList
detailsWindow.buddyIndex = -1
detailsWindow.buddyText = ""
detailsWindow.depth = ""
detailsWindow.divemasterModel = manager.divemasterList
detailsWindow.divemasterIndex = -1
detailsWindow.divemasterText = ""
detailsWindow.notes = ""
detailsWindow.location = ""
detailsWindow.gps = ""
detailsWindow.duration = ""
detailsWindow.suitModel = manager.suitList
detailsWindow.suitIndex = -1
detailsWindow.suitText = ""
detailsWindow.cylinderModel = manager.cylinderInit
detailsWindow.cylinderIndex = -1
detailsWindow.cylinderText = ""
detailsWindow.weight = ""
detailsWindow.gasmix = ""
detailsWindow.startpressure = ""
detailsWindow.endpressure = ""
detailsWindow.gpsCheckbox = false
stackView.push(detailsWindow)
}
globalDrawer: Kirigami.GlobalDrawer {
title: qsTr("Subsurface")
titleIcon: "qrc:/qml/subsurface-mobile-icon.png"
bannerImageSource: "dive.jpg"
resetMenuOnTriggered: false
actions: [
Kirigami.Action {
icon {
name: ":/icons/ic_home.svg"
}
text: qsTr("Dive list")
onTriggered: {
manager.appendTextToLog("requested dive list with credential status " + manager.credentialStatus)
if (manager.credentialStatus == QMLManager.CS_UNKNOWN) {
// the user has asked to change credentials - if the credentials before that
// were valid, go back to dive list
if (oldStatus == QMLManager.CS_VERIFIED) {
manager.credentialStatus = oldStatus
}
}
returnTopPage()
globalDrawer.close()
}
},
Kirigami.Action {
icon {
name: ":/icons/map-globe.svg"
}
text: mapPage.title
onTriggered: {
showMap()
}
},
Kirigami.Action {
icon {
name: ":/icons/ic_sync.svg"
}
text: qsTr("Dive management")
Kirigami.Action {
icon {
name: ":/icons/ic_add.svg"
}
text: qsTr("Add dive manually")
enabled: manager.credentialStatus === QMLManager.CS_VERIFIED || manager.credentialStatus === QMLManager.CS_NOCLOUD
onTriggered: {
globalDrawer.close()
returnTopPage() // otherwise odd things happen with the page stack
startAddDive()
}
}
Kirigami.Action {
// this of course assumes a white background - theming means this needs to change again
icon {
name: ":/icons/downloadDC-black.svg"
}
text: qsTr("Download from DC")
enabled: true
onTriggered: {
globalDrawer.close()
downloadFromDc.dcImportModel.clearTable()
stackView.push(downloadFromDc)
}
}
Kirigami.Action {
icon {
name: ":/icons/ic_add_location.svg"
}
text: qsTr("Apply GPS fixes")
onTriggered: {
manager.applyGpsData();
}
}
Kirigami.Action {
icon {
name: ":/icons/cloud_sync.svg"
}
text: qsTr("Manual sync with cloud")
enabled: manager.credentialStatus === QMLManager.CS_VERIFIED || manager.credentialStatus === QMLManager.CS_NOCLOUD
onTriggered: {
if (manager.credentialStatus === QMLManager.CS_NOCLOUD) {
returnTopPage()
oldStatus = manager.credentialStatus
manager.startPageText = "Enter valid cloud storage credentials"
manager.credentialStatus = QMLManager.CS_UNKNOWN
globalDrawer.close()
} else {
globalDrawer.close()
detailsWindow.endEditMode()
manager.saveChangesCloud(true);
globalDrawer.close()
}
}
}
Kirigami.Action {
icon {
name: syncToCloud ? ":/icons/ic_cloud_off.svg" : ":/icons/ic_cloud_done.svg"
}
text: syncToCloud ? qsTr("Disable auto cloud sync") : qsTr("Enable auto cloud sync")
enabled: manager.credentialStatus !== QMLManager.CS_NOCLOUD
onTriggered: {
syncToCloud = !syncToCloud
if (!syncToCloud) {
showPassiveNotification(qsTr("Turning off automatic sync to cloud causes all data to only be \
stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' \
if you have network connectivity and want to sync your data to cloud storage."), 10000)
}
}
}
},
Kirigami.Action {
icon {
name: ":/icons/ic_place.svg"
}
text: qsTr("GPS")
visible: true
Kirigami.Action {
icon {
name: ":/icons/ic_cloud_upload.svg"
}
text: qsTr("Upload GPS data")
onTriggered: {
globalDrawer.close();
manager.sendGpsData();
}
}
Kirigami.Action {
icon {
name: ":/icons/ic_cloud_download.svg"
}
text: qsTr("Download GPS data")
onTriggered: {
globalDrawer.close();
manager.downloadGpsData();
}
}
Kirigami.Action {
icon {
name:":/icons/ic_gps_fixed.svg"
}
text: qsTr("Show GPS fixes")
onTriggered: {
globalDrawer.close()
returnTopPage()
manager.populateGpsData();
stackView.push(gpsWindow)
}
}
Kirigami.Action {
icon {
name: ":/icons/ic_clear.svg"
}
text: qsTr("Clear GPS cache")
onTriggered: {
globalDrawer.close();
manager.clearGpsData();
}
}
Kirigami.Action {
icon {
name: locationServiceEnabled ? ":/icons/ic_location_off.svg" : ":/icons/ic_place.svg"
}
text: locationServiceEnabled ? qsTr("Disable location service") : qsTr("Run location service")
onTriggered: {
globalDrawer.close();
locationServiceEnabled = !locationServiceEnabled
}
}
},
Kirigami.Action {
icon {
name: ":/icons/ic_info_outline.svg"
}
text: qsTr("About")
onTriggered: {
globalDrawer.close()
stackView.push(aboutWindow)
detailsWindow.endEditMode()
}
},
Kirigami.Action {
icon {
name: ":/icons/ic_settings.svg"
}
text: qsTr("Settings")
onTriggered: {
globalDrawer.close()
stackView.push(settingsWindow)
detailsWindow.endEditMode()
}
},
Kirigami.Action {
icon {
name: ":/icons/ic_adb.svg"
}
text: qsTr("Developer")
visible: manager.developer
Kirigami.Action {
text: qsTr("App log")
onTriggered: {
globalDrawer.close()
stackView.push(logWindow)
}
}
Kirigami.Action {
text: qsTr("Theme information")
onTriggered: {
globalDrawer.close()
stackView.push(themetest)
}
}
},
Kirigami.Action {
icon {
name: ":/icons/ic_help_outline.svg"
}
text: qsTr("Help")
onTriggered: {
Qt.openUrlExternally("https://subsurface-divelog.org/documentation/subsurface-mobile-v2-user-manual/")
}
}
] // end actions
Kirigami.Icon {
source: ":/icons/" + (subsurfaceTheme.currentTheme != "" ? subsurfaceTheme.currentTheme : "Blue") + "_gps.svg"
enabled: false
visible: locationServiceEnabled
}
}
function blueTheme() {
Material.theme = Material.Light
Material.accent = subsurfaceTheme.bluePrimaryColor
subsurfaceTheme.currentTheme = "Blue"
subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.blueDarkerPrimaryColor
subsurfaceTheme.darkerPrimaryTextColor= subsurfaceTheme.blueDarkerPrimaryTextColor
subsurfaceTheme.primaryColor = subsurfaceTheme.bluePrimaryColor
subsurfaceTheme.primaryTextColor = subsurfaceTheme.bluePrimaryTextColor
subsurfaceTheme.lightPrimaryColor = subsurfaceTheme.blueLightPrimaryColor
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.blueLightPrimaryTextColor
subsurfaceTheme.backgroundColor = subsurfaceTheme.blueBackgroundColor
subsurfaceTheme.textColor = subsurfaceTheme.blueTextColor
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.blueSecondaryTextColor
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
subsurfaceTheme.drawerColor = subsurfaceTheme.lightDrawerColor
}
function pinkTheme() {
Material.theme = Material.Light
Material.accent = subsurfaceTheme.pinkPrimaryColor
subsurfaceTheme.currentTheme = "Pink"
subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.pinkDarkerPrimaryColor
subsurfaceTheme.darkerPrimaryTextColor = subsurfaceTheme.pinkDarkerPrimaryTextColor
subsurfaceTheme.primaryColor = subsurfaceTheme.pinkPrimaryColor
subsurfaceTheme.primaryTextColor = subsurfaceTheme.pinkPrimaryTextColor
subsurfaceTheme.lightPrimaryColor = subsurfaceTheme.pinkLightPrimaryColor
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.pinkLightPrimaryTextColor
subsurfaceTheme.backgroundColor = subsurfaceTheme.pinkBackgroundColor
subsurfaceTheme.textColor = subsurfaceTheme.pinkTextColor
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.pinkSecondaryTextColor
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
subsurfaceTheme.drawerColor = subsurfaceTheme.lightDrawerColor
}
function darkTheme() {
Material.theme = Material.Dark
Material.accent = subsurfaceTheme.darkerPrimaryColor
subsurfaceTheme.currentTheme = "Dark"
subsurfaceTheme.darkerPrimaryColor = subsurfaceTheme.darkDarkerPrimaryColor
subsurfaceTheme.darkerPrimaryTextColor= subsurfaceTheme.darkDarkerPrimaryTextColor
subsurfaceTheme.primaryColor = subsurfaceTheme.darkPrimaryColor
subsurfaceTheme.primaryTextColor = subsurfaceTheme.darkPrimaryTextColor
subsurfaceTheme.lightPrimaryColor = subsurfaceTheme.darkLightPrimaryColor
subsurfaceTheme.lightPrimaryTextColor = subsurfaceTheme.darkLightPrimaryTextColor
subsurfaceTheme.backgroundColor = subsurfaceTheme.darkBackgroundColor
subsurfaceTheme.textColor = subsurfaceTheme.darkTextColor
subsurfaceTheme.secondaryTextColor = subsurfaceTheme.darkSecondaryTextColor
manager.setStatusbarColor(subsurfaceTheme.darkerPrimaryColor)
subsurfaceTheme.drawerColor = subsurfaceTheme.darkDrawerColor
}
QtObject {
id: subsurfaceTheme
property int regularPointSize: fontMetrics.font.pointSize
property int titlePointSize: Math.round(regularPointSize * 1.5)
property int smallPointSize: Math.round(regularPointSize * 0.8)
// colors currently in use
property string currentTheme
property color darkerPrimaryColor
property color darkerPrimaryTextColor
property color primaryColor
property color primaryTextColor
property color lightPrimaryColor
property color lightPrimaryTextColor
property color backgroundColor
property color textColor
property color secondaryTextColor
property color drawerColor
// colors for the blue theme
property color blueDarkerPrimaryColor: "#303F9f"
property color blueDarkerPrimaryTextColor: "#ECECEC"
property color bluePrimaryColor: "#3F51B5"
property color bluePrimaryTextColor: "#FFFFFF"
property color blueLightPrimaryColor: "#C5CAE9"
property color blueLightPrimaryTextColor: "#212121"
property color blueBackgroundColor: "#eff0f1"
property color blueTextColor: blueLightPrimaryTextColor
property color blueSecondaryTextColor: "#757575"
// colors for the pink theme
property color pinkDarkerPrimaryColor: "#C2185B"
property color pinkDarkerPrimaryTextColor: "#ECECEC"
property color pinkPrimaryColor: "#FF69B4"
property color pinkPrimaryTextColor: "#212121"
property color pinkLightPrimaryColor: "#FFDDF4"
property color pinkLightPrimaryTextColor: "#212121"
property color pinkBackgroundColor: "#eff0f1"
property color pinkTextColor: pinkLightPrimaryTextColor
property color pinkSecondaryTextColor: "#757575"
// colors for the dark theme
property color darkDarkerPrimaryColor: "#303F9f"
property color darkDarkerPrimaryTextColor: "#ECECEC"
property color darkPrimaryColor: "#3F51B5"
property color darkPrimaryTextColor: "#ECECEC"
property color darkLightPrimaryColor: "#C5CAE9"
property color darkLightPrimaryTextColor: "#212121"
property color darkBackgroundColor: "#303030"
property color darkTextColor: darkPrimaryTextColor
property color darkSecondaryTextColor: "#757575"
property color contrastAccentColor: "#FF5722" // used for delete button
property color lightDrawerColor: "#FFFFFF"
property color darkDrawerColor: "#424242"
property int columnWidth: Math.round(rootItem.width/(Kirigami.Units.gridUnit*28)) > 0 ? Math.round(rootItem.width / Math.round(rootItem.width/(Kirigami.Units.gridUnit*28))) : rootItem.width
Component.onCompleted: {
// this needs to pick the theme from persistent preference settings
var theme = manager.theme
if (theme == "Blue")
blueTheme()
else if (theme == "Pink")
pinkTheme()
else
darkTheme()
}
}
property Item stackView: pageStack
pageStack.initialPage: DiveList {
id: diveList
opacity: 0
Behavior on opacity {
NumberAnimation {
duration: 200
easing.type: Easing.OutQuad
}
}
}
pageStack.onCurrentItemChanged: {
// This is called whenever the user navigates using the breadcrumbs in the header
// disable the left swipe to go back when on the map page
stackView.interactive = pageStack.currentItem.objectName !== mapPage.objectName
// is there a better way to reload the map markers instead of doing that
// every time the map page is shown - e.g. link to the dive list model somehow?
if (pageStack.currentItem.objectName === mapPage.objectName)
mapPage.reloadMap()
// In case we land on any page, not being the DiveDetails (which can be
// in multiple states, such as add, edit or view), just end the edit/add mode
if (pageStack.currentItem.objectName !== "DiveDetails" &&
(detailsWindow.state === 'edit' || detailsWindow.state === 'add')) {
detailsWindow.endEditMode()
}
}
QMLManager {
id: manager
}
Settings {
id: settingsWindow
visible: false
}
About {
id: aboutWindow
visible: false
}
DiveDetails {
id: detailsWindow
visible: false
anchors.fill: parent
}
Log {
id: logWindow
visible: false
}
GpsList {
id: gpsWindow
visible: false
}
DownloadFromDiveComputer {
id: downloadFromDc
visible: false
}
MapPage {
id: mapPage
visible: false
anchors.fill: parent
}
ThemeTest {
id: themetest
visible: false
}
Component.onCompleted: {
rootItem.visible = true
diveList.opacity = 1
rootItem.opacity = 1
pageStack.defaultColumnWidth = Kirigami.Units.gridUnit * 28
}
/* TODO: Verify where opacity went to.
Behavior on opacity {
NumberAnimation {
duration: 200
easing.type: Easing.OutQuad
}
}
*/
}
|