Merge pull request #436 from enviroCar/develop

Develop
enviroCar · Feb 18, 2020 · 1341caa · 1341caa
2 parents e52628b + 9bb5d13
commit 1341caa
Show file tree

Hide file tree

Showing 31 changed files with 698 additions and 805 deletions.
diff --git a/build.gradle b/build.gradle
@@ -58,7 +58,7 @@ ext {
     // Android dependencies.
     supportV4 = 'androidx.legacy:legacy-support-v4:1.0.0'
     supportV7 = 'androidx.appcompat:appcompat:1.1.0'
-    supportDesign = 'com.google.android.material:material:1.0.0'
+    supportDesign = 'com.google.android.material:material:1.1.0'
     supportCardview = 'androidx.cardview:cardview:1.0.0'
     supportRecyclerview = 'androidx.recyclerview:recyclerview:1.0.0'
     supportConstraintLayout = 'androidx.constraintlayout:constraintlayout:1.1.3'

diff --git a/org.envirocar.app/res/drawable/ic_date_24dp.xml b/org.envirocar.app/res/drawable/ic_date_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,11L7,11v2h2v-2zM13,11h-2v2h2v-2zM17,11h-2v2h2v-2zM19,4h-1L18,2h-2v2L8,4L8,2L6,2v2L5,4c-1.11,0 -1.99,0.9 -1.99,2L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.9,-2 -2,-2zM19,20L5,20L5,9h14v11z"/>
+</vector>
diff --git a/org.envirocar.app/res/drawable/ic_directions_car_black_24dp.xml b/org.envirocar.app/res/drawable/ic_directions_car_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18.92,6.01C18.72,5.42 18.16,5 17.5,5h-11c-0.66,0 -1.21,0.42 -1.42,1.01L3,12v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,13 6.5,13s1.5,0.67 1.5,1.5S7.33,16 6.5,16zM17.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,11l1.5,-4.5h11L19,11L5,11z"/>
+</vector>
diff --git a/org.envirocar.app/res/drawable/ic_engine.xml b/org.envirocar.app/res/drawable/ic_engine.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="246.99496"
+    android:viewportWidth="246.99496" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000"
+        android:pathData="m101.877,202.829c-0.796,-0.192 -1.881,-0.584 -2.412,-0.87 -0.531,-0.286 -8.124,-6.511 -16.873,-13.833l-15.908,-13.312 -15.931,-0.003c-8.966,-0.002 -16.678,-0.21 -17.641,-0.478 -1.94,-0.539 -4.494,-2.958 -5.256,-4.978 -0.334,-0.886 -0.512,-9.065 -0.512,-23.518v-22.159h-5.548,-5.548l-0.008,22.553c-0.008,22.443 -0.013,22.562 -1.085,24.454 -2.424,4.276 -8.12,5.269 -11.783,2.054 -3.226,-2.833 -3.043,0.6 -3.043,-57.17L0.329,63.047l1.107,-2.126c2.948,-5.664 11.293,-5.539 14.022,0.211 0.699,1.472 0.792,4.308 0.792,24.148L16.249,107.759L21.797,107.759 27.344,107.759L27.344,85.403 27.344,63.047l1.111,-2.101c0.759,-1.436 1.776,-2.452 3.212,-3.212 1.987,-1.051 2.613,-1.111 11.616,-1.111h9.515l0.196,-4.483c0.215,-4.921 0.999,-6.904 3.451,-8.733 1.324,-0.987 1.955,-1.022 22.673,-1.256l21.312,-0.241 0.14,-3.715 0.14,-3.715 -20.884,-0.144c-18.717,-0.129 -21.042,-0.231 -22.409,-0.979 -1.961,-1.073 -3.396,-2.915 -4.099,-5.261 -0.973,-3.248 0.829,-7.2 4.099,-8.99 1.418,-0.776 5.007,-0.835 50.972,-0.835h49.447l1.993,1.142c4.887,2.801 5.389,9.497 0.984,13.138 -1.978,1.635 -5.239,1.881 -24.951,1.881h-19.273v3.859,3.859h20.914c20.894,0 20.915,0.001 22.508,1.085 3.59,2.443 3.586,2.427 3.854,16.195l0.241,12.388 12.147,0.241c11.308,0.225 12.239,0.31 13.478,1.236 3.037,2.27 3.307,3.074 3.477,10.375l0.157,6.72h3.099,3.099v-7.255c0,-8.177 0.527,-10.01 3.487,-12.121 1.538,-1.097 1.888,-1.13 13.647,-1.269 13.476,-0.16 14.648,0.043 16.786,2.911 0.645,0.865 3.969,7.869 7.386,15.563l6.213,13.99 0.132,29.082 0.132,29.082 -6.537,14.801c-3.595,8.14 -7.019,15.317 -7.609,15.948 -2.25,2.41 -2.846,2.503 -15.931,2.503 -11.914,0 -12.298,-0.03 -13.849,-1.085 -3.372,-2.295 -3.597,-2.981 -3.767,-11.491l-0.154,-7.685h-3.079,-3.079l-0.144,12.267c-0.135,11.515 -0.205,12.349 -1.138,13.598 -1.437,1.923 -3.155,3.081 -5.314,3.582 -2.229,0.517 -82.728,0.53 -84.867,0.014zM177.375,175.328c0,-11.967 0.188,-13.36 2.082,-15.394 2.381,-2.557 3.176,-2.713 14.794,-2.888 12.474,-0.189 15.278,0.056 17.426,1.519 3.321,2.261 3.55,2.967 3.72,11.48l0.154,7.706 3.38,-0.141 3.38,-0.141 4.547,-10.298 4.547,-10.298 0,-25.159 0,-25.159 -4.638,-10.492 -4.638,-10.492h-3.322,-3.322v7.16c0,6.544 -0.096,7.341 -1.111,9.261 -0.759,1.436 -1.776,2.452 -3.212,3.212 -2.038,1.078 -2.477,1.111 -14.733,1.111 -12.256,0 -12.695,-0.033 -14.733,-1.111 -3.478,-1.839 -4.322,-4.039 -4.322,-11.267v-5.954l-10.734,-0.003c-11.511,-0.003 -13.474,-0.286 -15.85,-2.285 -2.663,-2.24 -2.844,-3.262 -2.844,-16.028L147.947,58.071L108.39,58.071 68.832,58.071v4.512c0,3.885 -0.151,4.733 -1.085,6.106 -2.401,3.528 -2.662,3.597 -14.147,3.76l-10.341,0.147 0.123,43.029 0.123,43.029 14.714,0.266c8.092,0.146 14.763,0.309 14.824,0.362 0.061,0.053 7.512,6.283 16.558,13.845l16.448,13.749h35.663,35.663z" android:strokeWidth="0.48241204"/>
+</vector>
diff --git a/org.envirocar.app/res/drawable/ic_gas.xml b/org.envirocar.app/res/drawable/ic_gas.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.77,7.23l0.01,-0.01 -3.72,-3.72L15,4.56l2.11,2.11c-0.94,0.36 -1.61,1.26 -1.61,2.33 0,1.38 1.12,2.5 2.5,2.5 0.36,0 0.69,-0.08 1,-0.21v7.21c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1L17,14c0,-1.1 -0.9,-2 -2,-2h-1L14,5c0,-1.1 -0.9,-2 -2,-2L6,3c-1.1,0 -2,0.9 -2,2v16h10v-7.5h1.5v5c0,1.38 1.12,2.5 2.5,2.5s2.5,-1.12 2.5,-2.5L20.5,9c0,-0.69 -0.28,-1.32 -0.73,-1.77zM12,10L6,10L6,5h6v5zM18,10c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/>
+</vector>
diff --git a/org.envirocar.app/res/drawable/ic_manufacturer.xml b/org.envirocar.app/res/drawable/ic_manufacturer.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="32"
+    android:viewportWidth="32" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="m1.9959,0.4963c-0.8225,0 -1.5,0.6775 -1.5,1.5 0,0.8225 0.6775,1.5 1.5,1.5a0.5001,0.5001 0,0 0,0.0527 -0.002,0.5001 0.5001,0 0,0 0.0527,0.002l1.8984,0 0.0352,0 0.4688,0a0.5001,0.5001 0,0 0,0.008 0,0.5001 0.5001,0 0,0 0.041,0l3.4512,0c0.2821,0 0.5,0.2179 0.5,0.5 0,0.2821 -0.2179,0.5 -0.5,0.5a0.5001,0.5001 0,0 0,-0.0215 0,0.5001 0.5001,0 0,0 -0.0156,0l-2.9531,0a0.5001,0.5001 0,0 0,-0.1543 0.0234c-1.3058,0.1084 -2.3594,1.1614 -2.3594,2.4707a0.5001,0.5001 0,0 0,0 0.01l-1.5,0 0,25 3,-0.008a1.0001,1.0001 0,0 1,0 -0.002l0,-14.9902a1.0001,1.0001 0,0 1,0.4902 -0.8594l3.5098,-2.0801 0,-7.0606 -2.5,0a0.5001,0.5001 0,0 0,0 -0.01c0,-0.8193 0.6898,-1.4922 1.5762,-1.4922a0.5001,0.5001 0,0 0,0.0606 -0.002l0.8301,0a0.5001,0.5001 0,0 0,0.002 0,0.5001 0.5001,0 0,0 0.0664,-0.004c0.808,-0.0173 1.4688,-0.6843 1.4688,-1.4961 0,-0.7651 -0.5901,-1.3968 -1.334,-1.4824a0.5001,0.5001 0,0 0,-0.1309 -0.0175l-3.5273,0a0.5001,0.5001 0,0 0,-0.008 0l-0.5039,0c-0.2821,0 -0.5,-0.2179 -0.5,-0.5 0,-0.2821 0.2179,-0.5 0.5,-0.5a0.5001,0.5001 0,1 0,0 -1c-0.8225,0 -1.5,0.6775 -1.5,1.5 0,0.1757 0.0352,0.3428 0.0918,0.5l-0.4902,0a0.5001,0.5001 0,0 0,-0.0508 0.002,0.5001 0.5001,0 0,1 -0.002,0 0.5001,0.5001 0,0 0,-0.0527 -0.002c-0.2821,0 -0.5,-0.2179 -0.5,-0.5 0,-0.2821 0.2179,-0.5 0.5,-0.5a0.5001,0.5001 0,1 0,0 -1zM5.0232,5.5041c-0.3238,0.4155 -0.5234,0.9248 -0.5234,1.4863a0.5001,0.5001 0,0 0,0 0.01l-1,0a0.5001,0.5001 0,0 0,0 -0.01c0,-0.8025 0.6633,-1.4596 1.5234,-1.4863zM18.4998,12.9982 L11.7498,17.0002 11.7478,13.0002 4.9997,17.0002 4.9997,31.9904 31.9998,32.0004 31.9998,12.9984 25.2498,16.9984 25.2498,12.9984 18.4998,16.9984 18.4998,12.9984zM7.9998,19.9963 L10.9998,19.9963 10.9998,22.9963 7.9998,22.9963 7.9998,19.9963zM13.9998,19.9963 L16.9998,19.9963 16.9998,22.9963 13.9998,22.9963 13.9998,19.9963zM19.9998,19.9963 L22.9998,19.9963 22.9998,22.9963 19.9998,22.9963 19.9998,19.9963zM25.9998,19.9963 L28.9998,19.9963 28.9998,22.9963 25.9998,22.9963 25.9998,19.9963zM7.9998,25.9963 L10.9998,25.9963 10.9998,28.9963 7.9998,28.9963 7.9998,25.9963zM13.9998,25.9963 L16.9998,25.9963 16.9998,28.9963 13.9998,28.9963 13.9998,25.9963zM19.9998,25.9963 L22.9998,25.9963 22.9998,28.9963 19.9998,28.9963 19.9998,25.9963zM25.9998,25.9963 L28.9998,25.9963 28.9998,28.9963 25.9998,28.9963 25.9998,25.9963z"/>
+</vector>
diff --git a/org.envirocar.app/res/layout/activity_car_selection_layout.xml b/org.envirocar.app/res/layout/activity_car_selection_layout.xml
@@ -31,14 +31,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/activity_car_selection_layout_toolbar"
-            style="@style/ToolBarStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/blue_dark_cario"
-            android:orientation="vertical"
-            app:elevation="6dp"/>
+        <include layout="@layout/envirocar_toolbar"></include>
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -47,7 +40,7 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/activity_car_selection_layout_exptoolbar"
-                style="@style/Widget.enviroCar.Toolbar"
+                style="@style/enviroCar.Toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:elevation="6dp"
@@ -127,7 +120,6 @@
                 android:background="#3f3f3f3f"
                 android:visibility="gone"/>
 
-
         </RelativeLayout>
     </LinearLayout>
 
@@ -140,6 +132,7 @@
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/activity_car_selection_new_car_fab"
         style="@style/Widget.enviroCar.Fab"
+        android:src="@drawable/ic_add_white_24dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
         android:layout_gravity="bottom|end"

diff --git a/org.envirocar.app/res/layout/activity_car_selection_layout_carlist_entry.xml b/org.envirocar.app/res/layout/activity_car_selection_layout_carlist_entry.xml
@@ -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
 
@@ -19,10 +18,10 @@
     with the enviroCar app. If not, see http://www.gnu.org/licenses/.
 
 -->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/spacing_xxxxlarge"
+    android:layout_height="64dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginTop="@dimen/spacing_large"
     android:layout_marginLeft="@dimen/spacing_large"
     android:layout_marginRight="@dimen/spacing_large"
@@ -35,7 +34,7 @@
         android:layout_centerVertical="true"
         android:layout_marginLeft="@dimen/spacing_medium"
         android:alpha="0.54"
-        android:src="@drawable/ic_drive_eta_black_24dp"/>
+        android:src="@drawable/ic_drive_eta_black_24dp" />
 
     <RadioButton
         android:id="@+id/activity_car_selection_layout_carlist_entry_radio"
@@ -44,81 +43,43 @@
         android:layout_alignParentRight="true"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/spacing_large"/>
+        android:layout_marginLeft="@dimen/spacing_large" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
         android:layout_alignWithParentIfMissing="true"
-        android:layout_centerVertical="true"
-        android:layout_marginBottom="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_centerInParent="true"
         android:layout_toLeftOf="@id/activity_car_selection_layout_carlist_entry_radio"
         android:layout_toRightOf="@id/activity_car_selection_layout_carlist_entry_icon"
         android:orientation="vertical"
         android:paddingLeft="24dp"
         android:paddingRight="@dimen/spacing_large">
 
-        <TextView
-            android:id="@+id/activity_car_selection_layout_carlist_entry_firstline"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:gravity="center_vertical"
-            android:text="Car Type"
-            android:textSize="16sp"/>
 
-        <LinearLayout
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/activity_car_selection_layout_carlist_entry_firstline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="8dp"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/activity_car_selection_layout_carlist_entry_year"
-                    style="@style/carDetailsSubtitle"
-                    android:text="2004"
-                    android:textSize="13sp"/>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginRight="16dp"
-                android:layout_marginTop="8dp"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/activity_car_selection_layout_carlist_entry_gasoline"
-                    style="@style/carDetailsSubtitle"
-                    android:text="Gasoline"
-                    android:textSize="13sp"/>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginTop="8dp"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/activity_car_selection_layout_carlist_entry_engine"
-                    style="@style/carDetailsSubtitle"
-                    android:text="Gasoline"
-                    android:textSize="13sp"/>
-
-            </LinearLayout>
-
-        </LinearLayout>
+            android:fontFamily="@font/roboto_medium"
+            android:singleLine="true"
+            android:text="@string/dashboard_carselection_no_car_selected"
+            android:textColor="#000000"
+            app:autoSizeMaxTextSize="20sp"
+            app:autoSizeMinTextSize="15sp"
+            app:autoSizeTextType="uniform" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/activity_car_selection_layout_carlist_entry_secondline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/roboto"
+            android:singleLine="true"
+            android:text="@string/dashboard_carselection_no_car_selected_advise"
+            android:textColor="#000000"
+            app:autoSizeMaxTextSize="15sp"
+            app:autoSizeMinTextSize="7sp"
+            app:autoSizeTextType="uniform" />
 
     </LinearLayout>
 
@@ -128,6 +89,6 @@
         android:layout_alignParentBottom="true"
         android:layout_marginLeft="24dp"
         android:layout_toRightOf="@id/activity_car_selection_layout_carlist_entry_icon"
-        android:background="@color/envirocar_color_divider_grey"></LinearLayout>
+        android:background="@color/envirocar_color_divider_grey" />
 
 </RelativeLayout>