diff --git a/src/main/java/trikita/talalarmo/SettingsActivity.java b/src/main/java/trikita/talalarmo/SettingsActivity.java index ae14242..96def0c 100644 --- a/src/main/java/trikita/talalarmo/SettingsActivity.java +++ b/src/main/java/trikita/talalarmo/SettingsActivity.java @@ -19,16 +19,32 @@ public class SettingsActivity extends Activity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - if (App.getState().settings().theme() == 0) { - setTheme(android.R.style.Theme_Holo_Light); - } else { - setTheme(android.R.style.Theme_Holo); + switch (App.getState().settings().theme()) { + case 0: + setTheme(android.R.style.Theme_Holo_Light); + break; + case 1: + setTheme(android.R.style.Theme_Holo); + break; + case 2: + setTheme(R.style.AMOLED); + break; + default: + setTheme(android.R.style.Theme_Holo_Light); } } else { - if (App.getState().settings().theme() == 0) { - setTheme(android.R.style.Theme_Material_Light); - } else { - setTheme(android.R.style.Theme_Material); + switch (App.getState().settings().theme()) { + case 0: + setTheme(android.R.style.Theme_Material_Light); + break; + case 1: + setTheme(android.R.style.Theme_Material); + break; + case 2: + setTheme(R.style.AMOLED); + break; + default: + setTheme(android.R.style.Theme_Holo_Light); } } diff --git a/src/main/java/trikita/talalarmo/ui/Theme.java b/src/main/java/trikita/talalarmo/ui/Theme.java index 770f4ff..b3509c3 100644 --- a/src/main/java/trikita/talalarmo/ui/Theme.java +++ b/src/main/java/trikita/talalarmo/ui/Theme.java @@ -8,7 +8,9 @@ public enum Theme { LIGHT(0xffffffff, 0x0f555555, 0xff666666, 0xff0097a7, 0xff00bcd4, 0xff212121, 0xff727272, true), DARK(0xff002b36, 0x40002129, 0xffcbd2d2, 0xff002129, 0xffe91e63, - 0xddfdf6e3, 0xff93a1a1, true); + 0xddfdf6e3, 0xff93a1a1, true), + AMOLED(0xff000000, 0xff0a0a0a, 0xffcccccc, 0xff000000, 0xffc51162, + 0xffcccccc, 0xffbbbbbb, true); public final int backgroundColor; public final int backgroundTranslucentColor; @@ -33,10 +35,15 @@ public enum Theme { } public static Theme get(int index) { - if (index == 0) { - return LIGHT; - } else { - return DARK; + switch (index) { + case 0: + return LIGHT; + case 1: + return DARK; + case 2: + return AMOLED; + default: + return LIGHT; } } diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 08c3471..3e7b2fa 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -24,5 +24,6 @@ ライト ダーク + AMOLED diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index ca47f11..79eb310 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -24,5 +24,6 @@ Светлая тема Темная тема + AMOLED \ No newline at end of file diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index b849b8e..08b362a 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -24,5 +24,6 @@ Світла Темна + AMOLED \ No newline at end of file diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml index 47964b1..6c377d8 100644 --- a/src/main/res/values-v21/styles.xml +++ b/src/main/res/values-v21/styles.xml @@ -1,4 +1,11 @@ \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 789ddf4..f30235e 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -24,9 +24,11 @@ Light Dark + AMOLED 0 1 + 2 diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 1df1c61..af24f8a 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -1,4 +1,11 @@ \ No newline at end of file