diff --git a/app/src/main/assets/app/app.js b/app/src/main/assets/app/app.js index 746cf9375..8bbcc83ee 100644 --- a/app/src/main/assets/app/app.js +++ b/app/src/main/assets/app/app.js @@ -601,16 +601,7 @@ function display24HourForecast(forecastData) { forecastItem.classList.add('forecast-item'); forecastItem.id = "forecast24"; - if(SelectedTempUnit === 'celsius'){ - forecastItem.innerHTML = ` -

${time}

- Weather Icon -

${temperature}°C

-

water_drop ${Math.round(rainPercentage)}%

- -

${description}

- `; - } else{ + if(SelectedTempUnit === 'fahrenheit'){ forecastItem.innerHTML = `

${time}

Weather Icon @@ -619,6 +610,15 @@ function display24HourForecast(forecastData) {

${description}

`; + } else{ + forecastItem.innerHTML = ` +

${time}

+ Weather Icon +

${temperature}°C

+

water_drop ${Math.round(rainPercentage)}%

+ +

${description}

+ `; } @@ -708,30 +708,31 @@ function display5DayForecast(forecastData) { forecastItem.classList.add('forecast-item-forecast'); - if(SelectedTempUnit === 'celsius'){ - forecastItem.innerHTML = ` - - Weather Icon -

${temp}°C

-
-
-
${description} -

${date}

-
- - `; - } else{ + if(SelectedTempUnit === 'fahrenheit'){ forecastItem.innerHTML = ` Weather Icon

${tempF}°F

-
${description} +
${description}

${date}

- + `; + } else{ + + forecastItem.innerHTML = ` + + Weather Icon +

${temp}°C

+
+
+
${description} +

${date}

+
+ + `; }