1.4.4 updated

PranshulGG · Aug 19, 2024 · bc747ea · bc747ea
1 parent 1ed44bd
commit bc747ea
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 35 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk 22
         targetSdk 33
         versionCode 2
-        versionName "1.4.3 (W)"
+        versionName "1.4.4 (W)"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app/src/main/assets/app/app.js b/app/src/main/assets/app/app.js
@@ -926,6 +926,7 @@ function getWeather(city, latitude, longitude) {
         })
         .catch(error => {
             console.error('Error fetching current weather:', error);
+            ShowError()
 
         });
 
@@ -1391,7 +1392,7 @@ function getWeatherByCoordinates(latitude, longitude) {
         })
           .catch(error => {
                     console.error('Error fetching current weather:', error);
-
+                    ShowError()
                 });
 
     currentLocation = {
@@ -1548,7 +1549,18 @@ function display24HourForecast(forecastData) {
             const description = forecast.weather[0].description;
             const rainPercentage = forecast.pop * 100;
             const rainMeterBarItem = document.createElement('rainMeterBarItem');
-            const rain1hr = forecast.rain ? forecast.rain['1h'] : 0;
+
+
+                        let rain1hr;
+
+
+
+                         if(forecast.snow){
+                         rain1hr = forecast.snow ? forecast.snow['1h'] : 0;
+                        }  else{
+                            rain1hr = forecast.rain ? forecast.rain['1h'] : 0;
+                        }
+
 
 
 
@@ -1703,7 +1715,6 @@ function displayDailyForecast(dailyForecast) {
             <p class="time-5d">${date}</p>
             </div>
 
-<md-ripple style="--md-ripple-pressed-opacity: 0.1;"></md-ripple>
             `
 
 
@@ -1718,24 +1729,11 @@ function displayDailyForecast(dailyForecast) {
         <div class="d5-disc-text">${description}
         <p class="time-5d">${date}</p>
         </div>
-        <md-ripple style="--md-ripple-pressed-opacity: 0.1;"></md-ripple>
 `
     ;
         }
 
 
-        forecastItem.addEventListener('click', () => {
-            forecastContainer.style.pointerEvents = 'none';
-
-            setTimeout(()=>{
-                sendThemeToAndroid('Open8Forecast')
-            }, 250);
-
-                        setTimeout(()=>{
-                            forecastContainer.style.pointerEvents = '';
-                        }, 800);
-        });
-
 
         forecastContainer.appendChild(forecastItem);
     });

diff --git a/app/src/main/assets/icons/error-cat.json b/app/src/main/assets/icons/error-cat.json
diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html
@@ -193,10 +193,10 @@ <h2 id="city-name" style="margin-right: 3px;">
 
             </rainMeter>
 
-            <div class="all-5d">
+            <div class="all-5d" onclick="sendThemeToAndroid('Open8Forecast')">
                 <div class="h2">
-                    <p class="forecast_Text">Forecast</p>
-                    <p class="icon_top">8-Days</p>
+                    <p>8-Days Forecast</p>
+                    <p class="" style="display: flex; align-items: center;">More <i icon-outlined style="font-size: 20px;">chevron_right</i></p>
                 </div>
                 <div class="forecast-5day" id="forecast-5day">
 
@@ -540,7 +540,7 @@ <h2 id="city-name" style="margin-right: 3px;">
 <div class="no_internet_error" hidden>
     <div class="img_wrap404" >
         <!-- <img src="icons/404.svg" alt=""> -->
-        <div id="error_img_cat" style="height: 330px;"></div>
+        <div id="error_img_cat" style="height: 290px;"></div>
     </div>
 
     <div class="text_content_error">

diff --git a/app/src/main/assets/modules/lottie.js b/app/src/main/assets/modules/lottie.js
diff --git a/app/src/main/assets/pages/AboutPage.html b/app/src/main/assets/pages/AboutPage.html
@@ -94,7 +94,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.4.3 (W)</div>
+                    <div slot="supporting-text">1.4.4 (W)</div>
                 </md-list-item>
 
             </md-list>
@@ -178,7 +178,7 @@
 
 
 document.getElementById('checkUpdatesBtn').addEventListener('click', async function() {
-    const currentVersion = 'v1.4.3';
+    const currentVersion = 'v1.4.4';
     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
@@ -881,11 +881,13 @@ touch_search{
   justify-content: center;
   align-items: center;
   text-align: center;
-  margin-top: 220px;
+  margin-top:190px;
+
 }
 .no_internet_error .text_content_error p{
   font-size: 30px;
   color: var(--Error);
+    margin-bottom: 20px;
 }
 
 .no_internet_error .text_content_error span{

diff --git a/release/output-metadata.json b/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 2,
-      "versionName": "1.4.2 (W)",
+      "versionName": "1.4.3 (W)",
       "outputFile": "app-release.apk"
     }
   ],