Skip to content

Commit

Permalink
Merge pull request #511 from enviroCar/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
dewall authored Mar 27, 2020
2 parents f26cbf3 + aef10d1 commit 5152731
Show file tree
Hide file tree
Showing 8 changed files with 172 additions and 260 deletions.
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ ext {
compileSdkVersion = 28
targetSdkVersion = 28
buildToolsVersion = '28.0.3'
versionCode = 43
versionName = "1.1.3"
versionCode = 44
versionName = "1.1.4"

javaCompileVersion = JavaVersion.VERSION_1_8

Expand Down
4 changes: 2 additions & 2 deletions org.envirocar.app/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
package="org.envirocar.app"
android:installLocation="internalOnly"
android:versionCode="43"
android:versionName="1.1.3">
android:versionCode="44"
android:versionName="1.1.4">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
Expand Down
24 changes: 9 additions & 15 deletions org.envirocar.app/res/layout/report_issue_checkbox_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,29 @@
with the enviroCar app. If not, see http://www.gnu.org/licenses/.
-->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_height="wrap_content">

<CheckBox
android:id="@+id/report_issue_checkbox_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:layout_marginLeft="16dp" />

<TextView
android:id="@+id/report_issue_check_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:fontFamily="@font/roboto"
android:textColor="#000000"
android:text="Some Issue"
android:singleLine="false"
android:breakStrategy="high_quality"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="@+id/report_issue_checkbox_item"
app:layout_constraintStart_toEndOf="@+id/report_issue_checkbox_item"
app:layout_constraintTop_toTopOf="@+id/report_issue_checkbox_item" />
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_gravity="center"/>

</LinearLayout>
190 changes: 83 additions & 107 deletions org.envirocar.app/res/layout/send_log_layout_new.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,158 +18,134 @@
with the enviroCar app. If not, see http://www.gnu.org/licenses/.
-->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/relativeLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">

<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/toolbar"
style="@style/ToolBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/blue_dark_cario"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<include layout="@layout/envirocar_toolbar" />

<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar">
android:layout_height="match_parent"
android:paddingHorizontal="8dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:layout_marginVertical="8dp">

<EditText
android:id="@+id/report_issue_header"
android:layout_width="wrap_content"
<TextView
android:id="@+id/report_issue_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginTop="12dp"
android:fontFamily="@font/roboto_medium"
android:hint="@string/report_issue_summary"
android:textSize="20sp" />

<EditText
android:id="@+id/report_issue_desc"
android:layout_width="match_parent"
android:layout_height="170dp"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:background="@android:color/transparent"
android:fontFamily="@font/roboto"
android:gravity="start|top"
android:hint="@string/report_issue_desc_text"
android:inputType="textMultiLine"
android:padding="4dp"
android:textColor="#000000" />
android:layout_marginBottom="12dp"
android:fontFamily="@font/roboto_light1"
android:lineSpacingExtra="1.5dp"
android:text="@string/report_issue_text" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
android:orientation="horizontal"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="8dp">

<TextView
android:id="@+id/report_issue_time_since_crash_txtview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:fontFamily="@font/roboto_medium"
android:text="@string/report_issue_time_since_crash"
android:layout_marginLeft="4dp"
android:layout_marginRight="16dp"
android:textColor="@color/cario_color_primary_dark"
android:textSize="18sp" />

<EditText
android:id="@+id/report_issue_time_since_crash"
android:layout_width="wrap_content"
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:hint="@string/report_issue_minutes"
android:inputType="number"
android:textSize="18sp" />
android:hint="@string/report_issue_minutes">

<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/report_issue_time_since_crash"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start|top"
android:imeOptions="actionNext"
android:inputType="number"
android:padding="12dp" />

</com.google.android.material.textfield.TextInputLayout>

</LinearLayout>

<ListView
android:id="@+id/report_issue_checkbox_list"
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/activity_car_selection_newcar_layout_manufacturer"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:divider="@null" />
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="8dp"
android:hint="@string/problem_description">

<TextView
android:id="@+id/report_issue_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginTop="12dp"
android:layout_marginRight="12dp"
android:layout_marginBottom="12dp"
android:fontFamily="@font/roboto_light1"
android:lineSpacingExtra="1.5dp"
android:text="@string/report_issue_text" />
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/report_issue_desc"
android:layout_width="match_parent"
android:layout_height="150dp"
android:gravity="start|top"
android:imeOptions="actionNext"
android:inputType="textMultiLine"
android:padding="12dp" />

<Button
android:id="@+id/report_issue_submit"
</com.google.android.material.textfield.TextInputLayout>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center|center_vertical"
android:layout_margin="12dp"
android:layout_marginRight="20dp"
android:background="@drawable/btn_new"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="16dp"
android:textSize="18sp"
android:fontFamily="@font/roboto_medium"
android:paddingLeft="25dp"
android:paddingTop="15dp"
android:paddingRight="25dp"
android:paddingBottom="15dp"
android:text="@string/report_issue_button"
android:textAllCaps="true"
android:textSize="15sp" />
android:textColor="@color/cario_color_primary_dark"
android:text="@string/categories" />

<TextView
android:id="@+id/report_issue_bottom_text"
<ListView
android:id="@+id/report_issue_checkbox_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginTop="12dp"
android:layout_marginRight="12dp"
android:fontFamily="@font/roboto_light1"
android:lineSpacingExtra="1.5dp"
android:text="@string/report_issue_bottom_text" />
android:layout_marginHorizontal="12dp"
android:divider="@null" />

<TextView
android:id="@+id/report_issue_log_location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginTop="8dp"
android:layout_marginRight="12dp"
android:layout_marginBottom="3dp"
android:fontFamily="@font/roboto_medium" />
<androidx.cardview.widget.CardView
android:id="@+id/report_issue_submit"
android:layout_width="250dp"
android:layout_height="50dp"
android:layout_marginVertical="26dp"
android:layout_marginHorizontal="16dp"
android:layout_centerHorizontal="true"
android:layout_gravity="center"
app:cardBackgroundColor="@color/cario_color_primary_dark"
app:cardCornerRadius="25dp"
app:cardElevation="10dp">

<TextView
android:id="@+id/report_issue_other_file"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_marginBottom="35dp"
android:fontFamily="@font/roboto_medium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/report_issue_button"
android:textColor="@color/white_cario" />

</androidx.cardview.widget.CardView>
</LinearLayout>
</ScrollView>


</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
20 changes: 13 additions & 7 deletions org.envirocar.app/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,10 @@

<string name="welcome_message">Willkommen, %s</string>
<string name="goodbye_message">Auf Wiederstehen, %s</string>
<string name="problem_description">Beschreiben Sie Ihr Problem</string>

<string name="envirocar.org">http://www.envirocar.org</string>
<string name="categories">Kategorien:</string>

<string name="imperial_unit">Imperiale Maßeinheiten?</string>

Expand Down Expand Up @@ -86,15 +88,15 @@
<string name="report_issue_time_since_crash">Ungefährer Zeitpunkt:</string>
<string name="report_issue_minutes">10:00</string>

<string name="report_issue_no_checkbox_selected_title">Keine Kategorie ausgewählt</string>
<string name="report_issue_no_checkbox_selected_content">Sie haben keines der Kategorien markiert. Diese helfen jedoch den Entwicklern, Probleme zu kategorisieren und schneller zu lösen. Bitte erwägen Sie, die relevanten Felder auszufüllen.</string>
<string name="report_issue_no_checkbox_send_anyway">Bericht trotzdem senden</string>

<string name="report_issue_text">
Zeitstempel werden automatisch in die Protokolle aufgenommen. Das Senden von Berichten an uns hilft uns,
unerwartetes Verhalten oder Abstürze zu reproduzieren. Das macht enviroCar besser und stabiler.
Klicken Sie auf die Schaltfläche Senden unten, um diesen Bericht per EMail an uns zu senden.</string>
<string name="report_issue_bottom_text">Diese Funktion verwendet die Standardeinstellung \"Senden an\".
Wenn Sie es mit Ihrem EMail-Client aufrufen, können Sie den Bericht ganz einfach per EMail versenden.
Wenn Sie keinen EMail-Client installiert haben, können Sie die Protokolldatei auf einem PC speichern,
z.B. über Bluetooth oder USB. \n\nIn solchen Fällen bitten wir Sie, das Berichtspaket manuell einzusenden.
Sie werden an den folgenden Stellen aufbewahrt:</string>
unerwartetes Verhalten oder Abstürze zu reproduzieren. Dadurch können wir enviroCar stabilisieren und verbessern.
Klicken Sie auf unten auf die Schaltfläche "Bericht Senden", um diesen Bericht per EMail inklusive Protokolldaten an uns zu senden.</string>
<string name="report_issue_bottom_text">Diese Funktion verwendet die Standardeinstellung \"Senden an\".</string>
<string name="report_issue_desc_text">Eine detailliertere Beschreibung</string>
<string name="report_issue_button">Bericht Absenden</string>
<string-array name="report_issue_subject_header">
Expand Down Expand Up @@ -137,4 +139,8 @@
<!-- ################# -->
<string name="permissions_request_dialog">Die enviroCar App benötigt für die Aufzeichnung von Fahrten weitere Berechtigung, die Sie im Folgenden manuell bestätigen können. Hierzu gehört zum einem die genaue Positionsbestimmung des Smartphones, damit gesammelte Parameter einer Fahrt im Raum verortet werden können, und zum anderen die Schreibberechtigung auf den externen Speicher, damit Logs generiert und im Falle von Fehlverhalten durch die Funktion "Problem melden" an uns übermittelt werden können. </string>

<!-- ###################### -->
<!-- Extended MapView -->
<!-- ###################### -->
<string name="mapview_extended_select_phenomena">Attributauswahl</string>
</resources>
Loading

0 comments on commit 5152731

Please sign in to comment.