metro themes

res/drawable/metro_button_green.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:a="http://schemas.android.com/apk/res/android">
+
+	<item a:state_pressed="true"
+		  a:drawable="@drawable/metro_button_pressed"/>
+
+	<item a:drawable="@drawable/metro_button_green_shape"/>
+
+</selector>

res/drawable/metro_button_green_shape.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:startColor="#667e22" android:endColor="#667e22"/>
+    <corners android:radius="1dp" />
+</shape>

res/drawable/metro_button_pressed.xml

@@ -15,6 +15,6 @@
 -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient android:startColor="#1aa1e1" android:endColor="#1aa1e1"/>
+    <gradient android:startColor="#C9C9C9" android:endColor="#C9C9C9"/>
     <corners android:radius="1dp" />
 </shape>

res/drawable/metro_button_purple.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:a="http://schemas.android.com/apk/res/android">
+
+	<item a:state_pressed="true"
+		  a:drawable="@drawable/metro_button_pressed"/>
+
+	<item a:drawable="@drawable/metro_button_purple_shape"/>
+
+</selector>

res/drawable/metro_button_purple_shape.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:startColor="#651456" android:endColor="#651456"/>
+    <corners android:radius="1dp" />
+</shape>

res/values-ru/text_strings.xml

@@ -87,10 +87,12 @@
 	<string name="p_bin">Бинарная</string>
 
 	<string name="c_calc_theme">Тема оформления</string>
-	<string name="p_default_theme">По умолчанию</string>
+	<string name="p_default_theme">Серая</string>
 	<string name="p_violet_theme">Фиолетовая</string>
 	<string name="p_light_blue_theme">Голубая</string>
-	<string name="p_metro_theme">Метро</string>
+	<string name="p_metro_blue_theme">Метро Синяя (По умолчанию)</string>
+	<string name="p_metro_green_theme">Метро Зелёная</string>
+	<string name="p_metro_purple_theme">Метро Фиолетовая</string>
 	<string name="c_calc_result_precision_summary">Точность результата(все вычисления производятся максимально точно)</string>
 	<string name="c_calc_color_display_summary">Включает/выключает подсветку синтаксиса в поле редактирования калькулятора</string>
 	<string name="c_calc_theme_summary">Устанавливает тему оформления приложения</string>

res/values/arrays.xml

@@ -9,13 +9,17 @@
 		<item>@string/p_default_theme</item>
 		<item>@string/p_violet_theme</item>
 		<item>@string/p_light_blue_theme</item>
-		<item>@string/p_metro_theme</item>
+		<item>@string/p_metro_blue_theme</item>
+		<item>@string/p_metro_green_theme</item>
+		<item>@string/p_metro_purple_theme</item>
 	</string-array>
 	<string-array name="p_theme_values">
 		<item>default_theme</item>
 		<item>violet_theme</item>
 		<item>light_blue_theme</item>
-		<item>metro_theme</item>
+		<item>metro_blue_theme</item>
+		<item>metro_green_theme</item>
+		<item>metro_purple_theme</item>
 	</string-array>
 
 	<string-array name="p_grouping_separator_names">

res/values/styles-metro-blue-theme.xml

@@ -10,7 +10,7 @@
 		<item name="android:background">@drawable/metro_button_light</item>
 	</style>
 
-	<style name="metro_operation_button_style" parent="metro_digit_button_style">
+	<style name="metro_blue_operation_button_style" parent="metro_digit_button_style">
 		<item name="android:background">@drawable/metro_button_blue</item>
 	</style>
 
@@ -18,11 +18,11 @@
 		<item name="android:padding">6dp</item>
 	</style>
 
-	<style name="metro_theme">
+	<style name="metro_blue_theme">
 		<item name="digitButtonStyle">@style/metro_digit_button_style</item>
 		<item name="controlButtonStyle">@style/metro_control_button_style</item>
 		<item name="controlImageButtonStyle">@style/metro_control_image_button_style</item>
-		<item name="operationButtonStyle">@style/metro_operation_button_style</item>
+		<item name="operationButtonStyle">@style/metro_blue_operation_button_style</item>
 	</style>
 
 </resources>

res/values/styles-metro-green-theme.xml

@@ -0,0 +1,28 @@
+<resources>
+
+	<style name="metro_digit_button_style" parent="button_style">
+		<item name="android:background">@drawable/metro_button_dark</item>
+		<item name="android:layout_marginLeft">2dp</item>
+		<item name="android:layout_marginBottom">2dp</item>
+	</style>
+
+	<style name="metro_control_button_style" parent="metro_digit_button_style">
+		<item name="android:background">@drawable/metro_button_light</item>
+	</style>
+
+	<style name="metro_green_operation_button_style" parent="metro_digit_button_style">
+		<item name="android:background">@drawable/metro_button_green</item>
+	</style>
+
+	<style name="metro_control_image_button_style" parent="metro_control_button_style">
+		<item name="android:padding">6dp</item>
+	</style>
+
+	<style name="metro_green_theme">
+		<item name="digitButtonStyle">@style/metro_digit_button_style</item>
+		<item name="controlButtonStyle">@style/metro_control_button_style</item>
+		<item name="controlImageButtonStyle">@style/metro_control_image_button_style</item>
+		<item name="operationButtonStyle">@style/metro_green_operation_button_style</item>
+	</style>
+
+</resources>

res/values/styles-metro-purple-theme.xml

@@ -0,0 +1,28 @@
+<resources>
+
+	<style name="metro_digit_button_style" parent="button_style">
+		<item name="android:background">@drawable/metro_button_dark</item>
+		<item name="android:layout_marginLeft">2dp</item>
+		<item name="android:layout_marginBottom">2dp</item>
+	</style>
+
+	<style name="metro_control_button_style" parent="metro_digit_button_style">
+		<item name="android:background">@drawable/metro_button_light</item>
+	</style>
+
+	<style name="metro_purple_operation_button_style" parent="metro_digit_button_style">
+		<item name="android:background">@drawable/metro_button_purple</item>
+	</style>
+
+	<style name="metro_control_image_button_style" parent="metro_control_button_style">
+		<item name="android:padding">6dp</item>
+	</style>
+
+	<style name="metro_purple_theme">
+		<item name="digitButtonStyle">@style/metro_digit_button_style</item>
+		<item name="controlButtonStyle">@style/metro_control_button_style</item>
+		<item name="controlImageButtonStyle">@style/metro_control_image_button_style</item>
+		<item name="operationButtonStyle">@style/metro_purple_operation_button_style</item>
+	</style>
+
+</resources>

res/values/text_strings.xml

@@ -87,10 +87,12 @@
 	<string name="p_bin">Binary</string>
 
 	<string name="c_calc_theme">Theme</string>
-	<string name="p_default_theme">Default</string>
+	<string name="p_default_theme">Grey</string>
 	<string name="p_violet_theme">Violet</string>
 	<string name="p_light_blue_theme">Light Blue</string>
-	<string name="p_metro_theme">Metro</string>
+	<string name="p_metro_blue_theme">Metro Blue (Default)</string>
+	<string name="p_metro_green_theme">Metro Green</string>
+	<string name="p_metro_purple_theme">Metro Purple</string>
 	<string name="c_calc_result_precision_summary">Precision of result value (all calculations are done with maximum precision regardless of the value of this option)</string>
 	<string name="c_calc_color_display_summary">Toggles colouring and styling in calculator editor</string>
 	<string name="c_calc_theme_summary">Sets the theme for calculator</string>

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());