From 01230cd0a9dc90032a4a36e22ab10dcb77fad208 Mon Sep 17 00:00:00 2001 From: Dominik Date: Fri, 13 Apr 2012 02:34:46 +0200 Subject: new icon and readme --- LICENSE | 5 +- README.md | 6 +- Resources/icon.svg | 3370 +++++++++++++++++++- Resources/icon_google_play.png | Bin 49980 -> 81207 bytes Resources/icon_googlecode.png | Bin 0 -> 3643 bytes Resources/kgpg_key2_kopete.svgz | Bin 0 -> 36830 bytes org_apg/AndroidManifest.xml | 6 +- org_apg/build.xml | 2 +- org_apg/res/drawable-hdpi/icon.png | Bin 3869 -> 5308 bytes org_apg/res/drawable-ldpi/icon.png | Bin 1765 -> 2027 bytes org_apg/res/drawable-mdpi/icon.png | Bin 2488 -> 3035 bytes org_apg/res/drawable-xhdpi/icon.png | Bin 5832 -> 8165 bytes org_apg_integration_demo/build.xml | 2 +- .../res/drawable-hdpi/icon.png | Bin 3869 -> 5308 bytes .../res/drawable-ldpi/icon.png | Bin 1765 -> 2027 bytes .../res/drawable-mdpi/icon.png | Bin 2488 -> 3035 bytes .../res/drawable-xhdpi/icon.png | Bin 5832 -> 8165 bytes org_apg_integration_lib/build.xml | 2 +- 18 files changed, 3207 insertions(+), 186 deletions(-) create mode 100644 Resources/icon_googlecode.png create mode 100644 Resources/kgpg_key2_kopete.svgz diff --git a/LICENSE b/LICENSE index b217dc6bb..703673a2a 100644 --- a/LICENSE +++ b/LICENSE @@ -11,9 +11,8 @@ The following open source projects are used in APG: Images: * icon.svg - modified version of GnuPG Logo (not) - http://openclipart.org/detail/15078/gnupg-logo-(not)-by-mrbordello - Public Domain + modified version of kgpg_key2_kopete.svgz + GPL * dashboard_manage_keys.svg, dashboard_my_keys.svg, key.svg http://rrze-icon-set.berlios.de/ diff --git a/README.md b/README.md index 7a3966402..5d0a8f733 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Fork APG+ and do a merge request. I will merge your changes back into the main p 1. New -> Android Project -> Create project from existing source, choose com_actionbarsherlock 2. New -> Android Project -> Create project from existing source, choose org_apg 3. Add com_actionbarsherlock as Android Lib (Properties of org_apg -> Android -> Library -> add) -4. Add Java libs (Properties of org_apg -> Java Build Path -> Libraries -> add all libraries from libs folder in org_apg) +4. Optional (As of Android Tools r17 the libraries are automatically added from the libs folder): Add Java libs (Properties of org_apg -> Java Build Path -> Libraries -> add all libraries from libs folder in org_apg) 5. Now APG+ can be build # Build using Ant @@ -37,7 +37,7 @@ The Libraries are provided in the git repository. * ActionBarSherlock to provide an ActionBar for Android < 3.0 * Spongy Castle as the main Crypto Lib * android-support-v4.jar: Compatibility Lib -* android-integration-supportv4.jar: Barcode Scanner Integration +* barcodescanner-android-integration-supportv4.jar: Barcode Scanner Integration # Build XZing Integration Library @@ -53,7 +53,7 @@ On error see: http://code.google.com/p/zxing/issues/detail?id=1207 see https://github.com/rtyley/spongycastle -# Generate pressed dashboard icons +# Generate pressed dashboard icons 1. Open svg in Inkscape 2. Extensions -> Color -> darker (2 times!) \ No newline at end of file diff --git a/Resources/icon.svg b/Resources/icon.svg index 7ce1f5723..f07999465 100644 --- a/Resources/icon.svg +++ b/Resources/icon.svg @@ -22,16 +22,34 @@ id="svg2" height="512" width="512"> + @@ -39,7 +57,7 @@ id="linearGradient5479" osb:paint="solid"> @@ -48,42 +66,42 @@ + style="stop-color:#e6e6e6;stop-opacity:1;" /> + style="stop-color:#a4a19b;stop-opacity:1;" /> @@ -92,19 +110,19 @@ + style="stop-color:#c0c0c0;stop-opacity:1;" /> + style="stop-color:#bcbcbc;stop-opacity:1;" /> + style="stop-color:#9e9e9e;stop-opacity:1;" /> @@ -127,16 +145,6 @@ y2="591.70483" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.93617,296.44,-189.045)" /> - - - - - - - - - - - - - + gradientTransform="matrix(1.05149,-0.281746,0.281746,1.05149,-25.52633,9.74688)" + x1="132.77945" + y1="22.707912" + x2="-20.653816" + y2="91.103127" /> + + + + + gradientTransform="matrix(1,0,0,0.534483,0,41.66379)" + cx="39" + cy="89.5" + fx="39" + fy="89.5" + r="29" /> + + + + + gradientTransform="matrix(1.05149,-0.281746,0.281746,1.05149,-25.52633,9.74688)" + x1="63.498344" + y1="49.15625" + x2="124.625" + y2="49.15625" /> + + + + + + gradientTransform="matrix(1.05149,-0.281746,0.281746,1.05149,-25.52633,9.74688)" + x1="64.15625" + y1="63.796875" + x2="127.31514" + y2="63.796875" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -453,74 +3321,226 @@ inkscape:groupmode="layer" id="layer1" transform="translate(-8.0847263,-100.8597)"> - - - - - - - - - + id="g4431" + transform="translate(-1.3638622,6.7536828)"> + + + + + + + + + + OXYGEN + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Resources/icon_google_play.png b/Resources/icon_google_play.png index 34aa733ec..d5d86ebbc 100644 Binary files a/Resources/icon_google_play.png and b/Resources/icon_google_play.png differ diff --git a/Resources/icon_googlecode.png b/Resources/icon_googlecode.png new file mode 100644 index 000000000..33acccfd3 Binary files /dev/null and b/Resources/icon_googlecode.png differ diff --git a/Resources/kgpg_key2_kopete.svgz b/Resources/kgpg_key2_kopete.svgz new file mode 100644 index 000000000..2d43afb83 Binary files /dev/null and b/Resources/kgpg_key2_kopete.svgz differ diff --git a/org_apg/AndroidManifest.xml b/org_apg/AndroidManifest.xml index 5d6ff4021..1d2e93d24 100644 --- a/org_apg/AndroidManifest.xml +++ b/org_apg/AndroidManifest.xml @@ -124,7 +124,8 @@ android:name=".ui.EncryptActivity" android:configChanges="keyboardHidden|orientation|keyboard" android:label="@string/title_encrypt" - android:uiOptions="splitActionBarWhenNarrow" > + android:uiOptions="splitActionBarWhenNarrow" + android:windowSoftInputMode="stateHidden" > @@ -140,7 +141,8 @@ android:name=".ui.DecryptActivity" android:configChanges="keyboardHidden|orientation|keyboard" android:label="@string/title_decrypt" - android:uiOptions="splitActionBarWhenNarrow" > + android:uiOptions="splitActionBarWhenNarrow" + android:windowSoftInputMode="stateHidden" > diff --git a/org_apg/build.xml b/org_apg/build.xml index 6bc71bee0..eb9b68df7 100644 --- a/org_apg/build.xml +++ b/org_apg/build.xml @@ -1,5 +1,5 @@ - +