From a05a11988a05cd3bea549330ebabb3868a24f7bd Mon Sep 17 00:00:00 2001
From: Mateusz Lubecki <sp8ebc@interia.pl>
Date: Mon, 29 Nov 2021 11:32:10 +0100
Subject: [PATCH] consumers adjusted to new API design

---
 .../pogoda/mobile/pogodacc/web/LastStationDataConsumer.java | 5 +++--
 .../cc/pogoda/mobile/pogodacc/web/StationDataConsumer.java  | 5 +++--
 .../java/cc/pogoda/mobile/pogodacc/web/SummaryConsumer.java | 5 +++--
 .../java/cc/pogoda/mobile/pogodacc/web/TrendConsumer.java   | 5 +++--
 app/src/main/res/values-en-rUS/strings.xml                  | 4 ++++
 app/src/main/res/values-lv-rLV/strings.xml                  | 4 ++++
 app/src/main/res/values-lv/strings.xml                      | 4 ++++
 app/src/main/res/values-pl-rPL/strings.xml                  | 6 +++++-
 app/src/main/res/values-pl/strings.xml                      | 6 +++++-
 app/src/main/res/values-ru-rBY/strings.xml                  | 4 ++++
 app/src/main/res/values-ru-rRU/strings.xml                  | 4 ++++
 app/src/main/res/values-ru/strings.xml                      | 4 ++++
 app/src/main/res/values-uk-rUA/strings.xml                  | 4 ++++
 app/src/main/res/values-uk/strings.xml                      | 4 ++++
 app/src/main/res/values/strings.xml                         | 4 ++++
 15 files changed, 58 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/values-ru-rBY/strings.xml
 create mode 100644 app/src/main/res/values-ru-rRU/strings.xml
 create mode 100644 app/src/main/res/values-ru/strings.xml
 create mode 100644 app/src/main/res/values-uk-rUA/strings.xml
 create mode 100644 app/src/main/res/values-uk/strings.xml

diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/web/LastStationDataConsumer.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/web/LastStationDataConsumer.java
index 55fb725..2961318 100644
--- a/app/src/main/java/cc/pogoda/mobile/pogodacc/web/LastStationDataConsumer.java
+++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/web/LastStationDataConsumer.java
@@ -3,12 +3,13 @@ package cc.pogoda.mobile.pogodacc.web;
 import cc.pogoda.mobile.pogodacc.type.web.ListOfStationData;
 import retrofit2.Call;
 import retrofit2.http.GET;
