diff --git a/android-app-core/AndroidManifest.xml b/android-app-core/AndroidManifest.xml
new file mode 100644
index 00000000..312325db
--- /dev/null
+++ b/android-app-core/AndroidManifest.xml
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/android-app-core/pom.xml b/android-app-core/pom.xml
new file mode 100644
index 00000000..90c64f50
--- /dev/null
+++ b/android-app-core/pom.xml
@@ -0,0 +1,77 @@
+
+
+ 4.0.0
+
+
+ org.solovyev.android
+ calculatorpp-parent
+ 1.5.3-SNAPSHOT
+
+
+ org.solovyev.android
+ calculatorpp-android-app-core
+ 1.5.3-SNAPSHOT
+ Calculator++ Application Core
+ apklib
+
+
+
+
+ org.solovyev.android
+ calculatorpp-core
+
+
+
+ org.solovyev
+ common-core
+
+
+
+ org.solovyev
+ common-text
+
+
+
+ org.solovyev.android
+ android-common-all
+ apklib
+
+
+
+ org.solovyev
+ jscl
+
+
+
+ com.actionbarsherlock
+ library
+ apklib
+
+
+
+ com.google.android
+ android
+ provided
+
+
+
+ com.google.android
+ support-v4
+
+
+
+
+
+
+
+
+ com.jayway.maven.plugins.android.generation2
+ android-maven-plugin
+
+
+
+
+
+
\ No newline at end of file
diff --git a/calculatorpp/res/drawable-hdpi/ab_add.png b/android-app-core/res/drawable-hdpi/ab_add.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/ab_add.png
rename to android-app-core/res/drawable-hdpi/ab_add.png
diff --git a/calculatorpp/res/drawable-hdpi/ab_icon.png b/android-app-core/res/drawable-hdpi/ab_icon.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/ab_icon.png
rename to android-app-core/res/drawable-hdpi/ab_icon.png
diff --git a/calculatorpp/res/drawable-hdpi/ab_icon_long.png b/android-app-core/res/drawable-hdpi/ab_icon_long.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/ab_icon_long.png
rename to android-app-core/res/drawable-hdpi/ab_icon_long.png
diff --git a/calculatorpp/res/drawable-hdpi/ab_settings.png b/android-app-core/res/drawable-hdpi/ab_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/ab_settings.png
rename to android-app-core/res/drawable-hdpi/ab_settings.png
diff --git a/calculatorpp/res/drawable-hdpi/icon.png b/android-app-core/res/drawable-hdpi/icon.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/icon.png
rename to android-app-core/res/drawable-hdpi/icon.png
diff --git a/calculatorpp/res/drawable-hdpi/icon_onscreen.png b/android-app-core/res/drawable-hdpi/icon_onscreen.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/icon_onscreen.png
rename to android-app-core/res/drawable-hdpi/icon_onscreen.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_copy.png b/android-app-core/res/drawable-hdpi/kb_copy.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_copy.png
rename to android-app-core/res/drawable-hdpi/kb_copy.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_delete.png b/android-app-core/res/drawable-hdpi/kb_delete.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_delete.png
rename to android-app-core/res/drawable-hdpi/kb_delete.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_facebook.png b/android-app-core/res/drawable-hdpi/kb_facebook.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_facebook.png
rename to android-app-core/res/drawable-hdpi/kb_facebook.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_heart.png b/android-app-core/res/drawable-hdpi/kb_heart.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_heart.png
rename to android-app-core/res/drawable-hdpi/kb_heart.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_logo.png b/android-app-core/res/drawable-hdpi/kb_logo.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_logo.png
rename to android-app-core/res/drawable-hdpi/kb_logo.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_paste.png b/android-app-core/res/drawable-hdpi/kb_paste.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_paste.png
rename to android-app-core/res/drawable-hdpi/kb_paste.png
diff --git a/calculatorpp/res/drawable-hdpi/kb_settings.png b/android-app-core/res/drawable-hdpi/kb_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/kb_settings.png
rename to android-app-core/res/drawable-hdpi/kb_settings.png
diff --git a/calculatorpp/res/drawable-hdpi/logo.png b/android-app-core/res/drawable-hdpi/logo.png
similarity index 100%
rename from calculatorpp/res/drawable-hdpi/logo.png
rename to android-app-core/res/drawable-hdpi/logo.png
diff --git a/calculatorpp/res/drawable-ldpi/ab_add.png b/android-app-core/res/drawable-ldpi/ab_add.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/ab_add.png
rename to android-app-core/res/drawable-ldpi/ab_add.png
diff --git a/calculatorpp/res/drawable-ldpi/ab_icon.png b/android-app-core/res/drawable-ldpi/ab_icon.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/ab_icon.png
rename to android-app-core/res/drawable-ldpi/ab_icon.png
diff --git a/calculatorpp/res/drawable-ldpi/ab_settings.png b/android-app-core/res/drawable-ldpi/ab_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/ab_settings.png
rename to android-app-core/res/drawable-ldpi/ab_settings.png
diff --git a/calculatorpp/res/drawable-ldpi/icon.png b/android-app-core/res/drawable-ldpi/icon.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/icon.png
rename to android-app-core/res/drawable-ldpi/icon.png
diff --git a/calculatorpp/res/drawable-ldpi/icon_onscreen.png b/android-app-core/res/drawable-ldpi/icon_onscreen.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/icon_onscreen.png
rename to android-app-core/res/drawable-ldpi/icon_onscreen.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_copy.png b/android-app-core/res/drawable-ldpi/kb_copy.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_copy.png
rename to android-app-core/res/drawable-ldpi/kb_copy.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_delete.png b/android-app-core/res/drawable-ldpi/kb_delete.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_delete.png
rename to android-app-core/res/drawable-ldpi/kb_delete.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_facebook.png b/android-app-core/res/drawable-ldpi/kb_facebook.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_facebook.png
rename to android-app-core/res/drawable-ldpi/kb_facebook.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_heart.png b/android-app-core/res/drawable-ldpi/kb_heart.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_heart.png
rename to android-app-core/res/drawable-ldpi/kb_heart.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_logo.png b/android-app-core/res/drawable-ldpi/kb_logo.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_logo.png
rename to android-app-core/res/drawable-ldpi/kb_logo.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_paste.png b/android-app-core/res/drawable-ldpi/kb_paste.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_paste.png
rename to android-app-core/res/drawable-ldpi/kb_paste.png
diff --git a/calculatorpp/res/drawable-ldpi/kb_settings.png b/android-app-core/res/drawable-ldpi/kb_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/kb_settings.png
rename to android-app-core/res/drawable-ldpi/kb_settings.png
diff --git a/calculatorpp/res/drawable-ldpi/logo.png b/android-app-core/res/drawable-ldpi/logo.png
similarity index 100%
rename from calculatorpp/res/drawable-ldpi/logo.png
rename to android-app-core/res/drawable-ldpi/logo.png
diff --git a/calculatorpp/res/drawable-mdpi/ab_add.png b/android-app-core/res/drawable-mdpi/ab_add.png
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/ab_add.png
rename to android-app-core/res/drawable-mdpi/ab_add.png
diff --git a/calculatorpp/res/drawable-mdpi/ab_icon.png b/android-app-core/res/drawable-mdpi/ab_icon.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/ab_icon.png
rename to android-app-core/res/drawable-mdpi/ab_icon.png
diff --git a/calculatorpp/res/drawable-mdpi/ab_settings.png b/android-app-core/res/drawable-mdpi/ab_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/ab_settings.png
rename to android-app-core/res/drawable-mdpi/ab_settings.png
diff --git a/calculatorpp/res/drawable-mdpi/icon.png b/android-app-core/res/drawable-mdpi/icon.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/icon.png
rename to android-app-core/res/drawable-mdpi/icon.png
diff --git a/calculatorpp/res/drawable-mdpi/icon_onscreen.png b/android-app-core/res/drawable-mdpi/icon_onscreen.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/icon_onscreen.png
rename to android-app-core/res/drawable-mdpi/icon_onscreen.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_copy.png b/android-app-core/res/drawable-mdpi/kb_copy.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_copy.png
rename to android-app-core/res/drawable-mdpi/kb_copy.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_delete.png b/android-app-core/res/drawable-mdpi/kb_delete.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_delete.png
rename to android-app-core/res/drawable-mdpi/kb_delete.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_facebook.png b/android-app-core/res/drawable-mdpi/kb_facebook.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_facebook.png
rename to android-app-core/res/drawable-mdpi/kb_facebook.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_heart.png b/android-app-core/res/drawable-mdpi/kb_heart.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_heart.png
rename to android-app-core/res/drawable-mdpi/kb_heart.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_logo.png b/android-app-core/res/drawable-mdpi/kb_logo.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_logo.png
rename to android-app-core/res/drawable-mdpi/kb_logo.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_paste.png b/android-app-core/res/drawable-mdpi/kb_paste.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_paste.png
rename to android-app-core/res/drawable-mdpi/kb_paste.png
diff --git a/calculatorpp/res/drawable-mdpi/kb_settings.png b/android-app-core/res/drawable-mdpi/kb_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/kb_settings.png
rename to android-app-core/res/drawable-mdpi/kb_settings.png
diff --git a/calculatorpp/res/drawable-mdpi/logo.png b/android-app-core/res/drawable-mdpi/logo.png
similarity index 100%
rename from calculatorpp/res/drawable-mdpi/logo.png
rename to android-app-core/res/drawable-mdpi/logo.png
diff --git a/calculatorpp/res/drawable-nodpi/cpp_onscreen_button_close.png b/android-app-core/res/drawable-nodpi/cpp_onscreen_button_close.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/cpp_onscreen_button_close.png
rename to android-app-core/res/drawable-nodpi/cpp_onscreen_button_close.png
diff --git a/calculatorpp/res/drawable-nodpi/cpp_onscreen_button_fold.png b/android-app-core/res/drawable-nodpi/cpp_onscreen_button_fold.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/cpp_onscreen_button_fold.png
rename to android-app-core/res/drawable-nodpi/cpp_onscreen_button_fold.png
diff --git a/calculatorpp/res/drawable-nodpi/cpp_onscreen_button_minimize.png b/android-app-core/res/drawable-nodpi/cpp_onscreen_button_minimize.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/cpp_onscreen_button_minimize.png
rename to android-app-core/res/drawable-nodpi/cpp_onscreen_button_minimize.png
diff --git a/calculatorpp/res/drawable-nodpi/cpp_onscreen_header_logo.png b/android-app-core/res/drawable-nodpi/cpp_onscreen_header_logo.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/cpp_onscreen_header_logo.png
rename to android-app-core/res/drawable-nodpi/cpp_onscreen_header_logo.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png b/android-app-core/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png
rename to android-app-core/res/drawable-nodpi/default_abs__ab_transparent_dark_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png b/android-app-core/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png
rename to android-app-core/res/drawable-nodpi/default_abs__btn_cab_done_default_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png b/android-app-core/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png
rename to android-app-core/res/drawable-nodpi/default_abs__btn_cab_done_focused_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png b/android-app-core/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png
rename to android-app-core/res/drawable-nodpi/default_abs__btn_cab_done_pressed_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__list_focused_holo.9.png b/android-app-core/res/drawable-nodpi/default_abs__list_focused_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__list_focused_holo.9.png
rename to android-app-core/res/drawable-nodpi/default_abs__list_focused_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png b/android-app-core/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png
rename to android-app-core/res/drawable-nodpi/default_abs__list_longpressed_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png b/android-app-core/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png
rename to android-app-core/res/drawable-nodpi/default_abs__list_pressed_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png b/android-app-core/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png
rename to android-app-core/res/drawable-nodpi/default_abs__spinner_ab_focused_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png b/android-app-core/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png
rename to android-app-core/res/drawable-nodpi/default_abs__spinner_ab_pressed_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png b/android-app-core/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png
rename to android-app-core/res/drawable-nodpi/default_abs__tab_selected_focused_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__tab_selected_holo.9.png b/android-app-core/res/drawable-nodpi/default_abs__tab_selected_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__tab_selected_holo.9.png
rename to android-app-core/res/drawable-nodpi/default_abs__tab_selected_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png b/android-app-core/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png
rename to android-app-core/res/drawable-nodpi/default_abs__tab_selected_pressed_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png b/android-app-core/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png
rename to android-app-core/res/drawable-nodpi/default_abs__tab_unselected_pressed_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png b/android-app-core/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png
rename to android-app-core/res/drawable-nodpi/metro_blue_abs__ab_transparent_dark_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png b/android-app-core/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png
rename to android-app-core/res/drawable-nodpi/metro_blue_abs__list_focused_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png b/android-app-core/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png
rename to android-app-core/res/drawable-nodpi/metro_blue_abs__list_pressed_holo_dark.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png b/android-app-core/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png
rename to android-app-core/res/drawable-nodpi/metro_blue_abs__tab_selected_focused_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png b/android-app-core/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png
rename to android-app-core/res/drawable-nodpi/metro_blue_abs__tab_selected_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png b/android-app-core/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png
rename to android-app-core/res/drawable-nodpi/metro_blue_abs__tab_selected_pressed_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png b/android-app-core/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png
rename to android-app-core/res/drawable-nodpi/metro_blue_abs__tab_unselected_pressed_holo.9.png
diff --git a/calculatorpp/res/drawable-nodpi/widget_preview.png b/android-app-core/res/drawable-nodpi/widget_preview.png
similarity index 100%
rename from calculatorpp/res/drawable-nodpi/widget_preview.png
rename to android-app-core/res/drawable-nodpi/widget_preview.png
diff --git a/calculatorpp/res/drawable-xhdpi/ab_add.png b/android-app-core/res/drawable-xhdpi/ab_add.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/ab_add.png
rename to android-app-core/res/drawable-xhdpi/ab_add.png
diff --git a/calculatorpp/res/drawable-xhdpi/ab_icon.png b/android-app-core/res/drawable-xhdpi/ab_icon.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/ab_icon.png
rename to android-app-core/res/drawable-xhdpi/ab_icon.png
diff --git a/calculatorpp/res/drawable-xhdpi/ab_settings.png b/android-app-core/res/drawable-xhdpi/ab_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/ab_settings.png
rename to android-app-core/res/drawable-xhdpi/ab_settings.png
diff --git a/calculatorpp/res/drawable-xhdpi/ic_menu_preferences.png b/android-app-core/res/drawable-xhdpi/ic_menu_preferences.png
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/ic_menu_preferences.png
rename to android-app-core/res/drawable-xhdpi/ic_menu_preferences.png
diff --git a/calculatorpp/res/drawable-xhdpi/icon.png b/android-app-core/res/drawable-xhdpi/icon.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/icon.png
rename to android-app-core/res/drawable-xhdpi/icon.png
diff --git a/calculatorpp/res/drawable-xhdpi/icon_onscreen.png b/android-app-core/res/drawable-xhdpi/icon_onscreen.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/icon_onscreen.png
rename to android-app-core/res/drawable-xhdpi/icon_onscreen.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_copy.png b/android-app-core/res/drawable-xhdpi/kb_copy.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_copy.png
rename to android-app-core/res/drawable-xhdpi/kb_copy.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_delete.png b/android-app-core/res/drawable-xhdpi/kb_delete.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_delete.png
rename to android-app-core/res/drawable-xhdpi/kb_delete.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_facebook.png b/android-app-core/res/drawable-xhdpi/kb_facebook.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_facebook.png
rename to android-app-core/res/drawable-xhdpi/kb_facebook.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_heart.png b/android-app-core/res/drawable-xhdpi/kb_heart.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_heart.png
rename to android-app-core/res/drawable-xhdpi/kb_heart.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_logo.png b/android-app-core/res/drawable-xhdpi/kb_logo.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_logo.png
rename to android-app-core/res/drawable-xhdpi/kb_logo.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_paste.png b/android-app-core/res/drawable-xhdpi/kb_paste.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_paste.png
rename to android-app-core/res/drawable-xhdpi/kb_paste.png
diff --git a/calculatorpp/res/drawable-xhdpi/kb_settings.png b/android-app-core/res/drawable-xhdpi/kb_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/kb_settings.png
rename to android-app-core/res/drawable-xhdpi/kb_settings.png
diff --git a/calculatorpp/res/drawable-xhdpi/logo.png b/android-app-core/res/drawable-xhdpi/logo.png
similarity index 100%
rename from calculatorpp/res/drawable-xhdpi/logo.png
rename to android-app-core/res/drawable-xhdpi/logo.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_copy.png b/android-app-core/res/drawable-xlarge-hdpi/kb_copy.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_copy.png
rename to android-app-core/res/drawable-xlarge-hdpi/kb_copy.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_delete.png b/android-app-core/res/drawable-xlarge-hdpi/kb_delete.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_delete.png
rename to android-app-core/res/drawable-xlarge-hdpi/kb_delete.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_facebook.png b/android-app-core/res/drawable-xlarge-hdpi/kb_facebook.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_facebook.png
rename to android-app-core/res/drawable-xlarge-hdpi/kb_facebook.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_heart.png b/android-app-core/res/drawable-xlarge-hdpi/kb_heart.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_heart.png
rename to android-app-core/res/drawable-xlarge-hdpi/kb_heart.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_logo.png b/android-app-core/res/drawable-xlarge-hdpi/kb_logo.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_logo.png
rename to android-app-core/res/drawable-xlarge-hdpi/kb_logo.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_paste.png b/android-app-core/res/drawable-xlarge-hdpi/kb_paste.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_paste.png
rename to android-app-core/res/drawable-xlarge-hdpi/kb_paste.png
diff --git a/calculatorpp/res/drawable-xlarge-hdpi/kb_settings.png b/android-app-core/res/drawable-xlarge-hdpi/kb_settings.png
similarity index 100%
rename from calculatorpp/res/drawable-xlarge-hdpi/kb_settings.png
rename to android-app-core/res/drawable-xlarge-hdpi/kb_settings.png
diff --git a/calculatorpp/res/drawable/blue_button.xml b/android-app-core/res/drawable/blue_button.xml
similarity index 100%
rename from calculatorpp/res/drawable/blue_button.xml
rename to android-app-core/res/drawable/blue_button.xml
diff --git a/calculatorpp/res/drawable/blue_button_dark.xml b/android-app-core/res/drawable/blue_button_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/blue_button_dark.xml
rename to android-app-core/res/drawable/blue_button_dark.xml
diff --git a/calculatorpp/res/drawable/blue_button_dark_shape.xml b/android-app-core/res/drawable/blue_button_dark_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/blue_button_dark_shape.xml
rename to android-app-core/res/drawable/blue_button_dark_shape.xml
diff --git a/calculatorpp/res/drawable/blue_button_shape.xml b/android-app-core/res/drawable/blue_button_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/blue_button_shape.xml
rename to android-app-core/res/drawable/blue_button_shape.xml
diff --git a/calculatorpp/res/drawable/default_abs__btn_cab_done_holo_dark.xml b/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/default_abs__btn_cab_done_holo_dark.xml
rename to android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml
diff --git a/calculatorpp/res/drawable/default_abs__item_background_holo_dark.xml b/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/default_abs__item_background_holo_dark.xml
rename to android-app-core/res/drawable/default_abs__item_background_holo_dark.xml
diff --git a/calculatorpp/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml b/android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
rename to android-app-core/res/drawable/default_abs__list_selector_background_transition_holo_dark.xml
diff --git a/calculatorpp/res/drawable/default_abs__list_selector_holo_dark.xml b/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/default_abs__list_selector_holo_dark.xml
rename to android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml
diff --git a/calculatorpp/res/drawable/default_abs__spinner_ab_holo_dark.xml b/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/default_abs__spinner_ab_holo_dark.xml
rename to android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml
diff --git a/calculatorpp/res/drawable/default_abs__tab_indicator_ab_holo.xml b/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml
similarity index 100%
rename from calculatorpp/res/drawable/default_abs__tab_indicator_ab_holo.xml
rename to android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml
diff --git a/calculatorpp/res/drawable/gray_button.xml b/android-app-core/res/drawable/gray_button.xml
similarity index 100%
rename from calculatorpp/res/drawable/gray_button.xml
rename to android-app-core/res/drawable/gray_button.xml
diff --git a/calculatorpp/res/drawable/gray_button_dark.xml b/android-app-core/res/drawable/gray_button_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/gray_button_dark.xml
rename to android-app-core/res/drawable/gray_button_dark.xml
diff --git a/calculatorpp/res/drawable/gray_button_dark_shape.xml b/android-app-core/res/drawable/gray_button_dark_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/gray_button_dark_shape.xml
rename to android-app-core/res/drawable/gray_button_dark_shape.xml
diff --git a/calculatorpp/res/drawable/gray_button_shape.xml b/android-app-core/res/drawable/gray_button_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/gray_button_shape.xml
rename to android-app-core/res/drawable/gray_button_shape.xml
diff --git a/calculatorpp/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml b/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
rename to android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml
diff --git a/calculatorpp/res/drawable/metro_blue_button.xml b/android-app-core/res/drawable/metro_blue_button.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_blue_button.xml
rename to android-app-core/res/drawable/metro_blue_button.xml
diff --git a/calculatorpp/res/drawable/metro_blue_button_shape.xml b/android-app-core/res/drawable/metro_blue_button_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_blue_button_shape.xml
rename to android-app-core/res/drawable/metro_blue_button_shape.xml
diff --git a/calculatorpp/res/drawable/metro_blue_list_item.xml b/android-app-core/res/drawable/metro_blue_list_item.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_blue_list_item.xml
rename to android-app-core/res/drawable/metro_blue_list_item.xml
diff --git a/calculatorpp/res/drawable/metro_button_dark.xml b/android-app-core/res/drawable/metro_button_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_dark.xml
rename to android-app-core/res/drawable/metro_button_dark.xml
diff --git a/calculatorpp/res/drawable/metro_button_dark_shape.xml b/android-app-core/res/drawable/metro_button_dark_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_dark_shape.xml
rename to android-app-core/res/drawable/metro_button_dark_shape.xml
diff --git a/calculatorpp/res/drawable/metro_button_green.xml b/android-app-core/res/drawable/metro_button_green.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_green.xml
rename to android-app-core/res/drawable/metro_button_green.xml
diff --git a/calculatorpp/res/drawable/metro_button_green_shape.xml b/android-app-core/res/drawable/metro_button_green_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_green_shape.xml
rename to android-app-core/res/drawable/metro_button_green_shape.xml
diff --git a/calculatorpp/res/drawable/metro_button_light.xml b/android-app-core/res/drawable/metro_button_light.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_light.xml
rename to android-app-core/res/drawable/metro_button_light.xml
diff --git a/calculatorpp/res/drawable/metro_button_light_shape.xml b/android-app-core/res/drawable/metro_button_light_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_light_shape.xml
rename to android-app-core/res/drawable/metro_button_light_shape.xml
diff --git a/calculatorpp/res/drawable/metro_button_pressed.xml b/android-app-core/res/drawable/metro_button_pressed.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_pressed.xml
rename to android-app-core/res/drawable/metro_button_pressed.xml
diff --git a/calculatorpp/res/drawable/metro_button_purple.xml b/android-app-core/res/drawable/metro_button_purple.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_purple.xml
rename to android-app-core/res/drawable/metro_button_purple.xml
diff --git a/calculatorpp/res/drawable/metro_button_purple_shape.xml b/android-app-core/res/drawable/metro_button_purple_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_button_purple_shape.xml
rename to android-app-core/res/drawable/metro_button_purple_shape.xml
diff --git a/calculatorpp/res/drawable/metro_green_list_item.xml b/android-app-core/res/drawable/metro_green_list_item.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_green_list_item.xml
rename to android-app-core/res/drawable/metro_green_list_item.xml
diff --git a/calculatorpp/res/drawable/metro_purple_list_item.xml b/android-app-core/res/drawable/metro_purple_list_item.xml
similarity index 100%
rename from calculatorpp/res/drawable/metro_purple_list_item.xml
rename to android-app-core/res/drawable/metro_purple_list_item.xml
diff --git a/calculatorpp/res/drawable/pane_background.xml b/android-app-core/res/drawable/pane_background.xml
similarity index 100%
rename from calculatorpp/res/drawable/pane_background.xml
rename to android-app-core/res/drawable/pane_background.xml
diff --git a/calculatorpp/res/drawable/violet_button.xml b/android-app-core/res/drawable/violet_button.xml
similarity index 100%
rename from calculatorpp/res/drawable/violet_button.xml
rename to android-app-core/res/drawable/violet_button.xml
diff --git a/calculatorpp/res/drawable/violet_button_dark.xml b/android-app-core/res/drawable/violet_button_dark.xml
similarity index 100%
rename from calculatorpp/res/drawable/violet_button_dark.xml
rename to android-app-core/res/drawable/violet_button_dark.xml
diff --git a/calculatorpp/res/drawable/violet_button_dark_shape.xml b/android-app-core/res/drawable/violet_button_dark_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/violet_button_dark_shape.xml
rename to android-app-core/res/drawable/violet_button_dark_shape.xml
diff --git a/calculatorpp/res/drawable/violet_button_shape.xml b/android-app-core/res/drawable/violet_button_shape.xml
similarity index 100%
rename from calculatorpp/res/drawable/violet_button_shape.xml
rename to android-app-core/res/drawable/violet_button_shape.xml
diff --git a/calculatorpp/res/layout/widget_zero_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_0.xml
similarity index 76%
rename from calculatorpp/res/layout/widget_zero_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_button_0.xml
index 0c9aca96..37867e1f 100644
--- a/calculatorpp/res/layout/widget_zero_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_0.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_one_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_1.xml
similarity index 76%
rename from calculatorpp/res/layout/widget_one_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_button_1.xml
index 93e2c106..9341718d 100644
--- a/calculatorpp/res/layout/widget_one_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_1.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_two_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_2.xml
similarity index 76%
rename from calculatorpp/res/layout/widget_two_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_button_2.xml
index bca333fd..eb884305 100644
--- a/calculatorpp/res/layout/widget_two_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_2.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_three_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_3.xml
similarity index 76%
rename from calculatorpp/res/layout/widget_three_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_button_3.xml
index 8138087c..357a13f2 100644
--- a/calculatorpp/res/layout/widget_three_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_3.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_four_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_4.xml
similarity index 76%
rename from calculatorpp/res/layout/widget_four_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_button_4.xml
index 560acbd4..a9e711a3 100644
--- a/calculatorpp/res/layout/widget_four_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_4.xml
@@ -6,6 +6,6 @@
~ or visit http://se.solovyev.org
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_five_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_5.xml
similarity index 76%
rename from calculatorpp/res/layout/widget_five_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_button_5.xml
index 51a7691d..f7f9dae8 100644
--- a/calculatorpp/res/layout/widget_five_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_5.xml
@@ -6,6 +6,6 @@
~ or visit http://se.solovyev.org
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_six_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_6.xml
similarity index 76%
rename from calculatorpp/res/layout/widget_six_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_button_6.xml
index e018f4c6..63d57149 100644
--- a/calculatorpp/res/layout/widget_six_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_6.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_seven_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_7.xml
similarity index 56%
rename from calculatorpp/res/layout/widget_seven_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_button_7.xml
index 3cb5ffaa..3ef824aa 100644
--- a/calculatorpp/res/layout/widget_seven_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_7.xml
@@ -1,6 +1,6 @@
\ No newline at end of file
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_eight_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_8.xml
similarity index 76%
rename from calculatorpp/res/layout/widget_eight_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_button_8.xml
index c592c842..aa79844d 100644
--- a/calculatorpp/res/layout/widget_eight_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_8.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_nine_digit_button.xml b/android-app-core/res/layout/cpp_simple_button_9.xml
similarity index 76%
rename from calculatorpp/res/layout/widget_nine_digit_button.xml
rename to android-app-core/res/layout/cpp_simple_button_9.xml
index a66e30de..b01ac228 100644
--- a/calculatorpp/res/layout/widget_nine_digit_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_9.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_app_button.xml b/android-app-core/res/layout/cpp_simple_button_app.xml
similarity index 77%
rename from calculatorpp/res/layout/widget_app_button.xml
rename to android-app-core/res/layout/cpp_simple_button_app.xml
index 1149f1e2..2e5baf72 100644
--- a/calculatorpp/res/layout/widget_app_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_app.xml
@@ -7,7 +7,7 @@
-->
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_clear_button.xml b/android-app-core/res/layout/cpp_simple_button_clear.xml
similarity index 77%
rename from calculatorpp/res/layout/widget_clear_button.xml
rename to android-app-core/res/layout/cpp_simple_button_clear.xml
index 8715b738..fceee51b 100644
--- a/calculatorpp/res/layout/widget_clear_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_clear.xml
@@ -7,7 +7,7 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_copy_button.xml b/android-app-core/res/layout/cpp_simple_button_copy.xml
similarity index 77%
rename from calculatorpp/res/layout/widget_copy_button.xml
rename to android-app-core/res/layout/cpp_simple_button_copy.xml
index eac06ff0..665276f2 100644
--- a/calculatorpp/res/layout/widget_copy_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_copy.xml
@@ -7,7 +7,7 @@
-->
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_division_button.xml b/android-app-core/res/layout/cpp_simple_button_division.xml
similarity index 73%
rename from calculatorpp/res/layout/widget_division_button.xml
rename to android-app-core/res/layout/cpp_simple_button_division.xml
index 1a99c28b..516c224e 100644
--- a/calculatorpp/res/layout/widget_division_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_division.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_dot_button.xml b/android-app-core/res/layout/cpp_simple_button_dot.xml
similarity index 90%
rename from calculatorpp/res/layout/widget_dot_button.xml
rename to android-app-core/res/layout/cpp_simple_button_dot.xml
index 416fbefa..2607694e 100644
--- a/calculatorpp/res/layout/widget_dot_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_dot.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_equals_button.xml b/android-app-core/res/layout/cpp_simple_button_equals.xml
similarity index 75%
rename from calculatorpp/res/layout/widget_equals_button.xml
rename to android-app-core/res/layout/cpp_simple_button_equals.xml
index c07b0070..039d3321 100644
--- a/calculatorpp/res/layout/widget_equals_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_equals.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_erase_button.xml b/android-app-core/res/layout/cpp_simple_button_erase.xml
similarity index 77%
rename from calculatorpp/res/layout/widget_erase_button.xml
rename to android-app-core/res/layout/cpp_simple_button_erase.xml
index edd42f61..389e6169 100644
--- a/calculatorpp/res/layout/widget_erase_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_erase.xml
@@ -7,7 +7,7 @@
-->
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_functions_button.xml b/android-app-core/res/layout/cpp_simple_button_functions.xml
similarity index 76%
rename from calculatorpp/res/layout/widget_functions_button.xml
rename to android-app-core/res/layout/cpp_simple_button_functions.xml
index 1a240018..bb441593 100644
--- a/calculatorpp/res/layout/widget_functions_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_functions.xml
@@ -7,7 +7,7 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_history_button.xml b/android-app-core/res/layout/cpp_simple_button_history.xml
similarity index 77%
rename from calculatorpp/res/layout/widget_history_button.xml
rename to android-app-core/res/layout/cpp_simple_button_history.xml
index 51338209..7ba3c30f 100644
--- a/calculatorpp/res/layout/widget_history_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_history.xml
@@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org
-->
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_left_button.xml b/android-app-core/res/layout/cpp_simple_button_left.xml
similarity index 75%
rename from calculatorpp/res/layout/widget_left_button.xml
rename to android-app-core/res/layout/cpp_simple_button_left.xml
index f5dd952f..2f8c37a7 100644
--- a/calculatorpp/res/layout/widget_left_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_left.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_like_button.xml b/android-app-core/res/layout/cpp_simple_button_like.xml
similarity index 77%
rename from calculatorpp/res/layout/widget_like_button.xml
rename to android-app-core/res/layout/cpp_simple_button_like.xml
index f7432a99..9d3eef7c 100644
--- a/calculatorpp/res/layout/widget_like_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_like.xml
@@ -7,7 +7,7 @@
-->
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_multiplication_button.xml b/android-app-core/res/layout/cpp_simple_button_multiplication.xml
similarity index 72%
rename from calculatorpp/res/layout/widget_multiplication_button.xml
rename to android-app-core/res/layout/cpp_simple_button_multiplication.xml
index 736c3961..719decf3 100644
--- a/calculatorpp/res/layout/widget_multiplication_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_multiplication.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_paste_button.xml b/android-app-core/res/layout/cpp_simple_button_paste.xml
similarity index 77%
rename from calculatorpp/res/layout/widget_paste_button.xml
rename to android-app-core/res/layout/cpp_simple_button_paste.xml
index 1512e5f9..b9695e12 100644
--- a/calculatorpp/res/layout/widget_paste_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_paste.xml
@@ -7,7 +7,7 @@
-->
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_percent_button.xml b/android-app-core/res/layout/cpp_simple_button_percent.xml
similarity index 73%
rename from calculatorpp/res/layout/widget_percent_button.xml
rename to android-app-core/res/layout/cpp_simple_button_percent.xml
index 8d6c30ad..b98f7063 100644
--- a/calculatorpp/res/layout/widget_percent_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_percent.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_plus_button.xml b/android-app-core/res/layout/cpp_simple_button_plus.xml
similarity index 73%
rename from calculatorpp/res/layout/widget_plus_button.xml
rename to android-app-core/res/layout/cpp_simple_button_plus.xml
index e3b32fc1..0c10bb7b 100644
--- a/calculatorpp/res/layout/widget_plus_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_plus.xml
@@ -6,6 +6,6 @@
~ or visit http://se.solovyev.org
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_power_button.xml b/android-app-core/res/layout/cpp_simple_button_power.xml
similarity index 73%
rename from calculatorpp/res/layout/widget_power_button.xml
rename to android-app-core/res/layout/cpp_simple_button_power.xml
index 8c481de9..f6a5f95b 100644
--- a/calculatorpp/res/layout/widget_power_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_power.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_right_button.xml b/android-app-core/res/layout/cpp_simple_button_right.xml
similarity index 75%
rename from calculatorpp/res/layout/widget_right_button.xml
rename to android-app-core/res/layout/cpp_simple_button_right.xml
index e7a5df07..bc24d176 100644
--- a/calculatorpp/res/layout/widget_right_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_right.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_round_brackets_button.xml b/android-app-core/res/layout/cpp_simple_button_round_brackets.xml
similarity index 73%
rename from calculatorpp/res/layout/widget_round_brackets_button.xml
rename to android-app-core/res/layout/cpp_simple_button_round_brackets.xml
index 02a67454..9833ee95 100644
--- a/calculatorpp/res/layout/widget_round_brackets_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_round_brackets.xml
@@ -7,6 +7,6 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_settings_button.xml b/android-app-core/res/layout/cpp_simple_button_settings.xml
similarity index 77%
rename from calculatorpp/res/layout/widget_settings_button.xml
rename to android-app-core/res/layout/cpp_simple_button_settings.xml
index 86f316cf..f4c13728 100644
--- a/calculatorpp/res/layout/widget_settings_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_settings.xml
@@ -7,7 +7,7 @@
-->
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_subtraction_button.xml b/android-app-core/res/layout/cpp_simple_button_subtraction.xml
similarity index 72%
rename from calculatorpp/res/layout/widget_subtraction_button.xml
rename to android-app-core/res/layout/cpp_simple_button_subtraction.xml
index 21fee994..78a9d36f 100644
--- a/calculatorpp/res/layout/widget_subtraction_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_subtraction.xml
@@ -6,6 +6,6 @@
~ or visit http://se.solovyev.org
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_vars_button.xml b/android-app-core/res/layout/cpp_simple_button_vars.xml
similarity index 77%
rename from calculatorpp/res/layout/widget_vars_button.xml
rename to android-app-core/res/layout/cpp_simple_button_vars.xml
index 2ba91c0c..0bea581e 100644
--- a/calculatorpp/res/layout/widget_vars_button.xml
+++ b/android-app-core/res/layout/cpp_simple_button_vars.xml
@@ -7,7 +7,7 @@
-->
\ No newline at end of file
+ style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_keyboard.xml b/android-app-core/res/layout/cpp_simple_keyboard.xml
new file mode 100644
index 00000000..d5b0ee28
--- /dev/null
+++ b/android-app-core/res/layout/cpp_simple_keyboard.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/calculatorpp/res/layout/unit_converter.xml b/android-app-core/res/layout/cpp_unit_converter.xml
similarity index 100%
rename from calculatorpp/res/layout/unit_converter.xml
rename to android-app-core/res/layout/cpp_unit_converter.xml
diff --git a/android-app-core/res/layout/main_calculator.xml b/android-app-core/res/layout/main_calculator.xml
new file mode 100644
index 00000000..db7c950f
--- /dev/null
+++ b/android-app-core/res/layout/main_calculator.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/android-app-core/res/layout/main_calculator_mobile.xml b/android-app-core/res/layout/main_calculator_mobile.xml
new file mode 100644
index 00000000..db7c950f
--- /dev/null
+++ b/android-app-core/res/layout/main_calculator_mobile.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/calculatorpp/res/values-es/text_about.xml b/android-app-core/res/values-es/text_about.xml
similarity index 100%
rename from calculatorpp/res/values-es/text_about.xml
rename to android-app-core/res/values-es/text_about.xml
diff --git a/calculatorpp/res/values-es/text_functions.xml b/android-app-core/res/values-es/text_functions.xml
similarity index 100%
rename from calculatorpp/res/values-es/text_functions.xml
rename to android-app-core/res/values-es/text_functions.xml
diff --git a/calculatorpp/res/values-es/text_help.xml b/android-app-core/res/values-es/text_help.xml
similarity index 100%
rename from calculatorpp/res/values-es/text_help.xml
rename to android-app-core/res/values-es/text_help.xml
diff --git a/calculatorpp/res/values-es/text_operators.xml b/android-app-core/res/values-es/text_operators.xml
similarity index 100%
rename from calculatorpp/res/values-es/text_operators.xml
rename to android-app-core/res/values-es/text_operators.xml
diff --git a/calculatorpp/res/values-es/text_strings.xml b/android-app-core/res/values-es/text_strings.xml
similarity index 100%
rename from calculatorpp/res/values-es/text_strings.xml
rename to android-app-core/res/values-es/text_strings.xml
diff --git a/calculatorpp/res/values-es/text_vars.xml b/android-app-core/res/values-es/text_vars.xml
similarity index 100%
rename from calculatorpp/res/values-es/text_vars.xml
rename to android-app-core/res/values-es/text_vars.xml
diff --git a/calculatorpp/res/values-it/text_about.xml b/android-app-core/res/values-it/text_about.xml
similarity index 100%
rename from calculatorpp/res/values-it/text_about.xml
rename to android-app-core/res/values-it/text_about.xml
diff --git a/calculatorpp/res/values-it/text_functions.xml b/android-app-core/res/values-it/text_functions.xml
similarity index 100%
rename from calculatorpp/res/values-it/text_functions.xml
rename to android-app-core/res/values-it/text_functions.xml
diff --git a/calculatorpp/res/values-it/text_help.xml b/android-app-core/res/values-it/text_help.xml
similarity index 100%
rename from calculatorpp/res/values-it/text_help.xml
rename to android-app-core/res/values-it/text_help.xml
diff --git a/calculatorpp/res/values-it/text_operators.xml b/android-app-core/res/values-it/text_operators.xml
similarity index 100%
rename from calculatorpp/res/values-it/text_operators.xml
rename to android-app-core/res/values-it/text_operators.xml
diff --git a/calculatorpp/res/values-it/text_strings.xml b/android-app-core/res/values-it/text_strings.xml
similarity index 100%
rename from calculatorpp/res/values-it/text_strings.xml
rename to android-app-core/res/values-it/text_strings.xml
diff --git a/calculatorpp/res/values-it/text_vars.xml b/android-app-core/res/values-it/text_vars.xml
similarity index 100%
rename from calculatorpp/res/values-it/text_vars.xml
rename to android-app-core/res/values-it/text_vars.xml
diff --git a/calculatorpp/res/values-ru/text_about.xml b/android-app-core/res/values-ru/text_about.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_about.xml
rename to android-app-core/res/values-ru/text_about.xml
diff --git a/calculatorpp/res/values-ru/text_functions.xml b/android-app-core/res/values-ru/text_functions.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_functions.xml
rename to android-app-core/res/values-ru/text_functions.xml
diff --git a/calculatorpp/res/values-ru/text_help.xml b/android-app-core/res/values-ru/text_help.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_help.xml
rename to android-app-core/res/values-ru/text_help.xml
diff --git a/calculatorpp/res/values-ru/text_operators.xml b/android-app-core/res/values-ru/text_operators.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_operators.xml
rename to android-app-core/res/values-ru/text_operators.xml
diff --git a/calculatorpp/res/values-ru/text_preferences.xml b/android-app-core/res/values-ru/text_preferences.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_preferences.xml
rename to android-app-core/res/values-ru/text_preferences.xml
diff --git a/calculatorpp/res/values-ru/text_strings.xml b/android-app-core/res/values-ru/text_strings.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_strings.xml
rename to android-app-core/res/values-ru/text_strings.xml
diff --git a/calculatorpp/res/values-ru/text_vars.xml b/android-app-core/res/values-ru/text_vars.xml
similarity index 100%
rename from calculatorpp/res/values-ru/text_vars.xml
rename to android-app-core/res/values-ru/text_vars.xml
diff --git a/calculatorpp/res/values-uk/text_about.xml b/android-app-core/res/values-uk/text_about.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_about.xml
rename to android-app-core/res/values-uk/text_about.xml
diff --git a/calculatorpp/res/values-uk/text_functions.xml b/android-app-core/res/values-uk/text_functions.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_functions.xml
rename to android-app-core/res/values-uk/text_functions.xml
diff --git a/calculatorpp/res/values-uk/text_help.xml b/android-app-core/res/values-uk/text_help.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_help.xml
rename to android-app-core/res/values-uk/text_help.xml
diff --git a/calculatorpp/res/values-uk/text_operators.xml b/android-app-core/res/values-uk/text_operators.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_operators.xml
rename to android-app-core/res/values-uk/text_operators.xml
diff --git a/calculatorpp/res/values-uk/text_preferences.xml b/android-app-core/res/values-uk/text_preferences.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_preferences.xml
rename to android-app-core/res/values-uk/text_preferences.xml
diff --git a/calculatorpp/res/values-uk/text_strings.xml b/android-app-core/res/values-uk/text_strings.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_strings.xml
rename to android-app-core/res/values-uk/text_strings.xml
diff --git a/calculatorpp/res/values-uk/text_vars.xml b/android-app-core/res/values-uk/text_vars.xml
similarity index 100%
rename from calculatorpp/res/values-uk/text_vars.xml
rename to android-app-core/res/values-uk/text_vars.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_about.xml b/android-app-core/res/values-zh-rtw/text_about.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_about.xml
rename to android-app-core/res/values-zh-rtw/text_about.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_functions.xml b/android-app-core/res/values-zh-rtw/text_functions.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_functions.xml
rename to android-app-core/res/values-zh-rtw/text_functions.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_help.xml b/android-app-core/res/values-zh-rtw/text_help.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_help.xml
rename to android-app-core/res/values-zh-rtw/text_help.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_operators.xml b/android-app-core/res/values-zh-rtw/text_operators.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_operators.xml
rename to android-app-core/res/values-zh-rtw/text_operators.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_preferences.xml b/android-app-core/res/values-zh-rtw/text_preferences.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_preferences.xml
rename to android-app-core/res/values-zh-rtw/text_preferences.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_strings.xml b/android-app-core/res/values-zh-rtw/text_strings.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_strings.xml
rename to android-app-core/res/values-zh-rtw/text_strings.xml
diff --git a/calculatorpp/res/values-zh-rtw/text_vars.xml b/android-app-core/res/values-zh-rtw/text_vars.xml
similarity index 100%
rename from calculatorpp/res/values-zh-rtw/text_vars.xml
rename to android-app-core/res/values-zh-rtw/text_vars.xml
diff --git a/calculatorpp/res/values/attributes.xml b/android-app-core/res/values/attributes.xml
similarity index 100%
rename from calculatorpp/res/values/attributes.xml
rename to android-app-core/res/values/attributes.xml
diff --git a/android-app-core/res/values/colors.xml b/android-app-core/res/values/colors.xml
new file mode 100644
index 00000000..41d417dc
--- /dev/null
+++ b/android-app-core/res/values/colors.xml
@@ -0,0 +1,16 @@
+
+
+ #ffffffff
+ #ff393939
+ #ffffffff
+ #ffffff99
+ #ffffffff
+ #ffffff99
+ #ff000000
+ #ff1f1f1f
+ #ff1f1f1f
+ #10648c
+ #088e3a
+ #651456
+ #393939
+
\ No newline at end of file
diff --git a/calculatorpp/res/values/dimens.xml b/android-app-core/res/values/dimens.xml
similarity index 88%
rename from calculatorpp/res/values/dimens.xml
rename to android-app-core/res/values/dimens.xml
index c35ce931..d5674683 100644
--- a/calculatorpp/res/values/dimens.xml
+++ b/android-app-core/res/values/dimens.xml
@@ -20,15 +20,12 @@
20sp
15sp
- 25sp
- 20dp
- 25sp
- 6dp
-
20sp
10dp
5dp
3dp
+
+ 20dp
\ No newline at end of file
diff --git a/android-app-core/res/values/ids.xml b/android-app-core/res/values/ids.xml
new file mode 100644
index 00000000..c44a23fe
--- /dev/null
+++ b/android-app-core/res/values/ids.xml
@@ -0,0 +1,37 @@
+
+
+ - @dimen/cpp_display_text_size
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/calculatorpp/res/values/text_about.xml b/android-app-core/res/values/text_about.xml
similarity index 100%
rename from calculatorpp/res/values/text_about.xml
rename to android-app-core/res/values/text_about.xml
diff --git a/calculatorpp/res/values/text_functions.xml b/android-app-core/res/values/text_functions.xml
similarity index 100%
rename from calculatorpp/res/values/text_functions.xml
rename to android-app-core/res/values/text_functions.xml
diff --git a/calculatorpp/res/values/text_help.xml b/android-app-core/res/values/text_help.xml
similarity index 100%
rename from calculatorpp/res/values/text_help.xml
rename to android-app-core/res/values/text_help.xml
diff --git a/calculatorpp/res/values/text_operators.xml b/android-app-core/res/values/text_operators.xml
similarity index 100%
rename from calculatorpp/res/values/text_operators.xml
rename to android-app-core/res/values/text_operators.xml
diff --git a/calculatorpp/res/values/text_preferences.xml b/android-app-core/res/values/text_preferences.xml
similarity index 100%
rename from calculatorpp/res/values/text_preferences.xml
rename to android-app-core/res/values/text_preferences.xml
diff --git a/calculatorpp/res/values/text_strings.xml b/android-app-core/res/values/text_strings.xml
similarity index 100%
rename from calculatorpp/res/values/text_strings.xml
rename to android-app-core/res/values/text_strings.xml
diff --git a/calculatorpp/res/values/text_vars.xml b/android-app-core/res/values/text_vars.xml
similarity index 100%
rename from calculatorpp/res/values/text_vars.xml
rename to android-app-core/res/values/text_vars.xml
diff --git a/calculatorpp/res/values/theme_gray.xml b/android-app-core/res/values/theme_gray.xml
similarity index 97%
rename from calculatorpp/res/values/theme_gray.xml
rename to android-app-core/res/values/theme_gray.xml
index eefba194..abe02d73 100644
--- a/calculatorpp/res/values/theme_gray.xml
+++ b/android-app-core/res/values/theme_gray.xml
@@ -91,11 +91,6 @@
- 250dp
-
-
-
-
@@ -20,26 +16,15 @@
- @dimen/cpp_onscreen_header_button_text_size
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenBroadcastReceiver.java b/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenBroadcastReceiver.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenBroadcastReceiver.java
rename to android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenBroadcastReceiver.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenService.java b/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenService.java
similarity index 98%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenService.java
rename to android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenService.java
index d37af37f..315793b2 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenService.java
+++ b/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenService.java
@@ -15,7 +15,6 @@ import org.solovyev.android.AndroidUtils;
import org.solovyev.android.calculator.CalculatorDisplayViewState;
import org.solovyev.android.calculator.CalculatorEditorViewState;
import org.solovyev.android.calculator.Locator;
-import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.external.*;
/**
@@ -112,7 +111,7 @@ public class CalculatorOnscreenService extends Service implements ExternalCalcul
@NotNull
private static String getCursorColor(@NotNull Context context) {
if (cursorColor == null) {
- cursorColor = Integer.toHexString(context.getResources().getColor(R.color.cpp_widget_cursor_color)).substring(2);
+ cursorColor = Integer.toHexString(context.getResources().getColor(R.color.cpp_onscreen_cursor_color)).substring(2);
}
return cursorColor;
}
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorOnscreenStartActivity.java b/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenStartActivity.java
similarity index 69%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorOnscreenStartActivity.java
rename to android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenStartActivity.java
index 5b97928e..dbb5e1cf 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorOnscreenStartActivity.java
+++ b/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenStartActivity.java
@@ -1,8 +1,7 @@
-package org.solovyev.android.calculator;
+package org.solovyev.android.calculator.onscreen;
import android.app.Activity;
import android.os.Bundle;
-import org.solovyev.android.calculator.onscreen.CalculatorOnscreenService;
public class CalculatorOnscreenStartActivity extends Activity {
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java b/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java
similarity index 98%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java
rename to android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java
index dd29ca24..8bd0c2e5 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java
+++ b/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenView.java
@@ -10,7 +10,7 @@ import android.widget.ImageView;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.*;
-import org.solovyev.android.calculator.widget.WidgetButton;
+import org.solovyev.android.calculator.CalculatorButton;
/**
* User: serso
@@ -153,14 +153,14 @@ public class CalculatorOnscreenView {
private void init() {
if (!initialized) {
- for (final WidgetButton widgetButton : WidgetButton.values()) {
+ for (final CalculatorButton widgetButton : CalculatorButton.values()) {
final View button = root.findViewById(widgetButton.getButtonId());
if (button != null) {
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
widgetButton.onClick(context);
- if ( widgetButton == WidgetButton.app ) {
+ if ( widgetButton == CalculatorButton.app ) {
minimize();
}
}
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenViewDef.java b/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenViewDef.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenViewDef.java
rename to android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenViewDef.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/OnscreenViewListener.java b/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/OnscreenViewListener.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/onscreen/OnscreenViewListener.java
rename to android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/OnscreenViewListener.java
diff --git a/calculatorpp-test/pom.xml b/android-app-test/pom.xml
similarity index 90%
rename from calculatorpp-test/pom.xml
rename to android-app-test/pom.xml
index a054d398..d34b699a 100644
--- a/calculatorpp-test/pom.xml
+++ b/android-app-test/pom.xml
@@ -10,7 +10,7 @@
4.0.0
org.solovyev.android
- calculatorpp-test
+ calculatorpp-android-app-test
Calculator++ Application (Test)
diff --git a/android-app-widget/AndroidManifest.xml b/android-app-widget/AndroidManifest.xml
new file mode 100644
index 00000000..25df81f1
--- /dev/null
+++ b/android-app-widget/AndroidManifest.xml
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/android-app-widget/pom.xml b/android-app-widget/pom.xml
new file mode 100644
index 00000000..7a66f74e
--- /dev/null
+++ b/android-app-widget/pom.xml
@@ -0,0 +1,56 @@
+
+
+ 4.0.0
+
+
+ org.solovyev.android
+ calculatorpp-parent
+ 1.5.3-SNAPSHOT
+
+
+ org.solovyev.android
+ calculatorpp-android-app-widget
+ 1.5.3-SNAPSHOT
+ Calculator++ Application Widget
+ apklib
+
+
+
+
+ org.solovyev.android
+ calculatorpp-core
+
+
+
+ org.solovyev.android
+ calculatorpp-android-app-core
+ apklib
+
+
+
+ com.google.android
+ android
+ provided
+
+
+
+ com.google.android
+ support-v4
+
+
+
+
+
+
+
+
+ com.jayway.maven.plugins.android.generation2
+ android-maven-plugin
+
+
+
+
+
+
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_display.xml b/android-app-widget/res/layout/widget_display.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_display.xml
rename to android-app-widget/res/layout/widget_display.xml
diff --git a/calculatorpp/res/layout/widget_editor.xml b/android-app-widget/res/layout/widget_editor.xml
similarity index 100%
rename from calculatorpp/res/layout/widget_editor.xml
rename to android-app-widget/res/layout/widget_editor.xml
diff --git a/calculatorpp/res/layout/widget_layout.xml b/android-app-widget/res/layout/widget_layout.xml
similarity index 91%
rename from calculatorpp/res/layout/widget_layout.xml
rename to android-app-widget/res/layout/widget_layout.xml
index 878e298b..e3c782c3 100644
--- a/calculatorpp/res/layout/widget_layout.xml
+++ b/android-app-widget/res/layout/widget_layout.xml
@@ -15,7 +15,7 @@
a:layout_width="match_parent"
a:layout_height="0dp">
-
-
diff --git a/android-app-widget/res/values/colors.xml b/android-app-widget/res/values/colors.xml
new file mode 100644
index 00000000..89429bd7
--- /dev/null
+++ b/android-app-widget/res/values/colors.xml
@@ -0,0 +1,4 @@
+
+
+ #ff707070
+
\ No newline at end of file
diff --git a/android-app-widget/res/values/dimens.xml b/android-app-widget/res/values/dimens.xml
new file mode 100644
index 00000000..3915feed
--- /dev/null
+++ b/android-app-widget/res/values/dimens.xml
@@ -0,0 +1,6 @@
+
+
+ 25sp
+ 25sp
+ 6dp
+
\ No newline at end of file
diff --git a/android-app-widget/res/values/styles.xml b/android-app-widget/res/values/styles.xml
new file mode 100644
index 00000000..95b2a8f0
--- /dev/null
+++ b/android-app-widget/res/values/styles.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
similarity index 94%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
rename to android-app-widget/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
index b0d0a930..9412c797 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
+++ b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
@@ -10,11 +10,7 @@ import android.text.Html;
import android.widget.RemoteViews;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.solovyev.android.calculator.CalculatorButtons;
-import org.solovyev.android.calculator.CalculatorDisplayViewState;
-import org.solovyev.android.calculator.CalculatorEditorViewState;
-import org.solovyev.android.calculator.Locator;
-import org.solovyev.android.calculator.R;
+import org.solovyev.android.calculator.*;
import org.solovyev.android.calculator.external.ExternalCalculatorIntentHandler;
import org.solovyev.android.calculator.external.ExternalCalculatorStateUpdater;
@@ -114,7 +110,7 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider implem
for (int appWidgetId : appWidgetIds) {
final RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_layout);
- for (WidgetButton button : WidgetButton.values()) {
+ for (CalculatorButton button : CalculatorButton.values()) {
final Intent onButtonClickIntent = new Intent(context, getComponentClass());
onButtonClickIntent.setAction(BUTTON_PRESSED_ACTION);
onButtonClickIntent.putExtra(BUTTON_ID_EXTRA, button.getButtonId());
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetConfigurationActivity.java b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetConfigurationActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetConfigurationActivity.java
rename to android-app-widget/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetConfigurationActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetIntentHandler.java b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetIntentHandler.java
similarity index 90%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetIntentHandler.java
rename to android-app-widget/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetIntentHandler.java
index 0d58cbc1..a1a6095d 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetIntentHandler.java
+++ b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetIntentHandler.java
@@ -3,6 +3,7 @@ package org.solovyev.android.calculator.widget;
import android.content.Context;
import android.content.Intent;
import org.jetbrains.annotations.NotNull;
+import org.solovyev.android.calculator.CalculatorButton;
import org.solovyev.android.calculator.Locator;
import org.solovyev.android.calculator.external.DefaultExternalCalculatorIntentHandler;
import org.solovyev.android.calculator.external.ExternalCalculatorStateUpdater;
@@ -25,7 +26,7 @@ public class CalculatorWidgetIntentHandler extends DefaultExternalCalculatorInte
if (AbstractCalculatorWidgetProvider.BUTTON_PRESSED_ACTION.equals(intent.getAction())) {
final int buttonId = intent.getIntExtra(AbstractCalculatorWidgetProvider.BUTTON_ID_EXTRA, 0);
- final WidgetButton button = WidgetButton.getById(buttonId);
+ final CalculatorButton button = CalculatorButton.getById(buttonId);
if (button != null) {
button.onClick(context);
}
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
rename to android-app-widget/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider3x4.java b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider3x4.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider3x4.java
rename to android-app-widget/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider3x4.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x4.java b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x4.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x4.java
rename to android-app-widget/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x4.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x5.java b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x5.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x5.java
rename to android-app-widget/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x5.java
diff --git a/calculatorpp/AndroidManifest.xml b/android-app/AndroidManifest.xml
similarity index 95%
rename from calculatorpp/AndroidManifest.xml
rename to android-app/AndroidManifest.xml
index 94a5de6e..2298ebc1 100644
--- a/calculatorpp/AndroidManifest.xml
+++ b/android-app/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
@@ -21,7 +21,7 @@
-
+
@@ -67,7 +67,7 @@
-
+
diff --git a/calculatorpp/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip b/android-app/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
similarity index 100%
rename from calculatorpp/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
rename to android-app/misc/doc/GoogleAdMobAdsSdk-4.3.1-javadocs.zip
diff --git a/calculatorpp/misc/doc/achartengine-0.7.0-javadocs.zip b/android-app/misc/doc/achartengine-0.7.0-javadocs.zip
similarity index 100%
rename from calculatorpp/misc/doc/achartengine-0.7.0-javadocs.zip
rename to android-app/misc/doc/achartengine-0.7.0-javadocs.zip
diff --git a/calculatorpp/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar b/android-app/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
similarity index 100%
rename from calculatorpp/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
rename to android-app/misc/lib/GoogleAdMobAdsSdk-4.3.1.jar
diff --git a/calculatorpp/misc/lib/achartengine-0.7.0.jar b/android-app/misc/lib/achartengine-0.7.0.jar
similarity index 100%
rename from calculatorpp/misc/lib/achartengine-0.7.0.jar
rename to android-app/misc/lib/achartengine-0.7.0.jar
diff --git a/calculatorpp/misc/lib/achartengine-0.7.1.jar b/android-app/misc/lib/achartengine-0.7.1.jar
similarity index 100%
rename from calculatorpp/misc/lib/achartengine-0.7.1.jar
rename to android-app/misc/lib/achartengine-0.7.1.jar
diff --git a/calculatorpp/misc/other/prepare_avds.sh b/android-app/misc/other/prepare_avds.sh
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/other/prepare_avds.sh
rename to android-app/misc/other/prepare_avds.sh
diff --git a/calculatorpp/misc/other/remove_avds.sh b/android-app/misc/other/remove_avds.sh
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/other/remove_avds.sh
rename to android-app/misc/other/remove_avds.sh
diff --git a/calculatorpp/misc/other/take_screenshots.py b/android-app/misc/other/take_screenshots.py
similarity index 100%
rename from calculatorpp/misc/other/take_screenshots.py
rename to android-app/misc/other/take_screenshots.py
diff --git a/calculatorpp/misc/other/take_screenshots.sh b/android-app/misc/other/take_screenshots.sh
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/other/take_screenshots.sh
rename to android-app/misc/other/take_screenshots.sh
diff --git a/calculatorpp/misc/other/take_screenshots2.sh b/android-app/misc/other/take_screenshots2.sh
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/other/take_screenshots2.sh
rename to android-app/misc/other/take_screenshots2.sh
diff --git a/calculatorpp/misc/other/wait_device.py b/android-app/misc/other/wait_device.py
similarity index 100%
rename from calculatorpp/misc/other/wait_device.py
rename to android-app/misc/other/wait_device.py
diff --git a/calculatorpp/misc/res/calculatorpp/01_main_screen_port.png b/android-app/misc/res/calculatorpp/01_main_screen_port.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/01_main_screen_port.png
rename to android-app/misc/res/calculatorpp/01_main_screen_port.png
diff --git a/calculatorpp/misc/res/calculatorpp/01_main_screen_port_sm.png b/android-app/misc/res/calculatorpp/01_main_screen_port_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/01_main_screen_port_sm.png
rename to android-app/misc/res/calculatorpp/01_main_screen_port_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/02_main_screen_land.png b/android-app/misc/res/calculatorpp/02_main_screen_land.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/02_main_screen_land.png
rename to android-app/misc/res/calculatorpp/02_main_screen_land.png
diff --git a/calculatorpp/misc/res/calculatorpp/03_main_screen_port_with_expression.png b/android-app/misc/res/calculatorpp/03_main_screen_port_with_expression.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/03_main_screen_port_with_expression.png
rename to android-app/misc/res/calculatorpp/03_main_screen_port_with_expression.png
diff --git a/calculatorpp/misc/res/calculatorpp/04_plot_graph_menu.png b/android-app/misc/res/calculatorpp/04_plot_graph_menu.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/04_plot_graph_menu.png
rename to android-app/misc/res/calculatorpp/04_plot_graph_menu.png
diff --git a/calculatorpp/misc/res/calculatorpp/04_plot_graph_menu_sm.png b/android-app/misc/res/calculatorpp/04_plot_graph_menu_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/04_plot_graph_menu_sm.png
rename to android-app/misc/res/calculatorpp/04_plot_graph_menu_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/05_graph_screen.png b/android-app/misc/res/calculatorpp/05_graph_screen.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/05_graph_screen.png
rename to android-app/misc/res/calculatorpp/05_graph_screen.png
diff --git a/calculatorpp/misc/res/calculatorpp/05_graph_screen_sm.png b/android-app/misc/res/calculatorpp/05_graph_screen_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/05_graph_screen_sm.png
rename to android-app/misc/res/calculatorpp/05_graph_screen_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/06_constants_screen.png b/android-app/misc/res/calculatorpp/06_constants_screen.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/06_constants_screen.png
rename to android-app/misc/res/calculatorpp/06_constants_screen.png
diff --git a/calculatorpp/misc/res/calculatorpp/06_constants_screen_sm.png b/android-app/misc/res/calculatorpp/06_constants_screen_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/06_constants_screen_sm.png
rename to android-app/misc/res/calculatorpp/06_constants_screen_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/07_constant_create_dialog.png b/android-app/misc/res/calculatorpp/07_constant_create_dialog.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/07_constant_create_dialog.png
rename to android-app/misc/res/calculatorpp/07_constant_create_dialog.png
diff --git a/calculatorpp/misc/res/calculatorpp/08_constants_context_menu.png b/android-app/misc/res/calculatorpp/08_constants_context_menu.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/08_constants_context_menu.png
rename to android-app/misc/res/calculatorpp/08_constants_context_menu.png
diff --git a/calculatorpp/misc/res/calculatorpp/09_functions_screen.png b/android-app/misc/res/calculatorpp/09_functions_screen.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/09_functions_screen.png
rename to android-app/misc/res/calculatorpp/09_functions_screen.png
diff --git a/calculatorpp/misc/res/calculatorpp/09_functions_screen_sm.png b/android-app/misc/res/calculatorpp/09_functions_screen_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/09_functions_screen_sm.png
rename to android-app/misc/res/calculatorpp/09_functions_screen_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/10_history_screen.png b/android-app/misc/res/calculatorpp/10_history_screen.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/10_history_screen.png
rename to android-app/misc/res/calculatorpp/10_history_screen.png
diff --git a/calculatorpp/misc/res/calculatorpp/10_history_screen_sm.png b/android-app/misc/res/calculatorpp/10_history_screen_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/10_history_screen_sm.png
rename to android-app/misc/res/calculatorpp/10_history_screen_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/11_history_item_context_menu.png b/android-app/misc/res/calculatorpp/11_history_item_context_menu.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/11_history_item_context_menu.png
rename to android-app/misc/res/calculatorpp/11_history_item_context_menu.png
diff --git a/calculatorpp/misc/res/calculatorpp/12_saved_history_tab.png b/android-app/misc/res/calculatorpp/12_saved_history_tab.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/12_saved_history_tab.png
rename to android-app/misc/res/calculatorpp/12_saved_history_tab.png
diff --git a/calculatorpp/misc/res/calculatorpp/13_saved_history_item_context_menu.png b/android-app/misc/res/calculatorpp/13_saved_history_item_context_menu.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/13_saved_history_item_context_menu.png
rename to android-app/misc/res/calculatorpp/13_saved_history_item_context_menu.png
diff --git a/calculatorpp/misc/res/calculatorpp/14_about_screen.png b/android-app/misc/res/calculatorpp/14_about_screen.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/14_about_screen.png
rename to android-app/misc/res/calculatorpp/14_about_screen.png
diff --git a/calculatorpp/misc/res/calculatorpp/14_about_screen_sm.png b/android-app/misc/res/calculatorpp/14_about_screen_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/14_about_screen_sm.png
rename to android-app/misc/res/calculatorpp/14_about_screen_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/15_release_notes_tab.png b/android-app/misc/res/calculatorpp/15_release_notes_tab.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/15_release_notes_tab.png
rename to android-app/misc/res/calculatorpp/15_release_notes_tab.png
diff --git a/calculatorpp/misc/res/calculatorpp/16_help_screen.png b/android-app/misc/res/calculatorpp/16_help_screen.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/16_help_screen.png
rename to android-app/misc/res/calculatorpp/16_help_screen.png
diff --git a/calculatorpp/misc/res/calculatorpp/16_help_screen_sm.png b/android-app/misc/res/calculatorpp/16_help_screen_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/16_help_screen_sm.png
rename to android-app/misc/res/calculatorpp/16_help_screen_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/17_hints_tab.png b/android-app/misc/res/calculatorpp/17_hints_tab.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/17_hints_tab.png
rename to android-app/misc/res/calculatorpp/17_hints_tab.png
diff --git a/calculatorpp/misc/res/calculatorpp/18_preferences.png b/android-app/misc/res/calculatorpp/18_preferences.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/18_preferences.png
rename to android-app/misc/res/calculatorpp/18_preferences.png
diff --git a/calculatorpp/misc/res/calculatorpp/18_preferences_02.png b/android-app/misc/res/calculatorpp/18_preferences_02.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/18_preferences_02.png
rename to android-app/misc/res/calculatorpp/18_preferences_02.png
diff --git a/calculatorpp/misc/res/calculatorpp/18_preferences_03.png b/android-app/misc/res/calculatorpp/18_preferences_03.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/18_preferences_03.png
rename to android-app/misc/res/calculatorpp/18_preferences_03.png
diff --git a/calculatorpp/misc/res/calculatorpp/18_preferences_sm.png b/android-app/misc/res/calculatorpp/18_preferences_sm.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/18_preferences_sm.png
rename to android-app/misc/res/calculatorpp/18_preferences_sm.png
diff --git a/calculatorpp/misc/res/calculatorpp/plan.png b/android-app/misc/res/calculatorpp/plan.png
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/plan.png
rename to android-app/misc/res/calculatorpp/plan.png
diff --git a/calculatorpp/misc/res/calculatorpp/plan.xcf b/android-app/misc/res/calculatorpp/plan.xcf
similarity index 100%
rename from calculatorpp/misc/res/calculatorpp/plan.xcf
rename to android-app/misc/res/calculatorpp/plan.xcf
diff --git a/calculatorpp/misc/res/icon-green.png b/android-app/misc/res/icon-green.png
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/res/icon-green.png
rename to android-app/misc/res/icon-green.png
diff --git a/calculatorpp/misc/res/icon-hi-res.png b/android-app/misc/res/icon-hi-res.png
similarity index 100%
rename from calculatorpp/misc/res/icon-hi-res.png
rename to android-app/misc/res/icon-hi-res.png
diff --git a/calculatorpp/misc/res/icon-promo.png b/android-app/misc/res/icon-promo.png
similarity index 100%
rename from calculatorpp/misc/res/icon-promo.png
rename to android-app/misc/res/icon-promo.png
diff --git a/calculatorpp/misc/res/icon.png b/android-app/misc/res/icon.png
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/res/icon.png
rename to android-app/misc/res/icon.png
diff --git a/calculatorpp/misc/res/kb_facebook.png b/android-app/misc/res/kb_facebook.png
similarity index 100%
rename from calculatorpp/misc/res/kb_facebook.png
rename to android-app/misc/res/kb_facebook.png
diff --git a/calculatorpp/misc/res/kb_facebook_icon.png b/android-app/misc/res/kb_facebook_icon.png
similarity index 100%
rename from calculatorpp/misc/res/kb_facebook_icon.png
rename to android-app/misc/res/kb_facebook_icon.png
diff --git a/calculatorpp/misc/res/logo-admob.png b/android-app/misc/res/logo-admob.png
similarity index 100%
rename from calculatorpp/misc/res/logo-admob.png
rename to android-app/misc/res/logo-admob.png
diff --git a/calculatorpp/misc/res/logo-scaled.png b/android-app/misc/res/logo-scaled.png
similarity index 100%
rename from calculatorpp/misc/res/logo-scaled.png
rename to android-app/misc/res/logo-scaled.png
diff --git a/calculatorpp/misc/res/logo-small.png b/android-app/misc/res/logo-small.png
similarity index 100%
rename from calculatorpp/misc/res/logo-small.png
rename to android-app/misc/res/logo-small.png
diff --git a/calculatorpp/misc/res/logo.cdr b/android-app/misc/res/logo.cdr
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/res/logo.cdr
rename to android-app/misc/res/logo.cdr
diff --git a/calculatorpp/misc/res/logo.png b/android-app/misc/res/logo.png
old mode 100755
new mode 100644
similarity index 100%
rename from calculatorpp/misc/res/logo.png
rename to android-app/misc/res/logo.png
diff --git a/calculatorpp/misc/res/widget.png b/android-app/misc/res/widget.png
similarity index 100%
rename from calculatorpp/misc/res/widget.png
rename to android-app/misc/res/widget.png
diff --git a/calculatorpp/misc/res/work/Backup_of_logo.cdr b/android-app/misc/res/work/Backup_of_logo.cdr
similarity index 100%
rename from calculatorpp/misc/res/work/Backup_of_logo.cdr
rename to android-app/misc/res/work/Backup_of_logo.cdr
diff --git a/calculatorpp/misc/res/work/header.png b/android-app/misc/res/work/header.png
similarity index 100%
rename from calculatorpp/misc/res/work/header.png
rename to android-app/misc/res/work/header.png
diff --git a/calculatorpp/misc/res/work/header_bg.png b/android-app/misc/res/work/header_bg.png
similarity index 100%
rename from calculatorpp/misc/res/work/header_bg.png
rename to android-app/misc/res/work/header_bg.png
diff --git a/calculatorpp/misc/res/work/header_sm.png b/android-app/misc/res/work/header_sm.png
similarity index 100%
rename from calculatorpp/misc/res/work/header_sm.png
rename to android-app/misc/res/work/header_sm.png
diff --git a/calculatorpp/misc/res/work/heart_original.png b/android-app/misc/res/work/heart_original.png
similarity index 100%
rename from calculatorpp/misc/res/work/heart_original.png
rename to android-app/misc/res/work/heart_original.png
diff --git a/calculatorpp/misc/res/work/icon.png b/android-app/misc/res/work/icon.png
similarity index 100%
rename from calculatorpp/misc/res/work/icon.png
rename to android-app/misc/res/work/icon.png
diff --git a/calculatorpp/misc/res/work/icon_favicon_light_blue.ico b/android-app/misc/res/work/icon_favicon_light_blue.ico
similarity index 100%
rename from calculatorpp/misc/res/work/icon_favicon_light_blue.ico
rename to android-app/misc/res/work/icon_favicon_light_blue.ico
diff --git a/calculatorpp/misc/res/work/icon_favicon_light_blue.png b/android-app/misc/res/work/icon_favicon_light_blue.png
similarity index 100%
rename from calculatorpp/misc/res/work/icon_favicon_light_blue.png
rename to android-app/misc/res/work/icon_favicon_light_blue.png
diff --git a/calculatorpp/misc/res/work/icon_favicon_purple.ico b/android-app/misc/res/work/icon_favicon_purple.ico
similarity index 100%
rename from calculatorpp/misc/res/work/icon_favicon_purple.ico
rename to android-app/misc/res/work/icon_favicon_purple.ico
diff --git a/calculatorpp/misc/res/work/icon_small.png b/android-app/misc/res/work/icon_small.png
similarity index 100%
rename from calculatorpp/misc/res/work/icon_small.png
rename to android-app/misc/res/work/icon_small.png
diff --git a/calculatorpp/misc/res/work/log11o.psd b/android-app/misc/res/work/log11o.psd
similarity index 100%
rename from calculatorpp/misc/res/work/log11o.psd
rename to android-app/misc/res/work/log11o.psd
diff --git a/calculatorpp/misc/res/work/logo.cdr b/android-app/misc/res/work/logo.cdr
similarity index 100%
rename from calculatorpp/misc/res/work/logo.cdr
rename to android-app/misc/res/work/logo.cdr
diff --git a/calculatorpp/misc/res/work/logo.png b/android-app/misc/res/work/logo.png
similarity index 100%
rename from calculatorpp/misc/res/work/logo.png
rename to android-app/misc/res/work/logo.png
diff --git a/calculatorpp/misc/res/work/logoFULL copy.png b/android-app/misc/res/work/logoFULL copy.png
similarity index 100%
rename from calculatorpp/misc/res/work/logoFULL copy.png
rename to android-app/misc/res/work/logoFULL copy.png
diff --git a/calculatorpp/misc/res/work/logoFULL.pdf b/android-app/misc/res/work/logoFULL.pdf
similarity index 100%
rename from calculatorpp/misc/res/work/logoFULL.pdf
rename to android-app/misc/res/work/logoFULL.pdf
diff --git a/calculatorpp/misc/res/work/logoFULL.png b/android-app/misc/res/work/logoFULL.png
similarity index 100%
rename from calculatorpp/misc/res/work/logoFULL.png
rename to android-app/misc/res/work/logoFULL.png
diff --git a/calculatorpp/misc/res/work/logoFULL_banner.png b/android-app/misc/res/work/logoFULL_banner.png
similarity index 100%
rename from calculatorpp/misc/res/work/logoFULL_banner.png
rename to android-app/misc/res/work/logoFULL_banner.png
diff --git a/calculatorpp/misc/res/work/logoFULL_small.png b/android-app/misc/res/work/logoFULL_small.png
similarity index 100%
rename from calculatorpp/misc/res/work/logoFULL_small.png
rename to android-app/misc/res/work/logoFULL_small.png
diff --git a/calculatorpp/misc/res/work/logo_black.png b/android-app/misc/res/work/logo_black.png
similarity index 100%
rename from calculatorpp/misc/res/work/logo_black.png
rename to android-app/misc/res/work/logo_black.png
diff --git a/calculatorpp/misc/res/work/logo_blue.png b/android-app/misc/res/work/logo_blue.png
similarity index 100%
rename from calculatorpp/misc/res/work/logo_blue.png
rename to android-app/misc/res/work/logo_blue.png
diff --git a/calculatorpp/misc/res/work/logo_light_blue.png b/android-app/misc/res/work/logo_light_blue.png
similarity index 100%
rename from calculatorpp/misc/res/work/logo_light_blue.png
rename to android-app/misc/res/work/logo_light_blue.png
diff --git a/calculatorpp/misc/res/work/logo_purple.png b/android-app/misc/res/work/logo_purple.png
similarity index 100%
rename from calculatorpp/misc/res/work/logo_purple.png
rename to android-app/misc/res/work/logo_purple.png
diff --git a/calculatorpp/misc/res/work/promo_logo.png b/android-app/misc/res/work/promo_logo.png
similarity index 100%
rename from calculatorpp/misc/res/work/promo_logo.png
rename to android-app/misc/res/work/promo_logo.png
diff --git a/calculatorpp/misc/res/work/text_logo.png b/android-app/misc/res/work/text_logo.png
similarity index 100%
rename from calculatorpp/misc/res/work/text_logo.png
rename to android-app/misc/res/work/text_logo.png
diff --git a/calculatorpp/misc/res/work/text_logo_blue.png b/android-app/misc/res/work/text_logo_blue.png
similarity index 100%
rename from calculatorpp/misc/res/work/text_logo_blue.png
rename to android-app/misc/res/work/text_logo_blue.png
diff --git a/calculatorpp/misc/res/work/text_logo_light_blue.png b/android-app/misc/res/work/text_logo_light_blue.png
similarity index 100%
rename from calculatorpp/misc/res/work/text_logo_light_blue.png
rename to android-app/misc/res/work/text_logo_light_blue.png
diff --git a/calculatorpp/misc/res/work/text_logo_light_blue_cpp_forum.png b/android-app/misc/res/work/text_logo_light_blue_cpp_forum.png
similarity index 100%
rename from calculatorpp/misc/res/work/text_logo_light_blue_cpp_forum.png
rename to android-app/misc/res/work/text_logo_light_blue_cpp_forum.png
diff --git a/calculatorpp/misc/res/work/text_logo_purple.png b/android-app/misc/res/work/text_logo_purple.png
similarity index 100%
rename from calculatorpp/misc/res/work/text_logo_purple.png
rename to android-app/misc/res/work/text_logo_purple.png
diff --git a/calculatorpp/misc/src/achartengine-0.7.0.jar b/android-app/misc/src/achartengine-0.7.0.jar
similarity index 100%
rename from calculatorpp/misc/src/achartengine-0.7.0.jar
rename to android-app/misc/src/achartengine-0.7.0.jar
diff --git a/calculatorpp/misc/src/bsh.jar b/android-app/misc/src/bsh.jar
similarity index 100%
rename from calculatorpp/misc/src/bsh.jar
rename to android-app/misc/src/bsh.jar
diff --git a/calculatorpp/pom.xml b/android-app/pom.xml
similarity index 94%
rename from calculatorpp/pom.xml
rename to android-app/pom.xml
index d01ac953..3f1d027f 100644
--- a/calculatorpp/pom.xml
+++ b/android-app/pom.xml
@@ -10,7 +10,7 @@
4.0.0
org.solovyev.android
- calculatorpp
+ calculatorpp-android-app
apk
Calculator++ Application
@@ -21,7 +21,24 @@
org.solovyev.android
calculatorpp-core
- 1.5.3-SNAPSHOT
+
+
+
+ org.solovyev.android
+ calculatorpp-android-app-core
+ apklib
+
+
+
+ org.solovyev.android
+ calculatorpp-android-app-widget
+ apklib
+
+
+
+ org.solovyev.android
+ calculatorpp-android-app-onscreen
+ apklib
diff --git a/calculatorpp/proguard.cfg b/android-app/proguard.cfg
similarity index 100%
rename from calculatorpp/proguard.cfg
rename to android-app/proguard.cfg
diff --git a/calculatorpp/project.properties b/android-app/project.properties
similarity index 72%
rename from calculatorpp/project.properties
rename to android-app/project.properties
index a00e8017..542cf64d 100644
--- a/calculatorpp/project.properties
+++ b/android-app/project.properties
@@ -9,19 +9,22 @@
# Project target.
target=android-15
-android.library.reference.1=gen-external-apklibs/org.solovyev.android_android-common-all_1.0.6
-android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6
-android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6
-android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6
-android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6
-android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6
-android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6
-android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6
-android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6
-android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6
-android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6
-android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.6
-android.library.reference.13=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0
-android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6
+android.library.reference.1=../android-app-core
+android.library.reference.2=../android-app-widget
+android.library.reference.3=../android-app-onscreen
+android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-all_1.0.6
+android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6
+android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6
+android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6
+android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6
+android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6
+android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6
+android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6
+android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6
+android.library.reference.13=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6
+android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6
+android.library.reference.15=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.6
+android.library.reference.16=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0
+android.library.reference.17=gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6
diff --git a/android-app/res/layout-land/cpp_app_keyboard.xml b/android-app/res/layout-land/cpp_app_keyboard.xml
new file mode 100644
index 00000000..123ad649
--- /dev/null
+++ b/android-app/res/layout-land/cpp_app_keyboard.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android-app/res/layout-land/cpp_app_keyboard_mobile.xml b/android-app/res/layout-land/cpp_app_keyboard_mobile.xml
new file mode 100644
index 00000000..7d837f30
--- /dev/null
+++ b/android-app/res/layout-land/cpp_app_keyboard_mobile.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/calculatorpp/res/layout-land/main_calculator.xml b/android-app/res/layout-land/main_calculator.xml
similarity index 100%
rename from calculatorpp/res/layout-land/main_calculator.xml
rename to android-app/res/layout-land/main_calculator.xml
diff --git a/calculatorpp/res/layout-land/main_calculator_mobile.xml b/android-app/res/layout-land/main_calculator_mobile.xml
similarity index 100%
rename from calculatorpp/res/layout-land/main_calculator_mobile.xml
rename to android-app/res/layout-land/main_calculator_mobile.xml
diff --git a/calculatorpp/res/layout-land/main_first_pane.xml b/android-app/res/layout-land/main_first_pane.xml
similarity index 87%
rename from calculatorpp/res/layout-land/main_first_pane.xml
rename to android-app/res/layout-land/main_first_pane.xml
index 347683a7..c64ec051 100644
--- a/calculatorpp/res/layout-land/main_first_pane.xml
+++ b/android-app/res/layout-land/main_first_pane.xml
@@ -21,13 +21,13 @@
a:layout_width="match_parent"
a:layout_height="0dp">
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/calculatorpp/res/layout-large-land/main_calculator.xml b/android-app/res/layout-large-land/main_calculator.xml
similarity index 100%
rename from calculatorpp/res/layout-large-land/main_calculator.xml
rename to android-app/res/layout-large-land/main_calculator.xml
diff --git a/calculatorpp/res/layout-large/calc_display.xml b/android-app/res/layout-large/cpp_app_display.xml
similarity index 100%
rename from calculatorpp/res/layout-large/calc_display.xml
rename to android-app/res/layout-large/cpp_app_display.xml
diff --git a/calculatorpp/res/layout-large/calc_editor.xml b/android-app/res/layout-large/cpp_app_editor.xml
similarity index 100%
rename from calculatorpp/res/layout-large/calc_editor.xml
rename to android-app/res/layout-large/cpp_app_editor.xml
diff --git a/android-app/res/layout-large/cpp_app_keyboard.xml b/android-app/res/layout-large/cpp_app_keyboard.xml
new file mode 100644
index 00000000..a8a4af52
--- /dev/null
+++ b/android-app/res/layout-large/cpp_app_keyboard.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/calculatorpp/res/layout-large/main_calculator.xml b/android-app/res/layout-large/main_calculator.xml
similarity index 100%
rename from calculatorpp/res/layout-large/main_calculator.xml
rename to android-app/res/layout-large/main_calculator.xml
diff --git a/android-app/res/layout-xlarge-land/cpp_app_keyboard.xml b/android-app/res/layout-xlarge-land/cpp_app_keyboard.xml
new file mode 100644
index 00000000..205f6901
--- /dev/null
+++ b/android-app/res/layout-xlarge-land/cpp_app_keyboard.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/calculatorpp/res/layout-xlarge-land/main_calculator.xml b/android-app/res/layout-xlarge-land/main_calculator.xml
similarity index 100%
rename from calculatorpp/res/layout-xlarge-land/main_calculator.xml
rename to android-app/res/layout-xlarge-land/main_calculator.xml
diff --git a/calculatorpp/res/layout-xlarge/calc_display.xml b/android-app/res/layout-xlarge/cpp_app_display.xml
similarity index 100%
rename from calculatorpp/res/layout-xlarge/calc_display.xml
rename to android-app/res/layout-xlarge/cpp_app_display.xml
diff --git a/calculatorpp/res/layout-xlarge/calc_editor.xml b/android-app/res/layout-xlarge/cpp_app_editor.xml
similarity index 100%
rename from calculatorpp/res/layout-xlarge/calc_editor.xml
rename to android-app/res/layout-xlarge/cpp_app_editor.xml
diff --git a/android-app/res/layout-xlarge/cpp_app_keyboard.xml b/android-app/res/layout-xlarge/cpp_app_keyboard.xml
new file mode 100644
index 00000000..31262c45
--- /dev/null
+++ b/android-app/res/layout-xlarge/cpp_app_keyboard.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/calculatorpp/res/layout-xlarge/main_calculator.xml b/android-app/res/layout-xlarge/main_calculator.xml
similarity index 100%
rename from calculatorpp/res/layout-xlarge/main_calculator.xml
rename to android-app/res/layout-xlarge/main_calculator.xml
diff --git a/calculatorpp/res/layout/about_fragment.xml b/android-app/res/layout/about_fragment.xml
similarity index 100%
rename from calculatorpp/res/layout/about_fragment.xml
rename to android-app/res/layout/about_fragment.xml
diff --git a/calculatorpp/res/layout/ad.xml b/android-app/res/layout/ad.xml
similarity index 100%
rename from calculatorpp/res/layout/ad.xml
rename to android-app/res/layout/ad.xml
diff --git a/calculatorpp/res/layout/admob_pref.xml b/android-app/res/layout/admob_pref.xml
similarity index 100%
rename from calculatorpp/res/layout/admob_pref.xml
rename to android-app/res/layout/admob_pref.xml
diff --git a/calculatorpp/res/layout/calc_plot_view.xml b/android-app/res/layout/calc_plot_view.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_plot_view.xml
rename to android-app/res/layout/calc_plot_view.xml
diff --git a/calculatorpp/res/layout/calculator_messages_dialog.xml b/android-app/res/layout/calculator_messages_dialog.xml
similarity index 100%
rename from calculatorpp/res/layout/calculator_messages_dialog.xml
rename to android-app/res/layout/calculator_messages_dialog.xml
diff --git a/calculatorpp/res/layout/calculator_messages_dialog_message.xml b/android-app/res/layout/calculator_messages_dialog_message.xml
similarity index 100%
rename from calculatorpp/res/layout/calculator_messages_dialog_message.xml
rename to android-app/res/layout/calculator_messages_dialog_message.xml
diff --git a/calculatorpp/res/layout/calc_copy_button.xml b/android-app/res/layout/cpp_app_button_copy.xml
similarity index 92%
rename from calculatorpp/res/layout/calc_copy_button.xml
rename to android-app/res/layout/cpp_app_button_copy.xml
index d0fe8181..62132a7d 100644
--- a/calculatorpp/res/layout/calc_copy_button.xml
+++ b/android-app/res/layout/cpp_app_button_copy.xml
@@ -7,7 +7,7 @@
-->
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_donate_button.xml b/android-app/res/layout/cpp_app_button_donate.xml
similarity index 92%
rename from calculatorpp/res/layout/calc_donate_button.xml
rename to android-app/res/layout/cpp_app_button_donate.xml
index ad4c928b..b55b7e6e 100644
--- a/calculatorpp/res/layout/calc_donate_button.xml
+++ b/android-app/res/layout/cpp_app_button_donate.xml
@@ -7,7 +7,7 @@
-->
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_erase_button.xml b/android-app/res/layout/cpp_app_button_erase.xml
similarity index 90%
rename from calculatorpp/res/layout/calc_erase_button.xml
rename to android-app/res/layout/cpp_app_button_erase.xml
index 46ad2dfd..f0ce3c6e 100644
--- a/calculatorpp/res/layout/calc_erase_button.xml
+++ b/android-app/res/layout/cpp_app_button_erase.xml
@@ -7,7 +7,7 @@
-->
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_paste_button.xml b/android-app/res/layout/cpp_app_button_paste.xml
similarity index 90%
rename from calculatorpp/res/layout/calc_paste_button.xml
rename to android-app/res/layout/cpp_app_button_paste.xml
index a6cd5e42..035740c6 100644
--- a/calculatorpp/res/layout/calc_paste_button.xml
+++ b/android-app/res/layout/cpp_app_button_paste.xml
@@ -7,7 +7,7 @@
-->
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_display.xml b/android-app/res/layout/cpp_app_display.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_display.xml
rename to android-app/res/layout/cpp_app_display.xml
diff --git a/calculatorpp/res/layout/calc_display_mobile.xml b/android-app/res/layout/cpp_app_display_mobile.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_display_mobile.xml
rename to android-app/res/layout/cpp_app_display_mobile.xml
diff --git a/calculatorpp/res/layout/calc_editor.xml b/android-app/res/layout/cpp_app_editor.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_editor.xml
rename to android-app/res/layout/cpp_app_editor.xml
diff --git a/calculatorpp/res/layout/calc_editor_mobile.xml b/android-app/res/layout/cpp_app_editor_mobile.xml
similarity index 100%
rename from calculatorpp/res/layout/calc_editor_mobile.xml
rename to android-app/res/layout/cpp_app_editor_mobile.xml
diff --git a/android-app/res/layout/cpp_app_keyboard.xml b/android-app/res/layout/cpp_app_keyboard.xml
new file mode 100644
index 00000000..a69c25f5
--- /dev/null
+++ b/android-app/res/layout/cpp_app_keyboard.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_app_keyboard_mobile.xml b/android-app/res/layout/cpp_app_keyboard_mobile.xml
new file mode 100644
index 00000000..f5f41e98
--- /dev/null
+++ b/android-app/res/layout/cpp_app_keyboard_mobile.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_zero_digit_button.xml b/android-app/res/layout/cpp_drag_button_0.xml
similarity index 93%
rename from calculatorpp/res/layout/calc_zero_digit_button.xml
rename to android-app/res/layout/cpp_drag_button_0.xml
index dfa471e3..f377510d 100644
--- a/calculatorpp/res/layout/calc_zero_digit_button.xml
+++ b/android-app/res/layout/cpp_drag_button_0.xml
@@ -8,7 +8,7 @@
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_plus_button.xml b/android-app/res/layout/cpp_drag_button_plus.xml
similarity index 93%
rename from calculatorpp/res/layout/calc_plus_button.xml
rename to android-app/res/layout/cpp_drag_button_plus.xml
index 83e5531d..58b6a10b 100644
--- a/calculatorpp/res/layout/calc_plus_button.xml
+++ b/android-app/res/layout/cpp_drag_button_plus.xml
@@ -7,7 +7,7 @@
-->
-
- calculation.output.science_notation
false
- org.solovyev.android.calculator.CalculatorModel_functions
- org.solovyev.android.calculator.CalculatorModel_vars
org.solovyev.android.calculator.CalculatorModel_history
org.solovyev.android.calculator.CalculatorActivity_angle_units
diff --git a/calculatorpp/res/values/styles_history.xml b/android-app/res/values/styles_history.xml
similarity index 100%
rename from calculatorpp/res/values/styles_history.xml
rename to android-app/res/values/styles_history.xml
diff --git a/calculatorpp/res/values/styles_var.xml b/android-app/res/values/styles_var.xml
similarity index 100%
rename from calculatorpp/res/values/styles_var.xml
rename to android-app/res/values/styles_var.xml
diff --git a/calculatorpp/res/xml/calculator_widget_info_3x3.xml b/android-app/res/xml/calculator_widget_info_3x3.xml
similarity index 100%
rename from calculatorpp/res/xml/calculator_widget_info_3x3.xml
rename to android-app/res/xml/calculator_widget_info_3x3.xml
diff --git a/calculatorpp/res/xml/calculator_widget_info_3x4.xml b/android-app/res/xml/calculator_widget_info_3x4.xml
similarity index 100%
rename from calculatorpp/res/xml/calculator_widget_info_3x4.xml
rename to android-app/res/xml/calculator_widget_info_3x4.xml
diff --git a/calculatorpp/res/xml/calculator_widget_info_4x4.xml b/android-app/res/xml/calculator_widget_info_4x4.xml
similarity index 100%
rename from calculatorpp/res/xml/calculator_widget_info_4x4.xml
rename to android-app/res/xml/calculator_widget_info_4x4.xml
diff --git a/calculatorpp/res/xml/calculator_widget_info_4x5.xml b/android-app/res/xml/calculator_widget_info_4x5.xml
similarity index 100%
rename from calculatorpp/res/xml/calculator_widget_info_4x5.xml
rename to android-app/res/xml/calculator_widget_info_4x5.xml
diff --git a/calculatorpp/res/xml/preferences.xml b/android-app/res/xml/preferences.xml
similarity index 100%
rename from calculatorpp/res/xml/preferences.xml
rename to android-app/res/xml/preferences.xml
diff --git a/calculatorpp/res/xml/preferences_appearance.xml b/android-app/res/xml/preferences_appearance.xml
similarity index 100%
rename from calculatorpp/res/xml/preferences_appearance.xml
rename to android-app/res/xml/preferences_appearance.xml
diff --git a/calculatorpp/res/xml/preferences_calculations.xml b/android-app/res/xml/preferences_calculations.xml
similarity index 100%
rename from calculatorpp/res/xml/preferences_calculations.xml
rename to android-app/res/xml/preferences_calculations.xml
diff --git a/calculatorpp/res/xml/preferences_onscreen.xml b/android-app/res/xml/preferences_onscreen.xml
similarity index 100%
rename from calculatorpp/res/xml/preferences_onscreen.xml
rename to android-app/res/xml/preferences_onscreen.xml
diff --git a/calculatorpp/res/xml/preferences_other.xml b/android-app/res/xml/preferences_other.xml
similarity index 100%
rename from calculatorpp/res/xml/preferences_other.xml
rename to android-app/res/xml/preferences_other.xml
diff --git a/calculatorpp/res/xml/preferences_plot.xml b/android-app/res/xml/preferences_plot.xml
similarity index 100%
rename from calculatorpp/res/xml/preferences_plot.xml
rename to android-app/res/xml/preferences_plot.xml
diff --git a/calculatorpp/src/main/java/org/solovyev/android/AndroidUtils2.java b/android-app/src/main/java/org/solovyev/android/AndroidUtils2.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/AndroidUtils2.java
rename to android-app/src/main/java/org/solovyev/android/AndroidUtils2.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java b/android-app/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java
similarity index 82%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java
rename to android-app/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java
index a79fbbce..0ba59f44 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/AbstractCalculatorHelper.java
@@ -87,12 +87,12 @@ public abstract class AbstractCalculatorHelper implements SharedPreferences.OnSh
setOnDragListeners(root, dragPreferences, preferences);
final OnDragListener historyOnDragListener = new OnDragListenerVibrator(newOnDragListener(new HistoryDragProcessor(getCalculator()), dragPreferences), vibrator, preferences);
- final DragButton historyButton = getButton(root, R.id.historyButton);
+ final DragButton historyButton = getButton(root, R.id.cpp_button_history);
if (historyButton != null) {
historyButton.setOnDragListener(historyOnDragListener);
}
- final DragButton subtractionButton = getButton(root, R.id.subtractionButton);
+ final DragButton subtractionButton = getButton(root, R.id.cpp_button_subtraction);
if (subtractionButton != null) {
subtractionButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new SimpleOnDragListener.DragProcessor() {
@Override
@@ -108,64 +108,64 @@ public abstract class AbstractCalculatorHelper implements SharedPreferences.OnSh
final OnDragListener toPositionOnDragListener = new OnDragListenerVibrator(new SimpleOnDragListener(new CursorDragProcessor(), dragPreferences), vibrator, preferences);
- final DragButton rightButton = getButton(root, R.id.rightButton);
+ final DragButton rightButton = getButton(root, R.id.cpp_button_right);
if (rightButton != null) {
rightButton.setOnDragListener(toPositionOnDragListener);
}
- final DragButton leftButton = getButton(root, R.id.leftButton);
+ final DragButton leftButton = getButton(root, R.id.cpp_button_left);
if (leftButton != null) {
leftButton.setOnDragListener(toPositionOnDragListener);
}
- final DragButton equalsButton = getButton(root, R.id.equalsButton);
+ final DragButton equalsButton = getButton(root, R.id.cpp_button_equals);
if (equalsButton != null) {
equalsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new EvalDragProcessor(), dragPreferences), vibrator, preferences));
}
- final AngleUnitsButton angleUnitsButton = (AngleUnitsButton) getButton(root, R.id.sixDigitButton);
+ final AngleUnitsButton angleUnitsButton = (AngleUnitsButton) getButton(root, R.id.cpp_button_6);
if (angleUnitsButton != null) {
angleUnitsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.AngleUnitsChanger(activity), dragPreferences), vibrator, preferences));
}
- final NumeralBasesButton clearButton = (NumeralBasesButton) getButton(root, R.id.clearButton);
+ final NumeralBasesButton clearButton = (NumeralBasesButton) getButton(root, R.id.cpp_button_clear);
if (clearButton != null) {
clearButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.NumeralBasesChanger(activity), dragPreferences), vibrator, preferences));
}
- final DragButton varsButton = getButton(root, R.id.vars_button);
+ final DragButton varsButton = getButton(root, R.id.cpp_button_vars);
if (varsButton != null) {
varsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.VarsDragProcessor(activity), dragPreferences), vibrator, preferences));
}
- final DragButton functionsButton = getButton(root, R.id.functions_button);
+ final DragButton functionsButton = getButton(root, R.id.cpp_button_functions);
if (functionsButton != null) {
functionsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.FunctionsDragProcessor(activity), dragPreferences), vibrator, preferences));
}
- final DragButton roundBracketsButton = getButton(root, R.id.roundBracketsButton);
+ final DragButton roundBracketsButton = getButton(root, R.id.cpp_button_round_brackets);
if (roundBracketsButton != null) {
roundBracketsButton.setOnDragListener(new OnDragListenerVibrator(newOnDragListener(new CalculatorButtons.RoundBracketsDragProcessor(), dragPreferences), vibrator, preferences));
}
if (layout == CalculatorPreferences.Gui.Layout.simple) {
- toggleButtonDirectionText(root, R.id.oneDigitButton, false, DragDirection.up, DragDirection.down);
- toggleButtonDirectionText(root, R.id.twoDigitButton, false, DragDirection.up, DragDirection.down);
- toggleButtonDirectionText(root, R.id.threeDigitButton, false, DragDirection.up, DragDirection.down);
+ toggleButtonDirectionText(root, R.id.cpp_button_1, false, DragDirection.up, DragDirection.down);
+ toggleButtonDirectionText(root, R.id.cpp_button_2, false, DragDirection.up, DragDirection.down);
+ toggleButtonDirectionText(root, R.id.cpp_button_3, false, DragDirection.up, DragDirection.down);
- toggleButtonDirectionText(root, R.id.sixDigitButton, false, DragDirection.up, DragDirection.down);
- toggleButtonDirectionText(root, R.id.sevenDigitButton, false, DragDirection.left, DragDirection.up, DragDirection.down);
- toggleButtonDirectionText(root, R.id.eightDigitButton, false, DragDirection.left, DragDirection.up, DragDirection.down);
+ toggleButtonDirectionText(root, R.id.cpp_button_6, false, DragDirection.up, DragDirection.down);
+ toggleButtonDirectionText(root, R.id.cpp_button_7, false, DragDirection.left, DragDirection.up, DragDirection.down);
+ toggleButtonDirectionText(root, R.id.cpp_button_8, false, DragDirection.left, DragDirection.up, DragDirection.down);
- toggleButtonDirectionText(root, R.id.clearButton, false, DragDirection.left, DragDirection.up, DragDirection.down);
+ toggleButtonDirectionText(root, R.id.cpp_button_clear, false, DragDirection.left, DragDirection.up, DragDirection.down);
- toggleButtonDirectionText(root, R.id.fourDigitButton, false, DragDirection.down);
- toggleButtonDirectionText(root, R.id.fiveDigitButton, false, DragDirection.down);
+ toggleButtonDirectionText(root, R.id.cpp_button_4, false, DragDirection.down);
+ toggleButtonDirectionText(root, R.id.cpp_button_5, false, DragDirection.down);
- toggleButtonDirectionText(root, R.id.nineDigitButton, false, DragDirection.left);
+ toggleButtonDirectionText(root, R.id.cpp_button_9, false, DragDirection.left);
- toggleButtonDirectionText(root, R.id.multiplicationButton, false, DragDirection.left);
- toggleButtonDirectionText(root, R.id.plusButton, false, DragDirection.down, DragDirection.up);
+ toggleButtonDirectionText(root, R.id.cpp_button_multiplication, false, DragDirection.left);
+ toggleButtonDirectionText(root, R.id.cpp_button_plus, false, DragDirection.down, DragDirection.up);
}
CalculatorButtons.processButtons(theme, layout, root);
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java
similarity index 91%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java
rename to android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java
index 943aeed8..9fc3d854 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java
@@ -1,14 +1,10 @@
package org.solovyev.android.calculator;
import android.app.Activity;
-import android.app.AlertDialog;
import android.app.Application;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
import jscl.NumeralBase;
import jscl.math.Generic;
import org.jetbrains.annotations.NotNull;
@@ -40,19 +36,6 @@ public class AndroidCalculator implements Calculator, CalculatorEventListener, S
PreferenceManager.getDefaultSharedPreferences(application).registerOnSharedPreferenceChangeListener(this);
}
- public static void showEvaluationError(@NotNull Context context, @NotNull final String errorMessage) {
- final LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
-
- final View errorMessageView = layoutInflater.inflate(R.layout.display_error_message, null);
- ((TextView) errorMessageView.findViewById(R.id.error_message_text_view)).setText(errorMessage);
-
- final AlertDialog.Builder builder = new AlertDialog.Builder(context)
- .setPositiveButton(R.string.c_cancel, null)
- .setView(errorMessageView);
-
- builder.create().show();
- }
-
public void init(@NotNull final Activity activity) {
setEditor(activity);
setDisplay(activity);
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorClipboard.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorClipboard.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorClipboard.java
rename to android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorClipboard.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorKeyboard.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorKeyboard.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorKeyboard.java
rename to android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorKeyboard.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java
rename to android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorNotifier.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorNotifier.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorNotifier.java
rename to android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorNotifier.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorPreferenceService.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorPreferenceService.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorPreferenceService.java
rename to android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorPreferenceService.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidFunctionCategory.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidFunctionCategory.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidFunctionCategory.java
rename to android-app/src/main/java/org/solovyev/android/calculator/AndroidFunctionCategory.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidNumeralBase.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidNumeralBase.java
similarity index 86%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidNumeralBase.java
rename to android-app/src/main/java/org/solovyev/android/calculator/AndroidNumeralBase.java
index ecdc65aa..649493e8 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidNumeralBase.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/AndroidNumeralBase.java
@@ -22,7 +22,7 @@ public enum AndroidNumeralBase {
@NotNull
@Override
public List getButtonIds() {
- return Arrays.asList(R.id.zeroDigitButton, R.id.oneDigitButton);
+ return Arrays.asList(R.id.cpp_button_0, R.id.cpp_button_1);
}
},
@@ -31,7 +31,7 @@ public enum AndroidNumeralBase {
@Override
public List getButtonIds() {
final List result = new ArrayList(bin.getButtonIds());
- result.addAll(Arrays.asList(R.id.twoDigitButton, R.id.threeDigitButton, R.id.fourDigitButton, R.id.fiveDigitButton, R.id.sixDigitButton, R.id.sevenDigitButton));
+ result.addAll(Arrays.asList(R.id.cpp_button_2, R.id.cpp_button_3, R.id.cpp_button_4, R.id.cpp_button_5, R.id.cpp_button_6, R.id.cpp_button_7));
return result;
}
},
@@ -41,7 +41,7 @@ public enum AndroidNumeralBase {
@Override
public List getButtonIds() {
final List result = new ArrayList(oct.getButtonIds());
- result.addAll(Arrays.asList(R.id.eightDigitButton, R.id.nineDigitButton));
+ result.addAll(Arrays.asList(R.id.cpp_button_8, R.id.cpp_button_9));
return result;
}
},
@@ -49,7 +49,7 @@ public enum AndroidNumeralBase {
hex(CalculatorNumeralBase.hex) {
@NotNull
- private List specialHexButtonIds = Arrays.asList(R.id.oneDigitButton, R.id.twoDigitButton, R.id.threeDigitButton, R.id.fourDigitButton, R.id.fiveDigitButton, R.id.sixDigitButton);
+ private List specialHexButtonIds = Arrays.asList(R.id.cpp_button_1, R.id.cpp_button_2, R.id.cpp_button_3, R.id.cpp_button_4, R.id.cpp_button_5, R.id.cpp_button_6);
@NotNull
@Override
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidOperatorCategory.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidOperatorCategory.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidOperatorCategory.java
rename to android-app/src/main/java/org/solovyev/android/calculator/AndroidOperatorCategory.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidVarCategory.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidVarCategory.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidVarCategory.java
rename to android-app/src/main/java/org/solovyev/android/calculator/AndroidVarCategory.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelper.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelper.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelper.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelper.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelperImpl.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelperImpl.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelperImpl.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityHelperImpl.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
similarity index 69%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
index 164882cd..dd2d2cfe 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java
@@ -1,15 +1,21 @@
package org.solovyev.android.calculator;
+import android.app.Activity;
+import android.app.AlertDialog;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.preference.PreferenceManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import jscl.math.Generic;
import jscl.math.function.Constant;
import org.achartengine.ChartFactory;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.about.CalculatorAboutActivity;
import org.solovyev.android.calculator.function.FunctionEditDialogFragment;
import org.solovyev.android.calculator.help.CalculatorHelpActivity;
@@ -17,6 +23,7 @@ import org.solovyev.android.calculator.history.CalculatorHistoryActivity;
import org.solovyev.android.calculator.math.edit.*;
import org.solovyev.android.calculator.plot.CalculatorPlotActivity;
import org.solovyev.android.calculator.plot.CalculatorPlotFragment;
+import org.solovyev.android.calculator.plot.PlotInput;
import org.solovyev.common.msg.Message;
import org.solovyev.common.msg.MessageType;
import org.solovyev.common.text.StringUtils;
@@ -28,9 +35,12 @@ import java.util.List;
* Date: 11/2/11
* Time: 2:18 PM
*/
-public class CalculatorActivityLauncher {
+public final class CalculatorActivityLauncher implements CalculatorEventListener {
- public static void showHistory(@NotNull final Context context) {
+ public CalculatorActivityLauncher() {
+ }
+
+ public static void showHistory(@NotNull final Context context) {
showHistory(context, false);
}
@@ -166,4 +176,60 @@ public class CalculatorActivityLauncher {
CalculatorMessagesDialog.showDialogForMessages(messages, context);
}
}
+
+ @Override
+ public void onCalculatorEvent(@NotNull CalculatorEventData calculatorEventData, @NotNull CalculatorEventType calculatorEventType, @Nullable Object data) {
+ switch (calculatorEventType){
+ case show_create_var_dialog:
+ App.getInstance().getUiThreadExecutor().execute(new Runnable() {
+ @Override
+ public void run() {
+ CalculatorActivityLauncher.createVar(App.getInstance().getApplication(), Locator.getInstance().getDisplay());
+ }
+ });
+ break;
+ case show_create_function_dialog:
+ App.getInstance().getUiThreadExecutor().execute(new Runnable() {
+ @Override
+ public void run() {
+ CalculatorActivityLauncher.createFunction(App.getInstance().getApplication(), Locator.getInstance().getDisplay());
+ }
+ });
+ break;
+ case plot_graph:
+ final PlotInput plotInput = (PlotInput) data;
+ assert plotInput != null;
+ App.getInstance().getUiThreadExecutor().execute(new Runnable() {
+ @Override
+ public void run() {
+ plotGraph(App.getInstance().getApplication(), plotInput.getFunction(), plotInput.getConstant());
+ }
+ });
+ break;
+ case show_evaluation_error:
+ final String errorMessage = (String) data;
+ if (errorMessage != null) {
+ App.getInstance().getUiThreadExecutor().execute(new Runnable() {
+ @Override
+ public void run() {
+ showEvaluationError(App.getInstance().getApplication(), errorMessage);
+ }
+ });
+ }
+ break;
+ }
+ }
+
+ public static void showEvaluationError(@NotNull Context context, @NotNull final String errorMessage) {
+ final LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
+
+ final View errorMessageView = layoutInflater.inflate(R.layout.display_error_message, null);
+ ((TextView) errorMessageView.findViewById(R.id.error_message_text_view)).setText(errorMessage);
+
+ final AlertDialog.Builder builder = new AlertDialog.Builder(context)
+ .setPositiveButton(R.string.c_cancel, null)
+ .setView(errorMessageView);
+
+ builder.create().show();
+ }
}
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityMobile.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityMobile.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorActivityMobile.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityMobile.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
similarity index 99%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
index def27e3a..97420fa0 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
@@ -75,6 +75,8 @@ public class CalculatorApplication extends android.app.Application {
public void onCreate() {
ACRA.init(this);
+ App.getInstance().init(this);
+
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
CalculatorPreferences.setDefaultValues(preferences);
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java
similarity index 93%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java
index 9c443562..99515813 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java
@@ -26,9 +26,9 @@ public class CalculatorDisplayFragment extends SherlockFragment {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.getActivity());
final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(prefs);
if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
- fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_display_mobile, R.string.result);
+ fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_display_mobile, R.string.result);
} else {
- fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_display, R.string.result);
+ fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_display, R.string.result);
}
fragmentHelper.onCreate(this);
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java
similarity index 96%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java
index cb15e2c6..c1fdaec2 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java
@@ -53,9 +53,9 @@ public class CalculatorEditorFragment extends SherlockFragment {
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.getActivity());
final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(prefs);
if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
- fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_editor_mobile, R.string.editor);
+ fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_editor_mobile, R.string.editor);
} else {
- fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_editor, R.string.editor);
+ fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_editor, R.string.editor);
}
fragmentHelper.onCreate(this);
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFixableMessage.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorFixableMessage.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFixableMessage.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorFixableMessage.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentActivity.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelper.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelper.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelper.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelper.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorFragmentHelperImpl.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java
similarity index 97%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java
index d3c2fec6..d126219b 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java
@@ -32,9 +32,9 @@ public class CalculatorKeyboardFragment extends SherlockFragment implements Shar
final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(preferences);
if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
- fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_keyboard_mobile);
+ fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_keyboard_mobile);
} else {
- fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_keyboard);
+ fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.cpp_app_keyboard);
}
fragmentHelper.onCreate(this);
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorMenu.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorMessagesDialog.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorSecurity.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorSecurity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorSecurity.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CalculatorSecurity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java b/android-app/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java b/android-app/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
rename to android-app/src/main/java/org/solovyev/android/calculator/CursorDragProcessor.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java b/android-app/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
rename to android-app/src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java b/android-app/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java
rename to android-app/src/main/java/org/solovyev/android/calculator/NumeralBaseButtons.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutActivity.java
rename to android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java b/android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java
similarity index 95%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java
rename to android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java
index 65a33d52..8163b697 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java
@@ -22,7 +22,7 @@ import org.solovyev.android.calculator.plot.CalculatorPlotFragment;
*/
public enum CalculatorFragmentType {
- editor(CalculatorEditorFragment.class, R.layout.calc_editor, R.string.editor),
+ editor(CalculatorEditorFragment.class, R.layout.cpp_app_editor, R.string.editor),
//display(CalculatorHistoryFragment.class, "history", R.layout.history_fragment, R.string.c_history),
//keyboard(CalculatorHistoryFragment.class, "history", R.layout.history_fragment, R.string.c_history),
history(CalculatorHistoryFragment.class, R.layout.history_fragment, R.string.c_history),
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorReleaseNotesFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/about/TextHelper.java b/android-app/src/main/java/org/solovyev/android/calculator/about/TextHelper.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/about/TextHelper.java
rename to android-app/src/main/java/org/solovyev/android/calculator/about/TextHelper.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionEditDialogFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/function/FunctionEditDialogFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionEditDialogFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/function/FunctionEditDialogFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionEditorSaver.java b/android-app/src/main/java/org/solovyev/android/calculator/function/FunctionEditorSaver.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionEditorSaver.java
rename to android-app/src/main/java/org/solovyev/android/calculator/function/FunctionEditorSaver.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionParamEditText.java b/android-app/src/main/java/org/solovyev/android/calculator/function/FunctionParamEditText.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionParamEditText.java
rename to android-app/src/main/java/org/solovyev/android/calculator/function/FunctionParamEditText.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionParamsView.java b/android-app/src/main/java/org/solovyev/android/calculator/function/FunctionParamsView.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/function/FunctionParamsView.java
rename to android-app/src/main/java/org/solovyev/android/calculator/function/FunctionParamsView.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpActivity.java
rename to android-app/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpFaqFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpFaqFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpFaqFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpFaqFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpHintsFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpHintsFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpHintsFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpHintsFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpScreensFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpScreensFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpScreensFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/help/CalculatorHelpScreensFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/AbstractCalculatorHistoryFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/history/AbstractCalculatorHistoryFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/AbstractCalculatorHistoryFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/history/AbstractCalculatorHistoryFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/AndroidCalculatorHistory.java b/android-app/src/main/java/org/solovyev/android/calculator/history/AndroidCalculatorHistory.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/AndroidCalculatorHistory.java
rename to android-app/src/main/java/org/solovyev/android/calculator/history/AndroidCalculatorHistory.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryActivity.java
rename to android-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorSavedHistoryFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/history/CalculatorSavedHistoryFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorSavedHistoryFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/history/CalculatorSavedHistoryFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java b/android-app/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
rename to android-app/src/main/java/org/solovyev/android/calculator/history/HistoryArrayAdapter.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuData.java b/android-app/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuData.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuData.java
rename to android-app/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuData.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java b/android-app/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
rename to android-app/src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/history/TextViewEditorAdapter.java b/android-app/src/main/java/org/solovyev/android/calculator/history/TextViewEditorAdapter.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/history/TextViewEditorAdapter.java
rename to android-app/src/main/java/org/solovyev/android/calculator/history/TextViewEditorAdapter.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
rename to android-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
rename to android-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
rename to android-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/MathEntityRemover.java b/android-app/src/main/java/org/solovyev/android/calculator/math/edit/MathEntityRemover.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/MathEntityRemover.java
rename to android-app/src/main/java/org/solovyev/android/calculator/math/edit/MathEntityRemover.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/VarEditDialogFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/math/edit/VarEditDialogFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/VarEditDialogFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/math/edit/VarEditDialogFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java b/android-app/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java
rename to android-app/src/main/java/org/solovyev/android/calculator/math/edit/VarEditorSaver.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/model/Messages.java b/android-app/src/main/java/org/solovyev/android/calculator/model/Messages.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/model/Messages.java
rename to android-app/src/main/java/org/solovyev/android/calculator/model/Messages.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
rename to android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java
rename to android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotFragment.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotPreferenceActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotPreferenceActivity.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotPreferenceActivity.java
rename to android-app/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotPreferenceActivity.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/MyXYSeries.java b/android-app/src/main/java/org/solovyev/android/calculator/plot/MyXYSeries.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/plot/MyXYSeries.java
rename to android-app/src/main/java/org/solovyev/android/calculator/plot/MyXYSeries.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/plot/PlotUtils.java b/android-app/src/main/java/org/solovyev/android/calculator/plot/PlotUtils.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/plot/PlotUtils.java
rename to android-app/src/main/java/org/solovyev/android/calculator/plot/PlotUtils.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/CalculatorAdditionalTitle.java b/android-app/src/main/java/org/solovyev/android/calculator/view/CalculatorAdditionalTitle.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/view/CalculatorAdditionalTitle.java
rename to android-app/src/main/java/org/solovyev/android/calculator/view/CalculatorAdditionalTitle.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/view/OnDragListenerVibrator.java b/android-app/src/main/java/org/solovyev/android/calculator/view/OnDragListenerVibrator.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/calculator/view/OnDragListenerVibrator.java
rename to android-app/src/main/java/org/solovyev/android/calculator/view/OnDragListenerVibrator.java
diff --git a/calculatorpp/src/main/java/org/solovyev/android/fragments/FragmentUtils.java b/android-app/src/main/java/org/solovyev/android/fragments/FragmentUtils.java
similarity index 100%
rename from calculatorpp/src/main/java/org/solovyev/android/fragments/FragmentUtils.java
rename to android-app/src/main/java/org/solovyev/android/fragments/FragmentUtils.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java b/android-app/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java
rename to android-app/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java b/android-app/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java
rename to android-app/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java b/android-app/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
rename to android-app/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/CalculatorppTestRunner.java b/android-app/src/test/java/org/solovyev/android/calculator/CalculatorppTestRunner.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/CalculatorppTestRunner.java
rename to android-app/src/test/java/org/solovyev/android/calculator/CalculatorppTestRunner.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java b/android-app/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java
rename to android-app/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java b/android-app/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
rename to android-app/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/model/VarTest.java b/android-app/src/test/java/org/solovyev/android/calculator/model/VarTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/model/VarTest.java
rename to android-app/src/test/java/org/solovyev/android/calculator/model/VarTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/plot/PlotUtilsTest.java b/android-app/src/test/java/org/solovyev/android/calculator/plot/PlotUtilsTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/android/calculator/plot/PlotUtilsTest.java
rename to android-app/src/test/java/org/solovyev/android/calculator/plot/PlotUtilsTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java b/android-app/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
rename to android-app/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
diff --git a/calculatorpp/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java b/android-app/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java
similarity index 100%
rename from calculatorpp/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java
rename to android-app/src/test/java/org/solovyev/common/math/DiscreteNormalizerTest.java
diff --git a/calculatorpp/res/layout-land/calc_keyboard.xml b/calculatorpp/res/layout-land/calc_keyboard.xml
deleted file mode 100644
index b93d1da5..00000000
--- a/calculatorpp/res/layout-land/calc_keyboard.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/calculatorpp/res/layout-land/calc_keyboard_mobile.xml b/calculatorpp/res/layout-land/calc_keyboard_mobile.xml
deleted file mode 100644
index 5bab90d8..00000000
--- a/calculatorpp/res/layout-land/calc_keyboard_mobile.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/calculatorpp/res/layout-large-land/calc_keyboard.xml b/calculatorpp/res/layout-large-land/calc_keyboard.xml
deleted file mode 100644
index f97d39ec..00000000
--- a/calculatorpp/res/layout-large-land/calc_keyboard.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/calculatorpp/res/layout-large/calc_keyboard.xml b/calculatorpp/res/layout-large/calc_keyboard.xml
deleted file mode 100644
index 7d9b9100..00000000
--- a/calculatorpp/res/layout-large/calc_keyboard.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/calculatorpp/res/layout-xlarge-land/calc_keyboard.xml b/calculatorpp/res/layout-xlarge-land/calc_keyboard.xml
deleted file mode 100644
index b7adc360..00000000
--- a/calculatorpp/res/layout-xlarge-land/calc_keyboard.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/calculatorpp/res/layout-xlarge/calc_keyboard.xml b/calculatorpp/res/layout-xlarge/calc_keyboard.xml
deleted file mode 100644
index a40759e7..00000000
--- a/calculatorpp/res/layout-xlarge/calc_keyboard.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_keyboard.xml b/calculatorpp/res/layout/calc_keyboard.xml
deleted file mode 100644
index 9653cb2a..00000000
--- a/calculatorpp/res/layout/calc_keyboard.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_keyboard_mobile.xml b/calculatorpp/res/layout/calc_keyboard_mobile.xml
deleted file mode 100644
index 8dbe70cc..00000000
--- a/calculatorpp/res/layout/calc_keyboard_mobile.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/calculatorpp/res/layout/calc_title.xml b/calculatorpp/res/layout/calc_title.xml
deleted file mode 100644
index 8e3143d2..00000000
--- a/calculatorpp/res/layout/calc_title.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/calculatorpp/res/layout/widget_keyboard.xml b/calculatorpp/res/layout/widget_keyboard.xml
deleted file mode 100644
index 699538ae..00000000
--- a/calculatorpp/res/layout/widget_keyboard.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/calculatorpp/res/values/colors.xml b/calculatorpp/res/values/colors.xml
deleted file mode 100644
index 13e555d2..00000000
--- a/calculatorpp/res/values/colors.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- #ffffffff
- #ffffff99
- #ffffffff
- #ffffffff
- #ff393939
- #ff707070
- #ffffff99
- #ff000000
- #ff1f1f1f
- #ff1f1f1f
- #10648c
- #088e3a
- #651456
- #393939
-
\ No newline at end of file
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/WidgetButton.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/WidgetButton.java
deleted file mode 100644
index 32c863e9..00000000
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/widget/WidgetButton.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.solovyev.android.calculator.widget;
-
-import android.content.Context;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.solovyev.android.calculator.Locator;
-import org.solovyev.android.calculator.CalculatorSpecialButton;
-import org.solovyev.android.calculator.R;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
-* User: serso
-* Date: 10/20/12
-* Time: 12:05 AM
-*/
-public enum WidgetButton {
-
- /*digits*/
- one(R.id.oneDigitButton, "1"),
- two(R.id.twoDigitButton, "2"),
- three(R.id.threeDigitButton, "3"),
- four(R.id.fourDigitButton, "4"),
- five(R.id.fiveDigitButton, "5"),
- six(R.id.sixDigitButton, "6"),
- seven(R.id.sevenDigitButton, "7"),
- eight(R.id.eightDigitButton, "8"),
- nine(R.id.nineDigitButton, "9"),
- zero(R.id.zeroDigitButton, "0"),
-
- period(R.id.periodButton, "."),
- brackets(R.id.roundBracketsButton, "()"),
-
- settings(R.id.settingsButton, CalculatorSpecialButton.settings_detached),
- like(R.id.likeButton, CalculatorSpecialButton.like),
-
- /*last row*/
- left(R.id.leftButton, CalculatorSpecialButton.cursor_left),
- right(R.id.rightButton, CalculatorSpecialButton.cursor_right),
- vars(R.id.vars_button, CalculatorSpecialButton.vars_detached),
- functions(R.id.functions_button, CalculatorSpecialButton.functions_detached),
- app(R.id.appButton, CalculatorSpecialButton.open_app),
- history(R.id.historyButton, CalculatorSpecialButton.history_detached),
-
- /*operations*/
- multiplication(R.id.multiplicationButton, "*"),
- division(R.id.divisionButton, "/"),
- plus(R.id.plusButton, "+"),
- subtraction(R.id.subtractionButton, "-"),
- percent(R.id.percentButton, "%"),
- power(R.id.powerButton, "^"),
-
- /*last column*/
- clear(R.id.clearButton, CalculatorSpecialButton.clear),
- erase(R.id.eraseButton, CalculatorSpecialButton.erase, CalculatorSpecialButton.clear),
- copy(R.id.copyButton, CalculatorSpecialButton.copy),
- paste(R.id.pasteButton, CalculatorSpecialButton.paste),
-
- /*equals*/
- equals(R.id.equalsButton, CalculatorSpecialButton.equals);
-
-
- private final int buttonId;
-
- @NotNull
- private final String onClickText;
-
- @Nullable
- private final String onLongClickText;
-
- @NotNull
- private static Map buttonsByIds = new HashMap();
-
- WidgetButton(int buttonId, @NotNull CalculatorSpecialButton onClickButton, @Nullable CalculatorSpecialButton onLongClickButton) {
- this(buttonId, onClickButton.getActionCode(), onLongClickButton == null ? null : onLongClickButton.getActionCode());
- }
-
- WidgetButton(int buttonId, @NotNull CalculatorSpecialButton onClickButton) {
- this(buttonId, onClickButton, null);
- }
-
- WidgetButton(int buttonId, @NotNull String onClickText, @Nullable String onLongClickText) {
- this.buttonId = buttonId;
- this.onClickText = onClickText;
- this.onLongClickText = onLongClickText;
-
- }
-
- WidgetButton(int buttonId, @NotNull String onClickText) {
- this(buttonId, onClickText, null);
- }
-
- public void onLongClick(@NotNull Context context) {
- Locator.getInstance().getNotifier().showDebugMessage("Calculator++ Widget", "Button pressed: " + onLongClickText);
- if (onLongClickText != null) {
- Locator.getInstance().getKeyboard().buttonPressed(onLongClickText);
- }
- }
-
- public void onClick(@NotNull Context context) {
- Locator.getInstance().getNotifier().showDebugMessage("Calculator++ Widget", "Button pressed: " + onClickText);
- Locator.getInstance().getKeyboard().buttonPressed(onClickText);
- }
-
- @Nullable
- public static WidgetButton getById(int buttonId) {
- initButtonsByIdsMap();
-
- return buttonsByIds.get(buttonId);
- }
-
- private static void initButtonsByIdsMap() {
- if ( buttonsByIds.isEmpty() ) {
- // if not initialized
-
- final WidgetButton[] widgetButtons = values();
-
- final Map localButtonsByIds = new HashMap(widgetButtons.length);
- for (WidgetButton widgetButton : widgetButtons) {
- localButtonsByIds.put(widgetButton.getButtonId(), widgetButton);
- }
-
- buttonsByIds = localButtonsByIds;
- }
- }
-
- public int getButtonId() {
- return buttonId;
- }
-}
diff --git a/calculatorpp-core/pom.xml b/core/pom.xml
similarity index 97%
rename from calculatorpp-core/pom.xml
rename to core/pom.xml
index 79a47275..55a1ae37 100644
--- a/calculatorpp-core/pom.xml
+++ b/core/pom.xml
@@ -11,7 +11,7 @@
org.solovyev.android
calculatorpp-core
1.5.3-SNAPSHOT
- Calculator++ Application Core
+ Calculator++ Core
jar
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java b/core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java
rename to core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/AbstractNumberBuilder.java b/core/src/main/java/org/solovyev/android/calculator/AbstractNumberBuilder.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/AbstractNumberBuilder.java
rename to core/src/main/java/org/solovyev/android/calculator/AbstractNumberBuilder.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/Calculator.java b/core/src/main/java/org/solovyev/android/calculator/Calculator.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/Calculator.java
rename to core/src/main/java/org/solovyev/android/calculator/Calculator.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorButtonActions.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorButtonActions.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorButtonActions.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorButtonActions.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorClipboard.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorClipboard.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorClipboard.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorClipboard.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventData.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventData.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventData.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventData.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventDataImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventDataImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventDataImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorConversionEventDataImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventData.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventData.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventData.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventData.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventDataImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventDataImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventDataImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayChangeEventDataImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayView.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayView.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayView.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayView.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewState.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewState.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewState.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewState.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventData.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventData.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventData.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventData.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventDataImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventDataImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventDataImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditorChangeEventDataImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditorImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditorImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorView.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditorView.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorView.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditorView.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewState.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewState.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewState.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewState.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewStateImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewStateImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewStateImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEditorViewStateImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEngine.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEngine.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEngine.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEngine.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEngineControl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEngineControl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEngineControl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEngineControl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEvalException.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEvalException.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEvalException.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEvalException.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventData.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventData.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventData.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventData.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventDataImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventDataImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventDataImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEvaluationEventDataImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventContainer.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventContainer.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventContainer.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEventContainer.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventData.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventData.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventData.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEventData.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventDataImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventDataImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventDataImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEventDataImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventHolder.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventHolder.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventHolder.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEventHolder.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventListener.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventListener.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventListener.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEventListener.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java
similarity index 94%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java
index 8ab0f3ad..306e0ad2 100644
--- a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java
+++ b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java
@@ -153,7 +153,16 @@ public enum CalculatorEventType {
show_settings,
show_settings_detached,
- show_like_dialog;
+ show_like_dialog,
+
+ show_create_var_dialog,
+ show_create_function_dialog,
+
+ //org.solovyev.android.calculator.plot.PlotInput
+ plot_graph,
+
+ //String
+ show_evaluation_error;
public boolean isOfType(@NotNull CalculatorEventType... types) {
for (CalculatorEventType type : types) {
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFailure.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorFailure.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFailure.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorFailure.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFailureImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorFailureImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFailureImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorFailureImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFixableError.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorFixableError.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFixableError.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorFixableError.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFunctionsMathRegistry.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorFunctionsMathRegistry.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFunctionsMathRegistry.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorFunctionsMathRegistry.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorInput.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorInput.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorInput.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorInput.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorInputImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorInputImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorInputImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorInputImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboard.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboard.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboard.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboard.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLocator.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorLocator.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLocator.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorLocator.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMathEngine.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorMathEngine.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMathEngine.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorMathEngine.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMathRegistry.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorMathRegistry.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMathRegistry.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorMathRegistry.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMessage.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorMessage.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMessage.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorMessage.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMessages.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorMessages.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorMessages.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorMessages.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorNotifier.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorNotifier.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorNotifier.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorNotifier.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOperatorsMathRegistry.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorOperatorsMathRegistry.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOperatorsMathRegistry.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorOperatorsMathRegistry.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOutput.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorOutput.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOutput.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorOutput.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOutputImpl.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorOutputImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorOutputImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorOutputImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorPostfixFunctionsRegistry.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferenceService.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorPreferenceService.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferenceService.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorPreferenceService.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorSpecialButton.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorUtils.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorUtils.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorUtils.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorUtils.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorVarsRegistry.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorVarsRegistry.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorVarsRegistry.java
rename to core/src/main/java/org/solovyev/android/calculator/CalculatorVarsRegistry.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/Change.java b/core/src/main/java/org/solovyev/android/calculator/Change.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/Change.java
rename to core/src/main/java/org/solovyev/android/calculator/Change.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/ChangeImpl.java b/core/src/main/java/org/solovyev/android/calculator/ChangeImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/ChangeImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/ChangeImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/ConversionFailure.java b/core/src/main/java/org/solovyev/android/calculator/ConversionFailure.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/ConversionFailure.java
rename to core/src/main/java/org/solovyev/android/calculator/ConversionFailure.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/ConversionFailureImpl.java b/core/src/main/java/org/solovyev/android/calculator/ConversionFailureImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/ConversionFailureImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/ConversionFailureImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/DummyCalculatorClipboard.java b/core/src/main/java/org/solovyev/android/calculator/DummyCalculatorClipboard.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/DummyCalculatorClipboard.java
rename to core/src/main/java/org/solovyev/android/calculator/DummyCalculatorClipboard.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/DummyCalculatorNotifier.java b/core/src/main/java/org/solovyev/android/calculator/DummyCalculatorNotifier.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/DummyCalculatorNotifier.java
rename to core/src/main/java/org/solovyev/android/calculator/DummyCalculatorNotifier.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/Editor.java b/core/src/main/java/org/solovyev/android/calculator/Editor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/Editor.java
rename to core/src/main/java/org/solovyev/android/calculator/Editor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/FunctionCategory.java b/core/src/main/java/org/solovyev/android/calculator/FunctionCategory.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/FunctionCategory.java
rename to core/src/main/java/org/solovyev/android/calculator/FunctionCategory.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/ListCalculatorEventContainer.java b/core/src/main/java/org/solovyev/android/calculator/ListCalculatorEventContainer.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/ListCalculatorEventContainer.java
rename to core/src/main/java/org/solovyev/android/calculator/ListCalculatorEventContainer.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/LiteNumberBuilder.java b/core/src/main/java/org/solovyev/android/calculator/LiteNumberBuilder.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/LiteNumberBuilder.java
rename to core/src/main/java/org/solovyev/android/calculator/LiteNumberBuilder.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/Locator.java b/core/src/main/java/org/solovyev/android/calculator/Locator.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/Locator.java
rename to core/src/main/java/org/solovyev/android/calculator/Locator.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/MathEntityDao.java b/core/src/main/java/org/solovyev/android/calculator/MathEntityDao.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/MathEntityDao.java
rename to core/src/main/java/org/solovyev/android/calculator/MathEntityDao.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/MathEntityPersistenceContainer.java b/core/src/main/java/org/solovyev/android/calculator/MathEntityPersistenceContainer.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/MathEntityPersistenceContainer.java
rename to core/src/main/java/org/solovyev/android/calculator/MathEntityPersistenceContainer.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/MathPersistenceEntity.java b/core/src/main/java/org/solovyev/android/calculator/MathPersistenceEntity.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/MathPersistenceEntity.java
rename to core/src/main/java/org/solovyev/android/calculator/MathPersistenceEntity.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/NumberBuilder.java b/core/src/main/java/org/solovyev/android/calculator/NumberBuilder.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/NumberBuilder.java
rename to core/src/main/java/org/solovyev/android/calculator/NumberBuilder.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/OperatorCategory.java b/core/src/main/java/org/solovyev/android/calculator/OperatorCategory.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/OperatorCategory.java
rename to core/src/main/java/org/solovyev/android/calculator/OperatorCategory.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/PreparedExpression.java b/core/src/main/java/org/solovyev/android/calculator/PreparedExpression.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/PreparedExpression.java
rename to core/src/main/java/org/solovyev/android/calculator/PreparedExpression.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java b/core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java
rename to core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/ToJsclTextProcessor.java b/core/src/main/java/org/solovyev/android/calculator/ToJsclTextProcessor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/ToJsclTextProcessor.java
rename to core/src/main/java/org/solovyev/android/calculator/ToJsclTextProcessor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/VarCategory.java b/core/src/main/java/org/solovyev/android/calculator/VarCategory.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/VarCategory.java
rename to core/src/main/java/org/solovyev/android/calculator/VarCategory.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/external/CalculatorExternalListenersContainer.java b/core/src/main/java/org/solovyev/android/calculator/external/CalculatorExternalListenersContainer.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/external/CalculatorExternalListenersContainer.java
rename to core/src/main/java/org/solovyev/android/calculator/external/CalculatorExternalListenersContainer.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryState.java b/core/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryState.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryState.java
rename to core/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryState.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorDisplayHistoryState.java b/core/src/main/java/org/solovyev/android/calculator/history/CalculatorDisplayHistoryState.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorDisplayHistoryState.java
rename to core/src/main/java/org/solovyev/android/calculator/history/CalculatorDisplayHistoryState.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java b/core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java
rename to core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryImpl.java b/core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryImpl.java
rename to core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryState.java b/core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryState.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryState.java
rename to core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryState.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/EditorHistoryState.java b/core/src/main/java/org/solovyev/android/calculator/history/EditorHistoryState.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/EditorHistoryState.java
rename to core/src/main/java/org/solovyev/android/calculator/history/EditorHistoryState.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/History.java b/core/src/main/java/org/solovyev/android/calculator/history/History.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/History.java
rename to core/src/main/java/org/solovyev/android/calculator/history/History.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/HistoryUtils.java b/core/src/main/java/org/solovyev/android/calculator/history/HistoryUtils.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/HistoryUtils.java
rename to core/src/main/java/org/solovyev/android/calculator/history/HistoryUtils.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java b/core/src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java
rename to core/src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java b/core/src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java
rename to core/src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/math/MathType.java b/core/src/main/java/org/solovyev/android/calculator/math/MathType.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/math/MathType.java
rename to core/src/main/java/org/solovyev/android/calculator/math/MathType.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/AFunction.java b/core/src/main/java/org/solovyev/android/calculator/model/AFunction.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/AFunction.java
rename to core/src/main/java/org/solovyev/android/calculator/model/AFunction.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/Functions.java b/core/src/main/java/org/solovyev/android/calculator/model/Functions.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/Functions.java
rename to core/src/main/java/org/solovyev/android/calculator/model/Functions.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java b/core/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java
rename to core/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/Var.java b/core/src/main/java/org/solovyev/android/calculator/model/Var.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/Var.java
rename to core/src/main/java/org/solovyev/android/calculator/model/Var.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/Vars.java b/core/src/main/java/org/solovyev/android/calculator/model/Vars.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/Vars.java
rename to core/src/main/java/org/solovyev/android/calculator/model/Vars.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/DummyTextProcessor.java b/core/src/main/java/org/solovyev/android/calculator/text/DummyTextProcessor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/DummyTextProcessor.java
rename to core/src/main/java/org/solovyev/android/calculator/text/DummyTextProcessor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/FromJsclSimplifyTextProcessor.java b/core/src/main/java/org/solovyev/android/calculator/text/FromJsclSimplifyTextProcessor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/FromJsclSimplifyTextProcessor.java
rename to core/src/main/java/org/solovyev/android/calculator/text/FromJsclSimplifyTextProcessor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/TextProcessor.java b/core/src/main/java/org/solovyev/android/calculator/text/TextProcessor.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/TextProcessor.java
rename to core/src/main/java/org/solovyev/android/calculator/text/TextProcessor.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/units/CalculatorNumeralBase.java b/core/src/main/java/org/solovyev/android/calculator/units/CalculatorNumeralBase.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/android/calculator/units/CalculatorNumeralBase.java
rename to core/src/main/java/org/solovyev/android/calculator/units/CalculatorNumeralBase.java
diff --git a/core/src/main/java/org/solovyev/common/DelayedExecutor.java b/core/src/main/java/org/solovyev/common/DelayedExecutor.java
new file mode 100644
index 00000000..46aec463
--- /dev/null
+++ b/core/src/main/java/org/solovyev/common/DelayedExecutor.java
@@ -0,0 +1,16 @@
+package org.solovyev.common;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * User: serso
+ * Date: 12/1/12
+ * Time: 4:10 PM
+ */
+public interface DelayedExecutor extends Executor {
+
+ void execute(@NotNull Runnable command, long delay, @NotNull TimeUnit delayUnit);
+}
diff --git a/calculatorpp-core/src/main/java/org/solovyev/common/utils/ListListenersContainer.java b/core/src/main/java/org/solovyev/common/utils/ListListenersContainer.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/common/utils/ListListenersContainer.java
rename to core/src/main/java/org/solovyev/common/utils/ListListenersContainer.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/math/units/ConversionException.java b/core/src/main/java/org/solovyev/math/units/ConversionException.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/math/units/ConversionException.java
rename to core/src/main/java/org/solovyev/math/units/ConversionException.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/math/units/ConversionUtils.java b/core/src/main/java/org/solovyev/math/units/ConversionUtils.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/math/units/ConversionUtils.java
rename to core/src/main/java/org/solovyev/math/units/ConversionUtils.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/math/units/Unit.java b/core/src/main/java/org/solovyev/math/units/Unit.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/math/units/Unit.java
rename to core/src/main/java/org/solovyev/math/units/Unit.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/math/units/UnitConverter.java b/core/src/main/java/org/solovyev/math/units/UnitConverter.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/math/units/UnitConverter.java
rename to core/src/main/java/org/solovyev/math/units/UnitConverter.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/math/units/UnitImpl.java b/core/src/main/java/org/solovyev/math/units/UnitImpl.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/math/units/UnitImpl.java
rename to core/src/main/java/org/solovyev/math/units/UnitImpl.java
diff --git a/calculatorpp-core/src/main/java/org/solovyev/math/units/UnitType.java b/core/src/main/java/org/solovyev/math/units/UnitType.java
similarity index 100%
rename from calculatorpp-core/src/main/java/org/solovyev/math/units/UnitType.java
rename to core/src/main/java/org/solovyev/math/units/UnitType.java
diff --git a/calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages.properties b/core/src/main/resources/org/solovyev/android/calculator/messages.properties
similarity index 100%
rename from calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages.properties
rename to core/src/main/resources/org/solovyev/android/calculator/messages.properties
diff --git a/calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages_ru.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_ru.properties
similarity index 100%
rename from calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages_ru.properties
rename to core/src/main/resources/org/solovyev/android/calculator/messages_ru.properties
diff --git a/calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties
similarity index 100%
rename from calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties
rename to core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties
diff --git a/calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages_zh.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_zh.properties
similarity index 100%
rename from calculatorpp-core/src/main/resources/org/solovyev/android/calculator/messages_zh.properties
rename to core/src/main/resources/org/solovyev/android/calculator/messages_zh.properties
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/AbstractCalculatorTest.java b/core/src/test/java/org/solovyev/android/calculator/AbstractCalculatorTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/AbstractCalculatorTest.java
rename to core/src/test/java/org/solovyev/android/calculator/AbstractCalculatorTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImplTest.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImplTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImplTest.java
rename to core/src/test/java/org/solovyev/android/calculator/CalculatorDisplayViewStateImplTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorEditorImplTest.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorEditorImplTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorEditorImplTest.java
rename to core/src/test/java/org/solovyev/android/calculator/CalculatorEditorImplTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorEditorViewStateImplTest.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorEditorViewStateImplTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorEditorViewStateImplTest.java
rename to core/src/test/java/org/solovyev/android/calculator/CalculatorEditorViewStateImplTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorImplTest.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorImplTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorImplTest.java
rename to core/src/test/java/org/solovyev/android/calculator/CalculatorImplTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java b/core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
rename to core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/FromJsclSimplifyTextProcessorTest.java b/core/src/test/java/org/solovyev/android/calculator/FromJsclSimplifyTextProcessorTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/FromJsclSimplifyTextProcessorTest.java
rename to core/src/test/java/org/solovyev/android/calculator/FromJsclSimplifyTextProcessorTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/history/CalculatorHistoryImplTest.java b/core/src/test/java/org/solovyev/android/calculator/history/CalculatorHistoryImplTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/history/CalculatorHistoryImplTest.java
rename to core/src/test/java/org/solovyev/android/calculator/history/CalculatorHistoryImplTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessorTest.java b/core/src/test/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessorTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessorTest.java
rename to core/src/test/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessorTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/math/MathTypeTest.java b/core/src/test/java/org/solovyev/android/calculator/math/MathTypeTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/math/MathTypeTest.java
rename to core/src/test/java/org/solovyev/android/calculator/math/MathTypeTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/AndroidCalculatorEngineTest.java b/core/src/test/java/org/solovyev/android/calculator/model/AndroidCalculatorEngineTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/AndroidCalculatorEngineTest.java
rename to core/src/test/java/org/solovyev/android/calculator/model/AndroidCalculatorEngineTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/FunctionsTest.java b/core/src/test/java/org/solovyev/android/calculator/model/FunctionsTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/FunctionsTest.java
rename to core/src/test/java/org/solovyev/android/calculator/model/FunctionsTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java b/core/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java
rename to core/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java
diff --git a/calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java b/core/src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java
similarity index 100%
rename from calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java
rename to core/src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java
diff --git a/calculatorpp-core/src/test/resources/org/solovyev/android/calculator/model/nb_table.csv b/core/src/test/resources/org/solovyev/android/calculator/model/nb_table.csv
similarity index 100%
rename from calculatorpp-core/src/test/resources/org/solovyev/android/calculator/model/nb_table.csv
rename to core/src/test/resources/org/solovyev/android/calculator/model/nb_table.csv
diff --git a/pom.xml b/pom.xml
index 7a3d5cf8..64858624 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,9 +23,12 @@
- calculatorpp
- calculatorpp-test
- calculatorpp-core
+ android-app
+ android-app-core
+ android-app-widget
+ android-app-onscreen
+ android-app-test
+ core
@@ -37,7 +40,34 @@
+
+ org.solovyev.android
+ calculatorpp-core
+ 1.5.3-SNAPSHOT
+
+
+
+ org.solovyev.android
+ calculatorpp-android-app-core
+ 1.5.3-SNAPSHOT
+ apklib
+
+
+
+ org.solovyev.android
+ calculatorpp-android-app-widget
+ 1.5.3-SNAPSHOT
+ apklib
+
+
+ org.solovyev.android
+ calculatorpp-android-app-onscreen
+ 1.5.3-SNAPSHOT
+ apklib
+
+
+
org.solovyev
common-core
${common.version}