refactoring: use activity names for layouts

55 files changed, 48 insertions, 48 deletions

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index c391fe9..1ea0d28 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -172,7 +172,7 @@
             android:label="@string/map_static_title" >
         </activity>
         <activity
-            android:name=".VisitCacheActivity"
+            android:name=".LogCacheActivity"
             android:label="@string/log_new_log" >
         </activity>
         <activity
diff --git a/main/res/layout-land/navigate.xml b/main/res/layout-land/compass_activity.xml
index d07f047..e433814 100644
--- a/main/res/layout-land/navigate.xml
+++ b/main/res/layout-land/compass_activity.xml
@@ -70,7 +70,7 @@
             <TextView
                 android:id="@+id/nav_location"
                 style="@style/location_current"
-                android:layout_above="@id/status"
+                android:layout_above="@+id/status"
                 android:layout_alignParentBottom="false"
                 android:layout_alignParentLeft="false"
                 android:layout_alignParentTop="false"
diff --git a/main/res/layout-land/coords.xml b/main/res/layout-land/coordinatesinput_dialog.xml
index 88e5e76..88e5e76 100644
--- a/main/res/layout-land/coords.xml
+++ b/main/res/layout-land/coordinatesinput_dialog.xml
diff --git a/main/res/layout/addresses.xml b/main/res/layout/addresslist_activity.xml
index c48c28f..c48c28f 100644
--- a/main/res/layout/addresses.xml
+++ b/main/res/layout/addresslist_activity.xml
diff --git a/main/res/layout/addresses_item.xml b/main/res/layout/addresslist_item.xml
index dac1768..dac1768 100644
--- a/main/res/layout/addresses_item.xml
+++ b/main/res/layout/addresslist_item.xml
diff --git a/main/res/layout/cacheview.xml b/main/res/layout/cachedetail_activity.xml
index 3afe5f6..3afe5f6 100644
--- a/main/res/layout/cacheview.xml
+++ b/main/res/layout/cachedetail_activity.xml
diff --git a/main/res/layout/cacheview_description.xml b/main/res/layout/cachedetail_description_page.xml
index 5c05c20..5c05c20 100644
--- a/main/res/layout/cacheview_description.xml
+++ b/main/res/layout/cachedetail_description_page.xml
diff --git a/main/res/layout/cacheview_details.xml b/main/res/layout/cachedetail_details_page.xml
index 484385e..484385e 100644
--- a/main/res/layout/cacheview_details.xml
+++ b/main/res/layout/cachedetail_details_page.xml
diff --git a/main/res/layout/caches_images.xml b/main/res/layout/cachedetail_images_page.xml
index 2360dd0..2360dd0 100644
--- a/main/res/layout/caches_images.xml
+++ b/main/res/layout/cachedetail_images_page.xml
diff --git a/main/res/layout/cacheview_inventory.xml b/main/res/layout/cachedetail_inventory_page.xml
index 9acbba4..9acbba4 100644
--- a/main/res/layout/cacheview_inventory.xml
+++ b/main/res/layout/cachedetail_inventory_page.xml
diff --git a/main/res/layout/cacheview_logs.xml b/main/res/layout/cachedetail_logs_page.xml
index 9aafd83..9aafd83 100644
--- a/main/res/layout/cacheview_logs.xml
+++ b/main/res/layout/cachedetail_logs_page.xml
diff --git a/main/res/layout/cacheview_waypoints.xml b/main/res/layout/cachedetail_waypoints_page.xml
index 8a24aa8..8a24aa8 100644
--- a/main/res/layout/cacheview_waypoints.xml
+++ b/main/res/layout/cachedetail_waypoints_page.xml
diff --git a/main/res/layout/caches.xml b/main/res/layout/cacheslist_activity.xml
index 5c3abbc..5c3abbc 100644
--- a/main/res/layout/caches.xml
+++ b/main/res/layout/cacheslist_activity.xml
diff --git a/main/res/layout/caches_footer.xml b/main/res/layout/cacheslist_footer.xml
index ed2de18..ed2de18 100644
--- a/main/res/layout/caches_footer.xml
+++ b/main/res/layout/cacheslist_footer.xml
diff --git a/main/res/layout/caches_item.xml b/main/res/layout/cacheslist_item.xml
index 3bd556b..3bd556b 100644
--- a/main/res/layout/caches_item.xml
+++ b/main/res/layout/cacheslist_item.xml
diff --git a/main/res/layout/navigate.xml b/main/res/layout/compass_activity.xml
index b994b70..b994b70 100644
--- a/main/res/layout/navigate.xml
+++ b/main/res/layout/compass_activity.xml
diff --git a/main/res/layout/coords.xml b/main/res/layout/coordinatesinput_dialog.xml
index 4603360..4603360 100644
--- a/main/res/layout/coords.xml
+++ b/main/res/layout/coordinatesinput_dialog.xml
diff --git a/main/res/layout/edit_waypoint_activity.xml b/main/res/layout/editwaypoint_activity.xml
index 657e9f4..657e9f4 100644
--- a/main/res/layout/edit_waypoint_activity.xml
+++ b/main/res/layout/editwaypoint_activity.xml
diff --git a/main/res/layout/spoilers.xml b/main/res/layout/images_activity.xml
index 29ad570..ccd8499 100644
--- a/main/res/layout/spoilers.xml
+++ b/main/res/layout/images_activity.xml
@@ -7,6 +7,6 @@
 
     <include layout="@layout/actionbar" />
 
