Application structure changed

2012-11-30 13:43:41 +04:00 · 2012-11-30 13:43:41 +04:00 · 5026597946
commit 5026597946
parent a2009599e4
668 changed files with 169 additions and 169 deletions
--- a/calculatorpp-test/pom.xml
+++ b/calculatorpp-test/pom.xml
@ -10,7 +10,7 @@
    <modelVersion>4.0.0</modelVersion>

    <groupId>org.solovyev.android</groupId>
-    <artifactId>calculatorpp-test</artifactId>
+    <artifactId>calculatorpp-app-android-test</artifactId>
    <name>Calculator++ Application (Test)</name>


--- a/calculatorpp/AndroidManifest.xml
+++ b/calculatorpp/AndroidManifest.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="112" android:versionName="1.5.2" package="org.solovyev.android.calculator">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="112" android:versionName="1.5.3-SNAPSHOT" package="org.solovyev.android.calculator">

    <uses-permission android:name="android.permission.VIBRATE"/>
    <uses-permission android:name="android.permission.INTERNET"/>
@ -21,7 +21,7 @@

    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>

-    <application android:debuggable="false" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/cpp_metro_blue_theme">
+    <application android:debuggable="true" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/cpp_metro_blue_theme">

        <activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">

--- a/calculatorpp/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
+++ b/calculatorpp/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
--- a/calculatorpp/misc/doc/achartengine-0.7.0-javadocs.zip
+++ b/calculatorpp/misc/doc/achartengine-0.7.0-javadocs.zip
--- a/calculatorpp/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
+++ b/calculatorpp/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
--- a/calculatorpp/misc/lib/achartengine-0.7.0.jar
+++ b/calculatorpp/misc/lib/achartengine-0.7.0.jar
--- a/calculatorpp/misc/lib/achartengine-0.7.1.jar
+++ b/calculatorpp/misc/lib/achartengine-0.7.1.jar
--- a/calculatorpp/misc/other/prepare_avds.sh
+++ b/calculatorpp/misc/other/prepare_avds.sh
--- a/calculatorpp/misc/other/remove_avds.sh
+++ b/calculatorpp/misc/other/remove_avds.sh
--- a/calculatorpp/misc/other/take_screenshots.py
+++ b/calculatorpp/misc/other/take_screenshots.py
--- a/calculatorpp/misc/other/take_screenshots.sh
+++ b/calculatorpp/misc/other/take_screenshots.sh
--- a/calculatorpp/misc/other/take_screenshots2.sh
+++ b/calculatorpp/misc/other/take_screenshots2.sh
--- a/calculatorpp/misc/other/wait_device.py
+++ b/calculatorpp/misc/other/wait_device.py
--- a/calculatorpp/misc/res/calculatorpp/01_main_screen_port.png
+++ b/calculatorpp/misc/res/calculatorpp/01_main_screen_port.png
--- a/calculatorpp/misc/res/calculatorpp/01_main_screen_port_sm.png
+++ b/calculatorpp/misc/res/calculatorpp/01_main_screen_port_sm.png
--- a/calculatorpp/misc/res/calculatorpp/02_main_screen_land.png
+++ b/calculatorpp/misc/res/calculatorpp/02_main_screen_land.png
--- a/calculatorpp/misc/res/calculatorpp/03_main_screen_port_with_expression.png
+++ b/calculatorpp/misc/res/calculatorpp/03_main_screen_port_with_expression.png
--- a/calculatorpp/misc/res/calculatorpp/04_plot_graph_menu.png
+++ b/calculatorpp/misc/res/calculatorpp/04_plot_graph_menu.png
--- a/calculatorpp/misc/res/calculatorpp/04_plot_graph_menu_sm.png
+++ b/calculatorpp/misc/res/calculatorpp/04_plot_graph_menu_sm.png
--- a/calculatorpp/misc/res/calculatorpp/05_graph_screen.png
+++ b/calculatorpp/misc/res/calculatorpp/05_graph_screen.png
--- a/calculatorpp/misc/res/calculatorpp/05_graph_screen_sm.png
+++ b/calculatorpp/misc/res/calculatorpp/05_graph_screen_sm.png
--- a/calculatorpp/misc/res/calculatorpp/06_constants_screen.png
+++ b/calculatorpp/misc/res/calculatorpp/06_constants_screen.png
--- a/calculatorpp/misc/res/calculatorpp/06_constants_screen_sm.png
+++ b/calculatorpp/misc/res/calculatorpp/06_constants_screen_sm.png
--- a/calculatorpp/misc/res/calculatorpp/07_constant_create_dialog.png
+++ b/calculatorpp/misc/res/calculatorpp/07_constant_create_dialog.png
--- a/calculatorpp/misc/res/calculatorpp/08_constants_context_menu.png
+++ b/calculatorpp/misc/res/calculatorpp/08_constants_context_menu.png
--- a/calculatorpp/misc/res/calculatorpp/09_functions_screen.png
+++ b/calculatorpp/misc/res/calculatorpp/09_functions_screen.png
--- a/calculatorpp/misc/res/calculatorpp/09_functions_screen_sm.png
+++ b/calculatorpp/misc/res/calculatorpp/09_functions_screen_sm.png
--- a/calculatorpp/misc/res/calculatorpp/10_history_screen.png
+++ b/calculatorpp/misc/res/calculatorpp/10_history_screen.png
--- a/calculatorpp/misc/res/calculatorpp/10_history_screen_sm.png
+++ b/calculatorpp/misc/res/calculatorpp/10_history_screen_sm.png
--- a/calculatorpp/misc/res/calculatorpp/11_history_item_context_menu.png
+++ b/calculatorpp/misc/res/calculatorpp/11_history_item_context_menu.png
--- a/calculatorpp/misc/res/calculatorpp/12_saved_history_tab.png
+++ b/calculatorpp/misc/res/calculatorpp/12_saved_history_tab.png
--- a/calculatorpp/misc/res/calculatorpp/13_saved_history_item_context_menu.png
+++ b/calculatorpp/misc/res/calculatorpp/13_saved_history_item_context_menu.png
--- a/calculatorpp/misc/res/calculatorpp/14_about_screen.png
+++ b/calculatorpp/misc/res/calculatorpp/14_about_screen.png
--- a/calculatorpp/misc/res/calculatorpp/14_about_screen_sm.png
+++ b/calculatorpp/misc/res/calculatorpp/14_about_screen_sm.png
--- a/calculatorpp/misc/res/calculatorpp/15_release_notes_tab.png
+++ b/calculatorpp/misc/res/calculatorpp/15_release_notes_tab.png
--- a/calculatorpp/misc/res/calculatorpp/16_help_screen.png
+++ b/calculatorpp/misc/res/calculatorpp/16_help_screen.png
--- a/calculatorpp/misc/res/calculatorpp/16_help_screen_sm.png
+++ b/calculatorpp/misc/res/calculatorpp/16_help_screen_sm.png
--- a/calculatorpp/misc/res/calculatorpp/17_hints_tab.png
+++ b/calculatorpp/misc/res/calculatorpp/17_hints_tab.png
--- a/calculatorpp/misc/res/calculatorpp/18_preferences.png
+++ b/calculatorpp/misc/res/calculatorpp/18_preferences.png
--- a/calculatorpp/misc/res/calculatorpp/18_preferences_02.png
+++ b/calculatorpp/misc/res/calculatorpp/18_preferences_02.png
--- a/calculatorpp/misc/res/calculatorpp/18_preferences_03.png
+++ b/calculatorpp/misc/res/calculatorpp/18_preferences_03.png
--- a/calculatorpp/misc/res/calculatorpp/18_preferences_sm.png
+++ b/calculatorpp/misc/res/calculatorpp/18_preferences_sm.png
--- a/calculatorpp/misc/res/calculatorpp/plan.png
+++ b/calculatorpp/misc/res/calculatorpp/plan.png
--- a/calculatorpp/misc/res/calculatorpp/plan.xcf
+++ b/calculatorpp/misc/res/calculatorpp/plan.xcf
--- a/calculatorpp/misc/res/icon-green.png
+++ b/calculatorpp/misc/res/icon-green.png
--- a/calculatorpp/misc/res/icon-hi-res.png
+++ b/calculatorpp/misc/res/icon-hi-res.png
--- a/calculatorpp/misc/res/icon-promo.png
+++ b/calculatorpp/misc/res/icon-promo.png
--- a/calculatorpp/misc/res/icon.png
+++ b/calculatorpp/misc/res/icon.png
--- a/calculatorpp/misc/res/kb_facebook.png
+++ b/calculatorpp/misc/res/kb_facebook.png
--- a/calculatorpp/misc/res/kb_facebook_icon.png
+++ b/calculatorpp/misc/res/kb_facebook_icon.png
--- a/calculatorpp/misc/res/logo-admob.png
+++ b/calculatorpp/misc/res/logo-admob.png
--- a/calculatorpp/misc/res/logo-scaled.png
+++ b/calculatorpp/misc/res/logo-scaled.png
--- a/calculatorpp/misc/res/logo-small.png
+++ b/calculatorpp/misc/res/logo-small.png
--- a/calculatorpp/misc/res/logo.cdr
+++ b/calculatorpp/misc/res/logo.cdr
--- a/calculatorpp/misc/res/logo.png
+++ b/calculatorpp/misc/res/logo.png
--- a/calculatorpp/misc/res/widget.png
+++ b/calculatorpp/misc/res/widget.png
--- a/calculatorpp/misc/res/work/Backup_of_logo.cdr
+++ b/calculatorpp/misc/res/work/Backup_of_logo.cdr
--- a/calculatorpp/misc/res/work/header.png
+++ b/calculatorpp/misc/res/work/header.png
--- a/calculatorpp/misc/res/work/header_bg.png
+++ b/calculatorpp/misc/res/work/header_bg.png
--- a/calculatorpp/misc/res/work/header_sm.png
+++ b/calculatorpp/misc/res/work/header_sm.png
--- a/calculatorpp/misc/res/work/heart_original.png
+++ b/calculatorpp/misc/res/work/heart_original.png
--- a/calculatorpp/misc/res/work/icon.png
+++ b/calculatorpp/misc/res/work/icon.png
--- a/calculatorpp/misc/res/work/icon_favicon_light_blue.ico
+++ b/calculatorpp/misc/res/work/icon_favicon_light_blue.ico
--- a/calculatorpp/misc/res/work/icon_favicon_light_blue.png
+++ b/calculatorpp/misc/res/work/icon_favicon_light_blue.png
--- a/calculatorpp/misc/res/work/icon_favicon_purple.ico
+++ b/calculatorpp/misc/res/work/icon_favicon_purple.ico
--- a/calculatorpp/misc/res/work/icon_small.png
+++ b/calculatorpp/misc/res/work/icon_small.png
--- a/calculatorpp/misc/res/work/log11o.psd
+++ b/calculatorpp/misc/res/work/log11o.psd
--- a/calculatorpp/misc/res/work/logo.cdr
+++ b/calculatorpp/misc/res/work/logo.cdr
--- a/calculatorpp/misc/res/work/logo.png
+++ b/calculatorpp/misc/res/work/logo.png
--- a/calculatorpp/misc/res/work/logoFULL
+++ b/calculatorpp/misc/res/work/logoFULL
--- a/calculatorpp/misc/res/work/logoFULL.pdf
+++ b/calculatorpp/misc/res/work/logoFULL.pdf
--- a/calculatorpp/misc/res/work/logoFULL.png
+++ b/calculatorpp/misc/res/work/logoFULL.png
--- a/calculatorpp/misc/res/work/logoFULL_banner.png
+++ b/calculatorpp/misc/res/work/logoFULL_banner.png
--- a/calculatorpp/misc/res/work/logoFULL_small.png
+++ b/calculatorpp/misc/res/work/logoFULL_small.png
--- a/calculatorpp/misc/res/work/logo_black.png
+++ b/calculatorpp/misc/res/work/logo_black.png
--- a/calculatorpp/misc/res/work/logo_blue.png
+++ b/calculatorpp/misc/res/work/logo_blue.png
--- a/calculatorpp/misc/res/work/logo_light_blue.png
+++ b/calculatorpp/misc/res/work/logo_light_blue.png
--- a/calculatorpp/misc/res/work/logo_purple.png
+++ b/calculatorpp/misc/res/work/logo_purple.png
--- a/calculatorpp/misc/res/work/promo_logo.png
+++ b/calculatorpp/misc/res/work/promo_logo.png
--- a/calculatorpp/misc/res/work/text_logo.png
+++ b/calculatorpp/misc/res/work/text_logo.png
--- a/calculatorpp/misc/res/work/text_logo_blue.png
+++ b/calculatorpp/misc/res/work/text_logo_blue.png
--- a/calculatorpp/misc/res/work/text_logo_light_blue.png
+++ b/calculatorpp/misc/res/work/text_logo_light_blue.png
--- a/calculatorpp/misc/res/work/text_logo_light_blue_cpp_forum.png
+++ b/calculatorpp/misc/res/work/text_logo_light_blue_cpp_forum.png
--- a/calculatorpp/misc/res/work/text_logo_purple.png
+++ b/calculatorpp/misc/res/work/text_logo_purple.png
--- a/calculatorpp/misc/src/achartengine-0.7.0.jar
+++ b/calculatorpp/misc/src/achartengine-0.7.0.jar
--- a/calculatorpp/misc/src/bsh.jar
+++ b/calculatorpp/misc/src/bsh.jar
--- a/calculatorpp/pom.xml
+++ b/calculatorpp/pom.xml
@ -10,7 +10,7 @@
    <modelVersion>4.0.0</modelVersion>

    <groupId>org.solovyev.android</groupId>
