X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroidTab.java;h=cc1acd6798ab339c4a226b9984daa8fc639812f4;hp=b960eb1a2a7d5c5e81f93e75d3640e049bace381;hb=4f1c4dddbce7b4e8673173f1690f79ba60e72ba2;hpb=59dfe661fcb504f390d9726378c676f2b5b005f3

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
index b960eb1a..cc1acd67 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altoslib_7.*;
 import android.location.Location;
 import android.app.Activity;
 import android.graphics.Color;
@@ -26,9 +26,9 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.FragmentManager;
 import android.location.Location;
-import android.util.Log;
+import android.widget.TextView;
 
-public abstract class AltosDroidTab extends Fragment {
+public abstract class AltosDroidTab extends Fragment implements AltosUnitsListener {
 	AltosState		last_state;
 	AltosGreatCircle	last_from_receiver;
 	Location		last_receiver;
@@ -37,39 +37,52 @@ public abstract class AltosDroidTab extends Fragment {
 
 	public abstract String tab_name();
 
-	public void set_visible(boolean visible) {
-		FragmentTransaction	ft = AltosDroid.fm.beginTransaction();
-		if (visible)
-			ft.show(this);
-		else
-			ft.hide(this);
-		ft.commit();
+	public void set_map_type(int map_type) {
 	}
 
-	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver, boolean is_current) {
-		if (is_current) {
-			Log.d(AltosDroid.TAG, String.format("%s: visible, performing update", tab_name()));
+	public void units_changed(boolean imperial_units) {
+		if (!isHidden() && last_state != null)
+			show(last_state, last_from_receiver, last_receiver);
+	}
 
-			show(state, from_receiver, receiver);
-		} else {
-			Log.d(AltosDroid.TAG, String.format("%s: not visible, skipping update", tab_name()));
-			last_state = state;
-			last_from_receiver = from_receiver;
-			last_receiver = receiver;
-			return;
-		}
+	public void set_value(TextView text_view,
+			      AltosUnits units,
+			      int width,
+			      double value) {
+		if (value == AltosLib.MISSING)
+			text_view.setText("");
+		else
+			text_view.setText(units.show(width, value));
 	}
 
-	public void onHiddenChanged(boolean hidden) {
-		if (last_state != null && isVisible()) {
+	public void set_visible(boolean visible) {
+		FragmentTransaction	ft = AltosDroid.fm.beginTransaction();
+		if (visible) {
 			AltosState		state = last_state;
 			AltosGreatCircle	from_receiver = last_from_receiver;
 			Location		receiver = last_receiver;
 
-			last_state = null;
-			last_from_receiver = null;
-			last_receiver = null;
+			ft.show(this);
 			show(state, from_receiver, receiver);
-		}
+		} else
+			ft.hide(this);
+		ft.commitAllowingStateLoss();
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		AltosDebug.debug("onResume tab %s\n", tab_name());
+		set_visible(true);
+	}
+
+	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver, boolean is_current) {
+		last_state = state;
+		last_from_receiver = from_receiver;
+		last_receiver = receiver;
+		if (is_current)
+			show(state, from_receiver, receiver);
+		else
+			return;
 	}
 }