+import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 public interface LastStationDataConsumer {
 
-    @GET("meteo_backend/lastStationData/")
-    Call<ListOfStationData> getLastDataForStation(@Query("station")String station,
+    @GET("meteo_backend/station/{stationName}/lastStationData/")
+    Call<ListOfStationData> getLastDataForStation(@Path("stationName")String station,
                                                   @Query("ascendingOrder")boolean ascendingOrder,
                                                   @Query("isLong")boolean isLong);
 }
diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/web/StationDataConsumer.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/web/StationDataConsumer.java
index bf8de7a..90b4ab1 100644
--- a/app/src/main/java/cc/pogoda/mobile/pogodacc/web/StationDataConsumer.java
+++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/web/StationDataConsumer.java
@@ -3,12 +3,13 @@ package cc.pogoda.mobile.pogodacc.web;
 import cc.pogoda.mobile.pogodacc.type.web.ListOfStationData;
 import retrofit2.Call;
 import retrofit2.http.GET;
+import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 public interface StationDataConsumer {
 
-    @GET("meteo_backend/stationData/")
-    Call<ListOfStationData> getDataForStation(@Query("station")String station,
+    @GET("meteo_backend/station/{stationName}/stationData/")
+    Call<ListOfStationData> getDataForStation(@Path("stationName")String station,
                                               @Query("from")long from,
                                               @Query("to")long to);
 }
diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/web/SummaryConsumer.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/web/SummaryConsumer.java
index df5dc9a..7d84fd2 100644
--- a/app/src/main/java/cc/pogoda/mobile/pogodacc/web/SummaryConsumer.java
+++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/web/SummaryConsumer.java
@@ -4,10 +4,11 @@ package cc.pogoda.mobile.pogodacc.web;
 import cc.pogoda.mobile.pogodacc.type.web.Summary;
 import retrofit2.Call;
 import retrofit2.http.GET;
+import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 public interface SummaryConsumer {
 
-    @GET("meteo_backend/summary/")
-    Call<Summary> getSummaryForStation(@Query("station")String station);
+    @GET("meteo_backend/station/{stationName}/summary/")
+    Call<Summary> getSummaryForStation(@Path("stationName")String station);
 }
diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/web/TrendConsumer.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/web/TrendConsumer.java
index 28a1a05..ec17846 100644
--- a/app/src/main/java/cc/pogoda/mobile/pogodacc/web/TrendConsumer.java
+++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/web/TrendConsumer.java
@@ -3,10 +3,11 @@ package cc.pogoda.mobile.pogodacc.web;
 import cc.pogoda.mobile.pogodacc.type.web.Trend;
 import retrofit2.Call;
 import retrofit2.http.GET;
+import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 public interface TrendConsumer {
 
-    @GET("meteo_backend/trend/")
-    Call<Trend> getTrendForStation(@Query("station")String station);
+    @GET("meteo_backend/station/{stationName}/trend/")
+    Call<Trend> getTrendForStation(@Path("stationName")String station);
 }
diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml
index 70f6f71..e3857fa 100644
--- a/app/src/main/res/values-en-rUS/strings.xml
+++ b/app/src/main/res/values-en-rUS/strings.xml
@@ -109,4 +109,8 @@
     <string name="callsign">APRS callsign</string>
     <string name="select_output_file">Select output file</string>
     <string name="success">Operation successed</string>
+    <string name="failure">Operation failed</string>
+    <string name="knots_long">kn (knots)</string>
+    <string name="export_decimation">Export data decimation</string>
+    <string name="export_decimation_minutes">Minimum time resolution</string>
 </resources>
\ 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 2966d11..3c20180 100644
--- a/app/src/main/res/values-lv-rLV/strings.xml
+++ b/app/src/main/res/values-lv-rLV/strings.xml
@@ -109,4 +109,8 @@
     <string name="callsign">APRS izsaukuma signāls</string>
     <string name="select_output_file">Atlasīt izejas fails</string>
     <string name="success">"Operācija izdevusies "</string>
+    <string name="failure">-</string>
+    <string name="knots_long">kn</string>
+    <string name="export_decimation">Export data decimation</string>
+    <string name="export_decimation_minutes">Minimum time resolution</string>
 </resources>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 2966d11..3c20180 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -109,4 +109,8 @@
     <string name="callsign">APRS izsaukuma signāls</string>
     <string name="select_output_file">Atlasīt izejas fails</string>
     <string name="success">"Operācija izdevusies "</string>
+    <string name="failure">-</string>
+    <string name="knots_long">kn</string>
+    <string name="export_decimation">Export data decimation</string>
+    <string name="export_decimation_minutes">Minimum time resolution</string>
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 483f441..a067642 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -80,7 +80,7 @@
     <string name="h8_value">Osiem godzin temu</string>
     <string name="no_comm_with_backend">Brak komunikacji z serwerem</string>
     <string name="no_stations_in_fav_1">Brak stacji na Twojej liście ulubionych</string>
-    <string name="no_stations_in_fav_2">Proszę użyć menu w oknie szczegułów stacji aby coś tu dodać</string>
+    <string name="no_stations_in_fav_2">Proszę użyć menu w oknie szczegółów stacji aby coś tu dodać</string>
     <string name="fav_added_success">Stacja została dodana do ulubionych</string>
     <string name="fav_deleted_success">Stacja została usunięta z ulubionych</string>
     <string name="settings">Ustawienia</string>
@@ -109,4 +109,8 @@
     <string name="callsign">Znak wywoławczy w APRS</string>
     <string name="select_output_file">Wybierz plik wyjściowy</string>
     <string name="success">Zakończono z powodzeniem</string>
+    <string name="failure">Wystąpił błąd</string>
+    <string name="knots_long">kn (węzły)</string>
+    <string name="export_decimation">Decymacja eskportowanych danych</string>
+    <string name="export_decimation_minutes">Minimalny krok w minutach</string>
 </resources>
\ 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 d9d07bc..f466fe2 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -80,7 +80,7 @@
     <string name="h8_value">Osiem godzin temu</string>
     <string name="no_comm_with_backend">Brak komunikacji z serwerem</string>
     <string name="no_stations_in_fav_1">Brak stacji na Twojej liście ulubionych</string>
-    <string name="no_stations_in_fav_2">Proszę użyć menu w oknie szczegułów stacji aby coś tu dodać</string>
+    <string name="no_stations_in_fav_2">Proszę użyć menu w oknie szczegółów stacji aby coś tu dodać</string>
     <string name="fav_added_success">Stacja została dodana do ulubionych</string>
     <string name="fav_deleted_success">Stacja została usunięta z ulubionych</string>
     <string name="settings">Ustawienia</string>
@@ -109,4 +109,8 @@
     <string name="callsign">Znak wywoławczy w APRS</string>
     <string name="select_output_file">Wybierz plik wyjściowy</string>
     <string name="success">Zakończono z powodzeniem</string>
+    <string name="failure">Wystąpił błąd</string>
+    <string name="knots_long">kn (węzły)</string>
+    <string name="export_decimation">Decymacja eskportowanych danych</string>
+    <string name="export_decimation_minutes">Minimalny krok w minutach</string>
 </resources>
\ 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
new file mode 100644
index 0000000..526f445
--- /dev/null
+++ b/app/src/main/res/values-ru-rBY/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Pogoda.cc</string>
+</resources>
\ 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
new file mode 100644
index 0000000..526f445
--- /dev/null
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Pogoda.cc</string>
+</resources>
\ 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
new file mode 100644
index 0000000..526f445
--- /dev/null
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Pogoda.cc</string>
+</resources>
\ 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
new file mode 100644
index 0000000..526f445
--- /dev/null
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Pogoda.cc</string>
+</resources>
\ 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
new file mode 100644
index 0000000..526f445
--- /dev/null
+++ b/app/src/main/res/values-uk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Pogoda.cc</string>
+</resources>
\ 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 783f91e..6a07b27 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -128,4 +128,8 @@
     </string-array>
     <string name="select_output_file">Select output file</string>
     <string name="success">Operation successed</string>
+    <string name="failure">Operation failed</string>
+    <string name="knots_long">kn (knots)</string>
+    <string name="export_decimation">Export data decimation</string>
+    <string name="export_decimation_minutes">Minimum time resolution</string>
 </resources>
\ No newline at end of file