From 8c24b0fe7eb17a4f71a1c8a6ad4f9dea7a5b2ac7 Mon Sep 17 00:00:00 2001 From: Mateusz Lubecki Date: Thu, 9 Dec 2021 21:38:54 +0100 Subject: [PATCH] slight tweaks on wind rose --- .idea/deploymentTargetDropDown.xml | 12 ++-- .idea/misc.xml | 13 +++- .../StationDetailsWindRoseActivity.java | 8 +-- .../type/StationWindRoseActElements.java | 16 ++--- .../activity_station_details_wind_rose.xml | 60 ++++++++++++++++--- 5 files changed, 82 insertions(+), 27 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index fcfb8aa..5019931 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,17 +1,17 @@ - + - + - - + + - - + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 95f29b7..ae96b4a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,15 +6,19 @@ - + + + + + @@ -24,4 +28,11 @@ + + + \ No newline at end of file diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/StationDetailsWindRoseActivity.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/StationDetailsWindRoseActivity.java index 95d6fd8..b19f3ca 100644 --- a/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/StationDetailsWindRoseActivity.java +++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/StationDetailsWindRoseActivity.java @@ -38,10 +38,10 @@ public class StationDetailsWindRoseActivity extends AppCompatActivity { // find all elements in the xml layout file and set the references in a holding object elements = new StationWindRoseActElements(); elements.windArrow = findViewById(R.id.imageViewWindRoseArrow); - elements.windSpeed = findViewById(R.id.textViewWindRoseWindSpeed); - elements.windGusts = findViewById(R.id.textViewWindRoseWindGusts); - elements.windDirection = findViewById(R.id.textViewWindRoseWindDirection); - elements.temperature = findViewById(R.id.textViewWindRoseTemperatura); + elements.windSpeed = findViewById(R.id.textViewWindRoseWindSpeedValue); + elements.windGusts = findViewById(R.id.textViewWindRoseWindGustsValue); + elements.windDirection = findViewById(R.id.textViewWindRoseWindDirectionValue); + elements.temperature = findViewById(R.id.textViewWindRoseTemperaturaValue); elements.maxGust = findViewById(R.id.textViewWindRoseMaxHourGust); elements.minAverage = findViewById(R.id.textViewWindRoseMinHourSpeed); elements.pressure = findViewById(R.id.textViewWindRosePressure); diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/type/StationWindRoseActElements.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/type/StationWindRoseActElements.java index 9fbb377..ff93e43 100644 --- a/app/src/main/java/cc/pogoda/mobile/pogodacc/type/StationWindRoseActElements.java +++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/type/StationWindRoseActElements.java @@ -110,27 +110,27 @@ public class StationWindRoseActElements implements StationActivityElements { } if (!no_data && !data.wind_qf_native.equals(QualityFactor.NOT_AVALIABLE)) { - windSpeed.setText(activity.getResources().getString(R.string.mean_value) + '\n' + average_speed); + windSpeed.setText(average_speed); } else { - windSpeed.setText(activity.getResources().getString(R.string.mean_value) + '\n' + "---"); + windSpeed.setText("---"); } if (!no_data && !data.wind_qf_native.equals(QualityFactor.NOT_AVALIABLE)) { - windGusts.setText(activity.getResources().getString(R.string.wind_gust_short) + '\n' + gusts_speed); + windGusts.setText(gusts_speed); } else { - windGusts.setText(activity.getResources().getString(R.string.wind_gust_short) + '\n' + "---"); + windGusts.setText("---"); } if (!no_data && !data.wind_qf_native.equals(QualityFactor.NOT_AVALIABLE)) { - windDirection.setText(activity.getResources().getString(R.string.wind_direction_short) + '\n' + data.direction + activity.getResources().getString(R.string.degrees_sign)); + windDirection.setText(String.valueOf(data.direction) + activity.getResources().getString(R.string.degrees_sign)); } else { - windDirection.setText(activity.getResources().getString(R.string.wind_direction_short) + '\n' + "---"); + windDirection.setText("---"); } // check if temperature is avaliable in input data set if (!no_data) { - temperature.setText(activity.getResources().getString(R.string.temperature_short) + '\n' + String.format("%s", data.getTemperatureStr(true, false))); + temperature.setText(String.format("%s", data.getTemperatureStr(true, false))); if (!data.temperature_qf_native.equals(QualityFactor.NOT_AVALIABLE) && goodColor != 0) { temperature.setTextColor(goodColor); @@ -139,7 +139,7 @@ public class StationWindRoseActElements implements StationActivityElements { temperature.setTextColor(badColor); } } else { - temperature.setText(activity.getResources().getString(R.string.temperature_short) + '\n' + "---"); + temperature.setText("---"); } if (!no_data && !old_data) { diff --git a/app/src/main/res/layout/activity_station_details_wind_rose.xml b/app/src/main/res/layout/activity_station_details_wind_rose.xml index 8286656..78049f5 100644 --- a/app/src/main/res/layout/activity_station_details_wind_rose.xml +++ b/app/src/main/res/layout/activity_station_details_wind_rose.xml @@ -47,7 +47,7 @@ + app:layout_constraintVertical_bias="0.01999998" /> + app:layout_constraintVertical_bias="0.9" /> + app:layout_constraintVertical_bias="0.9" /> + app:layout_constraintVertical_bias="0.01999998" /> + + + + + + + +