From ed675f0233616f964a9e59aceda51e66a8a6271b Mon Sep 17 00:00:00 2001
From: Mateusz Lubecki <sp8ebc@interia.pl>
Date: Fri, 7 Jan 2022 09:20:48 +0100
Subject: [PATCH] changes to ux according to google play review

---
 .idea/deploymentTargetDropDown.xml            | 17 -----------------
 .../meteosystem/activity/MainActivity.java    |  4 ++--
 .../WeatherStationRecyclerViewAdapter.java    |  9 ++++++++-
 .../web/StationBackgroundDownloader.java      | 12 +++++++++++-
 .../main/res/layout/activity_export_data.xml  | 19 +++++++++++--------
 ...activity_favourites_linear_layout_data.xml |  8 ++++----
 app/src/main/res/layout/activity_settings.xml | 10 +++++-----
 .../main/res/layout/fragment_temperature.xml  |  8 ++++++--
 app/src/main/res/layout/fragment_wind.xml     |  8 ++++++--
 app/src/main/res/values/themes.xml            |  2 +-
 10 files changed, 54 insertions(+), 43 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 6bec355..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_4_XL_API_28.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-12-10T12:55:19.222514Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/MainActivity.java b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/MainActivity.java
index 2c28f9f..17471b9 100644
--- a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/MainActivity.java
+++ b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/MainActivity.java
@@ -182,7 +182,7 @@ public class MainActivity extends AppCompatActivity {
                 builder.setMessage("ENG: Mateusz Lubecki\r\n" +
                         "CZE: Sylwiusz Pachel\r\n" +
                         "GER: Jakub Fiałek\r\n" +
-                        "LAT: Andris Stikáns\r\n" +
+                        "LAT: Andris Stikāns\r\n" +
                         "UKR, RUS: Влад Поливач \r\n(Wład Polywacz)\r\n\r\nProgram Icon: Bartosz Kaszubowski");
                 builder.setPositiveButton(R.string.ok, (DialogInterface var1, int var2) -> {
                     var1.dismiss();
@@ -197,7 +197,7 @@ public class MainActivity extends AppCompatActivity {
                 Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
                 intent.addCategory(Intent.CATEGORY_OPENABLE);
                 intent.setType("text/plain");
-                intent.putExtra(Intent.EXTRA_TITLE, LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE) + ".log");
+                intent.putExtra(Intent.EXTRA_TITLE, "meteosystem_" +LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE) + ".log");
 
                 startActivityForResult(intent, 123);
 
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 b4c0b8b..bc989fb 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
@@ -103,7 +103,14 @@ public class WeatherStationRecyclerViewAdapter extends RecyclerView.Adapter<AllS
 
             if (!reason.equals(ParceableFavsCallReason.Reason.FAVOURITES)) {
                 if (station.getDisplayedName().length() > 22) {
-                    textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18.0f);
+                    textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20.0f);
+                } else {
+                    textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 22.0f);
+                }
+            }
+            else {
+                if (station.getDisplayedName().length() > 22) {
+                    textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20.0f);
                 } else {
                     textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 22.0f);
                 }
diff --git a/app/src/main/java/cc/pogoda/mobile/meteosystem/web/StationBackgroundDownloader.java b/app/src/main/java/cc/pogoda/mobile/meteosystem/web/StationBackgroundDownloader.java
index a1f4a59..99ef123 100644
--- a/app/src/main/java/cc/pogoda/mobile/meteosystem/web/StationBackgroundDownloader.java
+++ b/app/src/main/java/cc/pogoda/mobile/meteosystem/web/StationBackgroundDownloader.java
@@ -3,8 +3,11 @@ package cc.pogoda.mobile.meteosystem.web;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 
+import org.tinylog.Logger;
+
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 
 import cc.pogoda.mobile.meteosystem.type.WeatherStation;
 
