From 16b05b04e1f2a52d74b6941d596ebad716e16ec1 Mon Sep 17 00:00:00 2001
From: PranshulGG <pranshul2yt@gmail.com>
Date: Fri, 23 Aug 2024 20:42:01 +0530
Subject: [PATCH] 1.5.0 updated

---
 app/build.gradle                              |   4 +-
 app/src/main/AndroidManifest.xml              |   6 +
 app/src/main/assets/app/app.js                | 132 +-------
 app/src/main/assets/index.html                |  40 +--
 app/src/main/assets/pages/AboutPage.html      |   4 +-
 app/src/main/assets/pages/radar.html          | 310 ++++++++++++++++++
 app/src/main/assets/ui-files/ui.css           |  68 ----
 .../com/example/weathermaster/LiveRadar.java  | 213 ++++++++++++
 .../example/weathermaster/MainActivity.java   |   7 +
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/themes.xml            |   7 +
 release/output-metadata.json                  |   4 +-
 12 files changed, 552 insertions(+), 244 deletions(-)
 create mode 100644 app/src/main/assets/pages/radar.html
 create mode 100644 app/src/main/java/com/example/weathermaster/LiveRadar.java

diff --git a/app/build.gradle b/app/build.gradle
index 7b90a8f9f..404ec4fb2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.example.weathermaster"
         minSdk 22
         targetSdk 33
-        versionCode 40
-        versionName "1.4.9 (W)"
+        versionCode 41
+        versionName "1.5.0 (W)"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f2ce74487..e0f601339 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,6 +65,12 @@
             android:exported="true"
             android:theme="@style/ScreenMoonPhase"
             />
+        <activity
+            android:name=".LiveRadar"
+            android:screenOrientation="portrait"
+            android:exported="true"
+            android:theme="@style/ScreenLiveRadar"
+            />
             <activity
                 android:name=".MainActivity"
                 android:theme="@style/app_theme"
diff --git a/app/src/main/assets/app/app.js b/app/src/main/assets/app/app.js
index 7eb6a659c..70c9f1781 100644
--- a/app/src/main/assets/app/app.js
+++ b/app/src/main/assets/app/app.js
@@ -2053,136 +2053,6 @@ function removeMap() {
     }
 }
 
-var livemap;
-
-function liveMapRender(maptype){
-
-    const latDif = localStorage.getItem('currentLat');
-    const longDif = localStorage.getItem('currentLong');
-
-    livemap = window.L.map('livemap', {
-        center: [latDif, longDif],
-        zoom: 4,
-        minZoom: 3,
-        zoomControl: false
-    });
-
-
- window.L.marker([latDif, longDif]).addTo(livemap);
-
-
-    const apiKey = '9458a8b672d3e5ed460b72e7637c6eeb';
-
-    window.L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png', {}).addTo(livemap);
-
-
-    window.L.tileLayer(`https://tile.openweathermap.org/map/${maptype}/{z}/{x}/{y}.png?appid=${apiKey}`).addTo(livemap);
-
-
-
-
-}
-
-
-function removeLiveMap() {
-    if (livemap) {
-        livemap.remove();
-        livemap = null;
-    }
-}
-
-
-
-
-
-
-
-
-function Open_RefreshLiveMap(type){
-        removeLiveMap()
-
-    setTimeout(()=>{
-        liveMapRender(type)
-    }, 500);
-
-}
-
-
-
-
-function toggleMapTypeChips(element) {
-    if (element.selected) {
-    var passChips = document.getElementsByName('MapType');
-    passChips.forEach((passChip) => {
-        if (passChip !== element) {
-            passChip.selected = false;
-            passChip.style.pointerEvents = '';
-
-
-        } else{
-            passChip.style.pointerEvents = 'none';
-        }
-
-    });
-    } else{
-        element.selected = true;
-        element.style.pointerEvents = 'none';
-
-    }
-}
-
-
-
-function openLivemap(){
-    document.querySelector('.liveMapScreen').hidden = false;
-    window.history.pushState({ LiveMapOpen: true }, "");
-
-        var passChips = document.getElementsByName('MapType');
-        passChips.forEach((passChip) => {
-            passChip.selected = false;
-        });
-        document.querySelector('[label="Temperature"]').selected = true;
-}
-
-function closeLiveMap(){
-    document.querySelector('.liveMapScreen').style.height = '0'
-    document.querySelector('.liveMapScreen').style.opacity = '0'
-
-
-    setTimeout(()=>{
-        document.querySelector('.liveMapScreen').hidden = true;
-    document.querySelector('.liveMapScreen').style.height = ''
-    document.querySelector('.liveMapScreen').style.opacity = ''
-
-    }, 350);
-
-}
-
-
-window.addEventListener('popstate', function (event) {
-    if(!document.querySelector('.liveMapScreen').hidden){
-        closeLiveMap()
-    }
-
-});
-
-function refreshCurrentMap(){
-if(document.querySelector('[label="Rain"]').selected){
-    Open_RefreshLiveMap('rain')
-} else if(document.querySelector('[label="Clouds"]').selected){
-    Open_RefreshLiveMap('clouds')
-} else if(document.querySelector('[label="Temperature"]').selected){
-    Open_RefreshLiveMap('temp_new')
-
-} else if(document.querySelector('[label="Snow"]').selected){
-    Open_RefreshLiveMap('snow')
-
-} else if(document.querySelector('[label="Wind"]').selected){
-    Open_RefreshLiveMap('wind_new')
-
-}
-
-}
 
 
 let currentKeyMoonIndex = 0;
