Minor UI tidying up, built V4.2.7 for play store

This commit is contained in:
Graham Jones
2024-04-14 20:26:05 +01:00
parent db9515cf31
commit 27c7f7be7e
4 changed files with 10 additions and 4 deletions

View File

@@ -132,7 +132,7 @@ public class FragmentBatt extends FragmentOsdBaseClass {
mLineChart.refreshDrawableState(); mLineChart.refreshDrawableState();
float xSpan = (nWatchBattArr * 5.0f) / 60.0f; // time in minutes assuming one point every 5 seconds. float xSpan = (nWatchBattArr * 5.0f) / 60.0f; // time in minutes assuming one point every 5 seconds.
mLineChart.setDescription(getString(R.string.watch_batt_hist) mLineChart.setDescription(getString(R.string.watch_batt_hist)
+ String.format("%.1f", xSpan) + " " + String.format("%.1f", xSpan)
+ " " + getString(R.string.minutes)); + " " + getString(R.string.minutes));
mLineChart.setDescriptionTextSize(12f); mLineChart.setDescriptionTextSize(12f);
mLineChart.invalidate(); mLineChart.invalidate();

View File

@@ -10,6 +10,8 @@ import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import android.text.format.Time;
public class FragmentCommon extends FragmentOsdBaseClass { public class FragmentCommon extends FragmentOsdBaseClass {
String TAG = "FragmentCommon"; String TAG = "FragmentCommon";
@@ -94,8 +96,12 @@ public class FragmentCommon extends FragmentOsdBaseClass {
tv.setTextColor(okTextColour); tv.setTextColor(okTextColour);
tv = (TextView) mRootView.findViewById(R.id.data_time_tv); tv = (TextView) mRootView.findViewById(R.id.data_time_tv);
Time tnow = new Time(Time.getCurrentTimezone());
tnow.setToNow();
double tdiff;
tdiff = (tnow.toMillis(false) - mConnection.mSdServer.mSdData.dataTime.toMillis(false))/1000.;
tv.setText("Time =" + mConnection.mSdServer.mSdData.dataTime.format("%H:%M:%S") tv.setText("Time =" + mConnection.mSdServer.mSdData.dataTime.format("%H:%M:%S")
+ " (" + String.format("%.1f s)",mConnection.mSdServer.mSdData.timeDiff)); + " (" + String.format("%.0f s, %.1f s)",mConnection.mSdServer.mSdData.timeDiff, tdiff));
tv.setBackgroundColor(okColour); tv.setBackgroundColor(okColour);
tv.setTextColor(okTextColour); tv.setTextColor(okTextColour);

View File

@@ -73,8 +73,8 @@ public class FragmentWatchSig extends FragmentOsdBaseClass {
xAxis.setTextColor(Color.WHITE); xAxis.setTextColor(Color.WHITE);
YAxis yAxis = mLineChart.getAxisLeft(); YAxis yAxis = mLineChart.getAxisLeft();
//yAxis.setAxisMinValue(40f); yAxis.setAxisMaxValue(-50f);
//yAxis.setAxisMaxValue(240f); yAxis.setAxisMinValue(-100f);
yAxis.setDrawGridLines(true); yAxis.setDrawGridLines(true);
yAxis.setDrawLabels(true); yAxis.setDrawLabels(true);
yAxis.setTextColor(Color.WHITE); yAxis.setTextColor(Color.WHITE);