aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2012-01-14 15:02:15 +0100
committerBananeweizen <bananeweizen@gmx.de>2012-01-14 15:02:15 +0100
commite61a40fc8a4a3d5ab5a59346eddd1c43bcc4857e (patch)
treea2a8aec422fde537c500cf90ad70e606ba416121 /main
parent77a8bc851569ae7a82f76a0913b39006074ac56a (diff)
downloadcgeo-e61a40fc8a4a3d5ab5a59346eddd1c43bcc4857e.zip
cgeo-e61a40fc8a4a3d5ab5a59346eddd1c43bcc4857e.tar.gz
cgeo-e61a40fc8a4a3d5ab5a59346eddd1c43bcc4857e.tar.bz2
refactoring: move more widget related classes into own package
Diffstat (limited to 'main')
-rw-r--r--main/res/layout/cache.xml4
-rw-r--r--main/res/layout/navigate.xml2
-rw-r--r--main/src/cgeo/geocaching/cgBase.java3
-rw-r--r--main/src/cgeo/geocaching/cgSelectMapfile.java7
-rw-r--r--main/src/cgeo/geocaching/cgeocaches.java1
-rw-r--r--main/src/cgeo/geocaching/cgeogpxes.java7
-rw-r--r--main/src/cgeo/geocaching/cgeonavigate.java5
-rw-r--r--main/src/cgeo/geocaching/ui/CacheListAdapter.java (renamed from main/src/cgeo/geocaching/CacheListAdapter.java)44
-rw-r--r--main/src/cgeo/geocaching/ui/CacheView.java (renamed from main/src/cgeo/geocaching/cgCacheView.java)9
-rw-r--r--main/src/cgeo/geocaching/ui/CompassMiniView.java (renamed from main/src/cgeo/geocaching/cgCompassMini.java)11
-rw-r--r--main/src/cgeo/geocaching/ui/CompassView.java (renamed from main/src/cgeo/geocaching/cgCompass.java)17
-rw-r--r--main/src/cgeo/geocaching/ui/DirectionImage.java (renamed from main/src/cgeo/geocaching/cgDirectionImg.java)6
-rw-r--r--main/src/cgeo/geocaching/ui/DistanceView.java (renamed from main/src/cgeo/geocaching/cgDistanceView.java)11
-rw-r--r--main/src/cgeo/geocaching/ui/GPXListAdapter.java (renamed from main/src/cgeo/geocaching/cgGPXListAdapter.java)17
-rw-r--r--main/src/cgeo/geocaching/ui/GPXView.java (renamed from main/src/cgeo/geocaching/cgGPXView.java)4
-rw-r--r--main/src/cgeo/geocaching/ui/MapfileListAdapter.java (renamed from main/src/cgeo/geocaching/cgMapfileListAdapter.java)12
16 files changed, 98 insertions, 62 deletions
diff --git a/main/res/layout/cache.xml b/main/res/layout/cache.xml
index 45703fb..bc109cf 100644
--- a/main/res/layout/cache.xml
+++ b/main/res/layout/cache.xml
@@ -71,7 +71,7 @@
android:layout_marginTop="1dip"
android:layout_marginBottom="1dip"
android:layout_marginRight="30dip" >
- <view class="cgeo.geocaching.cgDistanceView"
+ <view class="cgeo.geocaching.ui.DistanceView"
android:id="@+id/distance"
android:layout_width="78dip"
android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
android:textSize="16dip"
android:textColor="?text_color"
android:gravity="center" />
- <view class="cgeo.geocaching.cgCompassMini"
+ <view class="cgeo.geocaching.ui.CompassMiniView"
android:id="@+id/direction"
android:layout_width="78dip"
android:layout_height="28px"
diff --git a/main/res/layout/navigate.xml b/main/res/layout/navigate.xml
index 58c1f93..8e98136 100644
--- a/main/res/layout/navigate.xml
+++ b/main/res/layout/navigate.xml
@@ -47,7 +47,7 @@
android:textSize="26dip"
android:textColor="?text_color"
android:text="@null" />
- <view class="cgeo.geocaching.cgCompass"
+ <view class="cgeo.geocaching.ui.CompassView"
android:id="@+id/rose"
android:layout_width="fill_parent"
android:layout_height="295dip"
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index 18c14ff..c4a2f24 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -20,6 +20,7 @@ import cgeo.geocaching.geopoint.IConversion;
import cgeo.geocaching.geopoint.Viewport;
import cgeo.geocaching.network.HtmlImage;
import cgeo.geocaching.twitter.Twitter;
+import cgeo.geocaching.ui.DirectionImage;
import cgeo.geocaching.utils.BaseUtils;
import cgeo.geocaching.utils.CancellableHandler;
@@ -657,7 +658,7 @@ public class cgBase {
{
for (cgCache oneCache : parseResult.cacheList) {
if (oneCache.getCoords() == null && StringUtils.isNotEmpty(oneCache.getDirectionImg())) {
- cgDirectionImg.getDrawable(oneCache.getGeocode(), oneCache.getDirectionImg());
+ DirectionImage.getDrawable(oneCache.getGeocode(), oneCache.getDirectionImg());
}
}
}
diff --git a/main/src/cgeo/geocaching/cgSelectMapfile.java b/main/src/cgeo/geocaching/cgSelectMapfile.java
index eebd2c9..b97d717 100644
--- a/main/src/cgeo/geocaching/cgSelectMapfile.java
+++ b/main/src/cgeo/geocaching/cgSelectMapfile.java
@@ -2,6 +2,7 @@ package cgeo.geocaching;
import cgeo.geocaching.files.FileList;
import cgeo.geocaching.files.LocalStorage;
+import cgeo.geocaching.ui.MapfileListAdapter;
import android.content.Intent;
import android.os.Bundle;
@@ -10,7 +11,7 @@ import android.os.Environment;
import java.io.File;
import java.util.List;
-public class cgSelectMapfile extends FileList<cgMapfileListAdapter> {
+public class cgSelectMapfile extends FileList<MapfileListAdapter> {
public cgSelectMapfile() {
super("map");
@@ -35,8 +36,8 @@ public class cgSelectMapfile extends FileList<cgMapfileListAdapter> {
}
@Override
- protected cgMapfileListAdapter getAdapter(List<File> files) {
- return new cgMapfileListAdapter(this, files);
+ protected MapfileListAdapter getAdapter(List<File> files) {
+ return new MapfileListAdapter(this, files);
}
@Override
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 599f480..aa90336 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -31,6 +31,7 @@ import cgeo.geocaching.sorting.StateComparator;
import cgeo.geocaching.sorting.TerrainComparator;
import cgeo.geocaching.sorting.VisitComparator;
import cgeo.geocaching.sorting.VoteComparator;
+import cgeo.geocaching.ui.CacheListAdapter;
import cgeo.geocaching.utils.RunnableWithArgument;
import org.apache.commons.collections.CollectionUtils;
diff --git a/main/src/cgeo/geocaching/cgeogpxes.java b/main/src/cgeo/geocaching/cgeogpxes.java
index cb8167a..ab903ec 100644
--- a/main/src/cgeo/geocaching/cgeogpxes.java
+++ b/main/src/cgeo/geocaching/cgeogpxes.java
@@ -4,6 +4,7 @@ import cgeo.geocaching.connector.ConnectorFactory;
import cgeo.geocaching.connector.IConnector;
import cgeo.geocaching.files.FileList;
import cgeo.geocaching.files.GPXImporter;
+import cgeo.geocaching.ui.GPXListAdapter;
import org.apache.commons.lang3.StringUtils;
@@ -15,7 +16,7 @@ import android.os.Environment;
import java.io.File;
import java.util.List;
-public class cgeogpxes extends FileList<cgGPXListAdapter> {
+public class cgeogpxes extends FileList<GPXListAdapter> {
private static final String EXTRAS_LIST_ID = "list";
public cgeogpxes() {
@@ -25,8 +26,8 @@ public class cgeogpxes extends FileList<cgGPXListAdapter> {
private int listId = 1;
@Override
- protected cgGPXListAdapter getAdapter(List<File> files) {
- return new cgGPXListAdapter(this, files);
+ protected GPXListAdapter getAdapter(List<File> files) {
+ return new GPXListAdapter(this, files);
}
@Override
diff --git a/main/src/cgeo/geocaching/cgeonavigate.java b/main/src/cgeo/geocaching/cgeonavigate.java
index 45bdf43..519521d 100644
--- a/main/src/cgeo/geocaching/cgeonavigate.java
+++ b/main/src/cgeo/geocaching/cgeonavigate.java
@@ -3,6 +3,7 @@ package cgeo.geocaching;
import cgeo.geocaching.activity.AbstractActivity;
import cgeo.geocaching.geopoint.Geopoint;
import cgeo.geocaching.maps.CGeoMap;
+import cgeo.geocaching.ui.CompassView;
import org.apache.commons.lang3.StringUtils;
@@ -48,7 +49,7 @@ public class cgeonavigate extends AbstractActivity {
private TextView navLocation = null;
private TextView distanceView = null;
private TextView headingView = null;
- private cgCompass compassView = null;
+ private CompassView compassView = null;
private updaterThread updater = null;
private Handler updaterHandler = new Handler() {
@@ -124,7 +125,7 @@ public class cgeonavigate extends AbstractActivity {
}
// get textviews once
- compassView = (cgCompass) findViewById(R.id.rose);
+ compassView = (CompassView) findViewById(R.id.rose);
// start updater thread
updater = new updaterThread(updaterHandler);
diff --git a/main/src/cgeo/geocaching/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
index a010c6d..c2910cf 100644
--- a/main/src/cgeo/geocaching/CacheListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java
@@ -1,5 +1,15 @@
-package cgeo.geocaching;
-
+package cgeo.geocaching.ui;
+
+import cgeo.geocaching.CacheDetailActivity;
+import cgeo.geocaching.R;
+import cgeo.geocaching.Settings;
+import cgeo.geocaching.cgBase;
+import cgeo.geocaching.cgCache;
+import cgeo.geocaching.R.color;
+import cgeo.geocaching.R.drawable;
+import cgeo.geocaching.R.id;
+import cgeo.geocaching.R.layout;
+import cgeo.geocaching.R.string;
import cgeo.geocaching.enumerations.CacheListType;
import cgeo.geocaching.enumerations.CacheSize;
import cgeo.geocaching.enumerations.CacheType;
@@ -52,7 +62,7 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
final private Resources res;
/** Resulting list of caches */
final private List<cgCache> list;
- private cgCacheView holder = null;
+ private CacheView holder = null;
private LayoutInflater inflater = null;
private CacheComparator cacheComparator = null;
private Geopoint coords = null;
@@ -62,8 +72,8 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
private int checked = 0;
private boolean selectMode = false;
final private static Map<CacheType, Drawable> gcIconDrawables = new HashMap<CacheType, Drawable>();
- final private Set<cgCompassMini> compasses = new LinkedHashSet<cgCompassMini>();
- final private Set<cgDistanceView> distances = new LinkedHashSet<cgDistanceView>();
+ final private Set<CompassMiniView> compasses = new LinkedHashSet<CompassMiniView>();
+ final private Set<DistanceView> distances = new LinkedHashSet<DistanceView>();
final private int[] ratingBcgs = new int[3];
final private float pixelDensity;
private static final int SWIPE_MIN_DISTANCE = 60;
@@ -276,11 +286,11 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
lastSort = System.currentTimeMillis();
}
- for (final cgDistanceView distance : distances) {
+ for (final DistanceView distance : distances) {
distance.update(coordsIn);
}
- for (final cgCompassMini compass : compasses) {
+ for (final CompassMiniView compass : compasses) {
compass.updateCoords(coordsIn);
}
}
@@ -297,7 +307,7 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
azimuth = directionNow;
if (CollectionUtils.isNotEmpty(compasses)) {
- for (cgCompassMini compass : compasses) {
+ for (CompassMiniView compass : compasses) {
compass.updateAzimuth(azimuth);
}
}
@@ -350,15 +360,15 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
if (v == null) {
v = inflater.inflate(R.layout.cache, null);
- holder = new cgCacheView();
+ holder = new CacheView();
holder.checkbox = (CheckBox) v.findViewById(R.id.checkbox);
holder.oneInfo = (RelativeLayout) v.findViewById(R.id.one_info);
holder.oneCheckbox = (RelativeLayout) v.findViewById(R.id.one_checkbox);
holder.logStatusMark = (ImageView) v.findViewById(R.id.log_status_mark);
holder.text = (TextView) v.findViewById(R.id.text);
holder.directionLayout = (RelativeLayout) v.findViewById(R.id.direction_layout);
- holder.distance = (cgDistanceView) v.findViewById(R.id.distance);
- holder.direction = (cgCompassMini) v.findViewById(R.id.direction);
+ holder.distance = (DistanceView) v.findViewById(R.id.distance);
+ holder.direction = (CompassMiniView) v.findViewById(R.id.direction);
holder.dirImgLayout = (RelativeLayout) v.findViewById(R.id.dirimg_layout);
holder.dirImg = (ImageView) v.findViewById(R.id.dirimg);
holder.inventory = (RelativeLayout) v.findViewById(R.id.inventory);
@@ -367,7 +377,7 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
v.setTag(holder);
} else {
- holder = (cgCacheView) v.getTag();
+ holder = (CacheView) v.getTag();
}
if (cache.isOwn()) {
@@ -494,7 +504,7 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
holder.directionLayout.setVisibility(View.GONE);
holder.distance.clear();
- final Bitmap dirImgPre = BitmapFactory.decodeFile(cgDirectionImg.getDirectionFile(cache.getGeocode(), false).getPath());
+ final Bitmap dirImgPre = BitmapFactory.decodeFile(DirectionImage.getDirectionFile(cache.getGeocode(), false).getPath());
final Bitmap dirImg;
if (dirImgPre != null) { // null happens for invalid caches (not yet released)
dirImg = dirImgPre.copy(Bitmap.Config.ARGB_8888, true);
@@ -686,10 +696,10 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
class detectGesture extends GestureDetector.SimpleOnGestureListener {
- private cgCacheView holder = null;
+ private CacheView holder = null;
private cgCache cache = null;
- public detectGesture(cgCacheView holderIn, cgCache cacheIn) {
+ public detectGesture(CacheView holderIn, cgCache cacheIn) {
holder = holderIn;
cache = cacheIn;
}
@@ -756,7 +766,7 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
}
}
- private void moveRight(cgCacheView holder, cgCache cache, boolean force) {
+ private void moveRight(CacheView holder, cgCache cache, boolean force) {
if (cache == null) {
return;
}
@@ -791,7 +801,7 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> {
cache.setStatusCheckedView(true);
}
- private void moveLeft(cgCacheView holder, cgCache cache, boolean force) {
+ private void moveLeft(CacheView holder, cgCache cache, boolean force) {
if (cache == null) {
return;
}
diff --git a/main/src/cgeo/geocaching/cgCacheView.java b/main/src/cgeo/geocaching/ui/CacheView.java
index 39f5a45..7fba55d 100644
--- a/main/src/cgeo/geocaching/cgCacheView.java
+++ b/main/src/cgeo/geocaching/ui/CacheView.java
@@ -1,11 +1,12 @@
-package cgeo.geocaching;
+package cgeo.geocaching.ui;
+
import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
-public class cgCacheView {
+public class CacheView {
// layouts & views
public RelativeLayout oneInfo;
public RelativeLayout oneCheckbox;
@@ -16,8 +17,8 @@ public class cgCacheView {
public TextView info;
public RelativeLayout inventory;
public RelativeLayout directionLayout;
- public cgDistanceView distance;
- public cgCompassMini direction;
+ public DistanceView distance;
+ public CompassMiniView direction;
public RelativeLayout dirImgLayout;
public ImageView dirImg;
}
diff --git a/main/src/cgeo/geocaching/cgCompassMini.java b/main/src/cgeo/geocaching/ui/CompassMiniView.java
index 4682502..5f3b8c2 100644
--- a/main/src/cgeo/geocaching/cgCompassMini.java
+++ b/main/src/cgeo/geocaching/ui/CompassMiniView.java
@@ -1,5 +1,8 @@
-package cgeo.geocaching;
+package cgeo.geocaching.ui;
+import cgeo.geocaching.R;
+import cgeo.geocaching.R.drawable;
+import cgeo.geocaching.R.styleable;
import cgeo.geocaching.geopoint.Geopoint;
import android.content.Context;
@@ -12,7 +15,7 @@ import android.graphics.PaintFlagsDrawFilter;
import android.util.AttributeSet;
import android.view.View;
-public class cgCompassMini extends View {
+public class CompassMiniView extends View {
private int arrowSkin = R.drawable.compass_arrow_mini_white;
private Context context = null;
private Geopoint cacheCoords = null;
@@ -22,12 +25,12 @@ public class cgCompassMini extends View {
private PaintFlagsDrawFilter setfil = null;
private PaintFlagsDrawFilter remfil = null;
- public cgCompassMini(Context contextIn) {
+ public CompassMiniView(Context contextIn) {
super(contextIn);
context = contextIn;
}
- public cgCompassMini(Context contextIn, AttributeSet attrs) {
+ public CompassMiniView(Context contextIn, AttributeSet attrs) {
super(contextIn, attrs);
context = contextIn;
diff --git a/main/src/cgeo/geocaching/cgCompass.java b/main/src/cgeo/geocaching/ui/CompassView.java
index aa4466b..20495c0 100644
--- a/main/src/cgeo/geocaching/cgCompass.java
+++ b/main/src/cgeo/geocaching/ui/CompassView.java
@@ -1,4 +1,7 @@
-package cgeo.geocaching;
+package cgeo.geocaching.ui;
+
+import cgeo.geocaching.R;
+import cgeo.geocaching.Settings;
import android.content.Context;
import android.graphics.Bitmap;
@@ -12,7 +15,7 @@ import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
-public class cgCompass extends View {
+public class CompassView extends View {
private changeThread watchdog = null;
private volatile boolean wantStop = false;
@@ -55,17 +58,17 @@ public class cgCompass extends View {
try {
invalidate();
} catch (Exception e) {
- Log.e(Settings.tag, "cgCompass.changeHandler: " + e.toString());
+ Log.e(Settings.tag, "CompassView.changeHandler: " + e.toString());
}
}
};
- public cgCompass(Context contextIn) {
+ public CompassView(Context contextIn) {
super(contextIn);
context = contextIn;
}
- public cgCompass(Context contextIn, AttributeSet attrs) {
+ public CompassView(Context contextIn, AttributeSet attrs) {
super(contextIn, attrs);
context = contextIn;
}
@@ -117,7 +120,7 @@ public class cgCompass extends View {
}
}
- protected synchronized void updateNorth(double northHeadingIn, double cacheHeadingIn) {
+ public synchronized void updateNorth(double northHeadingIn, double cacheHeadingIn) {
if (initialDisplay) {
// We will force the compass to move brutally if this is the first
// update since it is visible.
@@ -176,7 +179,7 @@ public class cgCompass extends View {
// nothing
}
- synchronized (cgCompass.this) {
+ synchronized (CompassView.this) {
azimuthShown = smoothUpdate(northMeasured, azimuthShown);
cacheHeadingShown = smoothUpdate(cacheHeadingMeasured, cacheHeadingShown);
}
diff --git a/main/src/cgeo/geocaching/cgDirectionImg.java b/main/src/cgeo/geocaching/ui/DirectionImage.java
index 7b28bf2..17c253a 100644
--- a/main/src/cgeo/geocaching/cgDirectionImg.java
+++ b/main/src/cgeo/geocaching/ui/DirectionImage.java
@@ -1,5 +1,7 @@
-package cgeo.geocaching;
+package cgeo.geocaching.ui;
+import cgeo.geocaching.Parameters;
+import cgeo.geocaching.cgBase;
import cgeo.geocaching.files.LocalStorage;
import org.apache.commons.lang3.StringUtils;
@@ -7,7 +9,7 @@ import org.apache.http.HttpResponse;
import java.io.File;
-public class cgDirectionImg {
+public class DirectionImage {
public static void getDrawable(final String geocode, final String code) {
if (StringUtils.isBlank(geocode) || StringUtils.isBlank(code)) {
diff --git a/main/src/cgeo/geocaching/cgDistanceView.java b/main/src/cgeo/geocaching/ui/DistanceView.java
index 704a655..49c90b7 100644
--- a/main/src/cgeo/geocaching/cgDistanceView.java
+++ b/main/src/cgeo/geocaching/ui/DistanceView.java
@@ -1,23 +1,24 @@
-package cgeo.geocaching;
+package cgeo.geocaching.ui;
+import cgeo.geocaching.cgBase;
import cgeo.geocaching.geopoint.Geopoint;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.TextView;
-public class cgDistanceView extends TextView {
+public class DistanceView extends TextView {
private Geopoint cacheCoords = null;
- public cgDistanceView(Context context) {
+ public DistanceView(Context context) {
super(context);
}
- public cgDistanceView(Context context, AttributeSet attrs) {
+ public DistanceView(Context context, AttributeSet attrs) {
super(context, attrs);
}
- public cgDistanceView(Context context, AttributeSet attrs, int defStyle) {
+ public DistanceView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
}
diff --git a/main/src/cgeo/geocaching/cgGPXListAdapter.java b/main/src/cgeo/geocaching/ui/GPXListAdapter.java
index 7b163cf..23f38b0 100644
--- a/main/src/cgeo/geocaching/cgGPXListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/GPXListAdapter.java
@@ -1,5 +1,10 @@
-package cgeo.geocaching;
+package cgeo.geocaching.ui;
+import cgeo.geocaching.R;
+import cgeo.geocaching.Settings;
+import cgeo.geocaching.cgeogpxes;
+import cgeo.geocaching.R.id;
+import cgeo.geocaching.R.layout;
import cgeo.geocaching.files.GPXImporter;
import android.app.Activity;
@@ -13,12 +18,12 @@ import android.widget.TextView;
import java.io.File;
import java.util.List;
-public class cgGPXListAdapter extends ArrayAdapter<File> {
- private cgGPXView holder = null;
+public class GPXListAdapter extends ArrayAdapter<File> {
+ private GPXView holder = null;
private cgeogpxes parent = null;
private LayoutInflater inflater = null;
- public cgGPXListAdapter(cgeogpxes parentIn, List<File> listIn) {
+ public GPXListAdapter(cgeogpxes parentIn, List<File> listIn) {
super(parentIn, 0, listIn);
parent = parentIn;
@@ -42,13 +47,13 @@ public class cgGPXListAdapter extends ArrayAdapter<File> {
if (v == null) {
v = inflater.inflate(R.layout.gpx_item, null);
- holder = new cgGPXView();
+ holder = new GPXView();
holder.filepath = (TextView) v.findViewById(R.id.filepath);
holder.filename = (TextView) v.findViewById(R.id.filename);
v.setTag(holder);
} else {
- holder = (cgGPXView) v.getTag();
+ holder = (GPXView) v.getTag();
}
final touchListener touchLst = new touchListener(file);
diff --git a/main/src/cgeo/geocaching/cgGPXView.java b/main/src/cgeo/geocaching/ui/GPXView.java
index a731f70..a93d0db 100644
--- a/main/src/cgeo/geocaching/cgGPXView.java
+++ b/main/src/cgeo/geocaching/ui/GPXView.java
@@ -1,8 +1,8 @@
-package cgeo.geocaching;
+package cgeo.geocaching.ui;
import android.widget.TextView;
-public class cgGPXView {
+public class GPXView {
// layouts & views
public TextView filepath;
public TextView filename;
diff --git a/main/src/cgeo/geocaching/cgMapfileListAdapter.java b/main/src/cgeo/geocaching/ui/MapfileListAdapter.java
index 5294ff2..cc16733 100644
--- a/main/src/cgeo/geocaching/cgMapfileListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/MapfileListAdapter.java
@@ -1,4 +1,10 @@
-package cgeo.geocaching;
+package cgeo.geocaching.ui;
+
+import cgeo.geocaching.R;
+import cgeo.geocaching.Settings;
+import cgeo.geocaching.cgSelectMapfile;
+import cgeo.geocaching.R.id;
+import cgeo.geocaching.R.layout;
import android.app.Activity;
import android.graphics.Typeface;
@@ -12,13 +18,13 @@ import android.widget.TextView;
import java.io.File;
import java.util.List;
-public class cgMapfileListAdapter extends ArrayAdapter<File> {
+public class MapfileListAdapter extends ArrayAdapter<File> {
private cgSelectMapfile parentView;
private LayoutInflater inflater;
private MapfileView holder;
- public cgMapfileListAdapter(cgSelectMapfile parentIn, List<File> listIn) {
+ public MapfileListAdapter(cgSelectMapfile parentIn, List<File> listIn) {
super(parentIn, 0, listIn);
parentView = parentIn;