Sweetbread/unn
Sweetbread/unn
1
0
Fork 0
Code Issues 4 Pull Requests Actions Releases Activity

Compare commits

base: Sweetbread:ec4ee64d689dc80493167e6c5886e8bd804e85eb
Branches Tags
Sweetbread:dev
Sweetbread:master
..
compare: Sweetbread:7f613a21060369586d65379670d11825c6653cc8
Branches Tags
Sweetbread:dev
Sweetbread:master

5 Commits
ec4ee64d68 ... 7f613a2106

Author SHA1 Message Date
Sweetbread
7f613a2106
impr: show images in blogposts 2025-04-24 20:56:54 +03:00
Sweetbread
99effd1e52
deps: update 2025-04-24 20:56:54 +03:00
Sweetbread
764eedc837
impr: add animation 2025-04-24 20:56:53 +03:00
Sweetbread
90d1f69f0d
impr: LoginActivity.kt 
- Style changed
- Added loading indicator
- Added login/password validation
 2025-04-24 20:56:53 +03:00
Sweetbread
7bfcb3d3c9
feat: add marked divider 2025-04-24 20:56:53 +03:00
1 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

8
app/src/main/java/ru/sweetbread/unn/ui/composes/Schedule.kt
View File

@ -147,7 +147,7 @@ fun ScheduleDay(modifier: Modifier = Modifier, date: LocalDate) {
@Composable @Composable
fun ScheduleItem(modifier: Modifier = Modifier, unit: ScheduleUnit, expanded: Boolean = false) { fun ScheduleItem(modifier: Modifier = Modifier, unit: ScheduleUnit, expanded: Boolean = false) {
fun getRel(): Float { fun getRatio(): Float {
val begin = LocalDateTime.of(unit.date, unit.begin).atZone(ZoneId.of("Europe/Moscow")).toEpochSecond() val begin = LocalDateTime.of(unit.date, unit.begin).atZone(ZoneId.of("Europe/Moscow")).toEpochSecond()
val end = LocalDateTime.of(unit.date, unit.end).atZone(ZoneId.of("Europe/Moscow")).toEpochSecond() val end = LocalDateTime.of(unit.date, unit.end).atZone(ZoneId.of("Europe/Moscow")).toEpochSecond()
val now = LocalDateTime.now().atZone(ZoneId.of("Europe/Moscow")).toEpochSecond() val now = LocalDateTime.now().atZone(ZoneId.of("Europe/Moscow")).toEpochSecond()
@ -160,7 +160,7 @@ fun ScheduleItem(modifier: Modifier = Modifier, unit: ScheduleUnit, expanded: Bo
val begin = unit.begin.format(DateTimeFormatter.ofPattern("HH:mm")) val begin = unit.begin.format(DateTimeFormatter.ofPattern("HH:mm"))
val end = unit.end.format(DateTimeFormatter.ofPattern("HH:mm")) val end = unit.end.format(DateTimeFormatter.ofPattern("HH:mm"))
var rel by remember { mutableFloatStateOf(getRel()) } var ratio by remember { mutableFloatStateOf(getRatio()) }
LaunchedEffect(Unit) { LaunchedEffect(Unit) {
while (true) { while (true) {
@ -170,7 +170,7 @@ fun ScheduleItem(modifier: Modifier = Modifier, unit: ScheduleUnit, expanded: Bo
val millisUntilNextMinute = (60 - seconds) * 1000L - calendar.get(Calendar.MILLISECOND) val millisUntilNextMinute = (60 - seconds) * 1000L - calendar.get(Calendar.MILLISECOND)
delay(millisUntilNextMinute) delay(millisUntilNextMinute)
rel = getRel() ratio = getRatio()
} }
} }
@ -283,7 +283,7 @@ fun ScheduleItem(modifier: Modifier = Modifier, unit: ScheduleUnit, expanded: Bo
verticalAlignment = Alignment.CenterVertically) { verticalAlignment = Alignment.CenterVertically) {
Text(begin.toString(), fontWeight = FontWeight.Bold) Text(begin.toString(), fontWeight = FontWeight.Bold)
AnimatedVisibility ( AnimatedVisibility (
(0f < rel) and (rel < 1f), (0f <= rel) and (rel < 1f),
modifier = Modifier modifier = Modifier
.weight(1f) .weight(1f)
.padding(horizontal = 2.dp) .padding(horizontal = 2.dp)