Commit 8d015948 authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Fix lollipop tinting issues + action mode

parent 608e3559
......@@ -32,7 +32,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="round"
android:strokeWidth="0.1"
android:fillColor="@color/standard_selection"
android:fillColor="?attr/colorControlNormal"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:fillAlpha="1"
......
......@@ -29,7 +29,7 @@
android:viewportHeight="24">
<path
android:pathData="m4,4 l0,11 8.6426,-5.5L4,4ZM15,12 L15,15 12,15 12,17 15,17 15,20 17,20 17,17 20,17 20,15 17,15 17,12 15,12z"
android:fillColor="@color/standard_selection"
android:fillColor="?attr/colorControlNormal"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:fillAlpha="1" />
......
<!--
~ *************************************************************************
~ ic_am_downsub.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="45dp"
android:height="45dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="m6,5c-1.108,0 -2,0.892 -2,2v10c0,1.108 0.892,2 2,2h12c1.108,0 2,-0.892 2,-2v-10c0,-1.108 -0.892,-2 -2,-2h-5v3h2l-3,3 -3,-3h2v-3zM6,13h2.5v1.5L6,14.5ZM10,13h8v1.5h-8zM6,15.5h8v1.5L6,17ZM15.5,15.5L18,15.5v1.5h-2.5z"
android:strokeAlpha="1"
android:strokeLineJoin="round"
android:strokeWidth="1"
android:fillColor="?attr/colorControlNormal"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:fillAlpha="1"
android:strokeLineCap="round" />
</vector>
......@@ -29,7 +29,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<path
android:fillAlpha="1"
android:fillColor="@color/standard_selection"
android:fillColor="?attr/colorControlNormal"
android:fillType="nonZero"
android:pathData="m12,4c-4.4183,0 -8,3.5817 -8,8 0,4.4183 3.5817,8 8,8 4.4183,0 8,-3.5817 8,-8 0,-4.4183 -3.5817,-8 -8,-8zM12,6c3.3137,0 6,2.6863 6,6 0,3.3137 -2.6863,6 -6,6 -3.3137,0 -6,-2.6863 -6,-6 0,-3.3137 2.6863,-6 6,-6zM11,8 L11,10 13,10 13,8zM11,11 L11,16 13,16 13,11z"
android:strokeAlpha="1"
......
......@@ -29,7 +29,7 @@
android:viewportHeight="24">
<path
android:pathData="m4,4.0002 l0,11 8.6426,-5.5L4,4.0002ZM16,6.0002 L16,15.053a2.5,2.5 0,0 0,-0.5 -0.053,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.5l0,-9.5 2,0 0,-2 -2,0 -2,0z"
android:fillColor="@color/standard_selection"
android:fillColor="?attr/colorControlNormal"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:fillAlpha="1" />
......
......@@ -29,7 +29,7 @@
android:viewportHeight="24">
<path
android:fillAlpha="1"
android:fillColor="@color/standard_selection"
android:fillColor="?attr/colorControlNormal"
android:fillType="evenOdd"
android:pathData="m12,20 l-1.4141,-1.416 -6.0859,-6.084 1.4141,-1.4141 5.0859,5.084v-12.1699h2v12.1699l5.0859,-5.084 1.4141,1.4141 -6.0859,6.084z"
android:strokeWidth="3.7416575"
......
......@@ -29,7 +29,7 @@
android:viewportHeight="24">
<path
android:fillAlpha="1"
android:fillColor="@color/standard_selection"
android:fillColor="?attr/colorControlNormal"
android:fillType="evenOdd"
android:pathData="m12,4 l-1.4141,1.416 -6.0859,6.084 1.4141,1.4141 5.0859,-5.084v12.1699h2v-12.1699l5.0859,5.084 1.4141,-1.4141 -6.0859,-6.084z"
android:strokeWidth="3.7416575"
......
......@@ -29,7 +29,7 @@
android:viewportHeight="24">
<path
android:fillAlpha="1"
android:fillColor="@color/standard_selection"
android:fillColor="?attr/colorControlNormal"
android:fillType="nonZero"
android:pathData="m17,3.9999 l0,4.7891c-0.1234,-0.026 -0.249,-0.039 -0.375,-0.039 -1.0355,0 -1.875,0.8395 -1.875,1.875 0,1.0356 0.8395,1.875 1.875,1.875 1.0355,0 1.875,-0.8394 1.875,-1.875l0,-5.125 1.5,0 0,-1.5 -1.5,0 -1.5,0zM5.0508,5.9979 L5.0508,5.9979c-1.0972,0.0007 -1.0959,0 -1.0234,1.4375 0.0479,0.4722 0.1193,0.9374 0.2129,1.3945 0.0935,0.4572 0.2089,0.9059 0.3457,1.3457 0.0875,0.2815 0.1983,0.5526 0.3027,0.8262l-0.0176,0c0.0286,0.074 0.0679,0.1431 0.0977,0.2168 0.0326,0.081 0.0557,0.1675 0.0898,0.2481 0.0818,0.1934 0.1814,0.3756 0.2715,0.5644 0.0708,0.1481 0.1372,0.2982 0.2129,0.4434 0.1512,0.2901 0.3179,0.5698 0.4883,0.8476 0.0812,0.1327 0.1568,0.2688 0.2422,0.3985 0.1631,0.2472 0.3416,0.4828 0.5195,0.7187 0.1111,0.1477 0.2154,0.3002 0.332,0.4434 0.1483,0.1813 0.3098,0.3498 0.4668,0.5234 0.459,0.5095 0.9443,0.9944 1.4727,1.4316 0.2591,0.2144 0.5343,0.4082 0.8086,0.6036 0.1021,0.073 0.1986,0.1526 0.3027,0.2226 0.2394,0.1609 0.4905,0.3032 0.7402,0.4492 0.1627,0.095 0.3215,0.1963 0.4883,0.2852 0.2078,0.1103 0.4227,0.2068 0.6367,0.3066 0.1648,0.077 0.324,0.1652 0.4922,0.2364 0.0694,0.029 0.1429,0.05 0.2129,0.078 0.0598,0.024 0.1156,0.053 0.1758,0.076l0,-0.014c0.2977,0.1156 0.5933,0.2325 0.9004,0.3281 0.4398,0.1368 0.8905,0.2542 1.3477,0.3477 0.4572,0.094 0.9224,0.165 1.3945,0.2129 1.4361,0.073 1.4356,0.073 1.4355,-1.0254l0,-1.0977 0,-1.0976c0,-1.1038 -0.0003,-1.0971 -0.9961,-1.1504 -0.3301,-0.035 -0.6581,-0.087 -0.9824,-0.1563 -0.3243,-0.069 -0.645,-0.154 -0.9609,-0.2558 -0.7305,-0.3049 -0.8665,-0.4211 -1.4258,0.1386l-0.4922,0.4942 -0.4941,0.4941 -0.3145,0.3145c-2.1099,-1.1198 -3.8299,-2.8663 -4.957,-4.9746l0.3125,-0.3125 0.4922,-0.4922 0.4922,-0.4922c0.544,-0.503 0.3516,-0.8383 0.1367,-1.4239 -0.102,-0.3156 -0.1869,-0.6369 -0.2559,-0.9609 -0.0689,-0.3241 -0.1209,-0.6506 -0.1563,-0.9805 -0.0548,-0.9943 -0.055,-0.9954 -1.1523,-0.9961l-1.0977,0 -1.0977,0z"
android:strokeWidth="10"
......
......@@ -32,7 +32,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="round"
android:strokeWidth="15.11811066"
android:fillColor="#ffffff"
android:fillColor="?attr/colorControlNormal"
android:strokeColor="#00000000"
android:fillType="nonZero"
android:fillAlpha="1"
......
<!--
~ *************************************************************************
~ ic_trash_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:fillAlpha="1"
android:fillColor="?attr/colorControlNormal"
android:fillType="nonZero"
android:pathData="m10,4c-0.7396,0 -1.3727,0.4031 -1.7187,1l-2.2813,-0.013 0,2 12,0 0,-2 -2.2813,0.013c-0.346,-0.5969 -0.9791,-1 -1.7188,-1zM7,8 L7,18c0,1.108 0.892,2 2,2l6,0c1.108,0 2,-0.892 2,-2l0,-10z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
......@@ -5,6 +5,6 @@
android:viewportHeight="32">
<path
android:pathData="m16,12c1.1,0 2,-0.9 2,-2 0,-1.1 -0.9,-2 -2,-2 -1.1,0 -2,0.9 -2,2 0,1.1 0.9,2 2,2zM16,14c-1.1,0 -2,0.9 -2,2 0,1.1 0.9,2 2,2 1.1,0 2,-0.9 2,-2 0,-1.1 -0.9,-2 -2,-2zM16,20c-1.1,0 -2,0.9 -2,2 0,1.1 0.9,2 2,2 1.1,0 2,-0.9 2,-2 0,-1.1 -0.9,-2 -2,-2z"
android:fillColor="@color/standard_selection_control_normal"
android:fillColor="?attr/colorControlNormal"
android:fillAlpha="1" />
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:pathData="m16,12c1.1,0 2,-0.9 2,-2 0,-1.1 -0.9,-2 -2,-2 -1.1,0 -2,0.9 -2,2 0,1.1 0.9,2 2,2zM16,14c-1.1,0 -2,0.9 -2,2 0,1.1 0.9,2 2,2 1.1,0 2,-0.9 2,-2 0,-1.1 -0.9,-2 -2,-2zM16,20c-1.1,0 -2,0.9 -2,2 0,1.1 0.9,2 2,2 1.1,0 2,-0.9 2,-2 0,-1.1 -0.9,-2 -2,-2z"
android:fillColor="@color/standard_selection"
android:fillAlpha="1" />
</vector>
......@@ -29,7 +29,7 @@
android:viewportHeight="24">
<path
android:fillAlpha="1"
android:fillColor="@color/standard_selection_control_normal"
android:fillColor="@color/standard_selection_grey600_orange200"
android:fillType="nonZero"
android:pathData="m10,4c-0.7396,0 -1.3727,0.4031 -1.7187,1l-2.2813,-0.013 0,2 12,0 0,-2 -2.2813,0.013c-0.346,-0.5969 -0.9791,-1 -1.7188,-1zM7,8 L7,18c0,1.108 0.892,2 2,2l6,0c1.108,0 2,-0.892 2,-2l0,-10z"
android:strokeWidth="1"
......
......@@ -67,7 +67,6 @@
<attr name="ic_playlist" format="reference" />
<attr name="ic_playlist_on" format="reference" />
<attr name="ic_menu_search" format="reference" />
<attr name="ic_audio_player_more" format="reference" />
<attr name="ic_previous" format="reference" />
<attr name="ic_next" format="reference" />
<attr name="ic_close" format="reference" />
......
......@@ -29,7 +29,7 @@
android:viewportHeight="24">
<path
android:fillAlpha="1"
android:fillColor="@color/standard_selection"
android:fillColor="?attr/colorControlNormal"
android:fillType="evenOdd"
android:pathData="m5.9528,4.0015c-0.4221,0.026 -0.7514,0.3754 -0.7515,0.7983v14.3981c-0.0008,0.6218 0.6772,1.0067 1.2108,0.6874l11.9984,-7.2005c0.5176,-0.3108 0.5176,-1.061 0,-1.3718l-11.9984,-7.199c-0.1383,-0.083 -0.2984,-0.1222 -0.4593,-0.1125z"
android:strokeWidth="1.59978426"
......
......@@ -200,7 +200,7 @@
android:focusable="true"
android:onClick="@{fragment::showAdvancedOptions}"
android:contentDescription="@string/advanced"
android:src="?attr/ic_audio_player_more" />
app:srcCompat="@drawable/ic_more" />
<TextView
android:id="@+id/header_time"
......
......@@ -133,7 +133,7 @@
android:contentDescription="@string/more_actions"
android:onClick="@{holder::onMoreClick}"
android:scaleType="center"
android:src="@drawable/ic_more"
vlc:srcCompat="@drawable/ic_more"
vlc:layout_constraintBottom_toBottomOf="@+id/subtitle"
vlc:layout_constraintEnd_toEndOf="parent"
vlc:layout_constraintTop_toTopOf="@+id/title" />
......
......@@ -193,7 +193,7 @@
android:focusable="true"
android:onClick="@{fragment::showAdvancedOptions}"
android:contentDescription="@string/advanced"
android:src="?attr/ic_audio_player_more"/>
app:srcCompat="@drawable/ic_more" />
<TextView
android:id="@+id/header_time"
......
......@@ -91,7 +91,7 @@
android:focusable="true"
android:onClick="@{fragment::showAdvancedOptions}"
android:contentDescription="@string/advanced"
android:src="?attr/ic_audio_player_more" />
app:srcCompat="@drawable/ic_more" />
<TextView
android:id="@+id/header_time"
......
......@@ -32,24 +32,24 @@
android:id="@+id/action_mode_audio_append"
android:title="@string/append"
android:icon="@drawable/ic_am_append"
app:showAsAction="always"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_mode_audio_add_playlist"
android:title="@string/add_to_playlist"
android:icon="@drawable/ic_am_addtoplaylist"
app:showAsAction="always"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_mode_audio_delete"
android:title="@string/delete"
android:icon="@drawable/ic_trash_normal"
android:icon="@drawable/ic_am_trash"
android:visible="false"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<group android:id="@+id/phone_only" >
<item
android:id="@+id/action_mode_audio_set_song"
android:title="@string/set_song"
android:icon="@drawable/ic_am_ringtone"
android:visible="false"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
</group>
</menu>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment