From 1dc99df1f6becc24deb6a9f194756201352cf6f2 Mon Sep 17 00:00:00 2001
From: Johan von Forstner <johan.forstner@gmail.com>
Date: Mon, 23 Mar 2020 22:41:17 +0100
Subject: [PATCH] Add more connector icons

---
 _img/connectors/connector_ccs.svg             |  2 +-
 _img/connectors/connector_chademo.svg         | 22 +++++++
 _img/connectors/connector_schuko.svg          | 13 +++++
 _img/connectors/connector_supercharger.svg    | 23 ++++++++
 _img/connectors/connector_typ2.svg            |  8 +--
 .../com/johan/evmap/ui/BindingAdapters.kt     |  7 ++-
 ...connector_ccs.xml => ic_connector_ccs.xml} |  2 +-
 .../res/drawable/ic_connector_chademo.xml     | 57 +++++++++++++++++++
 .../main/res/drawable/ic_connector_schuko.xml | 23 ++++++++
 .../drawable/ic_connector_supercharger.xml    | 38 +++++++++++++
 ...nnector_typ2.xml => ic_connector_typ2.xml} |  6 +-
 11 files changed, 190 insertions(+), 11 deletions(-)
 create mode 100644 _img/connectors/connector_chademo.svg
 create mode 100644 _img/connectors/connector_schuko.svg
 create mode 100644 _img/connectors/connector_supercharger.svg
 rename app/src/main/res/drawable/{connector_ccs.xml => ic_connector_ccs.xml} (95%)
 create mode 100644 app/src/main/res/drawable/ic_connector_chademo.xml
 create mode 100644 app/src/main/res/drawable/ic_connector_schuko.xml
 create mode 100644 app/src/main/res/drawable/ic_connector_supercharger.xml
 rename app/src/main/res/drawable/{connector_typ2.xml => ic_connector_typ2.xml} (83%)

diff --git a/_img/connectors/connector_ccs.svg b/_img/connectors/connector_ccs.svg
index 1c774893..49960bb8 100644
--- a/_img/connectors/connector_ccs.svg
+++ b/_img/connectors/connector_ccs.svg
@@ -5,7 +5,7 @@
     <title>connector_ccs</title>
     <path class="cls-1"
         d="M20,8.2a7.89,7.89,0,0,1-8,7.87A7.91,7.91,0,0,1,6.29,2.6H17.71A8,8,0,0,1,20,8.2Z" />
-    <circle cx="12" cy="7.4" r="1.6" />
+    <circle cx="12" cy="8.4" r="1.6" />
     <circle cx="9.6" cy="5" r="1" />
     <circle cx="14.4" cy="5" r="1" />
     <circle cx="9" cy="18.73" r="1.37" />
