diff options
Diffstat (limited to 'android/app/src/main')
| -rw-r--r-- | android/app/src/main/java/org/terst/doot/widget/ui/DootWidget.kt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/android/app/src/main/java/org/terst/doot/widget/ui/DootWidget.kt b/android/app/src/main/java/org/terst/doot/widget/ui/DootWidget.kt index 23a7019..b40b868 100644 --- a/android/app/src/main/java/org/terst/doot/widget/ui/DootWidget.kt +++ b/android/app/src/main/java/org/terst/doot/widget/ui/DootWidget.kt @@ -26,6 +26,7 @@ import org.terst.doot.widget.data.* import java.time.Instant import java.time.ZoneId import java.time.ZonedDateTime +import java.time.temporal.ChronoUnit fun sourceColor(source: String): Color = when (source) { "todoist" -> Color(0xFFE44332) @@ -78,7 +79,7 @@ fun WidgetRoot(items: List<WidgetItem>, now: Instant) { "TODAY", style = TextStyle( color = ColorProvider(Color(0x66FFFFFF)), - fontSize = 9.sp, + fontSize = 11.sp, fontWeight = FontWeight.Bold ) ) @@ -99,7 +100,7 @@ fun HourRow( @Suppress("UNUSED_PARAMETER") zone: ZoneId ) { val hourStart = nowZoned.withHour(hour).withMinute(0).withSecond(0).withNano(0).toInstant() - val hourEnd = nowZoned.withHour(if (hour < 23) hour + 1 else 23).withMinute(59).withSecond(59).withNano(0).toInstant() + val hourEnd = hourStart.plus(1, ChronoUnit.HOURS) val isNowHour = nowZoned.hour == hour val eventsHere = scheduled.filter { event -> @@ -118,8 +119,8 @@ fun HourRow( ) { Text( text = hourLabel(hour), - style = TextStyle(color = ColorProvider(Color(0x4DFFFFFF)), fontSize = 8.sp), - modifier = GlanceModifier.width(28.dp).padding(top = 2.dp) + style = TextStyle(color = ColorProvider(Color(0x4DFFFFFF)), fontSize = 10.sp), + modifier = GlanceModifier.width(32.dp).padding(top = 2.dp) ) Column(modifier = GlanceModifier.defaultWeight()) { @@ -170,7 +171,7 @@ fun EventBlock(event: WidgetItem, isPast: Boolean) { text = event.title, style = TextStyle( color = ColorProvider(Color.White.copy(alpha = alpha)), - fontSize = 11.sp + fontSize = 13.sp ), modifier = GlanceModifier.padding(start = 6.dp), maxLines = 1 @@ -184,13 +185,12 @@ fun TaskFragmentBlock(fragment: TaskFragment) { modifier = GlanceModifier .fillMaxWidth() .padding(vertical = 2.dp) - .background(Color(0xFF1E1E1E.toInt())) ) { Text( "TODAY", style = TextStyle( color = ColorProvider(Color(0x73FFFFFF)), - fontSize = 7.sp, + fontSize = 9.sp, fontWeight = FontWeight.Bold ), modifier = GlanceModifier.padding(start = 8.dp, top = 3.dp, bottom = 1.dp) @@ -235,7 +235,7 @@ fun TaskRow(task: WidgetItem) { text = task.title, style = TextStyle( color = ColorProvider(Color(0xFFDDDDDD.toInt())), - fontSize = 10.sp + fontSize = 13.sp ), modifier = GlanceModifier.padding(start = 7.dp), maxLines = 1 |
