From 38dc2457bb207172e8e7e349e55a7c5b34ba8f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pekka=20Ker=C3=A4nen?= Date: Fri, 13 Dec 2024 09:49:39 +0200 Subject: [PATCH] issue-714: Added accessibility labels to weather symbols and removed unused resources --- .../fmi/mobileweather/BaseWidgetProvider.java | 13 +++- .../LargeForecastWidgetProvider.java | 3 +- .../MaxForecastWidgetProvider.java | 6 +- .../src/main/res/drawable-mdpi/fmi_logo.png | Bin 2250 -> 0 bytes .../app/src/main/res/drawable-xhdpi/basic.png | Bin 934 -> 0 bytes .../src/main/res/drawable-xhdpi/easter.png | Bin 1180 -> 0 bytes .../src/main/res/drawable-xhdpi/halloween.png | Bin 1924 -> 0 bytes .../app/src/main/res/drawable-xhdpi/hot.png | Bin 1276 -> 0 bytes .../res/drawable-xhdpi/itsenaisyyspaiva.png | Bin 1226 -> 0 bytes .../src/main/res/drawable-xhdpi/juhannus.png | Bin 1231 -> 0 bytes .../main/res/drawable-xhdpi/naistenpaiva.png | Bin 1632 -> 0 bytes .../src/main/res/drawable-xhdpi/newyear.png | Bin 1647 -> 0 bytes .../src/main/res/drawable-xhdpi/raining.png | Bin 1350 -> 0 bytes .../src/main/res/drawable-xhdpi/valentine.png | Bin 1234 -> 0 bytes .../app/src/main/res/drawable-xhdpi/vappu.png | Bin 1574 -> 0 bytes .../app/src/main/res/drawable-xhdpi/windy.png | Bin 969 -> 0 bytes .../src/main/res/drawable-xhdpi/winter.png | Bin 1079 -> 0 bytes .../app/src/main/res/drawable-xhdpi/xmas.png | Bin 1718 -> 0 bytes .../app/src/main/res/drawable/whitelogo.png | Bin 6508 -> 0 bytes .../layout/large_forecast_widget_layout.xml | 7 +- .../res/layout/max_forecast_widget_layout.xml | 8 +-- .../layout/small_forecast_widget_layout.xml | 2 +- .../app/src/main/res/layout/weathercell.xml | 30 --------- .../src/main/res/layout/weathercellsmall.xml | 35 ---------- android/app/src/main/res/layout/widgetng.xml | 60 ------------------ .../app/src/main/res/values-en/strings.xml | 45 +++++++++++++ .../app/src/main/res/values-fi/strings.xml | 45 +++++++++++++ .../app/src/main/res/values-sv/strings.xml | 45 +++++++++++++ android/app/src/main/res/values/strings.xml | 46 +++++++++++++- 29 files changed, 202 insertions(+), 143 deletions(-) delete mode 100644 android/app/src/main/res/drawable-mdpi/fmi_logo.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/basic.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/easter.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/halloween.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/hot.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/itsenaisyyspaiva.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/juhannus.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/naistenpaiva.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/newyear.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/raining.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/valentine.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/vappu.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/windy.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/winter.png delete mode 100644 android/app/src/main/res/drawable-xhdpi/xmas.png delete mode 100644 android/app/src/main/res/drawable/whitelogo.png delete mode 100644 android/app/src/main/res/layout/weathercell.xml delete mode 100644 android/app/src/main/res/layout/weathercellsmall.xml delete mode 100644 android/app/src/main/res/layout/widgetng.xml diff --git a/android/app/src/main/java/fi/fmi/mobileweather/BaseWidgetProvider.java b/android/app/src/main/java/fi/fmi/mobileweather/BaseWidgetProvider.java index 67580f97..70c51829 100644 --- a/android/app/src/main/java/fi/fmi/mobileweather/BaseWidgetProvider.java +++ b/android/app/src/main/java/fi/fmi/mobileweather/BaseWidgetProvider.java @@ -406,9 +406,10 @@ protected void setWidgetData(JSONArray announcementsJson, SharedPreferencesHelpe // ** set the weather icon - String weatherSymbol = first.getString("smartSymbol"); + int weatherSymbol = first.getInt("smartSymbol"); int drawableResId = context.getResources().getIdentifier("s_" + weatherSymbol + (theme.equals(LIGHT) ? "_light" : "_dark"), "drawable", context.getPackageName()); widgetRemoteViews.setImageViewResource(R.id.weatherIconImageView, drawableResId); + widgetRemoteViews.setContentDescription(R.id.weatherIconImageView, getSymbolTranslation(weatherSymbol)); // Update time TODO: should be hidden for release widgetRemoteViews.setTextViewText(R.id.updateTimeTextView, DateFormat.getTimeInstance().format(new Date())); @@ -838,4 +839,14 @@ protected int getFirstFutureTimeIndex(JSONArray data) throws JSONException { // if no future time found return -1; } + + protected String getSymbolTranslation(int symbol) { + // > 100 is night version, but we can use day symbol translation + int symbolId = context.getResources().getIdentifier( + symbol > 100 ? "s_"+(symbol-100) : "s_"+symbol, + "string", + context.getPackageName() + ); + return context.getString(symbolId); + } } \ No newline at end of file diff --git a/android/app/src/main/java/fi/fmi/mobileweather/LargeForecastWidgetProvider.java b/android/app/src/main/java/fi/fmi/mobileweather/LargeForecastWidgetProvider.java index aab119bf..e6768bd8 100644 --- a/android/app/src/main/java/fi/fmi/mobileweather/LargeForecastWidgetProvider.java +++ b/android/app/src/main/java/fi/fmi/mobileweather/LargeForecastWidgetProvider.java @@ -69,7 +69,7 @@ protected void setWidgetData(JSONArray announcementsJson, SharedPreferencesHelpe // time at the selected location String localTime = forecast.getString("localtime"); String temperature = forecast.getString("temperature"); - String weatherSymbol = forecast.getString("smartSymbol"); + int weatherSymbol = forecast.getInt("smartSymbol"); // get timeTextView0 or timeTextView1 etc. based on i from widgetRemoteViews int timeTextViewId = context.getResources().getIdentifier("timeTextView" + i, "id", context.getPackageName()); @@ -86,6 +86,7 @@ protected void setWidgetData(JSONArray announcementsJson, SharedPreferencesHelpe int drawableResId = context.getResources().getIdentifier("s_" + weatherSymbol + (theme.equals(LIGHT) ? "_light" : "_dark"), "drawable", context.getPackageName()); widgetRemoteViews.setImageViewResource(weatherIconImageViewId, drawableResId); + widgetRemoteViews.setContentDescription(weatherIconImageViewId, getSymbolTranslation(weatherSymbol)); } // Update time TODO: should be hidden for release diff --git a/android/app/src/main/java/fi/fmi/mobileweather/MaxForecastWidgetProvider.java b/android/app/src/main/java/fi/fmi/mobileweather/MaxForecastWidgetProvider.java index 68b703a9..1a808bc6 100644 --- a/android/app/src/main/java/fi/fmi/mobileweather/MaxForecastWidgetProvider.java +++ b/android/app/src/main/java/fi/fmi/mobileweather/MaxForecastWidgetProvider.java @@ -78,12 +78,13 @@ protected void setWidgetData(JSONArray announcementsJson, SharedPreferencesHelpe widgetRemoteViews.setTextViewText(R.id.timeTextView, formattedTime); String temperature = forecast.getString("temperature"); - String weatherSymbol = forecast.getString("smartSymbol"); + int weatherSymbol = forecast.getInt("smartSymbol"); widgetRemoteViews.setTextViewText(R.id.temperatureTextView, addPlusIfNeeded(temperature) + "°"); int drawableResId = context.getResources().getIdentifier("s_" + weatherSymbol + (theme.equals(LIGHT) ? "_light" : "_dark"), "drawable", context.getPackageName()); widgetRemoteViews.setImageViewResource(R.id.weatherIconImageView, drawableResId); + widgetRemoteViews.setContentDescription(R.id.weatherIconImageView, getSymbolTranslation(weatherSymbol)); // next iteration in loop continue; @@ -92,7 +93,7 @@ protected void setWidgetData(JSONArray announcementsJson, SharedPreferencesHelpe // time at the selected location String localTime = forecast.getString("localtime"); String temperature = forecast.getString("temperature"); - String weatherSymbol = forecast.getString("smartSymbol"); + int weatherSymbol = forecast.getInt("smartSymbol"); // j = weather row layout index int j = i - 1; @@ -112,6 +113,7 @@ protected void setWidgetData(JSONArray announcementsJson, SharedPreferencesHelpe int drawableResId = context.getResources().getIdentifier("s_" + weatherSymbol + (theme.equals(LIGHT) ? "_light" : "_dark"), "drawable", context.getPackageName()); widgetRemoteViews.setImageViewResource(weatherIconImageViewId, drawableResId); + widgetRemoteViews.setContentDescription(weatherIconImageViewId, getSymbolTranslation(weatherSymbol)); } // Get the current time diff --git a/android/app/src/main/res/drawable-mdpi/fmi_logo.png b/android/app/src/main/res/drawable-mdpi/fmi_logo.png deleted file mode 100644 index e31dac2e7a9d9eaafb9738c9e710d3305ee939b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2250 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 IM6N<$f_X2wHvj+t diff --git a/android/app/src/main/res/drawable-xhdpi/easter.png b/android/app/src/main/res/drawable-xhdpi/easter.png deleted file mode 100644 index b2cbadf002346067f8b0e2bdae6fd954ef7833ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1180 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 KMNUMnLSTZ9pO^0d diff --git a/android/app/src/main/res/drawable-xhdpi/hot.png b/android/app/src/main/res/drawable-xhdpi/hot.png deleted file mode 100644 index 81dfdb3dd03e7b43a8853c652585eb356d9e2d0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1276 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 diff --git a/android/app/src/main/res/drawable-xhdpi/naistenpaiva.png b/android/app/src/main/res/drawable-xhdpi/naistenpaiva.png deleted file mode 100644 index ea296a8f194727da59a97fd7212044b5570d335f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1632 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 diff --git a/android/app/src/main/res/drawable-xhdpi/winter.png b/android/app/src/main/res/drawable-xhdpi/winter.png deleted file mode 100644 index a6bac967f67fc7ede4d6da60357e735392d803c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1079 zcmV-71jze|P);zkBYB=lz;_XQV=*P$(1%g+ifFC=?3W0Tu&$fiHns!kO)5>;>*?doCA%G2m>3 zv|)S;jI}*qR_Lz0a~b5#aTZwYInzC!%_O}kXzU#;)5O@KY?mtB4>Q&LZpJ`xcu3p)eIxr<^ zJXd~0rp)Y-9KksSx~;f68(MPMXFU?fFgBt>8(MPMXFU?fFg zBt>8(IR#E<%x=n5uHc*k_h>XEPRaR$ra}YUK05#oO8Q;WRY^0FuJj&XHM5S_>qw2K zz?+g5Rs5@?o=A12&h-8LYv1D;NmtD5FP9fw6HkGENP0Ly)OFn!I!yG>W_Bq-uh9Yc zI^!)JgBN>c{TDB_^D&B&%GLX?gJl?^oyjWnOmJVv-O#K%;UBK&1_cE z5rUT0Os3d2YxLPsGiuUf?qmSla|;9(0T*gUZTFfz8Niv$0{7I6IpZ~R zQh=?w1Om%|-)hEe^_)8?!0Ai^->VsM+H>CI09#TE1Re$ct{JiLuTFqdi3OghS$-<_ zY}wz90Uk=6_q3#4HJ|=|%HHk(+knfVt8Z`x0tS51p!_nhxvlx50A2xZ#>lG>xH}-? zAKa^TMd zaUG!U0mv6%GjOBfKqu+`hQb&yQT2pg_D3PLL%0rXY}?lz084-$nwaY`-j}g*$aB_G zeK4w1JB&*}k}rOzIuAT7X?3Eks_d$JYGQay(xJqeVE~&5-|tNTQNel12wl0%q_H0Z*)Fw>#o8Svoo+Ld3JQouXyAOOPvVIhJH>Nmv69!hR zdzXRh-3=K)(&J|KV@Pq#3VdDh@+Q>%U4?N;P2YNosqM!k`Clso7XyxbgT$Q6#ncXR zG1NoQ3ItY3S`*rI1X%+F{i;XkCj5M0-5?*+JC~F6iDPXQK}X}zGyEq5>jv4W@NW^t x)K;-U($S_xp)2r-z`9XpZAeiOc$=V^ZUG3oyD&Rkp!)y-002ovPDHLkV1nok_)7o) diff --git a/android/app/src/main/res/drawable-xhdpi/xmas.png b/android/app/src/main/res/drawable-xhdpi/xmas.png deleted file mode 100644 index eadf065916fe28626fa885406882cbc11ca4f385..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1718 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 SoYnRK0000 - - - - - - - - diff --git a/android/app/src/main/res/layout/weathercellsmall.xml b/android/app/src/main/res/layout/weathercellsmall.xml deleted file mode 100644 index 8f20e6ef..00000000 --- a/android/app/src/main/res/layout/weathercellsmall.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - diff --git a/android/app/src/main/res/layout/widgetng.xml b/android/app/src/main/res/layout/widgetng.xml deleted file mode 100644 index fd0fb872..00000000 --- a/android/app/src/main/res/layout/widgetng.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/android/app/src/main/res/values-en/strings.xml b/android/app/src/main/res/values-en/strings.xml index 45b7c89a..689f4a71 100644 --- a/android/app/src/main/res/values-en/strings.xml +++ b/android/app/src/main/res/values-en/strings.xml @@ -65,4 +65,49 @@ Please add your favorite places in the Weather app, if you want to use widget without location services. Add more favorite locations Please allow the Weather app background location service (Allow all the time) use your current location to show weather near you. + Clear + Mostly clear + Partly cloudy + Mostly cloudy + Overcast + Fog + Drizzle + Freezing drizzle + Freezing rain + Isolated showers + Scattered showers + Showers + Partly cloudy and periods of light rain + Partly cloudy and periods of moderate rain + Partly cloudy and periods of heavy rain + Mostly cloudy and periods of light rain + Mostly cloudy and periods of moderate rain + Mostly cloudy and periods of heavy rain + Light rain + Moderate rain + Heavy rain + Isolated light sleet showers + Isolated moderate sleet showers + Isolated heavy sleet showers + Scattered light sleet showers + Scattered moderate sleet showers + Scattered heavy sleet showers + Light sleet + Moderate sleet + Heavy sleet + Isolated light snow showers + Isolated moderate snow showers + Isolated heavy snow showers + Scattered light snow showers + Scattered moderate snow showers + Scattered heavy snow showers + Light snowfall + Moderate snowfall + Heavy snowfall + Isolated hail showers + Scattered hail showers + Hail showers + Isolated thundershowers + Scattered thundershowers + Thundershowers diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml index 4f361363..7f060c8f 100644 --- a/android/app/src/main/res/values-fi/strings.xml +++ b/android/app/src/main/res/values-fi/strings.xml @@ -65,4 +65,49 @@ Lisää suosikkipaikkasi Sää-sovelluksessa, jos haluat käyttää widgettiä ilman sijaintipalveluita. Lisää suosikkipaikkoja Salli taustasijaintipalvelu (Salli aina), jotta widget voi käyttää nykyistä sijaintiasi säätietojen näyttämiseen. + Selkeää + Enimmäkseen selkeää + Puolipilvistä + Enimmäkseen pilvistä + Pilvistä + Sumua + Tihkusadetta + Jäätävää tihkua + Jäätävää sadetta + Yksittäisiä sadekuuroja + Paikoin sadekuuroja + Sadekuuroja + Puolipilvistä ja ajoittain heikkoa vesisadetta + Puolipilvistä ja ajoittain kohtalaista vesisadetta + Puolipilvistä ja ajoittain voimakasta vesisadetta + Enimmäkseen pilvistä ja ajoittain heikkoa vesisadetta + Enimmäkseen pilvistä ja ajoittain kohtalaista vesisadetta + Enimmäkseen pilvistä ja ajoittain voimakasta vesisadetta + Heikkoa vesisadetta + Kohtalaista vesisadetta + Voimakasta vesisadetta + Puolipilvistä ja ajoittain heikkoa räntäsadetta tai räntäkuuroja + Puolipilvistä ja ajoittain kohtalaista räntäsadetta tai räntäkuuroja + Puolipilvistä ja ajoittain voimakasta räntäsadetta tai räntäkuuroja + Enimmäkseen pilvistä ja ajoittain heikkoa räntäsadetta tai räntäkuuroja + Enimmäkseen pilvistä ja ajoittain kohtalaista räntäsadetta tai räntäkuuroja + Enimmäkseen pilvistä ja ajoittain voimakasta räntäsadetta tai räntäkuuroja + Heikkoa räntäsadetta + Kohtalaista räntäsadetta + Voimakasta räntäsadetta + Puolipilvistä ja ajoittain heikkoa lumisadetta tai lumikuuroja + Puolipilvistä ja ajoittain kohtalaista lumisadetta tai lumikuuroja + Puolipilvistä ja ajoittain voimakasta lumisadetta tai lumikuuroja + Enimmäkseen pilvistä ja ajoittain heikkoa lumisadetta tai lumikuuroja + Enimmäkseen pilvistä ja ajoittain kohtalaista lumisadetta tai lumikuuroja + Enimmäkseen pilvistä ja ajoittain voimakasta lumisadetta tai lumikuuroja + Enimmäkseen pilvistä ja ajoittain voimakasta lumisadetta tai lumikuuroja + Kohtalaista lumisadetta + Runsasta lumisadetta + Yksittäisiä raekuuroja + Paikoin raekuuroja + Raekuuroja + Yksittäisiä ukkoskuuroja + Paikoin ukkoskuuroja + Ukkoskuuroja diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml index 44a69715..b265c261 100644 --- a/android/app/src/main/res/values-sv/strings.xml +++ b/android/app/src/main/res/values-sv/strings.xml @@ -65,4 +65,49 @@ Lägg till dina favoritplatser i Weather-appen om du vill använda widget utan platstjänster. Lägg till fler favoritplatser Tillåt att Weather-appens bakgrundsplatstjänst (Tillåt alltid) använder din nuvarande plats för att visa väder nära dig. + Klart + Mest Klart + Halvklart + Molnigt + Mulet + Dimma + Duggregn + Underkylt duggregn + Underkylt regn + Enstaka regnskurar + Lokalt regnskurar + Regnskurar + Halvklart och tidvis lätt regn + Halvklart och tidvis måttligt regn + Halvklart och tidvis kraftigt regn + Molnigt och tidvis lätt regn + Molnigt och tidvis måttligt regn + Molnigt och tidvis kraftigt regn + Lätt regn + Måttligt regn + Kraftigt regn + Halvklart och enstaka byar av lätt snöblandat regn + Halvklart och enstaka byar av måttligt snöblandat regn + Halvklart och enstaka byar av kraftigt snöblandat regn + Molnigt och spridda byar av lätt snöblandat regn + Molnigt och spridda byar av måttligt snöblandat regn + Molnigt och spridda byar av lätt snöblandat regn + Lätt snöblandat regn + Måttligt snöblandat regn + Kraftigt snöblandat regn + Halvklart och enstaka lätta snöbyar + Halvklart och enstaka måttliga snöbya + Halvklart och enstaka ymniga snöbyar + Molnigt och spridda lätta snöbyar + Molnigt och spridda måttliga snöbyar + Molnigt och spridda ymniga snöbyar + Lätt snöfall + Måttligt snöfall + Ymnigt snöfall + Enstaka hagelskurar + Lokalt hagelskurar + Hagelskurar + Enstaka åskskurar + Lokalt åskskurar + Lokalt åskskurar diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index c797e918..c64eae8d 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -57,7 +57,6 @@ Please define favorites in the weather app, if you want to use widget without location services. Please allow background location service (Allow always), if you use current location. Power saving is enabled. We recommended disabling it for the app so that widget can update weather data. Open settings - Privacy Policy (in finnish) The app collects location data to enable widget update weather data for current location even when the app is closed or not in use. Alternatively you can use favorite locations without location service. Do you want to enable location service? Ask permission @@ -67,4 +66,49 @@ Please add your favorite places in the Weather app, if you want to use widget without location services. Add more favorite locations Please allow the Weather app background location service (Allow all the time) use your current location to show weather near you. + Clear + Mostly clear + Partly cloudy + Mostly cloudy + Overcast + Fog + Drizzle + Freezing drizzle + Freezing rain + Isolated showers + Scattered showers + Showers + Partly cloudy and periods of light rain + Partly cloudy and periods of moderate rain + Partly cloudy and periods of heavy rain + Mostly cloudy and periods of light rain + Mostly cloudy and periods of moderate rain + Mostly cloudy and periods of heavy rain + Light rain + Moderate rain + Heavy rain + Isolated light sleet showers + Isolated moderate sleet showers + Isolated heavy sleet showers + Scattered light sleet showers + Scattered moderate sleet showers + Scattered heavy sleet showers + Light sleet + Moderate sleet + Heavy sleet + Isolated light snow showers + Isolated moderate snow showers + Isolated heavy snow showers + Scattered light snow showers + Scattered moderate snow showers + Scattered heavy snow showers + Light snowfall + Moderate snowfall + Heavy snowfall + Isolated hail showers + Scattered hail showers + Hail showers + Isolated thundershowers + Scattered thundershowers + Thundershowers