diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-12-18 10:39:16 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-12-18 10:39:16 +0100 |
| commit | 98817045adee46e815b0e6b52dfcf93fe2d56b66 (patch) | |
| tree | b759c634267aba919e6b8e7bec81ded3192350c5 | |
| parent | da59fdf3fe3aa38d541bd2ba012dbf359092bd71 (diff) | |
| parent | bbd191f0ba23f8969de821f9f551703c247d7036 (diff) | |
| download | cgeo-98817045adee46e815b0e6b52dfcf93fe2d56b66.zip cgeo-98817045adee46e815b0e6b52dfcf93fe2d56b66.tar.gz cgeo-98817045adee46e815b0e6b52dfcf93fe2d56b66.tar.bz2 | |
Merge branch 'release' into upstream
| -rw-r--r-- | main/src/cgeo/geocaching/CacheDetailActivity.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index 85597e7..e74b2d2 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -1274,7 +1274,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc } /** - * shows/hides buttons, sets text in watchlist box + * Show/hide buttons, set text in watchlist box */ private void updateWatchlistBox() { final LinearLayout layout = ButterKnife.findById(view, R.id.watchlist_box); @@ -1308,9 +1308,17 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc } /** - * shows/hides buttons, sets text in watchlist box + * Show/hide buttons, set text in favourite line and box */ private void updateFavPointBox() { + // Favorite counts + if (cache.getFavoritePoints() > 0) { + favoriteLine.left.setVisibility(View.VISIBLE); + favoriteLine.right.setText(cache.getFavoritePoints() + "×"); + } else { + favoriteLine.left.setVisibility(View.GONE); + } + final LinearLayout layout = ButterKnife.findById(view, R.id.favpoint_box); final boolean supportsFavoritePoints = cache.supportsFavoritePoints(); layout.setVisibility(supportsFavoritePoints ? View.VISIBLE : View.GONE); @@ -1338,14 +1346,6 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc buttonRemove.setEnabled(false); buttonRemove.setVisibility(View.GONE); } - - // Favorite counts - if (cache.getFavoritePoints() > 0) { - favoriteLine.left.setVisibility(View.VISIBLE); - favoriteLine.right.setText(cache.getFavoritePoints() + "×"); - } else { - favoriteLine.left.setVisibility(View.GONE); - } } /** |