-    <include layout="@layout/caches_images" />
+    <include layout="@layout/cachedetail_images_page" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/visit_image.xml b/main/res/layout/imageselect_activity.xml
index fd8eaea..fd8eaea 100644
--- a/main/res/layout/visit_image.xml
+++ b/main/res/layout/imageselect_activity.xml
diff --git a/main/res/layout/visit.xml b/main/res/layout/logcache_activity.xml
index e0294da..e0294da 100644
--- a/main/res/layout/visit.xml
+++ b/main/res/layout/logcache_activity.xml
diff --git a/main/res/layout/visit_trackable.xml b/main/res/layout/logcache_trackable_item.xml
index 1eab116..1eab116 100644
--- a/main/res/layout/visit_trackable.xml
+++ b/main/res/layout/logcache_trackable_item.xml
diff --git a/main/res/layout/touch.xml b/main/res/layout/logtrackable_activity.xml
index 7791409..7791409 100644
--- a/main/res/layout/touch.xml
+++ b/main/res/layout/logtrackable_activity.xml
diff --git a/main/res/layout/main.xml b/main/res/layout/main_activity.xml
index 40e3d6a..40e3d6a 100644
--- a/main/res/layout/main.xml
+++ b/main/res/layout/main_activity.xml
diff --git a/main/res/layout/point.xml b/main/res/layout/navigateanypoint_activity.xml
index baa568c..baa568c 100644
--- a/main/res/layout/point.xml
+++ b/main/res/layout/navigateanypoint_activity.xml
diff --git a/main/res/layout/point_controls.xml b/main/res/layout/navigateanypoint_header.xml
index caf2e48..caf2e48 100644
--- a/main/res/layout/point_controls.xml
+++ b/main/res/layout/navigateanypoint_header.xml
diff --git a/main/res/layout/search.xml b/main/res/layout/search_activity.xml
index a0a699d..a0a699d 100644
--- a/main/res/layout/search.xml
+++ b/main/res/layout/search_activity.xml
diff --git a/main/res/layout/init.xml b/main/res/layout/settings_activity.xml
index ae70fa7..ae70fa7 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/settings_activity.xml
diff --git a/main/res/layout/star.xml b/main/res/layout/star_image.xml
index 919fedb..919fedb 100644
--- a/main/res/layout/star.xml
+++ b/main/res/layout/star_image.xml
diff --git a/main/res/layout/map_static.xml b/main/res/layout/staticmaps_activity.xml
index 2ffa70d..2ffa70d 100644
--- a/main/res/layout/map_static.xml
+++ b/main/res/layout/staticmaps_activity.xml
diff --git a/main/res/layout/map_static_item.xml b/main/res/layout/staticmaps_activity_item.xml
index 1bac7f0..1bac7f0 100644
--- a/main/res/layout/map_static_item.xml
+++ b/main/res/layout/staticmaps_activity_item.xml
diff --git a/main/res/layout/useful_apps_activity.xml b/main/res/layout/usefulapps_activity.xml
index 84bcf39..84bcf39 100644
--- a/main/res/layout/useful_apps_activity.xml
+++ b/main/res/layout/usefulapps_activity.xml
diff --git a/main/res/layout/useful_apps_item.xml b/main/res/layout/usefulapps_item.xml
index 70e7baf..70e7baf 100644
--- a/main/res/layout/useful_apps_item.xml
+++ b/main/res/layout/usefulapps_item.xml
diff --git a/main/src/cgeo/geocaching/AddressListActivity.java b/main/src/cgeo/geocaching/AddressListActivity.java
index 150bbc5..c984d28 100644
--- a/main/src/cgeo/geocaching/AddressListActivity.java
+++ b/main/src/cgeo/geocaching/AddressListActivity.java
@@ -20,7 +20,7 @@ public class AddressListActivity extends AbstractListActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.addresses);
+        super.onCreate(savedInstanceState, R.layout.addresslist_activity);
 
         // get parameters
         final String keyword = getIntent().getStringExtra(Intents.EXTRA_KEYWORD);
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 0f2fba0..32aabd8 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -202,7 +202,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.cacheview);
+        super.onCreate(savedInstanceState, R.layout.cachedetail_activity);
 
         // set title in code, as the activity needs a hard coded title due to the intent filters
         setTitle(res.getString(R.string.cache));