@@ -2527,7 +2397,7 @@ function checkNoInternet(){
 
     document.addEventListener('DOMContentLoaded', async function() {
 
-        const currentVersion = 'v1.4.9';
+        const currentVersion = 'v1.5.0';
             const githubRepo = 'PranshulGG/WeatherMaster';
             const releasesUrl = `https://api.github.com/repos/${githubRepo}/releases/latest`;
 
diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html
index e41f0cb22..1eafcdf36 100644
--- a/app/src/main/assets/index.html
+++ b/app/src/main/assets/index.html
@@ -212,7 +212,7 @@
                 <p id="cloth_recommended"></p>
             </div>
 
-            <div class="LiveMapWrap ripple_btn_low" onclick="openLivemap();Open_RefreshLiveMap('temp_new')">
+            <div class="LiveMapWrap ripple_btn_low" onclick="sendThemeToAndroid('OpenRadar')">
                 <div id="livemapPreview">
                     <img src="icons/prevmap.png" alt="">
                 </div>
@@ -567,44 +567,6 @@
 </div>
 
 
-<div class="liveMapScreen" hidden>
-    <div class="topLiveMapActions">
-        <div>
-            <button class="ripple-icon-btn focus regular" onclick="window.history.back()"  ontouchstart="playEffect(this)"
-                    ontouchend="playEffect2(this)">
-                <span class="ripple-effect-icon"></span>
-                <span icon-outlined>arrow_back</span>
-            </button>
-            <p>Live radar</p></div>
-        <div>
-            <button class="ripple-icon-btn focus regular" ontouchstart="playEffect(this)" onclick="refreshCurrentMap()"
-                    ontouchend="playEffect2(this)">
-                <span class="ripple-effect-icon"></span>
-                <span icon-outlined>autorenew</span>
-            </button>
-        </div>
-    </div>
-
-    <div class="liveMapHolder">
-        <div id="livemap">
-
-        </div>
-
-
-        <div class="map_Type">
-            <md-chip-set>
-                <md-filter-chip label="Rain" onclick="Open_RefreshLiveMap('rain');toggleMapTypeChips(this);" name="MapType"></md-filter-chip>
-                <md-filter-chip label="Clouds" onclick="Open_RefreshLiveMap('clouds');toggleMapTypeChips(this);" name="MapType"></md-filter-chip>
-                <md-filter-chip label="Snow" onclick="Open_RefreshLiveMap('snow'); toggleMapTypeChips(this);" name="MapType"></md-filter-chip>
-                <md-filter-chip label="Wind" onclick="Open_RefreshLiveMap('wind_new');toggleMapTypeChips(this);" name="MapType"></md-filter-chip>
-                <md-filter-chip label="Temperature" onclick="Open_RefreshLiveMap('temp_new');toggleMapTypeChips(this);" name="MapType" style="pointer-events: none;" selected></md-filter-chip>
-            </md-chip-set>
-        </div>
-    </div>
-    <!-- togglePasswordTypeChips(this); -->
-
-</div>
-
 
 <div class="map_picker" hidden>
     <div class="topLocationPickerActions">
diff --git a/app/src/main/assets/pages/AboutPage.html b/app/src/main/assets/pages/AboutPage.html
index 2f939e238..f857fa716 100644
--- a/app/src/main/assets/pages/AboutPage.html
+++ b/app/src/main/assets/pages/AboutPage.html
@@ -94,7 +94,7 @@
                 <md-list-item id="show_time_toast">
                     <md-icon slot="start" icon-filled>info</md-icon>
                     <div slot="headline" style="margin-bottom: 2px;">Version</div>
-                    <div slot="supporting-text">1.4.9 (W)</div>
+                    <div slot="supporting-text">1.5.0 (W)</div>
                 </md-list-item>
 
             </md-list>
@@ -178,7 +178,7 @@ AndroidInterface.updateStatusBarColor(theme);
 
 
 document.getElementById('checkUpdatesBtn').addEventListener('click', async function() {
-    const currentVersion = 'v1.4.9';
+    const currentVersion = 'v1.5.0';
     const githubRepo = 'PranshulGG/WeatherMaster';
     const releasesUrl = `https://api.github.com/repos/${githubRepo}/releases/latest`;
 
diff --git a/app/src/main/assets/pages/radar.html b/app/src/main/assets/pages/radar.html
new file mode 100644
index 000000000..66feb50b8
--- /dev/null
+++ b/app/src/main/assets/pages/radar.html
@@ -0,0 +1,310 @@
+<!DOCTYPE html>
+<html lang="en" Theme="default" data-theme="dark">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Live rader</title>
+    <link rel="stylesheet" href="../ui-files/font-usage.css">
+    <link rel="stylesheet" href="../ui-files/variables.css">
+    <link rel="stylesheet" href="../components/components.css">
+    <link rel="stylesheet" href="../components/modal-ver.css">
+    <link rel="stylesheet" href="../ripple-files/ripple.css">
+    <link rel="stylesheet" href="../components/segment-btns.css">
+    <link rel="stylesheet" href="../map/leaflet.css">
+    <script src="../map/leaflet.js"></script>
+
+
+    <style>
+        * {
+            -webkit-tap-highlight-color: transparent;
+            user-select: none;
+            touch-action: manipulation;
+            -webkit-user-drag: none;
+            outline: none;
+
+        }
+
+        p {
+            margin: 0;
+        }
+
+        body {
+            background-color: #003353;
+            padding: 0;
+            margin: 0;
+            overflow: hidden;
+            font-family: var(--outfit);
+            animation: opacity 0.3s ease-out;
+
+        }
+
+        .map_holder {
+            height: 100%;
+            width: 100%;
+            background-color: #003353;
+            position: fixed;
+            top: 0;
+            left: 0;
+        }
+
+        #mapRadar{
+            height: calc(100% - 175px);
+            background-color: #003353;
+        }
+
+        .header{
+            padding: 10px;
+            height: calc(65px - 20px);
+            display: flex;
+            align-items: center;
+            gap: 4px;
+        }
+
+        .header p{
+            font-size: 22px;
+            color: var(--On-Surface);
+            font-family: var(--google-normal);
+        }
+
+        .controls{
+            height: 110px;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+
+        }
+
+        .controls > div > md-slider{
+            --md-sys-color-surface-container-highest: #030457;
+            --md-slider-inactive-track-height: 56px;
+            --md-slider-active-track-height: 56px;
+            width: 100%;
+            --md-slider-inactive-track-shape: 16px !important;
+            --md-slider-active-track-shape: 16px !important;
+            --md-slider-handle-width: 0px;
+            --md-slider-handle-height: 0px;
+
+        }
+        .controls > div{
+            display: flex;
+            align-items: center;
+            gap: 0px;
+            padding-left: 10px;
+            padding-right: 0;
+        }
+
+        .time-label{
+            padding-right: 20px;
+            display: flex;
+            justify-content: flex-end;
+            padding-top: 5px;
+            font-size: 18px;
+            color: var(--On-Surface);
+            font-family: var(--outfit-mid);
+        }
+
+        .loader{
+            width: 100%;
+            height: 100%;
+            z-index: 999;
+            background-color: #003353;
+            top: 0;
+            left: 0;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            --md-circular-progress-size: 55px;
+            position: fixed;
+            transition: opacity 0.2s ease-out;
+
+        }
+
+        [hidden]{
+            display: none !important;
+        }
+
+        flex{
+            flex: 1;
+        }
+    </style>
+</head>
+
+<body>
+
+    <div class="map_holder">
+
+        <div class="header">
+            <button class="ripple-icon-btn regular" ontouchstart="playEffect(this)" ontouchend="playEffect2(this)"
+            onclick="sendThemeToAndroid('GoBack')" style="--ripple-unbounded: white">
+            <span class="ripple-effect-icon"></span>
+            <span icon-outlined style="font-size: 24px !important; color: white;">arrow_back</span>
+        </button>
+
+        <p>Live Radar</p>
+        <flex></flex>
+        <md-icon-button toggle onchange="changeMapTypeToggle()" id="changeMapTypeToggle">
+            <md-icon icon-outlined>light_mode</md-icon>
+            <md-icon slot="selected" icon-outlined>dark_mode</md-icon>
+        </md-icon-button>
+        </div>
+
+        <div id="mapRadar"></div>
+
+        <div class="controls">
+            <div class="slider_btn">
+             <md-fab id="autoplayBtn" variant="primary">
+                <md-icon slot="icon" icon-filled>play_arrow</md-icon>
+             </md-fab>
+            <md-slider id="timeSlider" min="0" max="12" value="0" step="1"></md-slider>
+            </div>
+            <span class="time-label" id="timeLabel"></span>
+        </div>
+
+    </div>
+
+
+    <div class="loader">
+        <md-circular-progress indeterminate></md-circular-progress>
+    </div>
+
+    <script>
+
+var map;
+
+function loadMapRainView(theme){
+        const latDif = localStorage.getItem('currentLat');
+        const longDif = localStorage.getItem('currentLong');
+
+        map = window.L.map('mapRadar', {
+            center: [latDif, longDif],
+            zoom: 8,
+            zoomControl: false,
+            minZoom: 2
+        });
+
+        window.L.tileLayer(theme, {
+       
+
+        }).addTo(map);
+
+
+        var marker = window.L.marker([latDif, longDif]).addTo(map);
+
+        var radarLayer;
+
+        var autoplayInterval;
+        var isPlaying = false;
+
+        function loadRadarLayer(timestamp) {
+            var radarUrl = `https://tilecache.rainviewer.com/v2/radar/${timestamp}/256/{z}/{x}/{y}/2/1_1.png`;
+
+            if (radarLayer) {
+                map.removeLayer(radarLayer);
+            }
+            radarLayer = window.L.tileLayer(radarUrl, {
+                tileSize: 256,
+                opacity: 1
+            }).addTo(map);
+        }
+
+        fetch('https://api.rainviewer.com/public/weather-maps.json')
+            .then(response => response.json())
+            .then(data => {
+                var radarPast = data.radar.past;
+                var timeSlider = document.getElementById("timeSlider");
+                var timeLabel = document.getElementById("timeLabel");
+                var autoplayBtn = document.getElementById("autoplayBtn");
+
+                timeSlider.max = radarPast.length - 1;
+
+                var lastTimestamp = radarPast[radarPast.length - 1].time;
+                loadRadarLayer(lastTimestamp);
+                updateTimestampLabel(lastTimestamp);
+
+                timeSlider.oninput = function () {
+                    var selectedTimestamp = radarPast[this.value].time;
+                    loadRadarLayer(selectedTimestamp);
+                    updateTimestampLabel(selectedTimestamp);
+                };
+
+                autoplayBtn.onclick = function () {
+                    if (isPlaying) {
+                        stopAutoplay();
+                        document.getElementById('changeMapTypeToggle').hidden = false;
+                    } else {
+                        startAutoplay();
+                       document.getElementById('changeMapTypeToggle').hidden = true;
+                    }
+                };
+
+                function startAutoplay() {
+                    isPlaying = true;
+                    autoplayBtn.innerHTML = '<md-icon slot="icon" icon-filled>pause</md-icon>';
+                    autoplayInterval = setInterval(function () {
+                        timeSlider.value = (parseInt(timeSlider.value) + 1) % radarPast.length;
+                        timeSlider.oninput();
+                    }, 1000);
+                }
+
+                function stopAutoplay() {
+                    isPlaying = false;
+                    autoplayBtn.innerHTML = '<md-icon slot="icon" icon-filled>play_arrow</md-icon>';
+                    clearInterval(autoplayInterval);
+                }
+
+                function updateTimestampLabel(timestamp) {
+                    var date = new Date(timestamp * 1000);
+                    timeLabel.textContent = date.toLocaleTimeString();
+                }
+            });
+        }
+
+        loadMapRainView('https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png')
+
+
+        setTimeout(()=>{
+            document.querySelector('.loader').style.opacity = '0';
+        }, 1000);
+
+        setTimeout(()=>{
+            document.querySelector('.loader').hidden = true;
+        }, 1300);
+
+
+        function changeMapTypeToggle(){
+            if(document.getElementById('changeMapTypeToggle').selected){
+                removeMap() 
+                setTimeout(()=>{
+                    loadMapRainView('https://{s}.basemaps.cartocdn.com/rastertiles/dark_all/{z}/{x}/{y}.png')
+                }, 400);
+            } else{
+                removeMap() 
+                setTimeout(()=>{
+                    loadMapRainView('https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png')
+                }, 400);
+            }
+        }
+
+
+        function removeMap() {
+    if (map) {
+        map.remove();
+        map = null;
+    }
+}
+
+        
+    </script>
+
+
+    <script src="../components-script.js/components.js"></script>
+    <script src="../ripple-files/icon-ripple.js"></script>
+    <script src="../modules/scroll.js"></script>
+    <script src="../modules/ripple_acc.js"></script>
+    <script src="../app/navigate.js"></script>
+    <script src="../bundle.js"></script>
+    <script type="module" src="../index.js"></script>
+</body>
+
+</html>
\ 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 6a4ee111b..fd07afe21 100644
--- a/app/src/main/assets/ui-files/ui.css
+++ b/app/src/main/assets/ui-files/ui.css
@@ -1505,74 +1505,6 @@ height: 100%;
   color: rgb(255, 255, 255);
 }
 
-.liveMapScreen{
-  width: 100%;
-  height: 100%;
-  background-color: var(--Surface);
-  z-index: 99;
-  position: fixed;
-  top: 0;
-  left: 0;
-  animation: liveMapScreen 0.3s cubic-bezier(1,0,0,1);
-  transition:all 0.3s cubic-bezier(1,0,0,1);
-
-  overflow: hidden;
-}
-
-@keyframes liveMapScreen{
-  0%{
-    opacity: 0;
-    height: 0;
-  }
-  100%{
-    opacity: 1;
-    height: 100%;
-  }
-}
-
-.liveMapScreen .liveMapHolder #livemap{
-  /* height: calc(100% - 60px); */
-  height: 100%;
-  /* border-radius: 20px; */
-  width: 100%;
-  z-index: 1;
-}
-
-
-.liveMapHolder{
-  display: flex;
-  background-color: var(--Surface);
-  height: calc(100% - 65px);
-  overflow: hidden;
-  flex-direction: column;
-}
-
-.liveMapScreen .topLiveMapActions{
-  display: flex;
-  padding: 10px;
-  height: 45px;
-  background-color: var(--Surface);
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.liveMapScreen .topLiveMapActions div{
-  display: flex;
-  align-items: center;
-  gap: 10px;
-}
-
-.liveMapScreen .topLiveMapActions div p{
-  font-size: 20px;
-}
-
-
-
-.map_Type{
-  padding: 10px;
-  padding-bottom: 20px;
-}
 
 .moonSideWrap{
   display: flex;
diff --git a/app/src/main/java/com/example/weathermaster/LiveRadar.java b/app/src/main/java/com/example/weathermaster/LiveRadar.java
new file mode 100644
index 000000000..2771d417d
--- /dev/null
+++ b/app/src/main/java/com/example/weathermaster/LiveRadar.java
@@ -0,0 +1,213 @@
+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 LiveRadar 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.RadarPage));
+
+        webview.loadUrl("file:///android_asset/pages/radar.html");
+
+    }
+
+
+
+
+    public class AndroidInterface {
+        private LiveRadar aActivity;
+
+        AndroidInterface(LiveRadar 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 = 0xFF415161;
+                        navigationBarColor = 0xFF334151;
+                        systemUiVisibilityFlags = 0;
+
+                    } else if (color.equals("ScrollFalse")) {
+                        statusBarColor = 0xFF334151;
+                        navigationBarColor = 0xFF334151;
+                        systemUiVisibilityFlags = 0;
+
+                    } else if (color.equals("GoBack")){
+                        back();
+                        return;
+                    } else if (color.equals("OpenTermsConditions")){
+
+                        return;
+                    } else if (color.equals("OpenPrivacyPolicy")){
+
+                        return;
+                    } else if (color.equals("OpenLicenses")){
+
+                        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 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")||
+                      url.startsWith("https://leafletjs.com/");
+
+
+        }
+
+
+    }
+}
\ 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 f81198ddf..7f5778943 100644
--- a/app/src/main/java/com/example/weathermaster/MainActivity.java
+++ b/app/src/main/java/com/example/weathermaster/MainActivity.java
@@ -361,6 +361,9 @@ public class MainActivity extends AppCompatActivity {
                     } else if (color.equals("OpenAboutPage")){
                         openAboutPage();
                         return;
+                    } else if (color.equals("OpenRadar")){
+                        openLiveRadarPage();
+                        return;
                     } else if (color.equals("GoBack")){
                         back();
                         return;
@@ -447,6 +450,10 @@ public class MainActivity extends AppCompatActivity {
             Intent intent = new Intent(mActivity, AboutPage.class);
             mActivity.startActivity(intent);
         }
+        public void openLiveRadarPage() {
+            Intent intent = new Intent(mActivity, LiveRadar.class);
+            mActivity.startActivity(intent);
+        }
 
     }
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1463b7c6a..02a213725 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -27,6 +27,7 @@
     <color name="mainBG">#121317</color>
     <color name="MoonPhase">#2b226f</color>
     <color name="forecastPageBg">#334151</color>
+    <color name="RadarPage">#003353</color>
 
     <color name="diffDefault">#0e1d2a</color>
 </resources>
\ 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 05f318e56..cbf8e2df7 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -31,6 +31,13 @@
 
     </style>
 
+    <style name="ScreenLiveRadar" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:navigationBarColor">@color/RadarPage</item>
+        <item name="android:statusBarColor">@color/RadarPage</item>
+        <item name="colorAccent">#afc6ff</item>
+
+    </style>
+
     <style name="ScreenForecastPage" parent="Theme.AppCompat.NoActionBar">
         <item name="android:navigationBarColor">@color/forecastPageBg</item>
         <item name="android:statusBarColor">@color/forecastPageBg</item>
diff --git a/release/output-metadata.json b/release/output-metadata.json
index acc9aa338..2a7267793 100644
--- a/release/output-metadata.json
+++ b/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 40,
-      "versionName": "1.4.9 (W)",
+      "versionCode": 41,
+      "versionName": "1.5.0 (W)",
       "outputFile": "app-release.apk"
     }
   ],