From 1f361ee844f859bb1fddae6d593fe95a0d7f816f Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Thu, 4 Nov 2021 09:37:44 +0100
Subject: [PATCH] Nothing Ear(1): add custom icons for batteries

---
 app/src/main/assets/nothing_ear_l.svg         | 64 +++++++++++++++++
 app/src/main/assets/nothing_ear_r.svg         | 64 +++++++++++++++++
 app/src/main/assets/tws_bud_l.svg             | 72 -------------------
 app/src/main/assets/tws_bud_r.svg             | 72 -------------------
 .../devices/nothing/Ear1Coordinator.java      |  4 +-
 .../main/res/drawable/ic_nothing_ear_l.xml    | 15 ++++
 .../main/res/drawable/ic_nothing_ear_r.xml    | 15 ++++
 app/src/main/res/drawable/ic_tws_bud_l.xml    | 12 ----
 app/src/main/res/drawable/ic_tws_bud_r.xml    | 12 ----
 9 files changed, 160 insertions(+), 170 deletions(-)
 create mode 100644 app/src/main/assets/nothing_ear_l.svg
 create mode 100644 app/src/main/assets/nothing_ear_r.svg
 delete mode 100644 app/src/main/assets/tws_bud_l.svg
 delete mode 100644 app/src/main/assets/tws_bud_r.svg
 create mode 100644 app/src/main/res/drawable/ic_nothing_ear_l.xml
 create mode 100644 app/src/main/res/drawable/ic_nothing_ear_r.xml
 delete mode 100644 app/src/main/res/drawable/ic_tws_bud_l.xml
 delete mode 100644 app/src/main/res/drawable/ic_tws_bud_r.xml

