mirror
/
MeteoSystem
kopia lustrzana https://github.com/SP8EBC/MeteoSystem
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

changes to ux according to google play review

fix/get-all-stations-hangout
Mateusz Lubecki 2022-01-07 09:20:48 +01:00
rodzic a40fb19282
commit ed675f0233
10 zmienionych plików z 54 dodań i 43 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

17
.idea/deploymentTargetDropDown.xml
Wyświetl plik

@ -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>

4
app/src/main/java/cc/pogoda/mobile/meteosystem/activity/MainActivity.java
Wyświetl plik

@ -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);

9
app/src/main/java/cc/pogoda/mobile/meteosystem/adapter/WeatherStationRecyclerViewAdapter.java
Wyświetl plik

@ -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);
}

12
app/src/main/java/cc/pogoda/mobile/meteosystem/web/StationBackgroundDownloader.java
Wyświetl plik

@ -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;
}

19
app/src/main/res/layout/activity_export_data.xml
Wyświetl plik

@ -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" />

8
app/src/main/res/layout/activity_favourites_linear_layout_data.xml
Wyświetl plik

@ -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"

10
app/src/main/res/layout/activity_settings.xml
Wyświetl plik

@ -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"

8
app/src/main/res/layout/fragment_temperature.xml
Wyświetl plik

@ -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" />

8
app/src/main/res/layout/fragment_wind.xml
Wyświetl plik

@ -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" />

2
app/src/main/res/values/themes.xml
Wyświetl plik

@ -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. -->