[Android] Update search icon
Alexandre Perraud
git at videolan.org
Fri Oct 6 10:20:34 UTC 2023
vlc-android | branch: master | Alexandre Perraud <alexandre at videolan.org> | Thu Jul 13 17:10:53 2023 +0200| [590066a9c6178226ed92ce202567855f5b3300a4] | committer: Alexandre Perraud
Update search icon
> https://code.videolan.org/videolan/vlc-android/commit/590066a9c6178226ed92ce202567855f5b3300a4
---
.../resources/assets/images/svg/ic_menu_search.svg | 68 ----------------------
.../src/main/res/drawable/ic_am_search.xml | 9 +++
.../src/main/res/drawable/ic_menu_search.xml | 16 -----
.../src/main/res/drawable/ic_menu_search_w.xml | 16 -----
.../vlc-android/res/menu/activity_option.xml | 2 +-
.../vlc-android/res/menu/activity_prefs.xml | 2 +-
.../vlc-android/res/menu/playlist_option.xml | 2 +-
7 files changed, 12 insertions(+), 103 deletions(-)
diff --git a/application/resources/assets/images/svg/ic_menu_search.svg b/application/resources/assets/images/svg/ic_menu_search.svg
deleted file mode 100644
index cd8a9eb326..0000000000
--- a/application/resources/assets/images/svg/ic_menu_search.svg
+++ /dev/null
@@ -1,68 +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.4 (5da689c313, 2019-01-14)"
- sodipodi:docname="ic_menu_search.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="45.254834"
- inkscape:cx="16.312703"
- inkscape:cy="8.5063266"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:window-width="1920"
- inkscape:window-height="1043"
- inkscape:window-x="1920"
- inkscape:window-y="0"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid2983" />
- </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 />
- </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;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.
99960649;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;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
- d="m 9.9999,1031.3621 c -3.8542,0 -7,3.1459 -7,7 0,3.8542 3.1458,7 7,7 1.748,0 3.345,-0.652 4.5742,-1.7188 l 0.4258,0.4258 v 0.7071 l 4.2832,4.2832 a 1,1 0 0 0 0.01,0.01 1,1 0 0 0 0.707,0.293 1,1 0 0 0 1,-1 1,1 0 0 0 -0.293,-0.707 l -4.2929,-4.293 h -0.7071 l -0.4258,-0.4258 c 1.0666,-1.2295 1.7186,-2.8265 1.7186,-4.5745 0,-3.8541 -3.1458,-7 -7,-7 z m 0,2 c 2.7735,0 5,2.2265 5,5 0,2.7735 -2.2265,5.002 -5,5.002 -2.7735,0 -5,-2.2285 -5,-5.002 0,-2.7735 2.2265,-5 5,-5 z"
- id="ellipse11151" />
- </g>
-</svg>
diff --git a/application/resources/src/main/res/drawable/ic_am_search.xml b/application/resources/src/main/res/drawable/ic_am_search.xml
new file mode 100644
index 0000000000..bb3249a931
--- /dev/null
+++ b/application/resources/src/main/res/drawable/ic_am_search.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="48dp"
+ android:height="48dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+ <path
+ android:pathData="m31.966,29h-1.576L29.832,28.462C32.225,25.669 33.462,21.86 32.784,17.812 31.846,12.267 27.22,7.84 21.635,7.162 13.199,6.125 6.099,13.225 7.136,21.661 7.814,27.245 12.242,31.872 17.786,32.809c4.049,0.678 7.858,-0.558 10.65,-2.952l0.538,0.558v1.576l8.476,8.476c0.818,0.818 2.154,0.818 2.972,0 0.818,-0.818 0.818,-2.154 0,-2.972zM20,29c-4.966,0 -8.975,-4.009 -8.975,-8.975 0,-4.966 4.009,-8.975 8.975,-8.975 4.966,0 8.975,4.009 8.975,8.975C28.975,24.991 24.966,29 20,29Z"
+ android:fillColor="?attr/colorControlNormal"/>
+</vector>
diff --git a/application/resources/src/main/res/drawable/ic_menu_search.xml b/application/resources/src/main/res/drawable/ic_menu_search.xml
deleted file mode 100644
index b382347ec5..0000000000
--- a/application/resources/src/main/res/drawable/ic_menu_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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="m9.9999,2.9999c-3.8542,0 -7,3.1459 -7,7 0,3.8542 3.1458,7 7,7 1.748,0 3.345,-0.652 4.5742,-1.7188l0.4258,0.4258v0.7071l4.2832,4.2832a1,1 0,0 0,0.01 0.01,1 1,0 0,0 0.707,0.293 1,1 0,0 0,1 -1,1 1,0 0,0 -0.293,-0.707l-4.2929,-4.293h-0.7071l-0.4258,-0.4258c1.0666,-1.2295 1.7186,-2.8265 1.7186,-4.5745 0,-3.8541 -3.1458,-7 -7,-7zM9.9999,4.9999c2.7735,0 5,2.2265 5,5 0,2.7735 -2.2265,5.002 -5,5.002 -2.7735,0 -5,-2.2285 -5,-5.002 0,-2.7735 2.2265,-5 5,-5z"
- android:strokeAlpha="1"
- android:strokeLineJoin="round"
- android:strokeWidth="1.99960649"
- android:fillColor="@color/standard_selection_control_normal"
- android:strokeColor="#00000000"
- android:fillType="nonZero"
- android:fillAlpha="1"
- android:strokeLineCap="round" />
-</vector>
diff --git a/application/resources/src/main/res/drawable/ic_menu_search_w.xml b/application/resources/src/main/res/drawable/ic_menu_search_w.xml
deleted file mode 100644
index 6061513f14..0000000000
--- a/application/resources/src/main/res/drawable/ic_menu_search_w.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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="m9.9999,2.9999c-3.8542,0 -7,3.1459 -7,7 0,3.8542 3.1458,7 7,7 1.748,0 3.345,-0.652 4.5742,-1.7188l0.4258,0.4258v0.7071l4.2832,4.2832a1,1 0,0 0,0.01 0.01,1 1,0 0,0 0.707,0.293 1,1 0,0 0,1 -1,1 1,0 0,0 -0.293,-0.707l-4.2929,-4.293h-0.7071l-0.4258,-0.4258c1.0666,-1.2295 1.7186,-2.8265 1.7186,-4.5745 0,-3.8541 -3.1458,-7 -7,-7zM9.9999,4.9999c2.7735,0 5,2.2265 5,5 0,2.7735 -2.2265,5.002 -5,5.002 -2.7735,0 -5,-2.2285 -5,-5.002 0,-2.7735 2.2265,-5 5,-5z"
- android:strokeAlpha="1"
- android:strokeLineJoin="round"
- android:strokeWidth="1.99960649"
- 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/activity_option.xml b/application/vlc-android/res/menu/activity_option.xml
index 101e5686f1..57868441bc 100644
--- a/application/vlc-android/res/menu/activity_option.xml
+++ b/application/vlc-android/res/menu/activity_option.xml
@@ -36,7 +36,7 @@
<item
android:orderInCategory="1"
android:id="@+id/ml_menu_filter"
- android:icon="@drawable/ic_menu_search_w"
+ android:icon="@drawable/ic_am_search"
vlc:actionViewClass="androidx.appcompat.widget.SearchView"
android:title="@string/searchable_hint"
vlc:showAsAction="always|collapseActionView"/>
diff --git a/application/vlc-android/res/menu/activity_prefs.xml b/application/vlc-android/res/menu/activity_prefs.xml
index 3ec35a050a..1d97936f06 100644
--- a/application/vlc-android/res/menu/activity_prefs.xml
+++ b/application/vlc-android/res/menu/activity_prefs.xml
@@ -30,7 +30,7 @@
<item
android:orderInCategory="1"
android:id="@+id/menu_pref_search"
- android:icon="@drawable/ic_menu_search_w"
+ android:icon="@drawable/ic_am_search"
android:title="@string/searchable_hint"
vlc:showAsAction="always|collapseActionView"/>
</menu>
\ No newline at end of file
diff --git a/application/vlc-android/res/menu/playlist_option.xml b/application/vlc-android/res/menu/playlist_option.xml
index 1c973e71c9..f8bc04aa50 100644
--- a/application/vlc-android/res/menu/playlist_option.xml
+++ b/application/vlc-android/res/menu/playlist_option.xml
@@ -35,7 +35,7 @@
<item
android:orderInCategory="1"
android:id="@+id/ml_menu_filter"
- android:icon="@drawable/ic_menu_search_w"
+ android:icon="@drawable/ic_am_search"
app:actionViewClass="androidx.appcompat.widget.SearchView"
android:title="@string/searchable_hint"
app:showAsAction="always|collapseActionView"/>
More information about the Android
mailing list