@@ -1155,7 +1155,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 return null;
             }
 
-            view = (ScrollView) getLayoutInflater().inflate(R.layout.cacheview_details, null);
+            view = (ScrollView) getLayoutInflater().inflate(R.layout.cachedetail_details_page, null);
 
             // Start loading preview map
             if (Settings.isStoreOfflineMaps()) {
@@ -1776,7 +1776,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 return null;
             }
 
-            view = (ScrollView) getLayoutInflater().inflate(R.layout.cacheview_description, null);
+            view = (ScrollView) getLayoutInflater().inflate(R.layout.cachedetail_description_page, null);
             Views.inject(this, view);
 
             // cache short description
@@ -2108,7 +2108,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 return null;
             }
 
-            view = (ListView) getLayoutInflater().inflate(R.layout.cacheview_logs, null);
+            view = (ListView) getLayoutInflater().inflate(R.layout.cachedetail_logs_page, null);
 
             // log count
             final Map<LogType, Integer> logCounts = cache.getLogCounts();
@@ -2273,7 +2273,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 return null;
             }
 
-            view = (ScrollView) getLayoutInflater().inflate(R.layout.cacheview_waypoints, null);
+            view = (ScrollView) getLayoutInflater().inflate(R.layout.cachedetail_waypoints_page, null);
 
             final LinearLayout waypoints = (LinearLayout) view.findViewById(R.id.waypoints);
 
@@ -2392,7 +2392,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 return null;
             }
 
-            view = (ListView) getLayoutInflater().inflate(R.layout.cacheview_inventory, null);
+            view = (ListView) getLayoutInflater().inflate(R.layout.cachedetail_inventory_page, null);
 
             // TODO: fix layout, then switch back to Android-resource and delete copied one
             // this copy is modified to respect the text color
@@ -2420,7 +2420,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 return null; // something is really wrong
             }
 
-            view = getLayoutInflater().inflate(R.layout.caches_images, null);
+            view = getLayoutInflater().inflate(R.layout.cachedetail_images_page, null);
             if (imagesList == null && isCurrentPage(Page.IMAGES)) {
                 loadCacheImages();
             }
