diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 9ea06b733..000000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 531d5fd6d..a891d2cad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.example.weathermaster" minSdk 22 targetSdk 33 - versionCode 65 - versionName "1.7.3 (W)" + versionCode 66 + versionName "1.7.4 (W)" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 7580ea6f4..7a1e44c11 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 65, - "versionName": "1.7.3 (W)", + "versionCode": 66, + "versionName": "1.7.4 (W)", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/assets/app/apiKeysRotation.js b/app/src/main/assets/app/apiKeysRotation.js index 48dae5b11..beb198489 100644 --- a/app/src/main/assets/app/apiKeysRotation.js +++ b/app/src/main/assets/app/apiKeysRotation.js @@ -1,27 +1,26 @@ const apiKeysDaily = [ -KEYS - + YOUR_KEY ]; const apiKeysAlerts = [ -KEYS + YOUR_KEY ]; const apiKeysCityName = [ -KEYS + YOUR_KEY ]; const apiKeysGeo = [ -KEYS + YOUR_KEY ]; const apiKeysVisual = [ -KEYS + YOUR_KEY ]; const astronomyApiKeys = [ -KEYS + YOUR_KEY ]; diff --git a/app/src/main/assets/app/app.js b/app/src/main/assets/app/app.js index 3beb85061..89266239a 100644 --- a/app/src/main/assets/app/app.js +++ b/app/src/main/assets/app/app.js @@ -83,6 +83,11 @@ if(DefaultLocation.name === 'CurrentDeviceLocation'){ } else if(DefaultLocation.lat && DefaultLocation.lon){ DecodeWeather(DefaultLocation.lat, DefaultLocation.lon) document.querySelector('.currentLocationdiv').hidden = true; + + document.getElementById('city-name').innerHTML = DefaultLocation.name; + document.getElementById('SelectedLocationText').innerHTML = DefaultLocation.name; + localStorage.setItem('CurrentLocationName', DefaultLocation.name) + document.getElementById('currentLocationName').textContent = DefaultLocation.name } } else{ @@ -287,6 +292,7 @@ document.addEventListener('DOMContentLoaded', () => { cityList.innerHTML = ''; cityInput.value = ''; document.getElementById('city-name').innerHTML = suggestionText; + document.getElementById('currentLocationName').innerHTML = suggestionText; document.querySelector('.focus-input').blur(); document.getElementById('forecast').scrollLeft = 0; document.getElementById('weather_wrap').scrollTop = 0; @@ -403,6 +409,7 @@ function loadSavedLocations() { savelocationtouch.addEventListener('click', () => { DecodeWeather(savedLocationItemLat, savedLocationItemLon) document.getElementById('city-name').innerHTML = location.locationName + document.getElementById('currentLocationName').innerHTML = location.locationName; document.getElementById('forecast').scrollLeft = 0; document.getElementById('weather_wrap').scrollTop = 0; window.history.back(); @@ -600,7 +607,7 @@ function RenderSearhMap() { DecodeWeather(lat, lon); - document.getElementById('city-name').innerHTML = ''; + document.getElementById('forecast').scrollLeft = 0; document.getElementById('weather_wrap').scrollTop = 0; }); @@ -637,7 +644,7 @@ function checkNoInternet(){ document.addEventListener('DOMContentLoaded', async function() { - const currentVersion = 'v1.7.2'; + const currentVersion = 'v1.7.4'; const githubRepo = 'PranshulGG/WeatherMaster'; const releasesUrl = `https://api.github.com/repos/${githubRepo}/releases/latest`; @@ -681,6 +688,18 @@ const scrollView = document.querySelector('.insights'); const scrollIndicators = document.getElementById('scroll-indicators'); +function saveScrollPosition() { + const scrollPosition = scrollView.scrollLeft; + localStorage.setItem('scrollPosition', scrollPosition); + } + + function restoreScrollPosition() { + const savedScrollPosition = localStorage.getItem('scrollPosition'); + if (savedScrollPosition) { + scrollView.scrollLeft = savedScrollPosition; + } + } + function createScrollDots(){ const sections = document.querySelectorAll('.insights_item'); @@ -712,13 +731,14 @@ const updateActiveIndicator = () => { }; +window.addEventListener('beforeunload', saveScrollPosition); + scrollView.addEventListener('scroll', updateActiveIndicator); document.addEventListener('DOMContentLoaded', ()=>{ createScrollDots() updateActiveIndicator(); - +restoreScrollPosition(); }); - diff --git a/app/src/main/assets/app/bg_animations.js b/app/src/main/assets/app/bg_animations.js index b64496a99..79248f7a5 100644 --- a/app/src/main/assets/app/bg_animations.js +++ b/app/src/main/assets/app/bg_animations.js @@ -882,7 +882,6 @@ function displayStars(){ var anim1fog function displayFog(){ - fogAnimation.startAnimation() var animationContainer1 = document.getElementById('background_animation'); var animationContainer2 = document.getElementById('foreground_animation'); @@ -894,7 +893,7 @@ function displayFog(){ animationContainer1.innerHTML = '' animationContainer2.innerHTML = '' - var animationData1 = 'lottie_animations/mostly_cloudy_background.json'; + var animationData1 = 'lottie_animations/haze_smoke_foreground.json'; anim1fog = bodymovin.loadAnimation({ @@ -951,6 +950,52 @@ function displayLeaves() { }); } +var anim1CloudFull + var anim2CloudFull + + function displayCloudsFull(){ + var animationContainer1 = document.getElementById('background_animation'); + var animationContainer2 = document.getElementById('foreground_animation'); + + + if (anim1CloudFull) { + anim1CloudFull.destroy(); + } + + + + animationContainer1.innerHTML = '' + animationContainer2.innerHTML = '' + + var animationData1 = 'lottie_animations/mostly_cloudy_background.json'; + var animationData2 = 'lottie_animations/mostly_cloudy_background.json'; + + + + anim1CloudFull = bodymovin.loadAnimation({ + container: animationContainer1, + renderer: 'svg', + loop: true, + autoplay: true, + path: animationData1, + rendererSettings: { + preserveAspectRatio: 'xMidYMid slice' + } + }); + + anim2CloudFull = bodymovin.loadAnimation({ + container: animationContainer2, + renderer: 'svg', + loop: true, + autoplay: true, + path: animationData2, + rendererSettings: { + preserveAspectRatio: 'xMidYMid slice' + } + }); + + } + // remove animations @@ -971,7 +1016,6 @@ function removeStars(){ } function removeFog(){ - fogAnimation.clearCanvas() if (anim1fog) anim1fog.destroy(); } @@ -992,3 +1036,7 @@ function removeLeaves(){ if (anim2) anim2.destroy(); } +function removeCloudsFull(){ + if (anim1CloudFull) anim1CloudFull.destroy(); + if (anim2CloudFull) anim2CloudFull.destroy(); +} \ No newline at end of file diff --git a/app/src/main/assets/app/day_summary.js b/app/src/main/assets/app/day_summary.js index 11368858a..2ac413215 100644 --- a/app/src/main/assets/app/day_summary.js +++ b/app/src/main/assets/app/day_summary.js @@ -16,8 +16,8 @@ function ReportFromdaily(data) { } function GenerateSummary(data) { - let hourlyWeather = getWeatherLabelInLangNoAnimText(data.hourlyData,1 , localStorage.getItem('AppLanguageCode')); - let dailyWeather = getWeatherLabelInLangNoAnim(data.dailyData, 1, localStorage.getItem('AppLanguageCode')); + let hourlyWeather = getWeatherLabelInLangNoAnimText(data.hourlyData, 1, 'en'); + let dailyWeather = getWeatherLabelInLangNoAnim(data.dailyData, 1, 'en'); let weatherComment = ''; diff --git a/app/src/main/assets/app/fetch.js b/app/src/main/assets/app/fetch.js index f2e5a9b97..198de6bed 100644 --- a/app/src/main/assets/app/fetch.js +++ b/app/src/main/assets/app/fetch.js @@ -5,7 +5,7 @@ function getCountryName(code) { async function DecodeWeather(lat, lon) { - const apiKey = 'KEYS'; + const apiKey = ' YOUR_KEY'; const url = `https://api.timezonedb.com/v2.1/get-time-zone?key=${apiKey}&format=json&by=position&lat=${lat}&lng=${lon}`; try { diff --git a/app/src/main/assets/app/renderWeather.js b/app/src/main/assets/app/renderWeather.js index 24918253e..a72ec4c68 100644 --- a/app/src/main/assets/app/renderWeather.js +++ b/app/src/main/assets/app/renderWeather.js @@ -1040,7 +1040,7 @@ function UvIndex(uvIndexValue) { function MoreDetails(latSum, lonSum) { - fetch(`https://api.weatherapi.com/v1/forecast.json?key=ef2cb48d90984d828a8140518240209&q=${latSum},${lonSum}`) + fetch(`https://api.weatherapi.com/v1/forecast.json?key= YOUR_KEY&q=${latSum},${lonSum}`) .then(response => response.json()) .then(data => { @@ -1193,7 +1193,7 @@ function MoreDetails(latSum, lonSum) { } function astronomyData(latSum, lonSum) { - fetch(`https://api.weatherapi.com/v1/astronomy.json?key=ef2cb48d90984d828a8140518240209&q=${latSum},${lonSum}`) + fetch(`https://api.weatherapi.com/v1/astronomy.json?key= YOUR_KEY&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=10baabdf43ea48d191075955241810&q=${lat},${lon}`) + fetch(`https://api.weatherapi.com/v1/alerts.json?key= YOUR_KEY&q=${lat},${lon}`) .then(response => response.json()) .then(data => { diff --git a/app/src/main/assets/langs/langs.js b/app/src/main/assets/langs/langs.js index 0ba9464c2..ce219d0e4 100644 --- a/app/src/main/assets/langs/langs.js +++ b/app/src/main/assets/langs/langs.js @@ -3161,4 +3161,4 @@ function applyTranslations(langCode) { const translationKey = el.getAttribute("data-translate"); el.textContent = getTranslationByLang(langCode, translationKey); }); -} +} \ No newline at end of file diff --git a/app/src/main/assets/modules/units.js b/app/src/main/assets/modules/units.js index df25dc8c4..c81460f76 100644 --- a/app/src/main/assets/modules/units.js +++ b/app/src/main/assets/modules/units.js @@ -209,6 +209,7 @@ function GetWeatherLabel(iconCode, isDay) { if (iconCode === 0) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -223,6 +224,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 1) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() displayClouds() removeRain() @@ -238,6 +240,7 @@ function GetWeatherLabel(iconCode, isDay) { }else{ removeDrizzle() displayClouds() + removeCloudsFull() removeRain() removeFog() removeSnow() @@ -250,7 +253,8 @@ function GetWeatherLabel(iconCode, isDay) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ removeDrizzle() - displayClouds() + removeClouds() + displayCloudsFull() removeRain() removeLeaves() removeFog() @@ -262,6 +266,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 45 || iconCode === 48) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -275,6 +280,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 51 || iconCode === 53 || iconCode === 55) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() displayDrizzle() removeClouds() removeRain() @@ -288,6 +294,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 56 || iconCode === 57) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() displayDrizzle() removeClouds() removeRain() @@ -301,6 +308,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 61 || iconCode === 63) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() displayRain() @@ -314,6 +322,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 65) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() displayRain() @@ -327,6 +336,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 66 || iconCode === 67) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() displayRain() @@ -340,6 +350,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 71) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -353,6 +364,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 73) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -366,6 +378,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 75) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -379,6 +392,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 77) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -392,6 +406,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 80 || iconCode === 81) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() displayRain() @@ -405,6 +420,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 82) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() displayRain() @@ -418,6 +434,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 85) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -431,6 +448,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 86) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -444,6 +462,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 95) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() displayRain() @@ -457,6 +476,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 96 || iconCode === 99) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() displayRain() @@ -472,6 +492,7 @@ function GetWeatherLabel(iconCode, isDay) { if (iconCode === 0) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -500,6 +521,7 @@ function GetWeatherLabel(iconCode, isDay) { }else{ removeDrizzle() displayClouds() + removeCloudsFull() removeRain() removeFog() removeSnow() @@ -512,7 +534,8 @@ function GetWeatherLabel(iconCode, isDay) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ removeDrizzle() - displayClouds() + removeClouds() + displayCloudsFull() removeRain() removeFog() removeLeaves() @@ -524,6 +547,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 45 || iconCode === 48) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeLeaves() @@ -537,6 +561,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 51 || iconCode === 53 || iconCode === 55) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() displayDrizzle() removeClouds() removeLeaves() @@ -550,6 +575,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 56 || iconCode === 57) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() displayDrizzle() removeClouds() removeRain() @@ -563,6 +589,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 61 || iconCode === 63) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() displayRain() @@ -576,6 +603,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 65) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() displayRain() @@ -589,6 +617,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 66 || iconCode === 67) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeLeaves() @@ -602,6 +631,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 71) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -615,6 +645,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 73) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -628,6 +659,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 75) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -641,6 +673,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 77) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -654,6 +687,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 80 || iconCode === 81) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() displayRain() @@ -667,6 +701,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 82) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() displayRain() @@ -680,6 +715,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 85) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -693,6 +729,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 86) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() removeRain() @@ -706,6 +743,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 95) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() displayRain() @@ -719,6 +757,7 @@ function GetWeatherLabel(iconCode, isDay) { } else if (iconCode === 96 || iconCode === 99) { if(localStorage.getItem('UseBackgroundAnimations') && localStorage.getItem('UseBackgroundAnimations') === 'false'){ }else{ + removeCloudsFull() removeDrizzle() removeClouds() displayRain() diff --git a/app/src/main/assets/pages/AboutPage.html b/app/src/main/assets/pages/AboutPage.html index c0a0e74d4..9addfc495 100644 --- a/app/src/main/assets/pages/AboutPage.html +++ b/app/src/main/assets/pages/AboutPage.html @@ -1,5 +1,6 @@ - + + @@ -11,18 +12,179 @@ + - + -
-
-
- -
+
+
-
-

