[Android] Update edit and delete toolbar menu
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 Jul 21 17:23:13 2023 +0200| [75a4433c55b2f83d6022855b701308c60d7a68e4] | committer: Alexandre Perraud
Update edit and delete toolbar menu
> https://code.videolan.org/videolan/vlc-android/commit/75a4433c55b2f83d6022855b701308c60d7a68e4
---
.../resources/src/main/res/drawable/ic_am_edit.xml | 9 +++++
.../src/main/res/drawable/ic_delete_toolbar.xml | 44 ++++------------------
.../resources/src/main/res/drawable/ic_edit.xml | 40 --------------------
.../src/main/res/drawable/ic_edit_toolbar.xml | 40 --------------------
.../res/menu/action_mode_video_group.xml | 2 +-
.../vlc-android/res/menu/activity_option.xml | 2 +-
6 files changed, 18 insertions(+), 119 deletions(-)
diff --git a/application/resources/src/main/res/drawable/ic_am_edit.xml b/application/resources/src/main/res/drawable/ic_am_edit.xml
new file mode 100644
index 0000000000..79d9d0c6be
--- /dev/null
+++ b/application/resources/src/main/res/drawable/ic_am_edit.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="m6,34.92v6.08C6,41.56 6.44,42 7,42h6.08c0.26,0 0.52,-0.1 0.7,-0.3L35.621,19.879 28.121,12.379 6.3,34.2C6.1,34.4 6,34.64 6,34.92ZM41.418,14.082c0.78,-0.78 0.78,-2.04 0,-2.82l-4.68,-4.68c-0.78,-0.78 -2.04,-0.78 -2.82,0l-3.66,3.66 7.5,7.5z"
+ android:fillColor="?attr/colorControlNormal"/>
+</vector>
diff --git a/application/resources/src/main/res/drawable/ic_delete_toolbar.xml b/application/resources/src/main/res/drawable/ic_delete_toolbar.xml
index 41c57a6902..79d7f18d27 100644
--- a/application/resources/src/main/res/drawable/ic_delete_toolbar.xml
+++ b/application/resources/src/main/res/drawable/ic_delete_toolbar.xml
@@ -1,39 +1,9 @@
-<!--
- ~ *************************************************************************
- ~ ic_delete_toolbar.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="24dp"
- android:height="24dp"
- android:viewportWidth="48"
- android:viewportHeight="48">
- <path
- android:pathData="m18,8c-1.1046,0 -2,0.8954 -2,2h-5v4L37,14L37,10L32,10C32,8.8954 31.1046,8 30,8ZM13,16v20c0,2.2091 1.7909,4 4,4h14c2.2091,0 4,-1.7909 4,-4L35,16Z"
- android:strokeAlpha="1"
- android:strokeLineJoin="miter"
- android:strokeWidth="4"
- android:fillColor="?attr/colorControlNormal"
- android:strokeColor="#00000000"
- android:fillAlpha="1"
- android:strokeLineCap="round" />
+ android:width="48dp"
+ android:height="48dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
+ <path
+ android:pathData="m12,38c0,2.2 1.8,4 4,4h16c2.2,0 4,-1.8 4,-4V18c0,-2.2 -1.8,-4 -4,-4H16c-2.2,0 -4,1.8 -4,4zM36,8H31L29.58,6.58C29.22,6.22 28.7,6 28.18,6H19.82C19.3,6 18.78,6.22 18.42,6.58L17,8h-5c-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:fillColor="?attr/colorControlNormal"/>
</vector>
diff --git a/application/resources/src/main/res/drawable/ic_edit.xml b/application/resources/src/main/res/drawable/ic_edit.xml
deleted file mode 100644
index a8ea452eac..0000000000
--- a/application/resources/src/main/res/drawable/ic_edit.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
- ~ *************************************************************************
- ~ ic_edit.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="48"
- android:viewportHeight="48">
- <path
- android:pathData="m34.0294,8c-0.5407,0 -1.0612,0.2036 -1.4434,0.5859l-2,2 6.8282,6.8281 2,-2c0.7808,-0.781 0.7808,-2.0471 0,-2.8281l-4,-4C35.0465,8.2179 34.5499,8 34.0294,8ZM27.8361,13.3359 L8.0002,33.1719L8.0002,40h6.8281l19.836,-19.8359z"
- android:strokeAlpha="1"
- android:strokeLineJoin="miter"
- android:strokeWidth="4"
- android:fillColor="?attr/colorControlNormal"
- android:strokeColor="#00000000"
- android:fillType="evenOdd"
- android:fillAlpha="1"
- android:strokeLineCap="butt" />
-</vector>
diff --git a/application/resources/src/main/res/drawable/ic_edit_toolbar.xml b/application/resources/src/main/res/drawable/ic_edit_toolbar.xml
deleted file mode 100644
index 66916672bf..0000000000
--- a/application/resources/src/main/res/drawable/ic_edit_toolbar.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
- ~ *************************************************************************
- ~ ic_edit_toolbar.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="24dp"
- android:height="24dp"
- android:viewportWidth="48"
- android:viewportHeight="48">
- <path
- android:pathData="m34.0294,8c-0.5407,0 -1.0612,0.2036 -1.4434,0.5859l-2,2 6.8282,6.8281 2,-2c0.7808,-0.781 0.7808,-2.0471 0,-2.8281l-4,-4C35.0465,8.2179 34.5499,8 34.0294,8ZM27.8361,13.3359 L8.0002,33.1719L8.0002,40h6.8281l19.836,-19.8359z"
- android:strokeAlpha="1"
- android:strokeLineJoin="miter"
- android:strokeWidth="4"
- android:fillColor="?attr/colorControlNormal"
- android:strokeColor="#00000000"
- android:fillType="evenOdd"
- android:fillAlpha="1"
- android:strokeLineCap="butt" />
-</vector>
diff --git a/application/vlc-android/res/menu/action_mode_video_group.xml b/application/vlc-android/res/menu/action_mode_video_group.xml
index db4a959405..72fb388969 100644
--- a/application/vlc-android/res/menu/action_mode_video_group.xml
+++ b/application/vlc-android/res/menu/action_mode_video_group.xml
@@ -29,7 +29,7 @@
<item
android:id="@+id/action_rename"
android:title="@string/rename_group"
- android:icon="@drawable/ic_edit"
+ android:icon="@drawable/ic_am_edit"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_video_delete"
diff --git a/application/vlc-android/res/menu/activity_option.xml b/application/vlc-android/res/menu/activity_option.xml
index 57868441bc..a17fdd2022 100644
--- a/application/vlc-android/res/menu/activity_option.xml
+++ b/application/vlc-android/res/menu/activity_option.xml
@@ -205,7 +205,7 @@
<item
android:orderInCategory="5"
android:title="@string/rename_group"
- android:icon="@drawable/ic_edit_toolbar"
+ android:icon="@drawable/ic_am_edit"
android:visible="false"
vlc:showAsAction="ifRoom"
android:id="@+id/rename_group" />
More information about the Android
mailing list