@@ -28,10 +31,17 @@ public class StationBackgroundDownloader implements Runnable {
     public void run() {
         InputStream in = null;
         try {
-            in = new java.net.URL(station.getImageUrl()).openStream();
+            URL url = new java.net.URL(station.getImageUrl());
+
+            Logger.debug("[StationBackgroundDownloader][run][url = " + url.toString() +"]");
+
+            in = url.openStream();
             bitmap = BitmapFactory.decodeStream(in);
 
+            in.close();
+
         } catch (IOException e) {
+            Logger.error("[StationBackgroundDownloader][run][IOException][e = " + e.getLocalizedMessage() +"]");
             e.printStackTrace();
             bitmap = null;
         }
diff --git a/app/src/main/res/layout/activity_export_data.xml b/app/src/main/res/layout/activity_export_data.xml
index 1619ed5..39c1c87 100644
--- a/app/src/main/res/layout/activity_export_data.xml
+++ b/app/src/main/res/layout/activity_export_data.xml
@@ -23,9 +23,10 @@
             <Button
                 android:id="@+id/buttonExportTarget"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="50dp"
                 android:layout_marginTop="6dp"
                 android:text="@string/output_fn"
+                android:textSize="16sp"
                 app:iconTint="#56039BE5"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -47,7 +48,7 @@
             <Spinner
                 android:id="@+id/spinnerOutputFormat"
                 android:layout_width="247dp"
-                android:layout_height="29dp"
+                android:layout_height="50dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/textView" />
@@ -66,8 +67,9 @@
             <Button
                 android:id="@+id/buttonExportStart"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="50dp"
                 android:text="@string/start_export"
+                android:textSize="16sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/buttonExportTarget" />
@@ -110,8 +112,8 @@
 
             <EditText
                 android:id="@+id/editTextNumberExport"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="250dp"
+                android:layout_height="50dp"
                 android:layout_marginTop="10dp"
                 android:ems="10"
                 android:inputType="number"
@@ -133,11 +135,12 @@
             <Button
                 android:id="@+id/buttonSelectStationExport"
                 android:layout_width="0dp"
-                android:layout_height="47dp"
-                android:layout_marginStart="32dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="16dp"
                 android:layout_marginTop="32dp"
-                android:layout_marginEnd="32dp"
+                android:layout_marginEnd="16dp"
                 android:text="@string/select_station_export"
+                android:textSize="16sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
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 9044f5a..037cceb 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
@@ -10,11 +10,11 @@
         android:id="@+id/station_name_fav"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="24dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
-        android:textSize="24sp"
+        android:textSize="22sp"
         app:layout_constraintBottom_toBottomOf="@+id/station_button_fav"
         app:layout_constraintEnd_toStartOf="@+id/station_button_fav"
         app:layout_constraintStart_toStartOf="parent"
@@ -24,7 +24,7 @@
         android:id="@+id/station_button_fav"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="8dp"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
         android:textSize="14sp"
@@ -37,7 +37,7 @@
         android:id="@+id/station_data_fav"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         android:textSize="14sp"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 9cba447..3aae608 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -9,7 +9,7 @@
     <Switch
         android:id="@+id/switchKnots"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:layout_marginStart="32dp"
         android:layout_marginTop="16dp"
         android:minWidth="48dp"
@@ -35,7 +35,7 @@
     <TextView
         android:id="@+id/textViewSettingsWindspeedUnitDisp"
         android:layout_width="118dp"
-        android:layout_height="48dp"
+        android:layout_height="50dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="16dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
@@ -62,7 +62,7 @@
     <Spinner
         android:id="@+id/spinnerSettingsLanguage"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:layout_marginStart="32dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
@@ -87,7 +87,7 @@
     <TextView
         android:id="@+id/textViewSettingsLabelDecimationTimeStep"
         android:layout_width="wrap_content"
-        android:layout_height="41dp"
+        android:layout_height="50dp"
         android:layout_marginStart="32dp"
         android:layout_marginTop="16dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
@@ -102,7 +102,7 @@
     <EditText
         android:id="@+id/editTextNumberSettingsMinTimeRes"
         android:layout_width="93dp"
-        android:layout_height="41dp"
+        android:layout_height="50dp"
         android:layout_marginTop="16dp"
         android:ems="10"
         android:inputType="number"
diff --git a/app/src/main/res/layout/fragment_temperature.xml b/app/src/main/res/layout/fragment_temperature.xml
index 0cf2565..f765372 100644
--- a/app/src/main/res/layout/fragment_temperature.xml
+++ b/app/src/main/res/layout/fragment_temperature.xml
@@ -26,7 +26,7 @@
         android:layout_marginTop="8dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
         android:text="@string/last_data_timestamp"
-        android:textSize="18sp"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewTemperatureTrendStationName" />
 
@@ -53,7 +53,7 @@
         android:layout_marginTop="8dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
         android:text="@string/current_value"
-        android:textSize="18sp"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewTemperatureTrendLastTimestampValue" />
 
@@ -93,6 +93,7 @@
         android:layout_marginTop="16dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
         android:text="@string/h2_value"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewTemperatureTrendCurrentTValue" />
 
@@ -130,6 +131,7 @@
         android:layout_marginTop="8dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
         android:text="@string/h4_value"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewTemperatureTrendTwoHoursTValue" />
 
@@ -167,6 +169,7 @@
         android:layout_marginTop="8dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
         android:text="@string/h6_value"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewTemperatureTrendFourHoursTValue" />
 
@@ -204,6 +207,7 @@
         android:layout_marginTop="8dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
         android:text="@string/h8_value"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewTemperatureTrendSixHoursTValue" />
 
diff --git a/app/src/main/res/layout/fragment_wind.xml b/app/src/main/res/layout/fragment_wind.xml
index 87fe03f..063ca0e 100644
--- a/app/src/main/res/layout/fragment_wind.xml
+++ b/app/src/main/res/layout/fragment_wind.xml
@@ -26,7 +26,7 @@
         android:layout_marginTop="8dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
         android:text="@string/last_data_timestamp"
-        android:textSize="18sp"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewTemperatureTrendStationName" />
 
@@ -53,7 +53,7 @@
         android:layout_marginTop="8dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
         android:text="@string/current_value"
-        android:textSize="18sp"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewTemperatureTrendLastTimestampValue" />
 
@@ -93,6 +93,7 @@
         android:layout_marginTop="16dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
         android:text="@string/h2_value"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewTemperatureTrendCurrentTValue" />
 
@@ -130,6 +131,7 @@
         android:layout_marginTop="8dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
         android:text="@string/h4_value"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewTemperatureTrendTwoHoursTValue" />
 
@@ -167,6 +169,7 @@
         android:layout_marginTop="8dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
         android:text="@string/h6_value"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewTemperatureTrendFourHoursTValue" />
 
@@ -204,6 +207,7 @@
         android:layout_marginTop="8dp"
         android:fontFamily="@font/alegreya_sans_sc_medium"
         android:text="@string/h8_value"
+        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewTemperatureTrendSixHoursTValue" />
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a05a500..708d36d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,7 +6,7 @@
         <item name="colorPrimaryVariant">@color/blue</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondary">@color/dark_blue</item>
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->