Merge branch 'master' into legacy

legacy
sh123 2022-07-24 21:45:15 +03:00
commit 7fae9cdb88
3 zmienionych plików z 11 dodań i 6 usunięć

Wyświetl plik

@ -10,8 +10,8 @@ android {
applicationId "com.radio.codec2talkie"
minSdkVersion 21
targetSdkVersion 30
versionCode 128
versionName "1.28"
versionCode 129
versionName "1.29"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Wyświetl plik

@ -34,12 +34,16 @@ public class LogItemGroupHolder extends RecyclerView.ViewHolder {
public void bind(LogItemGroup group) {
@SuppressLint("MissingPermission") Location loc = _locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
double distanceKm = Position.distanceTo(loc.getLatitude(), loc.getLongitude(), loc.getAltitude(),
group.getLatitude(), group.getLongitude(), group.getAltitudeMeters()) / 1000.0;
String bearing = Position.bearing(loc.getLatitude(), loc.getLongitude(), group.getLatitude(), group.getLongitude());
if (loc == null) {
_logItemViewDistance.setText(R.string.log_item_group_holder_unknown_km);
} else {
double distanceKm = Position.distanceTo(loc.getLatitude(), loc.getLongitude(), loc.getAltitude(),
group.getLatitude(), group.getLongitude(), group.getAltitudeMeters()) / 1000.0;
String bearing = Position.bearing(loc.getLatitude(), loc.getLongitude(), group.getLatitude(), group.getLongitude());
_logItemViewDistance.setText(String.format(Locale.US, "%s %.1f km", bearing, distanceKm));
}
_logItemViewTitle.setText(String.format(Locale.US, "%s",
group.getSrcCallsign()));
_logItemViewDistance.setText(String.format(Locale.US, "%s %.1f km", bearing, distanceKm));
_logItemViewMessage.setText(String.format(Locale.US, "%s %s %f %f %03d° %03dkm/h %04dm %s %s",
group.getSymbolCode(),
group.getMaidenHead(),

Wyświetl plik

@ -288,4 +288,5 @@
<string name="log_item_group_textview_title">Station SSIDS</string>
<string name="log_view_menu_stations">View stations</string>
<string name="log_view_station_history">Station history</string>
<string name="log_item_group_holder_unknown_km">\? km</string>
</resources>