SecT0uch
/
Kore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix getting backup color errors

This commit is contained in:
Synced Synapse 2015-11-05 23:04:41 +00:00
parent fe9f45bb4a
commit 9d7d04ea1f
9 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/xbmc/kore/ui/AddonDetailsFragment.java
View File

@ -287,7 +287,8 @@ public class AddonDetailsFragment extends Fragment {
Resources.Theme theme = getActivity().getTheme();
TypedArray styledAttributes = theme.obtainStyledAttributes(new int[] {
R.attr.colorAccent});
enabledButton.setColorFilter(styledAttributes.getColor(0, R.color.accent_default));
enabledButton.setColorFilter(styledAttributes.getColor(0,
getActivity().getResources().getColor(R.color.accent_default)));
styledAttributes.recycle();
fabButton.setVisibility(View.VISIBLE);

3
app/src/main/java/org/xbmc/kore/ui/AlbumDetailsFragment.java
View File

@ -646,7 +646,8 @@ public class AlbumDetailsFragment extends Fragment
TypedArray styledAttributes = theme.obtainStyledAttributes(new int[]{
R.attr.colorAccent});
downloadButton.setColorFilter(
styledAttributes.getColor(0, R.color.accent_default));
styledAttributes.getColor(0,
getActivity().getResources().getColor(R.color.accent_default)));
styledAttributes.recycle();
} else {
downloadButton.clearColorFilter();

6
app/src/main/java/org/xbmc/kore/ui/MovieDetailsFragment.java
View File

@ -583,7 +583,8 @@ public class MovieDetailsFragment extends Fragment
TypedArray styledAttributes = theme.obtainStyledAttributes(new int[]{
R.attr.colorAccent});
downloadButton.setColorFilter(
styledAttributes.getColor(0, R.color.accent_default));
styledAttributes.getColor(0,
getActivity().getResources().getColor(R.color.accent_default)));
styledAttributes.recycle();
} else {
downloadButton.clearColorFilter();
@ -596,7 +597,8 @@ public class MovieDetailsFragment extends Fragment
Resources.Theme theme = getActivity().getTheme();
TypedArray styledAttributes = theme.obtainStyledAttributes(new int[] {
R.attr.colorAccent});
seenButton.setColorFilter(styledAttributes.getColor(0, R.color.accent_default));
seenButton.setColorFilter(styledAttributes.getColor(0,
getActivity().getResources().getColor(R.color.accent_default)));
styledAttributes.recycle();
} else {
seenButton.clearColorFilter();

3
app/src/main/java/org/xbmc/kore/ui/MusicVideoDetailsFragment.java
View File

@ -497,7 +497,8 @@ public class MusicVideoDetailsFragment extends Fragment
TypedArray styledAttributes = theme.obtainStyledAttributes(new int[]{
R.attr.colorAccent});
downloadButton.setColorFilter(
styledAttributes.getColor(0, R.color.accent_default));
styledAttributes.getColor(0,
getActivity().getResources().getColor(R.color.accent_default)));
styledAttributes.recycle();
} else {
downloadButton.clearColorFilter();

9
app/src/main/java/org/xbmc/kore/ui/NavigationDrawerFragment.java
View File

@ -306,7 +306,7 @@ public class NavigationDrawerFragment extends Fragment {
if (mDrawerListView != null) {
mDrawerListView.setItemChecked(position, true);
}
mDrawerLayout.closeDrawer(Gravity.START);
mDrawerLayout.closeDrawer(GravityCompat.START);
// Same activity, just return
if (item.id == getItemIdFromActivity())
@ -395,8 +395,11 @@ public class NavigationDrawerFragment extends Fragment {
R.attr.colorAccent,
R.attr.textColorOverPrimary
});
selectedItemColor = styledAttributes.getColor(0, R.color.accent_default);
hostItemColor = styledAttributes.getColor(1, R.color.white);
Resources resources = context.getResources();
selectedItemColor = styledAttributes.getColor(0,
resources.getColor(R.color.accent_default));
hostItemColor = styledAttributes.getColor(1,
resources.getColor(R.color.white));
styledAttributes.recycle();
}

12
app/src/main/java/org/xbmc/kore/ui/NowPlayingFragment.java
View File