diff --git a/main/src/cgeo/geocaching/CompassActivity.java b/main/src/cgeo/geocaching/CompassActivity.java
index 73db653..4f8af08 100644
--- a/main/src/cgeo/geocaching/CompassActivity.java
+++ b/main/src/cgeo/geocaching/CompassActivity.java
@@ -57,7 +57,7 @@ public class CompassActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.navigate);
+        super.onCreate(savedInstanceState, R.layout.compass_activity);
 
         final SensorManager sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
         hasMagneticFieldSensor = sensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD) != null;
diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java
index 74cac4d..f97e9b5 100644
--- a/main/src/cgeo/geocaching/EditWaypointActivity.java
+++ b/main/src/cgeo/geocaching/EditWaypointActivity.java
@@ -126,7 +126,7 @@ public class EditWaypointActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.edit_waypoint_activity);
+        super.onCreate(savedInstanceState, R.layout.editwaypoint_activity);
 
         // get parameters
         Bundle extras = getIntent().getExtras();
diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 66b23bf..781f9ff 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -459,9 +459,9 @@ public class Geocache implements ICache, IWaypoint {
             fromActivity.showToast(((Activity) fromActivity).getResources().getString(R.string.err_cannot_log_visit));
             return;
         }
-        Intent logVisitIntent = new Intent((Activity) fromActivity, VisitCacheActivity.class);
-        logVisitIntent.putExtra(VisitCacheActivity.EXTRAS_ID, cacheId);
-        logVisitIntent.putExtra(VisitCacheActivity.EXTRAS_GEOCODE, geocode);
+        Intent logVisitIntent = new Intent((Activity) fromActivity, LogCacheActivity.class);
+        logVisitIntent.putExtra(LogCacheActivity.EXTRAS_ID, cacheId);
+        logVisitIntent.putExtra(LogCacheActivity.EXTRAS_GEOCODE, geocode);
 
         ((Activity) fromActivity).startActivity(logVisitIntent);
     }
diff --git a/main/src/cgeo/geocaching/ImageSelectActivity.java b/main/src/cgeo/geocaching/ImageSelectActivity.java
index f442a51..26dd85a 100644
--- a/main/src/cgeo/geocaching/ImageSelectActivity.java
+++ b/main/src/cgeo/geocaching/ImageSelectActivity.java
@@ -64,7 +64,7 @@ public class ImageSelectActivity extends AbstractActivity {
 
     @Override
     public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.visit_image);
+        super.onCreate(savedInstanceState, R.layout.imageselect_activity);
         Views.inject(this);
 
         scaleChoiceIndex = Settings.getLogImageScale();
