diff --git a/res/drawable-hdpi/copy.png b/res/drawable-hdpi/copy.png new file mode 100644 index 00000000..34b0283b Binary files /dev/null and b/res/drawable-hdpi/copy.png differ diff --git a/res/drawable-hdpi/heart.png b/res/drawable-hdpi/heart.png new file mode 100644 index 00000000..b4608722 Binary files /dev/null and b/res/drawable-hdpi/heart.png differ diff --git a/res/drawable-hdpi/logo.png b/res/drawable-hdpi/logo.png new file mode 100644 index 00000000..9d2d600d Binary files /dev/null and b/res/drawable-hdpi/logo.png differ diff --git a/res/drawable-hdpi/paste.png b/res/drawable-hdpi/paste.png new file mode 100644 index 00000000..f4764680 Binary files /dev/null and b/res/drawable-hdpi/paste.png differ diff --git a/res/drawable-hdpi/sym_keyboard_delete.png b/res/drawable-hdpi/sym_keyboard_delete.png new file mode 100644 index 00000000..f02cef88 Binary files /dev/null and b/res/drawable-hdpi/sym_keyboard_delete.png differ diff --git a/res/drawable-ldpi/copy.png b/res/drawable-ldpi/copy.png new file mode 100644 index 00000000..34b0283b Binary files /dev/null and b/res/drawable-ldpi/copy.png differ diff --git a/res/drawable-ldpi/heart.png b/res/drawable-ldpi/heart.png new file mode 100644 index 00000000..b4608722 Binary files /dev/null and b/res/drawable-ldpi/heart.png differ diff --git a/res/drawable-ldpi/logo.png b/res/drawable-ldpi/logo.png new file mode 100644 index 00000000..9d2d600d Binary files /dev/null and b/res/drawable-ldpi/logo.png differ diff --git a/res/drawable-ldpi/paste.png b/res/drawable-ldpi/paste.png new file mode 100644 index 00000000..f4764680 Binary files /dev/null and b/res/drawable-ldpi/paste.png differ diff --git a/res/drawable-ldpi/sym_keyboard_delete.png b/res/drawable-ldpi/sym_keyboard_delete.png new file mode 100644 index 00000000..f02cef88 Binary files /dev/null and b/res/drawable-ldpi/sym_keyboard_delete.png differ diff --git a/res/drawable-mdpi/copy.png b/res/drawable-mdpi/copy.png new file mode 100644 index 00000000..34b0283b Binary files /dev/null and b/res/drawable-mdpi/copy.png differ diff --git a/res/drawable-mdpi/heart.png b/res/drawable-mdpi/heart.png new file mode 100644 index 00000000..b4608722 Binary files /dev/null and b/res/drawable-mdpi/heart.png differ diff --git a/res/drawable-mdpi/logo.png b/res/drawable-mdpi/logo.png new file mode 100644 index 00000000..9d2d600d Binary files /dev/null and b/res/drawable-mdpi/logo.png differ diff --git a/res/drawable-mdpi/paste.png b/res/drawable-mdpi/paste.png new file mode 100644 index 00000000..f4764680 Binary files /dev/null and b/res/drawable-mdpi/paste.png differ diff --git a/res/drawable-mdpi/sym_keyboard_delete.png b/res/drawable-mdpi/sym_keyboard_delete.png new file mode 100644 index 00000000..f02cef88 Binary files /dev/null and b/res/drawable-mdpi/sym_keyboard_delete.png differ diff --git a/res/layout/calc_history_button.xml b/res/layout/calc_history_button.xml index 732f86b1..f089ae2b 100644 --- a/res/layout/calc_history_button.xml +++ b/res/layout/calc_history_button.xml @@ -12,6 +12,5 @@ calc:textUp="@string/c_undo" calc:textDown="@string/c_redo" style="?controlButtonStyle" - a:textSize="18dp" a:textStyle="bold" a:onClick="historyButtonClickHandler"/> \ No newline at end of file diff --git a/res/layout/history.xml b/res/layout/history.xml index 323df2a0..98840f02 100644 --- a/res/layout/history.xml +++ b/res/layout/history.xml @@ -14,16 +14,11 @@ + style="@style/history_time"/> + style="@style/history_item"/> \ No newline at end of file diff --git a/res/layout/var.xml b/res/layout/var.xml index 2fdc739d..0a07b948 100644 --- a/res/layout/var.xml +++ b/res/layout/var.xml @@ -19,13 +19,7 @@ + style="@style/var_text"> @@ -33,10 +27,7 @@ + style="@style/var_description"> \ No newline at end of file diff --git a/res/layout/var_edit.xml b/res/layout/var_edit.xml index 4e458571..50984080 100644 --- a/res/layout/var_edit.xml +++ b/res/layout/var_edit.xml @@ -21,16 +21,18 @@ + style="@style/default_text_size"> @@ -38,18 +40,19 @@ a:layout_width="fill_parent" a:layout_height="wrap_content" a:inputType="numberDecimal" - a:textSize="20dp"> + style="@style/default_text_size"> + style="@style/default_text_size"> diff --git a/res/layout/vars.xml b/res/layout/vars.xml index f999168a..20341704 100644 --- a/res/layout/vars.xml +++ b/res/layout/vars.xml @@ -22,8 +22,7 @@ a:layout_height="wrap_content" a:layout_gravity="center_horizontal" a:text="@string/c_add" - a:paddingLeft="40dp" - a:paddingRight="40dp" + style="@style/add_var_button" a:onClick="addVarButtonClickHandler"/> \ No newline at end of file diff --git a/res/values-hdpi/styles.xml b/res/values-hdpi/styles.xml new file mode 100644 index 00000000..849380a1 --- /dev/null +++ b/res/values-hdpi/styles.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/values-ldpi/styles.xml b/res/values-ldpi/styles.xml new file mode 100644 index 00000000..b2bfc0cc --- /dev/null +++ b/res/values-ldpi/styles.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/values-mdpi/styles.xml b/res/values-mdpi/styles.xml new file mode 100644 index 00000000..d38dc3d2 --- /dev/null +++ b/res/values-mdpi/styles.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index dcae5b06..2613c677 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -1,5 +1,12 @@ + + - #00ffffff - #ffffffff - #ffffffff + #00ffffff + #ffffffff + #ffffffff + #ff000000 \ No newline at end of file diff --git a/res/values/styles-common-history.xml b/res/values/styles-common-history.xml new file mode 100644 index 00000000..cb132b75 --- /dev/null +++ b/res/values/styles-common-history.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/values/styles-common-var.xml b/res/values/styles-common-var.xml new file mode 100644 index 00000000..195a9db9 --- /dev/null +++ b/res/values/styles-common-var.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/res/values/styles-common.xml b/res/values/styles-common.xml new file mode 100644 index 00000000..624d8e96 --- /dev/null +++ b/res/values/styles-common.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/values/styles.xml b/res/values/styles.xml index 4421f250..849380a1 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -1,103 +1,44 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file