diff --git a/README.md b/README.md index 4cc525f..ccc1f97 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If the app cannot connect to the weather service, it will retry the download eve ## Credits -- Icons are from [boxicons.com](https://boxicons.com) ([MIT-licensed](icon_credits.txt)) +- Icons are from [boxicons.com](https://boxicons.com) ([MIT-licensed](icon_credits.txt)) and the [Google Noto Color Emoji font](https://fonts.google.com/noto/specimen/Noto+Color+Emoji) (SIL Open Font License 1.1) - Made possible by the generous usage terms of [open-meteo.com](https://open-meteo.com) - Interfaces with [openweathermap.org](https://openweathermap.org) - Uses [karoo-ext](https://github.com/hammerheadnav/karoo-ext) (Apache2-licensed) diff --git a/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/WeatherView.kt b/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/WeatherView.kt index 10dd506..31af115 100644 --- a/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/WeatherView.kt +++ b/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/WeatherView.kt @@ -47,12 +47,12 @@ fun getShortDateFormatter(): DateTimeFormatter = DateTimeFormatter.ofPattern( fun getWeatherIcon(interpretation: WeatherInterpretation, isNight: Boolean): Int { return when (interpretation){ - WeatherInterpretation.CLEAR -> if (isNight) R.drawable.moon else R.drawable.bx_clear - WeatherInterpretation.CLOUDY -> R.drawable.bx_cloud - WeatherInterpretation.RAINY -> R.drawable.bx_cloud_rain - WeatherInterpretation.SNOWY -> R.drawable.bx_cloud_snow - WeatherInterpretation.DRIZZLE -> R.drawable.bx_cloud_drizzle - WeatherInterpretation.THUNDERSTORM -> R.drawable.bx_cloud_lightning + WeatherInterpretation.CLEAR -> if (isNight) R.drawable.crescent_moon else R.drawable.sun + WeatherInterpretation.CLOUDY -> R.drawable.cloud + WeatherInterpretation.RAINY -> R.drawable.cloud_with_rain + WeatherInterpretation.SNOWY -> R.drawable.cloud_with_snow + WeatherInterpretation.DRIZZLE -> R.drawable.cloud_with_light_rain + WeatherInterpretation.THUNDERSTORM -> R.drawable.cloud_with_lightning_and_rain WeatherInterpretation.UNKNOWN -> R.drawable.question_mark_regular_240 } } @@ -87,7 +87,6 @@ fun Weather( provider = ImageProvider(getWeatherIcon(current, isNight)), contentDescription = "Current weather information", contentScale = ContentScale.Fit, - colorFilter = ColorFilter.tint(ColorProvider(Color.Black, Color.White)) ) } @@ -143,7 +142,6 @@ fun Weather( provider = ImageProvider(R.drawable.thermometer), contentDescription = "Temperature", contentScale = ContentScale.Fit, - colorFilter = ColorFilter.tint(ColorProvider(Color.Black, Color.White)) ) Text( diff --git a/app/src/main/kotlin/de/timklge/karooheadwind/screens/WeatherWidget.kt b/app/src/main/kotlin/de/timklge/karooheadwind/screens/WeatherWidget.kt index 00ea0cf..341f3c6 100644 --- a/app/src/main/kotlin/de/timklge/karooheadwind/screens/WeatherWidget.kt +++ b/app/src/main/kotlin/de/timklge/karooheadwind/screens/WeatherWidget.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.material3.Icon +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -98,8 +99,7 @@ fun WeatherWidget( } } - // Weather icon (larger) - Icon( + Image( painter = painterResource(id = getWeatherIcon(current, isNight)), contentDescription = "Current weather", modifier = Modifier.size(72.dp) @@ -110,10 +110,10 @@ fun WeatherWidget( Row( verticalAlignment = Alignment.CenterVertically ) { - Icon( + Image( painter = painterResource(id = R.drawable.thermometer), contentDescription = "Temperature", - modifier = Modifier.size(18.dp) + modifier = Modifier.size(18.dp), ) Spacer(modifier = Modifier.width(4.dp)) @@ -135,8 +135,8 @@ fun WeatherWidget( val precipitationProbabilityLabel = if (precipitationProbability != null) "${precipitationProbability}% " else "" - Icon( - painter = painterResource(id = R.drawable.droplet_regular), + Image( + painter = painterResource(id = R.drawable.droplet), contentDescription = "Precipitation", modifier = Modifier.size(18.dp) ) diff --git a/app/src/main/res/drawable/bx_clear.png b/app/src/main/res/drawable/bx_clear.png deleted file mode 100644 index 09b07e3..0000000 Binary files a/app/src/main/res/drawable/bx_clear.png and /dev/null differ diff --git a/app/src/main/res/drawable/bx_cloud.png b/app/src/main/res/drawable/bx_cloud.png deleted file mode 100644 index e11ed40..0000000 Binary files a/app/src/main/res/drawable/bx_cloud.png and /dev/null differ diff --git a/app/src/main/res/drawable/bx_cloud_drizzle.png b/app/src/main/res/drawable/bx_cloud_drizzle.png deleted file mode 100644 index 2c10157..0000000 Binary files a/app/src/main/res/drawable/bx_cloud_drizzle.png and /dev/null differ diff --git a/app/src/main/res/drawable/bx_cloud_light_rain.png b/app/src/main/res/drawable/bx_cloud_light_rain.png deleted file mode 100644 index 79a94a9..0000000 Binary files a/app/src/main/res/drawable/bx_cloud_light_rain.png and /dev/null differ diff --git a/app/src/main/res/drawable/bx_cloud_lightning.png b/app/src/main/res/drawable/bx_cloud_lightning.png deleted file mode 100644 index 7ad42be..0000000 Binary files a/app/src/main/res/drawable/bx_cloud_lightning.png and /dev/null differ diff --git a/app/src/main/res/drawable/bx_cloud_rain.png b/app/src/main/res/drawable/bx_cloud_rain.png deleted file mode 100644 index 2e5f765..0000000 Binary files a/app/src/main/res/drawable/bx_cloud_rain.png and /dev/null differ diff --git a/app/src/main/res/drawable/bx_cloud_snow.png b/app/src/main/res/drawable/bx_cloud_snow.png deleted file mode 100644 index e63300c..0000000 Binary files a/app/src/main/res/drawable/bx_cloud_snow.png and /dev/null differ diff --git a/app/src/main/res/drawable/cloud.xml b/app/src/main/res/drawable/cloud.xml new file mode 100644 index 0000000..235cdb3 --- /dev/null +++ b/app/src/main/res/drawable/cloud.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/cloud_with_light_rain.xml b/app/src/main/res/drawable/cloud_with_light_rain.xml new file mode 100644 index 0000000..0760190 --- /dev/null +++ b/app/src/main/res/drawable/cloud_with_light_rain.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/cloud_with_lightning.xml b/app/src/main/res/drawable/cloud_with_lightning.xml new file mode 100644 index 0000000..95b21bc --- /dev/null +++ b/app/src/main/res/drawable/cloud_with_lightning.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/cloud_with_lightning_and_rain.xml b/app/src/main/res/drawable/cloud_with_lightning_and_rain.xml new file mode 100644 index 0000000..0b32f8f --- /dev/null +++ b/app/src/main/res/drawable/cloud_with_lightning_and_rain.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/cloud_with_rain.xml b/app/src/main/res/drawable/cloud_with_rain.xml new file mode 100644 index 0000000..09aac67 --- /dev/null +++ b/app/src/main/res/drawable/cloud_with_rain.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/cloud_with_snow.xml b/app/src/main/res/drawable/cloud_with_snow.xml new file mode 100644 index 0000000..91e52c3 --- /dev/null +++ b/app/src/main/res/drawable/cloud_with_snow.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/crescent_moon.xml b/app/src/main/res/drawable/crescent_moon.xml new file mode 100644 index 0000000..2ab542e --- /dev/null +++ b/app/src/main/res/drawable/crescent_moon.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/droplet.xml b/app/src/main/res/drawable/droplet.xml new file mode 100644 index 0000000..8819450 --- /dev/null +++ b/app/src/main/res/drawable/droplet.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/droplet_regular.png b/app/src/main/res/drawable/droplet_regular.png deleted file mode 100644 index 3a223bb..0000000 Binary files a/app/src/main/res/drawable/droplet_regular.png and /dev/null differ diff --git a/app/src/main/res/drawable/moon.png b/app/src/main/res/drawable/moon.png deleted file mode 100644 index 318344a..0000000 Binary files a/app/src/main/res/drawable/moon.png and /dev/null differ diff --git a/app/src/main/res/drawable/sun.xml b/app/src/main/res/drawable/sun.xml new file mode 100644 index 0000000..88fa8db --- /dev/null +++ b/app/src/main/res/drawable/sun.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/thermometer.png b/app/src/main/res/drawable/thermometer.png deleted file mode 100644 index 7c73043..0000000 Binary files a/app/src/main/res/drawable/thermometer.png and /dev/null differ diff --git a/app/src/main/res/drawable/thermometer.xml b/app/src/main/res/drawable/thermometer.xml new file mode 100644 index 0000000..52629d5 --- /dev/null +++ b/app/src/main/res/drawable/thermometer.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/water_regular.png b/app/src/main/res/drawable/water_regular.png deleted file mode 100644 index 0a86b1c..0000000 Binary files a/app/src/main/res/drawable/water_regular.png and /dev/null differ