refactoring: rename cgeo activity to MainActivity

* this avoids compiler errors when using fully qualified class names as
they all start with cgeo.subpackage

6 files changed, 16 insertions, 16 deletions

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index e69af11..8745ae8 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -31,7 +31,7 @@
 			android:name="com.google.android.backup.api_key"
 			android:value="AEdPqrEAAAAIsvD_aUSDMwWOf9NkwwxZ4kJJI_AG2EaxjSu2jw" />
 		<activity
-			android:name=".cgeo"
+			android:name=".MainActivity"
 			android:label="@string/app_name"
 			android:windowSoftInputMode="stateHidden"
 			android:theme="@style/cgeo_main"
diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/MainActivity.java
index 0140c3a..6f62cd8 100644
--- a/main/src/cgeo/geocaching/cgeo.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -45,7 +45,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 
-public class cgeo extends AbstractActivity {
+public class MainActivity extends AbstractActivity {
 
     private static final String SCAN_INTENT = "com.google.zxing.client.android.SCAN";
     private static final int SCAN_REQUEST_CODE = 1;
@@ -169,7 +169,7 @@ public class cgeo extends AbstractActivity {
         }
     };
 
-    public cgeo() {
+    public MainActivity() {
         super("c:geo-main-screen");
     }
 
@@ -199,7 +199,7 @@ public class cgeo extends AbstractActivity {
 
                         @Override
                         public void onClick(View view) {
-                            ActivityMixin.goManual(cgeo.this, "c:geo-intro");
+                            ActivityMixin.goManual(MainActivity.this, "c:geo-intro");
                             view.setVisibility(View.GONE);
                         }
                     });
@@ -378,12 +378,12 @@ public class cgeo extends AbstractActivity {
 
             @Override
             public boolean onLongClick(View v) {
-                new StoredList.UserInterface(cgeo.this).promptForListSelection(R.string.list_title, new RunnableWithArgument<Integer>() {
+                new StoredList.UserInterface(MainActivity.this).promptForListSelection(R.string.list_title, new RunnableWithArgument<Integer>() {
 
                     @Override
                     public void run(Integer selectedListId) {
                         Settings.saveLastList(selectedListId);
-                        cgeocaches.startActivityOffline(cgeo.this);
+                        cgeocaches.startActivityOffline(MainActivity.this);
                     }
                 });
                 return true;
@@ -500,7 +500,7 @@ public class cgeo extends AbstractActivity {
                     public void onClick(DialogInterface dialog, int id) {
                         dialog.dismiss();
                         cgData.resetNewlyCreatedDatabase();
-                        app.restoreDatabase(cgeo.this);
+                        app.restoreDatabase(MainActivity.this);
                     }
                 })
                 .setNegativeButton(getString(android.R.string.no), new DialogInterface.OnClickListener() {
@@ -744,7 +744,7 @@ public class cgeo extends AbstractActivity {
 
                 // invoke settings activity to insert login details
                 if (status == StatusCode.NO_LOGIN_INFO_STORED) {
-                    SettingsActivity.startActivity(cgeo.this);
+                    SettingsActivity.startActivity(MainActivity.this);
                 }
             }
         }
@@ -764,7 +764,7 @@ public class cgeo extends AbstractActivity {
             addressObtaining = true;
 
             try {
-                final Geocoder geocoder = new Geocoder(cgeo.this, Locale.getDefault());
+                final Geocoder geocoder = new Geocoder(MainActivity.this, Locale.getDefault());
                 final Geopoint coords = app.currentGeo().getCoords();
                 addresses = geocoder.getFromLocation(coords.getLatitude(), coords.getLongitude(), 1);
             } catch (Exception e) {
diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index 6fdff5a..ecbd2b2 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -432,6 +432,6 @@ public class SearchActivity extends AbstractActivity {
         searchIntent.setAction(Intent.ACTION_SEARCH).
                 putExtra(SearchManager.QUERY, scan).
                 putExtra(Intents.EXTRA_KEYWORD_SEARCH, false);
-        fromActivity.startActivityForResult(searchIntent, cgeo.SEARCH_REQUEST_CODE);
+        fromActivity.startActivityForResult(searchIntent, MainActivity.SEARCH_REQUEST_CODE);
     }
 }
diff --git a/main/src/cgeo/geocaching/activity/ActivityMixin.java b/main/src/cgeo/geocaching/activity/ActivityMixin.java
index c97cb9a..8432243 100644
--- a/main/src/cgeo/geocaching/activity/ActivityMixin.java
+++ b/main/src/cgeo/geocaching/activity/ActivityMixin.java
@@ -2,7 +2,7 @@ package cgeo.geocaching.activity;
 
 import cgeo.geocaching.R;
 import cgeo.geocaching.Settings;
-import cgeo.geocaching.cgeo;
+import cgeo.geocaching.MainActivity;
 import cgeo.geocaching.compatibility.Compatibility;
 
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +26,7 @@ import gnu.android.app.appmanualclient.AppManualReaderClient;
 public final class ActivityMixin {
 
     public final static void goHome(final Activity fromActivity) {
-        final Intent intent = new Intent(fromActivity, cgeo.class);
+        final Intent intent = new Intent(fromActivity, MainActivity.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
         fromActivity.startActivity(intent);
diff --git a/main/src/cgeo/geocaching/apps/AbstractApp.java b/main/src/cgeo/geocaching/apps/AbstractApp.java
index c95e8b4..ef56f87 100644
--- a/main/src/cgeo/geocaching/apps/AbstractApp.java
+++ b/main/src/cgeo/geocaching/apps/AbstractApp.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.apps;
 
 import cgeo.geocaching.Geocache;
-import cgeo.geocaching.cgeo;
+import cgeo.geocaching.MainActivity;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.utils.ProcessUtils;
 
@@ -29,7 +29,7 @@ public abstract class AbstractApp implements App {
         if (ProcessUtils.isInstalled(packageName)) {
             return true;
         }
-        return cgeo.isIntentAvailable(intent);
+        return MainActivity.isIntentAvailable(intent);
     }
 
     protected Intent getLaunchIntent() {
diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java
index a1fd7d1..b8f63ee 100644
--- a/main/src/cgeo/geocaching/cgeoapplication.java
+++ b/main/src/cgeo/geocaching/cgeoapplication.java
@@ -103,8 +103,8 @@ public class cgeoapplication extends Application {
                     boolean restored = atomic.get();
                     String message = restored ? res.getString(R.string.init_restore_success) : res.getString(R.string.init_restore_failed);
                     ActivityMixin.helpDialog(fromActivity, res.getString(R.string.init_backup_restore), message);
-                    if (fromActivity instanceof cgeo) {
-                        ((cgeo) fromActivity).updateCacheCounter();
+                    if (fromActivity instanceof MainActivity) {
+                        ((MainActivity) fromActivity).updateCacheCounter();
                     }
                 }
             };