diff options
Diffstat (limited to 'main/src/cgeo/geocaching/CacheDetailActivity.java')
| -rw-r--r-- | main/src/cgeo/geocaching/CacheDetailActivity.java | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index 37a24ad..813d1da 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -373,9 +373,9 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc final ViewGroup parent = ((ViewGroup) view.getParent()); for (int i = 0; i < parent.getChildCount(); i++) { if (parent.getChildAt(i) == view) { - final List<cgWaypoint> sortedWaypoints = new ArrayList<cgWaypoint>(cache.getWaypoints()); + final List<Waypoint> sortedWaypoints = new ArrayList<Waypoint>(cache.getWaypoints()); Collections.sort(sortedWaypoints); - final cgWaypoint waypoint = sortedWaypoints.get(i); + final Waypoint waypoint = sortedWaypoints.get(i); final int index = cache.getWaypoints().indexOf(waypoint); menu.setHeaderTitle(res.getString(R.string.waypoint)); if (waypoint.getWaypointType().equals(WaypointType.ORIGINAL)) { @@ -458,40 +458,40 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc break; case CONTEXT_MENU_WAYPOINT_EDIT: - final cgWaypoint waypointEdit = cache.getWaypoint(index); + final Waypoint waypointEdit = cache.getWaypoint(index); if (waypointEdit != null) { EditWaypointActivity.startActivityEditWaypoint(this, waypointEdit.getId()); refreshOnResume = true; } break; case CONTEXT_MENU_WAYPOINT_DUPLICATE: - final cgWaypoint waypointDuplicate = cache.getWaypoint(index); + final Waypoint waypointDuplicate = cache.getWaypoint(index); if (cache.duplicateWaypoint(waypointDuplicate)) { cgData.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB)); notifyDataSetChanged(); } break; case CONTEXT_MENU_WAYPOINT_DELETE: - final cgWaypoint waypointDelete = cache.getWaypoint(index); + final Waypoint waypointDelete = cache.getWaypoint(index); if (cache.deleteWaypoint(waypointDelete)) { cgData.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB)); notifyDataSetChanged(); } break; case CONTEXT_MENU_WAYPOINT_DEFAULT_NAVIGATION: - final cgWaypoint waypointNavigation = cache.getWaypoint(index); + final Waypoint waypointNavigation = cache.getWaypoint(index); if (waypointNavigation != null) { NavigationAppFactory.startDefaultNavigationApplication(1, this, waypointNavigation); } break; case CONTEXT_MENU_WAYPOINT_NAVIGATE: - final cgWaypoint waypointNav = cache.getWaypoint(contextMenuWPIndex); + final Waypoint waypointNav = cache.getWaypoint(contextMenuWPIndex); if (waypointNav != null) { NavigationAppFactory.showNavigationMenu(this, null, waypointNav, null); } break; case CONTEXT_MENU_WAYPOINT_CACHES_AROUND: - final cgWaypoint waypointAround = cache.getWaypoint(index); + final Waypoint waypointAround = cache.getWaypoint(index); if (waypointAround != null) { cgeocaches.startActivityCoordinates(this, waypointAround.getCoords()); } @@ -903,9 +903,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc private ViewGroup attributeDescriptionsLayout; // layout for attribute descriptions private boolean attributesShowAsIcons = true; // default: show icons /** - * True, if the cache was imported with an older version of c:geo. - * These older versions parsed the attribute description from the tooltip in the web - * page and put them into the DB. No icons can be matched for these. + * If the cache is from a non GC source, it might be without icons. Disable switching in those cases. */ private boolean noAttributeIconsFound = false; private int attributeBoxMaxWidth; @@ -1074,10 +1072,6 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc buffer.append(attributeName); } - if (noAttributeIconsFound) { - buffer.append("\n\n").append(res.getString(R.string.cache_attributes_no_icons)); - } - attribView.setText(buffer); return descriptions; @@ -2035,7 +2029,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc holder.images.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - ImagesActivity.startActivityLogImages(CacheDetailActivity.this, cache.getGeocode(), new ArrayList<cgImage>(log.getLogImages())); + ImagesActivity.startActivityLogImages(CacheDetailActivity.this, cache.getGeocode(), new ArrayList<Image>(log.getLogImages())); } }); } else { @@ -2102,10 +2096,10 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc final LinearLayout waypoints = (LinearLayout) view.findViewById(R.id.waypoints); // sort waypoints: PP, Sx, FI, OWN - final List<cgWaypoint> sortedWaypoints = new ArrayList<cgWaypoint>(cache.getWaypoints()); + final List<Waypoint> sortedWaypoints = new ArrayList<Waypoint>(cache.getWaypoints()); Collections.sort(sortedWaypoints); - for (final cgWaypoint wpt : sortedWaypoints) { + for (final Waypoint wpt : sortedWaypoints) { final LinearLayout waypointView = (LinearLayout) getLayoutInflater().inflate(R.layout.waypoint_item, null); // coordinates @@ -2200,13 +2194,13 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc // TODO: fix layout, then switch back to Android-resource and delete copied one // this copy is modified to respect the text color - view.setAdapter(new ArrayAdapter<cgTrackable>(CacheDetailActivity.this, R.layout.simple_list_item_1, cache.getInventory())); + view.setAdapter(new ArrayAdapter<Trackable>(CacheDetailActivity.this, R.layout.simple_list_item_1, cache.getInventory())); view.setOnItemClickListener(new OnItemClickListener() { @Override public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) { Object selection = arg0.getItemAtPosition(arg2); - if (selection instanceof cgTrackable) { - cgTrackable trackable = (cgTrackable) selection; + if (selection instanceof Trackable) { + Trackable trackable = (Trackable) selection; TrackableActivity.startActivity(CacheDetailActivity.this, trackable.getGuid(), trackable.getGeocode(), trackable.getName()); } } @@ -2254,7 +2248,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc final RadioButton resetBoth; final RadioButton resetLocal; - public ResetCacheCoordinatesDialog(final cgCache cache, final cgWaypoint wpt, final Activity activity) { + public ResetCacheCoordinatesDialog(final cgCache cache, final Waypoint wpt, final Activity activity) { super(activity); View layout = activity.getLayoutInflater().inflate(R.layout.reset_cache_coords_dialog, null); @@ -2303,12 +2297,12 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc private final Handler handler; private final boolean local; private final boolean remote; - private final cgWaypoint wpt; + private final Waypoint wpt; private ProgressDialog progress; public static final int LOCAL = 0; public static final int ON_WEBSITE = 1; - public ResetCoordsThread(cgCache cache, Handler handler, final cgWaypoint wpt, boolean local, boolean remote, final ProgressDialog progress) { + public ResetCoordsThread(cgCache cache, Handler handler, final Waypoint wpt, boolean local, boolean remote, final ProgressDialog progress) { this.cache = cache; this.handler = handler; this.local = local; |