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

v0.2.4 Release - Custom default icon and color for secondlion ; fixes #155

Browse source
This commit is contained in:
Gregor Santner 2017-03-19 23:32:18 +01:00
parent 5379386ecc
commit 8d6b09c800
32 changed files with 189 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -59,6 +59,7 @@ import android.widget.TextView;
import android.widget.Toast;
import com.github.dfa.diaspora_android.App;
import com.github.dfa.diaspora_android.BuildConfig;
import com.github.dfa.diaspora_android.R;
import com.github.dfa.diaspora_android.data.DiasporaPodList;
import com.github.dfa.diaspora_android.data.DiasporaUserProfile;
@ -392,6 +393,9 @@ public class MainActivity extends ThemedActivity
}
}
}
else if (BuildConfig.IS_TEST_BUILD){
navheaderImage.setImageResource(R.drawable.ic_launcher_test);
}
updateNavigationViewEntryVisibilities();
}

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

@ -17,7 +17,10 @@ package com.github.dfa.diaspora_android.util;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.SharedPreferences;
import android.support.annotation.ColorRes;
import android.support.v4.content.ContextCompat;
import com.github.dfa.diaspora_android.BuildConfig;
import com.github.dfa.diaspora_android.R;
import com.github.dfa.diaspora_android.data.DiasporaAspect;
import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod;
@ -136,6 +139,10 @@ public class AppSettings {
return pref.getInt(key, defaultColor);
}
public int getColorRes(@ColorRes int resColorId){
return ContextCompat.getColor(context, resColorId);
}
public void registerPrefAppPreferenceChangedListener(SharedPreferences.OnSharedPreferenceChangeListener listener) {
prefApp.registerOnSharedPreferenceChangeListener(listener);
}
@ -445,13 +452,14 @@ public class AppSettings {
public int[] getPrimaryColorSettings() {
return new int[]{
getInt(prefApp, R.string.pref_key__primary_color_base, context.getResources().getColor(R.color.md_blue_500)),
getInt(prefApp, R.string.pref_key__primary_color_shade, context.getResources().getColor(R.color.primary))
getInt(prefApp, R.string.pref_key__primary_color_base, getColorRes(R.color.md_blue_500)),
getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes(R.color.primary))
};
}
public int getPrimaryColor() {
return getInt(prefApp, R.string.pref_key__primary_color_shade, context.getResources().getColor(R.color.primary));
return getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes(
BuildConfig.IS_TEST_BUILD ? R.color.md_brown_800 : R.color.primary));
}
public void setAccentColorSettings(int base, int shade) {
@ -461,13 +469,13 @@ public class AppSettings {
public int[] getAccentColorSettings() {
return new int[]{
getInt(prefApp, R.string.pref_key__accent_color_base, context.getResources().getColor(R.color.md_deep_orange_500)),
getInt(prefApp, R.string.pref_key__accent_color_shade, context.getResources().getColor(R.color.accent))
getInt(prefApp, R.string.pref_key__accent_color_base, getColorRes(R.color.md_deep_orange_500)),
getInt(prefApp, R.string.pref_key__accent_color_shade, getColorRes(R.color.accent))
};
}
public int getAccentColor() {
return getInt(prefApp, R.string.pref_key__accent_color_shade, context.getResources().getColor(R.color.accent));
return getInt(prefApp, R.string.pref_key__accent_color_shade, getColorRes(R.color.accent));
}
public boolean isExtendedNotificationsActivated() {