diff options
-rw-r--r-- | OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png | bin | 0 -> 2616 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png | bin | 0 -> 1457 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png | bin | 0 -> 4012 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png | bin | 0 -> 6626 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_share_fragment.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/raw/help_about.html | 2 | ||||
-rw-r--r-- | Resources/graphics/ic_action_safeslinger.svg | 495 | ||||
-rwxr-xr-x | Resources/graphics/update-drawables.sh | 2 |
8 files changed, 499 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png Binary files differnew file mode 100644 index 000000000..6ff9bb7b4 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png Binary files differnew file mode 100644 index 000000000..bfea67f33 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png Binary files differnew file mode 100644 index 000000000..864a18d1a --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png Binary files differnew file mode 100644 index 000000000..02efa1d24 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png diff --git a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml index 29a6fc5b1..e02ba83c3 100644 --- a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml @@ -135,7 +135,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/ic_action_secure" + android:src="@drawable/ic_action_safeslinger" android:layout_gravity="center_vertical" style="@style/SelectableItem" /> diff --git a/OpenKeychain/src/main/res/raw/help_about.html b/OpenKeychain/src/main/res/raw/help_about.html index 580ac5865..1933a9225 100644 --- a/OpenKeychain/src/main/res/raw/help_about.html +++ b/OpenKeychain/src/main/res/raw/help_about.html @@ -26,6 +26,7 @@ And don't add newlines before or after p tags because of transifex --> <li>Nikhil Peter Raj</li> <li>Paul Sarbinowski</li> <li>'Senecaso'</li> +<li>Signe RĂ¼sch</li> <li>Sreeram Boyapati</li> <li>Thialfihar (APG 1.x)</li> <li>Tim Bray</li> @@ -44,6 +45,7 @@ And don't add newlines before or after p tags because of transifex --> <li><a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li> <li><a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li> <li><a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li> +<li><a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li> </ul> </body> </html> diff --git a/Resources/graphics/ic_action_safeslinger.svg b/Resources/graphics/ic_action_safeslinger.svg new file mode 100644 index 000000000..1575846db --- /dev/null +++ b/Resources/graphics/ic_action_safeslinger.svg @@ -0,0 +1,495 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="512" + height="512" + id="svg2816" + version="1.1" + inkscape:version="0.47 r22583" + sodipodi:docname="starslinger.svg" + inkscape:export-filename="C:\svn\mobile\StarSlinger\icons\starslinger32p.png" + inkscape:export-xdpi="5.625" + inkscape:export-ydpi="5.625"> + <defs + id="defs2818"> + <inkscape:path-effect + effect="skeletal" + id="path-effect5114" + is_visible="true" + pattern="M 0,5 C 0,2.24 2.24,0 5,0 7.76,0 10,2.24 10,5 10,7.76 7.76,10 5,10 2.24,10 0,7.76 0,5 z" + copytype="single_stretched" + prop_scale="1" + scale_y_rel="false" + spacing="0" + normal_offset="0" + tang_offset="0" + prop_units="false" + vertical_pattern="false" + fuse_tolerance="0" /> + <inkscape:path-effect + effect="skeletal" + id="path-effect5110" + is_visible="true" + pattern="M 0,5 C 0,2.24 2.24,0 5,0 7.76,0 10,2.24 10,5 10,7.76 7.76,10 5,10 2.24,10 0,7.76 0,5 z" + copytype="single_stretched" + prop_scale="1" + scale_y_rel="false" + spacing="0" + normal_offset="0" + tang_offset="0" + prop_units="false" + vertical_pattern="false" + fuse_tolerance="0" /> + <inkscape:path-effect + effect="skeletal" + id="path-effect5106" + is_visible="true" + pattern="M 0,5 C 0,2.24 2.24,0 5,0 7.76,0 10,2.24 10,5 10,7.76 7.76,10 5,10 2.24,10 0,7.76 0,5 z" + copytype="single_stretched" + prop_scale="1" + scale_y_rel="false" + spacing="0" + normal_offset="0" + tang_offset="0" + prop_units="false" + vertical_pattern="false" + fuse_tolerance="0" /> + <inkscape:path-effect + effect="spiro" + id="path-effect5104" + is_visible="true" /> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 32 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="64 : 32 : 1" + inkscape:persp3d-origin="32 : 21.333333 : 1" + id="perspective2824" /> + <inkscape:perspective + id="perspective2900" + inkscape:persp3d-origin="0.5 : 0.33333333 : 1" + inkscape:vp_z="1 : 0.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 0.5 : 1" + sodipodi:type="inkscape:persp3d" /> + <inkscape:perspective + id="perspective2900-2" + inkscape:persp3d-origin="0.5 : 0.33333333 : 1" + inkscape:vp_z="1 : 0.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 0.5 : 1" + sodipodi:type="inkscape:persp3d" /> + <inkscape:perspective + id="perspective2900-5" + inkscape:persp3d-origin="0.5 : 0.33333333 : 1" + inkscape:vp_z="1 : 0.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 0.5 : 1" + sodipodi:type="inkscape:persp3d" /> + <inkscape:perspective + id="perspective2900-1" + inkscape:persp3d-origin="0.5 : 0.33333333 : 1" + inkscape:vp_z="1 : 0.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 0.5 : 1" + sodipodi:type="inkscape:persp3d" /> + <inkscape:perspective + id="perspective2900-11" + inkscape:persp3d-origin="0.5 : 0.33333333 : 1" + inkscape:vp_z="1 : 0.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 0.5 : 1" + sodipodi:type="inkscape:persp3d" /> + <filter + id="filter2835" + inkscape:label="Drop shadow" + width="1.5" + height="1.5" + x="-0.25" + y="-0.25" + color-interpolation-filters="sRGB"> + <feGaussianBlur + id="feGaussianBlur2837" + in="SourceAlpha" + stdDeviation="2.000000" + result="blur" /> + <feColorMatrix + id="feColorMatrix2839" + result="bluralpha" + type="matrix" + values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.500000 0 " /> + <feOffset + id="feOffset2841" + in="bluralpha" + dx="4.000000" + dy="4.000000" + result="offsetBlur" /> + <feMerge + id="feMerge2843"> + <feMergeNode + id="feMergeNode2845" + in="offsetBlur" /> + <feMergeNode + id="feMergeNode2847" + in="SourceGraphic" /> + </feMerge> + </filter> + <filter + id="filter5377" + inkscape:label="Drop shadow" + width="1.5" + height="1.5" + x="-.25" + y="-.25"> + <feGaussianBlur + id="feGaussianBlur5379" + in="SourceAlpha" + stdDeviation="2.000000" + result="blur" /> + <feColorMatrix + id="feColorMatrix5381" + result="bluralpha" + type="matrix" + values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.250000 0 " /> + <feOffset + id="feOffset5383" + in="bluralpha" + dx="4.000000" + dy="4.000000" + result="offsetBlur" /> + <feMerge + id="feMerge5385" + result="fbSourceGraphic"> + <feMergeNode + id="feMergeNode5387" + in="offsetBlur" /> + <feMergeNode + id="feMergeNode5389" + in="SourceGraphic" /> + </feMerge> + <feColorMatrix + result="fbSourceGraphicAlpha" + in="fbSourceGraphic" + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix5433" /> + <feGaussianBlur + id="feGaussianBlur5435" + in="fbSourceGraphicAlpha" + stdDeviation="5.000000" + result="blur" /> + <feColorMatrix + id="feColorMatrix5437" + result="bluralpha" + type="matrix" + values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.250000 0 " /> + <feOffset + id="feOffset5439" + in="bluralpha" + dx="10.000000" + dy="10.000000" + result="offsetBlur" /> + <feMerge + id="feMerge5441" + result="fbSourceGraphic"> + <feMergeNode + id="feMergeNode5443" + in="offsetBlur" /> + <feMergeNode + id="feMergeNode5445" + in="fbSourceGraphic" /> + </feMerge> + <feColorMatrix + result="fbSourceGraphicAlpha" + in="fbSourceGraphic" + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix5447" /> + <feGaussianBlur + id="feGaussianBlur5449" + in="fbSourceGraphicAlpha" + stdDeviation="5.000000" + result="blur" /> + <feColorMatrix + id="feColorMatrix5451" + result="bluralpha" + type="matrix" + values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.250000 0 " /> + <feOffset + id="feOffset5453" + in="bluralpha" + dx="10.000000" + dy="10.000000" + result="offsetBlur" /> + <feMerge + id="feMerge5455"> + <feMergeNode + id="feMergeNode5457" + in="offsetBlur" /> + <feMergeNode + id="feMergeNode5459" + in="fbSourceGraphic" /> + </feMerge> + </filter> + <filter + id="filter3101" + inkscape:label="Drop shadow" + width="1.5" + height="1.5" + x="-.25" + y="-.25"> + <feGaussianBlur + id="feGaussianBlur3103" + in="SourceAlpha" + stdDeviation="0" + result="blur" /> + <feColorMatrix + id="feColorMatrix3105" + result="bluralpha" + type="matrix" + values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0 0 " /> + <feOffset + id="feOffset3107" + in="bluralpha" + dx="0" + dy="0" + result="offsetBlur" /> + <feMerge + id="feMerge3109"> + <feMergeNode + id="feMergeNode3111" + in="offsetBlur" /> + <feMergeNode + id="feMergeNode3113" + in="SourceGraphic" /> + </feMerge> + </filter> + <inkscape:perspective + id="perspective5215" + inkscape:persp3d-origin="0.5 : 0.33333333 : 1" + inkscape:vp_z="1 : 0.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 0.5 : 1" + sodipodi:type="inkscape:persp3d" /> + <filter + color-interpolation-filters="sRGB" + id="filter5377-3" + inkscape:label="Drop shadow" + width="1.5" + height="1.5" + x="-0.25" + y="-0.25"> + <feGaussianBlur + id="feGaussianBlur5379-1" + in="SourceAlpha" + stdDeviation="2.000000" + result="blur" /> + <feColorMatrix + id="feColorMatrix5381-6" + result="bluralpha" + type="matrix" + values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.250000 0 " /> + <feOffset + id="feOffset5383-8" + in="bluralpha" + dx="4.000000" + dy="4.000000" + result="offsetBlur" /> + <feMerge + id="feMerge5385-8" + result="fbSourceGraphic"> + <feMergeNode + id="feMergeNode5387-2" + in="offsetBlur" /> + <feMergeNode + id="feMergeNode5389-7" + in="SourceGraphic" /> + </feMerge> + <feColorMatrix + result="fbSourceGraphicAlpha" + in="fbSourceGraphic" + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix5433-7" /> + <feGaussianBlur + id="feGaussianBlur5435-1" + in="fbSourceGraphicAlpha" + stdDeviation="5.000000" + result="blur" /> + <feColorMatrix + id="feColorMatrix5437-2" + result="bluralpha" + type="matrix" + values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.250000 0 " /> + <feOffset + id="feOffset5439-6" + in="bluralpha" + dx="10.000000" + dy="10.000000" + result="offsetBlur" /> + <feMerge + id="feMerge5441-0" + result="fbSourceGraphic"> + <feMergeNode + id="feMergeNode5443-4" + in="offsetBlur" /> + <feMergeNode + id="feMergeNode5445-9" + in="fbSourceGraphic" /> + </feMerge> + <feColorMatrix + result="fbSourceGraphicAlpha" + in="fbSourceGraphic" + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + id="feColorMatrix5447-4" /> + <feGaussianBlur + id="feGaussianBlur5449-6" + in="fbSourceGraphicAlpha" + stdDeviation="5.000000" + result="blur" /> + <feColorMatrix + id="feColorMatrix5451-0" + result="bluralpha" + type="matrix" + values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.250000 0 " /> + <feOffset + id="feOffset5453-3" + in="bluralpha" + dx="10.000000" + dy="10.000000" + result="offsetBlur" /> + <feMerge + id="feMerge5455-6"> + <feMergeNode + id="feMergeNode5457-2" + in="offsetBlur" /> + <feMergeNode + id="feMergeNode5459-4" + in="fbSourceGraphic" /> + </feMerge> + </filter> + <filter + id="filter5422" + inkscape:label="Drop shadow" + width="1.5" + height="1.5" + x="-.25" + y="-.25"> + <feGaussianBlur + id="feGaussianBlur5424" + in="SourceAlpha" + stdDeviation="5.000000" + result="blur" /> + <feColorMatrix + id="feColorMatrix5426" + result="bluralpha" + type="matrix" + values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.250000 0 " /> + <feOffset + id="feOffset5428" + in="bluralpha" + dx="-20.000000" + dy="40.000000" + result="offsetBlur" /> + <feMerge + id="feMerge5430"> + <feMergeNode + id="feMergeNode5432" + in="offsetBlur" /> + <feMergeNode + id="feMergeNode5434" + in="SourceGraphic" /> + </feMerge> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.96679688" + inkscape:cx="131.87879" + inkscape:cy="256" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:document-units="px" + inkscape:grid-bbox="true" + inkscape:snap-bbox="true" + inkscape:snap-global="false" + inkscape:window-width="566" + inkscape:window-height="488" + inkscape:window-x="66" + inkscape:window-y="66" + inkscape:window-maximized="0" /> + <metadata + id="metadata2821"> + <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 + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer" + transform="translate(0,448)" + style="display:inline"> + <g + id="g5372" + style="filter:url(#filter5422)" + transform="translate(13.446465,-2.0686869)"> + <path + sodipodi:nodetypes="ccc" + id="path5092-5" + d="M 320.98425,-118.17913 21.383429,-383.73064 333.38305,0.76498342" + style="fill:#cecdb4;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;filter:url(#filter5377-3)" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="ccccccc" + id="path5090" + d="M 21.453861,-385.57782 493.31389,-113.0831 329.0864,-120.17313 333.02632,0.91932116 321.5813,-118.7966 128.26297,-38.426297 21.453861,-385.57782 z" + style="fill:#cecdb4;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3101)" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="ccc" + id="path5092" + d="M 330.36376,-120.17313 23.522547,-385.72464 320.00701,-119.14417" + style="fill:#cecdb4;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter5377)" + inkscape:connector-curvature="0" /> + <path + transform="translate(636.12121,-393.1798)" + d="m -330.98989,207.38586 c 0,22.56446 -25.93311,40.85657 -57.92323,40.85657 -31.99011,0 -57.92323,-18.29211 -57.92323,-40.85657 0,-22.56445 25.93312,-40.85656 57.92323,-40.85656 31.99012,0 57.92323,18.29211 57.92323,40.85656 z" + sodipodi:ry="40.856567" + sodipodi:rx="57.923229" + sodipodi:cy="207.38586" + sodipodi:cx="-388.91312" + id="path2963" + style="fill:#821f1f;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:type="arc" /> + <text + transform="scale(1.0736448,0.93140674)" + id="text5463" + y="-92.904434" + x="193.75075" + style="font-size:190.54101563px;font-style:normal;font-weight:normal;fill:#821f1f;fill-opacity:1;stroke:#271b1b;stroke-width:3.09899998;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans" + xml:space="preserve"><tspan + style="fill:#821f1f;fill-opacity:1;stroke:#271b1b;stroke-width:3.09899998;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + y="-92.904434" + x="193.75075" + id="tspan5465" + sodipodi:role="line">*</tspan></text> + </g> + </g> +</svg> diff --git a/Resources/graphics/update-drawables.sh b/Resources/graphics/update-drawables.sh index ae77d313a..4b6a0a03b 100755 --- a/Resources/graphics/update-drawables.sh +++ b/Resources/graphics/update-drawables.sh @@ -37,7 +37,7 @@ inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg # xhdpi: 64x64 # xxhdpi: 96x96 -for NAME in "ic_action_nfc" "ic_action_qr_code" +for NAME in "ic_action_nfc" "ic_action_qr_code" "ic_action_safeslinger" do echo $NAME inkscape -w 32 -h 32 -e "$MDPI_DIR/$NAME.png" $NAME.svg |