diff --git a/README.md b/README.md index 1347f3e0b..e9762fc71 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ GitHub
-`(Last updated on 10-20-2024 at 1:45 PM UTC)` +`(Last updated on 10-21-2024 at 1:50 PM UTC)` ![app_thumbnail](preview/thumbnail.png) diff --git a/app/build.gradle b/app/build.gradle index 1af5b0d13..585d2672d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.example.weathermaster" minSdk 22 targetSdk 33 - versionCode 61 - versionName "1.6.9 (W)" + versionCode 62 + versionName "1.7.0 (W)" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 26935e476..b800aba9b 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 61, - "versionName": "1.6.9 (W)", + "versionCode": 62, + "versionName": "1.7.0 (W)", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/assets/app/renderWeather.js b/app/src/main/assets/app/renderWeather.js index 40abfdbfb..24918253e 100644 --- a/app/src/main/assets/app/renderWeather.js +++ b/app/src/main/assets/app/renderWeather.js @@ -959,7 +959,7 @@ function getColor(value, type) { function UvIndex(uvIndexValue) { - const uvIndex = uvIndexValue; + const uvIndex = Math.round(uvIndexValue); if (uvIndex >= 0 && uvIndex <= 1) { @@ -1040,7 +1040,7 @@ function UvIndex(uvIndexValue) { function MoreDetails(latSum, lonSum) { - fetch(`https://api.weatherapi.com/v1/forecast.json?key=KEYS&q=${latSum},${lonSum}`) + fetch(`https://api.weatherapi.com/v1/forecast.json?key=ef2cb48d90984d828a8140518240209&q=${latSum},${lonSum}`) .then(response => response.json()) .then(data => { @@ -1093,7 +1093,7 @@ function MoreDetails(latSum, lonSum) { let weatherReport = `
  • ${willRain}
  • -
  • Expect a high of ${maxTemp}° ☀️. As the sun sets 🌅, temperatures will drop to a cozy ${minTemp}°. A lovely evening awaits! 🌙
  • +
  • Expect a high of ${maxTemp}° ☀️ with a maximum UV index of ${mainData.uv}. As the sun sets 🌅, temperatures will drop to a cozy ${minTemp}°. A lovely evening awaits! 🌙
  • ${precipitationMessage}
  • @@ -1193,7 +1193,7 @@ function MoreDetails(latSum, lonSum) { } function astronomyData(latSum, lonSum) { - fetch(`https://api.weatherapi.com/v1/astronomy.json?key=KEYS&q=${latSum},${lonSum}`) + fetch(`https://api.weatherapi.com/v1/astronomy.json?key=ef2cb48d90984d828a8140518240209&q=${latSum},${lonSum}`) .then(response => response.json()) .then(data => { @@ -1262,7 +1262,7 @@ function astronomyData(latSum, lonSum) { function FetchAlert(lat, lon){ - fetch(`https://api.weatherapi.com/v1/alerts.json?key=KEYS&q=${lat},${lon}`) + fetch(`https://api.weatherapi.com/v1/alerts.json?key=10baabdf43ea48d191075955241810&q=${lat},${lon}`) .then(response => response.json()) .then(data => { diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html index f9208b7f4..343804ace 100644 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/index.html @@ -708,7 +708,7 @@ Check your internet connection and try again. OR - There might be an API error. + There might be an API error.
    diff --git a/app/src/main/assets/modules/units.js b/app/src/main/assets/modules/units.js index 9c46b60ca..d66ebaf84 100644 --- a/app/src/main/assets/modules/units.js +++ b/app/src/main/assets/modules/units.js @@ -766,9 +766,9 @@ const SnowFrog = [ ] const ThunderStormFrog = [ - "https://gitlab.com/bignutty/google-weather-icons/-/blob/main/froggie/v2/mobile/22-iso-thunderstorms/22-iso-thunderstorms-home-inside.png?ref_type=heads", - "https://gitlab.com/bignutty/google-weather-icons/-/blob/main/froggie/v2/mobile/22-iso-thunderstorms/22-iso-thunderstorms-cafe-looking-outside.png?ref_type=heads", - "https://gitlab.com/bignutty/google-weather-icons/-/blob/main/froggie/v2/mobile/22-iso-thunderstorms/22-iso-thunderstorms-busstop-newspaper.png?ref_type=heads", + "https://gitlab.com/bignutty/google-weather-icons/-/raw/main/froggie/v2/mobile/22-iso-thunderstorms/22-iso-thunderstorms-home-inside.png?ref_type=heads", + "https://gitlab.com/bignutty/google-weather-icons/-/raw/main/froggie/v2/mobile/22-iso-thunderstorms/22-iso-thunderstorms-cafe-looking-outside.png?ref_type=heads", + "https://gitlab.com/bignutty/google-weather-icons/-/raw/main/froggie/v2/mobile/22-iso-thunderstorms/22-iso-thunderstorms-busstop-newspaper.png?ref_type=heads", ] diff --git a/app/src/main/assets/pages/AboutPage.html b/app/src/main/assets/pages/AboutPage.html index 3bcde3b9c..e84968b5f 100644 --- a/app/src/main/assets/pages/AboutPage.html +++ b/app/src/main/assets/pages/AboutPage.html @@ -161,7 +161,7 @@

    WeatherMaster

    - 1.6.9 (W) + 1.7.0 (W) Latest version refresh @@ -280,7 +280,7 @@ AndroidInterface.updateStatusBarColor(theme); document.getElementById('checkUpdatesBtn').addEventListener('click', async function() { - const currentVersion = 'v1.6.9'; + const currentVersion = 'v1.7.0'; const githubRepo = 'PranshulGG/WeatherMaster'; const releasesUrl = `https://api.github.com/repos/${githubRepo}/releases/latest`; diff --git a/app/src/main/assets/ui-files/ui.css b/app/src/main/assets/ui-files/ui.css index d313c8da1..cbed00316 100644 --- a/app/src/main/assets/ui-files/ui.css +++ b/app/src/main/assets/ui-files/ui.css @@ -1457,7 +1457,7 @@ height: 100%; position: relative; flex-direction: column; padding: 10px; - margin-top: 5px; + margin-top: 0; gap: 10px; border-radius: 10px 10px 0 0; margin-bottom: 0; diff --git a/app/src/main/java/com/example/weathermaster/AboutPage.java b/app/src/main/java/com/example/weathermaster/AboutPage.java index 35e1b2ad6..ef1469e71 100644 --- a/app/src/main/java/com/example/weathermaster/AboutPage.java +++ b/app/src/main/java/com/example/weathermaster/AboutPage.java @@ -57,6 +57,7 @@ public class AboutPage extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.AboutBG)); + webSettings.setTextZoom(100); webview.loadUrl("file:///android_asset/pages/AboutPage.html"); diff --git a/app/src/main/java/com/example/weathermaster/AlertPage.java b/app/src/main/java/com/example/weathermaster/AlertPage.java index ca5b2d2c2..aaea80c64 100644 --- a/app/src/main/java/com/example/weathermaster/AlertPage.java +++ b/app/src/main/java/com/example/weathermaster/AlertPage.java @@ -58,6 +58,8 @@ public class AlertPage extends AppCompatActivity { webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.mainBG)); setTheme(R.style.blue_caret); + webSettings.setTextZoom(100); + webview.loadUrl("file:///android_asset/pages/alertPage.html"); } diff --git a/app/src/main/java/com/example/weathermaster/ForecastPage.java b/app/src/main/java/com/example/weathermaster/ForecastPage.java index 135605b7a..8fe00d3fe 100644 --- a/app/src/main/java/com/example/weathermaster/ForecastPage.java +++ b/app/src/main/java/com/example/weathermaster/ForecastPage.java @@ -57,6 +57,7 @@ public class ForecastPage extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.forecastPageBg)); + webSettings.setTextZoom(100); webview.loadUrl("file:///android_asset/pages/forecastPage.html"); diff --git a/app/src/main/java/com/example/weathermaster/LanguagePage.java b/app/src/main/java/com/example/weathermaster/LanguagePage.java index 63129a1cd..f9f4d5839 100644 --- a/app/src/main/java/com/example/weathermaster/LanguagePage.java +++ b/app/src/main/java/com/example/weathermaster/LanguagePage.java @@ -58,6 +58,7 @@ public class LanguagePage extends AppCompatActivity { webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.mainBG)); webview.loadUrl("file:///android_asset/pages/LanguagesPage.html"); + webSettings.setTextZoom(100); } diff --git a/app/src/main/java/com/example/weathermaster/LiveRadar.java b/app/src/main/java/com/example/weathermaster/LiveRadar.java index 2771d417d..fcd8599c9 100644 --- a/app/src/main/java/com/example/weathermaster/LiveRadar.java +++ b/app/src/main/java/com/example/weathermaster/LiveRadar.java @@ -57,6 +57,7 @@ public class LiveRadar extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.RadarPage)); + webSettings.setTextZoom(100); webview.loadUrl("file:///android_asset/pages/radar.html"); diff --git a/app/src/main/java/com/example/weathermaster/MainActivity.java b/app/src/main/java/com/example/weathermaster/MainActivity.java index 82dd10154..5673a52e4 100644 --- a/app/src/main/java/com/example/weathermaster/MainActivity.java +++ b/app/src/main/java/com/example/weathermaster/MainActivity.java @@ -91,6 +91,7 @@ public class MainActivity extends AppCompatActivity { webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.addJavascriptInterface(new ShowToastInterface(this), "ToastAndroidShow"); webview.setBackgroundColor(getResources().getColor(R.color.diffDefault)); + webSettings.setTextZoom(100); diff --git a/app/src/main/java/com/example/weathermaster/MoonPhases.java b/app/src/main/java/com/example/weathermaster/MoonPhases.java index 40f8dc39a..78b22d24b 100644 --- a/app/src/main/java/com/example/weathermaster/MoonPhases.java +++ b/app/src/main/java/com/example/weathermaster/MoonPhases.java @@ -58,6 +58,7 @@ public class MoonPhases extends AppCompatActivity { webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.MoonPhase)); webview.loadUrl("file:///android_asset/pages/MoonPhases.html"); + webSettings.setTextZoom(100); } diff --git a/app/src/main/java/com/example/weathermaster/PrivacyPolicy.java b/app/src/main/java/com/example/weathermaster/PrivacyPolicy.java index b5e4ead79..63ffb4220 100644 --- a/app/src/main/java/com/example/weathermaster/PrivacyPolicy.java +++ b/app/src/main/java/com/example/weathermaster/PrivacyPolicy.java @@ -57,6 +57,7 @@ public class PrivacyPolicy extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.mainBG)); + webSettings.setTextZoom(100); webview.loadUrl("file:///android_asset/pages/aboutPages/PrivacyPolicy.html"); diff --git a/app/src/main/java/com/example/weathermaster/SettingsActivity.java b/app/src/main/java/com/example/weathermaster/SettingsActivity.java index 2d4ee2aaf..f1a797d2d 100644 --- a/app/src/main/java/com/example/weathermaster/SettingsActivity.java +++ b/app/src/main/java/com/example/weathermaster/SettingsActivity.java @@ -58,6 +58,7 @@ public class SettingsActivity extends AppCompatActivity { webview.setBackgroundColor(getResources().getColor(R.color.mainBG)); webview.loadUrl("file:///android_asset/pages/settings.html"); + webSettings.setTextZoom(100); } diff --git a/app/src/main/java/com/example/weathermaster/Terms_Conditions.java b/app/src/main/java/com/example/weathermaster/Terms_Conditions.java index bb32b4608..4ee57b099 100644 --- a/app/src/main/java/com/example/weathermaster/Terms_Conditions.java +++ b/app/src/main/java/com/example/weathermaster/Terms_Conditions.java @@ -57,6 +57,7 @@ public class Terms_Conditions extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.mainBG)); + webSettings.setTextZoom(100); webview.loadUrl("file:///android_asset/pages/aboutPages/TermsConditions.html"); diff --git a/app/src/main/java/com/example/weathermaster/ThirdParty.java b/app/src/main/java/com/example/weathermaster/ThirdParty.java index 5142dbb5e..c05750073 100644 --- a/app/src/main/java/com/example/weathermaster/ThirdParty.java +++ b/app/src/main/java/com/example/weathermaster/ThirdParty.java @@ -57,6 +57,7 @@ public class ThirdParty extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.mainBG)); + webSettings.setTextZoom(100); webview.loadUrl("file:///android_asset/pages/aboutPages/licenses.html"); diff --git a/app/src/main/java/com/example/weathermaster/UVIndexCondition.java b/app/src/main/java/com/example/weathermaster/UVIndexCondition.java index f02ea8033..9478c9a13 100644 --- a/app/src/main/java/com/example/weathermaster/UVIndexCondition.java +++ b/app/src/main/java/com/example/weathermaster/UVIndexCondition.java @@ -57,6 +57,7 @@ public class UVIndexCondition extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.conditionBG)); + webSettings.setTextZoom(100); webview.loadUrl("file:///android_asset/pages/conditions_pages/uvIndex_forecast.html"); diff --git a/app/src/main/java/com/example/weathermaster/WindCondition.java b/app/src/main/java/com/example/weathermaster/WindCondition.java index 277550e93..ca2ff4b2a 100644 --- a/app/src/main/java/com/example/weathermaster/WindCondition.java +++ b/app/src/main/java/com/example/weathermaster/WindCondition.java @@ -57,6 +57,7 @@ public class WindCondition extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.conditionBG)); + webSettings.setTextZoom(100); webview.loadUrl("file:///android_asset/pages/conditions_pages/wind_forecast.html"); diff --git a/app/src/main/java/com/example/weathermaster/humidityCondition.java b/app/src/main/java/com/example/weathermaster/humidityCondition.java index 9057448ec..c119ea4fe 100644 --- a/app/src/main/java/com/example/weathermaster/humidityCondition.java +++ b/app/src/main/java/com/example/weathermaster/humidityCondition.java @@ -57,6 +57,7 @@ public class humidityCondition extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.conditionBG)); + webSettings.setTextZoom(100); webview.loadUrl("file:///android_asset/pages/conditions_pages/humidity_forecast.html"); diff --git a/app/src/main/java/com/example/weathermaster/pressureCondition.java b/app/src/main/java/com/example/weathermaster/pressureCondition.java index a857ea743..f2ccb0511 100644 --- a/app/src/main/java/com/example/weathermaster/pressureCondition.java +++ b/app/src/main/java/com/example/weathermaster/pressureCondition.java @@ -57,6 +57,7 @@ public class pressureCondition extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.conditionBG)); + webSettings.setTextZoom(100); webview.loadUrl("file:///android_asset/pages/conditions_pages/pressure_forecast.html"); diff --git a/app/src/main/java/com/example/weathermaster/sunCondition.java b/app/src/main/java/com/example/weathermaster/sunCondition.java index 718a72fd0..446770f43 100644 --- a/app/src/main/java/com/example/weathermaster/sunCondition.java +++ b/app/src/main/java/com/example/weathermaster/sunCondition.java @@ -57,6 +57,7 @@ public class sunCondition extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.conditionBG)); + webSettings.setTextZoom(100); webview.loadUrl("file:///android_asset/pages/conditions_pages/sunset_rise_forecast.html"); diff --git a/app/src/main/java/com/example/weathermaster/visibilityCondition.java b/app/src/main/java/com/example/weathermaster/visibilityCondition.java index a5bea7d6d..7c7ccc601 100644 --- a/app/src/main/java/com/example/weathermaster/visibilityCondition.java +++ b/app/src/main/java/com/example/weathermaster/visibilityCondition.java @@ -57,6 +57,7 @@ public class visibilityCondition extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); webview.setBackgroundColor(getResources().getColor(R.color.conditionBG)); + webSettings.setTextZoom(100); webview.loadUrl("file:///android_asset/pages/conditions_pages/visibility_forecast.html");