Changed logo

2012-08-17 16:48:00 +01:00 · 2012-08-17 16:48:00 +01:00 · cc0aa6b835
commit cc0aa6b835
parent d87401f5fb
16 changed files with 2812 additions and 67 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@ -6,7 +6,7 @@
 	<supports-screens android:resizeable="false"
 		android:anyDensity="false" />
 	<application android:name="FDroidApp" android:label="@string/app_name"
-		android:icon="@drawable/icon">
+		android:icon="@drawable/ic_launcher">

 		<activity android:name="FDroid" android:configChanges="keyboardHidden|orientation">
 			<intent-filter>
--- a/build.properties
+++ b/build.properties
@ -1,22 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-# 
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
-# The name of your application package as defined in the manifest.
-# Used by the 'uninstall' rule.
-application.package=org.fdroid.fdroid
-
-
--- a/build.xml
+++ b/build.xml
@ -2,66 +2,91 @@
 <project name="FDroid" default="help">

    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked in in Version
-         Control Systems. -->
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
    <property file="local.properties" />

-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the default property values
-         used by the Ant rules.
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
         Here are some properties you may want to change/update:

-         application.package
-             the name of your application package as defined in the manifest. Used by the
-             'uninstall' rule.
         source.dir
-             the name of the source directory. Default is 'src'.
+             The name of the source directory. Default is 'src'.
         out.dir
-             the name of the output directory. Default is 'bin'.
+             The name of the output directory. Default is 'bin'.

-         Properties related to the SDK location or the project target should be updated
-          using the 'android' tool with the 'update' action.
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml

-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems.
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.

         -->
-    <property file="build.properties" />
+    <property file="ant.properties" />

-    <!-- The default.properties file is created and updated by the 'android' tool, as well
-         as ADT.
-         This file is an integral part of the build system for your application and
-         should be checked in in Version Control Systems. -->
-    <property file="default.properties" />
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>

-    <!-- Custom Android task to deal with the project target, and import the proper rules.
-         This requires ant 1.6.0 or above. -->
-    <path id="android.antlibs">
-        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
-    </path>
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.

-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs" />
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).

-    <!-- Execute the Android Setup task that will setup some properties specific to the target,
-         and import the build rules files.
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />

-         The rules file is imported from
-            <SDK>/platforms/<target_platform>/templates/android_rules.xml
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />

-         To customize some build steps for your project:
-         - copy the content of the main node <project> from android_rules.xml
-         - paste it in this build.xml below the <setup /> task.
-         - disable the import by changing the setup task below to <setup import="false" />
-
-         This will ensure that the properties are setup correctly but that your customized
-         build steps are used.
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
    -->
-    <setup />
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />

 </project>
