#80 #78 move requestOnClickSensorReconect() to NumberView, and use th…

…is with SensorStateButton in MainActivity
bailuk · Oct 19, 2019 · 684c6aa · 684c6aa
1 parent 965d75c
commit 684c6aa
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 31 deletions.
diff --git a/app/src/main/java/ch/bailu/aat/views/description/CockpitView.java b/app/src/main/java/ch/bailu/aat/views/description/CockpitView.java
@@ -64,26 +64,16 @@ public void addAltitude(DispatcherInterface di) {
 
     public void addHeartRate(DispatcherInterface di) {
         NumberView v = add(di, new HeartRateDescription(getContext()), InfoID.HEART_RATE_SENSOR);
-        requestOnClickSensorReconect(v);
+        v.requestOnClickSensorReconect();
     }
 
 
     public void addCadence(DispatcherInterface di) {
         NumberView v = add(di, new CadenceDescription(getContext()), InfoID.CADENCE_SENSOR);
-        requestOnClickSensorReconect(v);
+        v.requestOnClickSensorReconect();
     }
 
 
-    public static View requestOnClickSensorReconect(View v) {
-        v.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                AppLog.i(v.getContext(), ToDo.translate("Reconnect sensors..."));
-                AppBroadcaster.broadcast(v.getContext(), AppBroadcaster.SENSOR_RECONNECT + InfoID.SENSORS);
-            }
-        });
-        return v;
-    }
 
     @Override
     protected void onLayout(boolean changed, int l, int t, int r, int b) {

diff --git a/app/src/main/java/ch/bailu/aat/views/description/NumberView.java b/app/src/main/java/ch/bailu/aat/views/description/NumberView.java
@@ -5,14 +5,20 @@
 import android.os.Build;
 import android.text.Layout;
 import android.util.TypedValue;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
 import ch.bailu.aat.description.ContentDescription;
 import ch.bailu.aat.dispatcher.OnContentUpdatedInterface;
 import ch.bailu.aat.gpx.GpxInformation;
+import ch.bailu.aat.gpx.InfoID;
+import ch.bailu.aat.util.AppBroadcaster;
+import ch.bailu.aat.util.ui.AppLog;
 import ch.bailu.aat.util.ui.AppTheme;
+import ch.bailu.aat.util.ui.ToolTip;
 import ch.bailu.aat.util.ui.UiTheme;
+import ch.bailu.aat.views.preferences.ConnectToSensorsView;
 
 public class NumberView extends ViewGroup implements OnContentUpdatedInterface {
 
@@ -143,4 +149,19 @@ public void setOnClickListener(OnClickListener listener) {
         AppTheme.bar.button(this);
         setPadding(0,0,0,0);
     }
+
+
+
+    public View requestOnClickSensorReconect() {
+        ToolTip.set(this, ConnectToSensorsView.LABEL);
+
+        setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                AppLog.i(v.getContext(), ConnectToSensorsView.LABEL);
+                AppBroadcaster.broadcast(v.getContext(), AppBroadcaster.SENSOR_RECONNECT + InfoID.SENSORS);
+            }
+        });
+        return this;
+    }
 }
diff --git a/app/src/main/java/ch/bailu/aat/views/description/SensorStateButton.java b/app/src/main/java/ch/bailu/aat/views/description/SensorStateButton.java
@@ -9,31 +9,14 @@
 import ch.bailu.aat.util.ui.ToolTip;
 import ch.bailu.aat.views.preferences.ConnectToSensorsView;
 
-public class SensorStateButton extends NumberView implements View.OnClickListener {
+public class SensorStateButton extends NumberView {
     private final ServiceContext scontext;
 
 
     public SensorStateButton(ServiceContext c) {
         super(new SensorStateDescription(c.getContext()), AppTheme.bar);
         scontext = c;
 
-        setOnClickListener(this);
-
-        ToolTip.set(this, ConnectToSensorsView.LABEL);
-    }
-
-
-    @Override
-    public void onClick(View v) {
-        if (v==this) {
-            new InsideContext(scontext) {
-
-                @Override
-                public void run() {
-                    scontext.getSensorService().updateConnections();
-                }
-            };
-
-        }
+        requestOnClickSensorReconect();
     }
 }