diff --git a/android-app-core/AndroidManifest.xml b/android-app-core/AndroidManifest.xml index a86dbd76..a755358f 100644 --- a/android-app-core/AndroidManifest.xml +++ b/android-app-core/AndroidManifest.xml @@ -1,11 +1,11 @@ + package="org.solovyev.android.calculator.core" + android:versionCode="1" + android:versionName="1.0"> + android:minSdkVersion="4" + android:targetSdkVersion="17"/> \ No newline at end of file diff --git a/android-app-core/pom.xml b/android-app-core/pom.xml index e1f82e7e..0b843f0a 100644 --- a/android-app-core/pom.xml +++ b/android-app-core/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/android-app-core/res/drawable/blue_button.xml b/android-app-core/res/drawable/blue_button.xml index 3f190da7..2908509f 100644 --- a/android-app-core/res/drawable/blue_button.xml +++ b/android-app-core/res/drawable/blue_button.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/blue_button_dark.xml b/android-app-core/res/drawable/blue_button_dark.xml index 38247e80..9301f26d 100644 --- a/android-app-core/res/drawable/blue_button_dark.xml +++ b/android-app-core/res/drawable/blue_button_dark.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/blue_button_dark_shape.xml b/android-app-core/res/drawable/blue_button_dark_shape.xml index 153639d6..77ffecfd 100644 --- a/android-app-core/res/drawable/blue_button_dark_shape.xml +++ b/android-app-core/res/drawable/blue_button_dark_shape.xml @@ -1,15 +1,31 @@ - + a:startColor="#000d1f" + a:endColor="#002255" + a:angle="90"/> + diff --git a/android-app-core/res/drawable/blue_button_shape.xml b/android-app-core/res/drawable/blue_button_shape.xml index fd8acd78..2f27a937 100644 --- a/android-app-core/res/drawable/blue_button_shape.xml +++ b/android-app-core/res/drawable/blue_button_shape.xml @@ -1,9 +1,31 @@ + + - + a:startColor="#001c45" + a:endColor="#003481" + a:angle="90"/> + diff --git a/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml b/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml index c029d95c..c4410967 100644 --- a/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__btn_cab_done_holo_dark.xml @@ -1,20 +1,28 @@ - + - - - + + + diff --git a/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml b/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml index eb72d05b..0998eb96 100644 --- a/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__item_background_holo_dark.xml @@ -1,25 +1,36 @@ - + - - - - - - + + + + + + diff --git a/android-app-core/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 index c9f87b73..44f03a67 100644 --- a/android-app-core/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 @@ -1,19 +1,26 @@ - + - - + + diff --git a/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml b/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml index 619ff9d3..dd385175 100644 --- a/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__list_selector_holo_dark.xml @@ -1,26 +1,37 @@ - + - + - - - - - + + + + + diff --git a/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml b/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml index 4cda1e26..6c43f18a 100644 --- a/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml +++ b/android-app-core/res/drawable/default_abs__spinner_ab_holo_dark.xml @@ -1,21 +1,29 @@ - + - - - - + + + + diff --git a/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml b/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml index e538a5f4..f9a720b6 100644 --- a/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml +++ b/android-app-core/res/drawable/default_abs__tab_indicator_ab_holo.xml @@ -1,33 +1,48 @@ - + - - + + - - + + - - + + - - + + diff --git a/android-app-core/res/drawable/gray_button.xml b/android-app-core/res/drawable/gray_button.xml index 967fbfc0..9ceef380 100644 --- a/android-app-core/res/drawable/gray_button.xml +++ b/android-app-core/res/drawable/gray_button.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/gray_button_dark.xml b/android-app-core/res/drawable/gray_button_dark.xml index 4c45b348..35f16cb9 100644 --- a/android-app-core/res/drawable/gray_button_dark.xml +++ b/android-app-core/res/drawable/gray_button_dark.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/gray_button_dark_shape.xml b/android-app-core/res/drawable/gray_button_dark_shape.xml index 6545aa5a..09c8dab8 100644 --- a/android-app-core/res/drawable/gray_button_dark_shape.xml +++ b/android-app-core/res/drawable/gray_button_dark_shape.xml @@ -1,9 +1,31 @@ + + - + a:startColor="#000000" + a:endColor="#333333" + a:angle="90"/> + diff --git a/android-app-core/res/drawable/gray_button_shape.xml b/android-app-core/res/drawable/gray_button_shape.xml index 1710094b..0ebdbe72 100644 --- a/android-app-core/res/drawable/gray_button_shape.xml +++ b/android-app-core/res/drawable/gray_button_shape.xml @@ -1,9 +1,31 @@ + + - + a:startColor="#071622" + a:endColor="#253541" + a:angle="90"/> + diff --git a/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml b/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml index 75077a99..71ae4541 100644 --- a/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml +++ b/android-app-core/res/drawable/metro_blue_abs__tab_indicator_ab_holo.xml @@ -1,33 +1,48 @@ - + - - + + - - + + - - + + - - + + diff --git a/android-app-core/res/drawable/metro_blue_button.xml b/android-app-core/res/drawable/metro_blue_button.xml index a638c635..0101d679 100644 --- a/android-app-core/res/drawable/metro_blue_button.xml +++ b/android-app-core/res/drawable/metro_blue_button.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_blue_button_shape.xml b/android-app-core/res/drawable/metro_blue_button_shape.xml index e6fc3fc1..d888ae92 100644 --- a/android-app-core/res/drawable/metro_blue_button_shape.xml +++ b/android-app-core/res/drawable/metro_blue_button_shape.xml @@ -1,19 +1,26 @@ - + - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_blue_list_item.xml b/android-app-core/res/drawable/metro_blue_list_item.xml index 21559be3..cbc7a037 100644 --- a/android-app-core/res/drawable/metro_blue_list_item.xml +++ b/android-app-core/res/drawable/metro_blue_list_item.xml @@ -1,21 +1,51 @@ + + - - + + - - + + - - + + - - + + diff --git a/android-app-core/res/drawable/metro_button_dark.xml b/android-app-core/res/drawable/metro_button_dark.xml index 01eecc9c..cbaae7b8 100644 --- a/android-app-core/res/drawable/metro_button_dark.xml +++ b/android-app-core/res/drawable/metro_button_dark.xml @@ -1,8 +1,30 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_dark_shape.xml b/android-app-core/res/drawable/metro_button_dark_shape.xml index 3f06ca5b..2165b29a 100644 --- a/android-app-core/res/drawable/metro_button_dark_shape.xml +++ b/android-app-core/res/drawable/metro_button_dark_shape.xml @@ -1,19 +1,26 @@ - + - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_green.xml b/android-app-core/res/drawable/metro_button_green.xml index 4fa1e269..78abe5d1 100644 --- a/android-app-core/res/drawable/metro_button_green.xml +++ b/android-app-core/res/drawable/metro_button_green.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_green_shape.xml b/android-app-core/res/drawable/metro_button_green_shape.xml index 01833fac..2887709b 100644 --- a/android-app-core/res/drawable/metro_button_green_shape.xml +++ b/android-app-core/res/drawable/metro_button_green_shape.xml @@ -1,19 +1,26 @@ - + - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_light.xml b/android-app-core/res/drawable/metro_button_light.xml index 1498b5aa..a4c0a22c 100644 --- a/android-app-core/res/drawable/metro_button_light.xml +++ b/android-app-core/res/drawable/metro_button_light.xml @@ -1,8 +1,30 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_light_shape.xml b/android-app-core/res/drawable/metro_button_light_shape.xml index 32bbaf5c..78e13a77 100644 --- a/android-app-core/res/drawable/metro_button_light_shape.xml +++ b/android-app-core/res/drawable/metro_button_light_shape.xml @@ -1,19 +1,26 @@ - + - - + + diff --git a/android-app-core/res/drawable/metro_button_pressed.xml b/android-app-core/res/drawable/metro_button_pressed.xml index 386a4bad..72931a8f 100644 --- a/android-app-core/res/drawable/metro_button_pressed.xml +++ b/android-app-core/res/drawable/metro_button_pressed.xml @@ -1,19 +1,26 @@ - + - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_purple.xml b/android-app-core/res/drawable/metro_button_purple.xml index d5c51b1e..dbae4798 100644 --- a/android-app-core/res/drawable/metro_button_purple.xml +++ b/android-app-core/res/drawable/metro_button_purple.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_button_purple_shape.xml b/android-app-core/res/drawable/metro_button_purple_shape.xml index e50eab0f..a994ce3b 100644 --- a/android-app-core/res/drawable/metro_button_purple_shape.xml +++ b/android-app-core/res/drawable/metro_button_purple_shape.xml @@ -1,19 +1,26 @@ - + - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/metro_green_list_item.xml b/android-app-core/res/drawable/metro_green_list_item.xml index e7292aa6..0ba94d5a 100644 --- a/android-app-core/res/drawable/metro_green_list_item.xml +++ b/android-app-core/res/drawable/metro_green_list_item.xml @@ -1,22 +1,52 @@ + + - - + + - - + + - - + + - - + + diff --git a/android-app-core/res/drawable/metro_purple_list_item.xml b/android-app-core/res/drawable/metro_purple_list_item.xml index 34bbe728..0c54af47 100644 --- a/android-app-core/res/drawable/metro_purple_list_item.xml +++ b/android-app-core/res/drawable/metro_purple_list_item.xml @@ -1,21 +1,51 @@ + + - - + + - - + + - - + + - - + + diff --git a/android-app-core/res/drawable/pane_background.xml b/android-app-core/res/drawable/pane_background.xml index 4058c468..23efe1bb 100644 --- a/android-app-core/res/drawable/pane_background.xml +++ b/android-app-core/res/drawable/pane_background.xml @@ -1,19 +1,26 @@ - + - - + + \ No newline at end of file diff --git a/android-app-core/res/drawable/violet_button.xml b/android-app-core/res/drawable/violet_button.xml index 2f72752a..2113beb7 100644 --- a/android-app-core/res/drawable/violet_button.xml +++ b/android-app-core/res/drawable/violet_button.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/violet_button_dark.xml b/android-app-core/res/drawable/violet_button_dark.xml index 2d1232c8..2d979c5e 100644 --- a/android-app-core/res/drawable/violet_button_dark.xml +++ b/android-app-core/res/drawable/violet_button_dark.xml @@ -1,9 +1,31 @@ + + - + - + \ No newline at end of file diff --git a/android-app-core/res/drawable/violet_button_dark_shape.xml b/android-app-core/res/drawable/violet_button_dark_shape.xml index 7409fe9c..5caaca03 100644 --- a/android-app-core/res/drawable/violet_button_dark_shape.xml +++ b/android-app-core/res/drawable/violet_button_dark_shape.xml @@ -1,15 +1,31 @@ - + a:startColor="#2b0325" + a:endColor="#4f1c47" + a:angle="90"/> + diff --git a/android-app-core/res/drawable/violet_button_shape.xml b/android-app-core/res/drawable/violet_button_shape.xml index 4ef0e931..771c2f9b 100644 --- a/android-app-core/res/drawable/violet_button_shape.xml +++ b/android-app-core/res/drawable/violet_button_shape.xml @@ -1,15 +1,31 @@ - + a:startColor="#520546" + a:endColor="#8a307c" + a:angle="90"/> + diff --git a/android-app-core/res/layout/cpp_fixable_messages_dialog.xml b/android-app-core/res/layout/cpp_fixable_messages_dialog.xml index 333c2c04..77f3f036 100644 --- a/android-app-core/res/layout/cpp_fixable_messages_dialog.xml +++ b/android-app-core/res/layout/cpp_fixable_messages_dialog.xml @@ -1,31 +1,53 @@ + + + style="?cpp_dialog_style"> + a:id="@+id/cpp_fixable_messages_container" + a:layout_width="match_parent" + a:layout_height="wrap_content" + a:orientation="vertical"/> + a:id="@+id/cpp_do_not_show_fixable_messages_checkbox" + a:text="@string/do_not_show_messages_in_session" + a:layout_width="match_parent" + a:layout_height="wrap_content"/> + a:layout_width="match_parent" + a:layout_height="wrap_content" + a:orientation="horizontal" + a:gravity="center">