--- a/media/fdroid-logo/fdroid-135.png
+++ b/media/fdroid-logo/fdroid-135.png
--- a/media/fdroid-logo/fdroid-logo-blue-48pxb.svg
+++ b/media/fdroid-logo/fdroid-logo-blue-48pxb.svg
@ -0,0 +1,418 @@
+<?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="48px"
+   height="48px"
+   id="svg4297"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="48pxb.svg"
+   inkscape:export-filename="/home/willie/Pictures/Icons/fdroid/160pxb.png"
+   inkscape:export-xdpi="300"
+   inkscape:export-ydpi="300">
+  <defs
+     id="defs4299">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688-166-749-4"
+       id="radialGradient4337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       id="linearGradient3688-166-749-4">
+      <stop
+         offset="0"
+         style="stop-color:#181818;stop-opacity:1"
+         id="stop2883-7" />
+      <stop
+         offset="1"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2885-7" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688-464-309-5"
+       id="radialGradient4339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       id="linearGradient3688-464-309-5">
+      <stop
+         offset="0"
+         style="stop-color:#181818;stop-opacity:1"
+         id="stop2889-69" />
+      <stop
+         offset="1"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2891-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702-501-757-6"
+       id="linearGradient4341"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       id="linearGradient3702-501-757-6">
+      <stop
+         offset="0"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2895-4" />
+      <stop
+         offset="0.5"
+         style="stop-color:#181818;stop-opacity:1"
+         id="stop2897-7" />
+      <stop
+         offset="1"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2899-4" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-9"
+       id="radialGradient4343"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,3.24326,-4.3410587,-1.3685269e-7,68.681092,-18.988928)"
+       cx="7.4956832"
+       cy="8.4497671"
+       fx="7.4956832"
+       fy="8.4497671"
+       r="19.99999" />
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148-9">
+      <stop
+         offset="0"
+         style="stop-color:#51cfee;stop-opacity:1"
+         id="stop4627-2" />
+      <stop
+         offset="0.26238"
+         style="stop-color:#49a3d2;stop-opacity:1"
+         id="stop4629-8" />
+      <stop
+         offset="0.704952"
+         style="stop-color:#3470b4;stop-opacity:1"
+         id="stop4631-3" />
+      <stop
+         offset="1"
+         style="stop-color:#1b5699;stop-opacity:1"
+         id="stop4633-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3332-412-419-652-471-761-410-156-661-505-7"
+       id="linearGradient4345"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4102565,0,0,1.4102565,-1.8461542,-1.8461602)"
+       x1="24"
+       y1="44"
+       x2="24"
+       y2="3.8990016" />
+    <linearGradient
+       id="linearGradient3332-412-419-652-471-761-410-156-661-505-7">
+      <stop
+         offset="0"
+         style="stop-color:#205286;stop-opacity:1;"
+         id="stop8032-8" />
+      <stop
+         offset="1"
+         style="stop-color:#5492be;stop-opacity:1;"
+         id="stop8034-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3308-4-6-931-761"
+       id="linearGradient4347"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4324331,0,0,1.432432,-2.3783784,-2.3783623)"
+       x1="23.99999"
+       y1="4.999989"
+       x2="23.99999"
+       y2="43" />
+    <linearGradient
+       id="linearGradient3308-4-6-931-761">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop2919" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop2921" />
+    </linearGradient>
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient2873-966-168"
+       xlink:href="#linearGradient3688-166-749"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
+    <linearGradient
+       id="linearGradient3688-166-749">
+      <stop
+         id="stop2883"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2885"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient2875-742-326"
+       xlink:href="#linearGradient3688-464-309"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
+    <linearGradient
+       id="linearGradient3688-464-309">
+      <stop
+         id="stop2889"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2891"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       id="linearGradient2877-634-617"
+       xlink:href="#linearGradient3702-501-757"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3702-501-757">
+      <stop
+         id="stop2895"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop2897"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop2899"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.5625"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:snap-global="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="713"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4506" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4302">
+    <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">
+    <g
+       style="display:inline"
+       id="g2036"
+       transform="matrix(1.1751882,0,0,0.43401829,-4.3015901,27.601153)">
+      <g
+         style="opacity:0.4"
+         id="g3712"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           style="fill:url(#radialGradient2873-966-168);fill-opacity:1;stroke:none"
+           id="rect2801"
+           y="40"
+           x="38"
+           height="7"
+           width="5" />
+        <rect
+           style="fill:url(#radialGradient2875-742-326);fill-opacity:1;stroke:none"
+           id="rect3696"
+           transform="scale(-1,-1)"
+           y="-47"
+           x="-10"
+           height="7"
+           width="5" />
+        <rect
+           style="fill:url(#linearGradient2877-634-617);fill-opacity:1;stroke:none"
+           id="rect3700"
+           y="40"
+           x="10"
+           height="7.0000005"
+           width="28" />
+      </g>
+    </g>
+    <g
+       inkscape:label="Layer 1"
+       id="layer1-6"
+       transform="matrix(0.78345768,0,0,0.79318767,-1.0414057,-1.7543013)">
+      <g
+         transform="matrix(1.5000021,0,0,0.5555561,-4.0000114,35.888881)"
+         id="g2036-3"
+         style="display:inline">
+        <g
+           transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
+           id="g3712-9"
+           style="opacity:0.4">
+          <rect
+             width="5"
+             height="7"
+             x="38"
+             y="40"
+             id="rect2801-6"
+             style="fill:url(#radialGradient4337);fill-opacity:1;stroke:none" />
+          <rect
+             width="5"
+             height="7"
+             x="-10"
+             y="-47"
+             transform="scale(-1,-1)"
+             id="rect3696-2"
+             style="fill:url(#radialGradient4339);fill-opacity:1;stroke:none" />
+          <rect
+             width="28"
+             height="7.0000005"
+             x="10"
+             y="40"
+             id="rect3700-3"
+             style="fill:url(#linearGradient4341);fill-opacity:1;stroke:none" />
+        </g>
+      </g>
+      <rect
+         width="55"
+         height="55"
+         rx="3"
+         ry="3"
+         x="4.5"
+         y="4.5"
+         id="rect5505-0"
+         style="color:#000000;fill:url(#radialGradient4343);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4345);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         width="53"
+         height="53.000004"
+         rx="2"
+         ry="2"
+         x="5.5"
+         y="5.4999995"
+         id="rect6741-1"
+         style="opacity:0.4;fill:none;stroke:url(#linearGradient4347);stroke-width:0.99999964;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    </g>
+    <g
+       id="g6825"
+       transform="matrix(0.78345768,0,0,0.78123216,-1.1677507,0.46216534)">
+      <g
+         style="stroke:#3465a4"
+         transform="matrix(2.279764,0,0,2.279764,-18.418227,-64.194578)"
+         id="g3254">
+        <circle
+           d="M 930,490 C 930,733.00529 733.00529,930 490,930 246.99471,930 50,733.00529 50,490 50,246.99471 246.99471,50 490,50 733.00529,50 930,246.99471 930,490 z"
+           style="fill:none;stroke:#729fcf;stroke-width:100"
+           sodipodi:ry="440"
+           sodipodi:rx="440"
+           sodipodi:cy="490"
+           sodipodi:cx="490"
+           cx="490"
+           cy="490"
+           r="440"
+           id="circle3777-9"
+           transform="matrix(0.0218853,0,0,0.02011205,11.572346,31.726167)" />
+        <path
+           style="fill:#729fcf;stroke:#729fcf"
+           d="m 22.208612,35.949734 c -2.845089,0 -5.230587,1.830197 -5.843375,4.283867 l 2.866974,0 c 0.525247,-1.045827 1.663283,-1.769861 2.976401,-1.769861 1.81648,0 3.282795,1.347508 3.282795,3.016808 0,1.6693 -1.466315,3.016808 -3.282795,3.016808 -1.313118,0 -2.451154,-0.724034 -2.976401,-1.749749 l -2.866974,0 c 0.612788,2.433558 2.998286,4.263764 5.843375,4.263764 3.326566,0 6.018458,-2.473791 6.018458,-5.530823 0,-3.057032 -2.691892,-5.530814 -6.018458,-5.530814 z"
+           id="path3779-7"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="stroke:#204a87"
+         id="g3254-2"
+         transform="matrix(2.279764,0,0,2.279764,-18.39783,-64.773624)">
+        <circle
+           d="M 930,490 C 930,733.00529 733.00529,930 490,930 246.99471,930 50,733.00529 50,490 50,246.99471 246.99471,50 490,50 733.00529,50 930,246.99471 930,490 z"
+           style="fill:none;stroke:#204a87;stroke-width:100"
+           sodipodi:ry="440"
+           sodipodi:rx="440"
+           sodipodi:cy="490"
+           sodipodi:cx="490"
+           cx="490"
+           cy="490"
+           r="440"
+           id="circle3777-9-1"
+           transform="matrix(0.0218853,0,0,0.02011205,11.572346,31.425787)" />
+        <path
+           style="fill:#204a87;stroke:#204a87"
+           d="m 22.208612,35.749878 c -2.845089,0 -5.230587,1.830197 -5.843375,4.283867 l 2.866974,0 c 0.525247,-1.045827 1.663283,-1.769861 2.976401,-1.769861 1.81648,0 3.282795,1.347508 3.282795,3.016808 0,1.6693 -1.466315,3.016808 -3.282795,3.016808 -1.313118,0 -2.451154,-0.724034 -2.976401,-1.749749 l -2.866974,0 c 0.612788,2.433558 2.998286,4.263764 5.843375,4.263764 3.326566,0 6.018458,-2.473791 6.018458,-5.530823 0,-3.057032 -2.691892,-5.530814 -6.018458,-5.530814 z"
+           id="path3779-7-0"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4349"
+         d="m 9.368705,9.4765611 5.6035,5.8663739"
+         style="fill:none;stroke:#204a87;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#204a87;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M 55.078903,9.4759563 48.963831,15.342935"
+         id="path4859"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+</svg>
--- a/media/fdroid-logo/fdroid-logo-green48pxg.svg
+++ b/media/fdroid-logo/fdroid-logo-green48pxg.svg
@ -0,0 +1,291 @@
+<?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="48px"
+   height="48px"
+   id="svg4139"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="48px.svg"
+   inkscape:export-filename="/home/willie/Pictures/Icons/fdroid/g72px.png"
+   inkscape:export-xdpi="135"
+   inkscape:export-ydpi="135">
+  <defs
+     id="defs4141">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3242-7-2-5"
+       id="radialGradient6814"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,2.6082295,-3.4910792,-1.1005693e-7,53.373677,-17.507175)"
+       cx="7.4956832"
+       cy="8.4497671"
+       fx="7.4956832"
+       fy="8.4497671"
+       r="19.99999" />
+    <linearGradient
+       id="linearGradient3242-7-2-5">
+      <stop
+         id="stop3244-5-9-3"
+         style="stop-color:#eef87e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3246-9-9-7"
+         style="stop-color:#cde34f;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop3248-7-6-5"
+         style="stop-color:#93b723;stop-opacity:1"
+         offset="0.66093999" />
+      <stop
+         id="stop3250-8-0-9"
+         style="stop-color:#5a7e0d;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2490-3-76-6"
+       id="linearGradient6816"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1341282,0,0,1.1341282,-3.3443286,-3.7209606)"
+       x1="24"
+       y1="44"
+       x2="24"
+       y2="3.8990016" />
+    <linearGradient
+       id="linearGradient2490-3-76-6">
+      <stop
+         id="stop2492-3-1-5"
+         style="stop-color:#365f0e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2494-8-3-2"
+         style="stop-color:#84a718;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688-166-749-7"
+       id="radialGradient6853"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-15.44)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       id="linearGradient3688-166-749-7">
+      <stop
+         offset="0"
+         style="stop-color:#181818;stop-opacity:1"
+         id="stop2883-8" />
+      <stop
+         offset="1"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2885-1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688-464-309-1"
+       id="radialGradient6855"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-106.36)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       id="linearGradient3688-464-309-1">
+      <stop
+         offset="0"
+         style="stop-color:#181818;stop-opacity:1"
+         id="stop2889-7" />
+      <stop
+         offset="1"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2891-98" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702-501-757-1"
+       id="linearGradient6857"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       gradientTransform="translate(0,1.9599999)" />
+    <linearGradient
+       id="linearGradient3702-501-757-1">
+      <stop
+         offset="0"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2895-5" />
+      <stop
+         offset="0.5"
+         style="stop-color:#181818;stop-opacity:1"
+         id="stop2897-8" />
+      <stop
+         offset="1"
+         style="stop-color:#181818;stop-opacity:0"
+         id="stop2899-48" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="13.028251"
+     inkscape:cy="28.013628"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="713"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4276"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4144">
+    <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">
+    <g
+       style="display:inline"
+       id="g2036-33"
+       transform="matrix(1.2063017,0,0,0.44677823,-5.0764626,26.625556)">
+      <g
+         style="opacity:0.4"
+         id="g3712-8"
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect
+           style="fill:url(#radialGradient6853);fill-opacity:1;stroke:none"
+           id="rect2801-1"
+           y="41.959999"
+           x="38"
+           height="7"
+           width="5" />
+        <rect
+           style="fill:url(#radialGradient6855);fill-opacity:1;stroke:none"
+           id="rect3696-0"
+           transform="scale(-1,-1)"
+           y="-48.959999"
+           x="-10"
+           height="7"
+           width="5" />
+        <rect
+           style="fill:url(#linearGradient6857);fill-opacity:1;stroke:none"
+           id="rect3700-9"
+           y="41.959999"
+           x="10"
+           height="7.0000005"
+           width="28" />
+      </g>
+    </g>
+    <rect
+       style="color:#000000;fill:url(#radialGradient6814);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient6816);stroke-width:1.60840011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5505"
+       y="1.3826164"
+       x="1.7592438"
+       ry="2.4126003"
+       rx="2.4126003"
+       height="44.231003"
+       width="44.231003" />
+    <g
+       id="g6835"
+       transform="matrix(0.80420004,0,0,0.80420004,-2.0272662,-0.85442396)">
+      <g
+         id="g6837"
+         transform="matrix(2.279764,0,0,2.279764,-18.418227,-64.194578)"
+         style="stroke:#3465a4">
+        <circle
+           transform="matrix(0.0218853,0,0,0.02011205,11.572346,31.726167)"
+           id="circle6839"
+           r="440"
+           cy="490"
+           cx="490"
+           sodipodi:cx="490"
+           sodipodi:cy="490"
+           sodipodi:rx="440"
+           sodipodi:ry="440"
+           style="fill:none;stroke:#84c02c;stroke-width:100;stroke-opacity:1"
+           d="M 930,490 C 930,733.00529 733.00529,930 490,930 246.99471,930 50,733.00529 50,490 50,246.99471 246.99471,50 490,50 733.00529,50 930,246.99471 930,490 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6841"
+           d="m 22.208612,35.949734 c -2.845089,0 -5.230587,1.830197 -5.843375,4.283867 l 2.866974,0 c 0.525247,-1.045827 1.663283,-1.769861 2.976401,-1.769861 1.81648,0 3.282795,1.347508 3.282795,3.016808 0,1.6693 -1.466315,3.016808 -3.282795,3.016808 -1.313118,0 -2.451154,-0.724034 -2.976401,-1.749749 l -2.866974,0 c 0.612788,2.433558 2.998286,4.263764 5.843375,4.263764 3.326566,0 6.018458,-2.473791 6.018458,-5.530823 0,-3.057032 -2.691892,-5.530814 -6.018458,-5.530814 z"
+           style="fill:none;stroke:#84c02c" />
+      </g>
+      <g
+         transform="matrix(2.279764,0,0,2.279764,-18.39783,-64.773624)"
+         id="g6843"
+         style="stroke:#204a87">
+        <circle
+           transform="matrix(0.0218853,0,0,0.02011205,11.572346,31.425787)"
+           id="circle6845"
+           r="440"
+           cy="490"
+           cx="490"
+           sodipodi:cx="490"
+           sodipodi:cy="490"
+           sodipodi:rx="440"
+           sodipodi:ry="440"
+           style="fill:none;stroke:#648405;stroke-width:100;stroke-opacity:1"
+           d="M 930,490 C 930,733.00529 733.00529,930 490,930 246.99471,930 50,733.00529 50,490 50,246.99471 246.99471,50 490,50 733.00529,50 930,246.99471 930,490 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6847"
+           d="m 22.208612,35.749878 c -2.845089,0 -5.230587,1.830197 -5.843375,4.283867 l 2.866974,0 c 0.525247,-1.045827 1.663283,-1.769861 2.976401,-1.769861 1.81648,0 3.282795,1.347508 3.282795,3.016808 0,1.6693 -1.466315,3.016808 -3.282795,3.016808 -1.313118,0 -2.451154,-0.724034 -2.976401,-1.749749 l -2.866974,0 c 0.612788,2.433558 2.998286,4.263764 5.843375,4.263764 3.326566,0 6.018458,-2.473791 6.018458,-5.530823 0,-3.057032 -2.691892,-5.530814 -6.018458,-5.530814 z"
+           style="fill:#648405;fill-opacity:1;stroke:#648405;stroke-opacity:1" />
+      </g>
+      <path
+         style="fill:none;stroke:#648405;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 9.0816888,10.052244 4.7958602,5.974955"
+         id="path6849"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path6851"
+         d="m 55.733625,10.052244 -5.335121,6.715218"
+         style="fill:none;stroke:#648405;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>
--- a/media/fdroid-logo/fdroid-logo.svg
+++ b/media/fdroid-logo/fdroid-logo.svg
--- a/media/fdroid-logo/license.txt
+++ b/media/fdroid-logo/license.txt
@ -0,0 +1,9 @@
+The FDroid logo
+Copyright 2012 William Theaker
+Dual-licensed (pick either) under CC-BY-SA 3.0 Unported <http://creativecommons.org/licenses/by-sa/3.0/> and GPLv2 <http://www.gnu.org/licenses/gpl-2.0.html> or later versions of that license
+
+About:
+Here are the Inkscape SVGs for the icons I designed. I can change the
+line widths and email you the raster PNGs if you let me know what
+resolutions you need. Just my name should be sufficient for attribution.
+Thanks!
--- a/media/fdroidheader-thumb.png
+++ b/media/fdroidheader-thumb.png
--- a/media/fdroidheader.png
+++ b/media/fdroidheader.png
--- a/media/fdroidheader.xcf
+++ b/media/fdroidheader.xcf
--- a/res/drawable-hdpi/ic_launcher.png
+++ b/res/drawable-hdpi/ic_launcher.png
--- a/res/drawable-ldpi/ic_launcher.png
+++ b/res/drawable-ldpi/ic_launcher.png
--- a/res/drawable-mdpi/ic_launcher.png
+++ b/res/drawable-mdpi/ic_launcher.png
--- a/res/drawable-xhdpi/ic_launcher.png
+++ b/res/drawable-xhdpi/ic_launcher.png
--- a/res/drawable/icon.png
+++ b/res/drawable/icon.png