diff --git a/app/build.gradle b/app/build.gradle
index 4a32c247a..7b7d15f5a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
minSdk 22
targetSdk 33
versionCode 42
- versionName "1.5.1 (W)"
+ versionName "1.5.2 (W)"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/src/main/assets/app/app.js b/app/src/main/assets/app/app.js
index ebadd1a26..5237c961e 100644
--- a/app/src/main/assets/app/app.js
+++ b/app/src/main/assets/app/app.js
@@ -64,7 +64,8 @@ function useAutoCurrentLocation(){
}, (error) => {
console.error('Geolocation error:', error);
-
+ document.getElementById('search-container').style.display = 'block';
+ window.history.pushState({ SearchContainerOpen: true }, "");
});
} else {
console.error('Geolocation is not available in this browser.');
@@ -73,13 +74,22 @@ function useAutoCurrentLocation(){
}
+if(DefaultLocation){
if(DefaultLocation.name === 'CurrentAutoLocation'){
useAutoCurrentLocation()
+ sendThemeToAndroid("ReqLocation")
+ document.querySelector('.currentLocationdiv').hidden = false;
} else if(DefaultLocation.lat && DefaultLocation.lon){
getWeather(' ', DefaultLocation.lat, DefaultLocation.lon)
-} else{
- useAutoCurrentLocation()
+ document.querySelector('.currentLocationdiv').hidden = true;
}
+}
+else{
+ useAutoCurrentLocation()
+ sendThemeToAndroid("ReqLocation")
+ document.querySelector('.currentLocationdiv').hidden = false;
+}
+
const Uv_0 = 'A UV index is satisfactory, indicating that there is little or no risk of harm from ultraviolet radiation.';
@@ -115,12 +125,6 @@ document.addEventListener('DOMContentLoaded', () => {
let savedLocations = JSON.parse(localStorage.getItem('savedLocations')) || [];
- document.querySelector('savedLocationsHolder').innerHTML = ''
-
- setTimeout(()=>{
- loadSavedLocations()
- }, 150);
-
searchContainer.style.display = 'block';
window.history.pushState({ SearchContainerOpen: true }, "");
document.querySelector('.header_hold').style.transform = 'scale(1.1)';
@@ -404,7 +408,7 @@ function loadSavedLocations() {
const savedLocationItemLon = savedLocationItem.getAttribute('lon');
- const apiKeySaved = '120d979ba5b2d0780f51872890f5ad0b';
+ const apiKeySaved = `${KEY}`;
const apiUrlSaved = `https://api.openweathermap.org/data/2.5/weather?lat=${savedLocationItemLat}&lon=${savedLocationItemLon}&appid=${apiKeySaved}&units=metric`;
@@ -511,7 +515,7 @@ function deleteLocation(locationName) {
function setCurrentLocation(lat, lon){
- const apiKeyCurrent = '120d979ba5b2d0780f51872890f5ad0b';
+ const apiKeyCurrent = 'KEY';
const apiUrlCurrent = `https://api.openweathermap.org/data/2.5/weather?lat=${lat}&lon=${lon}&appid=${apiKeyCurrent}&units=metric`;
@@ -626,7 +630,7 @@ function getCountryName(code) {
function getWeather(city, latitude, longitude) {
showLoader();
- const apiKey = '120d979ba5b2d0780f51872890f5ad0b';
+ const apiKey = 'KEY';
const apiUrl = `https://api.openweathermap.org/data/2.5/weather?lat=${latitude}&lon=${longitude}&appid=${apiKey}&units=metric`;
setTimeout(() => {
@@ -1117,7 +1121,7 @@ function getCurrentLocationWeather() {
function getWeatherByCoordinates(latitude, longitude) {
showLoader();
- const apiKey = '120d979ba5b2d0780f51872890f5ad0b';
+ const apiKey = 'KEY';
const apiUrl = `https://api.openweathermap.org/data/2.5/weather?lat=${latitude}&lon=${longitude}&appid=${apiKey}&units=metric`;
@@ -1954,7 +1958,6 @@ function showLoader() {
const loaderContainer = document.getElementById('loader-container');
loaderContainer.style.display = 'flex';
loaderContainer.style.opacity = '1';
- document.getElementById('city-open').disabled = true;
document.querySelector('rainmeterbar').scrollLeft = 0
}
@@ -1967,7 +1970,6 @@ function hideLoader() {
setTimeout(() => {
loaderContainer.style.display = 'none';
- document.getElementById('city-open').disabled = false;
}, 300);
@@ -2410,7 +2412,7 @@ function checkNoInternet(){
document.addEventListener('DOMContentLoaded', async function() {
- const currentVersion = 'v1.5.1';
+ const currentVersion = 'v1.5.2';
const githubRepo = 'PranshulGG/WeatherMaster';
const releasesUrl = `https://api.github.com/repos/${githubRepo}/releases/latest`;
diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html
index 4204e7e0d..f1af1d6d3 100644
--- a/app/src/main/assets/index.html
+++ b/app/src/main/assets/index.html
@@ -508,10 +508,10 @@
location_onCurrent Location
-
![]()
+
-
-
+ -----------
+ --------
diff --git a/app/src/main/assets/pages/AboutPage.html b/app/src/main/assets/pages/AboutPage.html
index 6621ae416..50715c1a8 100644
--- a/app/src/main/assets/pages/AboutPage.html
+++ b/app/src/main/assets/pages/AboutPage.html
@@ -94,7 +94,7 @@
info
Version
- 1.5.1 (W)
+ 1.5.2 (W)
@@ -178,7 +178,7 @@ AndroidInterface.updateStatusBarColor(theme);
document.getElementById('checkUpdatesBtn').addEventListener('click', async function() {
- const currentVersion = 'v1.5.1';
+ const currentVersion = 'v1.5.2';
const githubRepo = 'PranshulGG/WeatherMaster';
const releasesUrl = `https://api.github.com/repos/${githubRepo}/releases/latest`;
diff --git a/app/src/main/assets/pages/MoonPhases.html b/app/src/main/assets/pages/MoonPhases.html
index 752387f86..efaab8b33 100644
--- a/app/src/main/assets/pages/MoonPhases.html
+++ b/app/src/main/assets/pages/MoonPhases.html
@@ -116,6 +116,7 @@ Fetchmoonphases(latDif, longDif)
function switchApiKey() {
currentKeyMoonIndex = (currentKeyMoonIndex + 1) % apiKeysVisual.length;
+ Fetchmoonphases(latDif, longDif)
}
function Fetchmoonphases(lat, long) {
diff --git a/app/src/main/assets/pages/alertPage.html b/app/src/main/assets/pages/alertPage.html
index 8bd4c6c7d..b6f2d6f83 100644
--- a/app/src/main/assets/pages/alertPage.html
+++ b/app/src/main/assets/pages/alertPage.html
@@ -235,22 +235,11 @@ const latAlerts = latDif;
const lonAlerts = longDif;
const apiKeysAlerts = [
- 'd94bcd435b62a031771c35633f9f310a',
- '3b833dcd6aac36124a8a30e182224427',
- 'dd1571a8ad3fd44555e8a5d66db01929',
- '82005d27a116c2880c8f0fcb866998a0',
- '279b4be6d54c8bf6ea9b12275a567156',
- '7a02a834570055b013f9a14fd1b712ed',
- '20f7632ffc2c022654e4093c6947b4f4',
- '6557810176c36fac5f0db536711a6c52',
- 'b190a0605344cc4f3af08d0dd473dd25',
- 'b02af426a3fad0d92d3e0b32f9324cf0'
+ 'KEY'
];
const apiKeysCityName = [
- '7147cfac7299479da122684c73d9b80a',
- '09713ffe266c4dfa99b98157dfd148f9',
- '66f9ad95f6704259a376949eaa659e62'
+'KEY'
];
let alertApiKeyIndex = 0;
diff --git a/app/src/main/java/com/example/weathermaster/MainActivity.java b/app/src/main/java/com/example/weathermaster/MainActivity.java
index 7f5778943..1ace32b4b 100644
--- a/app/src/main/java/com/example/weathermaster/MainActivity.java
+++ b/app/src/main/java/com/example/weathermaster/MainActivity.java
@@ -94,7 +94,7 @@ public class MainActivity extends AppCompatActivity {
- requestLocationPermissions();
+
webview.setWebChromeClient(new WebChromeClient() {
@Override
@@ -173,8 +173,8 @@ public class MainActivity extends AppCompatActivity {
webview.getSettings().setGeolocationEnabled(true);
webview.reload();
} else {
- // Permission denied, show an explanation to the user
- Toast.makeText(this, "Location permission is required", Toast.LENGTH_SHORT).show();
+
+
}
}
@@ -364,10 +364,12 @@ public class MainActivity extends AppCompatActivity {
} else if (color.equals("OpenRadar")){
openLiveRadarPage();
return;
- } else if (color.equals("GoBack")){
+ } else if (color.equals("GoBack")) {
back();
return;
-
+ } else if (color.equals("ReqLocation")) {
+ requestLocationPermissions();
+ return;
} else if (color.equals("bluesetDef")) {
return;
diff --git a/app/src/main/res/drawable/no_internet.png b/app/src/main/res/drawable/no_internet.png
deleted file mode 100644
index 8ece52e06..000000000
Binary files a/app/src/main/res/drawable/no_internet.png and /dev/null differ
diff --git a/app/src/main/res/layout/no_internet.xml b/app/src/main/res/layout/no_internet.xml
index 5df3aec5f..dcafb8fa7 100644
--- a/app/src/main/res/layout/no_internet.xml
+++ b/app/src/main/res/layout/no_internet.xml
@@ -15,7 +15,7 @@
android:layout_height="600px"
android:layout_marginBottom="100dp"
android:contentDescription="No Internet Icon"
- android:src="@drawable/no_internet" />
+ />