diff options
13 files changed, 21 insertions, 16 deletions
diff --git a/cgeo-calendar/src/cgeo/calendar/Compatibility.java b/cgeo-calendar/src/cgeo/calendar/Compatibility.java index 905d6df..8813f41 100644 --- a/cgeo-calendar/src/cgeo/calendar/Compatibility.java +++ b/cgeo-calendar/src/cgeo/calendar/Compatibility.java @@ -5,7 +5,7 @@ import android.os.Build; public final class Compatibility { - private final static int sdkVersion = Integer.parseInt(Build.VERSION.SDK); + private final static int sdkVersion = Build.VERSION.SDK_INT; private final static boolean isLevel8 = sdkVersion >= 8; private final static boolean isLevel14 = sdkVersion >= 14; diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index 1cb219a..62f946a 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -1175,7 +1175,7 @@ public class CacheDetailActivity extends AbstractActivity { private ViewGroup createAttributeIconsLayout(int parentWidth) { final LinearLayout rows = new LinearLayout(CacheDetailActivity.this); - rows.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT)); + rows.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); rows.setOrientation(LinearLayout.VERTICAL); LinearLayout attributeRow = newAttributeIconsRow(); @@ -1223,7 +1223,7 @@ public class CacheDetailActivity extends AbstractActivity { private LinearLayout newAttributeIconsRow() { LinearLayout rowLayout = new LinearLayout(CacheDetailActivity.this); - rowLayout.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, + rowLayout.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); rowLayout.setOrientation(LinearLayout.HORIZONTAL); return rowLayout; diff --git a/main/src/cgeo/geocaching/cgeocoords.java b/main/src/cgeo/geocaching/cgeocoords.java index 0ad2e81..0aaea2a 100644 --- a/main/src/cgeo/geocaching/cgeocoords.java +++ b/main/src/cgeo/geocaching/cgeocoords.java @@ -67,7 +67,7 @@ public class cgeocoords extends Dialog { try { requestWindowFeature(Window.FEATURE_NO_TITLE); - getWindow().setLayout(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT); + getWindow().setLayout(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); } catch (Exception e) { // nothing } diff --git a/main/src/cgeo/geocaching/compatibility/Compatibility.java b/main/src/cgeo/geocaching/compatibility/Compatibility.java index e646348..f88ec2d 100644 --- a/main/src/cgeo/geocaching/compatibility/Compatibility.java +++ b/main/src/cgeo/geocaching/compatibility/Compatibility.java @@ -16,7 +16,7 @@ import android.widget.EditText; public final class Compatibility { - private final static int sdkVersion = Integer.parseInt(Build.VERSION.SDK); + private final static int sdkVersion = Build.VERSION.SDK_INT; private final static boolean isLevel8 = sdkVersion >= 8; private final static boolean isLevel5 = sdkVersion >= 5; diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index 0618872..20c77f9 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -1541,7 +1541,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto public View makeView() { ImageView imageView = new ImageView(activity); imageView.setScaleType(ScaleType.CENTER); - imageView.setLayoutParams(new ImageSwitcher.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT)); + imageView.setLayoutParams(new ImageSwitcher.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); return imageView; } diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java index 6c76eff..51f7ea8 100644 --- a/main/src/cgeo/geocaching/network/HtmlImage.java +++ b/main/src/cgeo/geocaching/network/HtmlImage.java @@ -71,7 +71,7 @@ public class HtmlImage implements Html.ImageGetter { public BitmapDrawable getDrawable(final String url) { // Reject empty and counter images URL if (StringUtils.isBlank(url) || isCounter(url)) { - return new BitmapDrawable(getTransparent1x1Image()); + return new BitmapDrawable(resources, getTransparent1x1Image()); } final boolean shared = url.contains("/images/icons/icon_"); @@ -143,7 +143,7 @@ public class HtmlImage implements Html.ImageGetter { height = imgHeight; } - final BitmapDrawable image = new BitmapDrawable(imagePre); + final BitmapDrawable image = new BitmapDrawable(resources, imagePre); image.setBounds(new Rect(0, 0, width, height)); return image; diff --git a/main/src/cgeo/geocaching/ui/CacheListAdapter.java b/main/src/cgeo/geocaching/ui/CacheListAdapter.java index 69125b4..391e9ac 100644 --- a/main/src/cgeo/geocaching/ui/CacheListAdapter.java +++ b/main/src/cgeo/geocaching/ui/CacheListAdapter.java @@ -556,7 +556,7 @@ public class CacheListAdapter extends ArrayAdapter<cgCache> { public TouchListener(final cgCache cache) { this.cache = cache; final FlingGesture dGesture = new FlingGesture(cache); - gestureDetector = new GestureDetector(dGesture); + gestureDetector = new GestureDetector(getContext(), dGesture); } // tap on item diff --git a/main/src/cgeo/geocaching/ui/DateDialog.java b/main/src/cgeo/geocaching/ui/DateDialog.java index 03786b3..5dfd9b9 100644 --- a/main/src/cgeo/geocaching/ui/DateDialog.java +++ b/main/src/cgeo/geocaching/ui/DateDialog.java @@ -34,7 +34,7 @@ public class DateDialog extends Dialog { try { requestWindowFeature(Window.FEATURE_NO_TITLE); - getWindow().setLayout(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT); + getWindow().setLayout(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); } catch (Exception e) { // nothing } diff --git a/tests/src/cgeo/geocaching/SettingsTest.java b/tests/src/cgeo/geocaching/SettingsTest.java index 5c03396..f40b57f 100644 --- a/tests/src/cgeo/geocaching/SettingsTest.java +++ b/tests/src/cgeo/geocaching/SettingsTest.java @@ -7,7 +7,7 @@ import android.test.ActivityInstrumentationTestCase2; public class SettingsTest extends ActivityInstrumentationTestCase2<cgeo> { public SettingsTest() { - super("cgeo.geocaching", cgeo.class); + super(cgeo.class); } @Override @@ -25,4 +25,8 @@ public class SettingsTest extends ActivityInstrumentationTestCase2<cgeo> { // We just want to ensure that it does not throw any exception but we do not know anything about the result MapsforgeMapProvider.isValidMapFile(mapFile); } + + public static void testSettings() { + assertEquals(Settings.getMemberStatus(), "Premium Member"); + } } diff --git a/tests/src/cgeo/geocaching/activity/ProgressTest.java b/tests/src/cgeo/geocaching/activity/ProgressTest.java index 1910885..aa2460c 100644 --- a/tests/src/cgeo/geocaching/activity/ProgressTest.java +++ b/tests/src/cgeo/geocaching/activity/ProgressTest.java @@ -6,7 +6,7 @@ import android.test.ActivityInstrumentationTestCase2; public class ProgressTest extends ActivityInstrumentationTestCase2<cgeo> { public ProgressTest() { - super("cgeo.geocaching", cgeo.class); + super(cgeo.class); } public void testProgressWrapper() { diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java index 00290b4..843a48c 100644 --- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java +++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java @@ -2,6 +2,7 @@ package cgeo.geocaching; import cgeo.CGeoTestCase; import cgeo.geocaching.connector.ConnectorFactory; +import cgeo.geocaching.connector.gc.AbstractSearchThread; import cgeo.geocaching.connector.gc.GCParser; import cgeo.geocaching.connector.gc.Login; import cgeo.geocaching.connector.gc.Tile; @@ -25,7 +26,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.SmallTest; -import java.util.Date; +import java.util.GregorianCalendar; import junit.framework.Assert; @@ -69,7 +70,7 @@ public class cgeoApplicationTest extends CGeoTestCase { assertEquals("http://www.geocaching.com/images/wpttypes/21.gif", tb.getIconUrl()); assertEquals("blafoo's Children Music CD", tb.getName()); assertEquals("Travel Bug Dog Tag", tb.getType()); - assertEquals(new Date(2009 - 1900, 8 - 1, 24), tb.getReleased()); + assertEquals(new GregorianCalendar(2009 - 1900, 8 - 1, 24), tb.getReleased()); assertEquals("Niedersachsen, Germany", tb.getOrigin()); assertEquals("blafoo", tb.getOwner()); assertEquals("0564a940-8311-40ee-8e76-7e91b2cf6284", tb.getOwnerGuid()); diff --git a/tests/src/cgeo/geocaching/cgeogpxesTest.java b/tests/src/cgeo/geocaching/cgeogpxesTest.java index 6c33374..9de36ff 100644 --- a/tests/src/cgeo/geocaching/cgeogpxesTest.java +++ b/tests/src/cgeo/geocaching/cgeogpxesTest.java @@ -6,7 +6,7 @@ public class cgeogpxesTest extends ActivityInstrumentationTestCase2<cgeogpxes> { private final cgeogpxes importGpxActivity = new cgeogpxes(); public cgeogpxesTest() { - super("cgeo.geocaching", cgeogpxes.class); + super(cgeogpxes.class); } public void testFileNameMatches() { diff --git a/tests/src/cgeo/geocaching/compatibility/CompatibilityTest.java b/tests/src/cgeo/geocaching/compatibility/CompatibilityTest.java index 35baa8c..03034f8 100644 --- a/tests/src/cgeo/geocaching/compatibility/CompatibilityTest.java +++ b/tests/src/cgeo/geocaching/compatibility/CompatibilityTest.java @@ -11,7 +11,7 @@ public class CompatibilityTest extends ActivityInstrumentationTestCase2<cgeo> { private cgeo activity; public CompatibilityTest() { - super("cgeo.geocaching", cgeo.class); + super(cgeo.class); } @Override |