Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/ic_launcher-web.png
#	app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
#	app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
#	app/src/main/res/mipmap-hdpi/ic_launcher.png
#	app/src/main/res/mipmap-hdpi/ic_launcher_round.png
#	app/src/main/res/mipmap-mdpi/ic_launcher.png
#	app/src/main/res/mipmap-mdpi/ic_launcher_round.png
#	app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
#	app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
#	app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
#	assets/trackbook-app-icon-current.png
#	assets/trackbook-app-icon-current.svg
#	metadata/en-US/full_description.txt

CONTRIBUTE.md

@@ -2,7 +2,7 @@ How to contribute to Trackbook
 ==============================
 
 ### Report a bug or suggest a new feature
-Bugs and new features are being discussed on the GitHub [Issue Tracker](https://github.com/y20k/trackbook/issues). 
+Bugs and new features are being discussed on the GitHub [Issue Tracker](https://github.com/y20k/trackbook/issues). The issue "[Previous discussions and feature requests](https://github.com/y20k/trackbook/issues/57)" lists some of the features that were rejected - either because they did not fit conceptually or because I could not figure out how to implement them.
 
 ### Help with translations
 The translations are managed on [Weblate](https://hosted.weblate.org/projects/trackbook/strings/). Help is much appreciated. 
@@ -11,6 +11,9 @@ The translations are managed on [Weblate](https://hosted.weblate.org/projects/tr
 Help is very welcome. Be it in the form of code, or artwork, or enhancements to the website, or tutorial videos, or whatever. 
 **But please** suggest new features or enhancements in advance on the [Issue Tracker](https://github.com/y20k/trackbook/issues) before implementing them.
 
+### Suggested issues to tackle
+[#19](https://github.com/y20k/trackbook/issues/19)
+
 ### Credit for your contributions
 Contributors - like the main translators for a certain language - are listed as co-authors of this project in [AUTHORS.md](https://github.com/y20k/trackbook/blob/master/AUTHORS.md). Bonus: If you are on this list, you are automatically eligible for a free German beverage.
-To be redeemed in Stuttgart.
+To be redeemed in Stuttgart.

README.md

@@ -63,8 +63,8 @@ Tapping and holding some controls will toggle a tiny vibration (force feedback).
 
 Screenshots (v1.1)
 ------------------
-[<img src="https://raw.githubusercontent.com/y20k/trackbook/master/fastlane/metadata/en-US/phoneScreenshots/p1.png" width="240">](https://raw.githubusercontent.com/y20k/trackbook/master/fastlane/metadata/en-US/phoneScreenshots/p1.png)
-[<img src="https://raw.githubusercontent.com/y20k/trackbook/master/fastlane/metadata/en-US/phoneScreenshots/p2.png" width="240">](https://raw.githubusercontent.com/y20k/trackbook/master/fastlane/metadata/en-US/phoneScreenshots/p2.png)
+[<img src="https://raw.githubusercontent.com/y20k/trackbook/master/metadata/en-US/phoneScreenshots/p1.png" width="240">](https://raw.githubusercontent.com/y20k/trackbook/master/metadata/en-US/phoneScreenshots/p1.png)
+[<img src="https://raw.githubusercontent.com/y20k/trackbook/master/metadata/en-US/phoneScreenshots/p2.png" width="240">](https://raw.githubusercontent.com/y20k/trackbook/master/metadata/en-US/phoneScreenshots/p2.png)
 
-[<img src="https://raw.githubusercontent.com/y20k/trackbook/master/fastlane/metadata/en-US/phoneScreenshots/p3.png" width="240">](https://raw.githubusercontent.com/y20k/trackbook/master/fastlane/metadata/en-US/phoneScreenshots/p3.png)
-[<img src="https://raw.githubusercontent.com/y20k/trackbook/master/fastlane/metadata/en-US/phoneScreenshots/p4.png" width="240">](https://raw.githubusercontent.com/y20k/trackbook/master/fastlane/metadata/en-US/phoneScreenshots/p4.png)
+[<img src="https://raw.githubusercontent.com/y20k/trackbook/master/metadata/en-US/phoneScreenshots/p3.png" width="240">](https://raw.githubusercontent.com/y20k/trackbook/master/metadata/en-US/phoneScreenshots/p3.png)
+[<img src="https://raw.githubusercontent.com/y20k/trackbook/master/metadata/en-US/phoneScreenshots/p4.png" width="240">](https://raw.githubusercontent.com/y20k/trackbook/master/metadata/en-US/phoneScreenshots/p4.png)

app/src/main/res/values-it/strings.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- activities -->
-    <string name="app_name">Trackbook</string> <!-- please do not translate app_name - transcription into different alphabet types is fine though -->
-
+    <string name="app_name">Trackbook</string>
+    <!-- please do not translate app_name - transcription into different alphabet types is fine though -->
     <!-- tabs -->
     <string name="tab_map">Mappa</string>
     <string name="tab_last_tracks">Ultime Tracce</string>
-
     <!-- notification -->
     <string name="notification_title_trackbook_running">Trackbook in esecuzione</string>
     <string name="notification_title_trackbook_not_running">Trackbook non in esecuzione</string>
@@ -17,18 +16,15 @@
     <string name="notification_content_distance">Distanza</string>
     <string name="notification_channel_recording_name">Stato Registrazione Movimento</string>
     <string name="notification_channel_recording_description">Visualizza durata e distanza. Opzione per interrompere la registrazione del movimento.</string>
-
     <!-- snackbar messages -->
     <string name="snackbar_message_tracking_stopped">Tracciamento interrotto</string>
     <string name="snackbar_message_tracking_started">Tracciamento avviato</string>
     <string name="snackbar_message_tracking_resumed">Tracciamento ripreso</string>
     <string name="snackbar_message_location_offline">La posizione è disattivata. Trackbook non funzionerà.</string>
-
     <!-- fab sub menu -->
     <string name="fab_sub_menu_clear">Cancella</string>
     <string name="fab_sub_menu_save">Salva</string>
     <string name="fab_sub_menu_resume">Riprendi</string>
-
     <!-- dialogs -->
     <string name="dialog_default_action_cancel">Annulla</string>
     <string name="dialog_clear_content">Cancellare la registrazione\?</string>
@@ -46,7 +42,6 @@
     <string name="dialog_error_empty_recording_title">Impossibile salvare</string>
     <string name="dialog_error_empty_recording_content">Trackbook non ha registrato nessun waypoint finora.</string>
     <string name="dialog_error_empty_recording_action_resume">Riprendi la registrazione</string>
-
     <!-- toast messages -->
     <string name="toast_message_permissions_granted">Autorizzazioni concesse.</string>
     <string name="toast_message_unable_to_start_app">Impossibile avviare Trackbook.</string>
@@ -65,15 +60,13 @@
     <string name="toast_message_theme_night">Passaggio alla modalità notturna (pressione prolungata rilevata)</string>
     <string name="toast_message_theme_day">Passaggio alla modalità diurna (pressione prolungata rilevata)</string>
     <string name="toast_message_theme_follow_system">Passaggio alla modalità Segui Impostazione di Sistema (pressione prolungata rilevata)</string>
-
     <!-- map markers -->
     <string name="marker_description_source">Fonte</string>
     <string name="marker_description_time">Ora</string>
     <string name="marker_description_accuracy">Precisione</string>
-
     <!-- statistics sheet -->
     <string name="statistics_sheet_h1_statistics">Statistiche</string>
-    <string name="statistics_sheet_p_default_data">dati mancanti</string>
+    <string name="statistics_sheet_p_default_data">dati della traccia mancanti</string>
     <string name="statistics_sheet_p_distance">Distanza totale:</string>
     <string name="statistics_sheet_p_steps">Passi:</string>
     <string name="statistics_sheet_p_steps_no_pedometer">pedometro non disponibile</string>
@@ -85,7 +78,6 @@
     <string name="statistics_sheet_p_min_altitude">Waypoint più basso:</string>
     <string name="statistics_sheet_p_positive_elevation">Elevazione (in salita):</string>
     <string name="statistics_sheet_p_negative_elevation">Elevazione (in discesa):</string>
-
     <!-- onboarding layout -->
     <string name="layout_onboarding_h1_welcome">Ciao</string>
     <string name="layout_onboarding_description_app_icon">Icona dell\'applicazione Trackbook</string>
@@ -97,11 +89,9 @@
     <string name="layout_onboarding_h3_permission_storage">MEMORIA</string>
     <string name="layout_onboarding_p_permission_storage">Trackbook usa osmdroid, che memorizza porzioni di mappa sull\'SD esterna di Android. Puoi trovare la cache della mappa nella cartella osmdroid al livello più alto del file system accessibile all\'utente.</string>
     <string name="layout_onboarding_button_okay">Capito!</string>
-
     <!-- track tab onboarding -->
     <string name="track_tab_onboarding_h1_part_1">Le tue tracce registrate</string>
     <string name="track_tab_onboarding_h1_part_2">… verranno mostrate qui.</string>
-
     <!-- descriptions -->
     <string name="descr_map_current_track">Mappatura della traccia corrente</string>
     <string name="descr_map_last_track">Mappatura dell\'ultima traccia</string>
@@ -118,5 +108,4 @@
     <string name="descr_export_button">Pulsante Esporta traccia</string>
     <string name="descr_delete_button">Pulsante Elimina traccia</string>
     <string name="descr_share_button_gpx">Pulsante Condividi che permette di esportare come GPX</string>
-
-</resources>
+</resources>

app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#3C98DB</color>
-</resources>

assets/README.md

@@ -14,4 +14,4 @@ How to create Trackbooks's [Adaptive Icon](https://developer.android.com/guide/p
 6. Foreground Layer: Set Resize to `100%`
 
 ## F-Droid Assets
-F-Droid assets are found in the folder **metadata/\<locale\>/**.
+F-Droid assets are found in the folder **metadata/\<locale\>/**.

assets/trackbook-app-icon-current.svg

@@ -1,12 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
+<<<<<<< HEAD
 <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
     xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="svg2" xml:space="preserve"
     width="108pt" height="108pt" viewBox="0 0 144.00001 144.00001" sodipodi:docname="trackbook-app-icon-red.svg"
     inkscape:version="0.92.4 5da689c313, 2019-01-14" inkscape:export-filename="/home/solaris/Desktop/trackbook/assets/trackbook-app-icon-background-current.png"
     inkscape:export-xdpi="1000" inkscape:export-ydpi="1000"><metadata
+=======
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   xml:space="preserve"
+   width="108pt"
+   height="108pt"
+   viewBox="0 0 144.00001 144.00001"
+   sodipodi:docname="trackbook-app-icon-current.svg"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   inkscape:export-filename="/Users/solaris/Desktop/trackbook/assets/trackbook-app-icon-current.png"
+   inkscape:export-xdpi="1117.09"
+   inkscape:export-ydpi="1117.09"><metadata
+>>>>>>> origin/master
      id="metadata8"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
@@ -290,7 +312,7 @@
                    id="g390"><g
                      transform="matrix(75,0,0,411,260,31)"
                      id="g388"><image
-                       sodipodi:absref="/home/solaris/Desktop/trackbook/assets/app-icon-5_img0.png"
+                       sodipodi:absref="/Users/solaris/Desktop/trackbook/assets/app-icon-5_img0.png"
                        xlink:href="app-icon-5_img0.png"
                        id="image386"
                        transform="matrix(1,0,0,-1,0,1)"
@@ -351,6 +373,7 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
+<<<<<<< HEAD
      inkscape:window-width="2043"
      inkscape:window-height="1370"
      id="namedview4"
@@ -362,13 +385,42 @@
      inkscape:window-y="27"
      inkscape:window-maximized="0"
      inkscape:current-layer="layer3"
+=======
+     inkscape:window-width="1920"
+     inkscape:window-height="1156"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="3.9999998"
+     inkscape:cx="47.788092"
+     inkscape:cy="55.67287"
+     inkscape:window-x="83"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g10"
+>>>>>>> origin/master
      units="pt"
      showguides="true"
      inkscape:guide-bbox="true"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
+<<<<<<< HEAD
      fit-margin-bottom="0" /><g
+=======
+     fit-margin-bottom="0"><sodipodi:guide
+       position="0,72.000005"
+       orientation="0,1"
+       id="guide4776"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" /><sodipodi:guide
+       position="72.000005,0"
+       orientation="1,0"
+       id="guide4778"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" /></sodipodi:namedview><g
+>>>>>>> origin/master
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="background "
@@ -411,7 +463,7 @@
      transform="translate(-14,-98)"><g
        inkscape:label="shaddow shape"
        style="display:inline"
-       transform="matrix(0.37011394,0,0,0.37101603,199.5487,288.5418)"
+       transform="matrix(0.37011394,0,0,0.37101603,199.5487,289.65056)"
        id="g1000"><path
          inkscape:connector-curvature="0"
          d="m -237.11371,-383.84088 -25.30707,4.44676 -36.05251,6.33522 -8.32059,1.46227 v 8.65587 105.31928 8.65662 l 44.3731,-7.79786 25.30707,-4.44601 c 4.59484,-0.80779 8.31981,-5.33777 8.31981,-10.11889 v -105.3189 c 0,-4.78075 -3.72497,-8.00177 -8.31981,-7.19436 m -139.36038,0 25.30707,4.44676 36.05253,6.33522 8.32059,1.46227 v 8.65587 105.31928 8.65662 l -44.37312,-7.79786 -25.30707,-4.44601 c -4.59484,-0.80779 -8.31981,-5.33777 -8.31981,-10.11889 v -105.3189 c 0,-4.78075 3.72497,-8.00177 8.31981,-7.19436"
@@ -426,7 +478,7 @@
        id="g190"
        inkscape:label="right page"
        style="display:inline"
-       transform="matrix(0.1028593,0,0,0.10311016,38.168066,35.957148)"><g
+       transform="matrix(0.1028593,0,0,0.10311016,38.168064,35.125581)"><g
          id="g192"
          clip-path="url(#clipPath196)"
          inkscape:label="right page"><g
@@ -497,7 +549,7 @@
        id="g296"
        style="display:inline"
        inkscape:label="left page"
-       transform="matrix(0.1028593,0,0,0.10311016,38.168066,35.957148)"><g
+       transform="matrix(0.1028593,0,0,0.10311016,38.168064,35.125581)"><g
          id="g298"
          clip-path="url(#clipPath302)"
          inkscape:label="left page"><g
@@ -558,13 +610,13 @@
      id="layer2"
      inkscape:label="save zones"
      style="display:none"><circle
-       style="display:none;opacity:0.12999998;fill:#ff71ff;fill-opacity:1;stroke-width:7.09376144"
+       style="display:inline;opacity:0.12999998;fill:#ff71ff;fill-opacity:1;stroke-width:7.09376144"
        id="path4770"
        cx="72"
        cy="72"
        inkscape:label="circular 66pt"
        r="44" /><rect
-       style="display:none;opacity:0.12999998;fill:#ff71ff;fill-opacity:1"
+       style="display:inline;opacity:0.12999998;fill:#ff71ff;fill-opacity:1"
        id="rect4774"
        width="96"
        height="96"

metadata/en-US/changelogs/34.txt

@@ -1,6 +1,6 @@
-# v1.1.18 - San Tropez
+# v1.2.0 - San Tropez
 
-**2019-04-09**
+**2019-04-10**
 - new Danish language version
 - updated translations
-- updated icon
+- updated icon

metadata/en-US/full_description.txt

@@ -40,10 +40,10 @@ WHICH PERMISSIONS DOES TRACKBOOK NEED?
 Permission "INTERNET"
 Trackbook needs to download map data from OpenStreetMap servers and therefore needs access to the internet.
 
-Permission "ACCESS\_NETWORK\_STATE" and "ACCESS\_WIFI\_STATE"
+Permission "ACCESS_NETWORK_STATE" and "ACCESS_WIFI_STATE"
 Trackbook uses [osmdroid](https://github.com/osmdroid/osmdroid/) to draw its maps. osmdroid needs to know the current state of your device’s connectivity - see [Prerequisites](https://github.com/osmdroid/osmdroid/wiki/Prerequisites).
 
-Permission "ACCESS\_COARSE\_LOCATION" and "ACCESS\_FINE\_LOCATION"
+Permission "ACCESS_COARSE_LOCATION" and "ACCESS_FINE_LOCATION"
 Trackbook needs accurate GPS location data to be able to record your movements. If the GPS data is not available or not accurate enough Trackbook uses location data from cell tower and WiFi triangulation.
 
 Permission "VIBRATE"