@ -319,7 +319,8 @@ public class NowPlayingFragment extends Fragment
TypedArray styledAttributes = theme.obtainStyledAttributes(new int[] {
R.attr.colorAccent});
volumeMuteButton.setColorFilter(
styledAttributes.getColor(0, R.color.accent_default));
styledAttributes.getColor(0,
getActivity().getResources().getColor(R.color.accent_default)));
styledAttributes.recycle();
} else {
volumeMuteButton.clearColorFilter();
@ -763,24 +764,25 @@ public class NowPlayingFragment extends Fragment
}
Resources.Theme theme = getActivity().getTheme();
TypedArray styledAttributes = theme.obtainStyledAttributes(new int[] {
TypedArray styledAttributes = theme.obtainStyledAttributes(new int[]{
R.attr.colorAccent,
R.attr.iconRepeat,
R.attr.iconRepeatOne});
int accentDefaultColor = getResources().getColor(R.color.accent_default);
if (getPropertiesResult.repeat.equals(PlayerType.Repeat.OFF)) {
repeatButton.setImageResource(styledAttributes.getResourceId(1, R.drawable.ic_repeat_white_24dp));
repeatButton.clearColorFilter();
} else if (getPropertiesResult.repeat.equals(PlayerType.Repeat.ONE)) {
repeatButton.setImageResource(styledAttributes.getResourceId(2, R.drawable.ic_repeat_one_white_24dp));
repeatButton.setColorFilter(styledAttributes.getColor(0, R.color.accent_default));
repeatButton.setColorFilter(styledAttributes.getColor(0, accentDefaultColor));
} else {
repeatButton.setImageResource(styledAttributes.getResourceId(1, R.drawable.ic_repeat_white_24dp));
repeatButton.setColorFilter(styledAttributes.getColor(0, R.color.accent_default));
repeatButton.setColorFilter(styledAttributes.getColor(0, accentDefaultColor));
}
if (!getPropertiesResult.shuffled) {
shuffleButton.clearColorFilter();
} else {
shuffleButton.setColorFilter(styledAttributes.getColor(0, R.color.accent_default));
shuffleButton.setColorFilter(styledAttributes.getColor(0, accentDefaultColor));
}
styledAttributes.recycle();

6
app/src/main/java/org/xbmc/kore/ui/PlaylistFragment.java
View File

@ -531,8 +531,10 @@ public class PlaylistFragment extends Fragment
TypedArray styledAttributes = theme.obtainStyledAttributes(new int[] {
R.attr.appCardBackgroundColor,
R.attr.appSelectedCardBackgroundColor});
cardBackgroundColor = styledAttributes.getColor(0, R.color.dark_content_background);
selectedCardBackgroundColor = styledAttributes.getColor(1, R.color.dark_selected_content_background);
cardBackgroundColor = styledAttributes.getColor(0,
getResources().getColor(R.color.dark_content_background));
selectedCardBackgroundColor = styledAttributes.getColor(1,
getResources().getColor(R.color.dark_selected_content_background));
styledAttributes.recycle();
}

4
app/src/main/java/org/xbmc/kore/ui/TVShowEpisodeDetailsFragment.java
View File

@ -562,7 +562,7 @@ public class TVShowEpisodeDetailsFragment extends Fragment
TypedArray styledAttributes = theme.obtainStyledAttributes(new int[]{
R.attr.colorAccent});
downloadButton.setColorFilter(
styledAttributes.getColor(0, R.color.accent_default));
styledAttributes.getColor(0, getResources().getColor(R.color.accent_default)));
styledAttributes.recycle();
} else {
downloadButton.clearColorFilter();
@ -575,7 +575,7 @@ public class TVShowEpisodeDetailsFragment extends Fragment
Resources.Theme theme = getActivity().getTheme();
TypedArray styledAttributes = theme.obtainStyledAttributes(new int[] {
R.attr.colorAccent});
seenButton.setColorFilter(styledAttributes.getColor(0, R.color.accent_default));
seenButton.setColorFilter(styledAttributes.getColor(0, getResources().getColor(R.color.accent_default)));
styledAttributes.recycle();
} else {
seenButton.clearColorFilter();

2
app/src/main/java/org/xbmc/kore/ui/TVShowEpisodeListFragment.java
View File

@ -457,7 +457,7 @@ public class TVShowEpisodeListFragment extends Fragment
R.attr.iconCollapse,
R.attr.iconExpand,
});
themeAccentColor = styledAttributes.getColor(0, R.color.accent_default);
themeAccentColor = styledAttributes.getColor(0, getResources().getColor(R.color.accent_default));
iconCollapseResId = styledAttributes.getResourceId(1, R.drawable.ic_expand_less_white_24dp);
iconExpandResId = styledAttributes.getResourceId(2, R.drawable.ic_expand_more_white_24dp);
styledAttributes.recycle();