diff --git a/app/src/main/assets/nothing_ear_l.svg b/app/src/main/assets/nothing_ear_l.svg
new file mode 100644
index 000000000..1cf5387a3
--- /dev/null
+++ b/app/src/main/assets/nothing_ear_l.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="23.17325mm"
+   height="24mm"
+   viewBox="0 0 23.17325 24"
+   version="1.1"
+   id="svg1232"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="nothing_ear_l.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1234"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     fit-margin-top="3"
+     fit-margin-left="6"
+     fit-margin-right="6"
+     fit-margin-bottom="3"
+     inkscape:zoom="5.0814254"
+     inkscape:cx="83.933143"
+     inkscape:cy="62.088878"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs1229" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(16,5.0000005)">
+    <g
+       id="g1083"
+       style="fill:#010000;fill-opacity:1;stroke-width:0.209403"
+       transform="matrix(-1.2635098,0,0,1.2635098,20.971815,-14.752565)">
+      <path
+         d="m 18.3225,24.339 a 2.6708,2.6529 90 0 1 -2.653,-2.6708 V 14.546 a 4.4513,4.4216 89.9998 0 1 4.227,-4.4513 h 0.1945 a 5.6977,5.6596 90.0002 0 1 4.1916,1.7182 0.8903,0.8843 89.9998 0 1 0.2299,0.6054 v 3.3652 a 0.8903,0.8843 89.9998 0 1 -0.2299,0.6054 5.5464,5.5093 89.9997 0 1 -3.3073,1.6559 v 3.6234 a 2.6708,2.6529 90 0 1 -2.6529,2.6708 z m 1.7686,-12.4638 h -0.1415 a 2.6708,2.6529 90 0 0 -2.5114,2.6708 v 7.1222 a 0.8903,0.8843 90.0003 0 0 1.7686,0 v -4.4513 a 0.8903,0.8843 89.9998 0 1 0.8843,-0.8903 4.113,4.0855 90.0003 0 0 2.6529,-0.8903 v -2.6708 a 4.113,4.0855 90.0003 0 0 -2.6529,-0.8903 z"
+         fill="#ffffff"
+         stroke-width="0.185801"
+         id="path10"
+         style="fill:#010000;fill-opacity:1" />
+      <path
+         d="m 20.9754,14.1009 m -0.8843,0 a 0.8903,0.8843 90.0003 1 1 1.7686,0 0.8903,0.8843 90.0003 1 1 -1.7686,0"
+         fill="#ffffff"
+         stroke-width="0.185801"
+         id="path14"
+         style="fill:#010000;fill-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/app/src/main/assets/nothing_ear_r.svg b/app/src/main/assets/nothing_ear_r.svg
new file mode 100644
index 000000000..00e3c2f5e
--- /dev/null
+++ b/app/src/main/assets/nothing_ear_r.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="23.17325mm"
+   height="24mm"
+   viewBox="0 0 23.17325 24"
+   version="1.1"
+   id="svg1232"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="nothing_ear_r.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1234"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     fit-margin-top="3"
+     fit-margin-left="6"
+     fit-margin-right="6"
+     fit-margin-bottom="3"
+     inkscape:zoom="5.0814254"
+     inkscape:cx="83.933143"
+     inkscape:cy="62.088878"
+     inkscape:window-width="1920"
+     inkscape:window-height="1035"
+     inkscape:window-x="0"
+     inkscape:window-y="45"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs1229" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(16,5.0000005)">
+    <g
+       id="g1083"
+       style="fill:#010000;fill-opacity:1;stroke-width:0.209403"
+       transform="matrix(1.2635098,0,0,1.2635098,-29.798564,-14.752565)">
+      <path
+         d="m 18.3225,24.339 a 2.6708,2.6529 90 0 1 -2.653,-2.6708 V 14.546 a 4.4513,4.4216 89.9998 0 1 4.227,-4.4513 h 0.1945 a 5.6977,5.6596 90.0002 0 1 4.1916,1.7182 0.8903,0.8843 89.9998 0 1 0.2299,0.6054 v 3.3652 a 0.8903,0.8843 89.9998 0 1 -0.2299,0.6054 5.5464,5.5093 89.9997 0 1 -3.3073,1.6559 v 3.6234 a 2.6708,2.6529 90 0 1 -2.6529,2.6708 z m 1.7686,-12.4638 h -0.1415 a 2.6708,2.6529 90 0 0 -2.5114,2.6708 v 7.1222 a 0.8903,0.8843 90.0003 0 0 1.7686,0 v -4.4513 a 0.8903,0.8843 89.9998 0 1 0.8843,-0.8903 4.113,4.0855 90.0003 0 0 2.6529,-0.8903 v -2.6708 a 4.113,4.0855 90.0003 0 0 -2.6529,-0.8903 z"
+         fill="#ffffff"
+         stroke-width="0.185801"
+         id="path10"
+         style="fill:#010000;fill-opacity:1" />
+      <path
+         d="m 20.9754,14.1009 m -0.8843,0 a 0.8903,0.8843 90.0003 1 1 1.7686,0 0.8903,0.8843 90.0003 1 1 -1.7686,0"
+         fill="#ffffff"
+         stroke-width="0.185801"
+         id="path14"
+         style="fill:#010000;fill-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/app/src/main/assets/tws_bud_l.svg b/app/src/main/assets/tws_bud_l.svg
deleted file mode 100644
index 03d29a0a8..000000000
--- a/app/src/main/assets/tws_bud_l.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="20.824697mm"
-   height="33.370094mm"
-   viewBox="0 0 20.824698 33.370094"
-   version="1.1"
-   id="svg1584"
-   sodipodi:docname="tws_bud_l.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1586"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="mm"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     fit-margin-top="5"
-     fit-margin-left="5"
-     fit-margin-right="5"
-     fit-margin-bottom="5"
-     inkscape:zoom="7.2407734"
-     inkscape:cx="2.8311893"
-     inkscape:cy="77.408858"
-     inkscape:window-width="1920"
-     inkscape:window-height="1035"
-     inkscape:window-x="0"
-     inkscape:window-y="45"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     inkscape:snap-nodes="false">
-    <sodipodi:guide
-       position="60.230277,-77.001526"
-       orientation="0,-1"
-       id="guide12345" />
-    <sodipodi:guide
-       position="48.368846,-82.602765"
-       orientation="1,0"
-       id="guide12613" />
-    <sodipodi:guide
-       position="66.270257,-85.540793"
-       orientation="1,0"
-       id="guide12653" />
-    <sodipodi:guide
-       position="59.029537,-82.554635"
-       orientation="0,-1"
-       id="guide13329" />
-  </sodipodi:namedview>
-  <defs
-     id="defs1581" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-54.112633,-52.186932)">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 66.055074,76.803636 c -0.244298,3.556234 2.977704,4.111332 2.879953,-0.991401 l -0.05475,-12.382282 c -0.0097,-2.189912 -1.289342,-5.281881 -4.473037,-5.242683 -2.522448,0.03106 -4.251319,0.718798 -4.261175,2.097025 l -0.03339,4.669439 c -0.01544,2.158509 4.351931,3.889198 5.490653,3.126882 1.023556,-0.685216 0.439063,8.854415 0.439063,8.854415"
-       id="path1690"
-       sodipodi:nodetypes="ccsssssc" />
-  </g>
-</svg>
diff --git a/app/src/main/assets/tws_bud_r.svg b/app/src/main/assets/tws_bud_r.svg
deleted file mode 100644
index 3cd3739a8..000000000
--- a/app/src/main/assets/tws_bud_r.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="20.824697mm"
-   height="33.370094mm"
-   viewBox="0 0 20.824698 33.370094"
-   version="1.1"
-   id="svg1584"
-   sodipodi:docname="tws_bud_r.svg"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1586"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="mm"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     fit-margin-top="5"
-     fit-margin-left="5"
-     fit-margin-right="5"
-     fit-margin-bottom="5"
-     inkscape:zoom="7.2407734"
-     inkscape:cx="2.8311893"
-     inkscape:cy="77.408858"
-     inkscape:window-width="1920"
-     inkscape:window-height="1035"
-     inkscape:window-x="0"
-     inkscape:window-y="45"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     inkscape:snap-nodes="false">
-    <sodipodi:guide
-       position="60.230277,-77.001526"
-       orientation="0,-1"
-       id="guide12345" />
-    <sodipodi:guide
-       position="48.368846,-82.602765"
-       orientation="1,0"
-       id="guide12613" />
-    <sodipodi:guide
-       position="66.270257,-85.540793"
-       orientation="1,0"
-       id="guide12653" />
-    <sodipodi:guide
-       position="59.029537,-82.554635"
-       orientation="0,-1"
-       id="guide13329" />
-  </sodipodi:namedview>
-  <defs
-     id="defs1581" />
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-54.112633,-52.186932)">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 62.994889,76.803636 c 0.244298,3.556234 -2.977704,4.111332 -2.879953,-0.991401 l 0.05475,-12.382282 c 0.0097,-2.189912 1.289342,-5.281881 4.473037,-5.242683 2.522448,0.03106 4.251319,0.718798 4.261175,2.097025 l 0.03339,4.669439 c 0.01544,2.158509 -4.351931,3.889198 -5.490653,3.126882 -1.023556,-0.685216 -0.439063,8.854415 -0.439063,8.854415"
-       id="path1690"
-       sodipodi:nodetypes="ccsssssc" />
-  </g>
-</svg>
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java
index c4fc32a16..10b3e04ff 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/nothing/Ear1Coordinator.java
@@ -129,8 +129,8 @@ public class Ear1Coordinator extends AbstractDeviceCoordinator {
     @Override
     public BatteryConfig[] getBatteryConfig() {
         BatteryConfig battery1 = new BatteryConfig(0, R.drawable.ic_tws_case, R.string.battery_case);
-        BatteryConfig battery2 = new BatteryConfig(1, R.drawable.ic_tws_bud_l, R.string.left_earbud);
-        BatteryConfig battery3 = new BatteryConfig(2, R.drawable.ic_tws_bud_r, R.string.right_earbud);
+        BatteryConfig battery2 = new BatteryConfig(1, R.drawable.ic_nothing_ear_l, R.string.left_earbud);
+        BatteryConfig battery3 = new BatteryConfig(2, R.drawable.ic_nothing_ear_r, R.string.right_earbud);
         return new BatteryConfig[]{battery1, battery2, battery3};
     }
 
diff --git a/app/src/main/res/drawable/ic_nothing_ear_l.xml b/app/src/main/res/drawable/ic_nothing_ear_l.xml
new file mode 100644
index 000000000..413f33f26
--- /dev/null
+++ b/app/src/main/res/drawable/ic_nothing_ear_l.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="23.17325dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="23.17325"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#010000"
+        android:pathData="M13.821 21a3.375 3.352 63.38 0 0 3.352-3.375V8.626a5.624 5.587 63.391 0 0-5.34-5.624h-0.247A7.2 7.151 63.369 0 0 6.29 5.173 1.125 1.117 63.391 0 0 6 5.938v4.252a1.125 1.117 63.391 0 0 0.29 0.765 7.008 6.961 63.397 0 0 4.18 2.092v4.578A3.375 3.352 63.38 0 0 13.82 21zM11.586 5.252h0.18a3.375 3.352 63.38 0 1 3.172 3.374v9a1.125 1.117 63.363 0 1-2.234 0V12a1.125 1.117 63.391 0 0-1.117-1.125A5.197 5.162 63.363 0 1 8.235 9.75V6.377a5.197 5.162 63.363 0 1 3.352-1.125z"
+        android:strokeWidth="0.23476137" />
+    <path
+        android:fillColor="#010000"
+        android:pathData="M11.587 8.064a1.125 1.117 63.363 1 0-2.235 0 1.125 1.117 63.363 1 0 2.235 0"
+        android:strokeWidth="0.23476137" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_nothing_ear_r.xml b/app/src/main/res/drawable/ic_nothing_ear_r.xml
new file mode 100644
index 000000000..4d497b64c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_nothing_ear_r.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="23.17325dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="23.17325"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#010000"
+        android:pathData="M9.352 21A3.375 3.352 116.62 0 1 6 17.625V8.626a5.624 5.587 116.609 0 1 5.34-5.624h0.247a7.2 7.151 116.631 0 1 5.296 2.171 1.125 1.117 116.609 0 1 0.29 0.765v4.252a1.125 1.117 116.609 0 1-0.29 0.765 7.008 6.961 116.603 0 1-4.179 2.092v4.578A3.375 3.352 116.62 0 1 9.352 21zm2.235-15.748h-0.18a3.375 3.352 116.62 0 0-3.172 3.374v9a1.125 1.117 116.637 0 0 2.234 0V12a1.125 1.117 116.609 0 1 1.118-1.125 5.197 5.162 116.637 0 0 3.352-1.125V6.377a5.197 5.162 116.637 0 0-3.352-1.125z"
+        android:strokeWidth="0.23476137" />
+    <path
+        android:fillColor="#010000"
+        android:pathData="M11.587 8.064a1.125 1.117 116.637 1 1 2.234 0 1.125 1.117 116.637 1 1-2.234 0"
+        android:strokeWidth="0.23476137" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_tws_bud_l.xml b/app/src/main/res/drawable/ic_tws_bud_l.xml
deleted file mode 100644
index 5a4bb241e..000000000
--- a/app/src/main/res/drawable/ic_tws_bud_l.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20.824697dp"
-    android:height="33.370094dp"
-    android:viewportWidth="20.824697"
-    android:viewportHeight="33.370094"
-    android:tint="#7E7E7E">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M11.942 24.617c-0.244 3.556 2.978 4.111 2.88-0.992l-0.054-12.382c-0.01-2.19-1.29-5.282-4.473-5.243-2.523 0.031-4.252 0.72-4.262 2.097L6 12.767c-0.015 2.158 4.352 3.889 5.49 3.127 1.024-0.686 0.44 8.854 0.44 8.854"
-        android:strokeWidth="2"
-        android:strokeColor="#000000" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_tws_bud_r.xml b/app/src/main/res/drawable/ic_tws_bud_r.xml
deleted file mode 100644
index 4af389ae5..000000000
--- a/app/src/main/res/drawable/ic_tws_bud_r.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20.824697dp"
-    android:height="33.370094dp"
-    android:viewportWidth="20.824697"
-    android:viewportHeight="33.370094"
-    android:tint="#7E7E7E">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M8.882 24.617c0.245 3.556-2.977 4.111-2.88-0.992l0.055-12.382C6.067 9.053 7.347 5.961 10.53 6c2.522 0.031 4.251 0.72 4.261 2.097l0.034 4.67c0.015 2.158-4.352 3.889-5.491 3.127-1.024-0.686-0.44 8.854-0.44 8.854"
-        android:strokeWidth="2"
-        android:strokeColor="#000000" />
-</vector>