Merge screen_resolution_independent branch

- total refactoring of code;
- support various screen resolutions;
- use jobjects for characters, backgrounds and sounds;
- add collaboration code

2 files changed, 2 insertions, 36 deletions

diff --git a/activity/activity.info b/activity/activity.info
index 5f7797a..a754f9a 100755..100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,7 +1,8 @@
 [Activity]
 name = CartoonBuilder
 service_name = com.ywwg.CartoonBuilderActivity
-class = cartoonbuilder.cartoonbuilderActivity
+class = activity.CartoonBuilderActivity
 icon = activity-cartoonbuilder
 activity_version = 1
 show_launcher = yes
+license = GPLv2+
diff --git a/activity/old.activity-cartoonbuilder.svg b/activity/old.activity-cartoonbuilder.svg
deleted file mode 100644
index 1a762a3..0000000
--- a/activity/old.activity-cartoonbuilder.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="60.75" height="56.5" viewBox="0 0 60.75 56.5"
-	 overflow="visible" enable-background="new 0 0 60.75 56.5" xml:space="preserve">
-<rect x="1.75" y="1.75" fill="#FFFFFF" stroke="#000000" stroke-width="3.5" width="57.25" height="53"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="1.5" y1="10.5" x2="59" y2="10.5"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="1.5" y1="46.625" x2="59" y2="46.625"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="9.125" y1="1.5" x2="9.125" y2="10.5"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="16.229" y1="1.5" x2="16.229" y2="10.5"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="23.333" y1="1.5" x2="23.333" y2="10.5"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="30.438" y1="1.5" x2="30.438" y2="10.5"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="37.542" y1="1.5" x2="37.542" y2="10.5"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="44.646" y1="1.5" x2="44.646" y2="10.5"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="51.75" y1="1.5" x2="51.75" y2="10.5"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="9.125" y1="45.875" x2="9.125" y2="54.875"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="16.229" y1="45.875" x2="16.229" y2="54.875"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="23.333" y1="45.875" x2="23.333" y2="54.875"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="30.438" y1="45.875" x2="30.438" y2="54.875"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="37.542" y1="45.875" x2="37.542" y2="54.875"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="44.646" y1="45.875" x2="44.646" y2="54.875"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="51.75" y1="45.875" x2="51.75" y2="54.875"/>
-<line fill="none" stroke="#000000" stroke-width="3.5" x1="37.375" y1="10.375" x2="37.375" y2="47.375"/>
-<ellipse fill="none" stroke="#000000" stroke-width="3.5" cx="19.125" cy="28.188" rx="12.25" ry="12.312"/>
-<ellipse fill="none" stroke="#000000" cx="23.833" cy="24.125" rx="2.5" ry="2.417"/>
-<ellipse fill="none" stroke="#000000" cx="14.25" cy="24.125" rx="2.5" ry="2.417"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M13.042,30.667c2.108,2.886,7.219,6.563,13.083,0"/>
-<path fill="none" stroke="#000000" stroke-width="3.5" d="M57.03,40.069c-6.766,0-12.25-5.513-12.25-12.312
-	s5.484-12.312,12.25-12.312"/>
-<ellipse fill="none" stroke="#000000" cx="52.156" cy="23.694" rx="2.5" ry="2.417"/>
-<path fill="none" stroke="#000000" stroke-width="2" d="M50.573,30.174c1.251,1.713,3.561,3.705,6.457,3.669"/>
-</svg>
\ No newline at end of file