diff --git a/android-app-core/pom.xml b/android-app-core/pom.xml index 6099e3b9..20d03dc7 100644 --- a/android-app-core/pom.xml +++ b/android-app-core/pom.xml @@ -17,10 +17,39 @@ 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 + + diff --git a/android-app/res/drawable-hdpi/ab_add.png b/android-app-core/res/drawable-hdpi/ab_add.png similarity index 100% rename from android-app/res/drawable-hdpi/ab_add.png rename to android-app-core/res/drawable-hdpi/ab_add.png diff --git a/android-app/res/drawable-hdpi/ab_icon.png b/android-app-core/res/drawable-hdpi/ab_icon.png similarity index 100% rename from android-app/res/drawable-hdpi/ab_icon.png rename to android-app-core/res/drawable-hdpi/ab_icon.png diff --git a/android-app/res/drawable-hdpi/ab_icon_long.png b/android-app-core/res/drawable-hdpi/ab_icon_long.png similarity index 100% rename from android-app/res/drawable-hdpi/ab_icon_long.png rename to android-app-core/res/drawable-hdpi/ab_icon_long.png diff --git a/android-app/res/drawable-hdpi/ab_settings.png b/android-app-core/res/drawable-hdpi/ab_settings.png similarity index 100% rename from android-app/res/drawable-hdpi/ab_settings.png rename to android-app-core/res/drawable-hdpi/ab_settings.png diff --git a/android-app/res/drawable-hdpi/icon.png b/android-app-core/res/drawable-hdpi/icon.png similarity index 100% rename from android-app/res/drawable-hdpi/icon.png rename to android-app-core/res/drawable-hdpi/icon.png diff --git a/android-app/res/drawable-hdpi/icon_onscreen.png b/android-app-core/res/drawable-hdpi/icon_onscreen.png similarity index 100% rename from android-app/res/drawable-hdpi/icon_onscreen.png rename to android-app-core/res/drawable-hdpi/icon_onscreen.png diff --git a/android-app/res/drawable-hdpi/kb_copy.png b/android-app-core/res/drawable-hdpi/kb_copy.png similarity index 100% rename from android-app/res/drawable-hdpi/kb_copy.png rename to android-app-core/res/drawable-hdpi/kb_copy.png diff --git a/android-app/res/drawable-hdpi/kb_delete.png b/android-app-core/res/drawable-hdpi/kb_delete.png similarity index 100% rename from android-app/res/drawable-hdpi/kb_delete.png rename to android-app-core/res/drawable-hdpi/kb_delete.png diff --git a/android-app/res/drawable-hdpi/kb_facebook.png b/android-app-core/res/drawable-hdpi/kb_facebook.png similarity index 100% rename from android-app/res/drawable-hdpi/kb_facebook.png rename to android-app-core/res/drawable-hdpi/kb_facebook.png diff --git a/android-app/res/drawable-hdpi/kb_heart.png b/android-app-core/res/drawable-hdpi/kb_heart.png similarity index 100% rename from android-app/res/drawable-hdpi/kb_heart.png rename to android-app-core/res/drawable-hdpi/kb_heart.png diff --git a/android-app/res/drawable-hdpi/kb_logo.png b/android-app-core/res/drawable-hdpi/kb_logo.png similarity index 100% rename from android-app/res/drawable-hdpi/kb_logo.png rename to android-app-core/res/drawable-hdpi/kb_logo.png diff --git a/android-app/res/drawable-hdpi/kb_paste.png b/android-app-core/res/drawable-hdpi/kb_paste.png similarity index 100% rename from android-app/res/drawable-hdpi/kb_paste.png rename to android-app-core/res/drawable-hdpi/kb_paste.png diff --git a/android-app/res/drawable-hdpi/kb_settings.png b/android-app-core/res/drawable-hdpi/kb_settings.png similarity index 100% rename from android-app/res/drawable-hdpi/kb_settings.png rename to android-app-core/res/drawable-hdpi/kb_settings.png diff --git a/android-app/res/drawable-hdpi/logo.png b/android-app-core/res/drawable-hdpi/logo.png similarity index 100% rename from android-app/res/drawable-hdpi/logo.png rename to android-app-core/res/drawable-hdpi/logo.png diff --git a/android-app/res/drawable-ldpi/ab_add.png b/android-app-core/res/drawable-ldpi/ab_add.png similarity index 100% rename from android-app/res/drawable-ldpi/ab_add.png rename to android-app-core/res/drawable-ldpi/ab_add.png diff --git a/android-app/res/drawable-ldpi/ab_icon.png b/android-app-core/res/drawable-ldpi/ab_icon.png similarity index 100% rename from android-app/res/drawable-ldpi/ab_icon.png rename to android-app-core/res/drawable-ldpi/ab_icon.png diff --git a/android-app/res/drawable-ldpi/ab_settings.png b/android-app-core/res/drawable-ldpi/ab_settings.png similarity index 100% rename from android-app/res/drawable-ldpi/ab_settings.png rename to android-app-core/res/drawable-ldpi/ab_settings.png diff --git a/android-app/res/drawable-ldpi/icon.png b/android-app-core/res/drawable-ldpi/icon.png similarity index 100% rename from android-app/res/drawable-ldpi/icon.png rename to android-app-core/res/drawable-ldpi/icon.png diff --git a/android-app/res/drawable-ldpi/icon_onscreen.png b/android-app-core/res/drawable-ldpi/icon_onscreen.png similarity index 100% rename from android-app/res/drawable-ldpi/icon_onscreen.png rename to android-app-core/res/drawable-ldpi/icon_onscreen.png diff --git a/android-app/res/drawable-ldpi/kb_copy.png b/android-app-core/res/drawable-ldpi/kb_copy.png similarity index 100% rename from android-app/res/drawable-ldpi/kb_copy.png rename to android-app-core/res/drawable-ldpi/kb_copy.png diff --git a/android-app/res/drawable-ldpi/kb_delete.png b/android-app-core/res/drawable-ldpi/kb_delete.png similarity index 100% rename from android-app/res/drawable-ldpi/kb_delete.png rename to android-app-core/res/drawable-ldpi/kb_delete.png diff --git a/android-app/res/drawable-ldpi/kb_facebook.png b/android-app-core/res/drawable-ldpi/kb_facebook.png similarity index 100% rename from android-app/res/drawable-ldpi/kb_facebook.png rename to android-app-core/res/drawable-ldpi/kb_facebook.png diff --git a/android-app/res/drawable-ldpi/kb_heart.png b/android-app-core/res/drawable-ldpi/kb_heart.png similarity index 100% rename from android-app/res/drawable-ldpi/kb_heart.png rename to android-app-core/res/drawable-ldpi/kb_heart.png diff --git a/android-app/res/drawable-ldpi/kb_logo.png b/android-app-core/res/drawable-ldpi/kb_logo.png similarity index 100% rename from android-app/res/drawable-ldpi/kb_logo.png rename to android-app-core/res/drawable-ldpi/kb_logo.png diff --git a/android-app/res/drawable-ldpi/kb_paste.png b/android-app-core/res/drawable-ldpi/kb_paste.png similarity index 100% rename from android-app/res/drawable-ldpi/kb_paste.png rename to android-app-core/res/drawable-ldpi/kb_paste.png diff --git a/android-app/res/drawable-ldpi/kb_settings.png b/android-app-core/res/drawable-ldpi/kb_settings.png similarity index 100% rename from android-app/res/drawable-ldpi/kb_settings.png rename to android-app-core/res/drawable-ldpi/kb_settings.png diff --git a/android-app/res/drawable-ldpi/logo.png b/android-app-core/res/drawable-ldpi/logo.png similarity index 100% rename from android-app/res/drawable-ldpi/logo.png rename to android-app-core/res/drawable-ldpi/logo.png diff --git a/android-app/res/drawable-mdpi/ab_add.png b/android-app-core/res/drawable-mdpi/ab_add.png similarity index 100% rename from android-app/res/drawable-mdpi/ab_add.png rename to android-app-core/res/drawable-mdpi/ab_add.png diff --git a/android-app/res/drawable-mdpi/ab_icon.png b/android-app-core/res/drawable-mdpi/ab_icon.png similarity index 100% rename from android-app/res/drawable-mdpi/ab_icon.png rename to android-app-core/res/drawable-mdpi/ab_icon.png diff --git a/android-app/res/drawable-mdpi/ab_settings.png b/android-app-core/res/drawable-mdpi/ab_settings.png similarity index 100% rename from android-app/res/drawable-mdpi/ab_settings.png rename to android-app-core/res/drawable-mdpi/ab_settings.png diff --git a/android-app/res/drawable-mdpi/icon.png b/android-app-core/res/drawable-mdpi/icon.png similarity index 100% rename from android-app/res/drawable-mdpi/icon.png rename to android-app-core/res/drawable-mdpi/icon.png diff --git a/android-app/res/drawable-mdpi/icon_onscreen.png b/android-app-core/res/drawable-mdpi/icon_onscreen.png similarity index 100% rename from android-app/res/drawable-mdpi/icon_onscreen.png rename to android-app-core/res/drawable-mdpi/icon_onscreen.png diff --git a/android-app/res/drawable-mdpi/kb_copy.png b/android-app-core/res/drawable-mdpi/kb_copy.png similarity index 100% rename from android-app/res/drawable-mdpi/kb_copy.png rename to android-app-core/res/drawable-mdpi/kb_copy.png diff --git a/android-app/res/drawable-mdpi/kb_delete.png b/android-app-core/res/drawable-mdpi/kb_delete.png similarity index 100% rename from android-app/res/drawable-mdpi/kb_delete.png rename to android-app-core/res/drawable-mdpi/kb_delete.png diff --git a/android-app/res/drawable-mdpi/kb_facebook.png b/android-app-core/res/drawable-mdpi/kb_facebook.png similarity index 100% rename from android-app/res/drawable-mdpi/kb_facebook.png rename to android-app-core/res/drawable-mdpi/kb_facebook.png diff --git a/android-app/res/drawable-mdpi/kb_heart.png b/android-app-core/res/drawable-mdpi/kb_heart.png similarity index 100% rename from android-app/res/drawable-mdpi/kb_heart.png rename to android-app-core/res/drawable-mdpi/kb_heart.png diff --git a/android-app/res/drawable-mdpi/kb_logo.png b/android-app-core/res/drawable-mdpi/kb_logo.png similarity index 100% rename from android-app/res/drawable-mdpi/kb_logo.png rename to android-app-core/res/drawable-mdpi/kb_logo.png diff --git a/android-app/res/drawable-mdpi/kb_paste.png b/android-app-core/res/drawable-mdpi/kb_paste.png similarity index 100% rename from android-app/res/drawable-mdpi/kb_paste.png rename to android-app-core/res/drawable-mdpi/kb_paste.png diff --git a/android-app/res/drawable-mdpi/kb_settings.png b/android-app-core/res/drawable-mdpi/kb_settings.png similarity index 100% rename from android-app/res/drawable-mdpi/kb_settings.png rename to android-app-core/res/drawable-mdpi/kb_settings.png diff --git a/android-app/res/drawable-mdpi/logo.png b/android-app-core/res/drawable-mdpi/logo.png similarity index 100% rename from android-app/res/drawable-mdpi/logo.png rename to android-app-core/res/drawable-mdpi/logo.png diff --git a/android-app/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 android-app/res/drawable-nodpi/cpp_onscreen_button_close.png rename to android-app-core/res/drawable-nodpi/cpp_onscreen_button_close.png diff --git a/android-app/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 android-app/res/drawable-nodpi/cpp_onscreen_button_fold.png rename to android-app-core/res/drawable-nodpi/cpp_onscreen_button_fold.png diff --git a/android-app/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 android-app/res/drawable-nodpi/cpp_onscreen_button_minimize.png rename to android-app-core/res/drawable-nodpi/cpp_onscreen_button_minimize.png diff --git a/android-app/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 android-app/res/drawable-nodpi/cpp_onscreen_header_logo.png rename to android-app-core/res/drawable-nodpi/cpp_onscreen_header_logo.png diff --git a/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/res/drawable-nodpi/widget_preview.png b/android-app-core/res/drawable-nodpi/widget_preview.png similarity index 100% rename from android-app/res/drawable-nodpi/widget_preview.png rename to android-app-core/res/drawable-nodpi/widget_preview.png diff --git a/android-app/res/drawable-xhdpi/ab_add.png b/android-app-core/res/drawable-xhdpi/ab_add.png similarity index 100% rename from android-app/res/drawable-xhdpi/ab_add.png rename to android-app-core/res/drawable-xhdpi/ab_add.png diff --git a/android-app/res/drawable-xhdpi/ab_icon.png b/android-app-core/res/drawable-xhdpi/ab_icon.png similarity index 100% rename from android-app/res/drawable-xhdpi/ab_icon.png rename to android-app-core/res/drawable-xhdpi/ab_icon.png diff --git a/android-app/res/drawable-xhdpi/ab_settings.png b/android-app-core/res/drawable-xhdpi/ab_settings.png similarity index 100% rename from android-app/res/drawable-xhdpi/ab_settings.png rename to android-app-core/res/drawable-xhdpi/ab_settings.png diff --git a/android-app/res/drawable-xhdpi/ic_menu_preferences.png b/android-app-core/res/drawable-xhdpi/ic_menu_preferences.png similarity index 100% rename from android-app/res/drawable-xhdpi/ic_menu_preferences.png rename to android-app-core/res/drawable-xhdpi/ic_menu_preferences.png diff --git a/android-app/res/drawable-xhdpi/icon.png b/android-app-core/res/drawable-xhdpi/icon.png similarity index 100% rename from android-app/res/drawable-xhdpi/icon.png rename to android-app-core/res/drawable-xhdpi/icon.png diff --git a/android-app/res/drawable-xhdpi/icon_onscreen.png b/android-app-core/res/drawable-xhdpi/icon_onscreen.png similarity index 100% rename from android-app/res/drawable-xhdpi/icon_onscreen.png rename to android-app-core/res/drawable-xhdpi/icon_onscreen.png diff --git a/android-app/res/drawable-xhdpi/kb_copy.png b/android-app-core/res/drawable-xhdpi/kb_copy.png similarity index 100% rename from android-app/res/drawable-xhdpi/kb_copy.png rename to android-app-core/res/drawable-xhdpi/kb_copy.png diff --git a/android-app/res/drawable-xhdpi/kb_delete.png b/android-app-core/res/drawable-xhdpi/kb_delete.png similarity index 100% rename from android-app/res/drawable-xhdpi/kb_delete.png rename to android-app-core/res/drawable-xhdpi/kb_delete.png diff --git a/android-app/res/drawable-xhdpi/kb_facebook.png b/android-app-core/res/drawable-xhdpi/kb_facebook.png similarity index 100% rename from android-app/res/drawable-xhdpi/kb_facebook.png rename to android-app-core/res/drawable-xhdpi/kb_facebook.png diff --git a/android-app/res/drawable-xhdpi/kb_heart.png b/android-app-core/res/drawable-xhdpi/kb_heart.png similarity index 100% rename from android-app/res/drawable-xhdpi/kb_heart.png rename to android-app-core/res/drawable-xhdpi/kb_heart.png diff --git a/android-app/res/drawable-xhdpi/kb_logo.png b/android-app-core/res/drawable-xhdpi/kb_logo.png similarity index 100% rename from android-app/res/drawable-xhdpi/kb_logo.png rename to android-app-core/res/drawable-xhdpi/kb_logo.png diff --git a/android-app/res/drawable-xhdpi/kb_paste.png b/android-app-core/res/drawable-xhdpi/kb_paste.png similarity index 100% rename from android-app/res/drawable-xhdpi/kb_paste.png rename to android-app-core/res/drawable-xhdpi/kb_paste.png diff --git a/android-app/res/drawable-xhdpi/kb_settings.png b/android-app-core/res/drawable-xhdpi/kb_settings.png similarity index 100% rename from android-app/res/drawable-xhdpi/kb_settings.png rename to android-app-core/res/drawable-xhdpi/kb_settings.png diff --git a/android-app/res/drawable-xhdpi/logo.png b/android-app-core/res/drawable-xhdpi/logo.png similarity index 100% rename from android-app/res/drawable-xhdpi/logo.png rename to android-app-core/res/drawable-xhdpi/logo.png diff --git a/android-app/res/drawable-xlarge-hdpi/kb_copy.png b/android-app-core/res/drawable-xlarge-hdpi/kb_copy.png similarity index 100% rename from android-app/res/drawable-xlarge-hdpi/kb_copy.png rename to android-app-core/res/drawable-xlarge-hdpi/kb_copy.png diff --git a/android-app/res/drawable-xlarge-hdpi/kb_delete.png b/android-app-core/res/drawable-xlarge-hdpi/kb_delete.png similarity index 100% rename from android-app/res/drawable-xlarge-hdpi/kb_delete.png rename to android-app-core/res/drawable-xlarge-hdpi/kb_delete.png diff --git a/android-app/res/drawable-xlarge-hdpi/kb_facebook.png b/android-app-core/res/drawable-xlarge-hdpi/kb_facebook.png similarity index 100% rename from android-app/res/drawable-xlarge-hdpi/kb_facebook.png rename to android-app-core/res/drawable-xlarge-hdpi/kb_facebook.png diff --git a/android-app/res/drawable-xlarge-hdpi/kb_heart.png b/android-app-core/res/drawable-xlarge-hdpi/kb_heart.png similarity index 100% rename from android-app/res/drawable-xlarge-hdpi/kb_heart.png rename to android-app-core/res/drawable-xlarge-hdpi/kb_heart.png diff --git a/android-app/res/drawable-xlarge-hdpi/kb_logo.png b/android-app-core/res/drawable-xlarge-hdpi/kb_logo.png similarity index 100% rename from android-app/res/drawable-xlarge-hdpi/kb_logo.png rename to android-app-core/res/drawable-xlarge-hdpi/kb_logo.png diff --git a/android-app/res/drawable-xlarge-hdpi/kb_paste.png b/android-app-core/res/drawable-xlarge-hdpi/kb_paste.png similarity index 100% rename from android-app/res/drawable-xlarge-hdpi/kb_paste.png rename to android-app-core/res/drawable-xlarge-hdpi/kb_paste.png diff --git a/android-app/res/drawable-xlarge-hdpi/kb_settings.png b/android-app-core/res/drawable-xlarge-hdpi/kb_settings.png similarity index 100% rename from android-app/res/drawable-xlarge-hdpi/kb_settings.png rename to android-app-core/res/drawable-xlarge-hdpi/kb_settings.png diff --git a/android-app/res/drawable/blue_button.xml b/android-app-core/res/drawable/blue_button.xml similarity index 100% rename from android-app/res/drawable/blue_button.xml rename to android-app-core/res/drawable/blue_button.xml diff --git a/android-app/res/drawable/blue_button_dark.xml b/android-app-core/res/drawable/blue_button_dark.xml similarity index 100% rename from android-app/res/drawable/blue_button_dark.xml rename to android-app-core/res/drawable/blue_button_dark.xml diff --git a/android-app/res/drawable/blue_button_dark_shape.xml b/android-app-core/res/drawable/blue_button_dark_shape.xml similarity index 100% rename from android-app/res/drawable/blue_button_dark_shape.xml rename to android-app-core/res/drawable/blue_button_dark_shape.xml diff --git a/android-app/res/drawable/blue_button_shape.xml b/android-app-core/res/drawable/blue_button_shape.xml similarity index 100% rename from android-app/res/drawable/blue_button_shape.xml rename to android-app-core/res/drawable/blue_button_shape.xml diff --git a/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/res/drawable/gray_button.xml b/android-app-core/res/drawable/gray_button.xml similarity index 100% rename from android-app/res/drawable/gray_button.xml rename to android-app-core/res/drawable/gray_button.xml diff --git a/android-app/res/drawable/gray_button_dark.xml b/android-app-core/res/drawable/gray_button_dark.xml similarity index 100% rename from android-app/res/drawable/gray_button_dark.xml rename to android-app-core/res/drawable/gray_button_dark.xml diff --git a/android-app/res/drawable/gray_button_dark_shape.xml b/android-app-core/res/drawable/gray_button_dark_shape.xml similarity index 100% rename from android-app/res/drawable/gray_button_dark_shape.xml rename to android-app-core/res/drawable/gray_button_dark_shape.xml diff --git a/android-app/res/drawable/gray_button_shape.xml b/android-app-core/res/drawable/gray_button_shape.xml similarity index 100% rename from android-app/res/drawable/gray_button_shape.xml rename to android-app-core/res/drawable/gray_button_shape.xml diff --git a/android-app/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 android-app/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/android-app/res/drawable/metro_blue_button.xml b/android-app-core/res/drawable/metro_blue_button.xml similarity index 100% rename from android-app/res/drawable/metro_blue_button.xml rename to android-app-core/res/drawable/metro_blue_button.xml diff --git a/android-app/res/drawable/metro_blue_button_shape.xml b/android-app-core/res/drawable/metro_blue_button_shape.xml similarity index 100% rename from android-app/res/drawable/metro_blue_button_shape.xml rename to android-app-core/res/drawable/metro_blue_button_shape.xml diff --git a/android-app/res/drawable/metro_blue_list_item.xml b/android-app-core/res/drawable/metro_blue_list_item.xml similarity index 100% rename from android-app/res/drawable/metro_blue_list_item.xml rename to android-app-core/res/drawable/metro_blue_list_item.xml diff --git a/android-app/res/drawable/metro_button_dark.xml b/android-app-core/res/drawable/metro_button_dark.xml similarity index 100% rename from android-app/res/drawable/metro_button_dark.xml rename to android-app-core/res/drawable/metro_button_dark.xml diff --git a/android-app/res/drawable/metro_button_dark_shape.xml b/android-app-core/res/drawable/metro_button_dark_shape.xml similarity index 100% rename from android-app/res/drawable/metro_button_dark_shape.xml rename to android-app-core/res/drawable/metro_button_dark_shape.xml diff --git a/android-app/res/drawable/metro_button_green.xml b/android-app-core/res/drawable/metro_button_green.xml similarity index 100% rename from android-app/res/drawable/metro_button_green.xml rename to android-app-core/res/drawable/metro_button_green.xml diff --git a/android-app/res/drawable/metro_button_green_shape.xml b/android-app-core/res/drawable/metro_button_green_shape.xml similarity index 100% rename from android-app/res/drawable/metro_button_green_shape.xml rename to android-app-core/res/drawable/metro_button_green_shape.xml diff --git a/android-app/res/drawable/metro_button_light.xml b/android-app-core/res/drawable/metro_button_light.xml similarity index 100% rename from android-app/res/drawable/metro_button_light.xml rename to android-app-core/res/drawable/metro_button_light.xml diff --git a/android-app/res/drawable/metro_button_light_shape.xml b/android-app-core/res/drawable/metro_button_light_shape.xml similarity index 100% rename from android-app/res/drawable/metro_button_light_shape.xml rename to android-app-core/res/drawable/metro_button_light_shape.xml diff --git a/android-app/res/drawable/metro_button_pressed.xml b/android-app-core/res/drawable/metro_button_pressed.xml similarity index 100% rename from android-app/res/drawable/metro_button_pressed.xml rename to android-app-core/res/drawable/metro_button_pressed.xml diff --git a/android-app/res/drawable/metro_button_purple.xml b/android-app-core/res/drawable/metro_button_purple.xml similarity index 100% rename from android-app/res/drawable/metro_button_purple.xml rename to android-app-core/res/drawable/metro_button_purple.xml diff --git a/android-app/res/drawable/metro_button_purple_shape.xml b/android-app-core/res/drawable/metro_button_purple_shape.xml similarity index 100% rename from android-app/res/drawable/metro_button_purple_shape.xml rename to android-app-core/res/drawable/metro_button_purple_shape.xml diff --git a/android-app/res/drawable/metro_green_list_item.xml b/android-app-core/res/drawable/metro_green_list_item.xml similarity index 100% rename from android-app/res/drawable/metro_green_list_item.xml rename to android-app-core/res/drawable/metro_green_list_item.xml diff --git a/android-app/res/drawable/metro_purple_list_item.xml b/android-app-core/res/drawable/metro_purple_list_item.xml similarity index 100% rename from android-app/res/drawable/metro_purple_list_item.xml rename to android-app-core/res/drawable/metro_purple_list_item.xml diff --git a/android-app/res/drawable/pane_background.xml b/android-app-core/res/drawable/pane_background.xml similarity index 100% rename from android-app/res/drawable/pane_background.xml rename to android-app-core/res/drawable/pane_background.xml diff --git a/android-app/res/drawable/violet_button.xml b/android-app-core/res/drawable/violet_button.xml similarity index 100% rename from android-app/res/drawable/violet_button.xml rename to android-app-core/res/drawable/violet_button.xml diff --git a/android-app/res/drawable/violet_button_dark.xml b/android-app-core/res/drawable/violet_button_dark.xml similarity index 100% rename from android-app/res/drawable/violet_button_dark.xml rename to android-app-core/res/drawable/violet_button_dark.xml diff --git a/android-app/res/drawable/violet_button_dark_shape.xml b/android-app-core/res/drawable/violet_button_dark_shape.xml similarity index 100% rename from android-app/res/drawable/violet_button_dark_shape.xml rename to android-app-core/res/drawable/violet_button_dark_shape.xml diff --git a/android-app/res/drawable/violet_button_shape.xml b/android-app-core/res/drawable/violet_button_shape.xml similarity index 100% rename from android-app/res/drawable/violet_button_shape.xml rename to android-app-core/res/drawable/violet_button_shape.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/android-app/res/values-es/text_about.xml b/android-app-core/res/values-es/text_about.xml similarity index 100% rename from android-app/res/values-es/text_about.xml rename to android-app-core/res/values-es/text_about.xml diff --git a/android-app/res/values-es/text_functions.xml b/android-app-core/res/values-es/text_functions.xml similarity index 100% rename from android-app/res/values-es/text_functions.xml rename to android-app-core/res/values-es/text_functions.xml diff --git a/android-app/res/values-es/text_help.xml b/android-app-core/res/values-es/text_help.xml similarity index 100% rename from android-app/res/values-es/text_help.xml rename to android-app-core/res/values-es/text_help.xml diff --git a/android-app/res/values-es/text_operators.xml b/android-app-core/res/values-es/text_operators.xml similarity index 100% rename from android-app/res/values-es/text_operators.xml rename to android-app-core/res/values-es/text_operators.xml diff --git a/android-app/res/values-es/text_strings.xml b/android-app-core/res/values-es/text_strings.xml similarity index 100% rename from android-app/res/values-es/text_strings.xml rename to android-app-core/res/values-es/text_strings.xml diff --git a/android-app/res/values-es/text_vars.xml b/android-app-core/res/values-es/text_vars.xml similarity index 100% rename from android-app/res/values-es/text_vars.xml rename to android-app-core/res/values-es/text_vars.xml diff --git a/android-app/res/values-it/text_about.xml b/android-app-core/res/values-it/text_about.xml similarity index 100% rename from android-app/res/values-it/text_about.xml rename to android-app-core/res/values-it/text_about.xml diff --git a/android-app/res/values-it/text_functions.xml b/android-app-core/res/values-it/text_functions.xml similarity index 100% rename from android-app/res/values-it/text_functions.xml rename to android-app-core/res/values-it/text_functions.xml diff --git a/android-app/res/values-it/text_help.xml b/android-app-core/res/values-it/text_help.xml similarity index 100% rename from android-app/res/values-it/text_help.xml rename to android-app-core/res/values-it/text_help.xml diff --git a/android-app/res/values-it/text_operators.xml b/android-app-core/res/values-it/text_operators.xml similarity index 100% rename from android-app/res/values-it/text_operators.xml rename to android-app-core/res/values-it/text_operators.xml diff --git a/android-app/res/values-it/text_strings.xml b/android-app-core/res/values-it/text_strings.xml similarity index 100% rename from android-app/res/values-it/text_strings.xml rename to android-app-core/res/values-it/text_strings.xml diff --git a/android-app/res/values-it/text_vars.xml b/android-app-core/res/values-it/text_vars.xml similarity index 100% rename from android-app/res/values-it/text_vars.xml rename to android-app-core/res/values-it/text_vars.xml diff --git a/android-app/res/values-ru/text_about.xml b/android-app-core/res/values-ru/text_about.xml similarity index 100% rename from android-app/res/values-ru/text_about.xml rename to android-app-core/res/values-ru/text_about.xml diff --git a/android-app/res/values-ru/text_functions.xml b/android-app-core/res/values-ru/text_functions.xml similarity index 100% rename from android-app/res/values-ru/text_functions.xml rename to android-app-core/res/values-ru/text_functions.xml diff --git a/android-app/res/values-ru/text_help.xml b/android-app-core/res/values-ru/text_help.xml similarity index 100% rename from android-app/res/values-ru/text_help.xml rename to android-app-core/res/values-ru/text_help.xml diff --git a/android-app/res/values-ru/text_operators.xml b/android-app-core/res/values-ru/text_operators.xml similarity index 100% rename from android-app/res/values-ru/text_operators.xml rename to android-app-core/res/values-ru/text_operators.xml diff --git a/android-app/res/values-ru/text_preferences.xml b/android-app-core/res/values-ru/text_preferences.xml similarity index 100% rename from android-app/res/values-ru/text_preferences.xml rename to android-app-core/res/values-ru/text_preferences.xml diff --git a/android-app/res/values-ru/text_strings.xml b/android-app-core/res/values-ru/text_strings.xml similarity index 100% rename from android-app/res/values-ru/text_strings.xml rename to android-app-core/res/values-ru/text_strings.xml diff --git a/android-app/res/values-ru/text_vars.xml b/android-app-core/res/values-ru/text_vars.xml similarity index 100% rename from android-app/res/values-ru/text_vars.xml rename to android-app-core/res/values-ru/text_vars.xml diff --git a/android-app/res/values-uk/text_about.xml b/android-app-core/res/values-uk/text_about.xml similarity index 100% rename from android-app/res/values-uk/text_about.xml rename to android-app-core/res/values-uk/text_about.xml diff --git a/android-app/res/values-uk/text_functions.xml b/android-app-core/res/values-uk/text_functions.xml similarity index 100% rename from android-app/res/values-uk/text_functions.xml rename to android-app-core/res/values-uk/text_functions.xml diff --git a/android-app/res/values-uk/text_help.xml b/android-app-core/res/values-uk/text_help.xml similarity index 100% rename from android-app/res/values-uk/text_help.xml rename to android-app-core/res/values-uk/text_help.xml diff --git a/android-app/res/values-uk/text_operators.xml b/android-app-core/res/values-uk/text_operators.xml similarity index 100% rename from android-app/res/values-uk/text_operators.xml rename to android-app-core/res/values-uk/text_operators.xml diff --git a/android-app/res/values-uk/text_preferences.xml b/android-app-core/res/values-uk/text_preferences.xml similarity index 100% rename from android-app/res/values-uk/text_preferences.xml rename to android-app-core/res/values-uk/text_preferences.xml diff --git a/android-app/res/values-uk/text_strings.xml b/android-app-core/res/values-uk/text_strings.xml similarity index 100% rename from android-app/res/values-uk/text_strings.xml rename to android-app-core/res/values-uk/text_strings.xml diff --git a/android-app/res/values-uk/text_vars.xml b/android-app-core/res/values-uk/text_vars.xml similarity index 100% rename from android-app/res/values-uk/text_vars.xml rename to android-app-core/res/values-uk/text_vars.xml diff --git a/android-app/res/values-zh-rtw/text_about.xml b/android-app-core/res/values-zh-rtw/text_about.xml similarity index 100% rename from android-app/res/values-zh-rtw/text_about.xml rename to android-app-core/res/values-zh-rtw/text_about.xml diff --git a/android-app/res/values-zh-rtw/text_functions.xml b/android-app-core/res/values-zh-rtw/text_functions.xml similarity index 100% rename from android-app/res/values-zh-rtw/text_functions.xml rename to android-app-core/res/values-zh-rtw/text_functions.xml diff --git a/android-app/res/values-zh-rtw/text_help.xml b/android-app-core/res/values-zh-rtw/text_help.xml similarity index 100% rename from android-app/res/values-zh-rtw/text_help.xml rename to android-app-core/res/values-zh-rtw/text_help.xml diff --git a/android-app/res/values-zh-rtw/text_operators.xml b/android-app-core/res/values-zh-rtw/text_operators.xml similarity index 100% rename from android-app/res/values-zh-rtw/text_operators.xml rename to android-app-core/res/values-zh-rtw/text_operators.xml diff --git a/android-app/res/values-zh-rtw/text_preferences.xml b/android-app-core/res/values-zh-rtw/text_preferences.xml similarity index 100% rename from android-app/res/values-zh-rtw/text_preferences.xml rename to android-app-core/res/values-zh-rtw/text_preferences.xml diff --git a/android-app/res/values-zh-rtw/text_strings.xml b/android-app-core/res/values-zh-rtw/text_strings.xml similarity index 100% rename from android-app/res/values-zh-rtw/text_strings.xml rename to android-app-core/res/values-zh-rtw/text_strings.xml diff --git a/android-app/res/values-zh-rtw/text_vars.xml b/android-app-core/res/values-zh-rtw/text_vars.xml similarity index 100% rename from android-app/res/values-zh-rtw/text_vars.xml rename to android-app-core/res/values-zh-rtw/text_vars.xml diff --git a/android-app/res/values/attributes.xml b/android-app-core/res/values/attributes.xml similarity index 100% rename from android-app/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/android-app/res/values/dimens.xml b/android-app-core/res/values/dimens.xml similarity index 83% rename from android-app/res/values/dimens.xml rename to android-app-core/res/values/dimens.xml index c35ce931..340956d2 100644 --- a/android-app/res/values/dimens.xml +++ b/android-app-core/res/values/dimens.xml @@ -20,11 +20,6 @@ 20sp 15sp - 25sp - 20dp - 25sp - 6dp - 20sp 10dp diff --git a/android-app-core/res/values/ids.xml b/android-app-core/res/values/ids.xml new file mode 100644 index 00000000..bc3359c4 --- /dev/null +++ b/android-app-core/res/values/ids.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android-app-core/res/values/preferences.xml b/android-app-core/res/values/preferences.xml new file mode 100644 index 00000000..8445b05b --- /dev/null +++ b/android-app-core/res/values/preferences.xml @@ -0,0 +1,5 @@ + + + org.solovyev.android.calculator.CalculatorModel_functions + org.solovyev.android.calculator.CalculatorModel_vars + \ No newline at end of file diff --git a/android-app/res/values/styles.xml b/android-app-core/res/values/styles.xml similarity index 91% rename from android-app/res/values/styles.xml rename to android-app-core/res/values/styles.xml index 1f3f554b..83c17c25 100644 --- a/android-app/res/values/styles.xml +++ b/android-app-core/res/values/styles.xml @@ -70,18 +70,10 @@ @dimen/cpp_display_text_size - - - - - - - - @@ -20,26 +16,15 @@ @dimen/cpp_onscreen_header_button_text_size - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android-app/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 99% rename from android-app/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..75ef8b5e 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java +++ b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java @@ -14,7 +14,6 @@ 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.external.ExternalCalculatorIntentHandler; import org.solovyev.android.calculator.external.ExternalCalculatorStateUpdater; diff --git a/android-app/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 android-app/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/android-app/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 100% rename from android-app/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 diff --git a/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/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 android-app/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/android-app/src/main/java/org/solovyev/android/calculator/widget/WidgetButton.java b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/WidgetButton.java similarity index 99% rename from android-app/src/main/java/org/solovyev/android/calculator/widget/WidgetButton.java rename to android-app-widget/src/main/java/org/solovyev/android/calculator/widget/WidgetButton.java index 32c863e9..bff1977e 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/widget/WidgetButton.java +++ b/android-app-widget/src/main/java/org/solovyev/android/calculator/widget/WidgetButton.java @@ -3,9 +3,8 @@ 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 org.solovyev.android.calculator.Locator; import java.util.HashMap; import java.util.Map; diff --git a/android-app/res/values/colors.xml b/android-app/res/values/colors.xml deleted file mode 100644 index 13e555d2..00000000 --- a/android-app/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/android-app/res/values/preferences.xml b/android-app/res/values/preferences.xml index 2d76a425..c5fe7155 100644 --- a/android-app/res/values/preferences.xml +++ b/android-app/res/values/preferences.xml @@ -41,8 +41,6 @@ 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/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java index 164882cd..27235789 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java @@ -10,6 +10,7 @@ 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; @@ -28,9 +29,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 +170,26 @@ 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; + } + } } diff --git a/android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java b/android-app/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java index def27e3a..97420fa0 100644 --- a/android-app/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/core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java index 8ab0f3ad..1b9a0b31 100644 --- a/core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java +++ b/core/src/main/java/org/solovyev/android/calculator/CalculatorEventType.java @@ -153,7 +153,10 @@ public enum CalculatorEventType { show_settings, show_settings_detached, - show_like_dialog; + show_like_dialog, + + show_create_var_dialog, + show_create_function_dialog; public boolean isOfType(@NotNull CalculatorEventType... types) { for (CalculatorEventType type : types) { 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); +}