[Android] Update delete action mode 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> | Fri Sep 15 10:26:09 2023 +0200| [79e80724d3ce909e513b77f3bc3ae432fcee4d9e] | committer: Alexandre Perraud

Update delete action mode icon

> https://code.videolan.org/videolan/vlc-android/commit/79e80724d3ce909e513b77f3bc3ae432fcee4d9e
---

 .../resources/assets/images/svg/ic_am_folder.svg   | 39 ++++++++++++++++++++++
 .../{ic_download.xml => ic_am_download.xml}        |  3 +-
 .../src/main/res/drawable/ic_am_folder.xml         | 32 +++---------------
 .../res/layout/subtitle_download_item.xml          |  4 +--
 .../vlc-android/res/menu/action_mode_video.xml     |  2 +-
 .../videolan/vlc/gui/dialogs/VideoTracksDialog.kt  |  2 +-
 6 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/application/resources/assets/images/svg/ic_am_folder.svg b/application/resources/assets/images/svg/ic_am_folder.svg
new file mode 100644
index 0000000000..fd5af96056
--- /dev/null
+++ b/application/resources/assets/images/svg/ic_am_folder.svg
@@ -0,0 +1,39 @@
+<?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="ic_am_folder.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="false"
+     inkscape:zoom="31.041667"
+     inkscape:cx="11.983893"
+     inkscape:cy="11.983893"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M10.59 4.59C10.21 4.21 9.7 4 9.17 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-1.41-1.41z"
+     id="path4"
+     style="fill:#000000" />
+</svg>
diff --git a/application/resources/src/main/res/drawable/ic_download.xml b/application/resources/src/main/res/drawable/ic_am_download.xml
similarity index 97%
rename from application/resources/src/main/res/drawable/ic_download.xml
rename to application/resources/src/main/res/drawable/ic_am_download.xml
index 78bed4524c..b7a6895426 100644
--- a/application/resources/src/main/res/drawable/ic_download.xml
+++ b/application/resources/src/main/res/drawable/ic_am_download.xml
@@ -1,6 +1,6 @@
 <!--
   ~ *************************************************************************
-  ~  ic_download.xml
+  ~  ic_am_download.xml
   ~ **************************************************************************
   ~ Copyright © 2021 VLC authors and VideoLAN
   ~ Author: Nicolas POMEPUY
@@ -29,6 +29,5 @@
     android:viewportHeight="48">
   <path
       android:pathData="m20,6c-1.1,0 -2,0.9 -2,2v10h-3.1797c-1.78,0 -2.6799,2.1599 -1.4199,3.4199l9.1797,9.1797c0.78,0.78 2.0403,0.78 2.8203,0l9.1797,-9.1797C35.8401,20.1599 34.9597,18 33.1797,18L30,18L30,8C30,6.9 29.1,6 28,6ZM22,10h4v12h2.3398L24,26.3398 19.6602,22L22,22ZM12,36c-1.1,0 -2,0.9 -2,2 0,1.1 0.9,2 2,2h24c1.1,0 2,-0.9 2,-2 0,-1.1 -0.9,-2 -2,-2z"
-      android:strokeWidth="2"
       android:fillColor="@color/standard_selection_control_normal"/>
 </vector>
diff --git a/application/resources/src/main/res/drawable/ic_am_folder.xml b/application/resources/src/main/res/drawable/ic_am_folder.xml
index ca449c1ca7..3b06eedec8 100644
--- a/application/resources/src/main/res/drawable/ic_am_folder.xml
+++ b/application/resources/src/main/res/drawable/ic_am_folder.xml
@@ -1,33 +1,9 @@
-<!--
-  ~ *************************************************************************
-  ~  ic_menu_folder.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:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="?attr/colorControlNormal"
-      android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+      android:pathData="M10.59,4.59C10.21,4.21 9.7,4 9.17,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-1.41,-1.41z"
+      android:fillColor="?attr/colorControlNormal"/>
 </vector>
diff --git a/application/vlc-android/res/layout/subtitle_download_item.xml b/application/vlc-android/res/layout/subtitle_download_item.xml
index 50bc08b911..1d68ef8a51 100644
--- a/application/vlc-android/res/layout/subtitle_download_item.xml
+++ b/application/vlc-android/res/layout/subtitle_download_item.xml
@@ -67,12 +67,12 @@
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:importantForAccessibility="no"
                 android:padding="4dp"
-                android:src="@{subtitleItem.state == State.Downloaded ? @drawable/ic_done : @drawable/ic_download }"
+                android:src="@{subtitleItem.state == State.Downloaded ? @drawable/ic_done : @drawable/ic_am_download }"
                 android:visibility="@{subtitleItem.state == State.Downloading ? View.GONE : View.VISIBLE}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:srcCompat="@drawable/ic_download" />
+                tools:srcCompat="@drawable/ic_am_download" />
 
         <ProgressBar
                 android:id="@+id/loading"
diff --git a/application/vlc-android/res/menu/action_mode_video.xml b/application/vlc-android/res/menu/action_mode_video.xml
index 175aa20bfc..1a2c242e4d 100644
--- a/application/vlc-android/res/menu/action_mode_video.xml
+++ b/application/vlc-android/res/menu/action_mode_video.xml
@@ -41,7 +41,7 @@
     <item
         android:id="@+id/action_video_download_subtitles"
         android:title="@string/download_subtitles"
-            android:icon="@drawable/ic_download"
+            android:icon="@drawable/ic_am_download"
         app:showAsAction="ifRoom" />
     <item
             android:id="@+id/action_remove_from_group"
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/dialogs/VideoTracksDialog.kt b/application/vlc-android/src/org/videolan/vlc/gui/dialogs/VideoTracksDialog.kt
index 8ab70dc22a..b9aa24469c 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/dialogs/VideoTracksDialog.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/dialogs/VideoTracksDialog.kt
@@ -159,7 +159,7 @@ class VideoTracksDialog : VLCBottomSheetDialogFragment() {
         generateSeparator(binding.subtitleTracks.options)
         generateOptionItem(binding.subtitleTracks.options, getString(R.string.spu_delay), R.drawable.ic_delay, VideoTrackOption.SUB_DELAY)
         generateOptionItem(binding.subtitleTracks.options, getString(R.string.subtitle_select), R.drawable.ic_subtitles_file, VideoTrackOption.SUB_PICK)
-        generateOptionItem(binding.subtitleTracks.options, getString(R.string.download_subtitles), R.drawable.ic_download, VideoTrackOption.SUB_DOWNLOAD)
+        generateOptionItem(binding.subtitleTracks.options, getString(R.string.download_subtitles), R.drawable.ic_am_download, VideoTrackOption.SUB_DOWNLOAD)
         generateSeparator(binding.subtitleTracks.options, true)
         binding.subtitleTracks.options.setAnimationUpdateListener {
             binding.subtitleTracks.trackMore.rotation = if (binding.subtitleTracks.options.isCollapsed) 180F - (180F * it) else 180F * it

More information about the Android mailing list