diff options
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/cgeo/geocaching/CacheDetailActivity.java | 6 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/TrackableActivity.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index ac9d4b9..bdc1921 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -2143,7 +2143,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc } final List<LogEntry> logs = allLogs ? cache.getLogs() : cache.getFriendsLogs(); - view.setAdapter(new ArrayAdapter<LogEntry>(CacheDetailActivity.this, R.layout.cacheview_logs_item, logs) { + view.setAdapter(new ArrayAdapter<LogEntry>(CacheDetailActivity.this, R.layout.logs_item, logs) { final UserActionsClickListener userActionsClickListener = new UserActionsClickListener(); final DecryptTextClickListener decryptTextClickListener = new DecryptTextClickListener(); @@ -2151,7 +2151,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc public View getView(final int position, final View convertView, final ViewGroup parent) { View rowView = convertView; if (null == rowView) { - rowView = getLayoutInflater().inflate(R.layout.cacheview_logs_item, null); + rowView = getLayoutInflater().inflate(R.layout.logs_item, null); } LogViewHolder holder = (LogViewHolder) rowView.getTag(); if (null == holder) { @@ -2277,7 +2277,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc date = (TextView) base.findViewById(R.id.added); type = (TextView) base.findViewById(R.id.type); author = (TextView) base.findViewById(R.id.author); - count = (TextView) base.findViewById(R.id.count); + count = (TextView) base.findViewById(R.id.count_or_location); text = (TextView) base.findViewById(R.id.log); images = (TextView) base.findViewById(R.id.log_images); statusMarker = (ImageView) base.findViewById(R.id.log_mark); diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java index 001ef2f..1295181 100644 --- a/main/src/cgeo/geocaching/TrackableActivity.java +++ b/main/src/cgeo/geocaching/TrackableActivity.java @@ -391,7 +391,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi @InjectView(R.id.added) protected TextView added ; @InjectView(R.id.type) protected TextView type; @InjectView(R.id.author) protected TextView author; - @InjectView(R.id.location) protected TextView location; + @InjectView(R.id.count_or_location) protected TextView location; @InjectView(R.id.log) protected TextView text; @InjectView(R.id.log_images) protected TextView images; @InjectView(R.id.log_mark) protected ImageView marker; @@ -407,12 +407,12 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi view = (ListView) getLayoutInflater().inflate(R.layout.trackable_logs_view, null); if (trackable != null && trackable.getLogs() != null) { - view.setAdapter(new ArrayAdapter<LogEntry>(TrackableActivity.this, R.layout.trackable_logs_item, trackable.getLogs()) { + view.setAdapter(new ArrayAdapter<LogEntry>(TrackableActivity.this, R.layout.logs_item, trackable.getLogs()) { @Override public View getView(int position, View convertView, android.view.ViewGroup parent) { View rowView = convertView; if (null == rowView) { - rowView = getLayoutInflater().inflate(R.layout.trackable_logs_item, null); + rowView = getLayoutInflater().inflate(R.layout.logs_item, null); } LogViewHolder holder = (LogViewHolder) rowView.getTag(); if (null == holder) { |