From 63f4d64a4b1ab86fa8c30a8ae4cf59d76b6c9351 Mon Sep 17 00:00:00 2001 From: Mateusz Lubecki Date: Thu, 6 Jan 2022 19:52:59 +0100 Subject: [PATCH] ux improvements, changed colours, buttons etc --- .../cc/pogoda/mobile/meteosystem/Main.java | 10 ---- .../activity/StationDetailsActivity.java | 40 +++++++++---- .../StationDetailsSummaryActivity.java | 38 +++++++++--- .../StationDetailsWindRoseActivity.java | 38 +++++++++--- ...avouritesStationDetailsOnListUpdater.java} | 6 +- ...ilsValuesOnActivityFromSummaryUpdater.java | 45 ++++++++++++++ ...tationDetailsValuesOnActivityUpdater.java} | 8 ++- .../WeatherStationRecyclerViewAdapter.java | 14 ++++- .../type/StationSummaryActElements.java | 4 ++ .../type/StationWindRoseActElements.java | 6 ++ app/src/main/res/drawable/button_border.xml | 16 +++++ ...activity_favourites_linear_layout_data.xml | 1 + app/src/main/res/layout/activity_main.xml | 30 ++++++++-- .../res/layout/activity_station_details.xml | 58 +++++++++++++++---- app/src/main/res/values-cs-rCZ/strings.xml | 3 +- app/src/main/res/values-cs/strings.xml | 3 +- app/src/main/res/values-de-rAT/strings.xml | 5 +- app/src/main/res/values-de-rDE/strings.xml | 5 +- app/src/main/res/values-de/strings.xml | 5 +- app/src/main/res/values-en-rUS/strings.xml | 3 +- app/src/main/res/values-lv-rLV/strings.xml | 1 + app/src/main/res/values-lv/strings.xml | 1 + app/src/main/res/values-pl-rPL/strings.xml | 3 +- app/src/main/res/values-pl/strings.xml | 3 +- app/src/main/res/values-ru-rBY/strings.xml | 1 + app/src/main/res/values-ru-rRU/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-uk-rUA/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values/strings.xml | 3 +- 30 files changed, 282 insertions(+), 72 deletions(-) rename app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/{FavouritesStationDetailsUpdater.java => FavouritesStationDetailsOnListUpdater.java} (93%) create mode 100644 app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/StationDetailsValuesOnActivityFromSummaryUpdater.java rename app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/{StationDetailsValuesUpdater.java => StationDetailsValuesOnActivityUpdater.java} (77%) create mode 100644 app/src/main/res/drawable/button_border.xml diff --git a/app/src/main/java/cc/pogoda/mobile/meteosystem/Main.java b/app/src/main/java/cc/pogoda/mobile/meteosystem/Main.java index 0fda7bf..d5e6910 100644 --- a/app/src/main/java/cc/pogoda/mobile/meteosystem/Main.java +++ b/app/src/main/java/cc/pogoda/mobile/meteosystem/Main.java @@ -4,11 +4,6 @@ import android.app.Application; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; -import android.os.Build; -import android.os.Handler; -import android.os.Looper; -import android.os.StrictMode; -import android.os.strictmode.Violation; import com.jakewharton.threetenabp.AndroidThreeTen; @@ -24,17 +19,12 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; -import cc.pogoda.mobile.meteosystem.activity.handler.MainActImageButtonFavouritesClickEvent; -import cc.pogoda.mobile.meteosystem.activity.updater.FavouritesStationDetailsUpdater; import cc.pogoda.mobile.meteosystem.activity.updater.FavouritesStationSummaryUpdater; -import cc.pogoda.mobile.meteosystem.activity.view.AllStationsActRecyclerViewHolder; import cc.pogoda.mobile.meteosystem.config.AppConfiguration; import cc.pogoda.mobile.meteosystem.dao.AllStationsDao; import cc.pogoda.mobile.meteosystem.file.ConfigurationFile; import cc.pogoda.mobile.meteosystem.file.FavouritiesFile; import cc.pogoda.mobile.meteosystem.file.FileNames; -import cc.pogoda.mobile.meteosystem.type.ParceableFavsCallReason; -import cc.pogoda.mobile.meteosystem.type.ParceableStationsList; import cc.pogoda.mobile.meteosystem.type.WeatherStation; import cc.pogoda.mobile.meteosystem.type.WeatherStationListEvent; import cc.pogoda.mobile.meteosystem.type.web.Summary; diff --git a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/StationDetailsActivity.java b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/StationDetailsActivity.java index b8d34b1..e0ea4af 100644 --- a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/StationDetailsActivity.java +++ b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/StationDetailsActivity.java @@ -2,11 +2,15 @@ package cc.pogoda.mobile.meteosystem.activity; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.text.HtmlCompat; import android.app.AlertDialog; import android.content.DialogInterface; import android.os.Bundle; import android.os.Handler; +import android.text.Html; +import android.text.method.LinkMovementMethod; +import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -294,13 +298,29 @@ public class StationDetailsActivity extends AppCompatActivity { } - stationName.setText(station.getDisplayedName()); + if (station.getDisplayedName().length() > 18) { + stationName.setText(station.getDisplayedName()); + stationName.setTextSize(TypedValue.COMPLEX_UNIT_SP, 30.0f); + } + else { + stationName.setText(station.getDisplayedName()); + stationName.setTextSize(TypedValue.COMPLEX_UNIT_SP, 36.0f); + } + stationLocation.setText(station.getDisplayedLocation()); station_lat = station.getLat(); station_lon = station.getLon(); - stationSponsorUrl.setText(station.getSponsorUrl()); +// if (station.getSponsorUrl().length() > 32) { +// stationSponsorUrl.setClickable(true); +// stationSponsorUrl.setMovementMethod(LinkMovementMethod.getInstance()); +// stationSponsorUrl.setText(Html.fromHtml("" + getString(R.string.www_link) + "\n", HtmlCompat.FROM_HTML_MODE_LEGACY)); +// } +// else { + stationSponsorUrl.setText(station.getSponsorUrl()); +// } + stationMoreInfo.setText(station.getMoreInfo()); StationBackgroundDownloader downloader = new StationBackgroundDownloader(station); @@ -312,33 +332,33 @@ public class StationDetailsActivity extends AppCompatActivity { if (station_lat > 0.0f && station_lon > 0.0f) { // europe - sb.append(station_lon); - sb.append(" N / "); sb.append(station_lat); + sb.append(" N / "); + sb.append(station_lon); sb.append(" E"); stationLatLon.setText(sb.toString()); } else if (station_lat < 0.0f && station_lon > 0.0f) { // usa - sb.append(station_lon); + sb.append(station_lat); sb.append(" N / "); - sb.append(-station_lat); + sb.append(-station_lon); sb.append(" W"); stationLatLon.setText(sb.toString()); } else if (station_lat < 0.0f && station_lon < 0.0f) { // brazil - sb.append(-station_lon); - sb.append(" S / "); sb.append(-station_lat); + sb.append(" S / "); + sb.append(-station_lon); sb.append(" W"); stationLatLon.setText(sb.toString()); } else if (station_lat > 0.0f && station_lat > 0.0f) { // australia - sb.append(-station_lon); + sb.append(-station_lat); sb.append(" S / "); - sb.append(station_lat); + sb.append(station_lon); sb.append(" E"); stationLatLon.setText(sb.toString()); diff --git a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/StationDetailsSummaryActivity.java b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/StationDetailsSummaryActivity.java index 2acc2eb..47aa0ad 100644 --- a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/StationDetailsSummaryActivity.java +++ b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/StationDetailsSummaryActivity.java @@ -8,8 +8,10 @@ import android.os.Bundle; import android.os.Handler; import android.util.TypedValue; +import cc.pogoda.mobile.meteosystem.Main; import cc.pogoda.mobile.meteosystem.R; -import cc.pogoda.mobile.meteosystem.activity.updater.StationDetailsValuesUpdater; +import cc.pogoda.mobile.meteosystem.activity.updater.StationDetailsValuesOnActivityFromSummaryUpdater; +import cc.pogoda.mobile.meteosystem.activity.updater.StationDetailsValuesOnActivityUpdater; import cc.pogoda.mobile.meteosystem.dao.SummaryDao; import cc.pogoda.mobile.meteosystem.type.StationSummaryActElements; import cc.pogoda.mobile.meteosystem.type.WeatherStation; @@ -21,13 +23,19 @@ public class StationDetailsSummaryActivity extends AppCompatActivity { WeatherStation station = null; - StationDetailsValuesUpdater updater = null; + StationDetailsValuesOnActivityUpdater valuesOnActUpdater = null; + + StationDetailsValuesOnActivityFromSummaryUpdater valuesFromSummaryUpdater = null; Handler handler = null; + Main main = null; + @Override protected void onCreate(Bundle savedInstanceState) { + main = (Main)getApplication(); + elems = new StationSummaryActElements(); int color = ContextCompat.getColor(this, android.R.color.secondary_text_light); @@ -69,12 +77,26 @@ public class StationDetailsSummaryActivity extends AppCompatActivity { // create a handler to update station data in background handler = new Handler(); - // create a copy of updater class for this tation - updater = new StationDetailsValuesUpdater(elems, handler, station.getSystemName(), station); + // check if this station is on favourites list + boolean onFavs = main.checkIsOnFavsList(station.getSystemName()); - if (handler != null && updater != null) { - handler.post(updater); + if (onFavs) { + valuesFromSummaryUpdater = new StationDetailsValuesOnActivityFromSummaryUpdater(elems, handler, station, main.getStationSystemNameToSummary()); + + if (handler != null && valuesFromSummaryUpdater != null) { + handler.post(valuesFromSummaryUpdater); + } } + else { + // create a copy of updater class for this station + valuesOnActUpdater = new StationDetailsValuesOnActivityUpdater(elems, handler, station.getSystemName(), station); + + if (handler != null && valuesOnActUpdater != null) { + handler.post(valuesOnActUpdater); + } + } + + } @@ -82,8 +104,8 @@ public class StationDetailsSummaryActivity extends AppCompatActivity { @Override protected void onStop() { - if (handler != null && updater != null) { - handler.removeCallbacks(updater); + if (handler != null && valuesOnActUpdater != null) { + handler.removeCallbacks(valuesOnActUpdater); } super.onStop(); diff --git a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/StationDetailsWindRoseActivity.java b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/StationDetailsWindRoseActivity.java index 41324b1..2f99012 100644 --- a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/StationDetailsWindRoseActivity.java +++ b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/StationDetailsWindRoseActivity.java @@ -5,8 +5,10 @@ import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.os.Handler; +import cc.pogoda.mobile.meteosystem.Main; import cc.pogoda.mobile.meteosystem.R; -import cc.pogoda.mobile.meteosystem.activity.updater.StationDetailsValuesUpdater; +import cc.pogoda.mobile.meteosystem.activity.updater.StationDetailsValuesOnActivityFromSummaryUpdater; +import cc.pogoda.mobile.meteosystem.activity.updater.StationDetailsValuesOnActivityUpdater; import cc.pogoda.mobile.meteosystem.dao.SummaryDao; import cc.pogoda.mobile.meteosystem.type.StationWindRoseActElements; import cc.pogoda.mobile.meteosystem.type.WeatherStation; @@ -18,12 +20,16 @@ public class StationDetailsWindRoseActivity extends AppCompatActivity { Summary summary; - StationDetailsValuesUpdater updater = null; + StationDetailsValuesOnActivityUpdater onActivityUpdater = null; + + StationDetailsValuesOnActivityFromSummaryUpdater fromSummaryUpdater = null; Handler handler = null; StationWindRoseActElements elements; + Main main = null; + public StationDetailsWindRoseActivity() { } @@ -35,6 +41,8 @@ public class StationDetailsWindRoseActivity extends AppCompatActivity { station = (WeatherStation) getIntent().getSerializableExtra("station"); + main = (Main)getApplication(); + // 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); @@ -59,12 +67,26 @@ public class StationDetailsWindRoseActivity extends AppCompatActivity { elements.updateFromSummary(summary, station.getAvailableParameters()); handler = new Handler(); - updater = new StationDetailsValuesUpdater(elements, handler, station.getSystemName(), station); - if (handler != null && updater != null) { - // start the handler to update the wind rose activity in background - handler.post(updater); + // check if this station is on favourites list + boolean onFavs = main.checkIsOnFavsList(station.getSystemName()); + + if (onFavs) { + fromSummaryUpdater = new StationDetailsValuesOnActivityFromSummaryUpdater(elements, handler, station, main.getStationSystemNameToSummary()); + + if (handler != null && fromSummaryUpdater != null) { + handler.post(fromSummaryUpdater); + } } + else { + onActivityUpdater = new StationDetailsValuesOnActivityUpdater(elements, handler, station.getSystemName(), station); + + if (handler != null && onActivityUpdater != null) { + // start the handler to update the wind rose activity in background + handler.post(onActivityUpdater); + } + } + } @@ -72,8 +94,8 @@ public class StationDetailsWindRoseActivity extends AppCompatActivity { protected void onStop() { // remove and stop background callback - if (handler != null && updater != null) { - handler.removeCallbacks(updater); + if (handler != null && onActivityUpdater != null) { + handler.removeCallbacks(onActivityUpdater); } super.onStop(); diff --git a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/FavouritesStationDetailsUpdater.java b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/FavouritesStationDetailsOnListUpdater.java similarity index 93% rename from app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/FavouritesStationDetailsUpdater.java rename to app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/FavouritesStationDetailsOnListUpdater.java index dcd94e7..faf4ca0 100644 --- a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/FavouritesStationDetailsUpdater.java +++ b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/FavouritesStationDetailsOnListUpdater.java @@ -22,7 +22,7 @@ import cc.pogoda.mobile.meteosystem.type.web.Summary; * This class is used to update entries (TextView) on Favourites list using HashMap * which is updated by {@link FavouritesStationSummaryUpdater} */ -public class FavouritesStationDetailsUpdater implements Runnable { +public class FavouritesStationDetailsOnListUpdater implements Runnable { /** * Handler is used by Android to put a Runnable into MessageQueue handler by the Looper. This @@ -51,7 +51,7 @@ public class FavouritesStationDetailsUpdater implements Runnable { */ private boolean enabled; - public FavouritesStationDetailsUpdater(Handler _handler, HashMap _station_system_name_to_summary) { + public FavouritesStationDetailsOnListUpdater(Handler _handler, HashMap _station_system_name_to_summary) { handler = _handler; stationsToUpdate = new HashMap<>(); availableParametersDao = new AvailableParametersDao(); @@ -92,7 +92,7 @@ public class FavouritesStationDetailsUpdater implements Runnable { // query web service for station data Summary summary = stationNameSummary.get(stationSystemName); - Logger.debug("[FavouritesStationDetailsUpdater][run][stationSystemName = " + stationSystemName +"][summary.last_timestamp = " + summary.last_timestamp +"]"); + Logger.debug("[FavouritesStationDetailsOnListUpdater][run][stationSystemName = " + stationSystemName +"][summary.last_timestamp = " + summary.last_timestamp +"]"); // query for available parameters AvailableParametersWeb params = availableParametersDao.getAvaliableParamsByStationName(stationSystemName); diff --git a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/StationDetailsValuesOnActivityFromSummaryUpdater.java b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/StationDetailsValuesOnActivityFromSummaryUpdater.java new file mode 100644 index 0000000..e5c0c16 --- /dev/null +++ b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/StationDetailsValuesOnActivityFromSummaryUpdater.java @@ -0,0 +1,45 @@ +package cc.pogoda.mobile.meteosystem.activity.updater; + +import android.os.Handler; + +import org.tinylog.Logger; + +import java.util.HashMap; + +import cc.pogoda.mobile.meteosystem.type.StationActivityElements; +import cc.pogoda.mobile.meteosystem.type.WeatherStation; +import cc.pogoda.mobile.meteosystem.type.web.Summary; + +/** + * This class uses external HashMap updated by @link{{@link FavouritesStationSummaryUpdater}} + */ +public class StationDetailsValuesOnActivityFromSummaryUpdater implements Runnable { + + HashMap mapWithSummary; + + StationActivityElements elementsToUpdate; + + Handler handler; + + WeatherStation stationToUpdate; + + public StationDetailsValuesOnActivityFromSummaryUpdater(StationActivityElements elems, Handler h, WeatherStation station, HashMap _map_with_summary_data) { + stationToUpdate = station; + handler = h; + elementsToUpdate = elems; + mapWithSummary = _map_with_summary_data; + } + + @Override + public void run() { + + if (mapWithSummary != null && elementsToUpdate != null) { + + Logger.info("[StationDetailsValuesOnActivityFromSummaryUpdater][run][stationToUpdate.getSystemName() = " + stationToUpdate.getSystemName() +"]"); + + elementsToUpdate.updateFromSummary(mapWithSummary.get(stationToUpdate.getSystemName()), stationToUpdate.getAvailableParameters()); + + handler.postDelayed(this, 90000); + } + } +} diff --git a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/StationDetailsValuesUpdater.java b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/StationDetailsValuesOnActivityUpdater.java similarity index 77% rename from app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/StationDetailsValuesUpdater.java rename to app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/StationDetailsValuesOnActivityUpdater.java index b566523..dcdc705 100644 --- a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/StationDetailsValuesUpdater.java +++ b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/updater/StationDetailsValuesOnActivityUpdater.java @@ -2,6 +2,8 @@ package cc.pogoda.mobile.meteosystem.activity.updater; import android.os.Handler; +import org.tinylog.Logger; + import cc.pogoda.mobile.meteosystem.dao.SummaryDao; import cc.pogoda.mobile.meteosystem.type.StationActivityElements; import cc.pogoda.mobile.meteosystem.type.WeatherStation; @@ -13,7 +15,7 @@ import cc.pogoda.mobile.meteosystem.type.web.Summary; * Class used to update the content of StationDetailsSummaryActivity and * StationDetailsWindRoseActivity */ -public class StationDetailsValuesUpdater implements Runnable { +public class StationDetailsValuesOnActivityUpdater implements Runnable { StationActivityElements elements = null; @@ -27,7 +29,7 @@ public class StationDetailsValuesUpdater implements Runnable { WeatherStation station; - public StationDetailsValuesUpdater(StationActivityElements elems, Handler h, String station_name, WeatherStation station) { + public StationDetailsValuesOnActivityUpdater(StationActivityElements elems, Handler h, String station_name, WeatherStation station) { elements = elems; handler = h; this.station_name = station_name; @@ -47,6 +49,8 @@ public class StationDetailsValuesUpdater implements Runnable { // get the current data from the Web Service station_summary = dao.getStationSummary(station_name); + Logger.debug("[StationDetailsValuesOnActivityUpdater][run][station_name = " + station_name +"]"); + // null check is done inside this call elements.updateFromSummary(station_summary, station.getAvailableParameters()); diff --git a/app/src/main/java/cc/pogoda/mobile/meteosystem/adapter/WeatherStationRecyclerViewAdapter.java b/app/src/main/java/cc/pogoda/mobile/meteosystem/adapter/WeatherStationRecyclerViewAdapter.java index a01bd43..4e20722 100644 --- a/app/src/main/java/cc/pogoda/mobile/meteosystem/adapter/WeatherStationRecyclerViewAdapter.java +++ b/app/src/main/java/cc/pogoda/mobile/meteosystem/adapter/WeatherStationRecyclerViewAdapter.java @@ -3,6 +3,7 @@ package cc.pogoda.mobile.meteosystem.adapter; import android.content.Context; import android.os.Handler; import android.os.Looper; +import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -18,7 +19,7 @@ import java.util.List; import cc.pogoda.mobile.meteosystem.Main; import cc.pogoda.mobile.meteosystem.R; import cc.pogoda.mobile.meteosystem.activity.handler.AllStationsActRecyclerViewButtonClickEvent; -import cc.pogoda.mobile.meteosystem.activity.updater.FavouritesStationDetailsUpdater; +import cc.pogoda.mobile.meteosystem.activity.updater.FavouritesStationDetailsOnListUpdater; import cc.pogoda.mobile.meteosystem.activity.view.AllStationsActRecyclerViewHolder; import cc.pogoda.mobile.meteosystem.dao.AvailableParametersDao; import cc.pogoda.mobile.meteosystem.dao.SummaryDao; @@ -41,7 +42,7 @@ public class WeatherStationRecyclerViewAdapter extends RecyclerView.Adapter 24) { + textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16.0f); + } + else { + textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20.0f); + } + button.setOnClickListener(new AllStationsActRecyclerViewButtonClickEvent(station, activity, reason)); } @@ -125,7 +133,7 @@ public class WeatherStationRecyclerViewAdapter extends RecyclerView.Adapter + + + + + diff --git a/app/src/main/res/layout/activity_favourites_linear_layout_data.xml b/app/src/main/res/layout/activity_favourites_linear_layout_data.xml index 5dc671f..660177d 100644 --- a/app/src/main/res/layout/activity_favourites_linear_layout_data.xml +++ b/app/src/main/res/layout/activity_favourites_linear_layout_data.xml @@ -24,6 +24,7 @@ android:id="@+id/station_button_fav" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginEnd="16dp" android:paddingLeft="16dp" android:paddingRight="16dp" android:textSize="10sp" diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6083032..bec8c50 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -37,12 +37,16 @@ android:id="@+id/imageButtonFavourites" android:layout_width="176dp" android:layout_height="180dp" - android:backgroundTint="@color/blue" + android:background="@drawable/button_border" + android:baselineAlignBottom="false" + android:cropToPadding="false" + android:foregroundTintMode="screen" android:paddingLeft="100px" android:paddingTop="100px" android:paddingRight="100px" android:paddingBottom="100px" android:scaleType="fitXY" + android:tint="@color/dark_blue" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -59,6 +63,9 @@ android:layout_marginBottom="18dp" android:text="@string/fav_stations" android:textAlignment="center" + android:textAllCaps="true" + android:textColor="@color/dark_blue" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/imageButtonFavourites" app:layout_constraintEnd_toEndOf="@+id/imageButtonFavourites" app:layout_constraintStart_toStartOf="@+id/imageButtonFavourites" @@ -83,7 +90,7 @@ android:id="@+id/imageButtonAllStations" android:layout_width="175dp" android:layout_height="183dp" - android:backgroundTint="@color/blue" + android:background="@drawable/button_border" android:backgroundTintMode="src_in" android:paddingLeft="100px" android:paddingTop="100px" @@ -92,6 +99,7 @@ android:scaleType="fitXY" android:scaleX="1" android:scaleY="1" + android:tint="@color/dark_blue" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -108,6 +116,9 @@ android:layout_marginBottom="18dp" android:text="@string/all_stations" android:textAlignment="center" + android:textAllCaps="true" + android:textColor="@color/dark_blue" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/imageButtonAllStations" app:layout_constraintEnd_toEndOf="@+id/imageButtonAllStations" app:layout_constraintHorizontal_bias="0.526" @@ -133,7 +144,7 @@ android:id="@+id/imageButtonExport" android:layout_width="175dp" android:layout_height="183dp" - android:backgroundTint="@color/blue" + android:background="@drawable/button_border" android:backgroundTintMode="src_in" android:paddingLeft="100px" android:paddingTop="100px" @@ -142,6 +153,7 @@ android:scaleType="fitXY" android:scaleX="1" android:scaleY="1" + android:tint="@color/dark_blue" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -158,6 +170,9 @@ android:layout_marginBottom="18dp" android:text="@string/export_data" android:textAlignment="center" + android:textAllCaps="true" + android:textColor="@color/dark_blue" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/imageButtonExport" app:layout_constraintEnd_toEndOf="@+id/imageButtonExport" app:layout_constraintHorizontal_bias="0.526" @@ -183,12 +198,13 @@ android:id="@+id/imageButtonSettings" android:layout_width="176dp" android:layout_height="180dp" - android:backgroundTint="@color/blue" + android:background="@drawable/button_border" android:paddingLeft="100px" android:paddingTop="100px" android:paddingRight="100px" android:paddingBottom="100px" android:scaleType="fitXY" + android:tint="@color/dark_blue" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -205,6 +221,9 @@ android:layout_marginBottom="18dp" android:text="@string/settings" android:textAlignment="center" + android:textAllCaps="true" + android:textColor="@color/dark_blue" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/imageButtonSettings" app:layout_constraintEnd_toEndOf="@+id/imageButtonSettings" app:layout_constraintStart_toStartOf="@+id/imageButtonSettings" @@ -218,6 +237,7 @@ android:layout_marginTop="32dp" android:fontFamily="@font/alegreya_sans_sc_medium" android:text="@string/credits_1" + android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/constraintLayoutExport" /> @@ -231,6 +251,7 @@ android:fontFamily="@font/alegreya_sans_sc_medium" android:text="@string/credits_2" android:textSize="18sp" + android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/textViewCredits3" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -243,6 +264,7 @@ android:fontFamily="@font/alegreya_sans_sc_medium" android:text="@string/credits_3" android:textSize="18sp" + android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/textViewCredits4" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/activity_station_details.xml b/app/src/main/res/layout/activity_station_details.xml index 2160afa..ea82fa6 100644 --- a/app/src/main/res/layout/activity_station_details.xml +++ b/app/src/main/res/layout/activity_station_details.xml @@ -45,11 +45,15 @@ + android:layout_height="68dp"> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textViewSponsorUrl" /> @@ -111,12 +117,13 @@ android:layout_height="180dp" android:layout_marginTop="4dp" android:layout_marginEnd="16dp" - android:backgroundTint="#56039BE5" + android:background="@drawable/button_border" android:paddingLeft="100px" android:paddingTop="100px" android:paddingRight="100px" android:paddingBottom="100px" android:scaleType="fitXY" + android:tint="@color/dark_blue" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.931" @@ -134,6 +141,9 @@ android:layout_marginEnd="57dp" android:layout_marginBottom="19dp" android:text="@string/wind_rose" + android:textAllCaps="true" + android:textColor="@color/dark_blue" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/imageButtonWindRose" app:layout_constraintEnd_toEndOf="@+id/imageButtonWindRose" app:layout_constraintStart_toStartOf="@+id/imageButtonWindRose" @@ -145,12 +155,13 @@ android:layout_height="180dp" android:layout_marginStart="16dp" android:layout_marginTop="4dp" - android:backgroundTint="#56039BE5" + android:background="@drawable/button_border" android:paddingLeft="100px" android:paddingTop="100px" android:paddingRight="100px" android:paddingBottom="100px" android:scaleType="fitXY" + android:tint="@color/dark_blue" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/imageButtonWindRose" app:layout_constraintHorizontal_bias="0" @@ -169,6 +180,9 @@ android:layout_marginBottom="18dp" android:text="@string/station_summary" android:textAlignment="center" + android:textAllCaps="true" + android:textColor="@color/dark_blue" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/imageButtonFavourites" app:layout_constraintEnd_toEndOf="@+id/imageButtonFavourites" app:layout_constraintStart_toStartOf="@+id/imageButtonFavourites" @@ -180,12 +194,13 @@ android:layout_height="180dp" android:layout_marginStart="16dp" android:layout_marginTop="10dp" - android:backgroundTint="#56039BE5" + android:background="@drawable/button_border" android:paddingLeft="100px" android:paddingTop="100px" android:paddingRight="100px" android:paddingBottom="100px" android:scaleType="fitXY" + android:tint="@color/dark_blue" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/imageButtonPlotsTemperature" app:layout_constraintHorizontal_bias="0" @@ -204,6 +219,9 @@ android:layout_marginBottom="15dp" android:text="@string/title_activity_trend" android:textAlignment="center" + android:textAllCaps="true" + android:textColor="@color/dark_blue" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/imageButtonTrend" app:layout_constraintEnd_toEndOf="@+id/imageButtonTrend" app:layout_constraintStart_toStartOf="@+id/imageButtonTrend" @@ -215,12 +233,13 @@ android:layout_height="180dp" android:layout_marginTop="10dp" android:layout_marginEnd="16dp" - android:backgroundTint="#56039BE5" + android:background="@drawable/button_border" android:paddingLeft="100px" android:paddingTop="100px" android:paddingRight="100px" android:paddingBottom="100px" android:scaleType="fitXY" + android:tint="@color/dark_blue" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.931" @@ -239,6 +258,9 @@ android:layout_marginBottom="15dp" android:text="@string/temperature_plot" android:textAlignment="center" + android:textAllCaps="true" + android:textColor="@color/dark_blue" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/imageButtonPlotsTemperature" app:layout_constraintEnd_toEndOf="@+id/imageButtonPlotsTemperature" app:layout_constraintStart_toStartOf="@+id/imageButtonPlotsTemperature" @@ -250,12 +272,13 @@ android:layout_height="180dp" android:layout_marginTop="10dp" android:layout_marginEnd="16dp" - android:backgroundTint="#56039BE5" + android:background="@drawable/button_border" android:paddingLeft="100px" android:paddingTop="100px" android:paddingRight="100px" android:paddingBottom="100px" android:scaleType="fitXY" + android:tint="@color/dark_blue" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.931" @@ -274,6 +297,9 @@ android:layout_marginBottom="15dp" android:text="@string/humidity_plot" android:textAlignment="center" + android:textAllCaps="true" + android:textColor="@color/dark_blue" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@id/imageButtonPlotsHumidity" app:layout_constraintEnd_toEndOf="@id/imageButtonPlotsHumidity" app:layout_constraintStart_toStartOf="@id/imageButtonPlotsHumidity" @@ -287,12 +313,13 @@ android:layout_marginStart="16dp" android:layout_marginTop="10dp" android:layout_marginEnd="16dp" - android:backgroundTint="#56039BE5" + android:background="@drawable/button_border" android:paddingLeft="100px" android:paddingTop="100px" android:paddingRight="100px" android:paddingBottom="100px" android:scaleType="fitCenter" + android:tint="@color/dark_blue" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0" @@ -311,6 +338,9 @@ android:layout_marginBottom="15dp" android:text="@string/wind_speed_plots" android:textAlignment="center" + android:textAllCaps="true" + android:textColor="@color/dark_blue" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@id/imageButtonPlotsWindSpeed" app:layout_constraintEnd_toEndOf="@id/imageButtonPlotsWindSpeed" app:layout_constraintStart_toStartOf="@id/imageButtonPlotsWindSpeed" @@ -322,12 +352,13 @@ android:layout_height="180dp" android:layout_marginStart="16dp" android:layout_marginTop="10dp" - android:backgroundTint="#56039BE5" + android:background="@drawable/button_border" android:paddingLeft="100px" android:paddingTop="100px" android:paddingRight="100px" android:paddingBottom="100px" android:scaleType="fitXY" + android:tint="@color/dark_blue" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/imageButtonPlotsHumidity" app:layout_constraintHorizontal_bias="0" @@ -346,6 +377,9 @@ android:layout_marginBottom="15dp" android:text="@string/wind_direction_plots" android:textAlignment="center" + android:textAllCaps="true" + android:textColor="@color/dark_blue" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@id/imageButtonPlotsWindDirection" app:layout_constraintEnd_toEndOf="@id/imageButtonPlotsWindDirection" app:layout_constraintStart_toStartOf="@id/imageButtonPlotsWindDirection" diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 18e6d18..d871ed9 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -111,7 +111,7 @@ Vlhkost vzduchu Stanice tento parametr neměří - Klikněte na bod na grafu + Klikněte na graf Seřadit podle abecedy Seřadit podle pořadí přidávání @@ -186,5 +186,6 @@ kn (Uzly) Decimace eskportovaných údajov Minimální krok v minutách + URL pro více informací diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 18e6d18..d871ed9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -111,7 +111,7 @@ Vlhkost vzduchu Stanice tento parametr neměří - Klikněte na bod na grafu + Klikněte na graf Seřadit podle abecedy Seřadit podle pořadí přidávání @@ -186,5 +186,6 @@ kn (Uzly) Decimace eskportovaných údajov Minimální krok v minutách + URL pro více informací diff --git a/app/src/main/res/values-de-rAT/strings.xml b/app/src/main/res/values-de-rAT/strings.xml index 63e1299..9d7d685 100644 --- a/app/src/main/res/values-de-rAT/strings.xml +++ b/app/src/main/res/values-de-rAT/strings.xml @@ -66,7 +66,7 @@ temperatu feichtigkeit Die Station misst keine Parameter - Druck auf den Punkt auf dem Diagramm + "Druck auf der Diagramm " Alphabetisch sortieren Sortiere nach hinzufügen datum lösche nicht existierende Stationen @@ -115,6 +115,7 @@ kn (knoten) Dezimierung exportierten Dateien Minimaler Schritt in Minuten - + URL to more information + diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 63e1299..6194dee 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -66,7 +66,7 @@ temperatu feichtigkeit Die Station misst keine Parameter - Druck auf den Punkt auf dem Diagramm + "Druck auf dem Diagramm " Alphabetisch sortieren Sortiere nach hinzufügen datum lösche nicht existierende Stationen @@ -115,6 +115,7 @@ kn (knoten) Dezimierung exportierten Dateien Minimaler Schritt in Minuten - + URL to more information + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 63e1299..9d7d685 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -66,7 +66,7 @@ temperatu feichtigkeit Die Station misst keine Parameter - Druck auf den Punkt auf dem Diagramm + "Druck auf der Diagramm " Alphabetisch sortieren Sortiere nach hinzufügen datum lösche nicht existierende Stationen @@ -115,6 +115,7 @@ kn (knoten) Dezimierung exportierten Dateien Minimaler Schritt in Minuten - + URL to more information + diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml index 28acae4..66087dc 100644 --- a/app/src/main/res/values-en-rUS/strings.xml +++ b/app/src/main/res/values-en-rUS/strings.xml @@ -65,7 +65,7 @@ Temperature Plot Humidity Plot The station doesn\'t measure this parameter - Click on point on the plot + Click on the plot Sort in alphabetical order Sort in adding order Clear removed stations @@ -113,4 +113,5 @@ kn (knots) Export data decimation Minimum time resolution + URL to more information \ No newline at end of file diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml index 6080f63..00aca2b 100644 --- a/app/src/main/res/values-lv-rLV/strings.xml +++ b/app/src/main/res/values-lv-rLV/strings.xml @@ -113,4 +113,5 @@ kn Export data decimation Minimum time resolution + URL to more information diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 6080f63..00aca2b 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -113,4 +113,5 @@ kn Export data decimation Minimum time resolution + URL to more information diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index 3aa224a..0b6a143 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -65,7 +65,7 @@ Temperatura Wilgotność Stacja nie mierzy tego parametru - Kliknij na punkt na wykresie + Kliknij na wykres Sortuj alfabetycznie Sortuj wg kolejności dodania Usuń nieistniejące stacje @@ -113,4 +113,5 @@ kn (węzły) Decymacja eskportowanych danych Minimalny krok w minutach + Więcej informacji \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 5f5d6e4..154b30b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -65,7 +65,7 @@ Temperatura Wilgotność Stacja nie mierzy tego parametru - Kliknij na punkt na wykresie + Kliknij na wykres Sortuj alfabetycznie Sortuj wg kolejności dodania Usuń nieistniejące stacje @@ -113,4 +113,5 @@ kn (węzły) Decymacja eskportowanych danych Minimalny krok w minutach + Więcej informacji \ No newline at end of file diff --git a/app/src/main/res/values-ru-rBY/strings.xml b/app/src/main/res/values-ru-rBY/strings.xml index 770955d..fee612d 100644 --- a/app/src/main/res/values-ru-rBY/strings.xml +++ b/app/src/main/res/values-ru-rBY/strings.xml @@ -113,4 +113,5 @@ kn (узлы) Децимация экспортируемых данных Минимальный шаг в минутах + URL to more information \ No newline at end of file diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index 770955d..fee612d 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -113,4 +113,5 @@ kn (узлы) Децимация экспортируемых данных Минимальный шаг в минутах + URL to more information \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 770955d..fee612d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -113,4 +113,5 @@ kn (узлы) Децимация экспортируемых данных Минимальный шаг в минутах + URL to more information \ No newline at end of file diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml index c219cd5..1005313 100644 --- a/app/src/main/res/values-uk-rUA/strings.xml +++ b/app/src/main/res/values-uk-rUA/strings.xml @@ -113,4 +113,5 @@ kn (вузли) Децимація експортованих даних Мінімальний крок у хвилинах + URL to more information \ No newline at end of file diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index c219cd5..1005313 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -113,4 +113,5 @@ kn (вузли) Децимація експортованих даних Мінімальний крок у хвилинах + URL to more information \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 898915a..0443187 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -71,7 +71,7 @@ The station doesn\'t measure this parameter m/s kn - Click on point on the plot + Click on the plot Sort in alphabetical order Sort in adding order Clear removed stations @@ -143,4 +143,5 @@ Deutsch Changing language requires app restart after making a choose in this window. + URL to more information \ No newline at end of file