mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Minor refactoring.

Browse source
This commit is contained in:
Dmitry Yunitsky 2014-10-20 16:39:46 +03:00 • committed by Alex Zolotarev
parent e155cc2ee7
commit 288cf3c487
5 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/src/com/mapswithme/maps/DownloadResourcesActivity.java
View file

@ -21,7 +21,7 @@ import com.mapswithme.maps.MWMActivity.OpenUrlTask;
import com.mapswithme.maps.MapStorage.Index;
import com.mapswithme.maps.api.Const;
import com.mapswithme.maps.api.ParsedMmwRequest;
import com.mapswithme.maps.base.MapsWithMeBaseActivity;
import com.mapswithme.maps.base.MapsWithMeBaseFragmentActivity;
import com.mapswithme.maps.location.LocationService;
import com.mapswithme.util.ConnectionState;
import com.mapswithme.util.Constants;
@ -33,11 +33,9 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@SuppressLint("StringFormatMatches")
public class DownloadResourcesActivity extends MapsWithMeBaseActivity
public class DownloadResourcesActivity extends MapsWithMeBaseFragmentActivity
implements LocationService.LocationListener, MapStorage.Listener
{
private static final String TAG = DownloadResourcesActivity.class.getName();

14
android/src/com/mapswithme/maps/base/MapsWithMeBaseActivity.java → android/src/com/mapswithme/maps/base/MapsWithMeBaseFragmentActivity.java
View file

@ -1,18 +1,16 @@
package com.mapswithme.maps.base;
import android.annotation.SuppressLint;
import android.app.ActionBar;
import android.app.Activity;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager;
import com.mapswithme.maps.MWMApplication;
import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.Statistics;
public class MapsWithMeBaseActivity extends FragmentActivity
public class MapsWithMeBaseFragmentActivity extends FragmentActivity
{
@Override
protected void onResume()
@ -34,13 +32,12 @@ public class MapsWithMeBaseActivity extends FragmentActivity
super.onStop();
}
@SuppressLint("NewApi")
@Override
protected void onCreate(Bundle arg0)
{
super.onCreate(arg0);
if (Utils.apiEqualOrGreaterThan(11))
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
{
// http://stackoverflow.com/questions/6867076/getactionbar-returns-null
final ActionBar bar = getActionBar();
@ -49,11 +46,6 @@ public class MapsWithMeBaseActivity extends FragmentActivity
}
}
public MWMApplication getMwmApplication()
{
return (MWMApplication) getApplication();
}
@Override
public boolean onOptionsItemSelected(MenuItem item)
{

6
android/src/com/mapswithme/maps/base/MapsWithMeBaseListActivity.java
View file

@ -1,22 +1,20 @@
package com.mapswithme.maps.base;
import android.annotation.SuppressLint;
import android.app.ActionBar;
import android.app.ListActivity;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.ListFragment;
import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager;
import com.mapswithme.maps.MWMApplication;
import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.Statistics;
/**
* TODO use simple activity and {@link ListFragment} instead.
*/
@SuppressLint("NewApi")
public class MapsWithMeBaseListActivity extends ListActivity
{
@ -39,7 +37,7 @@ public class MapsWithMeBaseListActivity extends ListActivity
{
super.onCreate(savedInstanceState);
if (Utils.apiEqualOrGreaterThan(11))
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
{
// http://stackoverflow.com/questions/6867076/getactionbar-returns-null
final ActionBar bar = getActionBar();

4
android/src/com/mapswithme/maps/bookmarks/BookmarkActivity.java
View file

@ -16,7 +16,7 @@ import android.widget.EditText;
import android.widget.TextView;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.MapsWithMeBaseActivity;
import com.mapswithme.maps.base.MapsWithMeBaseFragmentActivity;
import com.mapswithme.maps.bookmarks.data.Bookmark;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.bookmarks.data.Icon;
@ -25,7 +25,7 @@ import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.Statistics;
public class BookmarkActivity extends MapsWithMeBaseActivity
public class BookmarkActivity extends MapsWithMeBaseFragmentActivity
{
public static final String BOOKMARK_POSITION = "bookmark_position";
public static final String PIN = "pin";

4
android/src/com/nvidia/devtech/NvEventQueueActivity.java
View file

@ -10,11 +10,11 @@ import android.view.SurfaceView;
import android.view.View;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.MapsWithMeBaseActivity;
import com.mapswithme.maps.base.MapsWithMeBaseFragmentActivity;
import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.StubLogger;
public abstract class NvEventQueueActivity extends MapsWithMeBaseActivity implements View.OnTouchListener
public abstract class NvEventQueueActivity extends MapsWithMeBaseFragmentActivity implements View.OnTouchListener
{
private static final String TAG = "NvEventQueueActivity";