lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tweak weather widget typography

Browse Source
This commit is contained in:
MM20 2023-02-18 13:50:25 +01:00
parent ecbd7fe840
commit 51716eae64
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
View File

@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.layout.widthIn
@ -234,7 +235,7 @@ fun CurrentWeather(forecast: Forecast, imperialUnits: Boolean) {
) )
Text( Text(
text = forecast.condition, text = forecast.condition,
style = MaterialTheme.typography.bodySmall style = MaterialTheme.typography.labelMedium,
) )
AnimatedWeatherIcon( AnimatedWeatherIcon(
modifier = Modifier.padding( modifier = Modifier.padding(
@ -270,7 +271,7 @@ fun CurrentWeather(forecast: Forecast, imperialUnits: Boolean) {
Spacer(modifier = Modifier.padding(3.dp)) Spacer(modifier = Modifier.padding(3.dp))
Text( Text(
text = "${forecast.humidity.roundToInt()} %", text = "${forecast.humidity.roundToInt()} %",
style = MaterialTheme.typography.labelMedium style = MaterialTheme.typography.bodySmall
) )
} }
} }
@ -302,7 +303,7 @@ fun CurrentWeather(forecast: Forecast, imperialUnits: Boolean) {
} else { } else {
windDirectionAsWord(forecast.windDirection) windDirectionAsWord(forecast.windDirection)
}, },
style = MaterialTheme.typography.labelMedium style = MaterialTheme.typography.bodySmall
) )
} }
} }
@ -318,7 +319,7 @@ fun CurrentWeather(forecast: Forecast, imperialUnits: Boolean) {
Spacer(modifier = Modifier.padding(3.dp)) Spacer(modifier = Modifier.padding(3.dp))
Text( Text(
text = formatPrecipitation(imperialUnits, forecast), text = formatPrecipitation(imperialUnits, forecast),
style = MaterialTheme.typography.labelMedium style = MaterialTheme.typography.bodySmall
) )
} }
} }
@ -357,7 +358,7 @@ fun WeatherTimeSelector(
Column( Column(
modifier = Modifier modifier = Modifier
.clickable { onTimeSelected(idx) } .clickable { onTimeSelected(idx) }
.padding(6.dp), .padding(4.dp),
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.SpaceEvenly verticalArrangement = Arrangement.SpaceEvenly
) { ) {
@ -368,14 +369,14 @@ fun WeatherTimeSelector(
) )
Text( Text(
text = dateFormat.format(fc.timestamp), text = dateFormat.format(fc.timestamp),
style = MaterialTheme.typography.labelMedium, style = MaterialTheme.typography.labelSmall,
softWrap = false, softWrap = false,
modifier = Modifier.align(Alignment.CenterHorizontally) modifier = Modifier.align(Alignment.CenterHorizontally)
) )
Text( Text(
text = "${convertTemperature(imperialUnits, fc.temperature)}°", text = "${convertTemperature(imperialUnits, fc.temperature)}°",
softWrap = false, softWrap = false,
style = MaterialTheme.typography.labelMedium, style = MaterialTheme.typography.labelSmall,
modifier = Modifier.align(Alignment.CenterHorizontally) modifier = Modifier.align(Alignment.CenterHorizontally)
) )
} }
@ -415,14 +416,14 @@ fun WeatherDaySelector(
Row( Row(
modifier = Modifier modifier = Modifier
.clickable { onDaySelected(idx) } .clickable { onDaySelected(idx) }
.padding(6.dp), .padding(4.dp),
horizontalArrangement = Arrangement.SpaceAround, horizontalArrangement = Arrangement.SpaceAround,
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
WeatherIcon(icon = weatherIconById(day.icon)) WeatherIcon(icon = weatherIconById(day.icon))
Text( Text(
text = dateFormat.format(day.timestamp), text = dateFormat.format(day.timestamp),
style = MaterialTheme.typography.labelMedium, style = MaterialTheme.typography.labelSmall,
softWrap = false, softWrap = false,
modifier = Modifier.padding(start = 12.dp, end = 6.dp) modifier = Modifier.padding(start = 12.dp, end = 6.dp)
) )
@ -434,7 +435,7 @@ fun WeatherDaySelector(
) )
}° / ${convertTemperature(imperialUnits, day.maxTemp)}°", }° / ${convertTemperature(imperialUnits, day.maxTemp)}°",
softWrap = false, softWrap = false,
style = MaterialTheme.typography.labelMedium, style = MaterialTheme.typography.labelSmall,
) )
} }
} }