diff --git a/main/src/cgeo/geocaching/ImagesActivity.java b/main/src/cgeo/geocaching/ImagesActivity.java
index 07ff734..030b3f7 100644
--- a/main/src/cgeo/geocaching/ImagesActivity.java
+++ b/main/src/cgeo/geocaching/ImagesActivity.java
@@ -45,7 +45,7 @@ public class ImagesActivity extends AbstractActivity {
 
         // init
         setTheme();
-        setContentView(R.layout.spoilers);
+        setContentView(R.layout.images_activity);
         setTitle(res.getString(imgType.getTitle()));
 
         imagesList = new ImagesList(this, geocode);
diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/LogCacheActivity.java
index 89a7249..e4d3d17 100644
--- a/main/src/cgeo/geocaching/VisitCacheActivity.java
+++ b/main/src/cgeo/geocaching/LogCacheActivity.java
@@ -47,7 +47,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-public class VisitCacheActivity extends AbstractLoggingActivity implements DateDialog.DateDialogParent {
+public class LogCacheActivity extends AbstractLoggingActivity implements DateDialog.DateDialogParent {
     static final String EXTRAS_GEOCODE = "geocode";
     static final String EXTRAS_ID = "id";
 
@@ -142,7 +142,7 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
         inventoryView.removeAllViews();
 
         for (TrackableLog tb : trackables) {
-            LinearLayout inventoryItem = (LinearLayout) inflater.inflate(R.layout.visit_trackable, null);
+            LinearLayout inventoryItem = (LinearLayout) inflater.inflate(R.layout.logcache_trackable_item, null);
 
             ((TextView) inventoryItem.findViewById(R.id.trackcode)).setText(tb.trackCode);
             ((TextView) inventoryItem.findViewById(R.id.name)).setText(tb.name);
@@ -164,7 +164,7 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
 
                 @Override
                 public void onClick(View view) {
-                    final Intent trackablesIntent = new Intent(VisitCacheActivity.this, TrackableActivity.class);
+                    final Intent trackablesIntent = new Intent(LogCacheActivity.this, TrackableActivity.class);
                     trackablesIntent.putExtra(Intents.EXTRA_GEOCODE, tbCode);
                     startActivity(trackablesIntent);
                 }
@@ -223,7 +223,7 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
 
     @Override
     public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.visit);
+        super.onCreate(savedInstanceState, R.layout.logcache_activity);
 
         // Get parameters from intent and basic cache information from database
         final Bundle extras = getIntent().getExtras();
@@ -495,7 +495,7 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
 
         @Override
         public void onClick(View arg0) {
-            final Dialog dateDialog = new DateDialog(VisitCacheActivity.this, VisitCacheActivity.this, date);
+            final Dialog dateDialog = new DateDialog(LogCacheActivity.this, LogCacheActivity.this, date);
             dateDialog.setCancelable(true);
             dateDialog.show();
         }
@@ -507,7 +507,7 @@ public class VisitCacheActivity extends AbstractLoggingActivity implements DateD
             final String message = res.getString(StringUtils.isBlank(imageUri.getPath()) ?
                     R.string.log_saving :
                     R.string.log_saving_and_uploading);
-            new Poster(VisitCacheActivity.this, message).execute(currentLogText());
+            new Poster(LogCacheActivity.this, message).execute(currentLogText());
         }
     }
 
diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java
index 7d8575b..1f6feb7 100644
--- a/main/src/cgeo/geocaching/LogTrackableActivity.java
+++ b/main/src/cgeo/geocaching/LogTrackableActivity.java
@@ -115,7 +115,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.touch);
+        super.onCreate(savedInstanceState, R.layout.logtrackable_activity);
         Views.inject(this);
 
         // get parameters
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index e8de1f7..9c3e89f 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -189,7 +189,7 @@ public class MainActivity extends AbstractActivity {
     public void onCreate(Bundle savedInstanceState) {
         // don't call the super implementation with the layout argument, as that would set the wrong theme
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
+        setContentView(R.layout.main_activity);
         Views.inject(this);
 
         if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
diff --git a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
index cc6853b..6f94944 100644
--- a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
+++ b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
@@ -119,7 +119,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.point);
+        super.onCreate(savedInstanceState, R.layout.navigateanypoint_activity);
         Views.inject(this);
 
         createHistoryView();
@@ -127,7 +127,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
     }
 
     private void createHistoryView() {
-        final View pointControls = getLayoutInflater().inflate(R.layout.point_controls, null);
+        final View pointControls = getLayoutInflater().inflate(R.layout.navigateanypoint_header, null);
         historyListView.addHeaderView(pointControls, null, false);
 
         // inject a second time to also find the dynamically expanded views above
@@ -197,7 +197,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
 
     private TextView getEmptyHistoryFooter() {
         if (historyFooter == null) {
-            historyFooter = (TextView) getLayoutInflater().inflate(R.layout.caches_footer, null);
+            historyFooter = (TextView) getLayoutInflater().inflate(R.layout.cacheslist_footer, null);
             historyFooter.setText(R.string.search_history_empty);
         }
         return historyFooter;
diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index 946724f..0c31abf 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -78,7 +78,7 @@ public class SearchActivity extends AbstractActivity {
         }
 
         setTheme();
-        setContentView(R.layout.search);
+        setContentView(R.layout.search_activity);
 
         // set title in code, as the activity needs a hard coded title due to the intent filters
         setTitle(res.getString(R.string.search));
diff --git a/main/src/cgeo/geocaching/SettingsActivity.java b/main/src/cgeo/geocaching/SettingsActivity.java
index aa163ad..872d5ee 100644
--- a/main/src/cgeo/geocaching/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/SettingsActivity.java
@@ -126,7 +126,7 @@ public class SettingsActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.init);
+        super.onCreate(savedInstanceState, R.layout.settings_activity);
 
         init();
     }