diff --git a/_img/connectors/connector_chademo.svg b/_img/connectors/connector_chademo.svg
new file mode 100644
index 00000000..3d71d592
--- /dev/null
+++ b/_img/connectors/connector_chademo.svg
@@ -0,0 +1,22 @@
+<svg id="Ebene_5" data-name="Ebene 5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+    <defs>
+        <style>
+            .cls-1,.cls-2,.cls-3,.cls-4{fill:none;}.cls-2,.cls-3,.cls-4{stroke:#000;stroke-miterlimit:10;}.cls-3{stroke-width:2px;}.cls-4{stroke-width:0.5px;}
+        </style>
+    </defs>
+    <title>connector_chademo</title>
+    <path class="cls-1" d="M12,12H36V36H12Z" />
+    <circle class="cls-2" cx="17" cy="12" r="2" />
+    <path class="cls-3" d="M21,12A9,9,0,0,1,3,12a9.46,9.46,0,0,1,.06-1.07A9,9,0,0,1,21,12Z" />
+    <rect x="18.05" y="3.61" width="1.69" height="2"
+        transform="translate(2.27 14.71) rotate(-45)" />
+    <rect x="4.27" y="3.61" width="1.69" height="2"
+        transform="translate(5.46 11.49) rotate(-135)" />
+    <circle class="cls-2" cx="7" cy="12" r="2" />
+    <circle class="cls-2" cx="12" cy="7" r="2" />
+    <line class="cls-4" x1="10.5" y1="5.5" x2="13.5" y2="8.5" />
+    <line class="cls-4" x1="10.5" y1="8.5" x2="13.5" y2="5.5" />
+    <circle class="cls-2" cx="12" cy="17" r="2" />
+    <line class="cls-4" x1="10.5" y1="15.5" x2="13.5" y2="18.5" />
+    <line class="cls-4" x1="10.5" y1="18.5" x2="13.5" y2="15.5" />
+</svg>
\ No newline at end of file
diff --git a/_img/connectors/connector_schuko.svg b/_img/connectors/connector_schuko.svg
new file mode 100644
index 00000000..5e77abff
--- /dev/null
+++ b/_img/connectors/connector_schuko.svg
@@ -0,0 +1,13 @@
+<svg id="Ebene_5" data-name="Ebene 5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+    <defs>
+        <style>.cls-1,.cls-2{fill:none;}.cls-2{stroke:#000;stroke-miterlimit:10;stroke-width:2px;}
+        </style>
+    </defs>
+    <title>connector_schuko</title>
+    <path class="cls-1" d="M12,12H36V36H12Z" />
+    <circle cx="17" cy="12" r="1.5" />
+    <circle cx="7" cy="12" r="1.5" />
+    <path class="cls-2" d="M21,12A9,9,0,0,1,3,12a9.46,9.46,0,0,1,.06-1.07A9,9,0,0,1,21,12Z" />
+    <rect x="11" y="3" width="2" height="2" />
+    <rect x="11" y="19" width="2" height="2" />
+</svg>
\ No newline at end of file
diff --git a/_img/connectors/connector_supercharger.svg b/_img/connectors/connector_supercharger.svg
new file mode 100644
index 00000000..2a160311
--- /dev/null
+++ b/_img/connectors/connector_supercharger.svg
@@ -0,0 +1,23 @@
+<svg id="Ebene_5" data-name="Ebene 5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+    <defs>
+        <style>.cls-1,.cls-2{fill:none;}.cls-2{stroke:#000;stroke-miterlimit:10;stroke-width:2px;}
+        </style>
+    </defs>
+    <title>connector_supercharger</title>
+    <path class="cls-1" d="M12,12H36V36H12Z" />
+    <path class="cls-2"
+        d="M13.45,17.08a8.24,8.24,0,0,1-3.11.6,8.34,8.34,0,0,1-6-14.18H16.3a8.35,8.35,0,0,1,1.07,10.33" />
+    <circle cx="10.34" cy="9.34" r="1.67" />
+    <circle cx="15.35" cy="9.34" r="1.67" />
+    <circle cx="12.84" cy="13.51" r="1.67" />
+    <circle cx="7.84" cy="13.51" r="1.67" />
+    <circle cx="5.34" cy="9.34" r="1.67" />
+    <circle cx="7.84" cy="5.59" r="1" />
+    <circle cx="12.84" cy="5.59" r="1.04" />
+    <g id="T">
+        <path id="path35"
+            d="M18.18,22.23l1-5.48c.93,0,1.22.1,1.27.52a2.15,2.15,0,0,0,.93-.7,6.91,6.91,0,0,0-2.46-.6l-.71.88h0L17.46,16a7,7,0,0,0-2.46.6,2.22,2.22,0,0,0,.94.7c0-.42.33-.52,1.26-.52l1,5.48" />
+        <path id="path37"
+            d="M18.18,15.72a7.9,7.9,0,0,1,3.28.66,2.65,2.65,0,0,0,.2-.4,9.24,9.24,0,0,0-7,0,2.61,2.61,0,0,0,.19.4,7.94,7.94,0,0,1,3.29-.66h0" />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/_img/connectors/connector_typ2.svg b/_img/connectors/connector_typ2.svg
index c7bfe0c2..242dc22f 100644
--- a/_img/connectors/connector_typ2.svg
+++ b/_img/connectors/connector_typ2.svg
@@ -3,14 +3,14 @@
         <style>.cls-1,.cls-2{fill:none;}.cls-2{stroke:#000;stroke-miterlimit:10;stroke-width:2px;}
         </style>
     </defs>
-    <title>typ2</title>
+    <title>connector_typ2</title>
     <path class="cls-1" d="M12,12H36V36H12Z" />
     <path class="cls-2" d="M22,10.5a10,10,0,1,1-17.14-7H19.14A10,10,0,0,1,22,10.5Z" />
-    <circle cx="12" cy="9.5" r="2" />
-    <circle cx="18" cy="9.5" r="2" />
+    <circle cx="12" cy="10.5" r="2" />
+    <circle cx="18" cy="10.5" r="2" />
     <circle cx="15" cy="15.5" r="2" />
     <circle cx="9" cy="15.5" r="2" />
-    <circle cx="6" cy="9.5" r="2" />
+    <circle cx="6" cy="10.5" r="2" />
     <circle cx="9" cy="6" r="1.25" />
     <circle cx="15" cy="6" r="1.25" />
 </svg>
\ No newline at end of file
diff --git a/app/src/main/java/com/johan/evmap/ui/BindingAdapters.kt b/app/src/main/java/com/johan/evmap/ui/BindingAdapters.kt
index b9a8562c..d8926b70 100644
--- a/app/src/main/java/com/johan/evmap/ui/BindingAdapters.kt
+++ b/app/src/main/java/com/johan/evmap/ui/BindingAdapters.kt
@@ -43,8 +43,11 @@ fun <T> setRecyclerViewData(recyclerView: RecyclerView, items: List<T>?) {
 fun getConnectorItem(view: ImageView, type: String) {
     view.setImageResource(
         when (type) {
-            "Typ2" -> R.drawable.connector_typ2
-            "CCS" -> R.drawable.connector_ccs
+            "CCS" -> R.drawable.ic_connector_ccs
+            "CHAdeMO" -> R.drawable.ic_connector_chademo
+            "Schuko" -> R.drawable.ic_connector_schuko
+            "Tesla Supercharger" -> R.drawable.ic_connector_supercharger
+            "Typ2" -> R.drawable.ic_connector_typ2
             // TODO: add other connectors
             else -> 0
         }
diff --git a/app/src/main/res/drawable/connector_ccs.xml b/app/src/main/res/drawable/ic_connector_ccs.xml
similarity index 95%
rename from app/src/main/res/drawable/connector_ccs.xml
rename to app/src/main/res/drawable/ic_connector_ccs.xml
index e94a3654..72f7fe85 100644
--- a/app/src/main/res/drawable/connector_ccs.xml
+++ b/app/src/main/res/drawable/ic_connector_ccs.xml
@@ -10,7 +10,7 @@
         android:strokeColor="#000" />
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,7.4m-1.6,0a1.6,1.6 0,1 1,3.2 0a1.6,1.6 0,1 1,-3.2 0" />
+        android:pathData="M12,8.4m-1.6,0a1.6,1.6 0,1 1,3.2 0a1.6,1.6 0,1 1,-3.2 0" />
     <path
         android:fillColor="#FF000000"
         android:pathData="M9.6,5m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
diff --git a/app/src/main/res/drawable/ic_connector_chademo.xml b/app/src/main/res/drawable/ic_connector_chademo.xml
new file mode 100644
index 00000000..94e32360
--- /dev/null
+++ b/app/src/main/res/drawable/ic_connector_chademo.xml
@@ -0,0 +1,57 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:strokeWidth="1"
+        android:pathData="M17,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+        android:fillColor="#00000000"
+        android:strokeColor="#000" />
+    <path
+        android:pathData="M21,12A9,9 0,0 1,3 12a9.46,9.46 0,0 1,0.06 -1.07A9,9 0,0 1,21 12Z"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="#000" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.5859,4.4994l1.195,-1.195l1.4142,1.4142l-1.195,1.195z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4.9933,5.918l-1.195,-1.195l1.4142,-1.4142l1.195,1.195z" />
+    <path
+        android:strokeWidth="1"
+        android:pathData="M7,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+        android:fillColor="#00000000"
+        android:strokeColor="#000" />
+    <path
+        android:strokeWidth="1"
+        android:pathData="M12,7m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+        android:fillColor="#00000000"
+        android:strokeColor="#000" />
+    <path
+        android:pathData="M10.5,5.5L13.5,8.5"
+        android:strokeWidth="0.5"
+        android:fillColor="#00000000"
+        android:strokeColor="#000" />
+    <path
+        android:pathData="M10.5,8.5L13.5,5.5"
+        android:strokeWidth="0.5"
+        android:fillColor="#00000000"
+        android:strokeColor="#000" />
+    <path
+        android:strokeWidth="1"
+        android:pathData="M12,17m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+        android:fillColor="#00000000"
+        android:strokeColor="#000" />
+    <path
+        android:pathData="M10.5,15.5L13.5,18.5"
+        android:strokeWidth="0.5"
+        android:fillColor="#00000000"
+        android:strokeColor="#000" />
+    <path
+        android:pathData="M10.5,18.5L13.5,15.5"
+        android:strokeWidth="0.5"
+        android:fillColor="#00000000"
+        android:strokeColor="#000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_connector_schuko.xml b/app/src/main/res/drawable/ic_connector_schuko.xml
new file mode 100644
index 00000000..e58fc46f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_connector_schuko.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0" />
+    <path
+        android:pathData="M21,12A9,9 0,0 1,3 12a9.46,9.46 0,0 1,0.06 -1.07A9,9 0,0 1,21 12Z"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="#000" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,3h2v2h-2z" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,19h2v2h-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_connector_supercharger.xml b/app/src/main/res/drawable/ic_connector_supercharger.xml
new file mode 100644
index 00000000..414dd789
--- /dev/null
+++ b/app/src/main/res/drawable/ic_connector_supercharger.xml
@@ -0,0 +1,38 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M13.45,17.08a8.24,8.24 0,0 1,-3.11 0.6,8.34 8.34,0 0,1 -6,-14.18H16.3a8.35,8.35 0,0 1,1.07 10.33"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="#000" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10.34,9.34m-1.67,0a1.67,1.67 0,1 1,3.34 0a1.67,1.67 0,1 1,-3.34 0" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.35,9.34m-1.67,0a1.67,1.67 0,1 1,3.34 0a1.67,1.67 0,1 1,-3.34 0" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.84,13.51m-1.67,0a1.67,1.67 0,1 1,3.34 0a1.67,1.67 0,1 1,-3.34 0" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.84,13.51m-1.67,0a1.67,1.67 0,1 1,3.34 0a1.67,1.67 0,1 1,-3.34 0" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5.34,9.34m-1.67,0a1.67,1.67 0,1 1,3.34 0a1.67,1.67 0,1 1,-3.34 0" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.84,5.59m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.84,5.59m-1.04,0a1.04,1.04 0,1 1,2.08 0a1.04,1.04 0,1 1,-2.08 0" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18.18,22.23l1,-5.48c0.93,0 1.22,0.1 1.27,0.52a2.15,2.15 0,0 0,0.93 -0.7,6.91 6.91,0 0,0 -2.46,-0.6l-0.71,0.88h0L17.46,16a7,7 0,0 0,-2.46 0.6,2.22 2.22,0 0,0 0.94,0.7c0,-0.42 0.33,-0.52 1.26,-0.52l1,5.48" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18.18,15.72a7.9,7.9 0,0 1,3.28 0.66,2.65 2.65,0 0,0 0.2,-0.4 9.24,9.24 0,0 0,-7 0,2.61 2.61,0 0,0 0.19,0.4 7.94,7.94 0,0 1,3.29 -0.66h0" />
+</vector>
diff --git a/app/src/main/res/drawable/connector_typ2.xml b/app/src/main/res/drawable/ic_connector_typ2.xml
similarity index 83%
rename from app/src/main/res/drawable/connector_typ2.xml
rename to app/src/main/res/drawable/ic_connector_typ2.xml
index f827014d..90ea3fa6 100644
--- a/app/src/main/res/drawable/connector_typ2.xml
+++ b/app/src/main/res/drawable/ic_connector_typ2.xml
@@ -10,10 +10,10 @@
         android:strokeColor="#000" />
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12,9.5m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+        android:pathData="M12,10.5m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
         android:fillColor="#FF000000"
-        android:pathData="M18,9.5m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+        android:pathData="M18,10.5m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
         android:fillColor="#FF000000"
         android:pathData="M15,15.5m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
@@ -22,7 +22,7 @@
         android:pathData="M9,15.5m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
         android:fillColor="#FF000000"
-        android:pathData="M6,9.5m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
+        android:pathData="M6,10.5m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
     <path
         android:fillColor="#FF000000"
         android:pathData="M9,6m-1.25,0a1.25,1.25 0,1 1,2.5 0a1.25,1.25 0,1 1,-2.5 0" />