1 files changed, 14 insertions, 37 deletions

diff --git a/src/cgeo/geocaching/cgeotrackables.java b/src/cgeo/geocaching/cgeotrackables.java
index b578cc9..094311a 100644
--- a/src/cgeo/geocaching/cgeotrackables.java
+++ b/src/cgeo/geocaching/cgeotrackables.java
@@ -1,9 +1,7 @@
 package cgeo.geocaching;
 
-import gnu.android.app.appmanualclient.*;
-
 import java.util.ArrayList;
-import android.app.Activity;
+
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
@@ -15,15 +13,14 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import cgeo.geocaching.activity.AbstractActivity;
 
-public class cgeotrackables extends Activity {
+public class cgeotrackables extends AbstractActivity {
 	private ArrayList<cgTrackable> trackables = new ArrayList<cgTrackable>();
 	private String geocode = null;
 	private cgeoapplication app = null;
 	private cgSettings settings = null;
-	private cgBase base = null;
 	private cgWarning warning = null;
-	private Activity activity = null;
 	private LayoutInflater inflater = null;
 	private LinearLayout addList = null;
 	private ProgressDialog waitDialog = null;
@@ -33,7 +30,7 @@ public class cgeotrackables extends Activity {
 		public void handleMessage(Message msg) {
 			try {
 				if (inflater == null) {
-					inflater = activity.getLayoutInflater();
+					inflater = getLayoutInflater();
 				}
 
 				if (addList == null) {
@@ -79,25 +76,22 @@ public class cgeotrackables extends Activity {
 		}
 	};
 
+	public cgeotrackables() {
+		super("c:geo-trackable-list");
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
 		// init
-		activity = this;
 		app = (cgeoapplication) this.getApplication();
 		settings = new cgSettings(this, getSharedPreferences(cgSettings.preferences, 0));
-		base = new cgBase(app, settings, getSharedPreferences(cgSettings.preferences, 0));
 		warning = new cgWarning(this);
 
-		// set layout
-		if (settings.skin == 1) {
-			setTheme(R.style.light);
-		} else {
-			setTheme(R.style.dark);
-		}
+		setTheme();
 		setContentView(R.layout.trackables);
-		base.setTitle(activity, "Trackables");
+		setTitle("Trackables");
 
 		// get parameters
 		Bundle extras = getIntent().getExtras();
@@ -118,11 +112,11 @@ public class cgeotrackables extends Activity {
 
 		(new loadInventory()).start();
 	}
-	
+
 	@Override
 	public void onResume() {
 		super.onResume();
-		
+
 		settings.load();
 	}
 
@@ -153,31 +147,14 @@ public class cgeotrackables extends Activity {
 		}
 
 		public void onClick(View arg0) {
-			Intent trackableIntent = new Intent(activity, cgeotrackable.class);
+			Intent trackableIntent = new Intent(cgeotrackables.this, cgeotrackable.class);
 			trackableIntent.putExtra("guid", guid);
 			trackableIntent.putExtra("geocode", geocode);
 			trackableIntent.putExtra("name", name);
-			activity.startActivity(trackableIntent);
+			startActivity(trackableIntent);
 
 			finish();
 			return;
 		}
 	}
-
-	public void goHome(View view) {
-		base.goHome(activity);
-	}
-	
-	public void goManual(View view) {
-		try {
-			AppManualReaderClient.openManual(
-				"c-geo",
-				"c:geo-trackable-list",
-				activity,
-				"http://cgeo.carnero.cc/manual/"
-			);
-		} catch (Exception e) {
-			// nothing
-		}
-	}
 }
\ No newline at end of file