WeatherMaster

- 1.7.3 (W) - +
+

Weather
Master

- Latest version refresh -
+ 1.7.4 (W) +
+ +
+ +
+
+ +
+ Latest + version refresh + + +
+ +
+ Create an issue bug_report + + +
+ +
+ +
+
+ code +
+

Source code

+ + +
-
+
+
+ privacy_tip +
+

Terms & Conditions

+ + +
+ +
+
+ policy +
+

Privacy Policy

+ + +
+ +
+
+ copyright +
+

Licenses

+ + +
+ +
- + - - privacy_tip -
Terms and Conditions
-
+ - - policy -
Privacy Policy
-
+
- - code -
View source code
-
+
- - copyright -
Third party licenses
+
-
- - - - -
- - - - - - - diff --git a/app/src/main/assets/pages/LanguagesPage.html b/app/src/main/assets/pages/LanguagesPage.html index 6874f9262..0a730909d 100644 --- a/app/src/main/assets/pages/LanguagesPage.html +++ b/app/src/main/assets/pages/LanguagesPage.html @@ -276,6 +276,14 @@ + diff --git a/app/src/main/assets/ui-files/ui.css b/app/src/main/assets/ui-files/ui.css index 5ef8abf7b..03beb3d9b 100644 --- a/app/src/main/assets/ui-files/ui.css +++ b/app/src/main/assets/ui-files/ui.css @@ -211,7 +211,7 @@ touch_search{ .left_current_weather .temp_img p{ color: var(--Primary); font-size: 60px; - font-family: Arial, Helvetica, sans-serif; + font-family: var(--google-mid); margin: 0; font-weight: 500; } @@ -2508,4 +2508,28 @@ max-width: 150px; margin: 0; font-family: var(--outfit-mid); +} + +@media screen and (min-width: 600px){ + .weather { + max-width: 50%; + margin-left: auto; + + } + + #search-container{ + display: block; + max-width: 50%; + height: calc(100% - 65px); + top: 65px; + left: 0; + } + + touch_search{ + pointer-events: none; + } + + .close_search{ + display: none !important; + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/weathermaster/AboutPage.java b/app/src/main/java/com/example/weathermaster/AboutPage.java index ef1469e71..e4358c138 100644 --- a/app/src/main/java/com/example/weathermaster/AboutPage.java +++ b/app/src/main/java/com/example/weathermaster/AboutPage.java @@ -217,6 +217,7 @@ public class AboutPage extends AppCompatActivity { url.startsWith("https://app-privacy-policy-generator.nisrulz.com/") || url.startsWith("https://github.com/PranshulGG/WeatherMaster") || url.startsWith("mailto:pranshul.devmain@gmail.com")|| + url.startsWith("https://github.com/PranshulGG/WeatherMaster/issues/new") || url.startsWith("https://github.com/PranshulGG/WeatherMaster/releases"); diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index c107e8513..c98b1a051 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -1 +1 @@ -

WeatherMaster is developed with pure HTML, CSS, JavaScript, and Java. Designed to mimic the look and feel of a native Android app.


Features:

\ No newline at end of file +

WeatherMaster inspired by the Google Pixel weather app, but with more features


Features:

\ No newline at end of file diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/01-current.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/01-current.png deleted file mode 100644 index e90fc3f7f..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/01-current.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/02-rain_8_days.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/02-rain_8_days.png deleted file mode 100644 index 7e3eeed3e..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/02-rain_8_days.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/03-map_sun_moon.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/03-map_sun_moon.png deleted file mode 100644 index a82ce1185..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/03-map_sun_moon.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/04-details.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/04-details.png deleted file mode 100644 index 7c21e3b85..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/04-details.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/05-air_uv.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/05-air_uv.png deleted file mode 100644 index f8b0c1169..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/05-air_uv.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/06-gov_alert.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/06-gov_alert.png deleted file mode 100644 index 3a170f928..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/06-gov_alert.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/07-moonphases.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/07-moonphases.png deleted file mode 100644 index ee1463770..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/07-moonphases.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/08-settings.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/08-settings.png deleted file mode 100644 index d293b88ab..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/08-settings.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png new file mode 100644 index 000000000..bb2bd7291 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png new file mode 100644 index 000000000..a92cfa0de Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png new file mode 100644 index 000000000..063aa1e07 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png new file mode 100644 index 000000000..0a332d53a Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png new file mode 100644 index 000000000..c7e64d35b Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png new file mode 100644 index 000000000..c48141bfb Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png new file mode 100644 index 000000000..9b6893e4b Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/8.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/8.png new file mode 100644 index 000000000..518626903 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/8.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/9.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/9.png new file mode 100644 index 000000000..33dd5100e Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/9.png differ diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt index b58fd89c3..678d7b08a 100644 --- a/fastlane/metadata/android/en-US/short_description.txt +++ b/fastlane/metadata/android/en-US/short_description.txt @@ -1 +1 @@ -Weather, Forecast, Moon Phases and more \ No newline at end of file +Weather, Forecasts, Moon Phases, and More \ No newline at end of file