diff --git a/main/src/cgeo/geocaching/StaticMapsActivity.java b/main/src/cgeo/geocaching/StaticMapsActivity.java
index d8bc614..5cf9e9d 100644
--- a/main/src/cgeo/geocaching/StaticMapsActivity.java
+++ b/main/src/cgeo/geocaching/StaticMapsActivity.java
@@ -85,7 +85,7 @@ public class StaticMapsActivity extends AbstractActivity {
 
         for (final Bitmap image : maps) {
             if (image != null) {
-                final ImageView map = (ImageView) inflater.inflate(R.layout.map_static_item, null);
+                final ImageView map = (ImageView) inflater.inflate(R.layout.staticmaps_activity_item, null);
                 map.setImageBitmap(image);
                 smapsView.addView(map);
             }
@@ -94,7 +94,7 @@ public class StaticMapsActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.map_static);
+        super.onCreate(savedInstanceState, R.layout.staticmaps_activity);
 
         if (geocode == null) {
             showToast("Sorry, c:geo forgot for what cache you want to load static maps.");
diff --git a/main/src/cgeo/geocaching/UsefulAppsActivity.java b/main/src/cgeo/geocaching/UsefulAppsActivity.java
index b74db83..8093bba 100644
--- a/main/src/cgeo/geocaching/UsefulAppsActivity.java
+++ b/main/src/cgeo/geocaching/UsefulAppsActivity.java
@@ -67,16 +67,16 @@ public class UsefulAppsActivity extends AbstractActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState, R.layout.useful_apps_activity);
+        super.onCreate(savedInstanceState, R.layout.usefulapps_activity);
 
         Views.inject(this);
 
-        list.setAdapter(new ArrayAdapter<HelperApp>(this, R.layout.useful_apps_item, HELPER_APPS) {
+        list.setAdapter(new ArrayAdapter<HelperApp>(this, R.layout.usefulapps_item, HELPER_APPS) {
             @Override
             public View getView(int position, View convertView, android.view.ViewGroup parent) {
                 View rowView = convertView;
                 if (null == rowView) {
-                    rowView = getLayoutInflater().inflate(R.layout.useful_apps_item, null);
+                    rowView = getLayoutInflater().inflate(R.layout.usefulapps_item, null);
                 }
                 ViewHolder holder = (ViewHolder) rowView.getTag();
                 if (null == holder) {
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 6dad510..40dddd4 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -408,7 +408,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
         super.onCreate(savedInstanceState);
 
         setTheme();
-        setContentView(R.layout.caches);
+        setContentView(R.layout.cacheslist_activity);
 
         // get parameters
         Bundle extras = getIntent().getExtras();
@@ -1000,7 +1000,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
             if (inflater == null) {
                 inflater = getLayoutInflater();
             }
-            listFooter = inflater.inflate(R.layout.caches_footer, null);
+            listFooter = inflater.inflate(R.layout.cacheslist_footer, null);
             listFooter.setClickable(true);
             listFooter.setOnClickListener(new MoreCachesListener());
 
diff --git a/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java b/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java
index 0fbd718..4f2f8c4 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java
@@ -4,7 +4,7 @@ import cgeo.geocaching.Geocache;
 import cgeo.geocaching.R;
 import cgeo.geocaching.Settings;
 import cgeo.geocaching.TrackableLog;
-import cgeo.geocaching.VisitCacheActivity;
+import cgeo.geocaching.LogCacheActivity;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.connector.ILoggingManager;
 import cgeo.geocaching.connector.ImageResult;
@@ -30,7 +30,7 @@ import java.util.List;
 
 public class GCLoggingManager implements ILoggingManager, LoaderManager.LoaderCallbacks<String> {
 
-    private final VisitCacheActivity activity;
+    private final LogCacheActivity activity;
     private final Geocache cache;
 
     private String[] viewstates;
@@ -39,7 +39,7 @@ public class GCLoggingManager implements ILoggingManager, LoaderManager.LoaderCa
     private boolean hasLoaderError = true;
 
     public GCLoggingManager(Activity activity, Geocache cache) {
-        this.activity = (VisitCacheActivity) activity;
+        this.activity = (LogCacheActivity) activity;
         this.cache = cache;
     }
 
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java b/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java
index c5d6990..8a94218 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiLoggingManager.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.connector.oc;
 
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.TrackableLog;
-import cgeo.geocaching.VisitCacheActivity;
+import cgeo.geocaching.LogCacheActivity;
 import cgeo.geocaching.connector.ILoggingManager;
 import cgeo.geocaching.connector.ImageResult;
 import cgeo.geocaching.connector.LogResult;
@@ -21,7 +21,7 @@ public class OkapiLoggingManager implements ILoggingManager {
 
     private final OCApiConnector connector;
     private final Geocache cache;
-    private VisitCacheActivity activity;
+    private LogCacheActivity activity;
 
     private final static List<LogType> standardLogTypes = Arrays.asList(LogType.FOUND_IT, LogType.DIDNT_FIND_IT, LogType.NOTE, LogType.NEEDS_MAINTENANCE);
     private final static List<LogType> eventLogTypes = Arrays.asList(LogType.WILL_ATTEND, LogType.ATTENDED, LogType.NOTE);
@@ -29,7 +29,7 @@ public class OkapiLoggingManager implements ILoggingManager {
     public OkapiLoggingManager(Activity activity, OCApiConnector connector, Geocache cache) {
         this.connector = connector;
         this.cache = cache;
-        this.activity = (VisitCacheActivity) activity;
+        this.activity = (LogCacheActivity) activity;
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/ui/AddressListAdapter.java b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
index 6689bb6..736c036 100644
--- a/main/src/cgeo/geocaching/ui/AddressListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
@@ -50,7 +50,7 @@ public class AddressListAdapter extends ArrayAdapter<Address> {
         // holder pattern implementation
         final ViewHolder holder;
         if (view == null) {
-            view = inflater.inflate(R.layout.addresses_item, null);
+            view = inflater.inflate(R.layout.addresslist_item, null);
             holder = new ViewHolder(view);
         } else {
             holder = (ViewHolder) view.getTag();
diff --git a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
index 80f01e2..9059a6b 100644
--- a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
+++ b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java
@@ -68,7 +68,7 @@ public final class CacheDetailsCreator {
         final LayoutInflater inflater = LayoutInflater.from(activity);
 
         for (int i = 0; i < 5; i++) {
-            ImageView star = (ImageView) inflater.inflate(R.layout.star, null);
+            ImageView star = (ImageView) inflater.inflate(R.layout.star_image, null);
             if (value - i >= 0.75) {
                 star.setImageResource(R.drawable.star_on);
             } else if (value - i >= 0.25) {
diff --git a/main/src/cgeo/geocaching/ui/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
index 122f835..d95363e 100644
--- a/main/src/cgeo/geocaching/ui/CacheListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
@@ -354,7 +354,7 @@ public class CacheListAdapter extends ArrayAdapter<Geocache> {
 
         final ViewHolder holder;
         if (v == null) {
-            v = inflater.inflate(R.layout.caches_item, null);
+            v = inflater.inflate(R.layout.cacheslist_item, null);
 
             holder = new ViewHolder(v);
         } else {
diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
index becd422..4ab9af0 100644
--- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
+++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
@@ -72,7 +72,7 @@ public class CoordinatesInputDialog extends Dialog {
             // nothing
         }
 
-        setContentView(R.layout.coords);
+        setContentView(R.layout.coordinatesinput_dialog);
 
         final Spinner spinner = (Spinner) findViewById(R.id.spinnerCoordinateFormats);
         final ArrayAdapter<CharSequence> adapter =