Skip to content

Commit

Permalink
Merge pull request #372 from enviroCar/fix/upload
Browse files Browse the repository at this point in the history 
Fix/upload
  • Loading branch information
dewall authored Nov 22, 2019
2 parents ccc924c + 9bba78e commit c2bddd0
Show file tree
Hide file tree
Showing 14 changed files with 858 additions and 583 deletions.
114 changes: 57 additions & 57 deletions org.envirocar.app/res/layout/fragment_tracklist_uploading_single_dialog.xml
View file
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2013 - 2019 the enviroCar community
This file is part of the enviroCar app.
The enviroCar app is free software: you can redistribute it and/or
modify it under the terms of the GNU General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
The enviroCar app is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
Public License for more details.
You should have received a copy of the GNU General Public License along
with the enviroCar app. If not, see http://www.gnu.org/licenses/.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center"
android:padding="@dimen/spacing_large"
android:layout_weight="1">

<TextView
android:layout_width="match_parent"
android:gravity="left"
android:layout_height="wrap_content"
android:text="@string/track_list_upload_track_content"/>

<TextView
android:id="@+id/fragment_tracklist_uploading_single_dialog_trackname"
android:layout_width="match_parent"
android:padding="@dimen/spacing_medium"
android:gravity="center"
android:layout_height="wrap_content"
android:textStyle="bold"
android:text="Track"/>

</LinearLayout>

<ProgressBar
android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_height="wrap_content"/>

</LinearLayout>
<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2013 - 2019 the enviroCar community
This file is part of the enviroCar app.
The enviroCar app is free software: you can redistribute it and/or
modify it under the terms of the GNU General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
The enviroCar app is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
Public License for more details.
You should have received a copy of the GNU General Public License along
with the enviroCar app. If not, see http://www.gnu.org/licenses/.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="24dp"
android:orientation="horizontal">

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:orientation="vertical">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left"
android:text="@string/track_list_upload_track_content" />

<TextView
android:id="@+id/fragment_tracklist_uploading_single_dialog_trackname"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="@dimen/spacing_medium"
android:text="Track"
android:textStyle="bold" />

</LinearLayout>

<ProgressBar
android:layout_marginLeft="16dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center" />

</LinearLayout>
9 changes: 9 additions & 0 deletions org.envirocar.app/res/values-de/strings_track_list.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@
<string name="track_list_upload_track_content">Die folgende Fahrt wird als Open Data auf den enviroCar Server hochgeladen: </string>
<string name="track_list_upload_track_success_template">Die Fahrt \'%s\' wurde erfolgreich hochgeladen.</string>

<string name="track_list_upload_error_no_measurements">Die Fahrt enthält nicht genügend Messungen, um sie als verschleierte Fahrt hochzuladen.</string>
<string name="track_list_upload_error_no_valid_car">Hochladen der Fahrt nicht möglich. Der Fahrt ist kein gültiges Fahrzeug zugeordnet.</string>
<string name="track_list_upload_error_already_uploaded">Hochladen der Fahrt nicht möglich. Die Fahrt wurde bereits hochgeladen.</string>
<string name="track_list_upload_error_no_network_connection">Hochladen der Fahrt nicht möglich. Es besteht keine Verbindung mit dem Internet.</string>
<string name="track_list_upload_error_not_logged_in">Hochladen der Fahrt nicht möglich. Du bist nicht mit deinem Account angemeldet.</string>
<string name="track_list_upload_error_gps_track">Hochladen der Fahrt nicht möglich. Das Hochladen von GPS-basierten Tracks ist derzeit nicht möglich.</string>
<string name="track_list_upload_error_unauthorized">Hochladen der Fahrt nicht möglich. Du bist nicht authorisiert.</string>

<string name="track_list_loading_tracks">Lade Fahrten...</string>
<string name="track_list_loading_tracks_error_snackbar">Fehler beim Laden der Daten.\nBitte senden Sie einen Fehlerreport.</string>
<string name="track_list_loading_lremote_tracks_error">Fehler während des Ladens von heruntergladenen Fahrten.</string>
Expand Down Expand Up @@ -71,6 +79,7 @@

<string name="track_list_upload_all_tracks_title">Alle Fahrten Hochladen?</string>
<string name="track_list_upload_all_tracks_content">Sie sind dabei alle ihre Fahrten auf den enviroCar Server als Open Data hochzuladen. Alle Fahrten werden damit ihrem Benutzerkonto zugewiesen und anaonymisiert für andere zugreifbar.\n\nMöchten Sie fortfahren?</string>
<string name="track_list_upload_all_tracks_complete_template">%d of %d Fahrten wurden erfolgreich hochgeladen. %d Fahrten hatten zu wenig Messungen.</string>
<string name="track_list_uploading_please_wait">Bitte warten...</string>

<string name="track_list_details_subtitle_template">Ihre Fahrt mit %s %s am %s.</string>
Expand Down
12 changes: 10 additions & 2 deletions org.envirocar.app/res/values/strings_track_list.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2013 - 2019 the enviroCar community
Expand Down Expand Up @@ -37,6 +36,14 @@
<string name="track_list_upload_track_content">Uploading the following track as Open Data to the enviroCar server:</string>
<string name="track_list_upload_track_success_template">The upload of track \'%s\' was successful.</string>

<string name="track_list_upload_error_no_measurements">The track does not contain enough measurements to upload as obfuscated track.</string>
<string name="track_list_upload_error_no_valid_car">Unable to upload track. The track does not have a valid car assigned.</string>
<string name="track_list_upload_error_already_uploaded">Unable to upload track. The track has already been uploaded.</string>
<string name="track_list_upload_error_no_network_connection">Unable to upload track. Not connection to the internet available.</string>
<string name="track_list_upload_error_not_logged_in">Unable to upload track. You are not logged in to any account yet.</string>
<string name="track_list_upload_error_gps_track">Unable to upload track. The upload of GPS-based tracks is currently not possible.</string>
<string name="track_list_upload_error_unauthorized">Unable to upload track. You are not authorized to do that.</string>

<string name="track_list_loading_tracks">Loading...</string>
<string name="track_list_loading_tracks_error_snackbar">Error while loading the data.\nPlease send an error report.</string>
<string name="track_list_loading_lremote_tracks_error">Error while loading downloaded remote tracks.</string>
Expand Down Expand Up @@ -72,6 +79,7 @@

<string name="track_list_upload_all_tracks_title">Upload All Local Tracks?</string>
<string name="track_list_upload_all_tracks_content">You are about to upload all tracks. This means that all tracks will be uploaded and assigned to your account.\n\nDo you want to continue?</string>
<string name="track_list_upload_all_tracks_complete_template">%d of %d tracks have been successfully uploaded. %d tracks had to less measurements to upload.</string>
<string name="track_list_uploading_please_wait">Please wait...</string>

<string name="track_list_details_subtitle_template">Your Track with %s %s on %s.</string>
Expand Down
Loading

0 comments on commit c2bddd0

Please sign in to comment.