diff options
-rw-r--r-- | art/conversations.svg | 381 | ||||
-rw-r--r-- | art/conversations_baloon.svg | 69 | ||||
-rwxr-xr-x | art/render.rb | 3 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Contact.java | 16 | ||||
-rw-r--r-- | src/main/res/drawable-hdpi/ic_activity.png | bin | 3040 -> 0 bytes | |||
-rw-r--r-- | src/main/res/drawable-hdpi/ic_launcher.png | bin | 4416 -> 5190 bytes | |||
-rw-r--r-- | src/main/res/drawable-mdpi/ic_activity.png | bin | 1854 -> 0 bytes | |||
-rw-r--r-- | src/main/res/drawable-mdpi/ic_launcher.png | bin | 2726 -> 3057 bytes | |||
-rw-r--r-- | src/main/res/drawable-xhdpi/ic_activity.png | bin | 4349 -> 0 bytes | |||
-rw-r--r-- | src/main/res/drawable-xhdpi/ic_launcher.png | bin | 6503 -> 7477 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxhdpi/ic_activity.png | bin | 7209 -> 0 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxhdpi/ic_launcher.png | bin | 11054 -> 12738 bytes |
12 files changed, 50 insertions, 419 deletions
diff --git a/art/conversations.svg b/art/conversations.svg deleted file mode 100644 index 621b4124..00000000 --- a/art/conversations.svg +++ /dev/null @@ -1,381 +0,0 @@ -<?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:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="512" - height="512" - id="svg2" - version="1.1" - inkscape:version="0.48.4 r9939" - sodipodi:docname="conversation.svg" - inkscape:export-filename="/home/diesys/diesys/grafica/conversation/2/conversation.png" - inkscape:export-xdpi="100" - inkscape:export-ydpi="100"> - <defs - id="defs4"> - <linearGradient - inkscape:collect="always" - id="linearGradient3913"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop3915" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop3917" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3818"> - <stop - style="stop-color:#669900;stop-opacity:1" - offset="0" - id="stop3820" /> - <stop - style="stop-color:#99cc00;stop-opacity:1" - offset="1" - id="stop3822" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3818" - id="radialGradient3824" - cx="212.07048" - cy="1045.9178" - fx="212.07048" - fy="1045.9178" - r="238.57143" - gradientTransform="matrix(1.9491621,-0.90817722,0.65829208,1.4128498,-879.63121,-248.98648)" - gradientUnits="userSpaceOnUse" /> - <filter - inkscape:collect="always" - id="filter3836"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.3841605" - id="feGaussianBlur3838" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3913" - id="radialGradient3919" - cx="362.98563" - cy="379.77524" - fx="362.98563" - fy="379.77524" - r="139.95312" - gradientTransform="matrix(1.3800477,1.0445431,-1.3325077,1.7605059,339.09383,-577.83938)" - gradientUnits="userSpaceOnUse" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="-155.75885" - x2="114.59022" - y1="35.545681" - x1="114.55434" - id="linearGradient3794" - xlink:href="#linearGradient3788" - inkscape:collect="always" /> - <linearGradient - id="linearGradient3788"> - <stop - id="stop3790" - offset="0" - style="stop-color:#1eed00;stop-opacity:1;" /> - <stop - id="stop3792" - offset="1" - style="stop-color:#abff28;stop-opacity:1;" /> - </linearGradient> - <linearGradient - id="linearGradient3821"> - <stop - style="stop-color:#ff283d;stop-opacity:1;" - offset="0" - id="stop3823" /> - <stop - style="stop-color:#ff28ae;stop-opacity:1;" - offset="1" - id="stop3825" /> - </linearGradient> - <linearGradient - id="linearGradient4543"> - <stop - style="stop-color:#2e45bf;stop-opacity:1;" - offset="0" - id="stop4545" /> - <stop - style="stop-color:#28a7ff;stop-opacity:1;" - offset="1" - id="stop4547" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4098" - id="radialGradient4106" - cx="141.85023" - cy="147.36685" - fx="141.85023" - fy="147.36685" - r="172.26643" - gradientTransform="matrix(0.43684283,1.3119293,-2.2907273,0.76276042,502.45961,-107.61591)" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - id="linearGradient4098"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop4100" /> - <stop - style="stop-color:#e6e6e6;stop-opacity:1" - offset="1" - id="stop4102" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4098" - id="linearGradient3833" - x1="273.81851" - y1="764.74677" - x2="304.14023" - y2="936.47272" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4098" - id="linearGradient3853" - gradientUnits="userSpaceOnUse" - x1="273.81851" - y1="764.74677" - x2="304.14023" - y2="936.47272" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.24748737" - inkscape:cx="116.21963" - inkscape:cy="99.822919" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="false" - inkscape:window-width="1280" - inkscape:window-height="754" - inkscape:window-x="0" - inkscape:window-y="23" - inkscape:window-maximized="1" - showguides="true" - inkscape:guide-bbox="true" - inkscape:snap-to-guides="false" - inkscape:snap-grids="false" - inkscape:object-paths="true" - inkscape:object-nodes="false" - inkscape:snap-nodes="false"> - <sodipodi:guide - orientation="1,0" - position="0,534.28571" - id="guide3004" /> - <sodipodi:guide - orientation="0,1" - position="394.28571,511.42857" - id="guide3006" /> - <sodipodi:guide - orientation="1,0" - position="511.42857,320" - id="guide3008" /> - <sodipodi:guide - orientation="0,1" - position="401.42857,0" - id="guide3010" /> - <sodipodi:guide - orientation="1,0" - position="17.142857,258.57143" - id="guide3012" /> - <sodipodi:guide - orientation="0,1" - position="327.14286,494.28571" - id="guide3014" /> - <sodipodi:guide - orientation="0,1" - position="324.28571,17.142857" - id="guide3016" /> - <sodipodi:guide - orientation="1,0" - position="494.28571,237.14286" - id="guide3018" /> - <sodipodi:guide - orientation="1,0" - position="255.71429,302.85714" - id="guide3022" /> - <sodipodi:guide - orientation="0,1" - position="495.71429,255.71429" - id="guide3024" /> - <sodipodi:guide - orientation="1,0" - position="660,-315" - id="guide3904" /> - <sodipodi:guide - orientation="0,1" - position="554.28571,475.71429" - id="guide3931" /> - <sodipodi:guide - orientation="0,1" - position="581.42857,244.28571" - id="guide3933" /> - </sodipodi:namedview> - <metadata - id="metadata7"> - <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,-540.36218)" - style="display:inline"> - <rect - ry="20.359909" - y="563.69794" - x="17.857141" - height="475.09274" - width="477.14285" - id="rect3826" - style="opacity:0.6;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3836)" /> - <rect - ry="15.742693" - y="558.07648" - x="17.142857" - height="48.838173" - width="477.14285" - id="rect3796" - style="fill:#c0ea44;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - rx="15.714294" /> - <rect - style="fill:url(#radialGradient3824);fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - id="rect3026" - width="477.14285" - height="457.94995" - x="17.142857" - y="577.26935" - ry="20.359909" /> - <path - sodipodi:nodetypes="ccsssscc" - inkscape:connector-curvature="0" - id="path3843" - d="M 440.75922,998.26318 414.19749,890.80009 c 16.8897,-27.15918 22.70855,-59.05025 22.70855,-93.16236 0,-99.1504 -82.19661,-179.50071 -183.57099,-179.50071 -101.37434,0 -183.570935,80.35031 -183.570935,179.50071 0,99.15039 82.196595,179.56005 183.570935,179.56005 33.65679,0 58.24146,-6.91097 89.32491,-18.47 z" - style="opacity:0.05000000000000000;fill:#000000;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:80, 80;stroke-dashoffset:0;stroke-linecap:butt;stroke-linejoin:round;fill-opacity:1" /> - <path - style="fill:url(#radialGradient3919);fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;opacity:0.1" - d="M 413.71875 186.625 C 303.61523 186.625 214.375 274.21465 214.375 382.25 C 214.375 424.17883 227.82948 463.001 250.71875 494.84375 L 473.9375 494.84375 C 485.21689 494.84375 494.28125 485.77939 494.28125 474.5 L 494.28125 203.25 C 469.65076 192.56354 442.38179 186.625 413.71875 186.625 z " - id="rect3908" - transform="translate(0,540.36218)" /> - <g - id="g3971" - transform="matrix(1.1625669,0,0,1.0778378,-139.43297,-63.26267)"> - <g - id="g3945"> - <g - transform="matrix(0.97180599,0.00206436,-0.02018243,1.0289691,0,0)" - style="font-size:218.04266357px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:0.4;fill:#000000;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" - id="text3923"> - <path - d="m 261.11551,789.25169 c 0,12.55924 18.8389,18.83889 31.39814,18.83889 10.67536,0 18.83889,-8.16353 18.83889,-18.83889 0,-12.55925 -18.8389,-18.83889 -31.39815,-18.83889 -10.67536,0 -18.83888,8.16353 -18.83888,18.83889" - style="font-size:627.96289062px;font-weight:bold;fill:#000000;font-family:Pecita;-inkscape-font-specification:Pecita" - id="path3943" - inkscape:connector-curvature="0" /> - </g> - <g - transform="matrix(0.97180599,0.00206436,-0.02018243,1.0289691,0,0)" - style="font-size:218.04266357px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" - id="text3927"> - <path - d="m 256.13214,781.18791 c 0,12.55924 18.8389,18.83888 31.39814,18.83888 10.67536,0 18.83889,-8.16352 18.83889,-18.83888 0,-12.55925 -18.8389,-18.83889 -31.39814,-18.83889 -10.67536,0 -18.83889,8.16353 -18.83889,18.83889" - style="font-size:627.96289062px;font-weight:bold;letter-spacing:-1.37633753px;fill:#ffffff;font-family:Pecita;-inkscape-font-specification:Pecita" - id="path3940" - inkscape:connector-curvature="0" /> - </g> - </g> - <g - transform="translate(80,0)" - id="g3951"> - <g - id="g3953" - style="font-size:218.04266357px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:0.4;fill:#000000;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" - transform="matrix(0.97180599,0.00206436,-0.02018243,1.0289691,0,0)"> - <path - inkscape:connector-curvature="0" - id="path3955" - style="font-size:627.96289062px;font-weight:bold;fill:#000000;font-family:Pecita;-inkscape-font-specification:Pecita" - d="m 261.11551,789.25169 c 0,12.55924 18.8389,18.83889 31.39814,18.83889 10.67536,0 18.83889,-8.16353 18.83889,-18.83889 0,-12.55925 -18.8389,-18.83889 -31.39815,-18.83889 -10.67536,0 -18.83888,8.16353 -18.83888,18.83889" /> - </g> - <g - id="g3957" - style="font-size:218.04266357px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" - transform="matrix(0.97180599,0.00206436,-0.02018243,1.0289691,0,0)"> - <path - inkscape:connector-curvature="0" - id="path3959" - style="font-size:627.96289062px;font-weight:bold;letter-spacing:-1.37633753px;fill:#ffffff;font-family:Pecita;-inkscape-font-specification:Pecita" - d="m 256.13214,781.18791 c 0,12.55924 18.8389,18.83888 31.39814,18.83888 10.67536,0 18.83889,-8.16352 18.83889,-18.83888 0,-12.55925 -18.8389,-18.83889 -31.39814,-18.83889 -10.67536,0 -18.83889,8.16353 -18.83889,18.83889" /> - </g> - </g> - <g - id="g3961" - transform="translate(160,0)"> - <g - transform="matrix(0.97180599,0.00206436,-0.02018243,1.0289691,0,0)" - style="font-size:218.04266357px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:0.4;fill:#000000;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" - id="g3963"> - <path - d="m 261.11551,789.25169 c 0,12.55924 18.8389,18.83889 31.39814,18.83889 10.67536,0 18.83889,-8.16353 18.83889,-18.83889 0,-12.55925 -18.8389,-18.83889 -31.39815,-18.83889 -10.67536,0 -18.83888,8.16353 -18.83888,18.83889" - style="font-size:627.96289062px;font-weight:bold;fill:#000000;font-family:Pecita;-inkscape-font-specification:Pecita" - id="path3965" - inkscape:connector-curvature="0" /> - </g> - <g - transform="matrix(0.97180599,0.00206436,-0.02018243,1.0289691,0,0)" - style="font-size:218.04266357px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" - id="g3967"> - <path - d="m 256.13214,781.18791 c 0,12.55924 18.8389,18.83888 31.39814,18.83888 10.67536,0 18.83889,-8.16352 18.83889,-18.83888 0,-12.55925 -18.8389,-18.83889 -31.39814,-18.83889 -10.67536,0 -18.83889,8.16353 -18.83889,18.83889" - style="font-size:627.96289062px;font-weight:bold;letter-spacing:-1.37633753px;fill:#ffffff;font-family:Pecita;-inkscape-font-specification:Pecita" - id="path3969" - inkscape:connector-curvature="0" /> - </g> - </g> - </g> - <path - sodipodi:nodetypes="ccsssscc" - inkscape:connector-curvature="0" - id="path3845" - d="M 444.75922,1002.2632 418.19749,894.80009 c 16.8897,-27.15918 22.70855,-59.05025 22.70855,-93.16236 0,-99.1504 -82.19661,-179.50071 -183.57099,-179.50071 -101.37434,0 -183.570935,80.35031 -183.570935,179.50071 0,99.15039 82.196595,179.56005 183.570935,179.56005 33.65679,0 58.24146,-6.91097 89.32491,-18.47 z" - style="opacity:0;fill:none;stroke:#000000;stroke-width:20;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:80, 80;stroke-dashoffset:0;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3855" - d="m 253.3125,608.29968 c -4.57162,-0.002 -9.1209,0.0741 -10.84375,0.1875 -14.27382,0.9398 -25.20877,2.59141 -37.6875,5.75 -4.79596,1.21395 -8.46435,2.29027 -12.90625,3.75 -2.83656,0.93217 -7.14779,2.42208 -7.375,2.5625 -0.0697,0.0431 2.82515,7.91819 6.78125,18.5 0.0396,0.10605 0.14482,0.1174 0.28125,0.0625 0.9453,-0.38039 5.48292,-1.95002 7.59375,-2.625 18.16928,-5.80998 37.3261,-8.65347 56.3125,-8.375 2.67375,0.0392 6.0571,0.13508 7.5,0.21875 1.44289,0.0836 2.6507,0.13055 2.6875,0.0937 0.058,-0.058 1.3012,-19.70366 1.25,-19.75 -0.0105,-0.01 -1.19784,-0.0929 -2.65625,-0.1875 -1.7721,-0.11497 -6.36588,-0.18548 -10.9375,-0.1875 z m 94.09375,23.90625 c -0.086,0.0926 -9.46875,17.21685 -9.46875,17.28125 0,0.0158 0.43052,0.2686 0.96875,0.5625 9.87456,5.39206 21.05418,13.20405 29.84375,20.875 9.26433,8.08528 18.46008,18.02393 25.03125,27 0.55428,0.75718 0.67166,0.85859 0.875,0.71875 0.96294,-0.66221 15.622,-11.6872 15.625,-11.75 0.004,-0.0849 -2.83241,-3.84089 -4.03125,-5.34375 -4.7925,-6.00788 -8.99894,-10.68744 -14.65625,-16.34375 -9.04603,-9.04445 -17.54561,-16.09577 -28.03125,-23.25 -5.60544,-3.82453 -15.88873,-10.03821 -16.15625,-9.75 z m -233.3125,33.90625 -2.0625,2.1875 c -18.32375,19.26161 -32.32553,41.78507 -41.15625,66.25 -0.43225,1.19753 -0.81284,2.27121 -0.84375,2.40625 -0.0406,0.17743 2.51089,1.11193 9.15625,3.34375 5.05804,1.69873 9.27679,3.08775 9.375,3.09375 0.0982,0.006 0.77856,-1.65137 1.53125,-3.6875 7.72587,-20.89937 19.68924,-40.10992 35.375,-56.8125 l 2.59375,-2.78125 -6.96875,-7 -7,-7 z m 329.65625,97.75 -8.40625,1.625 c -4.62648,0.90809 -8.97544,1.75853 -9.6875,1.875 -0.88919,0.14544 -1.3125,0.29719 -1.3125,0.46875 0,0.13738 0.19807,1.38523 0.4375,2.78125 2.29501,13.3812 2.78822,29.39501 1.4375,46.90625 -0.61827,8.01542 -1.99398,17.86187 -3.3125,23.78125 -0.19825,0.89002 -0.32225,1.67775 -0.28125,1.71875 0.041,0.041 4.35259,0.98127 9.59375,2.09375 5.24116,1.11247 9.60165,2.01935 9.65625,2.03125 0.0546,0.0119 0.38836,-1.47098 0.75,-3.3125 2.85197,-14.52267 4.0984,-28.1704 4.125,-45.21875 0.0186,-11.95864 -0.67218,-20.67232 -2.4375,-31.375 l -0.5625,-3.375 z m -362.8125,54.375 -0.65625,0.0937 c -0.35822,0.052 -4.7537,0.57476 -9.75,1.15625 -4.9963,0.58149 -9.13608,1.10485 -9.1875,1.15625 -0.12057,0.12057 0.21425,2.4783 0.96875,7.0625 4.13481,25.12214 12.76972,47.74942 26.78125,70.125 0.38271,0.61117 0.79093,1.0844 0.90625,1.0625 0.30714,-0.0583 16.493,-10.358 16.5,-10.5 0.003,-0.0662 -0.67654,-1.19119 -1.5,-2.5 -3.62302,-5.75842 -8.43627,-14.81353 -11.09375,-20.875 -6.39324,-14.58238 -10.6048,-29.464 -12.78125,-45.2187 l -0.1875,-1.5625 z m 350.03125,100.1875 c -0.39823,0.008 -18.75391,4.56641 -18.875,4.6875 -0.0832,0.0832 18.69913,76.44787 19,77.25002 0.0482,0.1284 0.17116,0.1978 0.28125,0.1562 0.1101,-0.042 4.39957,-1.10959 9.53125,-2.37497 5.13167,-1.26539 9.33975,-2.4018 9.34375,-2.5 0.004,-0.0982 -4.26803,-17.49777 -9.5,-38.6875 -7.47046,-30.25568 -9.5684,-38.53525 -9.78125,-38.53125 z m -270.4375,22.6875 c -0.34766,0.0112 -1.03246,1.12684 -5.34375,8.1875 -2.81434,4.60909 -5.125,8.42085 -5.125,8.46875 0,0.11606 2.91136,1.85904 6,3.625 18.97988,10.85192 39.98244,18.52086 61.5,22.4375 3.0488,0.55494 4.81689,0.85401 9.375,1.53125 0.58929,0.0876 1.16293,0.1756 1.28125,0.1875 0.26735,0.0268 0.20708,0.53299 1.59375,-9.71875 0.63767,-4.71429 1.193,-8.85633 1.25,-9.21875 0.10005,-0.63553 0.0731,-0.6593 -0.5,-0.75 -0.32684,-0.0517 -2.28125,-0.35029 -4.34375,-0.65625 -18.93976,-2.80953 -38.43135,-9.25433 -55.46875,-18.3125 -3.01785,-1.60448 -8.63366,-4.78954 -10.0625,-5.71875 -0.045,-0.0293 -0.10658,-0.0641 -0.15625,-0.0625 z m 181.90625,7.71875 c -1.68213,0.11043 -3.90782,0.86376 -8.875,2.65625 -9.59501,3.46252 -20.49118,7.0151 -25.40625,8.28125 -0.71107,0.18318 -1.3115,0.43024 -1.3125,0.53125 -0.002,0.18251 4.8611,18.86584 4.9375,18.96875 0.047,0.0633 5.38958,-1.44515 8.71875,-2.46875 4.32782,-1.33065 11.61031,-3.77066 16.8125,-5.625 l 5.15625,-1.84375 18.9375,7.625 c 15.40636,6.21018 18.93675,7.59721 19.03125,7.375 0.76943,-1.80995 7.31715,-18.1024 7.28125,-18.125 -0.32947,-0.20787 -41.72627,-16.78524 -42.375,-16.96875 -1.06807,-0.30214 -1.89697,-0.47251 -2.90625,-0.40625 z" - style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;opacity:0.50000000000000000;stroke-opacity:1;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none" /> - </g> -</svg> diff --git a/art/conversations_baloon.svg b/art/conversations_baloon.svg index 5a993cce..90ec648b 100644 --- a/art/conversations_baloon.svg +++ b/art/conversations_baloon.svg @@ -14,11 +14,11 @@ height="512" id="svg2" version="1.1" - inkscape:version="0.48.4 r9939" - sodipodi:docname="conversation_bubble.svg" - inkscape:export-filename="/home/diesys/diesys/grafica/conversation/conversation_bubble.png" - inkscape:export-xdpi="100" - inkscape:export-ydpi="100"> + inkscape:version="0.48.5 r10040" + sodipodi:docname="conversations_baloon.svg" + inkscape:export-filename="/home/daniel/conversations_0.9.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> <defs id="defs4"> <linearGradient @@ -34,14 +34,13 @@ id="stop3917" /> </linearGradient> <linearGradient - inkscape:collect="always" id="linearGradient3818"> <stop - style="stop-color:#669900;stop-opacity:1" + style="stop-color:#0a7e07;stop-opacity:1;" offset="0" id="stop3820" /> <stop - style="stop-color:#99cc00;stop-opacity:1" + style="stop-color:#259b24;stop-opacity:1;" offset="1" id="stop3822" /> </linearGradient> @@ -221,17 +220,17 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.24748737" - inkscape:cx="222.83124" - inkscape:cy="467.98135" + inkscape:zoom="0.98994948" + inkscape:cx="302.78937" + inkscape:cy="277.57986" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1280" - inkscape:window-height="754" - inkscape:window-x="0" - inkscape:window-y="23" - inkscape:window-maximized="1" + inkscape:window-width="956" + inkscape:window-height="1161" + inkscape:window-x="960" + inkscape:window-y="18" + inkscape:window-maximized="0" showguides="true" inkscape:guide-bbox="true" inkscape:snap-to-guides="true" @@ -333,74 +332,78 @@ inkscape:connector-curvature="0" /> <g id="g3971" - transform="matrix(1.3691054,0,0,1.2698854,-209.33716,-230.16141)"> + transform="matrix(1.3691054,0,0,1.2698854,-209.33716,-230.16141)" + style="fill:#eeeeee;fill-opacity:1"> <g - id="g3945"> + id="g3945" + style="fill:#eeeeee;fill-opacity:1"> <g transform="matrix(0.97180599,0.00206436,-0.02018243,1.0289691,0,0)" - style="font-size:218.04266357px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:0.4;fill:#000000;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" + style="font-size:218.04266357000000198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:0.40000000000000002;fill:#eeeeee;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" id="text3923"> <path d="m 261.11551,789.25169 c 0,12.55924 18.8389,18.83889 31.39814,18.83889 10.67536,0 18.83889,-8.16353 18.83889,-18.83889 0,-12.55925 -18.8389,-18.83889 -31.39815,-18.83889 -10.67536,0 -18.83888,8.16353 -18.83888,18.83889" - style="font-size:627.96289062px;font-weight:bold;fill:#000000;font-family:Pecita;-inkscape-font-specification:Pecita" + style="font-size:627.96289062000016656px;font-weight:bold;fill:#eeeeee;font-family:Pecita;-inkscape-font-specification:Pecita;fill-opacity:1" id="path3943" inkscape:connector-curvature="0" /> </g> <g transform="matrix(0.97180599,0.00206436,-0.02018243,1.0289691,0,0)" - style="font-size:218.04266357px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" + style="font-size:218.04266357000000198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#eeeeee;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" id="text3927"> <path d="m 256.13214,781.18791 c 0,12.55924 18.8389,18.83888 31.39814,18.83888 10.67536,0 18.83889,-8.16352 18.83889,-18.83888 0,-12.55925 -18.8389,-18.83889 -31.39814,-18.83889 -10.67536,0 -18.83889,8.16353 -18.83889,18.83889" - style="font-size:627.96289062px;font-weight:bold;letter-spacing:-1.37633753px;fill:#ffffff;font-family:Pecita;-inkscape-font-specification:Pecita" + style="font-size:627.96289062000016656px;font-weight:bold;letter-spacing:-1.37633753000000003px;fill:#eeeeee;font-family:Pecita;-inkscape-font-specification:Pecita;fill-opacity:1" id="path3940" inkscape:connector-curvature="0" /> </g> </g> <g transform="translate(80,0)" - id="g3951"> + id="g3951" + style="fill:#eeeeee;fill-opacity:1"> <g id="g3953" - style="font-size:218.04266357px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:0.4;fill:#000000;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" + style="font-size:218.04266357000000198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:0.40000000000000002;fill:#eeeeee;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" transform="matrix(0.97180599,0.00206436,-0.02018243,1.0289691,0,0)"> <path inkscape:connector-curvature="0" id="path3955" - style="font-size:627.96289062px;font-weight:bold;fill:#000000;font-family:Pecita;-inkscape-font-specification:Pecita" + style="font-size:627.96289062000016656px;font-weight:bold;fill:#eeeeee;font-family:Pecita;-inkscape-font-specification:Pecita;fill-opacity:1" d="m 261.11551,789.25169 c 0,12.55924 18.8389,18.83889 31.39814,18.83889 10.67536,0 18.83889,-8.16353 18.83889,-18.83889 0,-12.55925 -18.8389,-18.83889 -31.39815,-18.83889 -10.67536,0 -18.83888,8.16353 -18.83888,18.83889" /> </g> <g id="g3957" - style="font-size:218.04266357px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" + style="font-size:218.04266357000000198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#eeeeee;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" transform="matrix(0.97180599,0.00206436,-0.02018243,1.0289691,0,0)"> <path inkscape:connector-curvature="0" id="path3959" - style="font-size:627.96289062px;font-weight:bold;letter-spacing:-1.37633753px;fill:#ffffff;font-family:Pecita;-inkscape-font-specification:Pecita" + style="font-size:627.96289062000016656px;font-weight:bold;letter-spacing:-1.37633753000000003px;fill:#eeeeee;font-family:Pecita;-inkscape-font-specification:Pecita;fill-opacity:1" d="m 256.13214,781.18791 c 0,12.55924 18.8389,18.83888 31.39814,18.83888 10.67536,0 18.83889,-8.16352 18.83889,-18.83888 0,-12.55925 -18.8389,-18.83889 -31.39814,-18.83889 -10.67536,0 -18.83889,8.16353 -18.83889,18.83889" /> </g> </g> <g id="g3961" - transform="translate(160,0)"> + transform="translate(160,0)" + style="fill:#eeeeee;fill-opacity:1"> <g transform="matrix(0.97180599,0.00206436,-0.02018243,1.0289691,0,0)" - style="font-size:218.04266357px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:0.4;fill:#000000;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" + style="font-size:218.04266357000000198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;opacity:0.40000000000000002;fill:#eeeeee;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" id="g3963"> <path d="m 261.11551,789.25169 c 0,12.55924 18.8389,18.83889 31.39814,18.83889 10.67536,0 18.83889,-8.16353 18.83889,-18.83889 0,-12.55925 -18.8389,-18.83889 -31.39815,-18.83889 -10.67536,0 -18.83888,8.16353 -18.83888,18.83889" - style="font-size:627.96289062px;font-weight:bold;fill:#000000;font-family:Pecita;-inkscape-font-specification:Pecita" + style="font-size:627.96289062000016656px;font-weight:bold;fill:#eeeeee;font-family:Pecita;-inkscape-font-specification:Pecita;fill-opacity:1" id="path3965" inkscape:connector-curvature="0" /> </g> <g transform="matrix(0.97180599,0.00206436,-0.02018243,1.0289691,0,0)" - style="font-size:218.04266357px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" + style="font-size:218.04266357000000198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#eeeeee;fill-opacity:1;stroke:none;font-family:Rockwell;-inkscape-font-specification:Rockwell" id="g3967"> <path d="m 256.13214,781.18791 c 0,12.55924 18.8389,18.83888 31.39814,18.83888 10.67536,0 18.83889,-8.16352 18.83889,-18.83888 0,-12.55925 -18.8389,-18.83889 -31.39814,-18.83889 -10.67536,0 -18.83889,8.16353 -18.83889,18.83889" - style="font-size:627.96289062px;font-weight:bold;letter-spacing:-1.37633753px;fill:#ffffff;font-family:Pecita;-inkscape-font-specification:Pecita" + style="font-size:627.96289062000016656px;font-weight:bold;letter-spacing:-1.37633753000000003px;fill:#eeeeee;font-family:Pecita;-inkscape-font-specification:Pecita;fill-opacity:1" id="path3969" inkscape:connector-curvature="0" /> </g> @@ -416,7 +419,7 @@ inkscape:connector-curvature="0" id="path3855" d="m 253.18246,561.05889 c -5.38379,-0.002 -10.7413,0.0871 -12.77023,0.22089 -16.80965,1.10727 -29.68729,3.05317 -44.38296,6.77453 -5.64799,1.43026 -9.96811,2.69833 -15.19914,4.41816 -3.34052,1.09828 -8.41764,2.85364 -8.68521,3.01909 -0.082,0.0507 3.32705,9.32907 7.98597,21.79631 0.0466,0.12496 0.17057,0.13832 0.33123,0.0736 1.11322,-0.44815 6.45699,-2.29745 8.94283,-3.09273 21.39718,-6.84518 43.95735,-10.19531 66.31683,-9.86723 3.14874,0.0461 7.13319,0.15915 8.83245,0.25775 1.69921,0.0987 3.12161,0.15378 3.16493,0.11037 0.0685,-0.0684 1.53237,-23.21444 1.47209,-23.26905 -0.0122,-0.0117 -1.41064,-0.10943 -3.12817,-0.22089 -2.0869,-0.13546 -7.49683,-0.21852 -12.88062,-0.22088 z m 110.81021,28.16581 c -0.10125,0.10911 -11.15095,20.28455 -11.15095,20.36043 0,0.0184 0.507,0.31643 1.14084,0.66267 11.62887,6.35285 24.79463,15.55676 35.14571,24.5945 10.91024,9.52593 21.73966,21.23542 29.47825,31.81082 0.65274,0.89212 0.79099,1.01157 1.03047,0.84681 1.13402,-0.7802 18.39736,-13.76959 18.40089,-13.84358 0.005,-0.1 -3.33561,-4.52525 -4.74744,-6.29593 -5.64395,-7.07831 -10.59767,-12.59168 -17.26005,-19.25582 -10.6531,-10.65598 -20.6627,-18.9637 -33.01119,-27.39263 -6.60131,-4.50599 -18.71149,-11.82683 -19.02653,-11.48727 z m -274.762206,39.94759 -2.428914,2.57732 c -21.579098,22.69359 -38.068397,49.23025 -48.467963,78.05431 -0.50904,1.41091 -0.957247,2.67589 -0.993643,2.83498 -0.04781,0.20904 2.956962,1.31003 10.78292,3.93954 5.956638,2.00143 10.92488,3.63791 11.040538,3.64502 0.115645,0.007 0.916879,-1.94564 1.803285,-4.34458 9.098432,-24.62317 23.187184,-47.25662 41.659643,-66.93523 l 3.05453,-3.27681 -8.206806,-8.24726 z m 388.222146,115.167 -9.89972,1.91451 c -5.44839,1.06994 -10.56998,2.07187 -11.40857,2.20908 -1.04711,0.17137 -1.54564,0.35016 -1.54564,0.55228 0,0.16187 0.23325,1.63204 0.51522,3.2768 2.70275,15.76547 3.28356,34.63258 1.69287,55.26394 -0.7281,9.44363 -2.34823,21.04449 -3.90099,28.01857 -0.23345,1.0486 -0.37949,1.97667 -0.33118,2.02499 0.0483,0.0483 5.12585,1.1561 11.29809,2.46683 6.17232,1.31067 11.30751,2.37915 11.3718,2.39315 0.0641,0.014 0.45734,-1.73307 0.88322,-3.90272 3.35867,-17.11028 4.82653,-33.18977 4.85786,-53.27572 0.0219,-14.08945 -0.79161,-24.35571 -2.87056,-36.96537 z m -427.268845,64.06345 -0.772838,0.11039 c -0.421858,0.0612 -5.59823,0.67716 -11.482161,1.36226 -5.883927,0.68512 -10.759171,1.30169 -10.819725,1.36228 -0.141991,0.142 0.252313,2.91986 1.140854,8.32086 4.869392,29.59836 15.038358,56.25732 31.539139,82.61977 0.450701,0.72005 0.931445,1.27763 1.06725,1.25182 0.361709,-0.0685 19.423106,-12.2036 19.431349,-12.3709 0.0036,-0.0779 -0.796734,-1.40341 -1.766487,-2.94542 -4.266677,-6.78447 -9.935035,-17.45299 -13.064635,-24.5945 -7.52905,-17.18062 -12.488823,-34.71382 -15.051936,-53.27567 z M 462.40066,926.44149 c -0.46898,0.009 -22.08567,5.38002 -22.2283,5.52269 -0.098,0.0981 22.04129,90.06142 22.37549,91.01382 0.40286,1.1482 3.73284,10.5298 13.56323,8.9156 10.95786,-2.3434 9.8458,-14.6677 8.99628,-14.4751 -0.11284,0.025 -5.02627,-20.61508 -11.18774,-45.58033 -8.79763,-35.64656 -11.26829,-45.40142 -11.51896,-45.39668 z M 143.91794,953.1714 c -0.40943,0.0131 -1.21588,1.3276 -6.29312,9.64634 -3.31435,5.43031 -6.03549,9.92123 -6.03549,9.9777 0,0.13674 3.42858,2.19027 7.06593,4.27089 22.35182,12.78549 47.08561,21.82095 72.42596,26.43487 3.59043,0.654 5.67261,1.0064 11.04051,1.804 0.69401,0.1031 1.36954,0.2073 1.50889,0.2212 0.31484,0.031 0.24386,0.6279 1.87691,-11.45018 0.75094,-5.5542 1.40492,-10.43428 1.47207,-10.86126 0.11781,-0.74877 0.0863,-0.77677 -0.58887,-0.88362 -0.38487,-0.0607 -2.68651,-0.4127 -5.11543,-0.77322 -22.30454,-3.3101 -45.25895,-10.90321 -65.32317,-21.57538 -3.55401,-1.89038 -10.16752,-5.64292 -11.85018,-6.73769 -0.0531,-0.0345 -0.12551,-0.0755 -0.18401,-0.0737 z m 214.22322,9.09404 c -1.98095,0.13013 -4.60205,1.01767 -10.4517,3.12954 -11.29964,4.0795 -24.13159,8.26507 -29.91986,9.75681 -0.83741,0.21582 -1.5445,0.50692 -1.54566,0.62592 -0.002,0.21503 5.72469,22.22722 5.81468,22.34847 0.0552,0.075 6.34708,-1.70267 10.2677,-2.90858 5.09669,-1.5677 13.67295,-4.44246 19.79936,-6.62722 l 6.07232,-2.17225 22.30187,8.98356 c 18.14341,7.31671 22.30098,8.95081 22.41231,8.68881 0.9061,-2.1322 8.61707,-21.32757 8.57483,-21.35419 -0.38803,-0.24492 -49.13929,-19.77601 -49.90327,-19.99221 -1.25781,-0.35596 -2.23399,-0.55669 -3.42258,-0.47866 z" - style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:5.88958931;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="opacity:0.50000000000000000;fill:#eeeeee;fill-opacity:1;stroke:#eeeeee;stroke-width:5.88958930999999986;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:nodetypes="ccssccssscccccccssscccssscccscsssccccccssssssssssccccscssccsscccsscsscsssssccsccsscssssccscccccss" /> </g> </svg> diff --git a/art/render.rb b/art/render.rb index 7999996d..386366a4 100755 --- a/art/render.rb +++ b/art/render.rb @@ -6,8 +6,7 @@ resolutions={ 'xxhdpi' => 3, } images = { - 'conversations.svg' => ['ic_launcher', 48], - 'conversations_baloon.svg' => ['ic_activity', 32], + 'conversations_baloon.svg' => ['ic_launcher', 48], 'conversations_mono.svg' => ['ic_notification', 24], 'ic_received_indicator.svg' => ['ic_received_indicator', 12], } diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java index 99a74907..a451c142 100644 --- a/src/main/java/eu/siacs/conversations/entities/Contact.java +++ b/src/main/java/eu/siacs/conversations/entities/Contact.java @@ -145,11 +145,21 @@ public class Contact implements ListItem { } public boolean match(String needle) { - if (needle == null) { + if (needle == null || needle.isEmpty()) { return true; } - needle = needle.toLowerCase(); - return jid.toString().contains(needle) || getDisplayName().toLowerCase().contains(needle) || matchInTag(needle); + needle = needle.toLowerCase().trim(); + String[] parts = needle.split("\\s+"); + if (parts.length > 1) { + for(int i = 0; i < parts.length; ++i) { + if (!match(parts[i])) { + return false; + } + } + return true; + } else { + return jid.toString().contains(needle) || getDisplayName().toLowerCase().contains(needle) || matchInTag(needle); + } } private boolean matchInTag(String needle) { diff --git a/src/main/res/drawable-hdpi/ic_activity.png b/src/main/res/drawable-hdpi/ic_activity.png Binary files differdeleted file mode 100644 index 613da683..00000000 --- a/src/main/res/drawable-hdpi/ic_activity.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png Binary files differindex d48df2c3..88c4dba2 100644 --- a/src/main/res/drawable-hdpi/ic_launcher.png +++ b/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/src/main/res/drawable-mdpi/ic_activity.png b/src/main/res/drawable-mdpi/ic_activity.png Binary files differdeleted file mode 100644 index c8727f57..00000000 --- a/src/main/res/drawable-mdpi/ic_activity.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png Binary files differindex 200daf4c..c366d920 100644 --- a/src/main/res/drawable-mdpi/ic_launcher.png +++ b/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/src/main/res/drawable-xhdpi/ic_activity.png b/src/main/res/drawable-xhdpi/ic_activity.png Binary files differdeleted file mode 100644 index 95ffbecf..00000000 --- a/src/main/res/drawable-xhdpi/ic_activity.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png Binary files differindex 927a2d2a..f8fd9f56 100644 --- a/src/main/res/drawable-xhdpi/ic_launcher.png +++ b/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/src/main/res/drawable-xxhdpi/ic_activity.png b/src/main/res/drawable-xxhdpi/ic_activity.png Binary files differdeleted file mode 100644 index 0b642d9b..00000000 --- a/src/main/res/drawable-xxhdpi/ic_activity.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png Binary files differindex 65c1af34..9a10d949 100644 --- a/src/main/res/drawable-xxhdpi/ic_launcher.png +++ b/src/main/res/drawable-xxhdpi/ic_launcher.png |