mirror of
https://github.com/PranshulGG/WeatherMaster.git
synced 2026-10-22 02:52:37 -05:00
1.2.0 updated
This commit is contained in:
PranshulGG committed
1 parent
00fe4002eb
commit
f66d96b967
8 files changed
+434
-44
No files matched your search
+1
-1
@@ -11,7 +11,7 @@ android {
|
||||
minSdk 22
|
||||
targetSdk 33
|
||||
versionCode 2
|
||||
versionName "1.1.8 (W)"
|
||||
versionName "1.2.0 (W)"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
+138
-15
@@ -911,20 +911,21 @@ function updateSunTrackProgress(latitude, longitude) {
|
||||
fetch(apiUrl)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
const timeZoneOffsetSeconds = data.timezone;
|
||||
const sunriseUTC = new Date((data.sys.sunrise + timeZoneOffsetSeconds) * 1000);
|
||||
const sunsetUTC = new Date((data.sys.sunset + timeZoneOffsetSeconds) * 1000);
|
||||
const sunriseUTC = new Date(data.sys.sunrise * 1000);
|
||||
const sunsetUTC = new Date(data.sys.sunset * 1000);
|
||||
const currentTime = new Date();
|
||||
|
||||
const totalDaylight = sunsetUTC - sunriseUTC;
|
||||
|
||||
const timeSinceSunrise = currentTime - sunriseUTC;
|
||||
const percentageOfDaylight = (timeSinceSunrise / totalDaylight) * 100;
|
||||
|
||||
const progressWidth = Math.min(Math.max(percentageOfDaylight, 0), 100);
|
||||
let percentageOfDaylight = (timeSinceSunrise / totalDaylight) * 100;
|
||||
|
||||
percentageOfDaylight = Math.min(Math.max(percentageOfDaylight, 0), 100);
|
||||
|
||||
document.querySelector('suntrackprogress').style.width = `${percentageOfDaylight}%`;
|
||||
|
||||
document.querySelector('suntrackprogress').style.width = `${progressWidth}%`;
|
||||
|
||||
console.log('updated')
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error fetching sunrise/sunset data:', error);
|
||||
@@ -1204,7 +1205,13 @@ function updateMoonTrackProgress(lat, long) {
|
||||
const currentTime = new Date();
|
||||
|
||||
const totalMoonlight = moonsetTime - moonriseTime;
|
||||
const timeSinceMoonrise = currentTime - moonriseTime;
|
||||
|
||||
let timeSinceMoonrise = currentTime - moonriseTime;
|
||||
|
||||
if (currentTime > moonsetTime && currentTime < new Date(currentTime.getFullYear(), currentTime.getMonth(), currentTime.getDate(), 23, 59, 59)) {
|
||||
timeSinceMoonrise = totalMoonlight;
|
||||
}
|
||||
|
||||
const percentageOfMoonlight = (timeSinceMoonrise / totalMoonlight) * 100;
|
||||
|
||||
const moonProgressWidth = Math.min(Math.max(percentageOfMoonlight, 0), 100);
|
||||
@@ -1212,13 +1219,9 @@ function updateMoonTrackProgress(lat, long) {
|
||||
document.querySelector('moontrackprogress').style.width = `${moonProgressWidth}%`;
|
||||
|
||||
const moonrise = formatTimeMoonRiseMoonSet(data.moonrise);
|
||||
const moonset = formatTimeMoonRiseMoonSet(data.moonset);
|
||||
const moonset = data.moonset === "-:-" ? "Not available" : formatTimeMoonRiseMoonSet(data.moonset);
|
||||
document.getElementById('moonrise').textContent = `${moonrise}`;
|
||||
if (data.moonset === "-:-") {
|
||||
document.getElementById('moonset').textContent = "Not available";
|
||||
} else{
|
||||
document.getElementById('moonset').textContent = `${moonset}`;
|
||||
}
|
||||
document.getElementById('moonset').textContent = `${moonset}`;
|
||||
|
||||
})
|
||||
.catch(error => {
|
||||
@@ -1226,6 +1229,7 @@ function updateMoonTrackProgress(lat, long) {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
function parseTime(time24) {
|
||||
const [hours, minutes] = time24.split(':').map(Number);
|
||||
const currentDate = new Date();
|
||||
@@ -1280,7 +1284,9 @@ function RenderSearhMap() {
|
||||
|
||||
map = window.L.map('map', {
|
||||
center: [latDif, longDif],
|
||||
zoom: 13
|
||||
zoom: 13,
|
||||
zoomControl: false
|
||||
|
||||
});
|
||||
|
||||
window.L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {}).addTo(map);
|
||||
@@ -1307,3 +1313,120 @@ function removeMap() {
|
||||
map = null;
|
||||
}
|
||||
}
|
||||
|
||||
var livemap;
|
||||
|
||||
function liveMapRender(maptype){
|
||||
|
||||
const latDif = localStorage.getItem('currentLat');
|
||||
const longDif = localStorage.getItem('currentLong');
|
||||
|
||||
livemap = window.L.map('livemap', {
|
||||
center: [latDif, longDif],
|
||||
zoom: 4,
|
||||
minZoom: 3,
|
||||
zoomControl: false
|
||||
});
|
||||
|
||||
|
||||
window.L.marker([latDif, longDif]).addTo(livemap);
|
||||
|
||||
|
||||
const apiKey = '9458a8b672d3e5ed460b72e7637c6eeb';
|
||||
|
||||
window.L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {}).addTo(livemap);
|
||||
|
||||
|
||||
window.L.tileLayer(`https://tile.openweathermap.org/map/${maptype}/{z}/{x}/{y}.png?appid=${apiKey}`).addTo(livemap);
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
function removeLiveMap() {
|
||||
if (livemap) {
|
||||
livemap.remove();
|
||||
livemap = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
function Open_RefreshLiveMap(type){
|
||||
removeLiveMap()
|
||||
|
||||
setTimeout(()=>{
|
||||
liveMapRender(type)
|
||||
}, 500);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
function toggleMapTypeChips(element) {
|
||||
if (element.selected) {
|
||||
var passChips = document.getElementsByName('MapType');
|
||||
passChips.forEach((passChip) => {
|
||||
if (passChip !== element) {
|
||||
passChip.selected = false;
|
||||
}
|
||||
|
||||
});
|
||||
} else{
|
||||
element.selected = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function openLivemap(){
|
||||
document.querySelector('.liveMapScreen').hidden = false;
|
||||
window.history.pushState({ LiveMapOpen: true }, "");
|
||||
}
|
||||
|
||||
function closeLiveMap(){
|
||||
document.querySelector('.liveMapScreen').style.height = '0'
|
||||
document.querySelector('.liveMapScreen').style.opacity = '0'
|
||||
|
||||
|
||||
setTimeout(()=>{
|
||||
document.querySelector('.liveMapScreen').hidden = true;
|
||||
document.querySelector('.liveMapScreen').style.height = ''
|
||||
document.querySelector('.liveMapScreen').style.opacity = ''
|
||||
|
||||
}, 350);
|
||||
|
||||
}
|
||||
|
||||
|
||||
window.addEventListener('popstate', function (event) {
|
||||
if(!document.querySelector('.liveMapScreen').hidden){
|
||||
closeLiveMap()
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
function refreshCurrentMap(){
|
||||
if(document.querySelector('[label="Rain"]').selected){
|
||||
Open_RefreshLiveMap('rain')
|
||||
} else if(document.querySelector('[label="Clouds"]').selected){
|
||||
Open_RefreshLiveMap('clouds')
|
||||
} else if(document.querySelector('[label="Temperature"]').selected){
|
||||
Open_RefreshLiveMap('temp_new')
|
||||
|
||||
} else if(document.querySelector('[label="Snow"]').selected){
|
||||
Open_RefreshLiveMap('snow')
|
||||
|
||||
} else if(document.querySelector('[label="Wind"]').selected){
|
||||
Open_RefreshLiveMap('wind_new')
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
<svg width="240" height="215" viewBox="0 0 240 215" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M229.597 107.354C229.597 166.644 181.533 214.708 122.244 214.708C62.9536 214.708 14.8896 166.644 14.8896 107.354C14.8896 48.064 62.9536 0 122.244 0C181.533 0 229.597 48.064 229.597 107.354C229.597 166.644 229.597 107.354 229.597 107.354Z" fill="url(#paint0_linear_9_632)"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M74.4663 114.24H70.9023V119.731C70.9023 122.187 70.228 124.017 68.8795 125.318C67.5309 126.618 65.7489 127.244 63.5816 127.244C61.4143 127.244 59.6323 126.618 58.2837 125.318C56.9352 124.017 56.2609 122.187 56.2609 119.731V114.24H32.9503C30.9757 114.24 29.3863 113.662 28.2304 112.458C27.0745 111.254 26.4966 109.761 26.4966 107.979C26.4966 106.197 27.1227 104.367 28.3268 102.585L56.9834 61.6471C57.754 60.5394 58.7172 59.7206 59.8731 59.1908C61.029 58.661 62.2331 58.3721 63.5334 58.3721C65.5081 58.3721 67.2419 59.0463 68.735 60.3467C70.228 61.6471 70.9504 63.4773 70.9504 65.7891V102.778H74.5145C79.138 102.826 81.498 104.704 81.498 108.461C81.498 112.314 79.138 114.24 74.4663 114.24ZM56.3091 81.6827L41.6196 102.826H56.3091V81.6827Z" fill="url(#paint1_linear_9_632)"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M205.42 114.24H201.856V119.731C201.856 122.187 201.181 124.017 199.833 125.318C198.484 126.618 196.702 127.244 194.535 127.244C192.368 127.244 190.586 126.618 189.237 125.318C187.889 124.017 187.214 122.187 187.214 119.731V114.24H163.856C161.881 114.24 160.292 113.662 159.136 112.458C157.98 111.254 157.402 109.761 157.402 107.979C157.402 106.197 158.028 104.367 159.232 102.585L187.889 61.6471C188.659 60.5394 189.622 59.7206 190.778 59.1908C191.934 58.661 193.138 58.3721 194.439 58.3721C196.413 58.3721 198.147 59.0463 199.64 60.3467C201.133 61.6471 201.856 63.4773 201.856 65.7891V102.778H205.42C210.091 102.826 212.451 104.704 212.451 108.461C212.451 112.314 210.091 114.24 205.42 114.24ZM187.263 81.6827L172.573 102.826H187.263V81.6827Z" fill="url(#paint2_linear_9_632)"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M148.732 90.6901C148.732 107.129 135.406 120.454 118.968 120.454C102.53 120.454 89.2036 107.129 89.2036 90.6901C89.2036 74.2517 102.53 60.9258 118.968 60.9258C135.406 60.9258 148.732 74.2517 148.732 90.6901C148.732 107.129 148.732 90.6901 148.732 90.6901Z" fill="url(#paint3_linear_9_632)"/>
|
||||
<path d="M102.738 106.872C101.293 105.427 101.293 103.067 102.738 101.622L129.902 74.4587C131.346 73.0138 133.706 73.0138 135.151 74.4587C136.596 75.9035 136.596 78.2635 135.151 79.7083L108.036 106.92C107.313 107.643 106.35 107.98 105.387 107.98C104.424 107.98 103.509 107.594 102.738 106.872Z" fill="#7BBE7A"/>
|
||||
<path d="M36.4664 133.264C37.4778 124.98 42.6312 120.935 42.872 120.742L44.4132 122.765L43.6426 121.754L44.4132 122.765C44.365 122.813 39.8377 126.425 38.9708 133.602C38.0557 141.404 41.5716 150.362 49.4702 160.235L47.4956 161.873C39.1635 151.422 35.455 141.789 36.4664 133.264Z" fill="#BEC9DB"/>
|
||||
<path d="M44.6055 123.296L46.243 122.285C47.0618 121.755 47.2544 120.648 46.6765 119.877L46.4838 119.636C45.9059 118.914 44.7982 118.817 44.1239 119.443L42.679 120.744C41.9084 121.322 41.9084 122.526 42.679 123.152C43.2088 123.634 44.0276 123.682 44.6055 123.296Z" fill="#102C56"/>
|
||||
<path d="M65.2671 162.837C75.8628 155.95 82.0276 148.533 83.6169 140.779C85.0618 133.651 81.9313 128.883 81.8831 128.835L84.0022 127.39C84.1467 127.63 87.8071 133.121 86.1214 141.26C84.3875 149.737 77.8375 157.684 66.6638 165.004L65.2671 162.837Z" fill="#BEC9DB"/>
|
||||
<path d="M81.5941 129.267L80.3419 127.774C79.7157 127.004 79.9084 125.896 80.7272 125.318L81.0161 125.125C81.7867 124.595 82.8945 124.884 83.3279 125.703L84.2912 127.389C84.7728 128.256 84.3875 129.364 83.4724 129.749C82.7981 130.038 82.0275 129.845 81.5941 129.267Z" fill="#102C56"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M138.086 132.809C143.004 134.371 145.725 139.624 144.163 144.542C142.601 149.46 137.347 152.181 132.429 150.619C127.511 149.057 124.79 143.804 126.352 138.886C127.914 133.968 133.168 131.247 138.086 132.809C143.004 134.371 138.086 132.809 138.086 132.809Z" fill="url(#paint4_linear_9_632)"/>
|
||||
<path d="M92.6232 158.213L74.7068 183.595C72.1542 187.207 67.4824 188.604 63.3405 186.966C59.3911 185.425 56.983 181.524 57.3202 177.334L57.6091 173.288C59.4393 173.24 61.2695 172.758 62.8588 171.795C63.1478 171.602 63.4368 171.458 63.7257 171.265C66.0857 169.58 67.6269 167.075 68.0604 164.234C68.2049 163.27 67.5306 162.355 66.5673 162.163C65.6041 162.018 64.689 162.692 64.4963 163.656C64.2074 165.582 63.1478 167.22 61.6066 168.376C60.0654 169.483 58.1389 169.965 56.2124 169.628C52.2631 169.002 49.6142 165.293 50.2403 161.344C50.3848 160.381 49.7105 159.466 48.7472 159.273C47.784 159.128 46.8689 159.803 46.6763 160.766C45.8093 166.112 49.0362 171.121 53.9969 172.758L53.6598 177.093C53.2264 182.872 56.5496 188.17 61.9437 190.338C65.8449 191.879 70.0832 191.445 73.5027 189.423C75.0921 188.507 76.4888 187.207 77.5965 185.666L95.5129 160.284C103.363 149.207 116.126 142.994 129.708 143.765C130.72 143.813 131.538 143.042 131.587 142.079C131.683 141.116 130.96 140.249 129.949 140.201C115.163 139.382 101.196 146.125 92.6232 158.213Z" fill="#102C56"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M141.508 141.729C141.515 145.187 138.717 147.996 135.259 148.002C131.801 148.008 128.992 145.21 128.986 141.752C128.98 138.294 131.778 135.486 135.236 135.48C138.694 135.473 141.502 138.271 141.508 141.729C141.515 145.187 141.508 141.729 141.508 141.729Z" fill="#FFD18C"/>
|
||||
<path d="M240 142.319C240 142.319 227.044 155.708 217.171 160.621C207.298 165.533 200.603 165.726 200.603 165.726L168.671 156.286C168.671 156.238 191.452 151.759 209.513 135.528L240 142.319Z" fill="url(#paint5_linear_9_632)"/>
|
||||
<path d="M239.952 142.271C239.952 142.271 226.322 154.697 215.919 158.887C205.516 163.125 198.532 162.836 198.532 162.836L165.156 151.374C165.156 151.422 189.044 148.484 208.068 133.554L239.952 142.271Z" fill="url(#paint6_linear_9_632)"/>
|
||||
<path d="M152.826 39.5416L167.42 45.321C170.695 46.6214 172.284 50.3299 170.984 53.605C169.683 56.88 165.975 58.4694 162.7 57.169L148.107 51.3895C144.831 50.0409 143.242 46.3324 144.543 43.1056C145.843 39.8305 149.551 38.2412 152.826 39.5416Z" fill="url(#paint7_linear_9_632)"/>
|
||||
<path d="M167.372 45.2726L157.787 41.4678C161.062 42.7682 162.652 46.4767 161.351 49.7517C160.051 53.0267 156.342 54.6161 153.067 53.3157L162.652 57.1205C165.927 58.4209 169.635 56.8316 170.936 53.5565C172.236 50.2815 170.647 46.573 167.372 45.2726Z" fill="url(#paint8_linear_9_632)"/>
|
||||
<path d="M15.2743 122.766L26.448 139.912C28.9524 143.765 27.8929 148.919 24.0399 151.423C20.1869 153.927 15.0335 152.868 12.5291 149.015L1.3554 131.821C-1.14905 128.016 -0.0894749 122.863 3.76351 120.358C7.6165 117.854 12.7699 118.913 15.2743 122.766Z" fill="url(#paint9_linear_9_632)"/>
|
||||
<path d="M26.4481 139.864L19.1274 128.643C21.6319 132.496 20.5723 137.649 16.7193 140.153C12.8663 142.658 7.71294 141.598 5.2085 137.745L12.5292 148.967C15.0336 152.82 20.187 153.88 24.04 151.375C27.893 148.871 28.9525 143.717 26.4481 139.864Z" fill="url(#paint10_linear_9_632)"/>
|
||||
<path opacity="0.2" d="M87.0847 24.7556L85.5917 23.3108L91.6601 17.146L92.4789 17.9647C92.8642 18.3019 93.4421 18.3019 93.7793 17.9647C94.1164 17.5794 94.1164 17.0015 93.7793 16.6643L88.4814 11.4628C88.0961 11.1257 87.5182 11.1257 87.181 11.4628C86.8439 11.8481 86.8439 12.4261 87.181 12.7632L87.9998 13.582L81.9313 19.7467L80.4383 18.3019L80.1975 18.0611C79.8122 17.7239 79.2342 17.7239 78.8971 18.0611C78.56 18.4464 78.56 19.0243 78.8971 19.3614L79.1379 19.6023L61.1733 37.904C60.6917 38.3856 60.5954 39.108 60.8844 39.686L62.3292 42.4794L50.7221 54.3273C50.4813 54.5681 50.4813 54.9053 50.7221 55.1461C50.9629 55.3869 51.3482 55.3869 51.5409 55.1461L63.148 43.3463L65.9896 44.6949C66.6157 44.9838 67.3381 44.8393 67.7716 44.4059L85.7362 26.056L85.977 26.2968C86.3623 26.634 86.9402 26.634 87.2773 26.2968C87.7108 25.9115 87.7108 25.3336 87.3255 24.9964L87.0847 24.7556Z" fill="url(#paint11_linear_9_632)"/>
|
||||
<path opacity="0.2" d="M139.726 18.4462C139.1 17.483 138.859 16.2789 139.004 15.123L139.148 14.0153H139.293C139.678 14.0634 140.063 13.8226 140.111 13.3892L140.545 10.5476C140.593 10.1623 140.352 9.77699 139.919 9.72883L127.397 7.89866C127.011 7.85049 126.626 8.09131 126.578 8.52477L126.144 11.3663C126.096 11.7516 126.337 12.1369 126.77 12.1851H126.915L126.77 13.2928C126.578 14.4487 126 15.5083 125.133 16.2307L123.399 17.7238C122.869 18.1572 122.532 18.7833 122.436 19.5058L119.931 36.4589C119.739 37.6148 120.558 38.7226 121.762 38.9152L136.499 41.0825C137.655 41.2752 138.763 40.4564 138.956 39.2524L141.46 22.2992C141.508 21.6731 141.364 20.9507 140.978 20.3727L139.726 18.4462Z" fill="url(#paint12_linear_9_632)"/>
|
||||
<path opacity="0.2" d="M112.419 186.292C112.178 186.34 111.937 186.148 111.889 185.859L111.214 179.116C111.166 178.875 110.974 178.683 110.685 178.683L104.568 179.309C104.327 179.357 104.135 179.55 104.135 179.839L104.809 186.581C104.857 186.822 104.664 187.063 104.375 187.111L97.6327 187.785C97.3919 187.833 97.1992 188.026 97.1992 188.315L97.8253 194.432C97.8735 194.673 98.0661 194.865 98.3551 194.865L105.098 194.191C105.339 194.143 105.579 194.335 105.628 194.624L106.302 201.367C106.35 201.608 106.543 201.801 106.832 201.801L112.948 201.174C113.189 201.126 113.382 200.934 113.382 200.645L112.707 193.902C112.659 193.661 112.852 193.42 113.141 193.372L119.884 192.698C120.124 192.65 120.317 192.457 120.317 192.168L119.691 186.051C119.643 185.762 119.402 185.57 119.161 185.618L112.419 186.292Z" fill="url(#paint13_linear_9_632)"/>
|
||||
<path opacity="0.2" fill-rule="evenodd" clip-rule="evenodd" d="M153.867 169.22C155.796 170.399 156.404 172.919 155.226 174.848C154.047 176.777 151.527 177.386 149.598 176.207C147.668 175.028 147.06 172.508 148.239 170.579C149.418 168.65 151.937 168.041 153.867 169.22C155.796 170.399 153.867 169.22 153.867 169.22Z" fill="url(#paint14_linear_9_632)"/>
|
||||
<path opacity="0.2" d="M172.38 182.823L178.641 176.659C179.845 175.455 181.82 175.503 182.976 176.707C184.18 177.911 184.132 179.886 182.928 181.041L176.667 187.206C175.511 188.362 173.536 188.362 172.332 187.158C171.128 185.954 171.176 183.979 172.38 182.823Z" fill="url(#paint15_linear_9_632)"/>
|
||||
<defs>
|
||||
<linearGradient id="paint0_linear_9_632" x1="-16.0917" y1="0" x2="-16.0917" y2="276.67" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#74B973"/>
|
||||
<stop offset="1" stop-color="#F3FBF2"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint1_linear_9_632" x1="26.4966" y1="58.3721" x2="26.4966" y2="127.244" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#8CCC8B"/>
|
||||
<stop offset="1" stop-color="#74B973"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint2_linear_9_632" x1="157.402" y1="58.3721" x2="157.402" y2="127.244" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#8CCC8B"/>
|
||||
<stop offset="1" stop-color="#74B973"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint3_linear_9_632" x1="83.5553" y1="58.1006" x2="77.9049" y2="128.926" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#B4EAB3"/>
|
||||
<stop offset="1" stop-color="#8CCC8B"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint4_linear_9_632" x1="123.524" y1="147.791" x2="141.334" y2="153.447" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#FFA620"/>
|
||||
<stop offset="1" stop-color="#F39200"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint5_linear_9_632" x1="176.67" y1="135.55" x2="173.458" y2="169.152" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#CBF1CA"/>
|
||||
<stop offset="1" stop-color="#ADE1AC"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint6_linear_9_632" x1="173.543" y1="133.575" x2="170.658" y2="166.206" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#D9F8D9"/>
|
||||
<stop offset="1" stop-color="#C6F1C5"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint7_linear_9_632" x1="144.089" y1="39.0879" x2="144.089" y2="57.6226" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#8CCC8B"/>
|
||||
<stop offset="1" stop-color="#74B973"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint8_linear_9_632" x1="153.067" y1="41.4678" x2="153.067" y2="57.5742" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#FFA620"/>
|
||||
<stop offset="1" stop-color="#F39200"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint9_linear_9_632" x1="0" y1="119.003" x2="0" y2="152.778" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#8CCC8B"/>
|
||||
<stop offset="1" stop-color="#74B973"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint10_linear_9_632" x1="5.2085" y1="128.643" x2="5.2085" y2="152.731" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#FFA620"/>
|
||||
<stop offset="1" stop-color="#F39200"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint11_linear_9_632" x1="59.7035" y1="3.78182" x2="34.1503" y2="73.128" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#85C284"/>
|
||||
<stop offset="1" stop-color="#85C284" stop-opacity="0.5"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint12_linear_9_632" x1="130.843" y1="-1.2411" x2="104.636" y2="20.055" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#85C284"/>
|
||||
<stop offset="1" stop-color="#85C284" stop-opacity="0.5"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint13_linear_9_632" x1="76.8493" y1="178.683" x2="76.8493" y2="242.5" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#85C284"/>
|
||||
<stop offset="1" stop-color="#85C284" stop-opacity="0.01"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint14_linear_9_632" x1="145.379" y1="175.26" x2="154.741" y2="180.981" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#85C284"/>
|
||||
<stop offset="1" stop-color="#85C284" stop-opacity="0.01"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint15_linear_9_632" x1="169.344" y1="175.779" x2="169.344" y2="192.246" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#85C284"/>
|
||||
<stop offset="1" stop-color="#85C284" stop-opacity="0.01"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 129 KiB |
@@ -161,6 +161,12 @@
|
||||
<p id="cloth_recommended"></p>
|
||||
</div>
|
||||
|
||||
<div class="LiveMapWrap ripple_btn_low" onclick="openLivemap();Open_RefreshLiveMap('temp_new')">
|
||||
<div id="livemapPreview">
|
||||
<img src="icons/prevmap.png" alt="">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="setRiseDivWrap" style="margin-bottom: 0px;">
|
||||
<div class="h1">
|
||||
@@ -384,10 +390,23 @@
|
||||
<div id="toast-container" class="toast-container"></div>
|
||||
|
||||
<div class="no_internet_error" hidden>
|
||||
<div class="top_error_internet">Something went wrong!</div>
|
||||
<div class="bottom_no_interNet_actions">
|
||||
<p style="text-align: center;">An error occurred</p>
|
||||
<md-filled-button onclick="window.location.reload(); sendThemeToAndroid('10d')">Retry</md-filled-button></div>
|
||||
<div class="img_wrap404">
|
||||
<img src="icons/404.svg" alt="">
|
||||
</div>
|
||||
|
||||
<div class="text_content_error">
|
||||
<p>Error occurred!</p>
|
||||
|
||||
<span>Check your internet connection and try again.</span>
|
||||
<span>OR</span>
|
||||
<span>There might be an API error.</span>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="retry_btn_error">
|
||||
<button class="ripple_btn" onclick="window.location.reload(); sendThemeToAndroid('10d')">Retry</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@@ -395,6 +414,45 @@
|
||||
<p>UI isn't made for Desktop devices</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="liveMapScreen" hidden>
|
||||
<div class="topLiveMapActions">
|
||||
<div>
|
||||
<button class="ripple-icon-btn focus regular" onclick="window.history.back()" ontouchstart="playEffect(this)"
|
||||
ontouchend="playEffect2(this)">
|
||||
<span class="ripple-effect-icon"></span>
|
||||
<span icon-outlined>arrow_back</span>
|
||||
</button>
|
||||
<p>Live map</p></div>
|
||||
<div>
|
||||
<button class="ripple-icon-btn focus regular" ontouchstart="playEffect(this)" onclick="refreshCurrentMap()"
|
||||
ontouchend="playEffect2(this)">
|
||||
<span class="ripple-effect-icon"></span>
|
||||
<span icon-outlined>autorenew</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="liveMapHolder">
|
||||
<div id="livemap">
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="map_Type">
|
||||
<md-chip-set>
|
||||
<md-filter-chip label="Rain" onclick="Open_RefreshLiveMap('rain');toggleMapTypeChips(this);" name="MapType"></md-filter-chip>
|
||||
<md-filter-chip label="Clouds" onclick="Open_RefreshLiveMap('clouds');toggleMapTypeChips(this);" name="MapType"></md-filter-chip>
|
||||
<md-filter-chip label="Snow" onclick="Open_RefreshLiveMap('snow'); toggleMapTypeChips(this);" name="MapType"></md-filter-chip>
|
||||
<md-filter-chip label="Wind" onclick="Open_RefreshLiveMap('wind_new');toggleMapTypeChips(this);" name="MapType"></md-filter-chip>
|
||||
<md-filter-chip label="Temperature" onclick="Open_RefreshLiveMap('temp_new');toggleMapTypeChips(this);" name="MapType" selected></md-filter-chip>
|
||||
</md-chip-set>
|
||||
</div>
|
||||
</div>
|
||||
<!-- togglePasswordTypeChips(this); -->
|
||||
|
||||
</div>
|
||||
|
||||
<script>
|
||||
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
<md-list-item id="show_time_toast">
|
||||
<md-icon slot="start" icon-filled>info</md-icon>
|
||||
<div slot="headline" style="margin-bottom: 2px;">Version</div>
|
||||
<div slot="supporting-text">1.1.9 (W)</div>
|
||||
<div slot="supporting-text">1.2.0 (W)</div>
|
||||
</md-list-item>
|
||||
|
||||
</md-list>
|
||||
|
||||
@@ -736,33 +736,51 @@ body {
|
||||
background-color: var(--Surface);
|
||||
}
|
||||
|
||||
.top_error_internet {
|
||||
height: 45px;
|
||||
padding: 10px;
|
||||
padding-left: 20px;
|
||||
color: var(--On-Surface);
|
||||
background-color: var(--Surface);
|
||||
border-bottom: 1px solid transparent;
|
||||
font-size: 16px;
|
||||
gap: 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.bottom_no_interNet_actions {
|
||||
.no_internet_error .img_wrap404{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
gap: 20px;
|
||||
margin-top: 100px;
|
||||
padding-top:30px;
|
||||
}
|
||||
|
||||
.bottom_no_interNet_actions p {
|
||||
font-size: 50px;
|
||||
font-family: var(--google-mid);
|
||||
.no_internet_error .text_content_error{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
}
|
||||
.no_internet_error .text_content_error p{
|
||||
font-size: 30px;
|
||||
color: var(--Error);
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.no_internet_error .text_content_error span{
|
||||
display: block;
|
||||
color: var(--On-Surface);
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.retry_btn_error{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: calc(100% - 40px);
|
||||
position: absolute;
|
||||
bottom: 50px;
|
||||
justify-content: center;
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.retry_btn_error button{
|
||||
background: var(--Error-Container);
|
||||
color: var(--On-Error-Container);
|
||||
font-family: var(--outfit);
|
||||
width: 100%;
|
||||
border: none;
|
||||
height: 50px;
|
||||
border-radius: 10px;
|
||||
font-size: 24px;
|
||||
|
||||
}
|
||||
|
||||
.city-list .suggest {
|
||||
@@ -1289,4 +1307,104 @@ rainMeterBar{
|
||||
padding: 5px;
|
||||
border-radius: 10px;
|
||||
margin: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.LiveMapWrap #livemapPreview img{
|
||||
border-radius: 10px;
|
||||
width: 100%;
|
||||
height: 100px;
|
||||
z-index: -1;
|
||||
}
|
||||
|
||||
.LiveMapWrap{
|
||||
margin: 10px;
|
||||
padding: 10px;
|
||||
background-color: var(--Surface);
|
||||
border-radius: 10px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.LiveMapWrap::before{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
border-radius: inherit;
|
||||
content: 'Live map';
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
top: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 30px;
|
||||
color: rgb(255, 255, 255);
|
||||
left: 0;
|
||||
}
|
||||
|
||||
.liveMapScreen{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: var(--Surface);
|
||||
z-index: 99;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
animation: liveMapScreen 0.3s cubic-bezier(1,0,0,1);
|
||||
transition:all 0.3s cubic-bezier(1,0,0,1);
|
||||
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
@keyframes liveMapScreen{
|
||||
0%{
|
||||
opacity: 0;
|
||||
height: 0;
|
||||
}
|
||||
100%{
|
||||
opacity: 1;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.liveMapScreen .liveMapHolder #livemap{
|
||||
/* height: calc(100% - 60px); */
|
||||
height: 100%;
|
||||
/* border-radius: 20px; */
|
||||
width: 100%;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
|
||||
.liveMapHolder{
|
||||
display: flex;
|
||||
background-color: var(--Surface);
|
||||
height: calc(100% - 65px);
|
||||
overflow: hidden;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.liveMapScreen .topLiveMapActions{
|
||||
display: flex;
|
||||
padding: 10px;
|
||||
height: 45px;
|
||||
background-color: var(--Surface);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.liveMapScreen .topLiveMapActions div{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.liveMapScreen .topLiveMapActions div p{
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.map_Type{
|
||||
padding: 10px;
|
||||
padding-bottom: 20px;
|
||||
}
|
||||
@@ -195,7 +195,7 @@
|
||||
--Error: #ffb4ab;
|
||||
--On-Error: #690005;
|
||||
--Error-Container: #93000a;
|
||||
--On-Error-Container: #93000a;
|
||||
--On-Error-Container: #ffdad6;
|
||||
--Surface-Dim:#12131b ;
|
||||
--Surface: #001d33;
|
||||
--Surface-Bright: #383942;
|
||||
|
||||
Reference in new issue
Block a user