diff --git a/app/build.gradle b/app/build.gradle index 257270d3a..c9b64de1b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 22 targetSdk 33 versionCode 1 - versionName "1.1.1 (W)" + versionName "1.1.3 (W)" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index c8f752d9a..d9db84d12 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "attributes": [], "versionCode": 1, - "versionName": "1.1.1 (W)", + "versionName": "1.1.2 (W)", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 174cd7146..ff5328537 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,13 +16,43 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_icon_round" android:supportsRtl="true" - android:theme="@style/Theme.WeatherMaster" + android:theme="@style/Base.Theme.WeatherMaster" tools:targetApi="31"> + android:exported="true" + android:theme="@style/ScreensAll" + /> + + + + + diff --git a/app/src/main/assets/app/app.js b/app/src/main/assets/app/app.js index 8bbcc83ee..65743104b 100644 --- a/app/src/main/assets/app/app.js +++ b/app/src/main/assets/app/app.js @@ -40,6 +40,14 @@ const uvIndexData = [ { description: "Its Very High", style: "background-color: #ff3c00;", img: 'uv-images/uv-10.png', detail: 'index at 10 Very high risk. Maximize precautions—use high SPF sunscreen, wear protective clothing, and limit sun exposure, especially midday, to minimize harm from intense ultraviolet radiation.' }, { description: "Extreme", style: "background-color: #9936D4;", img: 'uv-images/uv-11.png', detail: 'Index at 11 avoid every outdoor activies.' }, { description: "Extreme+", style: "background-color: #FF0087;", img: 'uv-images/uv-12.png', detail: 'Index at 12 avoid every outdoor activies.' }, + { description: "Extreme++", style: "background-color: #FF0087;", img: 'uv-images/uv-13.png', detail: 'Index at 13 avoid every outdoor activies.' }, + { description: "Extreme++", style: "background-color: #FF0087;", img: 'uv-images/uv-13.png', detail: 'Index at 13 avoid every outdoor activies.' }, + { description: "Extreme++", style: "background-color: #FF0087;", img: 'uv-images/uv-13.png', detail: 'Index at 13 avoid every outdoor activies.' }, + { description: "Extreme++", style: "background-color: #FF0087;", img: 'uv-images/uv-13.png', detail: 'Index at 13 avoid every outdoor activies.' }, + { description: "Extreme++", style: "background-color: #FF0087;", img: 'uv-images/uv-13.png', detail: 'Index at 13 avoid every outdoor activies.' }, + { description: "Extreme++", style: "background-color: #FF0087;", img: 'uv-images/uv-13.png', detail: 'Index at 13 avoid every outdoor activies.' }, + { description: "Extreme++", style: "background-color: #FF0087;", img: 'uv-images/uv-13.png', detail: 'Index at 13 avoid every outdoor activies.' }, + { description: "Extreme++", style: "background-color: #FF0087;", img: 'uv-images/uv-13.png', detail: 'Index at 13 avoid every outdoor activies.' }, { description: "Extreme++", style: "background-color: #FF0087;", img: 'uv-images/uv-13.png', detail: 'Index at 13 avoid every outdoor activies.' } ]; @@ -107,6 +115,8 @@ document.addEventListener('DOMContentLoaded', () => { document.getElementById('city-name').innerHTML = '' document.querySelector('.focus-input').blur(); document.getElementById('forecast').scrollLeft = 0; + cityInput.dispatchEvent(new Event('input')); + showLoader() if (selectedCity.toLowerCase() === "delhi, india") { getWeather(selectedCity, 28.6139, 77.2090); @@ -165,13 +175,18 @@ function displayCitySuggestions(suggestions, searchTerm) { if (suggestion.toLowerCase().includes(searchTerm.toLowerCase())) { const suggestionItem = document.createElement('div'); - const createSuggestRipple = document.createElement('md-ripple') - createSuggestRipple.style = '--md-ripple-pressed-opacity: 0.13;' + const saveBTN = document.createElement('md-text-button'); + const createSuggestRipple = document.createElement('md-ripple') + createSuggestRipple.style = '--md-ripple-pressed-opacity: 0.13;' + // const suggestSpace = document.createElement('suggest-space'); suggestionItem.classList.add("suggest"); suggestionItem.textContent = suggestion; + // suggestionItem.appendChild(suggestSpace) cityList.appendChild(suggestionItem); - + // suggestionItem.appendChild(saveBTN) + // saveBTN.textContent = 'Save' suggestionItem.appendChild(createSuggestRipple) + setTimeout(() => { document.getElementById('cityLoader').hidden = true; @@ -224,7 +239,12 @@ function getWeather(city, latitude, longitude) { const weatherIcon = document.getElementById('weather-icon'); - weatherIcon.src = `weather_icon_animated/${iconCode}.svg`; + weatherIcon.src = `weather-icons/${iconCode}.svg`; + document.getElementById('froggie_imgs').src = `froggie/${iconCode}.png`; + document.documentElement.setAttribute('iconCodeTheme', `${iconCode}`); + localStorage.setItem('weatherTHEME', iconCode) + sendThemeToAndroid(iconCode) + weatherIcon.alt = "Weather Icon"; const latitude = data.coord.lat; @@ -276,6 +296,36 @@ function getWeather(city, latitude, longitude) { document.getElementById('updated').textContent = `Last Updated: ${lastUpdatedTime}`; + function getClothingRecommendation(temp) { + if (temp <= 0) { + return "Wear a heavy coat, gloves, a hat, and a scarf."; + } else if (temp <= 5) { + return "Wear a thick coat, a hat, and gloves."; + } else if (temp <= 10) { + return "Wear a coat and a sweater."; + } else if (temp <= 15) { + return "Wear a light jacket and long sleeves."; + } else if (temp <= 20) { + return "Wear a light jacket or a sweater."; + } else if (temp <= 25) { + return "Wear a t-shirt and jeans or pants."; + } else if (temp <= 30) { + return "Wear a t-shirt and light pants or shorts."; + } else if (temp <= 35) { + return "Wear light, breathable clothing and stay hydrated."; + } else if (temp <= 40) { + return "Wear very light clothing, stay hydrated, and avoid direct sun."; + } else if (temp <= 45) { + return "Wear minimal clothing, stay indoors if possible, and stay hydrated."; + } else { + return "Extreme heat! Wear minimal clothing, stay indoors, and drink plenty of water."; + } + } + + const recommendation = getClothingRecommendation(temperature); + + document.getElementById('cloth_recommended').textContent = recommendation + // Fetch UV Index @@ -345,6 +395,7 @@ function getWeather(city, latitude, longitude) { }); + currentLocation = null; } @@ -434,7 +485,12 @@ function getWeatherByCoordinates(latitude, longitude) { const weatherIcon = document.getElementById('weather-icon'); - weatherIcon.src = `weather_icon_animated/${iconCode}.svg` + weatherIcon.src = `weather-icons/${iconCode}.svg` + document.getElementById('froggie_imgs').src = `froggie/${iconCode}.png`; + document.documentElement.setAttribute('iconCodeTheme', `${iconCode}`); + localStorage.setItem('weatherTHEME', iconCode) + sendThemeToAndroid(iconCode) + weatherIcon.title = `${iconCode}`; // Fetch 24-hour forecast get24HourForecast(latitude, longitude); @@ -489,6 +545,35 @@ function getWeatherByCoordinates(latitude, longitude) { + function getClothingRecommendation(temp) { + if (temp <= 0) { + return "Wear a heavy coat, gloves, a hat, and a scarf."; + } else if (temp <= 5) { + return "Wear a thick coat, a hat, and gloves."; + } else if (temp <= 10) { + return "Wear a coat and a sweater."; + } else if (temp <= 15) { + return "Wear a light jacket and long sleeves."; + } else if (temp <= 20) { + return "Wear a light jacket or a sweater."; + } else if (temp <= 25) { + return "Wear a t-shirt and jeans or pants."; + } else if (temp <= 30) { + return "Wear a t-shirt and light pants or shorts."; + } else if (temp <= 35) { + return "Wear light, breathable clothing and stay hydrated."; + } else if (temp <= 40) { + return "Wear very light clothing, stay hydrated, and avoid direct sun."; + } else if (temp <= 45) { + return "Wear minimal clothing, stay indoors if possible, and stay hydrated."; + } else { + return "Extreme heat! Wear minimal clothing, stay indoors, and drink plenty of water."; + } + } + + const recommendation = getClothingRecommendation(temperature); + + document.getElementById('cloth_recommended').textContent = recommendation @@ -521,8 +606,7 @@ function getWeatherByCoordinates(latitude, longitude) { document.getElementById('aqi_img').src = backgroundImage[aqi]; document.getElementById('aqi-level').style.backgroundColor = backgroundColor[aqi]; - }); - + }) const uvUrl = `https://api.openweathermap.org/data/2.5/uvi?lat=${latitude}&lon=${longitude}&appid=${apiKey}`; fetch(uvUrl) .then(response => response.json()) @@ -549,7 +633,11 @@ function getWeatherByCoordinates(latitude, longitude) { }) - .catch(error => console.error('Error fetching current weather:', error)); + .catch(error => { + console.error('Error fetching current weather:', error); + document.querySelector('.no_internet_error').hidden = false; + }); +n currentLocation = { @@ -837,4 +925,10 @@ function refreshWeather(){ const longSend = localStorage.getItem('currentLong') getWeather(' ',latSend, longSend) -} \ No newline at end of file +} + + +function sendThemeToAndroid(theme) { + + AndroidInterface.updateStatusBarColor(theme); + }; diff --git a/app/src/main/assets/app/apply.js b/app/src/main/assets/app/apply.js index 6c177504b..60daf34fb 100644 --- a/app/src/main/assets/app/apply.js +++ b/app/src/main/assets/app/apply.js @@ -1,17 +1,3 @@ -const themeType = localStorage.getItem('ThemeMode') || 'light'; +const themeStyle = localStorage.getItem('weatherTHEME') -if (!localStorage.getItem('ThemeMode')) { - localStorage.setItem('ThemeMode', 'light'); - -} - -const themeColorVariation = localStorage.getItem('ColorScheme') || 'Material You (Blue bright P40)' ; - - -if (!localStorage.getItem('ColorScheme')) { - localStorage.setItem('ColorScheme', 'Material You (Blue bright P40)'); - -} - -document.documentElement.setAttribute('data-theme', themeType); -document.documentElement.setAttribute('data-color-theme', themeColorVariation); +document.documentElement.setAttribute('iconCodeTheme', themeStyle); diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html index edcfc4566..b22021f13 100644 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/index.html @@ -1,5 +1,5 @@ - + @@ -14,262 +14,277 @@ -
-
- -

- -

-
-
- + - - + - - -
Current location
- - -
Settings
- - + + +
Current location
+ + +
Settings
+ + - + + +
+
+ + +
+
+
+ +
+ Weather Icon +
+ +
+ +
+

39 °C

+
+ +
+

Scattered clouds

+
+ + +
-
-
- -
-
-
-
- Weather Icon +
+ +
+ + +
+
+
+ thermostat +

-
- -
-

39 °C

-
- -
-

Scattered clouds

-
- - +
+ wind_power +

-
- - - -
-
-
- thermostat -

-
- -
- wind_power -

-
- -
- cloud -

-
+
+ cloud +

+
-
+
-
-
-

Today

-

Mar, 19

-
-
+
+
+

Today

+

Mar, 19

+
+
-
+
-
-
-
-

Next 5 Days

-

Forecast

-
-
- - -
+
+
+
+

Next 5 Days

+

Forecast

+
-
-
-

Sunrise & Sunset / Moonrise & Moonset

-
-
- -
- -

-
-
- -

-
-
- -

-
-
- -

-
- -
- +
-
-
- -

Feels Like & Visibility

-
-
- -
- -

-
-
- -

-
-
+
+
+ apparel
+ +
-
-
-

Air Quality

+
+
+

Sunrise & Sunset / Moonrise & Moonset

+
+
+ +
+ +

-
- -
- -
-
-
-

-
-
- -
-
+
+ +

+
+
+ +

+
+
+ +

+
-
-
-

UV Index

-
-
-
- -
-
-
-

-
-
- -
-
-
+ + +
+
+ +

Feels Like & Visibility

+
-
-

+
+ +

+
+
+ +

+
+
+
+
+

Air Quality

+
+
+
+ +
+
+
+

Error

+
+
+ Air quality not found! +
+
+
+ +
+
+

UV Index

+
+
+ +
+ +
+
+
+

+
+
+ +
+
+
+ +
+ + + +
+

+
+ + + +
+
- + - + -
- -
+
+ +
-
+
@@ -277,7 +292,7 @@

UI isn't made for Desktop devices

- - - - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/assets/modules/call-themes.js b/app/src/main/assets/modules/call-themes.js deleted file mode 100644 index 841c853fa..000000000 --- a/app/src/main/assets/modules/call-themes.js +++ /dev/null @@ -1,592 +0,0 @@ - - - - -function checkSearchScroll(){ - const currentTheme = localStorage.getItem('ThemeMode'); - const currentColorTheme = localStorage.getItem('ColorScheme'); - - if (currentTheme === 'dark') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('search-blue-dark'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('search-purple-dark'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('search-yellow-dark'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('search-green-dark'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('search-red-dark'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('search-pink-dark'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)') { - sendThemeToAndroid('search-charcol-dark'); - } else if (currentColorTheme === 'Material You (Hint orange 33)') { - sendThemeToAndroid('search-orange-dark'); - - } else if (currentColorTheme === 'Material You (Blue bright P40)') { - sendThemeToAndroid('search-blueBright-dark'); - - } else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('search-blue-dark'); - } - - } else if (currentTheme === 'light') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('search-blue-light'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('search-purple-light'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('search-yellow-light'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('search-green-light'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('search-red-light'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('search-pink-light'); - - } else if (currentColorTheme === 'Material You (Deep charcoal 83)') { - sendThemeToAndroid('search-charcol-light'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)') { - sendThemeToAndroid('search-orange-light'); - - } else if (currentColorTheme === 'Material You (Blue bright P40)') { - sendThemeToAndroid('search-blueBright-light'); - } - else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('search-blue-light'); - } - - } -} - -// scrollMain - -function checkMainScroll(){ - const currentTheme = localStorage.getItem('ThemeMode'); - const currentColorTheme = localStorage.getItem('ColorScheme'); - - if (currentTheme === 'dark') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('scroll-blue-dark'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('scroll-purple-dark'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('scroll-yellow-dark'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('scroll-green-dark'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('scroll-red-dark'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('scroll-pink-dark'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)') { - sendThemeToAndroid('scroll-charcol-dark'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)') { - sendThemeToAndroid('scroll-orange-dark'); - - - } else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('scroll-blue-dark'); - } - - } else if (currentTheme === 'light') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('scroll-blue-light'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('scroll-purple-light'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('scroll-yellow-light'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('scroll-green-light'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('scroll-red-light'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('scroll-pink-light'); - - } else if (currentColorTheme === 'Material You (Deep charcoal 83)') { - sendThemeToAndroid('scroll-charcol-light'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)') { - sendThemeToAndroid('scroll-orange-light'); - } - else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('scroll-blue-light'); - } - - } -} - - - -// ActivityColors - -function ActivityColor(){ - const currentTheme = localStorage.getItem('ThemeMode'); - const currentColorTheme = localStorage.getItem('ColorScheme'); - - if (currentTheme === 'dark') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('Activitybluedark'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('Activitypurpledark'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('Activityyellowdark'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('Activitygreendark'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('Activityreddark'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('ActivityPinkdark'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)'){ - sendThemeToAndroid('ActivityCharcoldark'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)'){ - sendThemeToAndroid('ActivityOrangedark'); - - } else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('Activitybluedark'); - } - - } else if (currentTheme === 'light') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('Activitybluelight'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('Activitypurplelight'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('Activityyellowlight'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('Activitygreenlight'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('Activityredlight'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('ActivityPinklight'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)'){ - sendThemeToAndroid('ActivityCharcollight'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)'){ - sendThemeToAndroid('ActivityOrangelight'); - } - else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('Activitybluelight'); - } - - } -} - -// ActivityColorsScrolled - -function ActivityColorScroll(){ - const currentTheme = localStorage.getItem('ThemeMode'); - const currentColorTheme = localStorage.getItem('ColorScheme'); - - if (currentTheme === 'dark') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('activityScroll-blue-dark'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('activityScroll-purple-dark'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('activityScroll-yellow-dark'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('activityScroll-green-dark'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('activityScroll-red-dark'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('activityScroll-pink-dark'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)'){ - sendThemeToAndroid('activityScroll-charcol-dark'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)'){ - sendThemeToAndroid('activityScroll-orange-dark'); - - } else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('activityScroll-blue-dark'); - } - - } else if (currentTheme === 'light') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('activityScroll-blue-light'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('activityScroll-purple-light'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('activityScroll-yellow-light'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('activityScroll-green-light'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('activityScroll-red-light'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('activityScroll-pink-light'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)'){ - sendThemeToAndroid('activityScroll-charcol-light'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)'){ - sendThemeToAndroid('activityScroll-orange-light'); - } - else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('activityScroll-blue-light'); - } - - } -} - - -// dialog - -function dialogcolor(){ - const currentTheme = localStorage.getItem('ThemeMode'); - const currentColorTheme = localStorage.getItem('ColorScheme'); - - if (currentTheme === 'dark') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('dialog-blue-dark'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('dialog-purple-dark'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('dialog-yellow-dark'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('dialog-green-dark'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('dialog-red-dark'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('dialog-pink-dark'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)'){ - sendThemeToAndroid('dialog-charcoal-dark'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)'){ - sendThemeToAndroid('dialog-orange-dark'); - - } else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('dialog-blue-dark'); - } - - } else if (currentTheme === 'light') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('dialog-blue-light'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('dialog-purple-light'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('dialog-yellow-light'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('dialog-green-light'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('dialog-red-light'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('dialog-pink-light'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)'){ - sendThemeToAndroid('dialog-charcoal-light'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)'){ - sendThemeToAndroid('dialog-orange-light'); - - } else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('dialog-blue-light'); - } - - } -} - - -// dialogInverted - -function dialogcolorInverted(){ - const currentTheme = localStorage.getItem('ThemeMode'); - const currentColorTheme = localStorage.getItem('ColorScheme'); - - if (currentTheme === 'dark') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('dialogInverted-blue-dark'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('dialogInverted-purple-dark'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('dialogInverted-yellow-dark'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('dialogInverted-green-dark'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('dialogInverted-red-dark'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('dialogInverted-pink-dark'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)'){ - sendThemeToAndroid('dialogInverted-charcoal-dark'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)'){ - sendThemeToAndroid('dialogInverted-orange-dark'); - } else if (currentColorTheme === 'Material You (Blue bright P40)') { - sendThemeToAndroid('dialogInverted-blue-dark'); - - } else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('dialogInverted-blue-dark'); - } - - } else if (currentTheme === 'light') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('dialogInverted-blue-light'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('dialogInverted-purple-light'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('dialogInverted-yellow-light'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('dialogInverted-green-light'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('dialogInverted-red-light'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('dialogInverted-pink-light'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)'){ - sendThemeToAndroid('dialogInverted-charcoal-light'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)'){ - sendThemeToAndroid('dialogInverted-orange-light'); - - } else if (currentColorTheme === 'Material You (Blue bright P40)') { - sendThemeToAndroid('dialogInverted-blue-light'); - - } else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('dialogInverted-blue-light'); - } - - } -} - - -function dialogcolorFull(){ - const currentTheme = localStorage.getItem('ThemeMode'); - const currentColorTheme = localStorage.getItem('ColorScheme'); - - if (currentTheme === 'dark') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('dialogActvity-blue-dark'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('dialogActvity-purple-dark'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('dialogActvity-yellow-dark'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('dialogActvity-green-dark'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('dialogActvity-red-dark'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('dialogActvity-pink-dark'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)'){ - sendThemeToAndroid('dialogActvity-charcoal-dark'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)'){ - sendThemeToAndroid('dialogActvity-orange-dark'); - - } else if (currentColorTheme === 'Material You (Blue bright P40)') { - sendThemeToAndroid('dialogActvity-blue-dark'); - - } else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('dialogActvity-blue-dark'); - } - - } else if (currentTheme === 'light') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('dialogActvity-blue-light'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('dialogActvity-purple-light'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('dialogActvity-yellow-light'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('dialogActvity-green-light'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('dialogActvity-red-light'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('dialogActvity-pink-light'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)'){ - sendThemeToAndroid('dialogActvity-charcoal-light'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)'){ - sendThemeToAndroid('dialogActvity-orange-light'); - - } else if (currentColorTheme === 'Material You (Blue bright P40)') { - sendThemeToAndroid('dialogActvity-blue-light'); - } - else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('dialogActvity-blue-light'); - } - - } -} - -// main - -function checkTHEME(){ - - const currentTheme = localStorage.getItem('ThemeMode'); - const currentColorTheme = localStorage.getItem('ColorScheme'); - - if (currentTheme === 'dark') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('blue-dark'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('purple-dark'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('yellow-dark'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('green-dark'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('red-dark'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('pink-dark'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)') { - sendThemeToAndroid('charcol-dark'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)') { - sendThemeToAndroid('orange-dark'); - - } else if (currentColorTheme === 'Material You (Blue bright P40)') { - sendThemeToAndroid('blue-bright-dark'); - - } else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('blue-dark'); - - } - - } else if (currentTheme === 'light') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('blue-light'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('purple-light'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('yellow-light'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('green-light'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('red-light'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('pink-light'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)') { - sendThemeToAndroid('charcol-light'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)') { - sendThemeToAndroid('orange-light'); - - } else if (currentColorTheme === 'Material You (Blue bright P40)') { - sendThemeToAndroid('blue-bright-light'); - } - - else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('blue-light'); - - } - - } -} - - -function sendThemeToAndroid(theme) { - - AndroidInterface.updateStatusBarColor(theme); - - -}; - -// sheetColor - -function sheetcolorInverted(){ - const currentTheme = localStorage.getItem('theme'); - const currentColorTheme = localStorage.getItem('ColorScheme'); - - if (currentTheme === 'dark') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('sheetInverted-blue-dark'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('sheetInverted-purple-dark'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('sheetInverted-yellow-dark'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('sheetInverted-green-dark'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('sheetInverted-red-dark'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('sheetInverted-pink-dark'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)'){ - sendThemeToAndroid('sheetInverted-charcoal-dark'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)'){ - sendThemeToAndroid('sheetInverted-orange-dark'); - - } else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('sheetInverted-blue-dark'); - } - - } else if (currentTheme === 'light') { - - if (currentColorTheme === 'Material You (Berry pop blue 44)') { - sendThemeToAndroid('sheetInverted-blue-light'); - } else if (currentColorTheme === 'Material You (Raisin purple 100)') { - sendThemeToAndroid('sheetInverted-purple-light'); - } else if (currentColorTheme === 'Material You (Olive pop green 49)') { - sendThemeToAndroid('sheetInverted-yellow-light'); - - } else if (currentColorTheme === 'Material You (Forest green 33)') { - sendThemeToAndroid('sheetInverted-green-light'); - - } else if (currentColorTheme === 'Material You (Chestnut cool red 122)') { - sendThemeToAndroid('sheetInverted-red-light'); - } else if (currentColorTheme === 'Material You (Raspberry pink P99)') { - sendThemeToAndroid('sheetInverted-pink-light'); - } else if (currentColorTheme === 'Material You (Deep charcoal 83)'){ - sendThemeToAndroid('sheetInverted-charcoal-light'); - - } else if (currentColorTheme === 'Material You (Hint orange 33)'){ - sendThemeToAndroid('sheetInverted-orange-light'); - - } else if (currentColorTheme === 'Material You (pop_blue_default)'){ - sendThemeToAndroid('sheetInverted-blue-light'); - } - - } -} - -// cool \ No newline at end of file diff --git a/app/src/main/assets/modules/scroll.js b/app/src/main/assets/modules/scroll.js index 3ec666d8c..56c336112 100644 --- a/app/src/main/assets/modules/scroll.js +++ b/app/src/main/assets/modules/scroll.js @@ -16,6 +16,7 @@ weatherWrap.addEventListener('scroll', function() { const newOpacity = Math.max(minOpacity, maxOpacity - (scrollPosition / maxHeight)); mainWeat.style.transform = `scale(${newOpacity})`; mainWeat.style.opacity = newOpacity; + document.querySelector('.froggie').style.opacity = newOpacity; ticking = false; }); ticking = true; diff --git a/app/src/main/assets/modules/theme.js b/app/src/main/assets/modules/theme.js deleted file mode 100644 index eb55e0e1d..000000000 --- a/app/src/main/assets/modules/theme.js +++ /dev/null @@ -1,98 +0,0 @@ -const darkToggleSwitch = document.getElementById('dark_mode_switch'); -const IsDarkOn = localStorage.getItem('ThemeMode'); -const currentThemeType = localStorage.getItem('ColorScheme') -const themeNameText = document.getElementById('themeName'); - -darkToggleSwitch.addEventListener('change', () =>{ - if(darkToggleSwitch.selected){ - document.documentElement.setAttribute('data-theme', 'dark'); - localStorage.setItem('ThemeMode', 'dark') - checkTHEME(); - } else{ - document.documentElement.setAttribute('data-theme', 'light'); - localStorage.setItem('ThemeMode', 'light') - checkTHEME(); - } - - themeOverlaySwitch() -}); - -if(IsDarkOn === 'dark'){ - document.documentElement.setAttribute('data-theme', 'dark'); - darkToggleSwitch.selected = true; -} else{ - document.documentElement.setAttribute('data-theme', 'light'); - darkToggleSwitch.selected = false; -} - -const themeOptions = document.querySelectorAll('input[name="themes"]'); - -const themeOptionsCheck = () => { - const selectedThemevalue = document.querySelector('input[name="themes"]:checked'); - localStorage.setItem('ColorScheme', selectedThemevalue.value) - document.documentElement.setAttribute('data-color-theme', selectedThemevalue.value) - themeNameText.textContent = selectedThemevalue.value; - checkTHEME(); - - themeOverlaySwitch() - - } - - -themeOptions.forEach(radio => { - radio.addEventListener('input', themeOptionsCheck); - -}); - - -if (currentThemeType) { - const ThemeradioToCheck = document.querySelector(`input[name="themes"][value="${currentThemeType}"]`); - document.documentElement.setAttribute('data-color-theme', currentThemeType) - themeNameText.textContent = currentThemeType; - - ThemeradioToCheck.checked = true; - -} - - - -function sendThemeToAndroid(theme) { - - AndroidInterface.updateStatusBarColor(theme); - - - }; - - - // for adjusting scroll -function themeOverlaySwitch(){ - document.querySelector('.theme_overlay').hidden = false; - - const loader = document.getElementById('theme_loader'); - let loaderValue = 0; - - function increaseLoader() { - loaderValue += 0.3; - - loaderValue = Math.min(loaderValue, 1); - - loader.setAttribute('value', loaderValue.toString()); - } - - const intervalId = setInterval(increaseLoader, 200); - - - setTimeout(() =>{ - document.getElementById('headUser-1').scrollTop = 0; - }, 800); - - - setTimeout(() =>{ - document.querySelector('.theme_overlay').hidden = true; - loader.setAttribute('value', '0'); - - - - clearInterval(intervalId); - }, 1000); -} \ No newline at end of file diff --git a/app/src/main/assets/pages/AboutPage.html b/app/src/main/assets/pages/AboutPage.html index 6c567e161..689114681 100644 --- a/app/src/main/assets/pages/AboutPage.html +++ b/app/src/main/assets/pages/AboutPage.html @@ -1,5 +1,5 @@ - + @@ -13,79 +13,72 @@ - + -
-
- -

About WeatherMaster

-
-
-

About WeatherMaster

-
+
+
+ +

About WeatherMaster

+
+
+

About WeatherMaster

+
- + - - privacy_tip -
Terms and Conditions
- + + privacy_tip +
Terms and Conditions
+ - - policy -
Privacy Policy
- + + policy +
Privacy Policy
+ - - code -
View source code
- - - - - system_update -
Latest version
- - - - copyright -
Third party licenses
- - + + code +
View source code
+ - - info -
Version
-
1.1.1 (W)
- + + system_update +
Latest version
+ + + + copyright +
Third party licenses
+ + + + + + info +
Version
+
1.1.3 (W)
+ + + - - -
+
- - - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/assets/pages/aboutPages/PrivacyPolicy.html b/app/src/main/assets/pages/aboutPages/PrivacyPolicy.html index f1336276f..423acac19 100644 --- a/app/src/main/assets/pages/aboutPages/PrivacyPolicy.html +++ b/app/src/main/assets/pages/aboutPages/PrivacyPolicy.html @@ -1,5 +1,5 @@ - + @@ -33,181 +33,185 @@ - -
+ +
-
- -

Privacy & Policy

-
-
-

Privacy & Policy

-
-

This privacy policy applies to the WeatherMaster app (hereby referred to as "Application") for mobile - devices that was created by Pranshul (hereby referred to as "Service Provider") as an Open Source - service. This service is intended for use "AS IS".


Information Collection and - Use -

The Application collects information when you download and use it. This information may include - information such as

+
+ +

Privacy & Policy

+
+
+

Privacy & Policy

+
+

This privacy policy applies to the WeatherMaster app (hereby referred to as "Application") for mobile + devices that was created by Pranshul (hereby referred to as "Service Provider") as an Open Source + service. This service is intended for use "AS IS".


Information Collection and + Use +

The Application collects information when you download and use it. This information may include + information such as

+
    +
  • Your device's Internet Protocol address (e.g. IP address)
    • +
  • The pages of the Application that you visit, the time and date of your visit, the time spent on + those pages
    • +
  • The time spent on the Application
    • +
  • The operating system you use on your mobile device
    • +
+


+

The Application does not gather precise information about the location of your + mobile device.

+
+

The Application collects your device's location, which helps the Service Provider determine your + approximate geographical location and make use of in below ways:

    -
  • Your device's Internet Protocol address (e.g. IP address)
    • -
  • The pages of the Application that you visit, the time and date of your visit, the time spent on - those pages
    • -
  • The time spent on the Application
    • -
  • The operating system you use on your mobile device
    • +
  • Geolocation Services: The Service Provider utilizes location data to provide features such + as personalized content, relevant recommendations, and location-based services.
    • +
  • Analytics and Improvements: Aggregated and anonymized location data helps the Service + Provider to analyze user behavior, identify trends, and improve the overall performance and + functionality of the Application.
    • +
  • Third-Party Services: Periodically, the Service Provider may transmit anonymized location + data to external services. These services assist them in enhancing the Application and + optimizing their offerings.
-


-

The Application does not gather precise information about the location of your - mobile device.

-
-

The Application collects your device's location, which helps the Service Provider determine your - approximate geographical location and make use of in below ways:

-
    -
  • Geolocation Services: The Service Provider utilizes location data to provide features such - as personalized content, relevant recommendations, and location-based services.
    • -
  • Analytics and Improvements: Aggregated and anonymized location data helps the Service - Provider to analyze user behavior, identify trends, and improve the overall performance and - functionality of the Application.
    • -
  • Third-Party Services: Periodically, the Service Provider may transmit anonymized location - data to external services. These services assist them in enhancing the Application and - optimizing their offerings.
    • -
-

-

The Service Provider may use the information you provided to contact you from time to time to provide - you with important information, required notices and marketing promotions.


-

For a better experience, while using the Application, the Service Provider may require you to provide - us with certain personally identifiable information. The information that the Service Provider - request will be retained by them and used as described in this privacy policy.


Third - Party Access -

Only aggregated, anonymized data is periodically transmitted to external services to aid the Service - Provider in improving the Application and their service. The Service Provider may share your - information with third parties in the ways that are described in this privacy statement.

-
-

The Service Provider may disclose User Provided and Automatically Collected Information:

-
    -
  • as required by law, such as to comply with a subpoena, or similar legal process;
    • -
  • when they believe in good faith that disclosure is necessary to protect their rights, protect - your safety or the safety of others, investigate fraud, or respond to a government request;
    • -
  • with their trusted services providers who work on their behalf, do not have an independent use - of the information we disclose to them, and have agreed to adhere to the rules set forth in this - privacy statement.
    • -
-


Opt-Out Rights -

You can stop all collection of information by the Application easily by uninstalling it. You may use - the standard uninstall processes as may be available as part of your mobile device or via the mobile - application marketplace or network.


Data Retention Policy -

The Service Provider will retain User Provided data for as long as you use the Application and for a - reasonable time thereafter. If you'd like them to delete User Provided Data that you have provided - via the Application, please contact them at pranshul.devmain@gmail.com and they will respond in a - reasonable time.


Children -

The Service Provider does not use the Application to knowingly solicit data from or market to - children under the age of 13.

-

-

The Service Provider does not knowingly collect personally identifiable information from - children. The Service Provider encourages all children to never submit any personally - identifiable information through the Application and/or Services. The Service Provider encourage - parents and legal guardians to monitor their children's Internet usage and to help enforce this - Policy by instructing their children never to provide personally identifiable information - through the Application and/or Services without their permission. If you have reason to believe - that a child has provided personally identifiable information to the Service Provider through - the Application and/or Services, please contact the Service Provider - (pranshul.devmain@gmail.com) so that they will be able to take the necessary actions. You must - also be at least 16 years of age to consent to the processing of your personally identifiable - information in your country (in some countries we may allow your parent or guardian to do so on - your behalf).

-

Security -

The Service Provider is concerned about safeguarding the confidentiality of your information. The - Service Provider provides physical, electronic, and procedural safeguards to protect information the - Service Provider processes and maintains.


Changes -

This Privacy Policy may be updated from time to time for any reason. The Service Provider will notify - you of any changes to the Privacy Policy by updating this page with the new Privacy Policy. You are - advised to consult this Privacy Policy regularly for any changes, as continued use is deemed - approval of all changes.


-

This privacy policy is effective as of 2024-06-16


Your Consent -

By using the Application, you are consenting to the processing of your information as set forth in - this Privacy Policy now and as amended by us.


Contact Us -

If you have any questions regarding privacy while using the Application, or have questions about the - practices, please contact the Service Provider via email at pranshul.devmain@gmail.com.

-
+

The Service Provider may use the information you provided to contact you from time to time to provide + you with important information, required notices and marketing promotions.


+

For a better experience, while using the Application, the Service Provider may require you to provide + us with certain personally identifiable information. The information that the Service Provider + request will be retained by them and used as described in this privacy policy.


Third + Party Access +

Only aggregated, anonymized data is periodically transmitted to external services to aid the Service + Provider in improving the Application and their service. The Service Provider may share your + information with third parties in the ways that are described in this privacy statement.

+
+

The Service Provider may disclose User Provided and Automatically Collected Information:

+
    +
  • as required by law, such as to comply with a subpoena, or similar legal process;
    • +
  • when they believe in good faith that disclosure is necessary to protect their rights, protect + your safety or the safety of others, investigate fraud, or respond to a government request;
    • +
  • with their trusted services providers who work on their behalf, do not have an independent use + of the information we disclose to them, and have agreed to adhere to the rules set forth in this + privacy statement.
    • +
+


Opt-Out Rights +

You can stop all collection of information by the Application easily by uninstalling it. You may use + the standard uninstall processes as may be available as part of your mobile device or via the mobile + application marketplace or network.


Data Retention Policy +

The Service Provider will retain User Provided data for as long as you use the Application and for a + reasonable time thereafter. If you'd like them to delete User Provided Data that you have provided + via the Application, please contact them at pranshul.devmain@gmail.com and they will respond in a + reasonable time.


Children +

The Service Provider does not use the Application to knowingly solicit data from or market to + children under the age of 13.

+

+

The Service Provider does not knowingly collect personally identifiable information from + children. The Service Provider encourages all children to never submit any personally + identifiable information through the Application and/or Services. The Service Provider encourage + parents and legal guardians to monitor their children's Internet usage and to help enforce this + Policy by instructing their children never to provide personally identifiable information + through the Application and/or Services without their permission. If you have reason to believe + that a child has provided personally identifiable information to the Service Provider through + the Application and/or Services, please contact the Service Provider + (pranshul.devmain@gmail.com) so that they will be able to take the necessary actions. You must + also be at least 16 years of age to consent to the processing of your personally identifiable + information in your country (in some countries we may allow your parent or guardian to do so on + your behalf).

+

Security +

The Service Provider is concerned about safeguarding the confidentiality of your information. The + Service Provider provides physical, electronic, and procedural safeguards to protect information the + Service Provider processes and maintains.


Changes +

This Privacy Policy may be updated from time to time for any reason. The Service Provider will notify + you of any changes to the Privacy Policy by updating this page with the new Privacy Policy. You are + advised to consult this Privacy Policy regularly for any changes, as continued use is deemed + approval of all changes.


+

This privacy policy is effective as of 2024-06-16


Your Consent +

By using the Application, you are consenting to the processing of your information as set forth in + this Privacy Policy now and as amended by us.


Contact Us +

If you have any questions regarding privacy while using the Application, or have questions about the + practices, please contact the Service Provider via email at pranshul.devmain@gmail.com.

+ pranshul.devmain@gmail.com -
-
- -

This Terms and Conditions page was generated by App Privacy Policy Generator

-
+
+
+ +

This Terms and Conditions page was generated by App Privacy Policy Generator

+
- - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/assets/pages/aboutPages/TermsConditions.html b/app/src/main/assets/pages/aboutPages/TermsConditions.html index 3a3b11177..b64487e14 100644 --- a/app/src/main/assets/pages/aboutPages/TermsConditions.html +++ b/app/src/main/assets/pages/aboutPages/TermsConditions.html @@ -1,5 +1,5 @@ - + @@ -33,93 +33,93 @@ - -
+ +
-
- -

Terms & Conditions

-
-
-

Terms & Conditions

-
-

These terms and conditions applies to the WeatherMaster app (hereby referred to as "Application") for - mobile devices that was created by Pranshul (hereby referred to as "Service Provider") as an Open - Source service.


-

Upon downloading or utilizing the Application, you are automatically agreeing to the following terms. - It is strongly advised that you thoroughly read and understand these terms prior to using the - Application. Unauthorized copying, modification of the Application, any part of the Application, or - our trademarks is strictly prohibited. Any attempts to extract the source code of the Application, - translate the Application into other languages, or create derivative versions are not permitted. All - trademarks, copyrights, database rights, and other intellectual property rights related to the - Application remain the property of the Service Provider.


-

The Service Provider is dedicated to ensuring that the Application is as beneficial and efficient as - possible. As such, they reserve the right to modify the Application or charge for their services at - any time and for any reason. The Service Provider assures you that any charges for the Application - or its services will be clearly communicated to you.


-

The Application stores and processes personal data that you have provided to the Service Provider in - order to provide the Service. It is your responsibility to maintain the security of your phone and - access to the Application. The Service Provider strongly advise against jailbreaking or rooting your - phone, which involves removing software restrictions and limitations imposed by the official - operating system of your device. Such actions could expose your phone to malware, viruses, malicious - programs, compromise your phone's security features, and may result in the Application not - functioning correctly or at all.


-

Please be aware that the Service Provider does not assume responsibility for certain aspects. Some - functions of the Application require an active internet connection, which can be Wi-Fi or provided - by your mobile network provider. The Service Provider cannot be held responsible if the Application - does not function at full capacity due to lack of access to Wi-Fi or if you have exhausted your data - allowance.


-

If you are using the application outside of a Wi-Fi area, please be aware that your mobile network - provider's agreement terms still apply. Consequently, you may incur charges from your mobile - provider for data usage during the connection to the application, or other third-party charges. By - using the application, you accept responsibility for any such charges, including roaming data - charges if you use the application outside of your home territory (i.e., region or country) without - disabling data roaming. If you are not the bill payer for the device on which you are using the - application, they assume that you have obtained permission from the bill payer.


-

Similarly, the Service Provider cannot always assume responsibility for your usage of the - application. For instance, it is your responsibility to ensure that your device remains charged. If - your device runs out of battery and you are unable to access the Service, the Service Provider - cannot be held responsible.


-

In terms of the Service Provider's responsibility for your use of the application, it is important to - note that while they strive to ensure that it is updated and accurate at all times, they do rely on - third parties to provide information to them so that they can make it available to you. The Service - Provider accepts no liability for any loss, direct or indirect, that you experience as a result of - relying entirely on this functionality of the application.


-

The Service Provider may wish to update the application at some point. The application is currently - available as per the requirements for the operating system (and for any additional systems they - decide to extend the availability of the application to) may change, and you will need to download - the updates if you want to continue using the application. The Service Provider does not guarantee - that it will always update the application so that it is relevant to you and/or compatible with the - particular operating system version installed on your device. However, you agree to always accept - updates to the application when offered to you. The Service Provider may also wish to cease - providing the application and may terminate its use at any time without providing termination notice - to you. Unless they inform you otherwise, upon any termination, (a) the rights and licenses granted - to you in these terms will end; (b) you must cease using the application, and (if necessary) delete - it from your device.


Changes to These Terms and Conditions -

The Service Provider may periodically update their Terms and Conditions. Therefore, you are advised - to review this page regularly for any changes. The Service Provider will notify you of any changes - by posting the new Terms and Conditions on this page.


-

These terms and conditions are effective as of 2024-06-16


Contact Us -

If you have any questions or suggestions about the Terms and Conditions, please do not hesitate to - contact the Service Provider at

- pranshul.devmain@gmail.com -
-
- -

This Terms and Conditions page was generated by App Privacy Policy Generator

-
+
+ +

Terms & Conditions

+
+
+

Terms & Conditions

+
+

These terms and conditions applies to the WeatherMaster app (hereby referred to as "Application") for + mobile devices that was created by Pranshul (hereby referred to as "Service Provider") as an Open + Source service.


+

Upon downloading or utilizing the Application, you are automatically agreeing to the following terms. + It is strongly advised that you thoroughly read and understand these terms prior to using the + Application. Unauthorized copying, modification of the Application, any part of the Application, or + our trademarks is strictly prohibited. Any attempts to extract the source code of the Application, + translate the Application into other languages, or create derivative versions are not permitted. All + trademarks, copyrights, database rights, and other intellectual property rights related to the + Application remain the property of the Service Provider.


+

The Service Provider is dedicated to ensuring that the Application is as beneficial and efficient as + possible. As such, they reserve the right to modify the Application or charge for their services at + any time and for any reason. The Service Provider assures you that any charges for the Application + or its services will be clearly communicated to you.


+

The Application stores and processes personal data that you have provided to the Service Provider in + order to provide the Service. It is your responsibility to maintain the security of your phone and + access to the Application. The Service Provider strongly advise against jailbreaking or rooting your + phone, which involves removing software restrictions and limitations imposed by the official + operating system of your device. Such actions could expose your phone to malware, viruses, malicious + programs, compromise your phone's security features, and may result in the Application not + functioning correctly or at all.


+

Please be aware that the Service Provider does not assume responsibility for certain aspects. Some + functions of the Application require an active internet connection, which can be Wi-Fi or provided + by your mobile network provider. The Service Provider cannot be held responsible if the Application + does not function at full capacity due to lack of access to Wi-Fi or if you have exhausted your data + allowance.


+

If you are using the application outside of a Wi-Fi area, please be aware that your mobile network + provider's agreement terms still apply. Consequently, you may incur charges from your mobile + provider for data usage during the connection to the application, or other third-party charges. By + using the application, you accept responsibility for any such charges, including roaming data + charges if you use the application outside of your home territory (i.e., region or country) without + disabling data roaming. If you are not the bill payer for the device on which you are using the + application, they assume that you have obtained permission from the bill payer.


+

Similarly, the Service Provider cannot always assume responsibility for your usage of the + application. For instance, it is your responsibility to ensure that your device remains charged. If + your device runs out of battery and you are unable to access the Service, the Service Provider + cannot be held responsible.


+

In terms of the Service Provider's responsibility for your use of the application, it is important to + note that while they strive to ensure that it is updated and accurate at all times, they do rely on + third parties to provide information to them so that they can make it available to you. The Service + Provider accepts no liability for any loss, direct or indirect, that you experience as a result of + relying entirely on this functionality of the application.


+

The Service Provider may wish to update the application at some point. The application is currently + available as per the requirements for the operating system (and for any additional systems they + decide to extend the availability of the application to) may change, and you will need to download + the updates if you want to continue using the application. The Service Provider does not guarantee + that it will always update the application so that it is relevant to you and/or compatible with the + particular operating system version installed on your device. However, you agree to always accept + updates to the application when offered to you. The Service Provider may also wish to cease + providing the application and may terminate its use at any time without providing termination notice + to you. Unless they inform you otherwise, upon any termination, (a) the rights and licenses granted + to you in these terms will end; (b) you must cease using the application, and (if necessary) delete + it from your device.


Changes to These Terms and Conditions +

The Service Provider may periodically update their Terms and Conditions. Therefore, you are advised + to review this page regularly for any changes. The Service Provider will notify you of any changes + by posting the new Terms and Conditions on this page.


+

These terms and conditions are effective as of 2024-06-16


Contact Us +

If you have any questions or suggestions about the Terms and Conditions, please do not hesitate to + contact the Service Provider at

+ pranshul.devmain@gmail.com +
+
+ +

This Terms and Conditions page was generated by App Privacy Policy Generator

+
- - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/assets/pages/aboutPages/licenses.html b/app/src/main/assets/pages/aboutPages/licenses.html index e89e1462a..3a3a8510b 100644 --- a/app/src/main/assets/pages/aboutPages/licenses.html +++ b/app/src/main/assets/pages/aboutPages/licenses.html @@ -1,5 +1,5 @@ - + @@ -39,125 +39,130 @@ - + -
+
-
- -

Third party licenses

-
-
-

Third party licenses

-
+
+ +

Third party licenses

+
+
+

Third party licenses

+
-
-

Outfit

- Rodrigo Fuenzalida, Smartsheet Inc -

A beautiful geometric sans: The official typeface for brand automation - company outfit.io. Inspired by the ligature-rich outfit wordmark, Outfit.io is delighted to - release it's own type family. The Outfit typeface links the Outfit written voice to Outfit - product marks; on brand by default.

- Open Font License -
+
+

Outfit

+ Rodrigo Fuenzalida, Smartsheet Inc +

A beautiful geometric sans: The official typeface for brand automation + company outfit.io. Inspired by the ligature-rich outfit wordmark, Outfit.io is delighted to + release it's own type family. The Outfit typeface links the Outfit written voice to Outfit + product marks; on brand by default.

+ Open Font License +
-
-

Poppins

- Indian Type Foundry, Jonny Pinhorn -

Poppins is a geometric sans serif font supporting Devanagari and Latin - scripts. Its Latin glyphs are rationalist, while the Devanagari design, introduced in 2015, was - pioneering, featuring various weights. Developed by Indian Type Foundry, Poppins maintains - monolinear letterforms with optical corrections. It later expanded to include multiple weights - and italics by the ITF studio team.

- Open Font License -
+
+

Poppins

+ Indian Type Foundry, Jonny Pinhorn +

Poppins is a geometric sans serif font supporting Devanagari and Latin + scripts. Its Latin glyphs are rationalist, while the Devanagari design, introduced in 2015, was + pioneering, featuring various weights. Developed by Indian Type Foundry, Poppins maintains + monolinear letterforms with optical corrections. It later expanded to include multiple weights + and italics by the ITF studio team.

+ Open Font License +
-
-

Material design components

- Open Source Project -

Material Web, or MWC, is a web component library aligned with Google's - Material Design guidelines. Supported by Google, it offers guidance for creating Material apps - and components, accessible on material.io. Material 3, the latest version, enhances experiences - with dynamic color, better accessibility, and support for large screen layouts and design - tokens.

- Apache-2.0 -
+
+

Material design components

+ Open Source Project +

Material Web, or MWC, is a web component library aligned with Google's + Material Design guidelines. Supported by Google, it offers guidance for creating Material apps + and components, accessible on material.io. Material 3, the latest version, enhances experiences + with dynamic color, better accessibility, and support for large screen layouts and design + tokens.

+ Apache-2.0 +

-
+
- - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/assets/pages/settings.html b/app/src/main/assets/pages/settings.html index 5629d39a5..1560cd21f 100644 --- a/app/src/main/assets/pages/settings.html +++ b/app/src/main/assets/pages/settings.html @@ -1,5 +1,5 @@ - + @@ -25,187 +25,110 @@ - + -
-
- -

Settings

-
-
-

Settings

-
+
+
+ +

Settings

+
+
+

Settings

+
-

App looks

- +

Weather

- - dark_mode -
Dark theme
-
Dark color scheme for the app
- - + + + notifications +
Weather alerts
+
Show notification alerts whenever the weather changes (does'nt work yet)
+ + + + + device_thermostat +
Temperature Unit
+ + +
°F
+ + +
°C
+ + + -
+ + airwave +
Wind Unit
+ + +
Km/h
+ + +
Mph
+ + + -
+ + visibility +
Visibility Unit
+ + +
km
+ + +
mile
+ + + -
- - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
-
-
- - -

Weather

- - - - notifications -
Weather alerts
-
Show notification alerts whenever the weather changes
- - - - - device_thermostat -
Temperature Unit
- - -
°F
- - -
°C
- - - - - - - airwave -
Wind Unit
- - -
Km/h
- - -
Mph
- - - - - - visibility -
Visibility Unit
- - -
km
- - -
mile
- - - - - + -

Additional

- +

Additional

+ + + routine +
Data provided by
+
OpenWeatherMap
+ open_in_new + + + + info +
About WeatherMaster
+
Learn about the app
+ chevron_right + + + - - format_paint -
Theme name
-
- - - routine -
Data provided by
-
OpenWeatherMap
- open_in_new - - - - info -
About WeatherMaster
-
Learn about the app
- chevron_right - - - -
+
- - + + - - - - - - - - - - + + + + + + + \ No newline at end of file diff --git a/app/src/main/assets/ui-files/ui.css b/app/src/main/assets/ui-files/ui.css index 2ef28980d..3d908527f 100644 --- a/app/src/main/assets/ui-files/ui.css +++ b/app/src/main/assets/ui-files/ui.css @@ -20,7 +20,7 @@ body { - background-color: var(--Surface); + background-color: var(--Secondary-Container); padding: 0; margin: 0; overflow: hidden; @@ -35,11 +35,10 @@ body { padding: 10px; height: 45px; padding-left: 4px; - background-color: var(--Surface-Container); + background-color: var(--Surface); display: flex; align-items: center; justify-content: space-between; - border-bottom: 1px solid var(--Outline); } @@ -49,7 +48,7 @@ body { margin: 0; overflow: hidden; text-overflow: ellipsis; - width: 100%; + width: calc(100% - 20px); white-space: nowrap; color: var(--On-Surface); } @@ -75,13 +74,15 @@ body { .main-weat { - /* background-color: var(--Surface-Container); */ + /* background-color: var(--Secondary-Container); */ + background: linear-gradient(0deg, var(--Secondary-Container) 10%, var(--Surface)); + position: relative; height: 180px; - border-radius: 0 0 10px 10px; + /* border-radius: 0 0 10px 10px; */ overflow: hidden; transition: opacity 0.2s; - + } @@ -93,29 +94,29 @@ body { .img-div { position: absolute; - right: 10px; + right: 25px; display: flex; align-items: center; justify-content: center; - width: 150px; - height: 150px; - top: 10px; + width: 90px; + height: 90px; + top: 30px; border-radius: 100px; } .img-div img { - width: 140px; - + width: 90px; + } .temp-main { - color: var(--On-Surface-Variant); + color: var(--Primary); position: absolute; top: 10px; left: 15px; - font-size: 55px; + font-size: 65px; width: max-content; - + font-family: var(--google-mid); } @@ -123,6 +124,8 @@ body { font-size: 30px; position: absolute; top: 3px; + font-family: var(--google-mid); + } #temp { @@ -155,6 +158,7 @@ body { .weather_wrap { overflow: auto; height: calc(100vh - 65px); + overflow-x: hidden; } .weather_wrap::-webkit-scrollbar{ @@ -176,13 +180,13 @@ body { .high-all { - background-color: var(--Surface-Container-Low); + background-color: var(--Surface); margin: 10px; - + padding-left: 10px; padding-right: 10px; border-radius: 20px 20px 10px 10px; - + margin-bottom: 5px; } @@ -214,12 +218,12 @@ body { .all-24, .all-5d { - background-color: var(--Surface-Container-Low); + background-color: var(--Surface); margin: 10px; /* margin-top: 5px; */ border-radius: 10px 10px 10px 10px; overflow: hidden; - + } .all-5d { @@ -247,7 +251,8 @@ body { .forecast #forecast24 { transition: all 0.3s cubic-bezier(1, 0, 0, 1); flex-shrink: 0; - background-color: var(--Surface); + /* background-color: var(--Surface-Container-Low); */ + background-color: rgba(0, 0, 0, 0.247); border-radius: 10px; padding-left: 25px; padding-right: 25px; @@ -257,6 +262,7 @@ body { justify-content: center; padding-bottom: 63px; margin-bottom: 5px; + min-width: calc(60px + 2px); position: relative; } @@ -274,21 +280,26 @@ body { margin-right: 0; margin-bottom: 0; text-transform: capitalize; - background-color: var(--Surface-Container-Low); + background-color: var(--Surface); border-radius: 10px; color: var(--On-Surface); - font-size: 15px; + font-size: 13px; margin-top: 5px; padding-top: 3px; padding-bottom: 3px; font-family: var(--google-normal); position: absolute; bottom: 5px; - min-height: 40px; - max-height: 45px; + max-height: calc(45px - 5px); + min-height: calc(40px - 5px); + + padding-top: 10px; + padding-bottom: 5px; + } + .today_Text { margin: 0; } @@ -380,7 +391,8 @@ body { justify-content: flex-end; position: relative; direction: rtl; - background-color: var(--Surface); + background-color: rgba(0, 0, 0, 0.247); + padding: 10px; border-radius: 10px; @@ -398,7 +410,7 @@ body { .forecast-5day div img { position: absolute; right: 15px; - width: 40px; + width: 35px; } .disc-5d { @@ -430,9 +442,9 @@ body { } .all-sun-div { - background-color: var(--Surface-Container-Low); + background-color: var(--Surface); margin: 10px; - + } @@ -455,10 +467,10 @@ body { height: max-content; width: calc(100% - 60px); margin: 10px; - background-color: var(--Surface); + background-color: rgba(0, 0, 0, 0.247); padding-left: 20px; padding-right: 20px; - border-radius: 30px 30px 10px 10px; + border-radius: 20px 20px 10px 10px; position: relative; } @@ -513,7 +525,7 @@ body { padding: 10px; height: 45px; padding-left: 5px; - background-color: var(--Surface-Container); + background-color: var(--Surface); gap: 10px; position: relative; } @@ -522,14 +534,13 @@ body { font-size: 18px; background-color: transparent; border: none; - caret-color: var(--Primary); + caret-color: #afc6ff; font-family: var(--google-normal); color: var(--On-Surface); } .main-options input::selection { - background-color: var(--Secondary-Container); - color: var(--On-Secondary-Container); + background-color: #465b9d; } .city_loader { @@ -682,10 +693,10 @@ body { } .all_air_quality { - background-color: var(--Surface-Container-Low); + background-color: var(--Surface); margin: 10px; margin-bottom: 5px; - + } @@ -703,7 +714,7 @@ body { .air-quality .img-div_air { width: 70px; height: 70px; - background-color: var(--Surface); + background-color: var(--Secondary-Container); flex-shrink: 0; display: flex; align-items: center; @@ -788,11 +799,15 @@ body { color: var(--On-Surface); position: relative; padding: 10px; - padding-top: 15px; display: flex; align-items: center; - gap: 5px; - padding-bottom: 15px; + gap: 10px; +} + +suggest-space{ + flex: 1; + padding-left: 10px; + padding-right: 10px; } .city-list { @@ -807,16 +822,23 @@ body { line-height: 1; color: var(--Secondary); font-size: 24px; + width: 40px; + height: 40px; + background-color: var(--Secondary-Container); + display: flex; + align-items: center; + justify-content: center; + border-radius: 50px; + flex-shrink: 0; } #updated-div { display: flex; align-items: center; justify-content: center; - background-color: var(--Secondary-Container); margin: 10px; margin-bottom: 40px; - color: var(--On-Secondary-Container); + color: var(--On-Surface-Variant); border-radius: 50px; } @@ -852,4 +874,40 @@ body { #updated-div{ margin-bottom: 90px; } +} + +.froggie img{ + width: 120%; +} + +.froggie { +background: linear-gradient(0deg, rgba(255, 0, 0, 0), var(--Secondary-Container) 100%); + +} + +.cloths{ + display: flex; + align-items: center; + background-color: var(--Surface); + margin: 10px; + border-radius: 20px; + padding: 10px; +} + +.cloths div{ + width: 50px; + height: 50px; + display: flex; + align-items: center; + justify-content: center; + color: var(--On-Secondary-Container); + background-color: var(--Secondary-Container); + flex-shrink: 0; + border-radius: 10px; +} + +#cloth_recommended{ + margin: 0; + color: var(--On-Surface); + margin-left: 10px; } \ No newline at end of file diff --git a/app/src/main/assets/ui-files/variables.css b/app/src/main/assets/ui-files/variables.css index 8468d82b2..52293edc1 100644 --- a/app/src/main/assets/ui-files/variables.css +++ b/app/src/main/assets/ui-files/variables.css @@ -1,4 +1,4 @@ -:root{ +:root { --google-normal: 'Google'; --google-thin: 'Google-thin'; --google-light: 'Google-light'; @@ -58,7 +58,7 @@ --md-sys-typescale-headline-font: var(--outfit); --md-sys-typescale-title-font: var(--outfit); - --md-icon-button-pressed-state-layer-opacity: 0.25; + --md-icon-button-pressed-state-layer-opacity: 0.25; --md-fab-pressed-state-layer-opacity: 0.25; } @@ -100,39 +100,23 @@ } -[margin]{ +[margin] { margin-bottom: 4px; } -[menu-type]{ +[menu-type] { --md-menu-item-one-line-container-height: 0px; --md-menu-item-label-text-size: 1.125rem; } -[large-tab]{ +[large-tab] { --md-primary-tab-label-text-size: 1em; } -[data-theme="light"]{ - --ripple-unbounded: var(--On-Surface); - --ripple-bounded: black; - color-scheme: light; - --today: rgb(0, 168, 84); - --yesterday: #af0763; - --date: rgb(218, 133, 7); - --normal-bmi: #abf891; - --overweight-bmi: #ebf18b; - --scrollbar: rgba(119, 118, 118, 0.507); - --high: rgb(9, 185, 9); - --mid: rgb(255, 145, 0); - --low: red; - --rain: blue; -} - -[data-theme="dark"]{ +[data-theme="dark"] { --ripple-unbounded: var(--On-Surface); --ripple-bounded: white; color-scheme: dark; @@ -147,875 +131,785 @@ --mid: orange; --low: red; --rain: skyblue; - + --main-bg: #011d33; } -[data-theme="light"][data-color-theme="Material You (Berry pop blue 44)"] { +[iconCodeTheme="01d"] { - - - --Primary: #465d91; - --On-Primary: #ffffff; - --Primary-Container: #d9e2ff; - --On-Primary-Container: #001944; - --Secondary: #575e71; - --On-Secondary: #ffffff; - --Secondary-Container: #dbe2f9; - --On-Secondary-Container: #141b2c; - --Tertiary: #2e6a44; - --On-Tertiary: #ffffff; - --Tertiary-Container: #b1f1c1; - --On-Tertiary-Container: #00210e; - --Error: #ba1a1a; - --On-Error: #ffffff; - --Error-Container: #ffdad6; - --On-Error-Container: #410002; - --Surface-Dim: #dad9e0; - --Surface: #faf8ff; - --Surface-Bright: #faf8ff; - --Surface-Container-Lowest:#ffffff ; - --Surface-Container-Low:#f4f3fa ; - --Surface-Container: #eeedf4; - --Surface-Container-High: #e8e7ef; - --Surface-Container-Highest: #e2e2e9; - --Inverse-Surface: #2f3036; - --Inverse-On-Surface:#f1f0f7 ; - --Inverse-Primary: #afc6ff; - --On-Surface: #1a1b20; - --On-Surface-Variant:#44464f ; - --Outline: #757780; - --Outline-Variant: #c5c6d0; - --Scrim: #000000; - --Shadow: #000000; - --Top-bar: 219, 226, 249; - --scheme: #2196f3; - - - - } - - [data-theme="dark"][data-color-theme="Material You (Berry pop blue 44)"]{ - - --Primary: #afc6ff; - --On-Primary: #142f60; - --Primary-Container: #2e4578; - --On-Primary-Container: #d9e2ff; - --Secondary: #bfc6dc; - --On-Secondary: #293042; - --Secondary-Container: #404659; - --On-Secondary-Container: #dbe2f9; - --Tertiary: #96d5a6; - --On-Tertiary: #00391c; - --Tertiary-Container: #12512e; - --On-Tertiary-Container: #b1f1c1; - --Error: #ffb4ab; - --On-Error: #690005; - --Error-Container: #93000a; - --On-Error-Container: #ffdad6; - --Surface-Dim: #121318; - --Surface: #121318; - --Surface-Bright: #38393f; - --Surface-Container-Lowest: #0c0e13; - --Surface-Container-Low: #1a1b20; - --Surface-Container: #1e1f25; - --Surface-Container-High: #282a2f; - --Surface-Container-Highest: #33353a; - --Inverse-Surface: #e2e2e9; - --Inverse-On-Surface: #2f3036; - --Inverse-Primary: #465d91; - --On-Surface: #e2e2e9; - --On-Surface-Variant: #c5c6d0; - --Outline: #8f9099; - --Outline-Variant: #44464f; - --Scrim: #000000; - --Shadow: #000000; - --Top-bar: 64, 70, 89; - --scheme: #2196f3; - - - - } - - /* purple-theme */ - - [data-theme="light"][data-color-theme="Material You (Raisin purple 100)"] { - - - --Primary: #725188; - --On-Primary: #ffffff; - --Primary-Container: #f3daff; - --On-Primary-Container: #2b0c40; - --Secondary: #675a6e; - --On-Secondary: #ffffff; - --Secondary-Container: #efdcf5; - --On-Secondary-Container: #221729; - --Tertiary: #815154; - --On-Tertiary: #ffffff; - --Tertiary-Container: #ffdada; - --On-Tertiary-Container: #331014; - --Error: #ba1a1a; - --On-Error: #ffffff; - --Error-Container: #ffdad6; - --On-Error-Container: #410002; - --Surface-Dim: #e0d7df; - --Surface: #fff7fd; - --Surface-Bright: #fff7fd; - --Surface-Container-Lowest:#ffffff ; - --Surface-Container-Low: #faf1f9; - --Surface-Container: #f4ebf3; - --Surface-Container-High: #eee6ed; - --Surface-Container-Highest: #e9e0e8; - --Inverse-Surface: #332f35; - --Inverse-On-Surface: #f7eef6; - --Inverse-Primary: #dfb8f6; - --On-Surface: #1e1a20; - --On-Surface-Variant: #4b454d; - --Outline: #7c747e; - --Outline-Variant: #cdc3ce; - --Scrim: #000000; - --Shadow: #000000; - --Top-bar: 239, 220, 245; - --scheme: #673ab7; - } - - [data-theme="dark"][data-color-theme="Material You (Raisin purple 100)"] { - - --Primary: #dfb8f6; - --On-Primary: #412356; - --Primary-Container: #593a6e; - --On-Primary-Container: #f3daff; - --Secondary: #d2c1d9; - --On-Secondary: #382c3e; - --Secondary-Container: #4f4256; - --On-Secondary-Container: #efdcf5; - --Tertiary: #f4b7ba; - --On-Tertiary: #4c2528; - --Tertiary-Container:#663b3d ; - --On-Tertiary-Container: #ffdada; - --Error: #ffb4ab; - --On-Error: #690005; - --Error-Container: #93000a; - --On-Error-Container: #ffdad6; - --Surface-Dim: #161217; - --Surface: #161217; - --Surface-Bright: #3c383e; - --Surface-Container-Lowest: #100d12; - --Surface-Container-Low: #1e1a20; - --Surface-Container: #221e24; - --Surface-Container-High: #2d292e; - --Surface-Container-Highest: #383339; - --Inverse-Surface: #e9e0e8; - --Inverse-On-Surface: #332f35; - --Inverse-Primary: #725188; - --On-Surface: #e9e0e8; - --On-Surface-Variant: #cdc3ce; - --Outline: #968e98; - --Outline-Variant: #4b454d; - --Scrim: #000000; - --Shadow: #000000; - --Top-bar: 79, 66, 86; - - --scheme: #673ab7; - - - } - - /* yellow */ - - [data-theme="light"][data-color-theme="Material You (Olive pop green 49)"] { - - - --Primary: #616118; - --On-Primary: #ffffff; - --Primary-Container: #e8e78f; - --On-Primary-Container: #1d1d00; - --Secondary: #606043; - --On-Secondary: #ffffff; - --Secondary-Container: #e7e4bf; - --On-Secondary-Container: #1d1d06; - --Tertiary: #3d6657; - --On-Tertiary: #ffffff; - --Tertiary-Container: #bfecd8; - --On-Tertiary-Container: #002117; - --Error:#ba1a1a ; - --On-Error:#ffffff ; - --Error-Container: #ffdad6; - --On-Error-Container: #410002; - --Surface-Dim: #dddacd; - --Surface: #fdf9ec; - --Surface-Bright: #fdf9ec; - --Surface-Container-Lowest: #ffffff; - --Surface-Container-Low: #f7f4e6; - --Surface-Container: #f1eee0; - --Surface-Container-High: #ece8db; - --Surface-Container-Highest: #e6e3d5; - --Inverse-Surface: #313128; - --Inverse-On-Surface:#f4f1e3 ; - --Inverse-Primary: #cbcb76; - --On-Surface: #1c1c14; - --On-Surface-Variant: #48473a; - --Outline: #797869; - --Outline-Variant: #cac7b6; - --Scrim: #000000; - --Shadow: #000000; - --Top-bar:231, 228, 191; - --scheme: #ffeb3b; - - } - - [data-theme="dark"][data-color-theme="Material You (Olive pop green 49)"] { - - --Primary: #cbcb76; - --On-Primary: #323200; - --Primary-Container: #494900; - --On-Primary-Container: #e8e78f; - --Secondary: #cac8a5; - --On-Secondary:#323218 ; - --Secondary-Container: #49482d; - --On-Secondary-Container: #e7e4bf; - --Tertiary: #a4d0bd; - --On-Tertiary: #0b372a; - --Tertiary-Container: #254e40; - --On-Tertiary-Container: #bfecd8; - --Error:#ffb4ab ; - --On-Error: #690005; - --Error-Container: #93000a ; - --On-Error-Container: #ffdad6; - --Surface-Dim: #14140c; - --Surface: #14140c; - --Surface-Bright: #3a3a30; - --Surface-Container-Lowest: #0f0f07; - --Surface-Container-Low: #1c1c14; - --Surface-Container: #202018; - --Surface-Container-High: #2b2a22; - --Surface-Container-Highest: #36352c; - --Inverse-Surface: #e6e3d5; - --Inverse-On-Surface: #313128; - --Inverse-Primary:#616118 ; - --On-Surface: #e6e3d5; - --On-Surface-Variant: #cac7b6; - --Outline: #939182; - --Outline-Variant: #48473a; - --Scrim:#000000 ; - --Shadow: #000000; - --Top-bar: 73, 72, 45; - --scheme: #ffeb3b; - - - } - - /* green */ - - [data-theme="light"][data-color-theme="Material You (Forest green 33)"] { - - - --Primary: #406836; - --On-Primary: #ffffff; - --Primary-Container: #c0efb0; - --On-Primary-Container: #002200; - --Secondary: #54634d; - --On-Secondary: #ffffff; - --Secondary-Container: #d7e8cd; - --On-Secondary-Container:#121f0e; - --Tertiary: #386568; - --On-Tertiary: #ffffff; - --Tertiary-Container: #bcebee; - --On-Tertiary-Container: #002022; - --Error:#ba1a1a ; - --On-Error: #ffffff; - --Error-Container: #ffdad6; - --On-Error-Container: #410002; - --Surface-Dim: #d8dbd2; - --Surface: #f8fbf1; - --Surface-Bright: #f8fbf1; - --Surface-Container-Lowest:#ffffff ; - --Surface-Container-Low:#f2f5eb ; - --Surface-Container: #ecefe5; - --Surface-Container-High: #e6e9e0; - --Surface-Container-Highest:#e1e4da ; - --Inverse-Surface:#2e322b ; - --Inverse-On-Surface: #eff2e8; - --Inverse-Primary: #a5d396; - --On-Surface: #191d17; - --On-Surface-Variant: #43483f; - --Outline: #73796e; - --Outline-Variant: #c3c8bc; - --Scrim: #000000; - --Shadow: #000000; - --Top-bar:215, 232, 205; - --scheme: #4caf50; - - } - - [data-theme="dark"][data-color-theme="Material You (Forest green 33)"] { - - - --Primary: #a5d396; - --On-Primary:#11380b ; - --Primary-Container: #285020; - --On-Primary-Container: #c0efb0; - --Secondary: #bbcbb2; - --On-Secondary: #263422; - --Secondary-Container: #3c4b37; - --On-Secondary-Container: #d7e8cd; - --Tertiary: #a0cfd2; - --On-Tertiary: #003739; - --Tertiary-Container: #1e4d50; - --On-Tertiary-Container: #bcebee; - --Error: #ffb4ab; - --On-Error: #690005; - --Error-Container: #93000a; - --On-Error-Container: #ffdad6; - --Surface-Dim: #11140f; - --Surface: #11140f; - --Surface-Bright: #363a34; - --Surface-Container-Lowest: #0b0f0a; - --Surface-Container-Low: #191d17; - --Surface-Container: #1d211b; - --Surface-Container-High: #272b25; - --Surface-Container-Highest: #32362f; - --Inverse-Surface: #e1e4da ; - --Inverse-On-Surface: #2e322b; - --Inverse-Primary: #406836; - --On-Surface: #e1e4da; - --On-Surface-Variant:#c3c8bc ; - --Outline: #8d9387; - --Outline-Variant: #43483f; - --Scrim: #000000; - --Shadow:#000000 ; - --Top-bar: 60, 75, 55; - --scheme: #4caf50; - - - } - - /* red */ - - [data-theme="light"][data-color-theme="Material You (Chestnut cool red 122)"] { - - - --Primary: #904b40; - --On-Primary: #ffffff ; - --Primary-Container: #ffdad4; - --On-Primary-Container: #3a0905; - --Secondary: #775651; - --On-Secondary: #ffffff; - --Secondary-Container: #ffdad4; - --On-Secondary-Container:#2c1512 ; - --Tertiary: #705c2e; - --On-Tertiary: #ffffff; - --Tertiary-Container: #fbdfa6; - --On-Tertiary-Container: #251a00; - --Error: #ba1a1a; - --On-Error: #ffffff; - --Error-Container: #ffdad6; - --On-Error-Container: #410002; - --Surface-Dim: #e8d6d3; - --Surface:#fff8f6 ; - --Surface-Bright:#fff8f6 ; - --Surface-Container-Lowest: #ffffff; - --Surface-Container-Low:#fff0ee ; - --Surface-Container: #fceae7; - --Surface-Container-High: #f7e4e1; - --Surface-Container-Highest: #f1dfdc; - --Inverse-Surface: #392e2c; - --Inverse-On-Surface:#ffedea ; - --Inverse-Primary: #ffb4a8; - --On-Surface:#231918 ; - --On-Surface-Variant: #534341; - --Outline:#857370; - --Outline-Variant: #d8c2be; - --Scrim: #000000; - --Shadow:#000000 ; - --Top-bar: 255, 218, 212; - --scheme: #f44336; - - - } - - [data-theme="dark"][data-color-theme="Material You (Chestnut cool red 122)"] { - - --Primary: #ffb4a8; - --On-Primary: #561e16; - --Primary-Container:#73342a ; - --On-Primary-Container: #ffdad4; - --Secondary: #e7bdb6; - --On-Secondary:#442925 ; - --Secondary-Container: #5d3f3b; - --On-Secondary-Container: #ffdad4; - --Tertiary: #dec48c; - --On-Tertiary: #3e2e04; - --Tertiary-Container:#564419 ; - --On-Tertiary-Container: #fbdfa6; - --Error: #ffb4ab; - --On-Error: #690005; - --Error-Container: #93000a; - --On-Error-Container: #ffdad6; - --Surface-Dim: #1a1110; - --Surface: #1a1110 ; - --Surface-Bright: #423735; - --Surface-Container-Lowest: #140c0b; - --Surface-Container-Low: #231918; - --Surface-Container: #271d1c; - --Surface-Container-High: #322826; - --Surface-Container-Highest:#3d3230 ; - --Inverse-Surface: #f1dfdc; - --Inverse-On-Surface:#392e2c ; - --Inverse-Primary: #904b40; - --On-Surface: #f1dfdc; - --On-Surface-Variant: #d8c2be; - --Outline: #a08c89; - --Outline-Variant: #534341; - --Scrim: #000000; - --Shadow: #000000; - --Top-bar: 93, 63, 59; - --scheme: #f44336; - - - - } - - - /* pink */ - - [data-theme="light"][data-color-theme="Material You (Raspberry pink P99)"] { - - --Primary: #8c4a60; - --On-Primary: #ffffff ; - --Primary-Container: #ffd9e2; - --On-Primary-Container: #3a071d; - --Secondary: #74565f; - --On-Secondary: #ffffff; - --Secondary-Container: #ffd9e2; - --On-Secondary-Container: #2b151c; - --Tertiary: #7c5635; - --On-Tertiary: #ffffff; - --Tertiary-Container: #ffdcc1; - --On-Tertiary-Container: #2e1500; - --Error: #ba1a1a; - --On-Error: #ffffff; - --Error-Container: #ffdad6; - --On-Error-Container: #410002; - --Surface-Dim: #e6d6d9; - --Surface: #fff8f8; - --Surface-Bright: #fff8f8; - --Surface-Container-Lowest:#ffffff ; - --Surface-Container-Low: #fff0f2; - --Surface-Container: #faeaed; - --Surface-Container-High: #f5e4e7; - --Surface-Container-Highest: #efdfe1; - --Inverse-Surface: #372e30; - --Inverse-On-Surface: #fdedef; - --Inverse-Primary: #ffb1c8; - --On-Surface: #22191c; - --On-Surface-Variant: #514347; - --Outline: #837377; - --Outline-Variant: #d5c2c6; - --Scrim: #000000; - --Shadow:#000000 ; - --Top-bar: 255, 217, 226; - --scheme: #e91e63; - - - } - - [data-theme="dark"][data-color-theme="Material You (Raspberry pink P99)"] { - - - --Primary: #ffb1c8; - --On-Primary: #541d32; - --Primary-Container:#703348 ; - --On-Primary-Container: #ffd9e2; - --Secondary: #e3bdc6; - --On-Secondary: #422931; - --Secondary-Container: #5a3f47; - --On-Secondary-Container: #ffd9e2; - --Tertiary: #efbd94; - --On-Tertiary: #48290b; - --Tertiary-Container: #623f20; - --On-Tertiary-Container: #ffdcc1; - --Error: #ffb4ab; - --On-Error: #690005; - --Error-Container: #93000a; - --On-Error-Container: #ffdad6; - --Surface-Dim: #191113; - --Surface: #191113; - --Surface-Bright: #413739; - --Surface-Container-Lowest: #140c0e; - --Surface-Container-Low: #22191c; - --Surface-Container: #261d20; - --Surface-Container-High: #31282a; - --Surface-Container-Highest: #3c3235; - --Inverse-Surface: #efdfe1; - --Inverse-On-Surface: #372e30; - --Inverse-Primary: #8c4a60; - --On-Surface: #efdfe1; - --On-Surface-Variant: #d5c2c6; - --Outline: #9e8c90; - --Outline-Variant: #514347; - --Scrim: #000000; - --Shadow: #000000; - --Top-bar:90, 63, 71; - --scheme: #e91e63; - - - - } - - /* orange */ - - - [data-theme="light"][data-color-theme="Material You (Hint orange 33)"] { - - - --Primary: #684100; - --On-Primary: #ffffff; - --Primary-Container: #966316; - --On-Primary-Container: #ffffff; - --Secondary: #745a39; - --On-Secondary: #ffffff; - --Secondary-Container: #ffdfbb; - --On-Secondary-Container: #5d4426; - --Tertiary: #454f00; - --On-Tertiary: #ffffff; - --Tertiary-Container: #687425; - --On-Tertiary-Container: #ffffff; - --Error: #ba1a1a; - --On-Error: #ffffff; - --Error-Container: #ffdad6; - --On-Error-Container: #410002; - --Surface-Dim:#e3d8ce ; - --Surface:#fff8f4 ; - --Surface-Bright: #fff8f4; - --Surface-Container-Lowest: #ffffff; - --Surface-Container-Low: #fef2e8; - --Surface-Container: #f8ece2; - --Surface-Container-High: #f2e6dc; - --Surface-Container-Highest: #ece0d7; - --Inverse-Surface: #362f29; - --Inverse-On-Surface: #fbefe5; - --Inverse-Primary:#fbba67 ; - --On-Surface: #201b15; - --On-Surface-Variant: #514538; - --Outline: #837566; - --Outline-Variant: #d5c4b2; + --Primary: #d2dbff; + --On-Primary: #122c6c; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #024874; + --On-Secondary-Container: #97c4f1; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #001d33; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; --Scrim: #000000; --Shadow: #000000; - --Top-bar: 255, 223, 187; - --scheme: #ff5722; } -[data-theme="dark"][data-color-theme="Material You (Hint orange 33)"] { +[iconCodeTheme="01n"] { - --Primary: #fbba67; + --Primary: #bac3ff; + --On-Primary: #00208d; + --Primary-Container: #1d40d0; + --On-Primary-Container: #f4f2ff; + --Secondary: #b9c3ff; + --On-Secondary: #212c60; + --Secondary-Container: #162155; + --On-Secondary-Container: #a4aeeb; + --Tertiary: #f6adff; + --On-Tertiary: #560069; + --Tertiary-Container: #871f9e; + --On-Tertiary-Container: #fff1fb; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #93000a; + --Surface-Dim:#12131b ; + --Surface: #001d33; + --Surface-Bright: #383942; + --Surface-Container-Lowest:#0c0e16 ; + --Surface-Container-Low: #001742; + --Surface-Container: #0c1e41; + --Surface-Container-High: #282932; + --Surface-Container-Highest: #33343d; + --Inverse-Surface: #e2e1ed; + --Inverse-On-Surface: #2f3039; + --Inverse-Primary: #2f4edc; + --On-Surface: #e2e1ed; + --On-Surface-Variant: #c4c5d7; + --Outline: #8e8fa0; + --Outline-Variant: #444655; + --Scrim: #000000; + --Shadow: #000000; + + + +} + + +[iconCodeTheme="02d"] { + + + --Primary: #d2dbff; + --On-Primary: #122c6c; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #243240; + --On-Secondary-Container: #97c4f1; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #0e1d2a; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + + +} + + +[iconCodeTheme="02n"] { + + --Primary: #d2dbff; + --On-Primary: #122c6c; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #243240; + --On-Secondary-Container: #97c4f1; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #0e1d2a; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + + +} + + +[iconCodeTheme="03d"] { + + --Primary: #d2dbff; + --On-Primary: #122c6c; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #364452; + --On-Secondary-Container: #97c4f1; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #0e1d2a; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + +} + + +[iconCodeTheme="03n"] { + + --Primary: #d2dbff; + --On-Primary: #122c6c; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #364452; + --On-Secondary-Container: #97c4f1; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #0e1d2a; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + + +} + + +[iconCodeTheme="04d"] { + + --Primary: #d2dbff; + --On-Primary: #122c6c; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #202e3c; + --On-Secondary-Container: #97c4f1; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #0e1d2a; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + +} + + +[iconCodeTheme="04n"] { + + --Primary: #d2dbff; + --On-Primary: #122c6c; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #202e3c; + --On-Secondary-Container: #97c4f1; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #0e1d2a; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + + +} + + +[iconCodeTheme="09d"] { + + --Primary: #d2dbff; + --On-Primary: #122c6c; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #1e2c3a; + --On-Secondary-Container: #97c4f1; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #0e1d2a; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + +} + + +[iconCodeTheme="09n"] { + + --Primary: #d2dbff; + --On-Primary: #122c6c; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #1e2c3a; + --On-Secondary-Container: #97c4f1; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #0e1d2a; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + + +} +[iconCodeTheme="10d"] { + + --Primary: #d2dbff; + --On-Primary: #122c6c; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #1e2c3a; + --On-Secondary-Container: #97c4f1; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #0e1d2a; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + + +} + + +[iconCodeTheme="10n"] { + + --Primary: #d2dbff; + --On-Primary: #122c6c; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #1e2c3a; + --On-Secondary-Container: #97c4f1; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #0e1d2a; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + + +} + +[iconCodeTheme="11d"] { + + --Primary: #d2dbff; + --On-Primary: #122c6c; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #1e2c3a; + --On-Secondary-Container: #97c4f1; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #0e1d2a; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + + +} + + +[iconCodeTheme="11n"] { + + --Primary: #d2dbff; + --On-Primary: #122c6c; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #1e2c3a; + --On-Secondary-Container: #97c4f1; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #0e1d2a; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + +} + + +[iconCodeTheme="13d"] { + + + + --Primary: #bdc4f1; + --On-Primary: #262e52; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #41465f; + --On-Secondary-Container: #cdd3ff; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #1f1f30; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + + +} + + +[iconCodeTheme="13n"] { + + + --Primary: #bdc4f1; + --On-Primary: #262e52; + --Primary-Container: #9bb0f8; + --On-Primary-Container: #042162; + --Secondary: #9dcbf9; + --On-Secondary: #003353; + --Secondary-Container: #41465f; + --On-Secondary-Container: #cdd3ff; + --Tertiary: #ffcef9; + --On-Tertiary: #4f1a51; + --Tertiary-Container:#e09ddc ; + --On-Tertiary-Container: #451048; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim:#121317 ; + --Surface: #1f1f30; + --Surface-Bright: #38393e; + --Surface-Container-Lowest:#0d0e12 ; + --Surface-Container-Low: #012438; + --Surface-Container: #112535; + --Surface-Container-High: #292a2e; + --Surface-Container-Highest: #343439; + --Inverse-Surface: #e3e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #465b9d; + --On-Surface: #e3e2e8; + --On-Surface-Variant: #c5c6d2; + --Outline: #8f909b; + --Outline-Variant: #444650; + --Scrim: #000000; + --Shadow: #000000; + + +} + + + +[iconCodeTheme="50d"] { + + + --Primary: #ffd5a5; --On-Primary: #462a00; - --Primary-Container: #774b00; - --On-Primary-Container: #fff7f1; - --Secondary: #e3c199; - --On-Secondary: #412c10; - --Secondary-Container: #523b1d; - --On-Secondary-Container:#f2cfa6 ; - --Tertiary: #c1ce74; - --On-Tertiary:#2d3400; - --Tertiary-Container: #4f5a0b; - --On-Tertiary-Container: #f4ffb1; - --Error: #ffb4ab; - --On-Error: #690005; - --Error-Container:#93000a ; - --On-Error-Container:#ffdad6 ; - --Surface-Dim:#17130d ; - --Surface: #17130d; - --Surface-Bright: #3f3831; - --Surface-Container-Lowest:#120d08 ; - --Surface-Container-Low: #201b15; - --Surface-Container: #241f19; - --Surface-Container-High: #2f2923; - --Surface-Container-Highest: #3a342d; - --Inverse-Surface: #ece0d7; - --Inverse-On-Surface: #362f29; - --Inverse-Primary: #845403; - --On-Surface: #ece0d7; - --On-Surface-Variant:#d5c4b2; - --Outline: #9d8e7e; - --Outline-Variant: #514538; - --Scrim:#000000 ; - --Shadow: #000000; - - --Top-bar: 82, 59, 29; - --scheme: #ff5722; - - -} - -/* gray */ - - -[data-theme="light"][data-color-theme="Material You (Deep charcoal 83)"] { - - - --Primary: #000000; - --On-Primary: #ffffff; - --Primary-Container: #262626; - --On-Primary-Container: #b1b1b1; - --Secondary: #5e5e5e; - --On-Secondary: #ffffff; - --Secondary-Container: #e6e6e6; - --On-Secondary-Container: #4a4a4a; - --Tertiary: #000000; - --On-Tertiary: #ffffff; - --Tertiary-Container: #262626; - --On-Tertiary-Container:#b1b1b1 ; - --Error: #ba1a1a; - --On-Error: #ffffff; - --Error-Container:#ffdad6 ; - --On-Error-Container: #410002; - --Surface-Dim: #dadada; - --Surface: #f9f9f9; - --Surface-Bright: #f9f9f9; - --Surface-Container-Lowest: #ffffff; - --Surface-Container-Low: #f3f3f3; - --Surface-Container: #eeeeee; - --Surface-Container-High: #e8e8e8; - --Surface-Container-Highest:#e2e2e2 ; - --Inverse-Surface:#303030 ; - --Inverse-On-Surface:#f1f1f1 ; - --Inverse-Primary: #c6c6c6; - --On-Surface: #1b1b1b ; - --On-Surface-Variant: #4c4546; - --Outline:#7e7576 ; - --Outline-Variant: #cfc4c5; - --Scrim: #000000; - --Shadow: #000000; - - --Top-bar: 230, 230, 230; - --scheme: #607d8b; - -} - - -[data-theme="dark"][data-color-theme="Material You (Deep charcoal 83)"] { - - --Primary: #c6c6c6; - --On-Primary: #303030; - --Primary-Container:#000000 ; - --On-Primary-Container: #969696; - --Secondary: #c6c6c6; - --On-Secondary: #303030; - --Secondary-Container:#3d3d3d ; - --On-Secondary-Container: #d1d1d1; - --Tertiary: #c6c6c6; - --On-Tertiary: #303030; - --Tertiary-Container: #000000; - --On-Tertiary-Container: #969696; - --Error:#ffb4ab ; - --On-Error: #690005; - --Error-Container: #93000a; - --On-Error-Container: #ffdad6; - --Surface-Dim:#131313; - --Surface:#131313 ; - --Surface-Bright:#393939 ; - --Surface-Container-Lowest:#0e0e0e ; - --Surface-Container-Low: #1b1b1b; - --Surface-Container: #1f1f1f; - --Surface-Container-High:#2a2a2a ; - --Surface-Container-Highest: #353535; - --Inverse-Surface: #e2e2e2; - --Inverse-On-Surface: #303030; - --Inverse-Primary:#5e5e5e ; - --On-Surface: #e2e2e2; - --On-Surface-Variant: #cfc4c5; - --Outline:#988e90 ; - --Outline-Variant: #4c4546; - --Scrim:#000000 ; - --Shadow: #000000; - - --Top-bar: 61, 61, 61; - - --scheme: #607d8b; - -} - - -/* blue bright */ - -[data-theme="light"][data-color-theme="Material You (Blue bright P40)"] { - - - --Primary: #0045a2; - --On-Primary: #ffffff; - --Primary-Container: #2668dc; - --On-Primary-Container: #ffffff; - --Secondary: #4b5d8a; - --On-Secondary: #ffffff; - --Secondary-Container: #c3d2ff; - --On-Secondary-Container: #2a3d68; - --Tertiary: #741f91; - --On-Tertiary: #ffffff; - --Tertiary-Container: #9c49b9; - --On-Tertiary-Container: #ffffff; - --Error: #ba1a1a; - --On-Error: #ffffff; - --Error-Container: #ffdad6; - --On-Error-Container: #410002; - --Surface-Dim: #d9d9e3; - --Surface: #faf8ff; - --Surface-Bright: #faf8ff; - --Surface-Container-Lowest: #ffffff; - --Surface-Container-Low: #f2f3fd; - --Surface-Container: #ededf7; - --Surface-Container-High:#e7e7f2 ; - --Surface-Container-Highest: #e1e2ec; - --Inverse-Surface: #2e3038; - --Inverse-On-Surface: #f0f0fa; - --Inverse-Primary: #b0c6ff; - --On-Surface: #191b23; - --On-Surface-Variant: #424654; - --Outline: #737785; - --Outline-Variant: #c2c6d6; - --Scrim: #000000; - --Shadow: #000000; - - --Top-bar: 237, 237, 247; - - --showcase: #0045a2; - --scheme: #3f51b5; - -} - - -[data-theme="dark"][data-color-theme="Material You (Blue bright P40)"] { - - --Primary: #b0c6ff; - --On-Primary: #002d6f; - --Primary-Container: #004fb8; - --On-Primary-Container: #f9f8ff; - --Secondary: #b3c6f9; - --On-Secondary: #1b2f59; - --Secondary-Container: #2c3f69; - --On-Secondary-Container: #c5d4ff; - --Tertiary: #efb0ff; - --On-Tertiary: #53006e; - --Tertiary-Container: #822f9f; - --On-Tertiary-Container: #fff9fa; + --Primary-Container:#f7a000 ; + --On-Primary-Container: #3a2200; + --Secondary: #dec391; + --On-Secondary: #3e2e09; + --Secondary-Container: #352603; + --On-Secondary-Container: #cab180; + --Tertiary: #d3e64f; + --On-Tertiary: #2d3400; + --Tertiary-Container: #a9bb26; + --On-Tertiary-Container: #242900; --Error: #ffb4ab; --On-Error: #690005; --Error-Container: #93000a; --On-Error-Container: #ffdad6; - --Surface-Dim: #11131a; - --Surface: #11131a; - --Surface-Bright: #373941; - --Surface-Container-Lowest:#0c0e15 ; - --Surface-Container-Low: #191b23; - --Surface-Container: #1d1f27; - --Surface-Container-High:#272a31 ; - --Surface-Container-Highest: #32353c; - --Inverse-Surface: #e1e2ec; - --Inverse-On-Surface: #2e3038; - --Inverse-Primary: #0058cb; - --On-Surface:#e1e2ec ; - --On-Surface-Variant:#c2c6d6 ; - --Outline: #8c909f; - --Outline-Variant:#424654 ; + --Surface-Dim: #191209; + --Surface: #191209; + --Surface-Bright: #41382d; + --Surface-Container-Lowest: #140d05; + --Surface-Container-Low: #221a11; + --Surface-Container: #261e15; + --Surface-Container-High: #31281f; + --Surface-Container-Highest: #3c3329; + --Inverse-Surface: #f0e0d1; + --Inverse-On-Surface: #382f25; + --Inverse-Primary: #855400; + --On-Surface: #f0e0d1; + --On-Surface-Variant: #d9c3ac; + --Outline: #a18e79; + --Outline-Variant: #534433; --Scrim: #000000; --Shadow: #000000; - --Top-bar: 29, 31, 39; - --showcase: #7b9ae6; - --scheme: #3f51b5; } - - /* default */ - [data-theme="light"][data-color-theme="Material You (pop_blue_default)"] { - --Primary: #465d91; - --On-Primary: #ffffff; - --Primary-Container: #d9e2ff; - --On-Primary-Container: #001944; - --Secondary: #575e71; - --On-Secondary: #ffffff; - --Secondary-Container: #dbe2f9; - --On-Secondary-Container: #141b2c; - --Tertiary: #2e6a44; - --On-Tertiary: #ffffff; - --Tertiary-Container: #b1f1c1; - --On-Tertiary-Container: #00210e; - --Error: #ba1a1a; - --On-Error: #ffffff; - --Error-Container: #ffdad6; - --On-Error-Container: #410002; - --Surface-Dim: #dad9e0; - --Surface: #faf8ff; - --Surface-Bright: #faf8ff; - --Surface-Container-Lowest:#ffffff ; - --Surface-Container-Low:#f4f3fa ; - --Surface-Container: #eeedf4; - --Surface-Container-High: #e8e7ef; - --Surface-Container-Highest: #e2e2e9; - --Inverse-Surface: #2f3036; - --Inverse-On-Surface:#f1f0f7 ; - --Inverse-Primary: #afc6ff; - --On-Surface: #1a1b20; - --On-Surface-Variant:#44464f ; - --Outline: #757780; - --Outline-Variant: #c5c6d0; - --Scrim: #000000; - --Shadow: #000000; - --Top-bar: 219, 226, 249; - +[iconCodeTheme="50n"] { - } - - [data-theme="dark"][data-color-theme="Material You (pop_blue_default)"] { - - --Primary: #afc6ff; - --On-Primary: #142f60; - --Primary-Container: #2e4578; - --On-Primary-Container: #d9e2ff; - --Secondary: #bfc6dc; - --On-Secondary: #293042; - --Secondary-Container: #404659; - --On-Secondary-Container: #dbe2f9; - --Tertiary: #96d5a6; - --On-Tertiary: #00391c; - --Tertiary-Container: #12512e; - --On-Tertiary-Container: #b1f1c1; - --Error: #ffb4ab; - --On-Error: #690005; - --Error-Container: #93000a; - --On-Error-Container: #ffdad6; - --Surface-Dim: #121318; - --Surface: #121318; - --Surface-Bright: #38393f; - --Surface-Container-Lowest: #0c0e13; - --Surface-Container-Low: #1a1b20; - --Surface-Container: #1e1f25; - --Surface-Container-High: #282a2f; - --Surface-Container-Highest: #33353a; - --Inverse-Surface: #e2e2e9; - --Inverse-On-Surface: #2f3036; - --Inverse-Primary: #465d91; - --On-Surface: #e2e2e9; - --On-Surface-Variant: #c5c6d0; - --Outline: #8f9099; - --Outline-Variant: #44464f; - --Scrim: #000000; - --Shadow: #000000; - --Top-bar: 64, 70, 89; - - - - - } + --Primary: #ffd5a5; + --On-Primary: #462a00; + --Primary-Container:#f7a000 ; + --On-Primary-Container: #3a2200; + --Secondary: #dec391; + --On-Secondary: #3e2e09; + --Secondary-Container: #352603; + --On-Secondary-Container: #cab180; + --Tertiary: #d3e64f; + --On-Tertiary: #2d3400; + --Tertiary-Container: #a9bb26; + --On-Tertiary-Container: #242900; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim: #191209; + --Surface: #191209; + --Surface-Bright: #41382d; + --Surface-Container-Lowest: #140d05; + --Surface-Container-Low: #221a11; + --Surface-Container: #261e15; + --Surface-Container-High: #31281f; + --Surface-Container-Highest: #3c3329; + --Inverse-Surface: #f0e0d1; + --Inverse-On-Surface: #382f25; + --Inverse-Primary: #855400; + --On-Surface: #f0e0d1; + --On-Surface-Variant: #d9c3ac; + --Outline: #a18e79; + --Outline-Variant: #534433; + --Scrim: #000000; + --Shadow: #000000; - /* test */ +} + + +/* apps */ + +[Theme="default"] { + + --Primary: #aac7ff; + --On-Primary: #002f64; + --Primary-Container: #6e94d6; + --On-Primary-Container: #000000; + --Secondary: #b9c7e5; + --On-Secondary: #233148; + --Secondary-Container: #323f58; + --On-Secondary-Container: #c6d4f3; + --Tertiary: #f2b0f5; + --On-Tertiary: #4d1a55; + --Tertiary-Container: #bc7fc0; + --On-Tertiary-Container: #000000; + --Error: #ffb4ab; + --On-Error: #690005; + --Error-Container: #93000a; + --On-Error-Container: #ffdad6; + --Surface-Dim: #121317; + --Surface: #121317; + --Surface-Bright: #38393e; + --Surface-Container-Lowest: #0c0e12; + --Surface-Container-Low: #1a1c20; + --Surface-Container: #1e2024; + --Surface-Container-High: #282a2e; + --Surface-Container-Highest: #333539; + --Inverse-Surface: #e2e2e8; + --Inverse-On-Surface: #2f3035; + --Inverse-Primary: #365e9d; + --On-Surface: #e2e2e8; + --On-Surface-Variant: #c3c6d2; + --Outline: #8d909b; + --Outline-Variant: #434750; + --Scrim: #000000; + --Shadow: #000000; + + + +} diff --git a/app/src/main/assets/weather_icon_animated/01d.svg b/app/src/main/assets/weather_icon_animated/01d.svg deleted file mode 100644 index ade295c18..000000000 --- a/app/src/main/assets/weather_icon_animated/01d.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/01n.svg b/app/src/main/assets/weather_icon_animated/01n.svg deleted file mode 100644 index 239ba11ff..000000000 --- a/app/src/main/assets/weather_icon_animated/01n.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/assets/weather_icon_animated/02d.svg b/app/src/main/assets/weather_icon_animated/02d.svg deleted file mode 100644 index c4246ce55..000000000 --- a/app/src/main/assets/weather_icon_animated/02d.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/02n.svg b/app/src/main/assets/weather_icon_animated/02n.svg deleted file mode 100644 index b885b4856..000000000 --- a/app/src/main/assets/weather_icon_animated/02n.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/03d.svg b/app/src/main/assets/weather_icon_animated/03d.svg deleted file mode 100644 index 2159f886c..000000000 --- a/app/src/main/assets/weather_icon_animated/03d.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/03n.svg b/app/src/main/assets/weather_icon_animated/03n.svg deleted file mode 100644 index 2159f886c..000000000 --- a/app/src/main/assets/weather_icon_animated/03n.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/04d.svg b/app/src/main/assets/weather_icon_animated/04d.svg deleted file mode 100644 index 4aa084d39..000000000 --- a/app/src/main/assets/weather_icon_animated/04d.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/04n.svg b/app/src/main/assets/weather_icon_animated/04n.svg deleted file mode 100644 index 4aa084d39..000000000 --- a/app/src/main/assets/weather_icon_animated/04n.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/09d.svg b/app/src/main/assets/weather_icon_animated/09d.svg deleted file mode 100644 index 6d8c6977c..000000000 --- a/app/src/main/assets/weather_icon_animated/09d.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/09n.svg b/app/src/main/assets/weather_icon_animated/09n.svg deleted file mode 100644 index 6d8c6977c..000000000 --- a/app/src/main/assets/weather_icon_animated/09n.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/10d.svg b/app/src/main/assets/weather_icon_animated/10d.svg deleted file mode 100644 index 861a73644..000000000 --- a/app/src/main/assets/weather_icon_animated/10d.svg +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/10n.svg b/app/src/main/assets/weather_icon_animated/10n.svg deleted file mode 100644 index 53681805e..000000000 --- a/app/src/main/assets/weather_icon_animated/10n.svg +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/11d.svg b/app/src/main/assets/weather_icon_animated/11d.svg deleted file mode 100644 index f10c7d105..000000000 --- a/app/src/main/assets/weather_icon_animated/11d.svg +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/11n.svg b/app/src/main/assets/weather_icon_animated/11n.svg deleted file mode 100644 index f10c7d105..000000000 --- a/app/src/main/assets/weather_icon_animated/11n.svg +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/13d.svg b/app/src/main/assets/weather_icon_animated/13d.svg deleted file mode 100644 index a19e59757..000000000 --- a/app/src/main/assets/weather_icon_animated/13d.svg +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/13n.svg b/app/src/main/assets/weather_icon_animated/13n.svg deleted file mode 100644 index a19e59757..000000000 --- a/app/src/main/assets/weather_icon_animated/13n.svg +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/50d.svg b/app/src/main/assets/weather_icon_animated/50d.svg deleted file mode 100644 index 390db9166..000000000 --- a/app/src/main/assets/weather_icon_animated/50d.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/assets/weather_icon_animated/50n.svg b/app/src/main/assets/weather_icon_animated/50n.svg deleted file mode 100644 index 0e933a2eb..000000000 --- a/app/src/main/assets/weather_icon_animated/50n.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/java/com/example/weathermaster/AboutPage.java b/app/src/main/java/com/example/weathermaster/AboutPage.java new file mode 100644 index 000000000..d188cb46d --- /dev/null +++ b/app/src/main/java/com/example/weathermaster/AboutPage.java @@ -0,0 +1,226 @@ +package com.example.weathermaster; + + +import android.animation.ArgbEvaluator; +import android.animation.ObjectAnimator; +import android.annotation.SuppressLint; +import android.content.Intent; +import android.graphics.Color; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.os.Handler; +import android.view.View; +import android.view.WindowManager; +import android.webkit.JavascriptInterface; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewClient; +import android.widget.ProgressBar; +import android.widget.Toast; + + +import androidx.annotation.RequiresApi; +import androidx.appcompat.app.AppCompatActivity; + +public class AboutPage extends AppCompatActivity { + + private WebView webview; + + public void onBackPressed() { + super.onBackPressed(); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + + + + setContentView(R.layout.activity_main); + + + + // Webview stuff + webview = findViewById(R.id.webView); + WebSettings webSettings = webview.getSettings(); + webSettings.setJavaScriptEnabled(true); + webSettings.setDomStorageEnabled(true); + webSettings.setAllowFileAccessFromFileURLs(true); + webSettings.setAllowUniversalAccessFromFileURLs(true); + webSettings.setAllowContentAccess(true); + webview.setVerticalScrollBarEnabled(true); + webview.setHorizontalScrollBarEnabled(false); + webview.setOverScrollMode(WebView.OVER_SCROLL_NEVER); + webview.setWebViewClient(new WebViewClientDemo()); + AndroidInterface androidInterface = new AndroidInterface(this); + webview.addJavascriptInterface(androidInterface, "AndroidInterface"); + webview.setBackgroundColor(getResources().getColor(R.color.mainBG)); + + webview.loadUrl("file:///android_asset/pages/AboutPage.html"); + + } + + + + + public class AndroidInterface { + private AboutPage aActivity; + + AndroidInterface(AboutPage activity) { + aActivity = activity; + } + + @JavascriptInterface + public void updateStatusBarColor(final String color) { + aActivity.runOnUiThread(new Runnable() { + @SuppressLint("ResourceType") + @RequiresApi(api = Build.VERSION_CODES.O) + @Override + public void run() { + int statusBarColor; + int navigationBarColor; + int systemUiVisibilityFlags = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; + + + if(color.equals("Scrolled")){ + statusBarColor = 0xFF1e2024; + navigationBarColor = 0xFF121317; + systemUiVisibilityFlags = 0; + + } else if (color.equals("ScrollFalse")) { + statusBarColor = 0xFF121317; + navigationBarColor = 0xFF121317; + systemUiVisibilityFlags = 0; + + } else if (color.equals("GoBack")){ + back(); + return; + } else if (color.equals("OpenTermsConditions")){ + openTermsConditions(); + return; + } else if (color.equals("OpenPrivacyPolicy")){ + openPrivacyPolicy(); + return; + } else if (color.equals("OpenLicenses")){ + openThirdParty(); + return; + + } else if (color.equals("bluesetDef")) { + + return; + } else if (color.equals("keepiton")) { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + return; + } else if (color.equals("keepitoff")) { + getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + return; + } else if (color.equals("itsOn")) { + Toast.makeText(aActivity, "Your device will stay awake", Toast.LENGTH_SHORT).show(); + return; + } else if (color.equals("ItsOff")) { + Toast.makeText(aActivity, "Your device will go to sleep at the default time", Toast.LENGTH_SHORT).show(); + return; + + + } else { + Toast.makeText(aActivity, "not found", Toast.LENGTH_SHORT).show(); + return; + } + + + int currentStatusBarColor = aActivity.getWindow().getStatusBarColor(); + int currentNavigationBarColor = aActivity.getWindow().getNavigationBarColor(); + + ObjectAnimator statusBarAnimator = ObjectAnimator.ofObject( + aActivity.getWindow(), + "statusBarColor", + new ArgbEvaluator(), + currentStatusBarColor, + statusBarColor + ); + + statusBarAnimator.setDuration(200); + statusBarAnimator.start(); + + ObjectAnimator navBarAnimator = ObjectAnimator.ofObject( + aActivity.getWindow(), + "navigationBarColor", + new ArgbEvaluator(), + currentNavigationBarColor, + navigationBarColor + ); + + navBarAnimator.setDuration(200); + navBarAnimator.start(); + + aActivity.getWindow().setNavigationBarColor(navigationBarColor); + + View decorView = aActivity.getWindow().getDecorView(); + decorView.setSystemUiVisibility(systemUiVisibilityFlags); + + + } + }); + } + + + + public void openTermsConditions() { + Intent intent = new Intent(aActivity, Terms_Conditions.class); + aActivity.startActivity(intent); + } + public void openPrivacyPolicy() { + Intent intent = new Intent(aActivity, PrivacyPolicy.class); + aActivity.startActivity(intent); + } + public void openThirdParty() { + Intent intent = new Intent(aActivity, ThirdParty.class); + aActivity.startActivity(intent); + } + + + } + + public void back() { + onBackPressed(); + } + + + + private static class WebViewClientDemo extends WebViewClient { + + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + if (shouldOpenInBrowser(url)) { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + view.getContext().startActivity(intent); + return true; + + } else { + view.loadUrl(url); + return true; + + + } + + + } + + private boolean shouldOpenInBrowser(String url) { + return url.startsWith("https://fonts.google.com/specimen/Outfit?query=outfit") || + url.startsWith("https://openweathermap.org/") || + url.startsWith("https://fonts.google.com/specimen/Poppins?query=poppins") || + url.startsWith("https://github.com/material-components/material-web") || + 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/releases"); + + + } + + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/weathermaster/MainActivity.java b/app/src/main/java/com/example/weathermaster/MainActivity.java index 165a7e2f2..09f9a68a1 100644 --- a/app/src/main/java/com/example/weathermaster/MainActivity.java +++ b/app/src/main/java/com/example/weathermaster/MainActivity.java @@ -70,11 +70,6 @@ public class MainActivity extends AppCompatActivity { super.onCreate(savedInstanceState); - getWindow().getDecorView().setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR - ); - - setContentView(R.layout.activity_main); @@ -94,7 +89,7 @@ public class MainActivity extends AppCompatActivity { AndroidInterface androidInterface = new AndroidInterface(this); webview.addJavascriptInterface(androidInterface, "AndroidInterface"); - webview.setBackgroundColor(getResources().getColor(R.color.black)); + webview.setBackgroundColor(getResources().getColor(R.color.diffDefault)); requestLocationPermissions(); @@ -205,691 +200,121 @@ public class MainActivity extends AppCompatActivity { int systemUiVisibilityFlags = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; - if (color.equals("Activitybluedark")) { - statusBarColor = 0xFF121318; - navigationBarColor = 0xFF121318; + if(color.equals("01d")){ + statusBarColor = 0xFF001d33; + navigationBarColor = 0xFF001d33; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C01d)); - } else if (color.equals("Activitybluelight")) { - statusBarColor = 0xFFfaf8ff; - navigationBarColor = 0xFFfaf8ff; - - - } else if (color.equals("Activitypurplelight")) { - statusBarColor = 0xFFfff7fd; - navigationBarColor = 0xFFfff7fd; - - } else if (color.equals("Activitypurpledark")) { - statusBarColor = 0xFF161217; - navigationBarColor = 0xFF161217; - systemUiVisibilityFlags = 0; - - } else if (color.equals("Activityyellowlight")) { - statusBarColor = 0xFFfdf9ec; - navigationBarColor = 0xFFfdf9ec; - } else if (color.equals("Activityyellowdark")) { - statusBarColor = 0xFF14140c; - navigationBarColor = 0xFF14140c; - systemUiVisibilityFlags = 0; - - } else if (color.equals("Activitygreenlight")) { - statusBarColor = 0xFFf8fbf1; - navigationBarColor = 0xFFf8fbf1; - - } else if (color.equals("Activitygreendark")) { - statusBarColor = 0xFF11140f; - navigationBarColor = 0xFF11140f; - systemUiVisibilityFlags = 0; - } else if (color.equals("Activityredlight")) { - statusBarColor = 0xFFfff8f6; - navigationBarColor = 0xFFfff8f6; - } else if (color.equals("Activityreddark")) { - statusBarColor = 0xFF1a1110; - navigationBarColor = 0xFF1a1110; - systemUiVisibilityFlags = 0; - - } else if (color.equals("ActivityPinklight")) { - statusBarColor = 0xFFfff8f8; - navigationBarColor = 0xFFfff8f8; - } else if (color.equals("ActivityPinkdark")) { - statusBarColor = 0xFF191113; - navigationBarColor = 0xFF191113; - systemUiVisibilityFlags = 0; - - } else if (color.equals("ActivityCharcollight")) { - statusBarColor = 0xFFf9f9f9; - navigationBarColor = 0xFFf9f9f9; - - } else if (color.equals("ActivityCharcoldark")) { - statusBarColor = 0xFF131313; - navigationBarColor = 0xFF131313; - systemUiVisibilityFlags = 0; - - } else if (color.equals("ActivityOrangelight")) { - statusBarColor = 0xFFfff8f4; - navigationBarColor = 0xFFfff8f4; - - } else if (color.equals("ActivityOrangedark")) { - statusBarColor = 0xFF17130d; - navigationBarColor = 0xFF17130d; - systemUiVisibilityFlags = 0; - -// Main-START - } else if (color.equals("blue-light")) { - statusBarColor = 0xFFfaf8ff; - navigationBarColor = 0xFFfaf8ff; - setTheme(R.style.blue_light_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.blue_light)); - - - } else if (color.equals("blue-dark")) { - statusBarColor = 0xFF121318; - navigationBarColor = 0xFF121318; - systemUiVisibilityFlags = 0; - setTheme(R.style.blue_dark_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.blue_dark)); - - - } else if (color.equals("purple-light")) { - statusBarColor = 0xFFfff7fd; - navigationBarColor = 0xFFfff7fd; - setTheme(R.style.purple_light_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.purple_light)); - - - } else if (color.equals("purple-dark")) { - statusBarColor = 0xFF161217; - navigationBarColor = 0xFF161217; - systemUiVisibilityFlags = 0; - setTheme(R.style.purple_dark_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.purple_dark)); - - - } else if (color.equals("yellow-light")) { - statusBarColor = 0xFFfdf9ec; - navigationBarColor = 0xFFfdf9ec; - setTheme(R.style.yellow_light_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.yellow_light)); - - - } else if (color.equals("yellow-dark")) { - statusBarColor = 0xFF14140c; - navigationBarColor = 0xFF14140c; - systemUiVisibilityFlags = 0; - setTheme(R.style.yellow_dark_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.yellow_dark)); - - - } else if (color.equals("green-light")) { - statusBarColor = 0xFFf8fbf1; - navigationBarColor = 0xFFf8fbf1; - setTheme(R.style.green_light_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.green_light)); - - - } else if (color.equals("green-dark")) { - statusBarColor = 0xFF11140f; - navigationBarColor = 0xFF11140f; - systemUiVisibilityFlags = 0; - setTheme(R.style.green_dark_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.green_dark)); - - - } else if (color.equals("red-light")) { - statusBarColor = 0xFFfff8f6; - navigationBarColor = 0xFFfff8f6; - setTheme(R.style.red_light_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.red_light)); - - - } else if (color.equals("red-dark")) { - statusBarColor = 0xFF1a1110; - navigationBarColor = 0xFF1a1110; - systemUiVisibilityFlags = 0; - setTheme(R.style.red_dark_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.red_dark)); - - - } else if (color.equals("pink-light")) { - statusBarColor = 0xFFfff8f8; - navigationBarColor = 0xFFfff8f8; - setTheme(R.style.pink_light_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.pink_light)); - - - } else if (color.equals("pink-dark")) { - statusBarColor = 0xFF191113; - navigationBarColor = 0xFF191113; - systemUiVisibilityFlags = 0; - setTheme(R.style.pink_dark_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.pink_dark)); - - - } else if (color.equals("charcol-light")) { - statusBarColor = 0xFFf9f9f9; - navigationBarColor = 0xFFf9f9f9; - setTheme(R.style.charcol_light_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.charcoal_light)); - - - } else if (color.equals("charcol-dark")) { - statusBarColor = 0xFF131313; - navigationBarColor = 0xFF131313; - systemUiVisibilityFlags = 0; - setTheme(R.style.charcol_dark_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.charcoal_dark)); - - - } else if (color.equals("orange-light")) { - statusBarColor = 0xFFfff8f4; - navigationBarColor = 0xFFfff8f4; - setTheme(R.style.orange_light_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.orange_light)); - - - } else if (color.equals("orange-dark")) { - statusBarColor = 0xFF17130d; - navigationBarColor = 0xFF17130d; + } else if (color.equals("01n")) { + statusBarColor = 0xFF001d33; + navigationBarColor = 0xFF001d33; systemUiVisibilityFlags = 0; - setTheme(R.style.orange_dark_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.orange_dark)); - + webview.setBackgroundColor(getResources().getColor(R.color.C01n)); - } else if (color.equals("blue-bright-light")) { - statusBarColor = 0xFFfaf8ff; - navigationBarColor = 0xFFfaf8ff; - setTheme(R.style.blue_bright_light_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.blue_bright_light)); + } else if(color.equals("02d")){ + statusBarColor = 0xFF0e1d2a; + navigationBarColor = 0xFF0e1d2a; + systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C02d)); + } else if (color.equals("02n")) { + statusBarColor = 0xFF0e1d2a; + navigationBarColor = 0xFF0e1d2a; + systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C02n)); - } else if (color.equals("blue-bright-dark")) { - statusBarColor = 0xFF11131a; - navigationBarColor = 0xFF11131a; + } else if(color.equals("03d")){ + statusBarColor = 0xFF0e1d2a; + navigationBarColor = 0xFF0e1d2a; systemUiVisibilityFlags = 0; - setTheme(R.style.blue_bright_dark_scheme); - webview.setBackgroundColor(getResources().getColor(R.color.blue_bright_dark)); + webview.setBackgroundColor(getResources().getColor(R.color.C03d)); - -// scroll colors main-window - - } else if (color.equals("scroll-blue-dark")) { - statusBarColor = 0xFF1e1f25; - navigationBarColor = 0xFF1e1f25; + } else if (color.equals("03n")) { + statusBarColor = 0xFF0e1d2a; + navigationBarColor = 0xFF0e1d2a; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C03n)); - } else if (color.equals("scroll-blue-light")) { - statusBarColor = 0xFFeeedf4; - navigationBarColor = 0xFFeeedf4; - - } else if (color.equals("scroll-purple-dark")) { - statusBarColor = 0xFF221e24; - navigationBarColor = 0xFF221e24; + } else if(color.equals("04d")){ + statusBarColor = 0xFF0e1d2a; + navigationBarColor = 0xFF0e1d2a; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C04d)); - } else if (color.equals("scroll-purple-light")) { - statusBarColor = 0xFFf4ebf3; - navigationBarColor = 0xFFf4ebf3; - - } else if (color.equals("scroll-yellow-dark")) { - statusBarColor = 0xFF202018; - navigationBarColor = 0xFF202018; + } else if (color.equals("04n")) { + statusBarColor = 0xFF0e1d2a; + navigationBarColor = 0xFF0e1d2a; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C04n)); - } else if (color.equals("scroll-yellow-light")) { - statusBarColor = 0xFFf1eee0; - navigationBarColor = 0xFFf1eee0; - - } else if (color.equals("scroll-green-dark")) { - statusBarColor = 0xFF1d211b; - navigationBarColor = 0xFF1d211b; + } else if(color.equals("09d")){ + statusBarColor = 0xFF0e1d2a; + navigationBarColor = 0xFF0e1d2a; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C09d)); - } else if (color.equals("scroll-green-light")) { - statusBarColor = 0xFFecefe5; - navigationBarColor = 0xFFecefe5; - - } else if (color.equals("scroll-red-dark")) { - statusBarColor = 0xFF271d1c; - navigationBarColor = 0xFF271d1c; + } else if (color.equals("09n")) { + statusBarColor = 0xFF0e1d2a; + navigationBarColor = 0xFF0e1d2a; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C09n)); - } else if (color.equals("scroll-red-light")) { - statusBarColor = 0xFFfceae7; - navigationBarColor = 0xFFfceae7; - - } else if (color.equals("scroll-pink-dark")) { - statusBarColor = 0xFF261d20; - navigationBarColor = 0xFF261d20; + } else if(color.equals("10d")){ + statusBarColor = 0xFF0e1d2a; + navigationBarColor = 0xFF0e1d2a; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C10d)); - } else if (color.equals("scroll-pink-light")) { - statusBarColor = 0xFF261d20; - navigationBarColor = 0xFF261d20; - - } else if (color.equals("scroll-charcol-dark")) { - statusBarColor = 0xFF1f1f1f; - navigationBarColor = 0xFF1f1f1f; + } else if (color.equals("10n")) { + statusBarColor = 0xFF0e1d2a; + navigationBarColor = 0xFF0e1d2a; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C10n)); - } else if (color.equals("scroll-charcol-light")) { - statusBarColor = 0xFFeeeeee; - navigationBarColor = 0xFFeeeeee; - - } else if (color.equals("scroll-orange-dark")) { - statusBarColor = 0xFF241f19; - navigationBarColor = 0xFF241f19; + } else if(color.equals("11d")){ + statusBarColor = 0xFF0e1d2a; + navigationBarColor = 0xFF0e1d2a; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C11d)); - } else if (color.equals("scroll-orange-light")) { - statusBarColor = 0xFFf8ece2; - navigationBarColor = 0xFFf8ece2; - - // scroll colors search-window - } else if (color.equals("search-blue-dark")) { - statusBarColor = 0xFF1e1f25; - navigationBarColor = 0xFF121318; + } else if (color.equals("11n")) { + statusBarColor = 0xFF0e1d2a; + navigationBarColor = 0xFF0e1d2a; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C11n)); - } else if (color.equals("search-blue-light")) { - statusBarColor = 0xFFeeedf4; - navigationBarColor = 0xFFfaf8ff; - - } else if (color.equals("search-purple-dark")) { - statusBarColor = 0xFF221e24; - navigationBarColor = 0xFF161217; + } else if(color.equals("13d")){ + statusBarColor = 0xFF1f1f30; + navigationBarColor = 0xFF1f1f30; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C13d)); - } else if (color.equals("search-purple-light")) { - statusBarColor = 0xFFf4ebf3; - navigationBarColor = 0xFFfff7fd; - - } else if (color.equals("search-yellow-dark")) { - statusBarColor = 0xFF202018; - navigationBarColor = 0xFF14140c; + } else if (color.equals("13n")) { + statusBarColor = 0xFF1f1f30; + navigationBarColor = 0xFF1f1f30; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C13n)); - } else if (color.equals("search-yellow-light")) { - statusBarColor = 0xFFf1eee0; - navigationBarColor = 0xFFfdf9ec; - - } else if (color.equals("search-green-dark")) { - statusBarColor = 0xFF1d211b; - navigationBarColor = 0xFF11140f; + } else if(color.equals("50d")){ + statusBarColor = 0xFF191209; + navigationBarColor = 0xFF191209; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C50d)); - } else if (color.equals("search-green-light")) { - statusBarColor = 0xFFecefe5; - navigationBarColor = 0xFFf8fbf1; - - } else if (color.equals("search-red-dark")) { - statusBarColor = 0xFF271d1c; - navigationBarColor = 0xFF1a1110; - systemUiVisibilityFlags = 0; - - } else if (color.equals("search-red-light")) { - statusBarColor = 0xFFfceae7; - navigationBarColor = 0xFFfff8f6; - - } else if (color.equals("search-pink-dark")) { - statusBarColor = 0xFF261d20; - navigationBarColor = 0xFF191113; - systemUiVisibilityFlags = 0; - - } else if (color.equals("search-pink-light")) { - statusBarColor = 0xFFfaeaed; - navigationBarColor = 0xFFfff8f8; - - } else if (color.equals("search-charcol-dark")) { - statusBarColor = 0xFF1f1f1f; - navigationBarColor = 0xFF131313; - systemUiVisibilityFlags = 0; - - } else if (color.equals("search-charcol-light")) { - statusBarColor = 0xFFeeeeee; - navigationBarColor = 0xFFf9f9f9; - - } else if (color.equals("search-orange-dark")) { - statusBarColor = 0xFF241f19; - navigationBarColor = 0xFF17130d; + } else if (color.equals("50n")) { + statusBarColor = 0xFF191209; + navigationBarColor = 0xFF191209; systemUiVisibilityFlags = 0; + webview.setBackgroundColor(getResources().getColor(R.color.C50n)); - } else if (color.equals("search-orange-light")) { - statusBarColor = 0xFFf8ece2; - navigationBarColor = 0xFFfff8f4; - - } else if (color.equals("search-blueBright-dark")) { - statusBarColor = 0xFF1d1f27; - navigationBarColor = 0xFF11131a; - systemUiVisibilityFlags = 0; - - } else if (color.equals("search-blueBright-light")) { - statusBarColor = 0xFFededf7; - navigationBarColor = 0xFFfaf8ff; - -// other-fuctions-dialog - - } else if (color.equals("dialog-blue-light")) { - statusBarColor = 0xFF646366; - navigationBarColor = 0xFF5f5f62; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialog-blue-dark")) { - statusBarColor = 0xFF07080a; - navigationBarColor = 0xFF0c0c0f; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialog-purple-light")) { - statusBarColor = 0xFF666365; - navigationBarColor = 0xFF625e61; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialog-purple-dark")) { - statusBarColor = 0xFF090709; - navigationBarColor = 0xFF0e0c0e; - systemUiVisibilityFlags = 0; - } else if (color.equals("dialog-yellow-light")) { - statusBarColor = 0xFF65645e; - navigationBarColor = 0xFF605f5a; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialog-yellow-dark")) { - statusBarColor = 0xFF080805; - navigationBarColor = 0xFF0d0d0a; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialog-green-light")) { - statusBarColor = 0xFF636460; - navigationBarColor = 0xFF5e605c; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialog-green-dark")) { - statusBarColor = 0xFF070806; - navigationBarColor = 0xFF0c0d0b; - systemUiVisibilityFlags = 0; - } else if (color.equals("dialog-red-light")) { - statusBarColor = 0xFF666362; - navigationBarColor = 0xFF655e5c; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialog-red-dark")) { - statusBarColor = 0xFF0a0706; - navigationBarColor = 0xFF100c0b; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialog-pink-light")) { - statusBarColor = 0xFF666363; - navigationBarColor = 0xFF645e5f; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialog-pink-dark")) { - statusBarColor = 0xFF0a0708; - navigationBarColor = 0xFF0f0c0d; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialog-charcoal-light")) { - statusBarColor = 0xFF646464; - navigationBarColor = 0xFF5f5f5f; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialog-charcoal-dark")) { - statusBarColor = 0xFF080808; - navigationBarColor = 0xFF0c0c0c; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialog-orange-light")) { - statusBarColor = 0xFF666362; - navigationBarColor = 0xFF635e5a; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialog-orange-dark")) { - statusBarColor = 0xFF090805; - navigationBarColor = 0xFF0e0c0a; - systemUiVisibilityFlags = 0; - - -// inverted-dialog - - } else if (color.equals("dialogInverted-blue-light")) { - navigationBarColor = 0xFF646366; - statusBarColor = 0xFF5f5f62; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogInverted-blue-dark")) { - navigationBarColor = 0xFF07080a; - statusBarColor = 0xFF0c0c0f; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogInverted-purple-light")) { - navigationBarColor = 0xFF666365; - statusBarColor = 0xFF625e61; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogInverted-purple-dark")) { - navigationBarColor = 0xFF090709; - statusBarColor = 0xFF0e0c0e; - systemUiVisibilityFlags = 0; - } else if (color.equals("dialogInverted-yellow-light")) { - navigationBarColor = 0xFF65645e; - statusBarColor = 0xFF605f5a; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogInverted-yellow-dark")) { - navigationBarColor = 0xFF080805; - statusBarColor = 0xFF0d0d0a; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogInverted-green-light")) { - navigationBarColor = 0xFF636460; - statusBarColor = 0xFF5e605c; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogInverted-green-dark")) { - navigationBarColor = 0xFF070806; - statusBarColor = 0xFF0c0d0b; - systemUiVisibilityFlags = 0; - } else if (color.equals("dialogInverted-red-light")) { - navigationBarColor = 0xFF666362; - statusBarColor = 0xFF655e5c; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogInverted-red-dark")) { - navigationBarColor = 0xFF0a0706; - statusBarColor = 0xFF100c0b; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogInverted-pink-light")) { - navigationBarColor = 0xFF666363; - statusBarColor = 0xFF645e5f; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogInverted-pink-dark")) { - navigationBarColor = 0xFF0a0708; - statusBarColor = 0xFF0f0c0d; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogInverted-charcoal-light")) { - navigationBarColor = 0xFF646464; - statusBarColor = 0xFF5f5f5f; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogInverted-charcoal-dark")) { - navigationBarColor = 0xFF080808; - statusBarColor = 0xFF0c0c0c; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogInverted-orange-light")) { - navigationBarColor = 0xFF666362; - statusBarColor = 0xFF635e5a; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogInverted-orange-dark")) { - navigationBarColor = 0xFF090805; - statusBarColor = 0xFF0e0c0a; - systemUiVisibilityFlags = 0; - - -// dialog-color activity - - } else if (color.equals("dialogActvity-blue-light")) { - statusBarColor = 0xFF646366; - navigationBarColor = 0xFF646366; - systemUiVisibilityFlags = 0; - - - } else if (color.equals("dialogActvity-blue-dark")) { - statusBarColor = 0xFF07080a; - navigationBarColor = 0xFF07080a; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogActvity-purple-light")) { - statusBarColor = 0xFF666365; - navigationBarColor = 0xFF666365; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogActvity-purple-dark")) { - statusBarColor = 0xFF090709; - navigationBarColor = 0xFF090709; - systemUiVisibilityFlags = 0; - } else if (color.equals("dialogActvity-yellow-light")) { - statusBarColor = 0xFF65645e; - navigationBarColor = 0xFF65645e; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogActvity-yellow-dark")) { - statusBarColor = 0xFF080805; - navigationBarColor = 0xFF080805; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogActvity-green-light")) { - statusBarColor = 0xFF636460; - navigationBarColor = 0xFF636460; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogActvity-green-dark")) { - statusBarColor = 0xFF070806; - navigationBarColor = 0xFF070806; - systemUiVisibilityFlags = 0; - } else if (color.equals("dialogActvity-red-light")) { - statusBarColor = 0xFF666362; - navigationBarColor = 0xFF666362; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogActvity-red-dark")) { - statusBarColor = 0xFF0a0706; - navigationBarColor = 0xFF0a0706; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogActvity-pink-light")) { - statusBarColor = 0xFF666363; - navigationBarColor = 0xFF666363; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogActvity-pink-dark")) { - statusBarColor = 0xFF0a0708; - navigationBarColor = 0xFF0a0708; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogActvity-charcoal-light")) { - statusBarColor = 0xFF646464; - navigationBarColor = 0xFF646464; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogActvity-charcoal-dark")) { - statusBarColor = 0xFF080808; - navigationBarColor = 0xFF080808; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogActvity-orange-light")) { - statusBarColor = 0xFF666362; - navigationBarColor = 0xFF666362; - systemUiVisibilityFlags = 0; - - } else if (color.equals("dialogActvity-orange-dark")) { - statusBarColor = 0xFF090805; - navigationBarColor = 0xFF090805; - systemUiVisibilityFlags = 0; - - - // sheet in activity - - } else if (color.equals("sheetInverted-blue-light")) { - navigationBarColor = 0xFFf4f3fa; - statusBarColor = 0xFF5f5f62; - systemUiVisibilityFlags = 0; - - } else if (color.equals("sheetInverted-blue-dark")) { - navigationBarColor = 0xFF1a1b20; - statusBarColor = 0xFF0c0c0f; - systemUiVisibilityFlags = 0; - - } else if (color.equals("sheetInverted-purple-light")) { - navigationBarColor = 0xFFfaf1f9; - statusBarColor = 0xFF625e61; - systemUiVisibilityFlags = 0; - - } else if (color.equals("sheetInverted-purple-dark")) { - navigationBarColor = 0xFF1e1a20; - statusBarColor = 0xFF0e0c0e; - systemUiVisibilityFlags = 0; - } else if (color.equals("sheetInverted-yellow-light")) { - navigationBarColor = 0xFFf7f4e6; - statusBarColor = 0xFF605f5a; - systemUiVisibilityFlags = 0; - - } else if (color.equals("sheetInverted-yellow-dark")) { - navigationBarColor = 0xFF1c1c14; - statusBarColor = 0xFF0d0d0a; - systemUiVisibilityFlags = 0; - - } else if (color.equals("sheetInverted-green-light")) { - navigationBarColor = 0xFFf2f5eb; - statusBarColor = 0xFF5e605c; - systemUiVisibilityFlags = 0; - - } else if (color.equals("sheetInverted-green-dark")) { - navigationBarColor = 0xFF191d17; - statusBarColor = 0xFF0c0d0b; - systemUiVisibilityFlags = 0; - } else if (color.equals("sheetInverted-red-light")) { - navigationBarColor = 0xFFfff0ee; - statusBarColor = 0xFF655e5c; - systemUiVisibilityFlags = 0; - - } else if (color.equals("sheetInverted-red-dark")) { - navigationBarColor = 0xFF231918; - statusBarColor = 0xFF100c0b; - systemUiVisibilityFlags = 0; - - } else if (color.equals("sheetInverted-pink-light")) { - navigationBarColor = 0xFFfff0f2; - statusBarColor = 0xFF645e5f; - systemUiVisibilityFlags = 0; - - } else if (color.equals("sheetInverted-pink-dark")) { - navigationBarColor = 0xFF22191c; - statusBarColor = 0xFF0f0c0d; - systemUiVisibilityFlags = 0; - - } else if (color.equals("sheetInverted-charcoal-light")) { - navigationBarColor = 0xFFf3f3f3; - statusBarColor = 0xFF5f5f5f; - systemUiVisibilityFlags = 0; - - } else if (color.equals("sheetInverted-charcoal-dark")) { - navigationBarColor = 0xFF1b1b1b; - statusBarColor = 0xFF0c0c0c; - systemUiVisibilityFlags = 0; - - } else if (color.equals("sheetInverted-orange-light")) { - navigationBarColor = 0xFFfef2e8; - statusBarColor = 0xFF635e5a; - systemUiVisibilityFlags = 0; - - } else if (color.equals("sheetInverted-orange-dark")) { - navigationBarColor = 0xFF201b15; - statusBarColor = 0xFF0e0c0a; - systemUiVisibilityFlags = 0; + } else if (color.equals("OpenSettings")){ + openSettingsActivity(); + return; + } else if (color.equals("GoBack")){ + back(); + return; } else if (color.equals("bluesetDef")) { @@ -949,9 +374,17 @@ public class MainActivity extends AppCompatActivity { }); } + public void openSettingsActivity() { + Intent intent = new Intent(mActivity, SettingsActivity.class); + mActivity.startActivity(intent); + } } + public void back() { + onBackPressed(); + } + private static class WebViewClientDemo extends WebViewClient { diff --git a/app/src/main/java/com/example/weathermaster/PrivacyPolicy.java b/app/src/main/java/com/example/weathermaster/PrivacyPolicy.java new file mode 100644 index 000000000..b5e4ead79 --- /dev/null +++ b/app/src/main/java/com/example/weathermaster/PrivacyPolicy.java @@ -0,0 +1,202 @@ +package com.example.weathermaster; + + +import android.animation.ArgbEvaluator; +import android.animation.ObjectAnimator; +import android.annotation.SuppressLint; +import android.content.Intent; +import android.graphics.Color; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.os.Handler; +import android.view.View; +import android.view.WindowManager; +import android.webkit.JavascriptInterface; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewClient; +import android.widget.ProgressBar; +import android.widget.Toast; + + +import androidx.annotation.RequiresApi; +import androidx.appcompat.app.AppCompatActivity; + +public class PrivacyPolicy extends AppCompatActivity { + + private WebView webview; + + public void onBackPressed() { + super.onBackPressed(); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + + + + setContentView(R.layout.activity_main); + + + + // Webview stuff + webview = findViewById(R.id.webView); + WebSettings webSettings = webview.getSettings(); + webSettings.setJavaScriptEnabled(true); + webSettings.setDomStorageEnabled(true); + webSettings.setAllowFileAccessFromFileURLs(true); + webSettings.setAllowUniversalAccessFromFileURLs(true); + webSettings.setAllowContentAccess(true); + webview.setVerticalScrollBarEnabled(true); + webview.setHorizontalScrollBarEnabled(false); + webview.setOverScrollMode(WebView.OVER_SCROLL_NEVER); + webview.setWebViewClient(new WebViewClientDemo()); + AndroidInterface androidInterface = new AndroidInterface(this); + webview.addJavascriptInterface(androidInterface, "AndroidInterface"); + webview.setBackgroundColor(getResources().getColor(R.color.mainBG)); + + webview.loadUrl("file:///android_asset/pages/aboutPages/PrivacyPolicy.html"); + + } + + + + + public class AndroidInterface { + private PrivacyPolicy pActivity; + + AndroidInterface(PrivacyPolicy activity) { + pActivity = activity; + } + + @JavascriptInterface + public void updateStatusBarColor(final String color) { + pActivity.runOnUiThread(new Runnable() { + @SuppressLint("ResourceType") + @RequiresApi(api = Build.VERSION_CODES.O) + @Override + public void run() { + int statusBarColor; + int navigationBarColor; + int systemUiVisibilityFlags = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; + + + if(color.equals("Scrolled")){ + statusBarColor = 0xFF1e2024; + navigationBarColor = 0xFF121317; + systemUiVisibilityFlags = 0; + + } else if (color.equals("ScrollFalse")) { + statusBarColor = 0xFF121317; + navigationBarColor = 0xFF121317; + systemUiVisibilityFlags = 0; + + } else if (color.equals("GoBack")){ + back(); + return; + + } else if (color.equals("bluesetDef")) { + + return; + } else if (color.equals("keepiton")) { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + return; + } else if (color.equals("keepitoff")) { + getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + return; + } else if (color.equals("itsOn")) { + Toast.makeText(pActivity, "Your device will stay awake", Toast.LENGTH_SHORT).show(); + return; + } else if (color.equals("ItsOff")) { + Toast.makeText(pActivity, "Your device will go to sleep at the default time", Toast.LENGTH_SHORT).show(); + return; + + + } else { + Toast.makeText(pActivity, "not found", Toast.LENGTH_SHORT).show(); + return; + } + + + int currentStatusBarColor = pActivity.getWindow().getStatusBarColor(); + int currentNavigationBarColor = pActivity.getWindow().getNavigationBarColor(); + + ObjectAnimator statusBarAnimator = ObjectAnimator.ofObject( + pActivity.getWindow(), + "statusBarColor", + new ArgbEvaluator(), + currentStatusBarColor, + statusBarColor + ); + + statusBarAnimator.setDuration(200); + statusBarAnimator.start(); + + ObjectAnimator navBarAnimator = ObjectAnimator.ofObject( + pActivity.getWindow(), + "navigationBarColor", + new ArgbEvaluator(), + currentNavigationBarColor, + navigationBarColor + ); + + navBarAnimator.setDuration(200); + navBarAnimator.start(); + + pActivity.getWindow().setNavigationBarColor(navigationBarColor); + + View decorView = pActivity.getWindow().getDecorView(); + decorView.setSystemUiVisibility(systemUiVisibilityFlags); + + + } + }); + } + + + } + + public void back() { + onBackPressed(); + } + + + + private static class WebViewClientDemo extends WebViewClient { + + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + if (shouldOpenInBrowser(url)) { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + view.getContext().startActivity(intent); + return true; + + } else { + view.loadUrl(url); + return true; + + + } + + + } + + private boolean shouldOpenInBrowser(String url) { + return url.startsWith("https://fonts.google.com/specimen/Outfit?query=outfit") || + url.startsWith("https://openweathermap.org/") || + url.startsWith("https://fonts.google.com/specimen/Poppins?query=poppins") || + url.startsWith("https://github.com/material-components/material-web") || + 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/releases"); + + + } + + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/weathermaster/SettingsActivity.java b/app/src/main/java/com/example/weathermaster/SettingsActivity.java new file mode 100644 index 000000000..06abd1e5f --- /dev/null +++ b/app/src/main/java/com/example/weathermaster/SettingsActivity.java @@ -0,0 +1,211 @@ +package com.example.weathermaster; + +import android.animation.ArgbEvaluator; +import android.animation.ObjectAnimator; +import android.annotation.SuppressLint; +import android.content.Intent; +import android.graphics.Color; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.os.Handler; +import android.view.View; +import android.view.WindowManager; +import android.webkit.JavascriptInterface; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewClient; +import android.widget.ProgressBar; +import android.widget.Toast; + + +import androidx.annotation.RequiresApi; +import androidx.appcompat.app.AppCompatActivity; + +public class SettingsActivity extends AppCompatActivity { + + private WebView webview; + + public void onBackPressed() { + super.onBackPressed(); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + + + + setContentView(R.layout.activity_main); + + + + // Webview stuff + webview = findViewById(R.id.webView); + WebSettings webSettings = webview.getSettings(); + webSettings.setJavaScriptEnabled(true); + webSettings.setDomStorageEnabled(true); + webSettings.setAllowFileAccessFromFileURLs(true); + webSettings.setAllowUniversalAccessFromFileURLs(true); + webSettings.setAllowContentAccess(true); + webview.setVerticalScrollBarEnabled(true); + webview.setHorizontalScrollBarEnabled(false); + webview.setOverScrollMode(WebView.OVER_SCROLL_NEVER); + webview.setWebViewClient(new WebViewClientDemo()); + AndroidInterface androidInterface = new AndroidInterface(this); + webview.addJavascriptInterface(androidInterface, "AndroidInterface"); + webview.setBackgroundColor(getResources().getColor(R.color.mainBG)); + + webview.loadUrl("file:///android_asset/pages/settings.html"); + + } + + + + + public class AndroidInterface { + private SettingsActivity sActivity; + + AndroidInterface(SettingsActivity activity) { + sActivity = activity; + } + + @JavascriptInterface + public void updateStatusBarColor(final String color) { + sActivity.runOnUiThread(new Runnable() { + @SuppressLint("ResourceType") + @RequiresApi(api = Build.VERSION_CODES.O) + @Override + public void run() { + int statusBarColor; + int navigationBarColor; + int systemUiVisibilityFlags = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; + + + if(color.equals("Scrolled")){ + statusBarColor = 0xFF1e2024; + navigationBarColor = 0xFF121317; + systemUiVisibilityFlags = 0; + + } else if (color.equals("ScrollFalse")) { + statusBarColor = 0xFF121317; + navigationBarColor = 0xFF121317; + systemUiVisibilityFlags = 0; + + } else if (color.equals("GoBack")){ + back(); + return; + } else if (color.equals("OpenAboutPage")){ + openAboutPage(); + return; + + } else if (color.equals("bluesetDef")) { + + return; + } else if (color.equals("keepiton")) { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + return; + } else if (color.equals("keepitoff")) { + getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + return; + } else if (color.equals("itsOn")) { + Toast.makeText(sActivity, "Your device will stay awake", Toast.LENGTH_SHORT).show(); + return; + } else if (color.equals("ItsOff")) { + Toast.makeText(sActivity, "Your device will go to sleep at the default time", Toast.LENGTH_SHORT).show(); + return; + + + } else { + Toast.makeText(sActivity, "not found", Toast.LENGTH_SHORT).show(); + return; + } + + + int currentStatusBarColor = sActivity.getWindow().getStatusBarColor(); + int currentNavigationBarColor = sActivity.getWindow().getNavigationBarColor(); + + ObjectAnimator statusBarAnimator = ObjectAnimator.ofObject( + sActivity.getWindow(), + "statusBarColor", + new ArgbEvaluator(), + currentStatusBarColor, + statusBarColor + ); + + statusBarAnimator.setDuration(200); + statusBarAnimator.start(); + + ObjectAnimator navBarAnimator = ObjectAnimator.ofObject( + sActivity.getWindow(), + "navigationBarColor", + new ArgbEvaluator(), + currentNavigationBarColor, + navigationBarColor + ); + + navBarAnimator.setDuration(200); + navBarAnimator.start(); + + sActivity.getWindow().setNavigationBarColor(navigationBarColor); + + View decorView = sActivity.getWindow().getDecorView(); + decorView.setSystemUiVisibility(systemUiVisibilityFlags); + + + } + }); + } + + + + public void openAboutPage() { + Intent intent = new Intent(sActivity, AboutPage.class); + sActivity.startActivity(intent); + } + + + } + + public void back() { + onBackPressed(); + } + + + + private static class WebViewClientDemo extends WebViewClient { + + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + if (shouldOpenInBrowser(url)) { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + view.getContext().startActivity(intent); + return true; + + } else { + view.loadUrl(url); + return true; + + + } + + + } + + private boolean shouldOpenInBrowser(String url) { + return url.startsWith("https://fonts.google.com/specimen/Outfit?query=outfit") || + url.startsWith("https://openweathermap.org/") || + url.startsWith("https://fonts.google.com/specimen/Poppins?query=poppins") || + url.startsWith("https://github.com/material-components/material-web") || + 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/releases"); + + + } + + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/weathermaster/Terms_Conditions.java b/app/src/main/java/com/example/weathermaster/Terms_Conditions.java new file mode 100644 index 000000000..bb32b4608 --- /dev/null +++ b/app/src/main/java/com/example/weathermaster/Terms_Conditions.java @@ -0,0 +1,202 @@ +package com.example.weathermaster; + + +import android.animation.ArgbEvaluator; +import android.animation.ObjectAnimator; +import android.annotation.SuppressLint; +import android.content.Intent; +import android.graphics.Color; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.os.Handler; +import android.view.View; +import android.view.WindowManager; +import android.webkit.JavascriptInterface; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewClient; +import android.widget.ProgressBar; +import android.widget.Toast; + + +import androidx.annotation.RequiresApi; +import androidx.appcompat.app.AppCompatActivity; + +public class Terms_Conditions extends AppCompatActivity { + + private WebView webview; + + public void onBackPressed() { + super.onBackPressed(); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + + + + setContentView(R.layout.activity_main); + + + + // Webview stuff + webview = findViewById(R.id.webView); + WebSettings webSettings = webview.getSettings(); + webSettings.setJavaScriptEnabled(true); + webSettings.setDomStorageEnabled(true); + webSettings.setAllowFileAccessFromFileURLs(true); + webSettings.setAllowUniversalAccessFromFileURLs(true); + webSettings.setAllowContentAccess(true); + webview.setVerticalScrollBarEnabled(true); + webview.setHorizontalScrollBarEnabled(false); + webview.setOverScrollMode(WebView.OVER_SCROLL_NEVER); + webview.setWebViewClient(new WebViewClientDemo()); + AndroidInterface androidInterface = new AndroidInterface(this); + webview.addJavascriptInterface(androidInterface, "AndroidInterface"); + webview.setBackgroundColor(getResources().getColor(R.color.mainBG)); + + webview.loadUrl("file:///android_asset/pages/aboutPages/TermsConditions.html"); + + } + + + + + public class AndroidInterface { + private Terms_Conditions tActivity; + + AndroidInterface(Terms_Conditions activity) { + tActivity = activity; + } + + @JavascriptInterface + public void updateStatusBarColor(final String color) { + tActivity.runOnUiThread(new Runnable() { + @SuppressLint("ResourceType") + @RequiresApi(api = Build.VERSION_CODES.O) + @Override + public void run() { + int statusBarColor; + int navigationBarColor; + int systemUiVisibilityFlags = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; + + + if(color.equals("Scrolled")){ + statusBarColor = 0xFF1e2024; + navigationBarColor = 0xFF121317; + systemUiVisibilityFlags = 0; + + } else if (color.equals("ScrollFalse")) { + statusBarColor = 0xFF121317; + navigationBarColor = 0xFF121317; + systemUiVisibilityFlags = 0; + + } else if (color.equals("GoBack")){ + back(); + return; + + } else if (color.equals("bluesetDef")) { + + return; + } else if (color.equals("keepiton")) { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + return; + } else if (color.equals("keepitoff")) { + getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + return; + } else if (color.equals("itsOn")) { + Toast.makeText(tActivity, "Your device will stay awake", Toast.LENGTH_SHORT).show(); + return; + } else if (color.equals("ItsOff")) { + Toast.makeText(tActivity, "Your device will go to sleep at the default time", Toast.LENGTH_SHORT).show(); + return; + + + } else { + Toast.makeText(tActivity, "not found", Toast.LENGTH_SHORT).show(); + return; + } + + + int currentStatusBarColor = tActivity.getWindow().getStatusBarColor(); + int currentNavigationBarColor = tActivity.getWindow().getNavigationBarColor(); + + ObjectAnimator statusBarAnimator = ObjectAnimator.ofObject( + tActivity.getWindow(), + "statusBarColor", + new ArgbEvaluator(), + currentStatusBarColor, + statusBarColor + ); + + statusBarAnimator.setDuration(200); + statusBarAnimator.start(); + + ObjectAnimator navBarAnimator = ObjectAnimator.ofObject( + tActivity.getWindow(), + "navigationBarColor", + new ArgbEvaluator(), + currentNavigationBarColor, + navigationBarColor + ); + + navBarAnimator.setDuration(200); + navBarAnimator.start(); + + tActivity.getWindow().setNavigationBarColor(navigationBarColor); + + View decorView = tActivity.getWindow().getDecorView(); + decorView.setSystemUiVisibility(systemUiVisibilityFlags); + + + } + }); + } + + + } + + public void back() { + onBackPressed(); + } + + + + private static class WebViewClientDemo extends WebViewClient { + + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + if (shouldOpenInBrowser(url)) { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + view.getContext().startActivity(intent); + return true; + + } else { + view.loadUrl(url); + return true; + + + } + + + } + + private boolean shouldOpenInBrowser(String url) { + return url.startsWith("https://fonts.google.com/specimen/Outfit?query=outfit") || + url.startsWith("https://openweathermap.org/") || + url.startsWith("https://fonts.google.com/specimen/Poppins?query=poppins") || + url.startsWith("https://github.com/material-components/material-web") || + 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/releases"); + + + } + + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/weathermaster/ThirdParty.java b/app/src/main/java/com/example/weathermaster/ThirdParty.java new file mode 100644 index 000000000..5142dbb5e --- /dev/null +++ b/app/src/main/java/com/example/weathermaster/ThirdParty.java @@ -0,0 +1,202 @@ +package com.example.weathermaster; + + +import android.animation.ArgbEvaluator; +import android.animation.ObjectAnimator; +import android.annotation.SuppressLint; +import android.content.Intent; +import android.graphics.Color; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.os.Handler; +import android.view.View; +import android.view.WindowManager; +import android.webkit.JavascriptInterface; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewClient; +import android.widget.ProgressBar; +import android.widget.Toast; + + +import androidx.annotation.RequiresApi; +import androidx.appcompat.app.AppCompatActivity; + +public class ThirdParty extends AppCompatActivity { + + private WebView webview; + + public void onBackPressed() { + super.onBackPressed(); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + + + + setContentView(R.layout.activity_main); + + + + // Webview stuff + webview = findViewById(R.id.webView); + WebSettings webSettings = webview.getSettings(); + webSettings.setJavaScriptEnabled(true); + webSettings.setDomStorageEnabled(true); + webSettings.setAllowFileAccessFromFileURLs(true); + webSettings.setAllowUniversalAccessFromFileURLs(true); + webSettings.setAllowContentAccess(true); + webview.setVerticalScrollBarEnabled(true); + webview.setHorizontalScrollBarEnabled(false); + webview.setOverScrollMode(WebView.OVER_SCROLL_NEVER); + webview.setWebViewClient(new WebViewClientDemo()); + AndroidInterface androidInterface = new AndroidInterface(this); + webview.addJavascriptInterface(androidInterface, "AndroidInterface"); + webview.setBackgroundColor(getResources().getColor(R.color.mainBG)); + + webview.loadUrl("file:///android_asset/pages/aboutPages/licenses.html"); + + } + + + + + public class AndroidInterface { + private ThirdParty thActivity; + + AndroidInterface(ThirdParty activity) { + thActivity = activity; + } + + @JavascriptInterface + public void updateStatusBarColor(final String color) { + thActivity.runOnUiThread(new Runnable() { + @SuppressLint("ResourceType") + @RequiresApi(api = Build.VERSION_CODES.O) + @Override + public void run() { + int statusBarColor; + int navigationBarColor; + int systemUiVisibilityFlags = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR; + + + if(color.equals("Scrolled")){ + statusBarColor = 0xFF1e2024; + navigationBarColor = 0xFF121317; + systemUiVisibilityFlags = 0; + + } else if (color.equals("ScrollFalse")) { + statusBarColor = 0xFF121317; + navigationBarColor = 0xFF121317; + systemUiVisibilityFlags = 0; + + } else if (color.equals("GoBack")){ + back(); + return; + + } else if (color.equals("bluesetDef")) { + + return; + } else if (color.equals("keepiton")) { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + return; + } else if (color.equals("keepitoff")) { + getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + return; + } else if (color.equals("itsOn")) { + Toast.makeText(thActivity, "Your device will stay awake", Toast.LENGTH_SHORT).show(); + return; + } else if (color.equals("ItsOff")) { + Toast.makeText(thActivity, "Your device will go to sleep at the default time", Toast.LENGTH_SHORT).show(); + return; + + + } else { + Toast.makeText(thActivity, "not found", Toast.LENGTH_SHORT).show(); + return; + } + + + int currentStatusBarColor = thActivity.getWindow().getStatusBarColor(); + int currentNavigationBarColor = thActivity.getWindow().getNavigationBarColor(); + + ObjectAnimator statusBarAnimator = ObjectAnimator.ofObject( + thActivity.getWindow(), + "statusBarColor", + new ArgbEvaluator(), + currentStatusBarColor, + statusBarColor + ); + + statusBarAnimator.setDuration(200); + statusBarAnimator.start(); + + ObjectAnimator navBarAnimator = ObjectAnimator.ofObject( + thActivity.getWindow(), + "navigationBarColor", + new ArgbEvaluator(), + currentNavigationBarColor, + navigationBarColor + ); + + navBarAnimator.setDuration(200); + navBarAnimator.start(); + + thActivity.getWindow().setNavigationBarColor(navigationBarColor); + + View decorView = thActivity.getWindow().getDecorView(); + decorView.setSystemUiVisibility(systemUiVisibilityFlags); + + + } + }); + } + + + } + + public void back() { + onBackPressed(); + } + + + + private static class WebViewClientDemo extends WebViewClient { + + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + if (shouldOpenInBrowser(url)) { + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + view.getContext().startActivity(intent); + return true; + + } else { + view.loadUrl(url); + return true; + + + } + + + } + + private boolean shouldOpenInBrowser(String url) { + return url.startsWith("https://fonts.google.com/specimen/Outfit?query=outfit") || + url.startsWith("https://openweathermap.org/") || + url.startsWith("https://fonts.google.com/specimen/Poppins?query=poppins") || + url.startsWith("https://github.com/material-components/material-web") || + 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/releases"); + + + } + + + } +} \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index fde71580b..1cf8993ee 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,22 +4,26 @@ #FFFFFFFF - #121318 - #faf8ff - #161217 - #fff7fd - #14140c - #fdf9ec - #11140f - #f8fbf1 - #1a1110 - #fff8f6 - #191113 - #fff8f8 - #17130d - #fff8f4 - #131313 - #f9f9f9 - #11131a - #faf8ff + #001d33 + #001d33 + #0e1d2a + #0e1d2a + #0e1d2a + #0e1d2a + #0e1d2a + #0e1d2a + #0e1d2a + #0e1d2a + #0e1d2a + #0e1d2a + #0e1d2a + #0e1d2a + #1f1f30 + #1f1f30 + #191209 + #191209 + + + #121317 + #0e1d2a \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 0ffb84997..2189ade56 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -8,8 +8,17 @@ + + @@ -23,7 +32,6 @@