jonas/Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases 10 Wiki Activity

minor ui changes

Browse Source
This commit is contained in:
MM20
2026-03-20 18:38:31 +01:00
parent 7f3334db10
commit 9116599988
3 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt
View File

@@ -118,15 +118,17 @@ fun CalendarWidget(
) {
for ((i, date) in availableDates.withIndex()) {
DropdownMenuItem(
shape = if (availableDates.size == 1) MenuDefaults.standaloneItemShape
else when (i) {
0 -> MenuDefaults.leadingItemShape
availableDates.lastIndex -> MenuDefaults.trailingItemShape
else -> MenuDefaults.middleItemShape
},
shapes = MenuDefaults.itemShape(i, availableDates.size),
selected = date == selectedDate,
text = {
Text(formatDay(context, date, LocalCalendarSystems.current[0]!!))
},
selectedLeadingIcon = {
Icon(
painterResource(R.drawable.check_24px),
null,
)
},
onClick = {
viewModel.selectDate(date)
showDropdown = false

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

@@ -34,7 +34,6 @@ import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.lazy.LazyRow
@@ -408,14 +407,35 @@ private fun CurrentWeatherDetails(
contentDescription = null,
tint = MaterialTheme.colorScheme.secondary,
)
} to if (forecast.precipProbability != null) {
formatPercent(forecast.precipProbability!!.toFloat())
} else {
formatPrecipitation(
context,
forecast.precipitation?.toFloat() ?: 0f,
measurementSystem
)
} to when {
forecast.precipProbability != null
&& forecast.precipitation != null
&& forecast.precipitation!! >= 0.05 -> {
"${
formatPercent(
forecast.precipProbability!!.toFloat()
)
} • ${
formatPrecipitation(
context,
forecast.precipitation?.toFloat() ?: 0f,
measurementSystem
)
}"
}
forecast.precipProbability != null -> {
formatPercent(forecast.precipProbability!!.toFloat())
}
else -> {
formatPrecipitation(
context,
forecast.precipitation?.toFloat() ?: 0f,
measurementSystem
)
}
}
)
}

4
app/ui/src/main/java/de/mm20/launcher2/ui/utils/Units.kt
View File

@@ -263,11 +263,11 @@ private fun formatMillimeters(
.withLocale(
Locale.getDefault()
).unitWidth(NumberFormatter.UnitWidth.NARROW)
.precision(Precision.maxFraction(0))
.precision(Precision.maxFraction(1))
.format(Measure(millimeters, MeasureUnit.MILLIMETER)).toString()
} else {
val formatted = NumberFormat.getInstance().apply {
maximumFractionDigits = 0
maximumFractionDigits = 1
}.format(millimeters)
return "$formatted ${context.getString(R.string.unit_millimeter_symbol)}"
}