vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-09-10 10:49:42 +02:00
Code Issues Releases Wiki Activity

Release v0.2.6

Browse source
This commit is contained in:
Gregor Santner 2017-05-03 23:48:22 +02:00
parent baff1a1d35
commit 1ff93b6959
No known key found for this signature in database
GPG key ID: 7E83A7834AECB009
23 changed files with 115 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
View file

@ -467,11 +467,12 @@ public class AppSettings {
public int[] getPrimaryColorSettings() {
return new int[]{
getInt(prefApp, R.string.pref_key__primary_color_base, getColorRes(R.color.md_blue_500)),
getInt(prefApp, R.string.pref_key__primary_color_base, getColorRes(R.color.md_blue_650)),
getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes(R.color.primary))
};
}
@SuppressWarnings("ConstantConditions")
public int getPrimaryColor() {
return getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes(
BuildConfig.IS_TEST_BUILD ? R.color.md_brown_800 : R.color.primary));
@ -484,7 +485,7 @@ public class AppSettings {
public int[] getAccentColorSettings() {
return new int[]{
getInt(prefApp, R.string.pref_key__accent_color_base, getColorRes(R.color.md_deep_orange_500)),
getInt(prefApp, R.string.pref_key__accent_color_base, getColorRes(R.color.md_green_400)),
getInt(prefApp, R.string.pref_key__accent_color_shade, getColorRes(R.color.accent))
};
}