diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-07-22 17:51:22 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-07-22 17:51:22 +0200 |
| commit | da6467b17a37a6eb2c8a4e98525a80679b695bb3 (patch) | |
| tree | 78f1f7f2a85f6ef14baac3119fd5b2315fe448fc /main | |
| parent | b71f1c3b9da9941e91ee5866b7a66ce171efa0d6 (diff) | |
| parent | 0362906593bebf0d47de1ac532d36d0744de6476 (diff) | |
| download | cgeo-da6467b17a37a6eb2c8a4e98525a80679b695bb3.zip cgeo-da6467b17a37a6eb2c8a4e98525a80679b695bb3.tar.gz cgeo-da6467b17a37a6eb2c8a4e98525a80679b695bb3.tar.bz2 | |
Merge pull request #4078 from Lineflyer/master
Do not take own rating for cachelist color
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/cgeo/geocaching/ui/CacheListAdapter.java | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/main/src/cgeo/geocaching/ui/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java index 6cd9e29..b879e54 100644 --- a/main/src/cgeo/geocaching/ui/CacheListAdapter.java +++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java @@ -474,24 +474,13 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> { } else { favoriteBack = R.drawable.favorite_background_dark; } - final float myVote = cache.getMyVote(); - if (myVote > 0) { // use my own rating for display, if I have voted - if (myVote >= 4) { - favoriteBack = RATING_BACKGROUND[2]; - } else if (myVote >= 3) { - favoriteBack = RATING_BACKGROUND[1]; - } else if (myVote > 0) { - favoriteBack = RATING_BACKGROUND[0]; - } - } else { - final float rating = cache.getRating(); - if (rating >= 3.5) { - favoriteBack = RATING_BACKGROUND[2]; - } else if (rating >= 2.1) { - favoriteBack = RATING_BACKGROUND[1]; - } else if (rating > 0.0) { - favoriteBack = RATING_BACKGROUND[0]; - } + final float rating = cache.getRating(); + if (rating >= 3.5) { + favoriteBack = RATING_BACKGROUND[2]; + } else if (rating >= 2.1) { + favoriteBack = RATING_BACKGROUND[1]; + } else if (rating > 0.0) { + favoriteBack = RATING_BACKGROUND[0]; } holder.favorite.setBackgroundResource(favoriteBack); |