diff --git a/app/src/main/assets/app/day_summary.js b/app/src/main/assets/app/day_summary.js index 08dfe7b3a..b0c4ea3c3 100644 --- a/app/src/main/assets/app/day_summary.js +++ b/app/src/main/assets/app/day_summary.js @@ -30,7 +30,9 @@ function GenerateSummary(data) { if(localStorage.getItem('UseFrogSummary') === 'true'){ descriptions = { - ${frogSummary} + ${summary} + + } } else{ @@ -68,7 +70,7 @@ function GenerateSummary(data) { if(localStorage.getItem('UseFrogSummary') === 'true'){ weatherPhrases = [ - ${frogPhrases} + summary ] } else{ weatherPhrases = [ diff --git a/app/src/main/assets/app/fetch.js b/app/src/main/assets/app/fetch.js index bac60e6b7..c2870cdf4 100644 --- a/app/src/main/assets/app/fetch.js +++ b/app/src/main/assets/app/fetch.js @@ -28,7 +28,7 @@ function processQueue() { isProcessingQueue = true; const { lat, lon, suggestionText, refreshValue, resolve, reject } = requestQueue.shift(); - fetch(`https://api.timezonedb.com/v2.1/get-time-zone?key=&format=json&by=position&lat=${lat}&lng=${lon}`) + fetch(`https://api.timezonedb.com/v2.1/get-time-zone?key=${}&format=json&by=position&lat=${lat}&lng=${lon}`) .then(response => response.json()) .then(data => { if (data.status === 'OK') { @@ -178,7 +178,7 @@ function FetchWeather(lat, lon, timezone, suggestionText, refreshValue) { function MoreDetails(latSum, lonSum, suggestionText) { - fetch(`https://api.weatherapi.com/v1/forecast.json?key=&q=${latSum},${lonSum}`) + fetch(`https://api.weatherapi.com/v1/forecast.json?key=${}&q=${latSum},${lonSum}`) .then(response => response.json()) .then(data => { @@ -194,7 +194,7 @@ function FetchWeather(lat, lon, timezone, suggestionText, refreshValue) { function astronomyData(latSum, lonSum, suggestionText) { - fetch(`https://api.weatherapi.com/v1/astronomy.json?key=&q=${latSum},${lonSum}`) + fetch(`https://api.weatherapi.com/v1/astronomy.json?key=${}&q=${latSum},${lonSum}`) .then(response => response.json()) .then(data => { @@ -207,7 +207,7 @@ function FetchWeather(lat, lon, timezone, suggestionText, refreshValue) { FetchAlert(lat, lon, suggestionText) function FetchAlert(lat, lon, suggestionText) { - fetch(`https://api.weatherapi.com/v1/alerts.json?key=&q=${lat},${lon}`) + fetch(`https://api.weatherapi.com/v1/alerts.json?key=${}&q=${lat},${lon}`) .then(response => response.json()) .then(data => { @@ -234,7 +234,7 @@ function FetchOpenMeteo(lat, lon, timezone, suggestionText, refreshValue) { const currentSelectedProvider = localStorage.getItem('selectedMainWeatherProvider'); const WeatherModel = localStorage.getItem('selectedWeatherModel') || 'best_match'; - if (currentSelectedProvider === 'dwdGermany' || currentSelectedProvider === 'noaaUS' || currentSelectedProvider === 'meteoFrance' || currentSelectedProvider === 'ecmwf' || currentSelectedProvider === 'ukMetOffice' || currentSelectedProvider === 'jmaJapan' || currentSelectedProvider === 'gemCanada' || currentSelectedProvider === 'bomAustralia' || currentSelectedProvider === 'cmaChina' || currentSelectedProvider === 'knmiNetherlands' || currentSelectedProvider === 'dmiDenmark') { + if (currentSelectedProvider === 'dwdGermany' || currentSelectedProvider === 'noaaUS' || currentSelectedProvider === 'meteoFrance' || currentSelectedProvider === 'ecmwf' || currentSelectedProvider === 'ukMetOffice' || currentSelectedProvider === 'jmaJapan' || currentSelectedProvider === 'gemCanada' || currentSelectedProvider === 'bomAustralia' || currentSelectedProvider === 'cmaChina' || currentSelectedProvider === 'knmiNetherlands' || currentSelectedProvider === 'dmiDenmark' || currentSelectedProvider === 'Met norway') { } else { diff --git a/app/src/main/assets/app/renderForecastPage.js b/app/src/main/assets/app/renderForecastPage.js index 3591ca342..8dce900af 100644 --- a/app/src/main/assets/app/renderForecastPage.js +++ b/app/src/main/assets/app/renderForecastPage.js @@ -1286,27 +1286,7 @@ function GenerateSummary(data) { if(localStorage.getItem('UseFrogSummary') === 'true'){ descriptions = { - 'Clear sky': ["a shiny, froggy day full of sunshine 🐸🌞", "the sky is clear like a froggy pond in summer 🐸🌈", "perfectly sunny with no clouds, just like a frog's favorite weather 🐸☀️"], - 'Mostly clear': ["mostly sunny with a few clouds for froggies to hop on 🐸☁️", "some sunshine peeking through, perfect for froggy adventures 🐸🌤", "a mix of sunshine and clouds, just like froggies love it 🐸⛅"], - 'Partly cloudy': ["partly cloudy, just enough clouds to make it froggy and cool 🐸🌥", "frogs love a balance of sun and cloud, just like today 🐸🌤", "some clouds and sunshine, a froggy combo 🐸☁️☀️"], - 'Overcast': ["cloudy and overcast, a cozy day for frogs 🐸🌫", "the sky is grey like a frog in a puddle 🐸☁️", "overcast with no sunshine, just how some frogs like it 🐸🌥"], - 'Fog': ["foggy weather, like a frog lost in a misty swamp 🐸🌫", "dense fog that makes it hard to see the lily pads 🐸🌁", "a misty, foggy atmosphere, just like a frog's favorite hiding spot 🐸🌫"], - 'Drizzle': ["light drizzle, the perfect kind of rain for a froggy splash 🐸💧", "a gentle drizzle, just enough to make the frogs happy 🐸🌧️", "soft, light rain—perfect for frogs hopping around 🐸🌦️"], - 'Freezing Drizzle': ["icy drizzle that makes froggies hop for cover 🐸❄️", "freezing drizzle, the kind of weather froggies don’t like 🐸🥶", "a touch of freezing drizzle, froggies need to bundle up! 🐸🧊"], - 'Moderate rain': ["moderate rain showers, a little too wet for some frogs 🐸🌧️", "steady rain, perfect for a froggy swim 🐸🌧️💦", "a nice light to moderate rain—just enough for froggies to splash around 🐸🌧"], - 'Heavy intensity rain': ["heavy rainfall, even frogs are staying inside 🐸🌧️", "intense rain, time for froggies to huddle together 🐸💧💦", "a downpour that’ll leave the frogs drenched 🐸💦"], - 'Freezing Rain': ["freezing rain, a froggy nightmare of ice and cold 🐸❄️🧊", "rain turning to ice, froggies better stay warm 🐸🥶", "ice-covered conditions—frogs don’t like this kind of chill 🐸❄️"], - 'Slight snow': ["light snowfall, froggies hopping through tiny snowflakes 🐸❄️", "gentle snowflakes falling, just a dusting for froggies 🐸☃️", "a little snow, perfect for froggies to hop around in 🐸🌨️"], - 'Moderate snow': ["moderate snowfall, froggies love a good snowstorm 🐸❄️", "steady snowfall, froggies hopping through the fluff 🐸🌨️", "a nice amount of snow, froggies will enjoy playing in it 🐸❄️"], - 'Heavy intensity snow': ["heavy snowfall, froggies need to dig in for warmth 🐸🌨️❄️", "a snowstorm, froggies buried in snowflakes 🐸❄️❄️", "intense snowfall, froggies might need a warm pond 🐸❄️❄️"], - 'Snow grains': ["occasional snow grains, froggies making footprints in the light snow 🐸❄️", "sporadic snow grains, froggies can hardly notice them 🐸❄️", "light snow grains drifting down, just enough for froggies to enjoy 🐸🌨️"], - 'Rain showers': ["intermittent rain showers, froggies will need to hop in and out 🐸🌧️", "sporadic rain showers, but frogs don’t mind 🐸💧", "on and off rain, froggies love hopping between puddles 🐸🌧️"], - 'Heavy rain showers': ["heavy rain showers, froggies are staying dry 🐸🌧️💦", "frequent, intense rain showers, the froggies are hopping fast 🐸💧", "lots of rain today, the frogs are loving it... but a little too wet 🐸🌧️🌊"], - 'Slight snow showers': ["light snow showers, froggies hopping through the flakes 🐸❄️", "occasional snowflakes, froggies are enjoying the cool air 🐸❄️🌨", "intermittent light snow, froggies are catching snowflakes on their tongues 🐸❄️"], - 'Heavy snow showers': ["heavy snow showers, froggies making big leaps through the snow 🐸❄️❄️", "constant heavy snow, froggies hopping through the winter wonderland 🐸❄️🌨️", "snow showers with strong intensity, froggies building snow forts 🐸❄️🌨️"], - 'Thunderstorm': ["a thunderstorm, froggies are huddling under a big leaf 🐸⚡", "a storm with lightning, froggies are hiding from the thunder 🐸⚡🌩️", "thunder and lightning, froggies don't like the loud boom 🐸⚡🌩️"], - 'Strong thunderstorm': ["strong thunderstorms, froggies are taking cover 🐸⚡🌪", "severe thunderstorms, froggies are staying under the big, safe lily pads 🐸⚡🌩️", "intense thunderstorm activity, froggies are in full retreat 🐸⚡🌩️"], - + ${summary} } @@ -1345,14 +1325,7 @@ function GenerateSummary(data) { if(localStorage.getItem('UseFrogSummary') === 'true'){ weatherPhrases = [ - `Froggy says: Expect ${hourlyDescription} in the morning, followed by ${dailyDescription} later in the day. Ribbit! 🐸`, - `Hop into the day with ${hourlyDescription}, and then get ready for ${dailyDescription} later on. Frogs like variety! 🐸🌞`, - `It's gonna be ${hourlyDescription} this morning, and then a little bit of ${dailyDescription} to keep things interesting. Ribbit! 🐸🎉`, - `Frogs love a good weather change! Start with ${hourlyDescription}, and watch out for ${dailyDescription} as the day goes on. 🐸🌤`, - `Grab your umbrella! Expect ${hourlyDescription} to start, then hop into ${dailyDescription} by the afternoon. Ribbit! 🐸🌧️`, - `Ribbit! Froggies say: ${hourlyDescription} this morning, with ${dailyDescription} later. Time to hop around! 🐸🌞`, - `Frogs are jumping in joy because it’s ${hourlyDescription}, and by the afternoon, you’ll have ${dailyDescription}. 🐸💨`, - `It’s a froggy day out there! Start with ${hourlyDescription}, then get ready for ${dailyDescription}. 🐸☔`, + summary ] } else{ weatherPhrases = [ diff --git a/app/src/main/assets/pages/LanguagesPage.html b/app/src/main/assets/pages/LanguagesPage.html index c47cbfa37..e1f3b1c41 100644 --- a/app/src/main/assets/pages/LanguagesPage.html +++ b/app/src/main/assets/pages/LanguagesPage.html @@ -1,10 +1,11 @@ - +
Language
+ +Language
@@ -192,7 +249,7 @@100%
@@ -203,20 +260,30 @@--
+ + @@ -385,7 +452,7 @@ TR ---
@@ -396,7 +463,7 @@ UK ---
@@ -408,7 +475,7 @@ VI ---
@@ -420,19 +487,31 @@ SR ---
+ + + @@ -494,6 +584,95 @@ - \ No newline at end of file diff --git a/app/src/main/assets/pages/contributors.html b/app/src/main/assets/pages/contributors.html index 526e36c5f..ba7107f63 100644 --- a/app/src/main/assets/pages/contributors.html +++ b/app/src/main/assets/pages/contributors.html @@ -1,10 +1,11 @@ - +Contributors
-Creator
@@ -212,8 +217,8 @@ diff --git a/app/src/main/assets/pages/searchPage.html b/app/src/main/assets/pages/searchPage.html index 6f870a565..18381583c 100644 --- a/app/src/main/assets/pages/searchPage.html +++ b/app/src/main/assets/pages/searchPage.html @@ -1,10 +1,11 @@ - +