feat: group display on schedule screen
This commit is contained in:
@@ -41,5 +41,5 @@ private class SimpleFactory<T : ViewModel>(private val create: () -> T) : ViewMo
|
|||||||
override fun <T : ViewModel> create(modelClass: Class<T>): T = create() as T
|
override fun <T : ViewModel> create(modelClass: Class<T>): T = create() as T
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun scheduleFactory(c: AppContainer): ViewModelProvider.Factory = SimpleFactory { ScheduleViewModel(c.scheduleRepository, c.preferencesRepository) }
|
private fun scheduleFactory(c: AppContainer): ViewModelProvider.Factory = SimpleFactory { ScheduleViewModel(c.scheduleRepository, c.preferencesRepository, c.groupRepository) }
|
||||||
private fun groupPickerFactory(c: AppContainer): ViewModelProvider.Factory = SimpleFactory { GroupPickerViewModel(c.groupRepository) }
|
private fun groupPickerFactory(c: AppContainer): ViewModelProvider.Factory = SimpleFactory { GroupPickerViewModel(c.groupRepository) }
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ class GroupRepositoryImpl(
|
|||||||
override suspend fun getGroups(): List<Group> =
|
override suspend fun getGroups(): List<Group> =
|
||||||
groupDao.observeAll().first().map { it.toDomain() }
|
groupDao.observeAll().first().map { it.toDomain() }
|
||||||
|
|
||||||
|
override suspend fun getGroup(id: String): Group? =
|
||||||
|
groupDao.getById(id)?.toDomain()
|
||||||
|
|
||||||
override suspend fun getFaculties(): List<String> = groupDao.getFaculties()
|
override suspend fun getFaculties(): List<String> = groupDao.getFaculties()
|
||||||
|
|
||||||
override suspend fun refreshIfStale(): Boolean {
|
override suspend fun refreshIfStale(): Boolean {
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import kotlinx.coroutines.flow.Flow
|
|||||||
interface GroupRepository {
|
interface GroupRepository {
|
||||||
fun observeGroups(): Flow<List<Group>>
|
fun observeGroups(): Flow<List<Group>>
|
||||||
suspend fun getGroups(): List<Group>
|
suspend fun getGroups(): List<Group>
|
||||||
|
suspend fun getGroup(id: String): Group?
|
||||||
suspend fun getFaculties(): List<String>
|
suspend fun getFaculties(): List<String>
|
||||||
suspend fun refreshIfStale(): Boolean
|
suspend fun refreshIfStale(): Boolean
|
||||||
suspend fun forceRefresh(): Boolean
|
suspend fun forceRefresh(): Boolean
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
|
|||||||
|
|
||||||
Column(Modifier.fillMaxSize()) {
|
Column(Modifier.fillMaxSize()) {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
title = { Text("Расписание") },
|
title = { Text(state.groupName ?: "Расписание", style = MaterialTheme.typography.titleMedium) },
|
||||||
actions = {
|
actions = {
|
||||||
TextButton(onClick = { onSwitchGroup() }) {
|
TextButton(onClick = { onSwitchGroup() }) {
|
||||||
Text("Сменить группу")
|
Text("Сменить группу")
|
||||||
@@ -53,7 +53,7 @@ fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) {
|
|||||||
Icon(Icons.Default.Refresh, contentDescription = "Обновить")
|
Icon(Icons.Default.Refresh, contentDescription = "Обновить")
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
windowInsets = WindowInsets.systemBars.only(androidx.compose.foundation.layout.WindowInsetsSides.Top)
|
windowInsets = WindowInsets(0.dp)
|
||||||
)
|
)
|
||||||
Column(Modifier.fillMaxSize().padding(horizontal = 16.dp, vertical = 0.dp)) {
|
Column(Modifier.fillMaxSize().padding(horizontal = 16.dp, vertical = 0.dp)) {
|
||||||
when {
|
when {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package agzam.vyatsu.ui.schedule
|
|||||||
import agzam.vyatsu.domain.ScheduleDates
|
import agzam.vyatsu.domain.ScheduleDates
|
||||||
import agzam.vyatsu.domain.model.Day
|
import agzam.vyatsu.domain.model.Day
|
||||||
import agzam.vyatsu.domain.model.Schedule
|
import agzam.vyatsu.domain.model.Schedule
|
||||||
|
import agzam.vyatsu.domain.repository.GroupRepository
|
||||||
import agzam.vyatsu.domain.repository.PreferencesRepository
|
import agzam.vyatsu.domain.repository.PreferencesRepository
|
||||||
import agzam.vyatsu.domain.repository.ScheduleRepository
|
import agzam.vyatsu.domain.repository.ScheduleRepository
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
@@ -14,7 +15,8 @@ import kotlinx.coroutines.launch
|
|||||||
|
|
||||||
class ScheduleViewModel(
|
class ScheduleViewModel(
|
||||||
private val scheduleRepository: ScheduleRepository,
|
private val scheduleRepository: ScheduleRepository,
|
||||||
private val preferencesRepository: PreferencesRepository
|
private val preferencesRepository: PreferencesRepository,
|
||||||
|
private val groupRepository: GroupRepository
|
||||||
) : ViewModel() {
|
) : ViewModel() {
|
||||||
|
|
||||||
private val _uiState = MutableStateFlow(ScheduleUiState())
|
private val _uiState = MutableStateFlow(ScheduleUiState())
|
||||||
@@ -37,7 +39,8 @@ class ScheduleViewModel(
|
|||||||
currentGroupId = groupId
|
currentGroupId = groupId
|
||||||
viewModelScope.launch {
|
viewModelScope.launch {
|
||||||
preferencesRepository.setSelectedGroup(groupId)
|
preferencesRepository.setSelectedGroup(groupId)
|
||||||
_uiState.value = _uiState.value.copy(noGroup = false)
|
val groupName = groupRepository.getGroup(groupId)?.name
|
||||||
|
_uiState.value = _uiState.value.copy(noGroup = false, groupName = groupName)
|
||||||
|
|
||||||
launch {
|
launch {
|
||||||
scheduleRepository.observeSchedule(groupId).collect { schedule ->
|
scheduleRepository.observeSchedule(groupId).collect { schedule ->
|
||||||
@@ -124,6 +127,7 @@ data class ScheduleUiState(
|
|||||||
val noGroup: Boolean = false,
|
val noGroup: Boolean = false,
|
||||||
val isRefreshing: Boolean = false,
|
val isRefreshing: Boolean = false,
|
||||||
val isSyncing: Boolean = false,
|
val isSyncing: Boolean = false,
|
||||||
|
val groupName: String? = null,
|
||||||
val schedule: Schedule? = null,
|
val schedule: Schedule? = null,
|
||||||
val todayIndex: Int = 0,
|
val todayIndex: Int = 0,
|
||||||
val selectedIndex: Int = 0
|
val selectedIndex: Int = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user