iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed score colors as requested

Browse Source
This commit is contained in:
jan_bar 2013-04-25 18:03:43 +02:00
parent 6aaf8143de
commit a771ad16cf
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/org/fox/ttrss/HeadlinesFragment.java
View File

@ -607,7 +607,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
if (tt != null) { if (tt != null) {
tt.setText(Html.fromHtml(article.title)); tt.setText(Html.fromHtml(article.title));
adjustTitleTextView(article.score, article.unread, tt, position); adjustTitleTextView(article.score, tt, position);
} }
TextView ft = (TextView)v.findViewById(R.id.feed_title); TextView ft = (TextView)v.findViewById(R.id.feed_title);
@ -740,17 +740,16 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
return v; return v;
} }
private void adjustTitleTextView(int score, boolean unread, TextView tv, int position) { private void adjustTitleTextView(int score, TextView tv, int position) {
int viewType = getItemViewType(position); int viewType = getItemViewType(position);
if (origTitleColors[viewType] == null) if (origTitleColors[viewType] == null)
// store original color // store original color
origTitleColors[viewType] = Integer.valueOf(tv.getCurrentTextColor()); origTitleColors[viewType] = Integer.valueOf(tv.getCurrentTextColor());
if (score < -100) { if (score < -500) {
tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
} else if (score > 500) { } else if (score > 500) {
if (unread) tv.setTextColor(titleHighScoreUnreadColor);
tv.setTextColor(titleHighScoreUnreadColor);
tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
} else { } else {
tv.setTextColor(origTitleColors[viewType].intValue()); tv.setTextColor(origTitleColors[viewType].intValue());

14
src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
View File

@ -453,11 +453,10 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
if (tt != null) { if (tt != null) {
tt.setText(Html.fromHtml(article.getString(article.getColumnIndex("title")))); tt.setText(Html.fromHtml(article.getString(article.getColumnIndex("title"))));
int scoreIndex = article.getColumnIndex("score"); int scoreIndex = article.getColumnIndex("score");
boolean unread = article.getInt(article.getColumnIndex("unread")) == 1; if (scoreIndex >= 0)
if(scoreIndex >= 0) adjustTitleTextView(article.getInt(scoreIndex), tt, position);
adjustTitleTextView(article.getInt(scoreIndex), unread, tt, position);
} }
TextView ft = (TextView)v.findViewById(R.id.feed_title); TextView ft = (TextView)v.findViewById(R.id.feed_title);
@ -596,17 +595,16 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
return v; return v;
} }
private void adjustTitleTextView(int score, boolean unread, TextView tv, int position) { private void adjustTitleTextView(int score, TextView tv, int position) {
int viewType = getItemViewType(position); int viewType = getItemViewType(position);
if (origTitleColors[viewType] == null) if (origTitleColors[viewType] == null)
// store original color // store original color
origTitleColors[viewType] = Integer.valueOf(tv.getCurrentTextColor()); origTitleColors[viewType] = Integer.valueOf(tv.getCurrentTextColor());
if (score < -100) { if (score < -500) {
tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
} else if (score > 500) { } else if (score > 500) {
if (unread) tv.setTextColor(titleHighScoreUnreadColor);
tv.setTextColor(titleHighScoreUnreadColor);
tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
} else { } else {
tv.setTextColor(origTitleColors[viewType].intValue()); tv.setTextColor(origTitleColors[viewType].intValue());