-    <artifactId>calculatorpp</artifactId>
+    <artifactId>calculatorpp-app-android</artifactId>
    <packaging>apk</packaging>
    <name>Calculator++ Application</name>

--- a/calculatorpp/proguard.cfg
+++ b/calculatorpp/proguard.cfg
--- a/calculatorpp/project.properties
+++ b/calculatorpp/project.properties
--- a/calculatorpp/res/drawable-hdpi/ab_add.png
+++ b/calculatorpp/res/drawable-hdpi/ab_add.png
--- a/calculatorpp/res/drawable-hdpi/ab_icon.png
+++ b/calculatorpp/res/drawable-hdpi/ab_icon.png
--- a/calculatorpp/res/drawable-hdpi/ab_icon_long.png
+++ b/calculatorpp/res/drawable-hdpi/ab_icon_long.png
--- a/calculatorpp/res/drawable-hdpi/ab_settings.png
+++ b/calculatorpp/res/drawable-hdpi/ab_settings.png
--- a/calculatorpp/res/drawable-hdpi/icon.png
+++ b/calculatorpp/res/drawable-hdpi/icon.png
--- a/calculatorpp/res/drawable-hdpi/icon_onscreen.png
+++ b/calculatorpp/res/drawable-hdpi/icon_onscreen.png
--- a/calculatorpp/res/drawable-hdpi/kb_copy.png
+++ b/calculatorpp/res/drawable-hdpi/kb_copy.png
--- a/calculatorpp/res/drawable-hdpi/kb_delete.png
+++ b/calculatorpp/res/drawable-hdpi/kb_delete.png
--- a/calculatorpp/res/drawable-hdpi/kb_facebook.png
+++ b/calculatorpp/res/drawable-hdpi/kb_facebook.png
--- a/calculatorpp/res/drawable-hdpi/kb_heart.png
+++ b/calculatorpp/res/drawable-hdpi/kb_heart.png
--- a/calculatorpp/res/drawable-hdpi/kb_logo.png
+++ b/calculatorpp/res/drawable-hdpi/kb_logo.png
--- a/Show More
+++ b/Show More