TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New theme: dark material

Browse Source
This commit is contained in:
serso
2015-02-05 17:31:15 +01:00
parent fa5aaf93bd
commit 56d6c0db76
6 changed files with 161 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
android-app/src/main/java/org/solovyev/android/calculator/Preferences.java
View File

@@ -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),