replace send button with quick action button as long as no text has been entered
|
@ -13,7 +13,7 @@
|
||||||
width="95"
|
width="95"
|
||||||
height="95"
|
height="95"
|
||||||
id="Yes_check"
|
id="Yes_check"
|
||||||
inkscape:version="0.48.5 r10040"
|
inkscape:version="0.91 r13725"
|
||||||
sodipodi:docname="ic_received_indicator.svg">
|
sodipodi:docname="ic_received_indicator.svg">
|
||||||
<metadata
|
<metadata
|
||||||
id="metadata10">
|
id="metadata10">
|
||||||
|
@ -23,7 +23,7 @@
|
||||||
<dc:format>image/svg+xml</dc:format>
|
<dc:format>image/svg+xml</dc:format>
|
||||||
<dc:type
|
<dc:type
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
<dc:title></dc:title>
|
<dc:title />
|
||||||
</cc:Work>
|
</cc:Work>
|
||||||
</rdf:RDF>
|
</rdf:RDF>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
@ -36,17 +36,17 @@
|
||||||
guidetolerance="10"
|
guidetolerance="10"
|
||||||
inkscape:pageopacity="0"
|
inkscape:pageopacity="0"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:window-width="1233"
|
inkscape:window-width="956"
|
||||||
inkscape:window-height="828"
|
inkscape:window-height="1156"
|
||||||
id="namedview8"
|
id="namedview8"
|
||||||
showgrid="false"
|
showgrid="false"
|
||||||
showguides="true"
|
showguides="true"
|
||||||
inkscape:guide-bbox="true"
|
inkscape:guide-bbox="true"
|
||||||
inkscape:zoom="5.04"
|
inkscape:zoom="5.04"
|
||||||
inkscape:cx="26.829268"
|
inkscape:cx="-4.3215257"
|
||||||
inkscape:cy="37.489149"
|
inkscape:cy="37.489149"
|
||||||
inkscape:window-x="0"
|
inkscape:window-x="2880"
|
||||||
inkscape:window-y="0"
|
inkscape:window-y="20"
|
||||||
inkscape:window-maximized="0"
|
inkscape:window-maximized="0"
|
||||||
inkscape:current-layer="Yes_check"
|
inkscape:current-layer="Yes_check"
|
||||||
fit-margin-top="0"
|
fit-margin-top="0"
|
||||||
|
@ -69,7 +69,7 @@
|
||||||
</defs>
|
</defs>
|
||||||
<path
|
<path
|
||||||
d="m 2.3894499,61.412131 c 0,0 16.7473651,20.271938 22.3528491,26.154483 3.648598,3.026816 12.878061,3.83429 14.880462,0 1.64903,-2.636163 2.380404,-5.8348 2.991819,-7.931771 C 49.920898,54.575958 72.297563,22.337321 92.321082,10.50894 96.814837,5.2377522 86.327596,3.5063483 77.217442,6.9958109 63.487006,12.254946 34.107717,59.529917 29.270873,69.192545 22.40265,70.841418 12.518762,52.447046 12.518762,52.447046 7.3805037,52.552428 1.8841059,52.071763 2.3894499,61.412131 z"
|
d="m 2.3894499,61.412131 c 0,0 16.7473651,20.271938 22.3528491,26.154483 3.648598,3.026816 12.878061,3.83429 14.880462,0 1.64903,-2.636163 2.380404,-5.8348 2.991819,-7.931771 C 49.920898,54.575958 72.297563,22.337321 92.321082,10.50894 96.814837,5.2377522 86.327596,3.5063483 77.217442,6.9958109 63.487006,12.254946 34.107717,59.529917 29.270873,69.192545 22.40265,70.841418 12.518762,52.447046 12.518762,52.447046 7.3805037,52.552428 1.8841059,52.071763 2.3894499,61.412131 z"
|
||||||
style="fill:#249b25;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.29981154;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
style="fill:#259b24;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.29981154;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||||
id="check"
|
id="check"
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
sodipodi:nodetypes="cccscsccc" />
|
sodipodi:nodetypes="cccscsccc" />
|
||||||
|
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
54
art/ic_send_location_away.svg
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
sodipodi:docname="ic_send_location_away.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata10">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<defs
|
||||||
|
id="defs8" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="1156"
|
||||||
|
id="namedview6"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.9166667"
|
||||||
|
inkscape:cx="0.91525424"
|
||||||
|
inkscape:cy="24"
|
||||||
|
inkscape:window-x="2880"
|
||||||
|
inkscape:window-y="20"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg2" />
|
||||||
|
<path
|
||||||
|
d="M24 4c-7.73 0-14 6.27-14 14 0 10.5 14 26 14 26s14-15.5 14-26c0-7.73-6.27-14-14-14zm0 19c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"
|
||||||
|
id="path4"
|
||||||
|
style="fill:#ff9800;fill-opacity:0.627451" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.6 KiB |
54
art/ic_send_location_dnd.svg
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
sodipodi:docname="ic_send_location_dnd.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata10">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<defs
|
||||||
|
id="defs8" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="1156"
|
||||||
|
id="namedview6"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.9166667"
|
||||||
|
inkscape:cx="-7.9322034"
|
||||||
|
inkscape:cy="24"
|
||||||
|
inkscape:window-x="2880"
|
||||||
|
inkscape:window-y="20"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg2" />
|
||||||
|
<path
|
||||||
|
d="M24 4c-7.73 0-14 6.27-14 14 0 10.5 14 26 14 26s14-15.5 14-26c0-7.73-6.27-14-14-14zm0 19c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"
|
||||||
|
id="path4"
|
||||||
|
style="fill:#e51c23;fill-opacity:0.627451" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.6 KiB |
54
art/ic_send_location_offline.svg
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
sodipodi:docname="ic_send_location_offline.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata10">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<defs
|
||||||
|
id="defs8" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="1156"
|
||||||
|
id="namedview6"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.9166667"
|
||||||
|
inkscape:cx="-7.9322034"
|
||||||
|
inkscape:cy="24"
|
||||||
|
inkscape:window-x="2880"
|
||||||
|
inkscape:window-y="20"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg2" />
|
||||||
|
<path
|
||||||
|
d="M24 4c-7.73 0-14 6.27-14 14 0 10.5 14 26 14 26s14-15.5 14-26c0-7.73-6.27-14-14-14zm0 19c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"
|
||||||
|
id="path4"
|
||||||
|
style="fill:#000000;fill-opacity:0.627451" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.6 KiB |
54
art/ic_send_location_online.svg
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
sodipodi:docname="ic_send_location_online.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata10">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<defs
|
||||||
|
id="defs8" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="1156"
|
||||||
|
id="namedview6"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.9166667"
|
||||||
|
inkscape:cx="-7.9322034"
|
||||||
|
inkscape:cy="24"
|
||||||
|
inkscape:window-x="2880"
|
||||||
|
inkscape:window-y="20"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg2" />
|
||||||
|
<path
|
||||||
|
d="M24 4c-7.73 0-14 6.27-14 14 0 10.5 14 26 14 26s14-15.5 14-26c0-7.73-6.27-14-14-14zm0 19c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"
|
||||||
|
id="path4"
|
||||||
|
style="stroke:none;stroke-opacity:0;fill:#259b24;fill-opacity:0.627451" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.7 KiB |
60
art/ic_send_photo_away.svg
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
sodipodi:docname="ic_send_photo_away.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata12">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<defs
|
||||||
|
id="defs10" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="567"
|
||||||
|
id="namedview8"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.9166667"
|
||||||
|
inkscape:cx="-8.3389831"
|
||||||
|
inkscape:cy="24"
|
||||||
|
inkscape:window-x="960"
|
||||||
|
inkscape:window-y="609"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg2" />
|
||||||
|
<circle
|
||||||
|
cx="24"
|
||||||
|
cy="24"
|
||||||
|
r="6.4"
|
||||||
|
id="circle4"
|
||||||
|
style="fill-opacity:0.627451;fill:#ff9800" />
|
||||||
|
<path
|
||||||
|
d="M18 4l-3.66 4H8c-2.21 0-4 1.79-4 4v24c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4V12c0-2.21-1.79-4-4-4h-6.34L30 4H18zm6 30c-5.52 0-10-4.48-10-10s4.48-10 10-10 10 4.48 10 10-4.48 10-10 10z"
|
||||||
|
id="path6"
|
||||||
|
style="fill:#ff9800;fill-opacity:0.627451" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.8 KiB |
60
art/ic_send_photo_dnd.svg
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
sodipodi:docname="ic_send_photo_dnd.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata12">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<defs
|
||||||
|
id="defs10" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="567"
|
||||||
|
id="namedview8"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.9166667"
|
||||||
|
inkscape:cx="-8.3389831"
|
||||||
|
inkscape:cy="24"
|
||||||
|
inkscape:window-x="960"
|
||||||
|
inkscape:window-y="609"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg2" />
|
||||||
|
<circle
|
||||||
|
cx="24"
|
||||||
|
cy="24"
|
||||||
|
r="6.4"
|
||||||
|
id="circle4"
|
||||||
|
style="fill:#e51c23;fill-opacity:0.627451" />
|
||||||
|
<path
|
||||||
|
d="M18 4l-3.66 4H8c-2.21 0-4 1.79-4 4v24c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4V12c0-2.21-1.79-4-4-4h-6.34L30 4H18zm6 30c-5.52 0-10-4.48-10-10s4.48-10 10-10 10 4.48 10 10-4.48 10-10 10z"
|
||||||
|
id="path6"
|
||||||
|
style="fill:#e51c23;fill-opacity:0.627451" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.8 KiB |
60
art/ic_send_photo_offline.svg
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
sodipodi:docname="ic_send_photo_offline.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata12">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<defs
|
||||||
|
id="defs10" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="567"
|
||||||
|
id="namedview8"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.9166667"
|
||||||
|
inkscape:cx="-8.3389831"
|
||||||
|
inkscape:cy="24"
|
||||||
|
inkscape:window-x="960"
|
||||||
|
inkscape:window-y="609"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg2" />
|
||||||
|
<circle
|
||||||
|
cx="24"
|
||||||
|
cy="24"
|
||||||
|
r="6.4"
|
||||||
|
id="circle4"
|
||||||
|
style="fill:#000000;fill-opacity:0.627451" />
|
||||||
|
<path
|
||||||
|
d="M18 4l-3.66 4H8c-2.21 0-4 1.79-4 4v24c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4V12c0-2.21-1.79-4-4-4h-6.34L30 4H18zm6 30c-5.52 0-10-4.48-10-10s4.48-10 10-10 10 4.48 10 10-4.48 10-10 10z"
|
||||||
|
id="path6"
|
||||||
|
style="fill:#000000;fill-opacity:0.627451" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.8 KiB |
60
art/ic_send_photo_online.svg
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
sodipodi:docname="ic_send_photo_online.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata12">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<defs
|
||||||
|
id="defs10" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="567"
|
||||||
|
id="namedview8"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.9166667"
|
||||||
|
inkscape:cx="-8.3389831"
|
||||||
|
inkscape:cy="24"
|
||||||
|
inkscape:window-x="960"
|
||||||
|
inkscape:window-y="609"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg2" />
|
||||||
|
<circle
|
||||||
|
cx="24"
|
||||||
|
cy="24"
|
||||||
|
r="6.4"
|
||||||
|
id="circle4"
|
||||||
|
style="fill:#259b24;fill-opacity:0.627451" />
|
||||||
|
<path
|
||||||
|
d="M18 4l-3.66 4H8c-2.21 0-4 1.79-4 4v24c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4V12c0-2.21-1.79-4-4-4h-6.34L30 4H18zm6 30c-5.52 0-10-4.48-10-10s4.48-10 10-10 10 4.48 10 10-4.48 10-10 10z"
|
||||||
|
id="path6"
|
||||||
|
style="fill:#259b24;fill-opacity:0.627451" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.8 KiB |
69
art/ic_send_text_away.svg
Normal file
|
@ -0,0 +1,69 @@
|
||||||
|
<?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"
|
||||||
|
id="svg3621"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
width="96"
|
||||||
|
height="96"
|
||||||
|
sodipodi:docname="ic_send_text_away.svg"
|
||||||
|
inkscape:export-filename="/home/daniel/workspace/Conversations/res/drawable-xxhdpi/ic_action_send_now_online.png"
|
||||||
|
inkscape:export-xdpi="154.28572"
|
||||||
|
inkscape:export-ydpi="154.28572">
|
||||||
|
<metadata
|
||||||
|
id="metadata3627">
|
||||||
|
<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>
|
||||||
|
<defs
|
||||||
|
id="defs3625" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="744"
|
||||||
|
inkscape:window-height="1156"
|
||||||
|
id="namedview3623"
|
||||||
|
showgrid="true"
|
||||||
|
showguides="true"
|
||||||
|
inkscape:zoom="8"
|
||||||
|
inkscape:cx="55.595803"
|
||||||
|
inkscape:cy="56.761328"
|
||||||
|
inkscape:window-x="3092"
|
||||||
|
inkscape:window-y="20"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg3621">
|
||||||
|
<inkscape:grid
|
||||||
|
type="xygrid"
|
||||||
|
id="grid3631" />
|
||||||
|
</sodipodi:namedview>
|
||||||
|
<path
|
||||||
|
style="fill:#ff9800;fill-opacity:0.627451;stroke:none"
|
||||||
|
d="M 3.887575,4.1549246 90.999747,47.676331 3.887575,91.286663 13.203552,52.344101 63.012683,47.720794 13.203552,43.008558 Z"
|
||||||
|
id="path3633"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="ccccccc"
|
||||||
|
inkscape:export-filename="/home/daniel/workspace/Conversations/res/drawable-mdpi/ic_action_send_now_dnd.png"
|
||||||
|
inkscape:export-xdpi="51.42857"
|
||||||
|
inkscape:export-ydpi="51.42857" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 2.2 KiB |
69
art/ic_send_text_dnd.svg
Normal file
|
@ -0,0 +1,69 @@
|
||||||
|
<?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"
|
||||||
|
id="svg3621"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
width="96"
|
||||||
|
height="96"
|
||||||
|
sodipodi:docname="ic_send_text_dnd.svg"
|
||||||
|
inkscape:export-filename="/home/daniel/workspace/Conversations/res/drawable-xxhdpi/ic_action_send_now_online.png"
|
||||||
|
inkscape:export-xdpi="154.28572"
|
||||||
|
inkscape:export-ydpi="154.28572">
|
||||||
|
<metadata
|
||||||
|
id="metadata3627">
|
||||||
|
<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>
|
||||||
|
<defs
|
||||||
|
id="defs3625" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="1156"
|
||||||
|
id="namedview3623"
|
||||||
|
showgrid="true"
|
||||||
|
showguides="true"
|
||||||
|
inkscape:zoom="8"
|
||||||
|
inkscape:cx="49.908303"
|
||||||
|
inkscape:cy="56.761328"
|
||||||
|
inkscape:window-x="2880"
|
||||||
|
inkscape:window-y="20"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg3621">
|
||||||
|
<inkscape:grid
|
||||||
|
type="xygrid"
|
||||||
|
id="grid3631" />
|
||||||
|
</sodipodi:namedview>
|
||||||
|
<path
|
||||||
|
style="fill:#e51c23;fill-opacity:0.627451;stroke:none"
|
||||||
|
d="M 3.887575,4.1549246 90.999747,47.676331 3.887575,91.286663 13.203552,52.344101 63.012683,47.720794 13.203552,43.008558 Z"
|
||||||
|
id="path3633"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="ccccccc"
|
||||||
|
inkscape:export-filename="/home/daniel/workspace/Conversations/res/drawable-mdpi/ic_action_send_now_dnd.png"
|
||||||
|
inkscape:export-xdpi="51.42857"
|
||||||
|
inkscape:export-ydpi="51.42857" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 2.2 KiB |
69
art/ic_send_text_offline.svg
Normal file
|
@ -0,0 +1,69 @@
|
||||||
|
<?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"
|
||||||
|
id="svg3621"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
width="96"
|
||||||
|
height="96"
|
||||||
|
sodipodi:docname="ic_send_text_offline.svg"
|
||||||
|
inkscape:export-filename="/home/daniel/workspace/Conversations/res/drawable-xxhdpi/ic_action_send_now_online.png"
|
||||||
|
inkscape:export-xdpi="154.28572"
|
||||||
|
inkscape:export-ydpi="154.28572">
|
||||||
|
<metadata
|
||||||
|
id="metadata3627">
|
||||||
|
<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>
|
||||||
|
<defs
|
||||||
|
id="defs3625" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="1156"
|
||||||
|
id="namedview3623"
|
||||||
|
showgrid="true"
|
||||||
|
showguides="true"
|
||||||
|
inkscape:zoom="8"
|
||||||
|
inkscape:cx="50.158303"
|
||||||
|
inkscape:cy="56.761328"
|
||||||
|
inkscape:window-x="2880"
|
||||||
|
inkscape:window-y="20"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg3621">
|
||||||
|
<inkscape:grid
|
||||||
|
type="xygrid"
|
||||||
|
id="grid3631" />
|
||||||
|
</sodipodi:namedview>
|
||||||
|
<path
|
||||||
|
style="fill:#000000;fill-opacity:0.627451;stroke:none"
|
||||||
|
d="M 3.887575,4.1549246 90.999747,47.676331 3.887575,91.286663 13.203552,52.344101 63.012683,47.720794 13.203552,43.008558 Z"
|
||||||
|
id="path3633"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="ccccccc"
|
||||||
|
inkscape:export-filename="/home/daniel/workspace/Conversations/res/drawable-mdpi/ic_action_send_now_dnd.png"
|
||||||
|
inkscape:export-xdpi="51.42857"
|
||||||
|
inkscape:export-ydpi="51.42857" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 2.2 KiB |
|
@ -11,7 +11,7 @@
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
id="svg3621"
|
id="svg3621"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
inkscape:version="0.48.4 r9939"
|
inkscape:version="0.91 r13725"
|
||||||
width="96"
|
width="96"
|
||||||
height="96"
|
height="96"
|
||||||
sodipodi:docname="ic_action_send_now.svg"
|
sodipodi:docname="ic_action_send_now.svg"
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
<dc:format>image/svg+xml</dc:format>
|
<dc:format>image/svg+xml</dc:format>
|
||||||
<dc:type
|
<dc:type
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
<dc:title></dc:title>
|
<dc:title />
|
||||||
</cc:Work>
|
</cc:Work>
|
||||||
</rdf:RDF>
|
</rdf:RDF>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
@ -41,16 +41,16 @@
|
||||||
guidetolerance="10"
|
guidetolerance="10"
|
||||||
inkscape:pageopacity="0"
|
inkscape:pageopacity="0"
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
inkscape:window-width="1916"
|
inkscape:window-width="1920"
|
||||||
inkscape:window-height="1161"
|
inkscape:window-height="1200"
|
||||||
id="namedview3623"
|
id="namedview3623"
|
||||||
showgrid="true"
|
showgrid="true"
|
||||||
showguides="true"
|
showguides="true"
|
||||||
inkscape:zoom="1"
|
inkscape:zoom="8"
|
||||||
inkscape:cx="47.28873"
|
inkscape:cx="69.783303"
|
||||||
inkscape:cy="43.262706"
|
inkscape:cy="56.761328"
|
||||||
inkscape:window-x="0"
|
inkscape:window-x="1920"
|
||||||
inkscape:window-y="18"
|
inkscape:window-y="0"
|
||||||
inkscape:window-maximized="0"
|
inkscape:window-maximized="0"
|
||||||
inkscape:current-layer="svg3621">
|
inkscape:current-layer="svg3621">
|
||||||
<inkscape:grid
|
<inkscape:grid
|
||||||
|
@ -58,8 +58,8 @@
|
||||||
id="grid3631" />
|
id="grid3631" />
|
||||||
</sodipodi:namedview>
|
</sodipodi:namedview>
|
||||||
<path
|
<path
|
||||||
style="fill:#e51c28;fill-opacity:0.627451;stroke:none"
|
style="fill:#259b24;fill-opacity:0.62745098;stroke:none"
|
||||||
d="M 20.012575,21.028577 76,49 20.012575,77.028577 26,52 58.012575,49.028577 26,46 z"
|
d="M 3.887575,4.1549246 90.999747,47.676331 3.887575,91.286663 13.203552,52.344101 63.012683,47.720794 13.203552,43.008558 Z"
|
||||||
id="path3633"
|
id="path3633"
|
||||||
inkscape:connector-curvature="0"
|
inkscape:connector-curvature="0"
|
||||||
sodipodi:nodetypes="ccccccc"
|
sodipodi:nodetypes="ccccccc"
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
54
art/ic_send_voice_away.svg
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
sodipodi:docname="ic_send_voice_away.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata10">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<defs
|
||||||
|
id="defs8" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="1156"
|
||||||
|
id="namedview6"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.9166667"
|
||||||
|
inkscape:cx="-7.9322034"
|
||||||
|
inkscape:cy="24"
|
||||||
|
inkscape:window-x="2880"
|
||||||
|
inkscape:window-y="20"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg2" />
|
||||||
|
<path
|
||||||
|
d="M24 30c3.31 0 5.98-2.69 5.98-6L30 12c0-3.32-2.68-6-6-6-3.31 0-6 2.68-6 6v12c0 3.31 2.69 6 6 6zm10.6-6c0 6-5.07 10.2-10.6 10.2-5.52 0-10.6-4.2-10.6-10.2H10c0 6.83 5.44 12.47 12 13.44V44h4v-6.56c6.56-.97 12-6.61 12-13.44h-3.4z"
|
||||||
|
id="path4"
|
||||||
|
style="fill:#ff9800;fill-opacity:0.627451" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.7 KiB |
54
art/ic_send_voice_dnd.svg
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
sodipodi:docname="ic_send_voice_dnd.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata10">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<defs
|
||||||
|
id="defs8" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="1156"
|
||||||
|
id="namedview6"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.9166667"
|
||||||
|
inkscape:cx="-7.9322034"
|
||||||
|
inkscape:cy="24"
|
||||||
|
inkscape:window-x="2880"
|
||||||
|
inkscape:window-y="20"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg2" />
|
||||||
|
<path
|
||||||
|
d="M24 30c3.31 0 5.98-2.69 5.98-6L30 12c0-3.32-2.68-6-6-6-3.31 0-6 2.68-6 6v12c0 3.31 2.69 6 6 6zm10.6-6c0 6-5.07 10.2-10.6 10.2-5.52 0-10.6-4.2-10.6-10.2H10c0 6.83 5.44 12.47 12 13.44V44h4v-6.56c6.56-.97 12-6.61 12-13.44h-3.4z"
|
||||||
|
id="path4"
|
||||||
|
style="fill:#e51c23;fill-opacity:0.627451" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.7 KiB |
54
art/ic_send_voice_offline.svg
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
sodipodi:docname="ic_send_voice_offline.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata10">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<defs
|
||||||
|
id="defs8" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="1156"
|
||||||
|
id="namedview6"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.9166667"
|
||||||
|
inkscape:cx="-7.9322034"
|
||||||
|
inkscape:cy="24"
|
||||||
|
inkscape:window-x="2880"
|
||||||
|
inkscape:window-y="20"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg2" />
|
||||||
|
<path
|
||||||
|
d="M24 30c3.31 0 5.98-2.69 5.98-6L30 12c0-3.32-2.68-6-6-6-3.31 0-6 2.68-6 6v12c0 3.31 2.69 6 6 6zm10.6-6c0 6-5.07 10.2-10.6 10.2-5.52 0-10.6-4.2-10.6-10.2H10c0 6.83 5.44 12.47 12 13.44V44h4v-6.56c6.56-.97 12-6.61 12-13.44h-3.4z"
|
||||||
|
id="path4"
|
||||||
|
style="fill:#000000;fill-opacity:0.627451" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.7 KiB |
54
art/ic_send_voice_online.svg
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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"
|
||||||
|
viewBox="0 0 48 48"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.91 r13725"
|
||||||
|
sodipodi:docname="ic_send_voice_online.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata10">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<defs
|
||||||
|
id="defs8" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="956"
|
||||||
|
inkscape:window-height="1156"
|
||||||
|
id="namedview6"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="4.9166667"
|
||||||
|
inkscape:cx="-7.9322034"
|
||||||
|
inkscape:cy="24"
|
||||||
|
inkscape:window-x="2880"
|
||||||
|
inkscape:window-y="20"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="svg2" />
|
||||||
|
<path
|
||||||
|
d="M24 30c3.31 0 5.98-2.69 5.98-6L30 12c0-3.32-2.68-6-6-6-3.31 0-6 2.68-6 6v12c0 3.31 2.69 6 6 6zm10.6-6c0 6-5.07 10.2-10.6 10.2-5.52 0-10.6-4.2-10.6-10.2H10c0 6.83 5.44 12.47 12 13.44V44h4v-6.56c6.56-.97 12-6.61 12-13.44h-3.4z"
|
||||||
|
id="path4"
|
||||||
|
style="fill:#259b24;fill-opacity:0.627451" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.7 KiB |
|
@ -10,6 +10,22 @@ images = {
|
||||||
'conversations_baloon.svg' => ['ic_launcher', 48],
|
'conversations_baloon.svg' => ['ic_launcher', 48],
|
||||||
'conversations_mono.svg' => ['ic_notification', 24],
|
'conversations_mono.svg' => ['ic_notification', 24],
|
||||||
'ic_received_indicator.svg' => ['ic_received_indicator', 12],
|
'ic_received_indicator.svg' => ['ic_received_indicator', 12],
|
||||||
|
'ic_send_text_offline.svg' => ['ic_send_text_offline', 36],
|
||||||
|
'ic_send_text_online.svg' => ['ic_send_text_online', 36],
|
||||||
|
'ic_send_text_away.svg' => ['ic_send_text_away', 36],
|
||||||
|
'ic_send_text_dnd.svg' => ['ic_send_text_dnd', 36],
|
||||||
|
'ic_send_photo_online.svg' => ['ic_send_photo_online', 36],
|
||||||
|
'ic_send_photo_offline.svg' => ['ic_send_photo_offline', 36],
|
||||||
|
'ic_send_photo_away.svg' => ['ic_send_photo_away', 36],
|
||||||
|
'ic_send_photo_dnd.svg' => ['ic_send_photo_dnd', 36],
|
||||||
|
'ic_send_location_online.svg' => ['ic_send_location_online', 36],
|
||||||
|
'ic_send_location_offline.svg' => ['ic_send_location_offline', 36],
|
||||||
|
'ic_send_location_away.svg' => ['ic_send_location_away', 36],
|
||||||
|
'ic_send_location_dnd.svg' => ['ic_send_location_dnd', 36],
|
||||||
|
'ic_send_voice_online.svg' => ['ic_send_voice_online', 36],
|
||||||
|
'ic_send_voice_offline.svg' => ['ic_send_voice_offline', 36],
|
||||||
|
'ic_send_voice_away.svg' => ['ic_send_voice_away', 36],
|
||||||
|
'ic_send_voice_dnd.svg' => ['ic_send_voice_dnd', 36],
|
||||||
}
|
}
|
||||||
images.each do |source, result|
|
images.each do |source, result|
|
||||||
resolutions.each do |name, factor|
|
resolutions.each do |name, factor|
|
||||||
|
|
|
@ -60,11 +60,11 @@ public class ConversationActivity extends XmppActivity
|
||||||
public static final int REQUEST_SEND_MESSAGE = 0x0201;
|
public static final int REQUEST_SEND_MESSAGE = 0x0201;
|
||||||
public static final int REQUEST_DECRYPT_PGP = 0x0202;
|
public static final int REQUEST_DECRYPT_PGP = 0x0202;
|
||||||
public static final int REQUEST_ENCRYPT_MESSAGE = 0x0207;
|
public static final int REQUEST_ENCRYPT_MESSAGE = 0x0207;
|
||||||
private static final int ATTACHMENT_CHOICE_CHOOSE_IMAGE = 0x0301;
|
public static final int ATTACHMENT_CHOICE_CHOOSE_IMAGE = 0x0301;
|
||||||
private static final int ATTACHMENT_CHOICE_TAKE_PHOTO = 0x0302;
|
public static final int ATTACHMENT_CHOICE_TAKE_PHOTO = 0x0302;
|
||||||
private static final int ATTACHMENT_CHOICE_CHOOSE_FILE = 0x0303;
|
public static final int ATTACHMENT_CHOICE_CHOOSE_FILE = 0x0303;
|
||||||
private static final int ATTACHMENT_CHOICE_RECORD_VOICE = 0x0304;
|
public static final int ATTACHMENT_CHOICE_RECORD_VOICE = 0x0304;
|
||||||
private static final int ATTACHMENT_CHOICE_LOCATION = 0x0305;
|
public static final int ATTACHMENT_CHOICE_LOCATION = 0x0305;
|
||||||
private static final String STATE_OPEN_CONVERSATION = "state_open_conversation";
|
private static final String STATE_OPEN_CONVERSATION = "state_open_conversation";
|
||||||
private static final String STATE_PANEL_OPEN = "state_panel_open";
|
private static final String STATE_PANEL_OPEN = "state_panel_open";
|
||||||
private static final String STATE_PENDING_URI = "state_pending_uri";
|
private static final String STATE_PENDING_URI = "state_pending_uri";
|
||||||
|
@ -452,7 +452,18 @@ public class ConversationActivity extends XmppActivity
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void attachFile(final int attachmentChoice) {
|
public void attachFile(final int attachmentChoice) {
|
||||||
|
switch (attachmentChoice) {
|
||||||
|
case ATTACHMENT_CHOICE_LOCATION:
|
||||||
|
getPreferences().edit().putString("recently_used_quick_action","location").apply();
|
||||||
|
break;
|
||||||
|
case ATTACHMENT_CHOICE_RECORD_VOICE:
|
||||||
|
getPreferences().edit().putString("recently_used_quick_action","voice").apply();
|
||||||
|
break;
|
||||||
|
case ATTACHMENT_CHOICE_TAKE_PHOTO:
|
||||||
|
getPreferences().edit().putString("recently_used_quick_action","photo").apply();
|
||||||
|
break;
|
||||||
|
}
|
||||||
final Conversation conversation = getSelectedConversation();
|
final Conversation conversation = getSelectedConversation();
|
||||||
final int encryption = conversation.getNextEncryption(forceEncryption());
|
final int encryption = conversation.getNextEncryption(forceEncryption());
|
||||||
if (encryption == Message.ENCRYPTION_PGP) {
|
if (encryption == Message.ENCRYPTION_PGP) {
|
||||||
|
|
|
@ -119,7 +119,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onScroll(AbsListView view, int firstVisibleItem,
|
public void onScroll(AbsListView view, int firstVisibleItem,
|
||||||
int visibleItemCount, int totalItemCount) {
|
int visibleItemCount, int totalItemCount) {
|
||||||
synchronized (ConversationFragment.this.messageList) {
|
synchronized (ConversationFragment.this.messageList) {
|
||||||
if (firstVisibleItem < 5 && messagesLoaded && messageList.size() > 0) {
|
if (firstVisibleItem < 5 && messagesLoaded && messageList.size() > 0) {
|
||||||
long timestamp = ConversationFragment.this.messageList.get(0).getTimeSent();
|
long timestamp = ConversationFragment.this.messageList.get(0).getTimeSent();
|
||||||
|
@ -145,7 +145,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
try {
|
try {
|
||||||
Message tmpMessage = messageList.get(newPosition);
|
Message tmpMessage = messageList.get(newPosition);
|
||||||
|
|
||||||
while(tmpMessage.wasMergedIntoPrevious()) {
|
while (tmpMessage.wasMergedIntoPrevious()) {
|
||||||
offset++;
|
offset++;
|
||||||
tmpMessage = tmpMessage.prev();
|
tmpMessage = tmpMessage.prev();
|
||||||
}
|
}
|
||||||
|
@ -174,7 +174,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
if (ConversationFragment.this.conversation != conversation) {
|
if (ConversationFragment.this.conversation != conversation) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
messageLoaderToast = Toast.makeText(activity,resId,Toast.LENGTH_LONG);
|
messageLoaderToast = Toast.makeText(activity, resId, Toast.LENGTH_LONG);
|
||||||
messageLoaderToast.show();
|
messageLoaderToast.show();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -208,7 +208,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
activity.verifyOtrSessionDialog(conversation,v);
|
activity.verifyOtrSessionDialog(conversation, v);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
private ConcurrentLinkedQueue<Message> mEncryptedMessages = new ConcurrentLinkedQueue<>();
|
private ConcurrentLinkedQueue<Message> mEncryptedMessages = new ConcurrentLinkedQueue<>();
|
||||||
|
@ -219,7 +219,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
|
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEND) {
|
if (actionId == EditorInfo.IME_ACTION_SEND) {
|
||||||
InputMethodManager imm = (InputMethodManager) v.getContext()
|
InputMethodManager imm = (InputMethodManager) v.getContext()
|
||||||
.getSystemService(Context.INPUT_METHOD_SERVICE);
|
.getSystemService(Context.INPUT_METHOD_SERVICE);
|
||||||
imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
|
imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
|
||||||
sendMessage();
|
sendMessage();
|
||||||
return true;
|
return true;
|
||||||
|
@ -232,7 +232,25 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
sendMessage();
|
Object tag = v.getTag();
|
||||||
|
if (tag instanceof SendButtonAction) {
|
||||||
|
SendButtonAction action = (SendButtonAction) tag;
|
||||||
|
switch (action) {
|
||||||
|
case TAKE_PHOTO:
|
||||||
|
activity.attachFile(ConversationActivity.ATTACHMENT_CHOICE_TAKE_PHOTO);
|
||||||
|
break;
|
||||||
|
case SEND_LOCATION:
|
||||||
|
activity.attachFile(ConversationActivity.ATTACHMENT_CHOICE_LOCATION);
|
||||||
|
break;
|
||||||
|
case RECORD_VOICE:
|
||||||
|
activity.attachFile(ConversationActivity.ATTACHMENT_CHOICE_RECORD_VOICE);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
sendMessage();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
sendMessage();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
private OnClickListener clickToMuc = new OnClickListener() {
|
private OnClickListener clickToMuc = new OnClickListener() {
|
||||||
|
@ -262,7 +280,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
}
|
}
|
||||||
Message message = new Message(conversation, mEditMessage.getText()
|
Message message = new Message(conversation, mEditMessage.getText()
|
||||||
.toString(), conversation.getNextEncryption(activity
|
.toString(), conversation.getNextEncryption(activity
|
||||||
.forceEncryption()));
|
.forceEncryption()));
|
||||||
if (conversation.getMode() == Conversation.MODE_MULTI) {
|
if (conversation.getMode() == Conversation.MODE_MULTI) {
|
||||||
if (conversation.getNextCounterpart() != null) {
|
if (conversation.getNextCounterpart() != null) {
|
||||||
message.setCounterpart(conversation.getNextCounterpart());
|
message.setCounterpart(conversation.getNextCounterpart());
|
||||||
|
@ -282,13 +300,13 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
if (conversation.getMode() == Conversation.MODE_MULTI
|
if (conversation.getMode() == Conversation.MODE_MULTI
|
||||||
&& conversation.getNextCounterpart() != null) {
|
&& conversation.getNextCounterpart() != null) {
|
||||||
this.mEditMessage.setHint(getString(
|
this.mEditMessage.setHint(getString(
|
||||||
R.string.send_private_message_to,
|
R.string.send_private_message_to,
|
||||||
conversation.getNextCounterpart().getResourcepart()));
|
conversation.getNextCounterpart().getResourcepart()));
|
||||||
} else {
|
} else {
|
||||||
switch (conversation.getNextEncryption(activity.forceEncryption())) {
|
switch (conversation.getNextEncryption(activity.forceEncryption())) {
|
||||||
case Message.ENCRYPTION_NONE:
|
case Message.ENCRYPTION_NONE:
|
||||||
mEditMessage
|
mEditMessage
|
||||||
.setHint(getString(R.string.send_plain_text_message));
|
.setHint(getString(R.string.send_plain_text_message));
|
||||||
break;
|
break;
|
||||||
case Message.ENCRYPTION_OTR:
|
case Message.ENCRYPTION_OTR:
|
||||||
mEditMessage.setHint(getString(R.string.send_otr_message));
|
mEditMessage.setHint(getString(R.string.send_otr_message));
|
||||||
|
@ -304,7 +322,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setupIme() {
|
private void setupIme() {
|
||||||
if (((ConversationActivity)getActivity()).usingEnterKey()) {
|
if (((ConversationActivity) getActivity()).usingEnterKey()) {
|
||||||
mEditMessage.setInputType(mEditMessage.getInputType() & (~InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE));
|
mEditMessage.setInputType(mEditMessage.getInputType() & (~InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE));
|
||||||
} else {
|
} else {
|
||||||
mEditMessage.setInputType(mEditMessage.getInputType() | InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE);
|
mEditMessage.setInputType(mEditMessage.getInputType() | InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE);
|
||||||
|
@ -313,8 +331,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(final LayoutInflater inflater,
|
public View onCreateView(final LayoutInflater inflater,
|
||||||
ViewGroup container, Bundle savedInstanceState) {
|
ViewGroup container, Bundle savedInstanceState) {
|
||||||
final View view = inflater.inflate(R.layout.fragment_conversation,container, false);
|
final View view = inflater.inflate(R.layout.fragment_conversation, container, false);
|
||||||
view.setOnClickListener(null);
|
view.setOnClickListener(null);
|
||||||
mEditMessage = (EditMessage) view.findViewById(R.id.textinput);
|
mEditMessage = (EditMessage) view.findViewById(R.id.textinput);
|
||||||
setupIme();
|
setupIme();
|
||||||
|
@ -365,21 +383,21 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
messageListAdapter
|
messageListAdapter
|
||||||
.setOnContactPictureLongClicked(new OnContactPictureLongClicked() {
|
.setOnContactPictureLongClicked(new OnContactPictureLongClicked() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onContactPictureLongClicked(Message message) {
|
public void onContactPictureLongClicked(Message message) {
|
||||||
if (message.getStatus() <= Message.STATUS_RECEIVED) {
|
if (message.getStatus() <= Message.STATUS_RECEIVED) {
|
||||||
if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
|
if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
|
||||||
if (message.getCounterpart() != null) {
|
if (message.getCounterpart() != null) {
|
||||||
privateMessageWith(message.getCounterpart());
|
privateMessageWith(message.getCounterpart());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
activity.showQrCode();
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
activity.showQrCode();
|
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
});
|
|
||||||
messagesView.setAdapter(messageListAdapter);
|
messagesView.setAdapter(messageListAdapter);
|
||||||
|
|
||||||
registerForContextMenu(messagesView);
|
registerForContextMenu(messagesView);
|
||||||
|
@ -389,7 +407,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreateContextMenu(ContextMenu menu, View v,
|
public void onCreateContextMenu(ContextMenu menu, View v,
|
||||||
ContextMenuInfo menuInfo) {
|
ContextMenuInfo menuInfo) {
|
||||||
synchronized (this.messageList) {
|
synchronized (this.messageList) {
|
||||||
super.onCreateContextMenu(menu, v, menuInfo);
|
super.onCreateContextMenu(menu, v, menuInfo);
|
||||||
AdapterView.AdapterContextMenuInfo acmi = (AdapterContextMenuInfo) menuInfo;
|
AdapterView.AdapterContextMenuInfo acmi = (AdapterContextMenuInfo) menuInfo;
|
||||||
|
@ -416,7 +434,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
if ((m.getType() == Message.TYPE_TEXT
|
if ((m.getType() == Message.TYPE_TEXT
|
||||||
|| m.getType() == Message.TYPE_PRIVATE
|
|| m.getType() == Message.TYPE_PRIVATE
|
||||||
|| m.getDownloadable() != null)
|
|| m.getDownloadable() != null)
|
||||||
&& (!GeoHelper.isGeoUri(m.getBody()))) {
|
&& (!GeoHelper.isGeoUri(m.getBody()))) {
|
||||||
shareWith.setVisible(false);
|
shareWith.setVisible(false);
|
||||||
}
|
}
|
||||||
if (m.getStatus() != Message.STATUS_SEND_FAILED) {
|
if (m.getStatus() != Message.STATUS_SEND_FAILED) {
|
||||||
|
@ -425,17 +443,17 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
if (((m.getType() != Message.TYPE_IMAGE && m.getDownloadable() == null)
|
if (((m.getType() != Message.TYPE_IMAGE && m.getDownloadable() == null)
|
||||||
|| m.getImageParams().url == null) && !GeoHelper.isGeoUri(m.getBody())) {
|
|| m.getImageParams().url == null) && !GeoHelper.isGeoUri(m.getBody())) {
|
||||||
copyUrl.setVisible(false);
|
copyUrl.setVisible(false);
|
||||||
}
|
}
|
||||||
if (m.getType() != Message.TYPE_TEXT
|
if (m.getType() != Message.TYPE_TEXT
|
||||||
|| m.getDownloadable() != null
|
|| m.getDownloadable() != null
|
||||||
|| !m.bodyContainsDownloadable()) {
|
|| !m.bodyContainsDownloadable()) {
|
||||||
downloadImage.setVisible(false);
|
downloadImage.setVisible(false);
|
||||||
}
|
}
|
||||||
if (!((m.getDownloadable() != null && !(m.getDownloadable() instanceof DownloadablePlaceholder))
|
if (!((m.getDownloadable() != null && !(m.getDownloadable() instanceof DownloadablePlaceholder))
|
||||||
|| (m.isFileOrImage() && (m.getStatus() == Message.STATUS_WAITING
|
|| (m.isFileOrImage() && (m.getStatus() == Message.STATUS_WAITING
|
||||||
|| m.getStatus() == Message.STATUS_OFFERED)))) {
|
|| m.getStatus() == Message.STATUS_OFFERED)))) {
|
||||||
cancelTransmission.setVisible(false);
|
cancelTransmission.setVisible(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -483,12 +501,12 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
}
|
}
|
||||||
shareIntent.setType(mime);
|
shareIntent.setType(mime);
|
||||||
}
|
}
|
||||||
activity.startActivity(Intent.createChooser(shareIntent,getText(R.string.share_with)));
|
activity.startActivity(Intent.createChooser(shareIntent, getText(R.string.share_with)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void copyText(Message message) {
|
private void copyText(Message message) {
|
||||||
if (activity.copyTextToClipboard(message.getMergedBody(),
|
if (activity.copyTextToClipboard(message.getMergedBody(),
|
||||||
R.string.message_text)) {
|
R.string.message_text)) {
|
||||||
Toast.makeText(activity, R.string.message_copied_to_clipboard,
|
Toast.makeText(activity, R.string.message_copied_to_clipboard,
|
||||||
Toast.LENGTH_SHORT).show();
|
Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
|
@ -498,7 +516,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
if (message.getType() == Message.TYPE_FILE || message.getType() == Message.TYPE_IMAGE) {
|
if (message.getType() == Message.TYPE_FILE || message.getType() == Message.TYPE_IMAGE) {
|
||||||
DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
|
DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
|
||||||
if (!file.exists()) {
|
if (!file.exists()) {
|
||||||
Toast.makeText(activity,R.string.file_deleted,Toast.LENGTH_SHORT).show();
|
Toast.makeText(activity, R.string.file_deleted, Toast.LENGTH_SHORT).show();
|
||||||
message.setDownloadable(new DownloadablePlaceholder(Downloadable.STATUS_DELETED));
|
message.setDownloadable(new DownloadablePlaceholder(Downloadable.STATUS_DELETED));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -519,20 +537,20 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
if (activity.copyTextToClipboard(url, resId)) {
|
if (activity.copyTextToClipboard(url, resId)) {
|
||||||
Toast.makeText(activity, R.string.url_copied_to_clipboard,
|
Toast.makeText(activity, R.string.url_copied_to_clipboard,
|
||||||
Toast.LENGTH_SHORT).show();
|
Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void downloadImage(Message message) {
|
private void downloadImage(Message message) {
|
||||||
activity.xmppConnectionService.getHttpConnectionManager()
|
activity.xmppConnectionService.getHttpConnectionManager()
|
||||||
.createNewConnection(message);
|
.createNewConnection(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void cancelTransmission(Message message) {
|
private void cancelTransmission(Message message) {
|
||||||
Downloadable downloadable = message.getDownloadable();
|
Downloadable downloadable = message.getDownloadable();
|
||||||
if (downloadable!=null) {
|
if (downloadable != null) {
|
||||||
downloadable.cancel();
|
downloadable.cancel();
|
||||||
} else {
|
} else {
|
||||||
activity.xmppConnectionService.markMessage(message,Message.STATUS_SEND_FAILED);
|
activity.xmppConnectionService.markMessage(message, Message.STATUS_SEND_FAILED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -548,9 +566,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
mEditMessage.getText().insert(0, nick + ": ");
|
mEditMessage.getText().insert(0, nick + ": ");
|
||||||
} else {
|
} else {
|
||||||
if (mEditMessage.getText().charAt(
|
if (mEditMessage.getText().charAt(
|
||||||
mEditMessage.getSelectionStart() - 1) != ' ') {
|
mEditMessage.getSelectionStart() - 1) != ' ') {
|
||||||
nick = " " + nick;
|
nick = " " + nick;
|
||||||
}
|
}
|
||||||
mEditMessage.getText().insert(mEditMessage.getSelectionStart(),
|
mEditMessage.getText().insert(mEditMessage.getSelectionStart(),
|
||||||
nick + " ");
|
nick + " ");
|
||||||
}
|
}
|
||||||
|
@ -563,7 +581,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
if (this.conversation != null) {
|
if (this.conversation != null) {
|
||||||
final String msg = mEditMessage.getText().toString();
|
final String msg = mEditMessage.getText().toString();
|
||||||
this.conversation.setNextMessage(msg);
|
this.conversation.setNextMessage(msg);
|
||||||
updateChatState(this.conversation,msg);
|
updateChatState(this.conversation, msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -586,7 +604,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
final String msg = mEditMessage.getText().toString();
|
final String msg = mEditMessage.getText().toString();
|
||||||
this.conversation.setNextMessage(msg);
|
this.conversation.setNextMessage(msg);
|
||||||
if (this.conversation != conversation) {
|
if (this.conversation != conversation) {
|
||||||
updateChatState(this.conversation,msg);
|
updateChatState(this.conversation, msg);
|
||||||
}
|
}
|
||||||
this.conversation.trim();
|
this.conversation.trim();
|
||||||
}
|
}
|
||||||
|
@ -632,7 +650,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
final Contact contact = conversation == null ? null :conversation.getContact();
|
final Contact contact = conversation == null ? null : conversation.getContact();
|
||||||
if (contact != null) {
|
if (contact != null) {
|
||||||
activity.xmppConnectionService.createContact(contact);
|
activity.xmppConnectionService.createContact(contact);
|
||||||
activity.switchToContactDetails(contact);
|
activity.switchToContactDetails(contact);
|
||||||
|
@ -655,7 +673,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT);
|
intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT);
|
||||||
intent.putExtra("contact", conversation.getContact().getJid().toBareJid().toString());
|
intent.putExtra("contact", conversation.getContact().getJid().toBareJid().toString());
|
||||||
intent.putExtra("account", conversation.getAccount().getJid().toBareJid().toString());
|
intent.putExtra("account", conversation.getAccount().getJid().toBareJid().toString());
|
||||||
intent.putExtra("mode",VerifyOTRActivity.MODE_ANSWER_QUESTION);
|
intent.putExtra("mode", VerifyOTRActivity.MODE_ANSWER_QUESTION);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -665,11 +683,11 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
final Contact contact = conversation.getContact();
|
final Contact contact = conversation.getContact();
|
||||||
final int mode = conversation.getMode();
|
final int mode = conversation.getMode();
|
||||||
if (conversation.isBlocked()) {
|
if (conversation.isBlocked()) {
|
||||||
showSnackbar(R.string.contact_blocked, R.string.unblock,this.mUnblockClickListener);
|
showSnackbar(R.string.contact_blocked, R.string.unblock, this.mUnblockClickListener);
|
||||||
} else if (!contact.showInRoster() && contact.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
|
} else if (!contact.showInRoster() && contact.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
|
||||||
showSnackbar(R.string.contact_added_you, R.string.add_back,this.mAddBackClickListener);
|
showSnackbar(R.string.contact_added_you, R.string.add_back, this.mAddBackClickListener);
|
||||||
} else if (mode == Conversation.MODE_MULTI
|
} else if (mode == Conversation.MODE_MULTI
|
||||||
&&!conversation.getMucOptions().online()
|
&& !conversation.getMucOptions().online()
|
||||||
&& account.getStatus() == Account.State.ONLINE) {
|
&& account.getStatus() == Account.State.ONLINE) {
|
||||||
switch (conversation.getMucOptions().getError()) {
|
switch (conversation.getMucOptions().getError()) {
|
||||||
case MucOptions.ERROR_NICK_IN_USE:
|
case MucOptions.ERROR_NICK_IN_USE:
|
||||||
|
@ -693,18 +711,18 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else if (askForPassphraseIntent != null ) {
|
} else if (askForPassphraseIntent != null) {
|
||||||
showSnackbar(R.string.openpgp_messages_found,R.string.decrypt, clickToDecryptListener);
|
showSnackbar(R.string.openpgp_messages_found, R.string.decrypt, clickToDecryptListener);
|
||||||
} else if (mode == Conversation.MODE_SINGLE
|
} else if (mode == Conversation.MODE_SINGLE
|
||||||
&& conversation.smpRequested()) {
|
&& conversation.smpRequested()) {
|
||||||
showSnackbar(R.string.smp_requested, R.string.verify,this.mAnswerSmpClickListener);
|
showSnackbar(R.string.smp_requested, R.string.verify, this.mAnswerSmpClickListener);
|
||||||
} else if (mode == Conversation.MODE_SINGLE
|
} else if (mode == Conversation.MODE_SINGLE
|
||||||
&&conversation.hasValidOtrSession()
|
&& conversation.hasValidOtrSession()
|
||||||
&& (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED)
|
&& (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED)
|
||||||
&& (!conversation.isOtrFingerprintVerified())) {
|
&& (!conversation.isOtrFingerprintVerified())) {
|
||||||
showSnackbar(R.string.unknown_otr_fingerprint, R.string.verify, clickToVerify);
|
showSnackbar(R.string.unknown_otr_fingerprint, R.string.verify, clickToVerify);
|
||||||
} else if (conversation.isMuted()) {
|
} else if (conversation.isMuted()) {
|
||||||
showSnackbar(R.string.notifications_disabled, R.string.enable,this.mUnmuteClickListener);
|
showSnackbar(R.string.notifications_disabled, R.string.enable, this.mUnmuteClickListener);
|
||||||
} else {
|
} else {
|
||||||
hideSnackbar();
|
hideSnackbar();
|
||||||
}
|
}
|
||||||
|
@ -722,12 +740,12 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
for (final Message message : this.messageList) {
|
for (final Message message : this.messageList) {
|
||||||
if (message.getEncryption() == Message.ENCRYPTION_PGP
|
if (message.getEncryption() == Message.ENCRYPTION_PGP
|
||||||
&& (message.getStatus() == Message.STATUS_RECEIVED || message
|
&& (message.getStatus() == Message.STATUS_RECEIVED || message
|
||||||
.getStatus() >= Message.STATUS_SEND)
|
.getStatus() >= Message.STATUS_SEND)
|
||||||
&& message.getDownloadable() == null) {
|
&& message.getDownloadable() == null) {
|
||||||
if (!mEncryptedMessages.contains(message)) {
|
if (!mEncryptedMessages.contains(message)) {
|
||||||
mEncryptedMessages.add(message);
|
mEncryptedMessages.add(message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
decryptNext();
|
decryptNext();
|
||||||
updateStatusMessages();
|
updateStatusMessages();
|
||||||
|
@ -790,53 +808,108 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
updateChatMsgHint();
|
updateChatMsgHint();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
enum SendButtonAction {TEXT, TAKE_PHOTO, SEND_LOCATION, RECORD_VOICE}
|
||||||
|
|
||||||
|
private int getSendButtonImageResource(SendButtonAction action, int status) {
|
||||||
|
switch (action) {
|
||||||
|
case TEXT:
|
||||||
|
switch (status) {
|
||||||
|
case Presences.CHAT:
|
||||||
|
case Presences.ONLINE:
|
||||||
|
return R.drawable.ic_send_text_online;
|
||||||
|
case Presences.AWAY:
|
||||||
|
return R.drawable.ic_send_text_away;
|
||||||
|
case Presences.XA:
|
||||||
|
case Presences.DND:
|
||||||
|
return R.drawable.ic_send_text_dnd;
|
||||||
|
default:
|
||||||
|
return R.drawable.ic_send_text_offline;
|
||||||
|
}
|
||||||
|
case TAKE_PHOTO:
|
||||||
|
switch (status) {
|
||||||
|
case Presences.CHAT:
|
||||||
|
case Presences.ONLINE:
|
||||||
|
return R.drawable.ic_send_photo_online;
|
||||||
|
case Presences.AWAY:
|
||||||
|
return R.drawable.ic_send_photo_away;
|
||||||
|
case Presences.XA:
|
||||||
|
case Presences.DND:
|
||||||
|
return R.drawable.ic_send_photo_dnd;
|
||||||
|
default:
|
||||||
|
return R.drawable.ic_send_photo_offline;
|
||||||
|
}
|
||||||
|
case RECORD_VOICE:
|
||||||
|
switch (status) {
|
||||||
|
case Presences.CHAT:
|
||||||
|
case Presences.ONLINE:
|
||||||
|
return R.drawable.ic_send_voice_online;
|
||||||
|
case Presences.AWAY:
|
||||||
|
return R.drawable.ic_send_voice_away;
|
||||||
|
case Presences.XA:
|
||||||
|
case Presences.DND:
|
||||||
|
return R.drawable.ic_send_voice_dnd;
|
||||||
|
default:
|
||||||
|
return R.drawable.ic_send_voice_offline;
|
||||||
|
}
|
||||||
|
case SEND_LOCATION:
|
||||||
|
switch (status) {
|
||||||
|
case Presences.CHAT:
|
||||||
|
case Presences.ONLINE:
|
||||||
|
return R.drawable.ic_send_location_online;
|
||||||
|
case Presences.AWAY:
|
||||||
|
return R.drawable.ic_send_location_away;
|
||||||
|
case Presences.XA:
|
||||||
|
case Presences.DND:
|
||||||
|
return R.drawable.ic_send_location_dnd;
|
||||||
|
default:
|
||||||
|
return R.drawable.ic_send_location_offline;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return R.drawable.ic_send_text_offline;
|
||||||
|
}
|
||||||
|
|
||||||
public void updateSendButton() {
|
public void updateSendButton() {
|
||||||
Conversation c = this.conversation;
|
final Conversation c = this.conversation;
|
||||||
|
final SendButtonAction action;
|
||||||
|
final int status;
|
||||||
|
if (c.getMode() == Conversation.MODE_MULTI) {
|
||||||
|
action = SendButtonAction.TEXT;
|
||||||
|
} else {
|
||||||
|
if (this.mEditMessage == null || this.mEditMessage.getText().length() == 0) {
|
||||||
|
String setting = activity.getPreferences().getString("quick_action","recent");
|
||||||
|
if (setting.equals("recent")) {
|
||||||
|
setting = activity.getPreferences().getString("recently_used_quick_action","text");
|
||||||
|
}
|
||||||
|
switch (setting) {
|
||||||
|
case "photo":
|
||||||
|
action = SendButtonAction.TAKE_PHOTO;
|
||||||
|
break;
|
||||||
|
case "location":
|
||||||
|
action = SendButtonAction.SEND_LOCATION;
|
||||||
|
break;
|
||||||
|
case "voice":
|
||||||
|
action = SendButtonAction.RECORD_VOICE;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
action = SendButtonAction.TEXT;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
action = SendButtonAction.TEXT;
|
||||||
|
}
|
||||||
|
}
|
||||||
if (activity.useSendButtonToIndicateStatus() && c != null
|
if (activity.useSendButtonToIndicateStatus() && c != null
|
||||||
&& c.getAccount().getStatus() == Account.State.ONLINE) {
|
&& c.getAccount().getStatus() == Account.State.ONLINE) {
|
||||||
if (c.getMode() == Conversation.MODE_SINGLE) {
|
if (c.getMode() == Conversation.MODE_SINGLE) {
|
||||||
switch (c.getContact().getMostAvailableStatus()) {
|
status = c.getContact().getMostAvailableStatus();
|
||||||
case Presences.CHAT:
|
|
||||||
this.mSendButton
|
|
||||||
.setImageResource(R.drawable.ic_action_send_now_online);
|
|
||||||
break;
|
|
||||||
case Presences.ONLINE:
|
|
||||||
this.mSendButton
|
|
||||||
.setImageResource(R.drawable.ic_action_send_now_online);
|
|
||||||
break;
|
|
||||||
case Presences.AWAY:
|
|
||||||
this.mSendButton
|
|
||||||
.setImageResource(R.drawable.ic_action_send_now_away);
|
|
||||||
break;
|
|
||||||
case Presences.XA:
|
|
||||||
this.mSendButton
|
|
||||||
.setImageResource(R.drawable.ic_action_send_now_away);
|
|
||||||
break;
|
|
||||||
case Presences.DND:
|
|
||||||
this.mSendButton
|
|
||||||
.setImageResource(R.drawable.ic_action_send_now_dnd);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
this.mSendButton
|
|
||||||
.setImageResource(R.drawable.ic_action_send_now_offline);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
} else if (c.getMode() == Conversation.MODE_MULTI) {
|
|
||||||
if (c.getMucOptions().online()) {
|
|
||||||
this.mSendButton
|
|
||||||
.setImageResource(R.drawable.ic_action_send_now_online);
|
|
||||||
} else {
|
|
||||||
this.mSendButton
|
|
||||||
.setImageResource(R.drawable.ic_action_send_now_offline);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
this.mSendButton
|
status = c.getMucOptions().online() ? Presences.ONLINE : Presences.OFFLINE;
|
||||||
.setImageResource(R.drawable.ic_action_send_now_offline);
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.mSendButton
|
status = Presences.OFFLINE;
|
||||||
.setImageResource(R.drawable.ic_action_send_now_offline);
|
|
||||||
}
|
}
|
||||||
|
this.mSendButton.setTag(action);
|
||||||
|
this.mSendButton.setImageResource(getSendButtonImageResource(action, status));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void updateStatusMessages() {
|
protected void updateStatusMessages() {
|
||||||
|
@ -865,7 +938,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void showSnackbar(final int message, final int action,
|
protected void showSnackbar(final int message, final int action,
|
||||||
final OnClickListener clickListener) {
|
final OnClickListener clickListener) {
|
||||||
snackbar.setVisibility(View.VISIBLE);
|
snackbar.setVisibility(View.VISIBLE);
|
||||||
snackbar.setOnClickListener(null);
|
snackbar.setOnClickListener(null);
|
||||||
snackbarMessage.setText(message);
|
snackbarMessage.setText(message);
|
||||||
|
@ -897,7 +970,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void userInputRequried(PendingIntent pi,
|
public void userInputRequried(PendingIntent pi,
|
||||||
Contact contact) {
|
Contact contact) {
|
||||||
activity.runIntent(
|
activity.runIntent(
|
||||||
pi,
|
pi,
|
||||||
ConversationActivity.REQUEST_ENCRYPT_MESSAGE);
|
ConversationActivity.REQUEST_ENCRYPT_MESSAGE);
|
||||||
|
@ -921,11 +994,11 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog,
|
public void onClick(DialogInterface dialog,
|
||||||
int which) {
|
int which) {
|
||||||
conversation
|
conversation
|
||||||
.setNextEncryption(Message.ENCRYPTION_NONE);
|
.setNextEncryption(Message.ENCRYPTION_NONE);
|
||||||
xmppService.databaseBackend
|
xmppService.databaseBackend
|
||||||
.updateConversation(conversation);
|
.updateConversation(conversation);
|
||||||
message.setEncryption(Message.ENCRYPTION_NONE);
|
message.setEncryption(Message.ENCRYPTION_NONE);
|
||||||
xmppService.sendMessage(message);
|
xmppService.sendMessage(message);
|
||||||
messageSent();
|
messageSent();
|
||||||
|
@ -936,9 +1009,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
if (conversation.getMucOptions().pgpKeysInUse()) {
|
if (conversation.getMucOptions().pgpKeysInUse()) {
|
||||||
if (!conversation.getMucOptions().everybodyHasKeys()) {
|
if (!conversation.getMucOptions().everybodyHasKeys()) {
|
||||||
Toast warning = Toast
|
Toast warning = Toast
|
||||||
.makeText(getActivity(),
|
.makeText(getActivity(),
|
||||||
R.string.missing_public_keys,
|
R.string.missing_public_keys,
|
||||||
Toast.LENGTH_LONG);
|
Toast.LENGTH_LONG);
|
||||||
warning.setGravity(Gravity.CENTER_VERTICAL, 0, 0);
|
warning.setGravity(Gravity.CENTER_VERTICAL, 0, 0);
|
||||||
warning.show();
|
warning.show();
|
||||||
}
|
}
|
||||||
|
@ -950,12 +1023,12 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog,
|
public void onClick(DialogInterface dialog,
|
||||||
int which) {
|
int which) {
|
||||||
conversation
|
conversation
|
||||||
.setNextEncryption(Message.ENCRYPTION_NONE);
|
.setNextEncryption(Message.ENCRYPTION_NONE);
|
||||||
message.setEncryption(Message.ENCRYPTION_NONE);
|
message.setEncryption(Message.ENCRYPTION_NONE);
|
||||||
xmppService.databaseBackend
|
xmppService.databaseBackend
|
||||||
.updateConversation(conversation);
|
.updateConversation(conversation);
|
||||||
xmppService.sendMessage(message);
|
xmppService.sendMessage(message);
|
||||||
messageSent();
|
messageSent();
|
||||||
}
|
}
|
||||||
|
@ -968,7 +1041,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
}
|
}
|
||||||
|
|
||||||
public void showNoPGPKeyDialog(boolean plural,
|
public void showNoPGPKeyDialog(boolean plural,
|
||||||
DialogInterface.OnClickListener listener) {
|
DialogInterface.OnClickListener listener) {
|
||||||
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
|
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
|
||||||
builder.setIconAttribute(android.R.attr.alertDialogIcon);
|
builder.setIconAttribute(android.R.attr.alertDialogIcon);
|
||||||
if (plural) {
|
if (plural) {
|
||||||
|
@ -1026,6 +1099,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
if (status == Account.State.ONLINE && conversation.setOutgoingChatState(ChatState.COMPOSING)) {
|
if (status == Account.State.ONLINE && conversation.setOutgoingChatState(ChatState.COMPOSING)) {
|
||||||
activity.xmppConnectionService.sendChatState(conversation);
|
activity.xmppConnectionService.sendChatState(conversation);
|
||||||
}
|
}
|
||||||
|
updateSendButton();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1042,6 +1116,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
||||||
if (status == Account.State.ONLINE && conversation.setOutgoingChatState(Config.DEFAULT_CHATSTATE)) {
|
if (status == Account.State.ONLINE && conversation.setOutgoingChatState(Config.DEFAULT_CHATSTATE)) {
|
||||||
activity.xmppConnectionService.sendChatState(conversation);
|
activity.xmppConnectionService.sendChatState(conversation);
|
||||||
}
|
}
|
||||||
|
updateSendButton();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Before Width: | Height: | Size: 932 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 767 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 806 B After Width: | Height: | Size: 798 B |
Before Width: | Height: | Size: 686 B After Width: | Height: | Size: 560 B |
BIN
src/main/res/drawable-hdpi/ic_send_location_away.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
src/main/res/drawable-hdpi/ic_send_location_dnd.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
src/main/res/drawable-hdpi/ic_send_location_offline.png
Normal file
After Width: | Height: | Size: 971 B |
BIN
src/main/res/drawable-hdpi/ic_send_location_online.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
src/main/res/drawable-hdpi/ic_send_photo_away.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
src/main/res/drawable-hdpi/ic_send_photo_dnd.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
src/main/res/drawable-hdpi/ic_send_photo_offline.png
Normal file
After Width: | Height: | Size: 987 B |
BIN
src/main/res/drawable-hdpi/ic_send_photo_online.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
src/main/res/drawable-hdpi/ic_send_text_away.png
Normal file
After Width: | Height: | Size: 982 B |
BIN
src/main/res/drawable-hdpi/ic_send_text_dnd.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
src/main/res/drawable-hdpi/ic_send_text_offline.png
Normal file
After Width: | Height: | Size: 800 B |
BIN
src/main/res/drawable-hdpi/ic_send_text_online.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
src/main/res/drawable-hdpi/ic_send_voice_away.png
Normal file
After Width: | Height: | Size: 1,017 B |
BIN
src/main/res/drawable-hdpi/ic_send_voice_dnd.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
src/main/res/drawable-hdpi/ic_send_voice_offline.png
Normal file
After Width: | Height: | Size: 844 B |
BIN
src/main/res/drawable-hdpi/ic_send_voice_online.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 784 B |
Before Width: | Height: | Size: 535 B |
Before Width: | Height: | Size: 779 B |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 553 B After Width: | Height: | Size: 554 B |
Before Width: | Height: | Size: 447 B After Width: | Height: | Size: 402 B |
BIN
src/main/res/drawable-mdpi/ic_send_location_away.png
Normal file
After Width: | Height: | Size: 784 B |
BIN
src/main/res/drawable-mdpi/ic_send_location_dnd.png
Normal file
After Width: | Height: | Size: 908 B |
BIN
src/main/res/drawable-mdpi/ic_send_location_offline.png
Normal file
After Width: | Height: | Size: 673 B |
BIN
src/main/res/drawable-mdpi/ic_send_location_online.png
Normal file
After Width: | Height: | Size: 919 B |
BIN
src/main/res/drawable-mdpi/ic_send_photo_away.png
Normal file
After Width: | Height: | Size: 776 B |
BIN
src/main/res/drawable-mdpi/ic_send_photo_dnd.png
Normal file
After Width: | Height: | Size: 909 B |
BIN
src/main/res/drawable-mdpi/ic_send_photo_offline.png
Normal file
After Width: | Height: | Size: 666 B |
BIN
src/main/res/drawable-mdpi/ic_send_photo_online.png
Normal file
After Width: | Height: | Size: 938 B |
BIN
src/main/res/drawable-mdpi/ic_send_text_away.png
Normal file
After Width: | Height: | Size: 677 B |
BIN
src/main/res/drawable-mdpi/ic_send_text_dnd.png
Normal file
After Width: | Height: | Size: 769 B |
BIN
src/main/res/drawable-mdpi/ic_send_text_offline.png
Normal file
After Width: | Height: | Size: 542 B |
BIN
src/main/res/drawable-mdpi/ic_send_text_online.png
Normal file
After Width: | Height: | Size: 793 B |
BIN
src/main/res/drawable-mdpi/ic_send_voice_away.png
Normal file
After Width: | Height: | Size: 679 B |
BIN
src/main/res/drawable-mdpi/ic_send_voice_dnd.png
Normal file
After Width: | Height: | Size: 774 B |
BIN
src/main/res/drawable-mdpi/ic_send_voice_offline.png
Normal file
After Width: | Height: | Size: 575 B |
BIN
src/main/res/drawable-mdpi/ic_send_voice_online.png
Normal file
After Width: | Height: | Size: 788 B |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 968 B |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 855 B After Width: | Height: | Size: 717 B |
BIN
src/main/res/drawable-xhdpi/ic_send_location_away.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_location_dnd.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_location_offline.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_location_online.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_photo_away.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_photo_dnd.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_photo_offline.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_photo_online.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_text_away.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_text_dnd.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_text_offline.png
Normal file
After Width: | Height: | Size: 1,007 B |
BIN
src/main/res/drawable-xhdpi/ic_send_text_online.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_voice_away.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_voice_dnd.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_voice_offline.png
Normal file
After Width: | Height: | Size: 1 KiB |
BIN
src/main/res/drawable-xhdpi/ic_send_voice_online.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1,016 B |
BIN
src/main/res/drawable-xxhdpi/ic_send_location_away.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
src/main/res/drawable-xxhdpi/ic_send_location_dnd.png
Normal file
After Width: | Height: | Size: 2.5 KiB |
BIN
src/main/res/drawable-xxhdpi/ic_send_location_offline.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
src/main/res/drawable-xxhdpi/ic_send_location_online.png
Normal file
After Width: | Height: | Size: 2.5 KiB |