diff options
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/cgeo/geocaching/CacheDetailActivity.java | 29 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/Constants.java | 7 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/cgeo.java | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/cgeonavigate.java | 2 |
4 files changed, 17 insertions, 23 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index 53930b8..d3076bc 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -739,7 +739,7 @@ public class CacheDetailActivity extends AbstractActivity { dist.append(Math.abs((int) diff)); dist.append(" m"); } else { - dist.append(Math.abs((int) (diff * 3.2808399))); + dist.append(Math.abs((int) (diff * Constants.M2FT))); dist.append(" ft"); } } @@ -1401,36 +1401,23 @@ public class CacheDetailActivity extends AbstractActivity { // cache state if (cache.isLogOffline() || cache.isArchived() || cache.isDisabled() || cache.isPremiumMembersOnly() || cache.isFound()) { - final StringBuilder state = new StringBuilder(); + List<String> states = new ArrayList<String>(5); if (cache.isLogOffline()) { - state.append(res.getString(R.string.cache_status_offline_log)); + states.add(res.getString(R.string.cache_status_offline_log)); } if (cache.isFound()) { - if (state.length() > 0) { - state.append(", "); - } - state.append(res.getString(R.string.cache_status_found)); + states.add(res.getString(R.string.cache_status_found)); } if (cache.isArchived()) { - if (state.length() > 0) { - state.append(", "); - } - state.append(res.getString(R.string.cache_status_archived)); + states.add(res.getString(R.string.cache_status_archived)); } if (cache.isDisabled()) { - if (state.length() > 0) { - state.append(", "); - } - state.append(res.getString(R.string.cache_status_disabled)); + states.add(res.getString(R.string.cache_status_disabled)); } if (cache.isPremiumMembersOnly()) { - if (state.length() > 0) { - state.append(", "); - } - state.append(res.getString(R.string.cache_status_premium)); + states.add(res.getString(R.string.cache_status_premium)); } - - addCacheDetail(R.string.cache_status, state.toString()); + addCacheDetail(R.string.cache_status, StringUtils.join(states, ", ")); } // distance diff --git a/main/src/cgeo/geocaching/Constants.java b/main/src/cgeo/geocaching/Constants.java index 2d4e0cc..180e039 100644 --- a/main/src/cgeo/geocaching/Constants.java +++ b/main/src/cgeo/geocaching/Constants.java @@ -20,4 +20,11 @@ public final class Constants { /** Text separator used for formatting texts */ public static final String SEPARATOR = " · "; + /** + * Factor used to calculate distance from meters to foot; + * <p> + * ft = m * M2FT; + */ + public static final double M2FT = 3.2808399d; + } diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/cgeo.java index 91cfaf7..0aa5cf7 100644 --- a/main/src/cgeo/geocaching/cgeo.java +++ b/main/src/cgeo/geocaching/cgeo.java @@ -600,7 +600,7 @@ public class cgeo extends AbstractActivity { if (Settings.isUseMetricUnits()) { navAccuracy.setText("±" + Math.round(geo.accuracyNow) + " m"); } else { - navAccuracy.setText("±" + Math.round(geo.accuracyNow * 3.2808399) + " ft"); + navAccuracy.setText("±" + Math.round(geo.accuracyNow * Constants.M2FT) + " ft"); } } else { navAccuracy.setText(null); diff --git a/main/src/cgeo/geocaching/cgeonavigate.java b/main/src/cgeo/geocaching/cgeonavigate.java index 8540ff4..53a62cc 100644 --- a/main/src/cgeo/geocaching/cgeonavigate.java +++ b/main/src/cgeo/geocaching/cgeonavigate.java @@ -366,7 +366,7 @@ public class cgeonavigate extends AbstractActivity { if (Settings.isUseMetricUnits()) { navAccuracy.setText("±" + Math.round(geo.accuracyNow) + " m"); } else { - navAccuracy.setText("±" + Math.round(geo.accuracyNow * 3.2808399) + " ft"); + navAccuracy.setText("±" + Math.round(geo.accuracyNow * Constants.M2FT) + " ft"); } } else { navAccuracy.setText(null); |