aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcampbeb <bpcampbell@gmail.com>2013-06-12 23:56:17 -1000
committercampbeb <bpcampbell@gmail.com>2013-06-12 23:56:17 -1000
commit14f7df2ecc607c4fbd76497512d3c67ece384901 (patch)
tree5c9564009d7b28b1cf0329139d2c33bf83c44839
parentd5c4fe5b4ca9754b6473c830bf6ede8d7803bdc6 (diff)
downloadcgeo-14f7df2ecc607c4fbd76497512d3c67ece384901.zip
cgeo-14f7df2ecc607c4fbd76497512d3c67ece384901.tar.gz
cgeo-14f7df2ecc607c4fbd76497512d3c67ece384901.tar.bz2
Radio buttons instead of check boxes in map strategy
-rw-r--r--main/res/menu/map_activity.xml4
-rw-r--r--main/src/cgeo/geocaching/maps/CGeoMap.java18
2 files changed, 13 insertions, 9 deletions
diff --git a/main/res/menu/map_activity.xml b/main/res/menu/map_activity.xml
index d76f5ca..df8fe09 100644
--- a/main/res/menu/map_activity.xml
+++ b/main/res/menu/map_activity.xml
@@ -55,22 +55,18 @@
android:checkableBehavior="single" >
<item
android:id="@+id/menu_strategy_fastest"
- android:checkable="true"
android:title="@string/map_strategy_fastest">
</item>
<item
android:id="@+id/menu_strategy_fast"
- android:checkable="true"
android:title="@string/map_strategy_fast">
</item>
<item
android:id="@+id/menu_strategy_auto"
- android:checkable="true"
android:title="@string/map_strategy_auto">
</item>
<item
android:id="@+id/menu_strategy_detailed"
- android:checkable="true"
android:title="@string/map_strategy_detailed">
</item>
</group>
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index a377e38..c876192 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -586,11 +586,19 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
menu.findItem(R.id.submenu_strategy).setEnabled(isLiveEnabled);
- Strategy strategy = Settings.getLiveMapStrategy();
- menu.findItem(R.id.menu_strategy_fastest).setChecked(strategy == Strategy.FASTEST);
- menu.findItem(R.id.menu_strategy_fast).setChecked(strategy == Strategy.FAST);
- menu.findItem(R.id.menu_strategy_auto).setChecked(strategy == Strategy.AUTO);
- menu.findItem(R.id.menu_strategy_detailed).setChecked(strategy == Strategy.DETAILED);
+ switch (Settings.getLiveMapStrategy()) {
+ case FASTEST:
+ menu.findItem(R.id.menu_strategy_fastest).setChecked(true);
+ break;
+ case FAST:
+ menu.findItem(R.id.menu_strategy_fast).setChecked(true);
+ break;
+ case AUTO:
+ menu.findItem(R.id.menu_strategy_auto).setChecked(true);
+ break;
+ default: // DETAILED
+ menu.findItem(R.id.menu_strategy_detailed).setChecked(true);
+ }
} catch (Exception e) {
Log.e("CGeoMap.onPrepareOptionsMenu", e);
}