From 02d9ce835a7f38e08e474dad21c0dc7709a99dc3 Mon Sep 17 00:00:00 2001
From: Alexandre Perraud <alexandre@videolan.org>
Date: Fri, 15 Sep 2023 10:18:23 +0200
Subject: [PATCH] Update share action mode icon

---
 .../assets/images/svg/ic_am_share.svg         | 43 +++++++++++++++++++
 .../assets/images/svg/ic_am_share_normal.svg  | 42 ------------------
 .../src/main/res/drawable/ic_am_share.xml     |  9 ++++
 .../main/res/drawable/ic_am_share_normal.xml  | 40 -----------------
 .../res/menu/action_mode_audio_browser.xml    |  2 +-
 .../res/menu/action_mode_video.xml            |  2 +-
 6 files changed, 54 insertions(+), 84 deletions(-)
 create mode 100644 application/resources/assets/images/svg/ic_am_share.svg
 delete mode 100644 application/resources/assets/images/svg/ic_am_share_normal.svg
 create mode 100644 application/resources/src/main/res/drawable/ic_am_share.xml
 delete mode 100644 application/resources/src/main/res/drawable/ic_am_share_normal.xml

diff --git a/application/resources/assets/images/svg/ic_am_share.svg b/application/resources/assets/images/svg/ic_am_share.svg
new file mode 100644
index 000000000..5f887a743
--- /dev/null
+++ b/application/resources/assets/images/svg/ic_am_share.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="24px"
+   viewBox="0 0 24 24"
+   width="24px"
+   fill="#000000"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="share_black_24dp.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   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">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#111111"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="1"
+     showgrid="true"
+     inkscape:zoom="31.041667"
+     inkscape:cx="9.9060403"
+     inkscape:cy="12"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6">
+    <inkscape:grid
+       type="xygrid"
+       id="grid827" />
+  </sodipodi:namedview>
+  <path
+     d="M18 16.08c-.76 0-1.44.3-1.96.77L8.91 12.7c.05-.23.09-.46.09-.7s-.04-.47-.09-.7l7.05-4.11c.54.5 1.25.81 2.04.81 1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 .24.04.47.09.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c.79 0 1.5-.31 2.04-.81l7.12 4.16c-.05.21-.08.43-.08.65 0 1.61 1.31 2.92 2.92 2.92s2.92-1.31 2.92-2.92-1.31-2.92-2.92-2.92z"
+     id="path4"
+     style="fill:#000000;stroke:none" />
+</svg>
diff --git a/application/resources/assets/images/svg/ic_am_share_normal.svg b/application/resources/assets/images/svg/ic_am_share_normal.svg
deleted file mode 100644
index 719edff4e..000000000
--- a/application/resources/assets/images/svg/ic_am_share_normal.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#"
-        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-        xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
-        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="24" height="24"
-        id="svg4682" version="1.1" inkscape:version="0.92.3 (2405546, 2018-03-11)"
-        sodipodi:docname="ic_am_share_normal.svg"
-        inkscape:export-filename="/home/corbax/Dev/android/Icons/Test 1/ic_play_normal.png"
-        inkscape:export-xdpi="90" inkscape:export-ydpi="90">
-    <defs id="defs4684" />
-    <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0"
-            inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2"
-            inkscape:cx="-9.3636279" inkscape:cy="3.737142" inkscape:document-units="px"
-            inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1920"
-            inkscape:window-height="1053" inkscape:window-x="0" inkscape:window-y="27"
-            inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-nodes="true"
-            inkscape:bbox-paths="true" inkscape:snap-bbox-edge-midpoints="true"
-            inkscape:snap-bbox-midpoints="true" inkscape:object-paths="true"
-            inkscape:snap-intersection-paths="true" inkscape:object-nodes="true"
-            inkscape:snap-smooth-nodes="true" inkscape:snap-midpoints="true"
-            inkscape:snap-object-midpoints="true" inkscape:snap-center="true">
-        <inkscape:grid type="xygrid" id="grid3002" />
-    </sodipodi:namedview>
-    <metadata id="metadata4687">
-        <rdf:RDF>
-            <cc:Work rdf:about="">
-                <dc:format>image/svg+xml</dc:format>
-                <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-                <dc:title></dc:title>
-            </cc:Work>
-        </rdf:RDF>
-    </metadata>
-    <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"
-            transform="translate(0,-1028.3622)">
-        <path inkscape:connector-curvature="0"
-                style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#212121;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:15.11811066;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:markers fill stroke;enable-background:accumulate"
-                d="m 16.5,1032.3622 a 2.5,2.5 0 0 0 -2.5,2.5 2.5,2.5 0 0 0 0.082,0.6211 l -4.88867,3.043 A 2.5,2.5 0 0 0 7.5,1037.8622 a 2.5,2.5 0 0 0 -2.5,2.5 2.5,2.5 0 0 0 2.5,2.5 2.5,2.5 0 0 0 1.64062,-0.6172 l 4.93555,3.0156 A 2.5,2.5 0 0 0 14,1045.8622 a 2.5,2.5 0 0 0 2.5,2.5 2.5,2.5 0 0 0 2.5,-2.5 2.5,2.5 0 0 0 -2.5,-2.5 2.5,2.5 0 0 0 -1.64258,0.6191 l -4.93554,-3.0156 A 2.5,2.5 0 0 0 10,1040.3622 2.5,2.5 0 0 0 9.9375,1039.827 l 4.93359,-3.0683 a 2.5,2.5 0 0 0 1.62891,0.6035 2.5,2.5 0 0 0 2.5,-2.5 2.5,2.5 0 0 0 -2.5,-2.5 z"
-                id="circle7821" />
-    </g>
-</svg>
diff --git a/application/resources/src/main/res/drawable/ic_am_share.xml b/application/resources/src/main/res/drawable/ic_am_share.xml
new file mode 100644
index 000000000..a2c340f04
--- /dev/null
+++ b/application/resources/src/main/res/drawable/ic_am_share.xml
@@ -0,0 +1,9 @@
+<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="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92 -1.31,-2.92 -2.92,-2.92z"
+      android:fillColor="?attr/colorControlNormal" />
+</vector>
diff --git a/application/resources/src/main/res/drawable/ic_am_share_normal.xml b/application/resources/src/main/res/drawable/ic_am_share_normal.xml
deleted file mode 100644
index 0bb3005ae..000000000
--- a/application/resources/src/main/res/drawable/ic_am_share_normal.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-  ~ *************************************************************************
-  ~  ic_am_share_normal.xml
-  ~ **************************************************************************
-  ~ Copyright © 2020 VLC authors and VideoLAN
-  ~ Author: Nicolas POMEPUY
-  ~ This program 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 2 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program 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 this program; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
-  ~ ***************************************************************************
-  ~
-  ~
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="48dp"
-        android:height="48dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <path
-            android:pathData="m16.5,4a2.5,2.5 0,0 0,-2.5 2.5,2.5 2.5,0 0,0 0.082,0.6211l-4.8887,3.043A2.5,2.5 0,0 0,7.5 9.5a2.5,2.5 0,0 0,-2.5 2.5,2.5 2.5,0 0,0 2.5,2.5 2.5,2.5 0,0 0,1.6406 -0.6172l4.9356,3.0156A2.5,2.5 0,0 0,14 17.5a2.5,2.5 0,0 0,2.5 2.5,2.5 2.5,0 0,0 2.5,-2.5 2.5,2.5 0,0 0,-2.5 -2.5,2.5 2.5,0 0,0 -1.6426,0.6191l-4.9355,-3.0156A2.5,2.5 0,0 0,10 12,2.5 2.5,0 0,0 9.9375,11.4648l4.9336,-3.0683a2.5,2.5 0,0 0,1.6289 0.6035,2.5 2.5,0 0,0 2.5,-2.5 2.5,2.5 0,0 0,-2.5 -2.5z"
-            android:strokeAlpha="1"
-            android:strokeLineJoin="round"
-            android:strokeWidth="15.11811066"
-            android:fillColor="?attr/colorControlNormal"
-            android:strokeColor="#00000000"
-            android:fillType="nonZero"
-            android:fillAlpha="1"
-            android:strokeLineCap="round" />
-</vector>
diff --git a/application/vlc-android/res/menu/action_mode_audio_browser.xml b/application/vlc-android/res/menu/action_mode_audio_browser.xml
index 57401e945..cf36d1400 100644
--- a/application/vlc-android/res/menu/action_mode_audio_browser.xml
+++ b/application/vlc-android/res/menu/action_mode_audio_browser.xml
@@ -9,7 +9,7 @@
     <item
             android:id="@+id/action_mode_audio_share"
             android:title="@string/share"
-            android:icon="@drawable/ic_am_share_normal"
+            android:icon="@drawable/ic_am_share"
             app:showAsAction="always" />
     <item
         android:id="@+id/action_mode_audio_play"
diff --git a/application/vlc-android/res/menu/action_mode_video.xml b/application/vlc-android/res/menu/action_mode_video.xml
index 7b6a53754..175aa20bf 100644
--- a/application/vlc-android/res/menu/action_mode_video.xml
+++ b/application/vlc-android/res/menu/action_mode_video.xml
@@ -21,7 +21,7 @@
     <item
             android:id="@+id/action_video_share"
             android:title="@string/share"
-            android:icon="@drawable/ic_am_share_normal"
+            android:icon="@drawable/ic_am_share"
             app:showAsAction="ifRoom" />
     <item
             android:id="@+id/action_video_play_audio"