[Android] Use the right subtitle icon in InfoActivity
Nicolas Pomepuy
git at videolan.org
Tue Oct 1 16:03:45 CEST 2019
vlc-android | branch: master | Nicolas Pomepuy <nicolas.pomepuy at gmail.com> | Tue Oct 1 08:33:50 2019 +0200| [bacbd2381ba05c7268f075f70f98b744dac0d950] | committer: Geoffrey Métais
Use the right subtitle icon in InfoActivity
Fixes #1053
> https://code.videolan.org/videolan/vlc-android/commit/bacbd2381ba05c7268f075f70f98b744dac0d950
---
assets/images/svg/ic_audiosub_info.svg | 48 ++++++++++++++++++++
.../drawable-hdpi/ic_audiosub_circle_normal_o.png | Bin 1066 -> 0 bytes
.../drawable-ldpi/ic_audiosub_circle_normal_o.png | Bin 545 -> 0 bytes
.../drawable-mdpi/ic_audiosub_circle_normal_o.png | Bin 749 -> 0 bytes
.../drawable-xhdpi/ic_audiosub_circle_normal_o.png | Bin 1337 -> 0 bytes
vlc-android/res/drawable/ic_audiosub_info.xml | 50 +++++++++++++++++++++
vlc-android/res/layout/info_activity.xml | 2 +-
7 files changed, 99 insertions(+), 1 deletion(-)
diff --git a/assets/images/svg/ic_audiosub_info.svg b/assets/images/svg/ic_audiosub_info.svg
new file mode 100644
index 000000000..06fbd10bb
--- /dev/null
+++ b/assets/images/svg/ic_audiosub_info.svg
@@ -0,0 +1,48 @@
+<?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="48" height="48"
+ id="svg4682" version="1.1" inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="ic_audiotrack_info.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="7.919596"
+ inkscape:cx="16.269228" inkscape:cy="11.637059" 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-paths="true"
+ inkscape:bbox-nodes="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:snap-text-baseline="true" inkscape:snap-page="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,-1004.3622)">
+ <circle style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#141414;fill-opacity:0.75294118;fill-rule:nonzero;stroke:none;stroke-width:15.1181097;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="circle6014" cx="24" cy="1028.3622" r="24" />
+ <g id="g5269"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:125%;font-family:Roboto;-inkscape-font-specification:Roboto;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ transform="translate(-64,740.00002)" />
+ <path inkscape:connector-curvature="0" id="path6104"
+ d="m 15,1017.8622 c -1.662,0 -3,1.338 -3,3 v 15 c 0,1.662 1.338,3 3,3 h 18 c 1.662,0 3,-1.338 3,-3 v -15 c 0,-1.662 -1.338,-3 -3,-3 z m 0,12 h 3.75 v 2.25 H 15 Z m 6,0 h 12 v 2.25 H 21 Z m -6,3.75 h 12 v 2.25 H 15 Z m 14.25,0 H 33 v 2.25 h -3.75 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#fafafa;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:3.70000005;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ sodipodi:nodetypes="cssssssccccccccccccccccccsccc" />
+ </g>
+</svg>
diff --git a/vlc-android/res/drawable-hdpi/ic_audiosub_circle_normal_o.png b/vlc-android/res/drawable-hdpi/ic_audiosub_circle_normal_o.png
deleted file mode 100644
index 48a1c707c..000000000
Binary files a/vlc-android/res/drawable-hdpi/ic_audiosub_circle_normal_o.png and /dev/null differ
diff --git a/vlc-android/res/drawable-ldpi/ic_audiosub_circle_normal_o.png b/vlc-android/res/drawable-ldpi/ic_audiosub_circle_normal_o.png
deleted file mode 100644
index 0dc525fea..000000000
Binary files a/vlc-android/res/drawable-ldpi/ic_audiosub_circle_normal_o.png and /dev/null differ
diff --git a/vlc-android/res/drawable-mdpi/ic_audiosub_circle_normal_o.png b/vlc-android/res/drawable-mdpi/ic_audiosub_circle_normal_o.png
deleted file mode 100644
index 5fcb725c9..000000000
Binary files a/vlc-android/res/drawable-mdpi/ic_audiosub_circle_normal_o.png and /dev/null differ
diff --git a/vlc-android/res/drawable-xhdpi/ic_audiosub_circle_normal_o.png b/vlc-android/res/drawable-xhdpi/ic_audiosub_circle_normal_o.png
deleted file mode 100644
index 0d189fa08..000000000
Binary files a/vlc-android/res/drawable-xhdpi/ic_audiosub_circle_normal_o.png and /dev/null differ
diff --git a/vlc-android/res/drawable/ic_audiosub_info.xml b/vlc-android/res/drawable/ic_audiosub_info.xml
new file mode 100644
index 000000000..7c9182213
--- /dev/null
+++ b/vlc-android/res/drawable/ic_audiosub_info.xml
@@ -0,0 +1,50 @@
+<!--
+ ~ *************************************************************************
+ ~ ic_audiosub_info.xml
+ ~ **************************************************************************
+ ~ Copyright © 2019 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="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="round"
+ android:strokeWidth="15.1181097"
+ android:fillColor="@color/player_circle_background"
+ android:strokeColor="#00000000"
+ android:fillType="nonZero"
+ android:fillAlpha="0.75294118"
+ android:strokeLineCap="butt" />
+ <path
+ android:pathData="m15,13.5c-1.662,0 -3,1.338 -3,3v15c0,1.662 1.338,3 3,3h18c1.662,0 3,-1.338 3,-3v-15c0,-1.662 -1.338,-3 -3,-3zM15,25.5h3.75v2.25L15,27.75ZM21,25.5h12v2.25L21,27.75ZM15,29.25h12v2.25L15,31.5ZM29.25,29.25L33,29.25v2.25h-3.75z"
+ android:strokeAlpha="1"
+ android:strokeLineJoin="round"
+ android:strokeWidth="1.5"
+ android:fillColor="#fafafa"
+ android:strokeColor="#00000000"
+ android:fillType="nonZero"
+ android:fillAlpha="1"
+ android:strokeLineCap="round" />
+</vector>
diff --git a/vlc-android/res/layout/info_activity.xml b/vlc-android/res/layout/info_activity.xml
index 636940de7..c31fcb9a7 100644
--- a/vlc-android/res/layout/info_activity.xml
+++ b/vlc-android/res/layout/info_activity.xml
@@ -127,7 +127,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/default_margin"
vlc:layout_constraintEnd_toEndOf="parent"
- android:src="@drawable/ic_audiosub_circle_normal_o"
+ vlc:srcCompat="@drawable/ic_audiosub_info"
android:visibility="gone"
tools:visibility="visible"
android:layout_marginTop="8dp"
More information about the Android
mailing list