projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Split setup functions to separate dialog
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
AltosMapOffline.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index 6edc87a5c381ddd50438a560c83643d4cc89e5e1..bde80cfc99146b35c011b744282ffc35886bdd14 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@
-79,7
+79,7
@@
class Rocket implements Comparable {
}
}
}
}
-public class AltosMapOffline extends View implements ScaleGestureDetector.OnScaleGestureListener, AltosMapInterface, AltosDroidMapInterface {
+public class AltosMapOffline extends View implements ScaleGestureDetector.OnScaleGestureListener, AltosMapInterface, AltosDroidMapInterface
, AltosMapTypeListener
{
ScaleGestureDetector scale_detector;
boolean scaling;
AltosMap map;
ScaleGestureDetector scale_detector;
boolean scaling;
AltosMap map;
@@
-493,7
+493,8
@@
public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
public void onCreateView(AltosDroid altos_droid) {
this.altos_droid = altos_droid;
map = new AltosMap(this);
public void onCreateView(AltosDroid altos_droid) {
this.altos_droid = altos_droid;
map = new AltosMap(this);
- map.set_maptype(altos_droid.map_type);
+ AltosPreferences.register_map_type_listener(this);
+ map.set_maptype(AltosPreferences.map_type());
pad_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.pad);
/* arrow at the bottom of the launchpad image */
pad_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.pad);
/* arrow at the bottom of the launchpad image */
@@
-511,7
+512,11
@@
public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
here_off_y = here_bitmap.getHeight() / 2;
}
here_off_y = here_bitmap.getHeight() / 2;
}
- public void set_map_type(int map_type) {
+ public void onDestroyView() {
+ AltosPreferences.unregister_map_type_listener(this);
+ }
+
+ public void map_type_changed(int map_type) {
if (map != null)
map.set_maptype(map_type);
}
if (map != null)
map.set_maptype(map_type);
}