diff --git a/README.md b/README.md index b2805f1..cd9d738 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ OpenWeatherMap has announced that access to One Call 2.5 will be discontinued in June 2024. While the app is compatible with One Call 3.0, the subscription requires a credit card, even though no payments will be charged due to the 1000 free daily calls. -I recommend transitioning to my omWeather app, which utilizes data from Open-Meteo, +I recommend transitioning to my Cirrus app, which utilizes data from Open-Meteo, as I believe it offers superior information. @@ -19,7 +19,7 @@ as I believe it offers superior information. | [](https://f-droid.org/packages/org.woheller69.level/) | [](https://f-droid.org/packages/org.woheller69.audiometry/) | [](https://f-droid.org/packages/org.woheller69.gpscockpit/) | | **Audio Analyzer** | **LavSeeker** | **TimeLapseCam** | | [](https://f-droid.org/packages/org.woheller69.audio_analyzer_for_android/) |[](https://f-droid.org/packages/org.woheller69.lavatories/) | [](https://f-droid.org/packages/org.woheller69.TimeLapseCam/) | -| **Arity** | **omWeather** | **solXpect** | +| **Arity** | **Cirrus** | **solXpect** | | [](https://f-droid.org/packages/org.woheller69.arity/) | [](https://f-droid.org/packages/org.woheller69.omweather/) | [](https://f-droid.org/packages/org.woheller69.solxpect/) | | **gptAssist** | **dumpSeeker** | **huggingAssist** | | [](https://f-droid.org/packages/org.woheller69.gptassist/) | [](https://f-droid.org/packages/org.woheller69.dumpseeker/) | [](https://f-droid.org/packages/org.woheller69.hugassist/) | @@ -45,13 +45,14 @@ There are also three new widgets: If permission for GPS is given the widget will automatically update position on a regular base. -As One Call API only allows 1000 calls per day an own OpenWeatherMap API key is mandatory. +As One Call API only allows 1000 free calls per day an own OpenWeatherMap API key is mandatory. -For subscriptions later than Aug 15, 2022 you need a free subscription and OneCallAPI 3.0 with a limit of 1000 (free) calls per day. +You need a free subscription and **OneCallAPI 3.0** with a limit of 1000 (free) calls per day. +OneCallAPI 2.5 has been discontinued by openWeatherMap Please register for free account at: https://home.openweathermap.org/users/sign_up -Use [omWeather](https://github.com/woheller69/omweather) instead if you do not yet have an API key. +Use [Cirrus](https://github.com/woheller69/omweather) instead if you do not yet have an API key. [](https://f-droid.org/de/packages/org.woheller69.weather/) diff --git a/app/build.gradle b/app/build.gradle index db5d926..577d275 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,19 +2,18 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" applicationId "org.woheller69.weather" minSdkVersion 21 - targetSdkVersion 33 - versionCode 64 - versionName "6.4" + targetSdkVersion 34 + versionCode 65 + versionName "6.5" buildConfigField "String", "DEFAULT_API_KEY", "\"00000000000000000000000000000000\"" - buildConfigField "String", "BASE_URL", "\"https://api.openweathermap.org/data/2.5/\"" - buildConfigField "String", "BASE_URL_3", "\"https://api.openweathermap.org/data/3.0/\"" + buildConfigField "String", "BASE_URL", "\"https://api.openweathermap.org/data/3.0/\"" buildConfigField "String", "GITHUB_URL","\"https://github.com/woheller69/weather/\"" } diff --git a/app/src/main/assets/rainviewer.html b/app/src/main/assets/rainviewer.html index 3e09592..1916756 100644 --- a/app/src/main/assets/rainviewer.html +++ b/app/src/main/assets/rainviewer.html @@ -17,47 +17,45 @@ } .btn { - border: 2px solid #a8a8a8; - outline: none; - background-color:white; - font-size:110%; - font-weight:bold; - height:30px; - border-radius: 6px; + border: 2px solid #a8a8a8; + outline: none; + background-color: white; + font-size: 110%; + font-weight: bold; + height: 30px; + border-radius: 6px; } -
FRAME TIME
+
FRAME TIME
diff --git a/app/src/main/java/org/woheller69/weather/activities/AboutActivity.java b/app/src/main/java/org/woheller69/weather/activities/AboutActivity.java index 6a5a321..2fd7b65 100644 --- a/app/src/main/java/org/woheller69/weather/activities/AboutActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/AboutActivity.java @@ -15,7 +15,6 @@ public class AboutActivity extends NavigationActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about); - overridePendingTransition(0, 0); ((TextView) findViewById(R.id.githubURL)).setMovementMethod(LinkMovementMethod.getInstance()); ((TextView) findViewById(R.id.textFieldVersionName)).setText(BuildConfig.VERSION_NAME); diff --git a/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java b/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java index 5b31fa6..09da284 100644 --- a/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/ForecastCityActivity.java @@ -102,7 +102,6 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); context=this; setContentView(R.layout.activity_forecast_city); - overridePendingTransition(0, 0); initResources(); diff --git a/app/src/main/java/org/woheller69/weather/activities/ManageLocationsActivity.java b/app/src/main/java/org/woheller69/weather/activities/ManageLocationsActivity.java index 670d589..31682f5 100644 --- a/app/src/main/java/org/woheller69/weather/activities/ManageLocationsActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/ManageLocationsActivity.java @@ -48,7 +48,6 @@ public class ManageLocationsActivity extends NavigationActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_manage_locations); - overridePendingTransition(0, 0); context=this; database = PFASQLiteHelper.getInstance(getApplicationContext()); diff --git a/app/src/main/java/org/woheller69/weather/activities/NavigationActivity.java b/app/src/main/java/org/woheller69/weather/activities/NavigationActivity.java index 59a955f..9dde75a 100644 --- a/app/src/main/java/org/woheller69/weather/activities/NavigationActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/NavigationActivity.java @@ -79,7 +79,6 @@ public void onClick(DialogInterface dialog, int which) { } - overridePendingTransition(0, 0); } @Override diff --git a/app/src/main/java/org/woheller69/weather/activities/RadiusSearchActivity.java b/app/src/main/java/org/woheller69/weather/activities/RadiusSearchActivity.java index f2e44b3..fed1e8e 100644 --- a/app/src/main/java/org/woheller69/weather/activities/RadiusSearchActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/RadiusSearchActivity.java @@ -83,8 +83,6 @@ public class RadiusSearchActivity extends NavigationActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_radius_search); - overridePendingTransition(0, 0); - dbHelper = PFASQLiteHelper.getInstance(this); initialize(); diff --git a/app/src/main/java/org/woheller69/weather/activities/SettingsActivity.java b/app/src/main/java/org/woheller69/weather/activities/SettingsActivity.java index dbcada7..c688b78 100644 --- a/app/src/main/java/org/woheller69/weather/activities/SettingsActivity.java +++ b/app/src/main/java/org/woheller69/weather/activities/SettingsActivity.java @@ -77,7 +77,6 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_settings); - overridePendingTransition(0, 0); } @Override diff --git a/app/src/main/java/org/woheller69/weather/weather_api/open_weather_map/OwmHttpRequest.java b/app/src/main/java/org/woheller69/weather/weather_api/open_weather_map/OwmHttpRequest.java index c366184..32607a6 100644 --- a/app/src/main/java/org/woheller69/weather/weather_api/open_weather_map/OwmHttpRequest.java +++ b/app/src/main/java/org/woheller69/weather/weather_api/open_weather_map/OwmHttpRequest.java @@ -92,7 +92,7 @@ protected String getUrlForQueryingOneCallAPI(Context context, float lat, float l SharedPreferences sharedPreferences=PreferenceManager.getDefaultSharedPreferences(context); return String.format( "%sonecall?lat=%s&lon=%s&units=metric&exclude=alerts&appid=%s", - sharedPreferences.getBoolean("oneCall3",false) ? BuildConfig.BASE_URL_3 : BuildConfig.BASE_URL, + BuildConfig.BASE_URL, lat, lon, prefManager.getOWMApiKey(context) diff --git a/app/src/main/java/org/woheller69/weather/weather_api/open_weather_map/ProcessOwmForecastOneCallAPIRequest.java b/app/src/main/java/org/woheller69/weather/weather_api/open_weather_map/ProcessOwmForecastOneCallAPIRequest.java index 96afca9..6dbcafc 100644 --- a/app/src/main/java/org/woheller69/weather/weather_api/open_weather_map/ProcessOwmForecastOneCallAPIRequest.java +++ b/app/src/main/java/org/woheller69/weather/weather_api/open_weather_map/ProcessOwmForecastOneCallAPIRequest.java @@ -194,6 +194,7 @@ public void processFailScenario(final VolleyError error) { @Override public void run() { if (NavigationActivity.isVisible) Toast.makeText(context, context.getResources().getString(R.string.error_fetch_forecast), Toast.LENGTH_LONG).show(); + if (NavigationActivity.isVisible && error.toString().contains("AuthFailureError")) Toast.makeText(context, context.getResources().getString(R.string.error_onecall3), Toast.LENGTH_LONG).show(); } }); } diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index d3fb12b..b5cc8bd 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -158,6 +158,7 @@ Du har brug for et gratis abonnement og OneCallAPI 3.0 med en grænse på 1000 (gratis) opkald pr. dag. Tillad også GPS-brug i baggrunden til brug i widgetten Tænd venligst GPS + OneCall 3.0-abonnement påkrævet diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9ad6838..9d2b60d 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -159,4 +159,5 @@ Sie benötigen ein kostenloses Abonnement und OneCallAPI 3.0 mit einem Limit von 1000 (kostenlosen) Anrufen pro Tag. Bitte erlauben Sie auch die GPS Nutzung im Hintergrund für die Verwendung im Widget Bitte GPS einschalten + OneCall 3.0 Abo erforderlich diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 30d772a..30b15ae 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -158,4 +158,5 @@ Necesita una suscripción gratuita y OneCallAPI 3.0 con un límite de 1000 llamadas (gratuitas) por día. También permitir el uso de fondo de GPS en el widget Por favor, encienda el GPS + Se requiere suscripción a OneCall 3.0 diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ed27258..aac3943 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -162,4 +162,5 @@ Vous avez besoin d\'un abonnement gratuit et de OneCallAPI 3.0 avec une limite de 1000 appels (gratuits) par jour. Autoriser également l\'utilisation du GPS en arrière-plan dans le widget Veuillez activer le GPS + Abonnement OneCall 3.0 requis \ No newline at end of file diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 1a24c78..de4c612 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -158,6 +158,7 @@ Ingyenes előfizetésre és OneCallAPI 3.0-ra van szüksége, napi 1000 (ingyenes) hívás korlátozásával. Kérjük, engedélyezze a GPS-használatot a háttérben a widgetben való használathoz Kérjük, kapcsolja be a GPS-t + OneCall 3.0 subscription required diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 261f382..3063c5e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -156,4 +156,5 @@ È necessario un abbonamento gratuito e OneCallAPI 3.0 con un limite di 1000 chiamate (gratuite) al giorno. Consenti anche l\'uso del GPS in background nel widget Si prega di attivare il GPS + È richiesto l\'abbonamento a OneCall 3.0 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 58cee88..62a10c6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -158,6 +158,7 @@ Je hebt een gratis abonnement en OneCallAPI 3.0 nodig met een limiet van 1000 (gratis) bellen per dag. Sta ook GPS-gebruik op de achtergrond toe voor gebruik in de widget Zet a.u.b. GPS aan + OneCall 3.0-abonnement vereist diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 1df2da1..6cb15db 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -163,4 +163,5 @@ Potrzebujesz bezpłatnego abonamentu i OneCallAPI 3.0 z limitem 1000 (darmowych) połączeń dziennie. Zezwól również na korzystanie z GPS w tle do użycia w widgecie Proszę włączyć GPS + OneCall 3.0 subscription required diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index c5d6273..1e5ac52 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -156,4 +156,5 @@ Você precisa de uma assinatura gratuita e OneCallAPI 3.0 com um limite de 1.000 chamadas (gratuitas) por dia. Permita também o uso de GPS em pano de fondo no widget Por favor, ligue o GPS + É necessária assinatura do OneCall 3.0 \ 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 35342d0..e61fb02 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -157,4 +157,5 @@ Вам нужна бесплатная подписка и OneCallAPI 3.0 с лимитом 1000 (бесплатных) звонков в день. Также разрешите использование GPS в фоновом режиме для использования в виджете Пожалуйста, включите GPS + OneCall 3.0 subscription required diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 2d68bd4..678f33d 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -158,6 +158,7 @@ Du behöver ett gratisabonnemang och OneCallAPI 3.0 med en gräns på 1000 (gratis) samtal per dag. Tillåt även GPS-användning i bakgrunden för användning i widgeten Slå på GPS + OneCall 3.0-abonnemang krävs diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 2724d8d..96baaf6 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -156,4 +156,5 @@ Ücretsiz bir aboneliğe ve günde 1000 (ücretsiz) arama limitli OneCallAPI 3.0\'a ihtiyacınız var. Lütfen widget\'ta kullanmak için arka planda GPS kullanımına da izin verin Lütfen GPS\'i açın + OneCall 3.0 subscription required diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a04ca3e..aecea24 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -164,4 +164,5 @@ Please also allow GPS usage in the background for use in the widget Please turn on GPS GitHub + OneCall 3.0 subscription required diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index 1d5e536..4656a5c 100644 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -11,10 +11,6 @@ android:key="API_key_value" android:title="@string/settings_title_API_key" android:defaultValue="@string/settings_API_key_default" /> - diff --git a/fastlane/metadata/android/de-DE/changelogs/64.txt b/fastlane/metadata/android/de-DE/changelogs/64.txt index d4c78f5..8a31432 100644 --- a/fastlane/metadata/android/de-DE/changelogs/64.txt +++ b/fastlane/metadata/android/de-DE/changelogs/64.txt @@ -1 +1 @@ -Fix translation \ No newline at end of file +Übersetzung korrigiert \ No newline at end of file diff --git a/fastlane/metadata/android/de-DE/changelogs/65.txt b/fastlane/metadata/android/de-DE/changelogs/65.txt new file mode 100644 index 0000000..b5ce52a --- /dev/null +++ b/fastlane/metadata/android/de-DE/changelogs/65.txt @@ -0,0 +1,7 @@ +Finales Release: +- Update für Android 14 (SDK 34) +- Zeige Wolkenbewegung im Regenradar + +OpenWeatherMap verlangt jetzt Kreditkartendaten. +Daher wird die App nicht weiterentwickelt. +Bitte zu Cirrus wechseln. \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/64.txt b/fastlane/metadata/android/en-US/changelogs/64.txt new file mode 100644 index 0000000..6a3d63d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/64.txt @@ -0,0 +1 @@ +fix translation \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/65.txt b/fastlane/metadata/android/en-US/changelogs/65.txt new file mode 100644 index 0000000..bc03f2a --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/65.txt @@ -0,0 +1,7 @@ +Final release: +- Update for Android 14 (SDK 34) +- Show cloud movement in rain radar + +OpenWeatherMap requires credit card data. +Therefore this app will no longer be maintained. +Please use Cirrus instead. \ No newline at end of file