diff --git a/res/drawable/metro_button_green.xml b/res/drawable/metro_button_green.xml
new file mode 100644
index 00000000..ac3da7d1
--- /dev/null
+++ b/res/drawable/metro_button_green.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/metro_button_green_shape.xml b/res/drawable/metro_button_green_shape.xml
new file mode 100644
index 00000000..2562e0b1
--- /dev/null
+++ b/res/drawable/metro_button_green_shape.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/metro_button_pressed.xml b/res/drawable/metro_button_pressed.xml
index fc25288a..e3a24537 100644
--- a/res/drawable/metro_button_pressed.xml
+++ b/res/drawable/metro_button_pressed.xml
@@ -15,6 +15,6 @@
-->
-
+
\ No newline at end of file
diff --git a/res/drawable/metro_button_purple.xml b/res/drawable/metro_button_purple.xml
new file mode 100644
index 00000000..beb401f7
--- /dev/null
+++ b/res/drawable/metro_button_purple.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/metro_button_purple_shape.xml b/res/drawable/metro_button_purple_shape.xml
new file mode 100644
index 00000000..425aaab7
--- /dev/null
+++ b/res/drawable/metro_button_purple_shape.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/values-ru/text_strings.xml b/res/values-ru/text_strings.xml
index 88f58c12..437b9fcd 100644
--- a/res/values-ru/text_strings.xml
+++ b/res/values-ru/text_strings.xml
@@ -87,10 +87,12 @@
Бинарная
Тема оформления
- По умолчанию
+ Серая
Фиолетовая
Голубая
- Метро
+ Метро Синяя (По умолчанию)
+ Метро Зелёная
+ Метро Фиолетовая
Точность результата(все вычисления производятся максимально точно)
Включает/выключает подсветку синтаксиса в поле редактирования калькулятора
Устанавливает тему оформления приложения
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index e2fa04c0..2df7b02c 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -9,13 +9,17 @@
- @string/p_default_theme
- @string/p_violet_theme
- @string/p_light_blue_theme
- - @string/p_metro_theme
+ - @string/p_metro_blue_theme
+ - @string/p_metro_green_theme
+ - @string/p_metro_purple_theme
- default_theme
- violet_theme
- light_blue_theme
- - metro_theme
+ - metro_blue_theme
+ - metro_green_theme
+ - metro_purple_theme
diff --git a/res/values/styles-metro-theme.xml b/res/values/styles-metro-blue-theme.xml
similarity index 81%
rename from res/values/styles-metro-theme.xml
rename to res/values/styles-metro-blue-theme.xml
index 608543b6..12adb288 100644
--- a/res/values/styles-metro-theme.xml
+++ b/res/values/styles-metro-blue-theme.xml
@@ -10,7 +10,7 @@
- @drawable/metro_button_light
-
@@ -18,11 +18,11 @@
- 6dp
-
\ No newline at end of file
diff --git a/res/values/styles-metro-green-theme.xml b/res/values/styles-metro-green-theme.xml
new file mode 100644
index 00000000..8c70e489
--- /dev/null
+++ b/res/values/styles-metro-green-theme.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/values/styles-metro-purple-theme.xml b/res/values/styles-metro-purple-theme.xml
new file mode 100644
index 00000000..eefd801e
--- /dev/null
+++ b/res/values/styles-metro-purple-theme.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/values/text_strings.xml b/res/values/text_strings.xml
index 366ac9ba..0ed5b3fb 100644
--- a/res/values/text_strings.xml
+++ b/res/values/text_strings.xml
@@ -87,10 +87,12 @@
Binary
Theme
- Default
+ Grey
Violet
Light Blue
- Metro
+ Metro Blue (Default)
+ Metro Green
+ Metro Purple
Precision of result value (all calculations are done with maximum precision regardless of the value of this option)
Toggles colouring and styling in calculator editor
Sets the theme for calculator
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
index 024ce05f..3c662f45 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
@@ -69,7 +69,9 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
default_theme(ThemeType.other, R.style.default_theme),
violet_theme(ThemeType.other, R.style.violet_theme),
light_blue_theme(ThemeType.other, R.style.light_blue_theme),
- metro_theme(ThemeType.metro, R.style.metro_theme);
+ metro_blue_theme(ThemeType.metro, R.style.metro_blue_theme),
+ metro_purple_theme(ThemeType.metro, R.style.metro_purple_theme),
+ metro_green_theme(ThemeType.metro, R.style.metro_green_theme);
@NotNull
private final ThemeType themeType;
@@ -111,7 +113,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
@NotNull
private static final String THEME_P_KEY = "org.solovyev.android.calculator.CalculatorActivity_calc_theme";
- private static final Theme THEME_P_DEFAULT = Theme.default_theme;
+ private static final Theme THEME_P_DEFAULT = Theme.metro_blue_theme;
@NotNull
private static final String APP_OPENED_COUNTER_P_KEY = "app_opened_counter";
@@ -481,7 +483,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
try {
theme = Preferences.theme.getPreference(preferences);
} catch (IllegalArgumentException e) {
- theme = Theme.default_theme;
+ theme = THEME_P_DEFAULT;
}
setTheme(theme.getThemeId());