From e1019b18d3f52d9797e6d850ead448ab05e76857 Mon Sep 17 00:00:00 2001 From: pc2025 Date: Wed, 21 Oct 2026 12:11:30 +0300 Subject: [PATCH] some update --- .../java/agzam/vyatsu/ui/info/CallsScreen.kt | 18 +----------------- .../agzam/vyatsu/ui/picker/PickerScreen.kt | 1 - .../vyatsu/ui/schedule/components/DayChips.kt | 3 --- .../ui/schedule/components/ScheduleStates.kt | 1 - .../vyatsu/ui/teacher/TeacherScheduleScreen.kt | 10 ---------- 5 files changed, 1 insertion(+), 32 deletions(-) diff --git a/app/src/main/java/agzam/vyatsu/ui/info/CallsScreen.kt b/app/src/main/java/agzam/vyatsu/ui/info/CallsScreen.kt index 67d9eb7..29f4584 100644 --- a/app/src/main/java/agzam/vyatsu/ui/info/CallsScreen.kt +++ b/app/src/main/java/agzam/vyatsu/ui/info/CallsScreen.kt @@ -11,16 +11,12 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.statusBars -import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold @@ -45,7 +41,6 @@ import kotlinx.coroutines.delay import java.time.LocalTime import java.time.format.DateTimeFormatter import java.time.temporal.ChronoUnit -import kotlin.time.Duration.Companion.milliseconds @@ -249,8 +244,7 @@ private fun CallCard( Text( text = status, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant + style = MaterialTheme.typography.bodySmall ) } @@ -267,19 +261,9 @@ private fun CallCard( Text( text = interval.end.toString(), style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant ) } } - - if (isCurrent) { - LinearProgressIndicator( - progress = { progress }, - modifier = Modifier.fillMaxWidth(), - color = MaterialTheme.colorScheme.primary, - trackColor = MaterialTheme.colorScheme.surfaceContainerHighest - ) - } } } } diff --git a/app/src/main/java/agzam/vyatsu/ui/picker/PickerScreen.kt b/app/src/main/java/agzam/vyatsu/ui/picker/PickerScreen.kt index a5f05cd..bed9b7c 100644 --- a/app/src/main/java/agzam/vyatsu/ui/picker/PickerScreen.kt +++ b/app/src/main/java/agzam/vyatsu/ui/picker/PickerScreen.kt @@ -32,7 +32,6 @@ import androidx.compose.material3.IconButton import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold -import androidx.compose.material3.SearchBar import androidx.compose.material3.SearchBarDefaults import androidx.compose.material3.SegmentedButton import androidx.compose.material3.SegmentedButtonDefaults diff --git a/app/src/main/java/agzam/vyatsu/ui/schedule/components/DayChips.kt b/app/src/main/java/agzam/vyatsu/ui/schedule/components/DayChips.kt index 9f5f59e..cd16378 100644 --- a/app/src/main/java/agzam/vyatsu/ui/schedule/components/DayChips.kt +++ b/app/src/main/java/agzam/vyatsu/ui/schedule/components/DayChips.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyListItemInfo import androidx.compose.foundation.lazy.LazyListLayoutInfo @@ -15,8 +14,6 @@ import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.pager.PagerState import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.FilterChip -import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text diff --git a/app/src/main/java/agzam/vyatsu/ui/schedule/components/ScheduleStates.kt b/app/src/main/java/agzam/vyatsu/ui/schedule/components/ScheduleStates.kt index 9a4287b..6cc2463 100644 --- a/app/src/main/java/agzam/vyatsu/ui/schedule/components/ScheduleStates.kt +++ b/app/src/main/java/agzam/vyatsu/ui/schedule/components/ScheduleStates.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.size -import androidx.compose.material.icons.Icons import androidx.compose.material3.Button import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/agzam/vyatsu/ui/teacher/TeacherScheduleScreen.kt b/app/src/main/java/agzam/vyatsu/ui/teacher/TeacherScheduleScreen.kt index 00cba78..f4d91eb 100644 --- a/app/src/main/java/agzam/vyatsu/ui/teacher/TeacherScheduleScreen.kt +++ b/app/src/main/java/agzam/vyatsu/ui/teacher/TeacherScheduleScreen.kt @@ -2,31 +2,22 @@ package agzam.vyatsu.ui.teacher import agzam.vyatsu.R import agzam.vyatsu.ui.schedule.components.DayChips -import agzam.vyatsu.ui.schedule.components.FULL_DATE import agzam.vyatsu.ui.schedule.components.LessonSlot import agzam.vyatsu.ui.schedule.components.ScheduleDateHeader import agzam.vyatsu.ui.schedule.components.ScheduleError -import agzam.vyatsu.ui.schedule.components.WeekSelector -import agzam.vyatsu.ui.schedule.components.dayName -import agzam.vyatsu.ui.schedule.components.hPadding import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.rememberPagerState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Refresh import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.HorizontalDivider @@ -35,7 +26,6 @@ import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect