diff --git a/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java b/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java
index 438c846d..e5d50dcc 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/Preferences.java
@@ -101,29 +101,22 @@ public final class Preferences {
public static enum Theme {
- default_theme(ThemeType.other, R.style.cpp_gray_theme),
- violet_theme(ThemeType.other, R.style.cpp_violet_theme),
- light_blue_theme(ThemeType.other, R.style.cpp_light_blue_theme),
- metro_blue_theme(ThemeType.metro, R.style.cpp_metro_blue_theme),
- metro_purple_theme(ThemeType.metro, R.style.cpp_metro_purple_theme),
- metro_green_theme(ThemeType.metro, R.style.cpp_metro_green_theme);
-
- @Nonnull
- private final ThemeType themeType;
+ default_theme(R.style.cpp_gray_theme),
+ violet_theme(R.style.cpp_violet_theme),
+ light_blue_theme(R.style.cpp_light_blue_theme),
+ metro_blue_theme(R.style.cpp_metro_blue_theme),
+ metro_purple_theme(R.style.cpp_metro_purple_theme),
+ metro_green_theme(R.style.cpp_metro_green_theme),
+ material_theme(R.style.cpp_material_theme),
+ ;
@Nonnull
private final Integer themeId;
- Theme(@Nonnull ThemeType themeType, @Nonnull Integer themeId) {
- this.themeType = themeType;
+ Theme(@Nonnull Integer themeId) {
this.themeId = themeId;
}
- @Nonnull
- public ThemeType getThemeType() {
- return themeType;
- }
-
@Nonnull
public Integer getThemeId() {
return getThemeId(null);
@@ -137,12 +130,6 @@ public final class Preferences {
return themeId;
}
}
-
- public static enum ThemeType {
- metro,
- other
- }
-
public static enum Layout {
main_calculator(R.layout.main_calculator, R.string.p_layout_calculator, true),
main_calculator_mobile(R.layout.main_calculator_mobile, R.string.p_layout_calculator_mobile, false),
diff --git a/android-app/src/main/res/drawable-v21/material_blue_button.xml b/android-app/src/main/res/drawable-v21/material_blue_button.xml
new file mode 100644
index 00000000..5f9f634d
--- /dev/null
+++ b/android-app/src/main/res/drawable-v21/material_blue_button.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+ -
+
+
+
+
+
diff --git a/android-app/src/main/res/drawable-v21/material_button_dark.xml b/android-app/src/main/res/drawable-v21/material_button_dark.xml
new file mode 100644
index 00000000..97c0ea90
--- /dev/null
+++ b/android-app/src/main/res/drawable-v21/material_button_dark.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android-app/src/main/res/drawable-v21/material_button_light.xml b/android-app/src/main/res/drawable-v21/material_button_light.xml
new file mode 100644
index 00000000..d26ac324
--- /dev/null
+++ b/android-app/src/main/res/drawable-v21/material_button_light.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/android-app/src/main/res/values-v21/theme_material.xml b/android-app/src/main/res/values-v21/theme_material.xml
new file mode 100644
index 00000000..92055bbe
--- /dev/null
+++ b/android-app/src/main/res/values-v21/theme_material.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android-app/src/main/res/values/colors.xml b/android-app/src/main/res/values/colors.xml
index 683cf68b..85ee23ce 100644
--- a/android-app/src/main/res/values/colors.xml
+++ b/android-app/src/main/res/values/colors.xml
@@ -41,6 +41,7 @@
#212121
#393939
#10648c
+ #ff0d4663
#ff092c39
#088e3a
#651456