From a8830bcd91ec15f40d787102bd4fd9b24ab3e682 Mon Sep 17 00:00:00 2001 From: Agzamus Date: Wed, 2 Sep 2026 23:47:00 +0300 Subject: [PATCH] init --- app/src/main/java/agzam/vyatsu/AppRoot.kt | 45 ++++ .../main/java/agzam/vyatsu/MainActivity.kt | 19 ++ .../java/agzam/vyatsu/VyatsuApplication.kt | 16 ++ .../agzam/vyatsu/data/local/AppDatabase.kt | 19 ++ .../java/agzam/vyatsu/data/local/DayDto.kt | 23 ++ .../java/agzam/vyatsu/data/local/GroupDao.kt | 28 ++ .../agzam/vyatsu/data/local/GroupEntity.kt | 16 ++ .../java/agzam/vyatsu/data/local/LessonDto.kt | 38 +++ .../vyatsu/data/local/PreferenceEntity.kt | 10 + .../agzam/vyatsu/data/local/PreferencesDao.kt | 18 ++ .../agzam/vyatsu/data/local/ScheduleCodec.kt | 25 ++ .../agzam/vyatsu/data/local/ScheduleDao.kt | 22 ++ .../agzam/vyatsu/data/local/ScheduleEntity.kt | 14 + .../java/agzam/vyatsu/data/local/SlotDto.kt | 26 ++ .../agzam/vyatsu/data/remote/GroupsParser.kt | 80 ++++++ .../vyatsu/data/remote/VyatsuHttpClient.kt | 38 +++ .../agzam/vyatsu/data/remote/VyatsuUrls.kt | 13 + .../agzam/vyatsu/data/remote/pdf/Pdf2Table.kt | 244 +++++++++++++++++ .../data/remote/pdf/PdfScheduleParser.kt | 147 ++++++++++ .../vyatsu/data/remote/pdf/PdfTextParser.kt | 45 ++++ .../data/repository/GroupRepositoryImpl.kt | 74 ++++++ .../repository/PreferencesRepositoryImpl.kt | 12 + .../data/repository/ScheduleRepositoryImpl.kt | 105 ++++++++ .../agzam/vyatsu/data/static/Buildings.kt | 34 +++ .../java/agzam/vyatsu/data/static/Calls.kt | 13 + .../main/java/agzam/vyatsu/di/AppContainer.kt | 45 ++++ .../java/agzam/vyatsu/domain/ScheduleDates.kt | 39 +++ .../agzam/vyatsu/domain/model/DateRange.kt | 6 + .../java/agzam/vyatsu/domain/model/Day.kt | 16 ++ .../java/agzam/vyatsu/domain/model/Group.kt | 11 + .../java/agzam/vyatsu/domain/model/Lesson.kt | 29 ++ .../agzam/vyatsu/domain/model/LessonType.kt | 18 ++ .../agzam/vyatsu/domain/model/Schedule.kt | 17 ++ .../java/agzam/vyatsu/domain/model/Season.kt | 11 + .../agzam/vyatsu/domain/model/TimeSlot.kt | 17 ++ .../domain/repository/GroupRepository.kt | 12 + .../repository/PreferencesRepository.kt | 7 + .../domain/repository/ScheduleRepository.kt | 12 + .../vyatsu/ui/groups/GroupPickerScreen.kt | 152 +++++++++++ .../vyatsu/ui/groups/GroupPickerViewModel.kt | 100 +++++++ .../java/agzam/vyatsu/ui/home/HomeScreen.kt | 73 +++++ .../agzam/vyatsu/ui/info/BuildingsScreen.kt | 70 +++++ .../java/agzam/vyatsu/ui/info/CallsScreen.kt | 42 +++ .../vyatsu/ui/schedule/ScheduleScreen.kt | 218 +++++++++++++++ .../vyatsu/ui/schedule/ScheduleViewModel.kt | 113 ++++++++ .../main/java/agzam/vyatsu/ui/theme/Color.kt | 11 + .../main/java/agzam/vyatsu/ui/theme/Theme.kt | 58 ++++ .../main/java/agzam/vyatsu/ui/theme/Type.kt | 34 +++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++ .../res/drawable/ic_launcher_foreground.xml | 30 +++ .../main/res/mipmap-anydpi/ic_launcher.xml | 6 + .../res/mipmap-anydpi/ic_launcher_round.xml | 6 + app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes app/src/main/res/values/colors.xml | 10 + app/src/main/res/values/strings.xml | 3 + app/src/main/res/values/themes.xml | 5 + app/src/main/res/xml/backup_rules.xml | 13 + .../main/res/xml/data_extraction_rules.xml | 19 ++ .../test/java/agzam/vyatsu/ExampleUnitTest.kt | 17 ++ build.gradle.kts | 5 + gradle.properties | 21 ++ gradle/gradle-daemon-jvm.properties | 12 + gradle/libs.versions.toml | 66 +++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes gradle/wrapper/gradle-wrapper.properties | 9 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle.kts | 26 ++ 77 files changed, 2998 insertions(+) create mode 100644 app/src/main/java/agzam/vyatsu/AppRoot.kt create mode 100644 app/src/main/java/agzam/vyatsu/MainActivity.kt create mode 100644 app/src/main/java/agzam/vyatsu/VyatsuApplication.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/local/AppDatabase.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/local/DayDto.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/local/GroupDao.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/local/GroupEntity.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/local/LessonDto.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/local/PreferenceEntity.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/local/PreferencesDao.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/local/ScheduleCodec.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/local/ScheduleDao.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/local/ScheduleEntity.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/local/SlotDto.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/remote/GroupsParser.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/remote/VyatsuHttpClient.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/remote/VyatsuUrls.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/remote/pdf/Pdf2Table.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfScheduleParser.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfTextParser.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/repository/GroupRepositoryImpl.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/repository/PreferencesRepositoryImpl.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/repository/ScheduleRepositoryImpl.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/static/Buildings.kt create mode 100644 app/src/main/java/agzam/vyatsu/data/static/Calls.kt create mode 100644 app/src/main/java/agzam/vyatsu/di/AppContainer.kt create mode 100644 app/src/main/java/agzam/vyatsu/domain/ScheduleDates.kt create mode 100644 app/src/main/java/agzam/vyatsu/domain/model/DateRange.kt create mode 100644 app/src/main/java/agzam/vyatsu/domain/model/Day.kt create mode 100644 app/src/main/java/agzam/vyatsu/domain/model/Group.kt create mode 100644 app/src/main/java/agzam/vyatsu/domain/model/Lesson.kt create mode 100644 app/src/main/java/agzam/vyatsu/domain/model/LessonType.kt create mode 100644 app/src/main/java/agzam/vyatsu/domain/model/Schedule.kt create mode 100644 app/src/main/java/agzam/vyatsu/domain/model/Season.kt create mode 100644 app/src/main/java/agzam/vyatsu/domain/model/TimeSlot.kt create mode 100644 app/src/main/java/agzam/vyatsu/domain/repository/GroupRepository.kt create mode 100644 app/src/main/java/agzam/vyatsu/domain/repository/PreferencesRepository.kt create mode 100644 app/src/main/java/agzam/vyatsu/domain/repository/ScheduleRepository.kt create mode 100644 app/src/main/java/agzam/vyatsu/ui/groups/GroupPickerScreen.kt create mode 100644 app/src/main/java/agzam/vyatsu/ui/groups/GroupPickerViewModel.kt create mode 100644 app/src/main/java/agzam/vyatsu/ui/home/HomeScreen.kt create mode 100644 app/src/main/java/agzam/vyatsu/ui/info/BuildingsScreen.kt create mode 100644 app/src/main/java/agzam/vyatsu/ui/info/CallsScreen.kt create mode 100644 app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleScreen.kt create mode 100644 app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleViewModel.kt create mode 100644 app/src/main/java/agzam/vyatsu/ui/theme/Color.kt create mode 100644 app/src/main/java/agzam/vyatsu/ui/theme/Theme.kt create mode 100644 app/src/main/java/agzam/vyatsu/ui/theme/Type.kt create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/mipmap-anydpi/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/xml/backup_rules.xml create mode 100644 app/src/main/res/xml/data_extraction_rules.xml create mode 100644 app/src/test/java/agzam/vyatsu/ExampleUnitTest.kt create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/gradle-daemon-jvm.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/app/src/main/java/agzam/vyatsu/AppRoot.kt b/app/src/main/java/agzam/vyatsu/AppRoot.kt new file mode 100644 index 0000000..337221b --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/AppRoot.kt @@ -0,0 +1,45 @@ +package agzam.vyatsu + +import agzam.vyatsu.di.AppContainer +import agzam.vyatsu.ui.groups.GroupPickerScreen +import agzam.vyatsu.ui.groups.GroupPickerViewModel +import agzam.vyatsu.ui.home.HomeScreen +import agzam.vyatsu.ui.schedule.ScheduleViewModel +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.platform.LocalContext +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.viewmodel.compose.viewModel + +@Composable +fun AppRoot() { + val app = LocalContext.current.applicationContext as VyatsuApplication + val container = app.container + + val scheduleViewModel: ScheduleViewModel = viewModel(factory = scheduleFactory(container)) + val groupPickerViewModel: GroupPickerViewModel = viewModel(factory = groupPickerFactory(container)) + + val state by scheduleViewModel.uiState.collectAsState() + + if (state.noGroup) { + GroupPickerScreen( + viewModel = groupPickerViewModel, + onGroupPicked = { group -> scheduleViewModel.selectGroup(group.id) } + ) + return + } + HomeScreen( + scheduleViewModel = scheduleViewModel, + onSwitchGroup = { scheduleViewModel.switchGroup() } + ) +} + +private class SimpleFactory(private val create: () -> T) : ViewModelProvider.Factory { + @Suppress("UNCHECKED_CAST") + override fun create(modelClass: Class): T = create() as T +} + +private fun scheduleFactory(c: AppContainer): ViewModelProvider.Factory = SimpleFactory { ScheduleViewModel(c.scheduleRepository, c.preferencesRepository) } +private fun groupPickerFactory(c: AppContainer): ViewModelProvider.Factory = SimpleFactory { GroupPickerViewModel(c.groupRepository) } diff --git a/app/src/main/java/agzam/vyatsu/MainActivity.kt b/app/src/main/java/agzam/vyatsu/MainActivity.kt new file mode 100644 index 0000000..a9ff8ad --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/MainActivity.kt @@ -0,0 +1,19 @@ +package agzam.vyatsu + +import agzam.vyatsu.ui.theme.VyatsuScheduleTheme +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + VyatsuScheduleTheme { + AppRoot() + } + } + } +} diff --git a/app/src/main/java/agzam/vyatsu/VyatsuApplication.kt b/app/src/main/java/agzam/vyatsu/VyatsuApplication.kt new file mode 100644 index 0000000..aaa83b4 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/VyatsuApplication.kt @@ -0,0 +1,16 @@ +package agzam.vyatsu + +import agzam.vyatsu.di.AppContainer +import android.app.Application +import com.tom_roush.pdfbox.android.PDFBoxResourceLoader + +class VyatsuApplication : Application() { + lateinit var container: AppContainer + private set + + override fun onCreate() { + super.onCreate() + PDFBoxResourceLoader.init(this) + container = AppContainer(this) + } +} diff --git a/app/src/main/java/agzam/vyatsu/data/local/AppDatabase.kt b/app/src/main/java/agzam/vyatsu/data/local/AppDatabase.kt new file mode 100644 index 0000000..fb471df --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/local/AppDatabase.kt @@ -0,0 +1,19 @@ +package agzam.vyatsu.data.local + +import androidx.room.Database +import androidx.room.RoomDatabase + +@Database( + entities = [ + GroupEntity::class, + ScheduleEntity::class, + PreferenceEntity::class + ], + version = 1, + exportSchema = false +) +abstract class AppDatabase : RoomDatabase() { + abstract fun groupDao(): GroupDao + abstract fun scheduleDao(): ScheduleDao + abstract fun preferencesDao(): PreferencesDao +} diff --git a/app/src/main/java/agzam/vyatsu/data/local/DayDto.kt b/app/src/main/java/agzam/vyatsu/data/local/DayDto.kt new file mode 100644 index 0000000..9c0e4ab --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/local/DayDto.kt @@ -0,0 +1,23 @@ +package agzam.vyatsu.data.local + +import agzam.vyatsu.domain.model.Day +import com.squareup.moshi.JsonClass +import java.time.LocalDate + +@JsonClass(generateAdapter = true) +data class DayDto( + val date: String, + val slots: List = emptyList() +) { + fun toDomain(): Day = Day( + date = LocalDate.parse(date), + intervals = slots.map { it.toDomain() } + ) + + companion object { + fun fromDomain(d: Day): DayDto = DayDto( + date = d.date.toString(), + slots = d.intervals.map { SlotDto.fromDomain(it) } + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/agzam/vyatsu/data/local/GroupDao.kt b/app/src/main/java/agzam/vyatsu/data/local/GroupDao.kt new file mode 100644 index 0000000..b476194 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/local/GroupDao.kt @@ -0,0 +1,28 @@ +package agzam.vyatsu.data.local + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import kotlinx.coroutines.flow.Flow + +@Dao +interface GroupDao { + @Query("SELECT * FROM groups ORDER BY name") + fun observeAll(): Flow> + + @Query("SELECT * FROM groups WHERE id = :id") + suspend fun getById(id: String): GroupEntity? + + @Query("SELECT * FROM groups WHERE faculty = :faculty ORDER BY name") + suspend fun getByFaculty(faculty: String): List + + @Query("SELECT DISTINCT faculty FROM groups ORDER BY faculty") + suspend fun getFaculties(): List + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertAll(groups: List) + + @Query("SELECT MAX(lastSyncedAt) FROM groups") + suspend fun maxSyncedAt(): Long? +} diff --git a/app/src/main/java/agzam/vyatsu/data/local/GroupEntity.kt b/app/src/main/java/agzam/vyatsu/data/local/GroupEntity.kt new file mode 100644 index 0000000..e746563 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/local/GroupEntity.kt @@ -0,0 +1,16 @@ +package agzam.vyatsu.data.local + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "groups") +data class GroupEntity( + @PrimaryKey val id: String, + val name: String, + val faculty: String, + val autumnFirst: String, + val autumnSecond: String, + val springFirst: String, + val springSecond: String, + val lastSyncedAt: Long +) diff --git a/app/src/main/java/agzam/vyatsu/data/local/LessonDto.kt b/app/src/main/java/agzam/vyatsu/data/local/LessonDto.kt new file mode 100644 index 0000000..958c75c --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/local/LessonDto.kt @@ -0,0 +1,38 @@ +package agzam.vyatsu.data.local + +import agzam.vyatsu.domain.model.Lesson +import agzam.vyatsu.domain.model.LessonType +import com.squareup.moshi.JsonClass + +@JsonClass(generateAdapter = true) +data class LessonDto( + val raw: String = "", + val room: String? = null, + val group: String? = null, + val subgroup: String? = null, + val subject: String? = null, + val type: String = "", + val teacher: String? = null +) { + fun toDomain(): Lesson = Lesson( + raw = raw, + room = room?.takeIf { it.isNotBlank() }, + group = group?.takeIf { it.isNotBlank() }, + subgroup = subgroup?.takeIf { it.isNotBlank() }, + subject = subject?.takeIf { it.isNotBlank() }, + type = runCatching { LessonType.valueOf(type) }.getOrDefault(LessonType.OTHER), + teacher = teacher?.takeIf { it.isNotBlank() } + ) + + companion object { + fun fromDomain(l: Lesson): LessonDto = LessonDto( + raw = l.raw, + room = l.room, + group = l.group, + subgroup = l.subgroup, + subject = l.subject, + type = l.type.name, + teacher = l.teacher + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/agzam/vyatsu/data/local/PreferenceEntity.kt b/app/src/main/java/agzam/vyatsu/data/local/PreferenceEntity.kt new file mode 100644 index 0000000..77ea582 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/local/PreferenceEntity.kt @@ -0,0 +1,10 @@ +package agzam.vyatsu.data.local + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "preferences") +data class PreferenceEntity( + @PrimaryKey val key: String, + val value: String +) diff --git a/app/src/main/java/agzam/vyatsu/data/local/PreferencesDao.kt b/app/src/main/java/agzam/vyatsu/data/local/PreferencesDao.kt new file mode 100644 index 0000000..b7ac864 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/local/PreferencesDao.kt @@ -0,0 +1,18 @@ +package agzam.vyatsu.data.local + +import androidx.room.Dao +import androidx.room.Query + +@Dao +interface PreferencesDao { + @Query("SELECT value FROM preferences WHERE key = 'selectedGroupId'") + suspend fun selectedGroupId(): String? + + @Query( + "INSERT OR REPLACE INTO preferences(key, value) VALUES('selectedGroupId', :groupId)" + ) + suspend fun setSelectedGroup(groupId: String) + + @Query("DELETE FROM preferences WHERE key = 'selectedGroupId'") + suspend fun clearSelectedGroup() +} diff --git a/app/src/main/java/agzam/vyatsu/data/local/ScheduleCodec.kt b/app/src/main/java/agzam/vyatsu/data/local/ScheduleCodec.kt new file mode 100644 index 0000000..cf1449d --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/local/ScheduleCodec.kt @@ -0,0 +1,25 @@ +package agzam.vyatsu.data.local + +import agzam.vyatsu.domain.model.Day +import com.squareup.moshi.Moshi +import com.squareup.moshi.Types + +class ScheduleCodec(moshi: Moshi) { + private val type: java.lang.reflect.Type = + Types.newParameterizedType(List::class.java, DayDto::class.java) + private val adapter = moshi.adapter>(type) + + fun toJson(days: List): String { + val dto = days.map { DayDto.fromDomain(it) } + return adapter.toJson(dto) + } + + fun fromJson(json: String): List { + return try { + val dto = adapter.fromJson(json) ?: return emptyList() + dto.map { it.toDomain() } + } catch (t: Throwable) { + emptyList() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/agzam/vyatsu/data/local/ScheduleDao.kt b/app/src/main/java/agzam/vyatsu/data/local/ScheduleDao.kt new file mode 100644 index 0000000..e5e1f11 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/local/ScheduleDao.kt @@ -0,0 +1,22 @@ +package agzam.vyatsu.data.local + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import kotlinx.coroutines.flow.Flow + +@Dao +interface ScheduleDao { + @Query("SELECT * FROM schedules WHERE groupId = :groupId") + fun observe(groupId: String): Flow + + @Query("SELECT * FROM schedules WHERE groupId = :groupId") + suspend fun get(groupId: String): ScheduleEntity? + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun upsert(entity: ScheduleEntity) + + @Query("DELETE FROM schedules WHERE groupId = :groupId") + suspend fun delete(groupId: String) +} diff --git a/app/src/main/java/agzam/vyatsu/data/local/ScheduleEntity.kt b/app/src/main/java/agzam/vyatsu/data/local/ScheduleEntity.kt new file mode 100644 index 0000000..8276f8d --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/local/ScheduleEntity.kt @@ -0,0 +1,14 @@ +package agzam.vyatsu.data.local + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "schedules") +data class ScheduleEntity( + @PrimaryKey val groupId: String, + val season: String, + val dateRangeFirst: String, + val dateRangeSecond: String, + val weeksJson: String, + val lastSyncedAt: Long +) diff --git a/app/src/main/java/agzam/vyatsu/data/local/SlotDto.kt b/app/src/main/java/agzam/vyatsu/data/local/SlotDto.kt new file mode 100644 index 0000000..36eba34 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/local/SlotDto.kt @@ -0,0 +1,26 @@ +package agzam.vyatsu.data.local + +import agzam.vyatsu.domain.model.TimeSlot +import com.squareup.moshi.JsonClass +import java.time.LocalTime + +@JsonClass(generateAdapter = true) +data class SlotDto( + val start: String, + val end: String, + val lessons: List = emptyList() +) { + fun toDomain(): TimeSlot = TimeSlot( + start = LocalTime.parse(start), + end = LocalTime.parse(end), + lessons = lessons.map { it.toDomain() } + ) + + companion object { + fun fromDomain(s: TimeSlot): SlotDto = SlotDto( + start = s.start.toString(), + end = s.end.toString(), + lessons = s.lessons.map { LessonDto.fromDomain(it) } + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/agzam/vyatsu/data/remote/GroupsParser.kt b/app/src/main/java/agzam/vyatsu/data/remote/GroupsParser.kt new file mode 100644 index 0000000..3a0578d --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/remote/GroupsParser.kt @@ -0,0 +1,80 @@ +package agzam.vyatsu.data.remote + +import agzam.vyatsu.domain.model.DateRange +import agzam.vyatsu.domain.model.Group +import agzam.vyatsu.domain.model.Season +import android.util.Log +import org.jsoup.Jsoup + +/** + * Основано на https://github.com/alirzaev/vyatsu-schedule-backend/blob/master/utils/extractors.py + * @author Agzam + */ +object GroupsParser { + + private val groupPattern = Regex("""/reports/schedule/Group/(\d{4,})_([12])_(\d{8})_(\d{8})\.pdf""") + + private val shorthands = mapOf( + "Институт биологии и биотехнологии (факультет)(ОРУ)" to "ИББТ", + "Институт химии и экологии (факультет) (ОРУ)" to "ИнХимЭк", + "Факультет автоматики и вычислительной техники (ОРУ)" to "ФАВТ", + "Факультет истории, политических наук и культурологии (ОРУ)" to "ФИПНК", + "Факультет компьютерных и физико-математических наук (ОРУ)" to "ФКФМН", + "Факультет лингвистики (ОРУ)" to "ФЛ", + "Факультет менеджмента и сервиса (ОРУ)" to "ФМиС", + "Факультет педагогики и психологии (ОРУ)" to "ФПП", + "Факультет строительства и архитектуры (ОРУ)" to "ФСА", + "Факультет технологий, инжиниринга и дизайна (ОРУ)" to "ФТИД", + "Факультет физической культуры и спорта (ОРУ)" to "ФФКС", + "Факультет филологии и медиакоммуникаций (ОРУ)" to "ФФМ", + "Факультет экономики и финансов (ОРУ)" to "ФЭиФ", + "Электротехнический факультет (ОРУ)" to "ЭТФ", + "Юридический институт (факультет) (ОРУ)" to "ЮИ" + ) + + /** + * Извлекает список групп с HTML страницы + */ + fun parseGroups(html: String): List { + val doc = Jsoup.parse(html) + val container = doc.selectFirst("div.column-center_rasp") ?: return emptyList() + val tables = container.select("table[style~=border: none !important]") + + return tables.flatMap { table -> + table.select("> tbody > tr, > tr").flatMap { row -> + Log.v("ROW", row.html()); + val faculty = shortname(row.selectFirst("div.fak_name")?.text().orEmpty()) // + + row.select("div.grpPeriod").map { grp -> + Group( + id = grp.attr("data-grp_period_id").dropLast(1), + name = removeParenthesized(grp.text()), + faculty = faculty + ) + } + } + } + } + + fun parseDateRanges(html: String): Map>> { + val result = HashMap>>() + groupPattern.findAll(html).forEach { m -> + val groupId = m.groupValues[1] + val season = if (m.groupValues[2] == "1") Season.AUTUMN else Season.SPRING + val range = DateRange(m.groupValues[3], m.groupValues[4]) + result + .getOrPut(groupId) { hashMapOf(Season.AUTUMN to mutableListOf(), Season.SPRING to mutableListOf()) } + .getOrPut(season) { mutableListOf() } + .add(range) + } + return result + } + + private fun shortname(name: String): String { + val stripped = removeParenthesized(name) + val sh = shorthands[name] + return if (sh != null) "$sh ($stripped)" else stripped + } + + private fun removeParenthesized(name: String): String = name.replace(Regex("""\(.*?\)\s?"""), "").trim() +} diff --git a/app/src/main/java/agzam/vyatsu/data/remote/VyatsuHttpClient.kt b/app/src/main/java/agzam/vyatsu/data/remote/VyatsuHttpClient.kt new file mode 100644 index 0000000..dc4e890 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/remote/VyatsuHttpClient.kt @@ -0,0 +1,38 @@ +package agzam.vyatsu.data.remote + +import android.util.Log +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import okhttp3.OkHttpClient +import okhttp3.Request +import java.util.concurrent.TimeUnit + +/** + * @author Agzam + */ +object VyatsuHttpClient { + + private const val TAG = "HTTP" + + private val client: OkHttpClient = OkHttpClient.Builder() + .connectTimeout(15, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .build() + + suspend fun getText(url: String): String = withContext(Dispatchers.IO) { + client.newCall(Request.Builder().url(url).build()).execute().use { resp -> + Log.d(TAG, "GET $url -> ${resp.code}") + check(resp.isSuccessful) { "HTTP ${resp.code} for $url" } + resp.body!!.string() + } + } + + suspend fun getBytes(url: String): ByteArray = withContext(Dispatchers.IO) { + client.newCall(Request.Builder().url(url).build()).execute().use { resp -> + Log.d(TAG, "GET $url -> ${resp.code}") + check(resp.isSuccessful) { "HTTP ${resp.code} for $url" } + resp.body!!.bytes() + } + } + +} diff --git a/app/src/main/java/agzam/vyatsu/data/remote/VyatsuUrls.kt b/app/src/main/java/agzam/vyatsu/data/remote/VyatsuUrls.kt new file mode 100644 index 0000000..aa63b9f --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/remote/VyatsuUrls.kt @@ -0,0 +1,13 @@ +package agzam.vyatsu.data.remote + +import agzam.vyatsu.domain.model.DateRange +import agzam.vyatsu.domain.model.Season + +object VyatsuUrls { + + const val GROUPS_PAGE = "https://www.vyatsu.ru/studentu-1/spravochnaya-informatsiya/raspisanie-zanyatiy-dlya-studentov.html" + const val PDF_BASEURL = "https://www.vyatsu.ru/reports/schedule/Group" + + fun groupPdfUrl(groupId: String, season: Season, range: DateRange): String = "$PDF_BASEURL/${groupId}_${season.apiKey}_${range.first}_${range.second}.pdf" + +} diff --git a/app/src/main/java/agzam/vyatsu/data/remote/pdf/Pdf2Table.kt b/app/src/main/java/agzam/vyatsu/data/remote/pdf/Pdf2Table.kt new file mode 100644 index 0000000..ab9b0cb --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/remote/pdf/Pdf2Table.kt @@ -0,0 +1,244 @@ +package agzam.vyatsu.data.remote.pdf + +import android.graphics.Path +import android.graphics.PointF +import com.tom_roush.pdfbox.contentstream.PDFGraphicsStreamEngine +import com.tom_roush.pdfbox.cos.COSName +import com.tom_roush.pdfbox.pdmodel.PDPage +import com.tom_roush.pdfbox.pdmodel.graphics.color.PDColor +import com.tom_roush.pdfbox.pdmodel.graphics.image.PDImage +import java.util.Locale +import kotlin.math.max +import kotlin.math.min + +/** + * - Парсит страницу PDF в набор линий + * - Позволяет получить таблицу + * - Позволяет конвертировать в SVG (для отладки) + * + * Требуется вызов [processPage] для парсинга + * @author Agzam + */ +class Pdf2Table(page: PDPage) : PDFGraphicsStreamEngine(page) { + + data class PdfLine(val x1: Float, val y1: Float, val x2: Float, val y2: Float) { + val left: Float get() = min(x1, x2) + val right: Float get() = max(x1, x2) + val top: Float get() = min(y1, y2) + val bottom: Float get() = max(y1, y2) + } + data class TableColumn(val x: Float, val width: Float, val cells: List) { + val right: Float get() = x + width + } + data class TableCell(val x: Float, val y: Float, val width: Float, val height: Float) { + val centerY: Float get() = y + height/2f + } + + private val _lines = mutableListOf() + + private val svgBuilder = StringBuilder() + private val currentPath = StringBuilder() + private val tableSvg = StringBuilder() + + + private val currentSubPathLines = mutableListOf() + private var lastPoint = PointF(0f, 0f) + + /** + * Представляет страницу в SVG формате + */ + fun asSvg(): String { + val mediaBox = page.mediaBox + val width = mediaBox.width + val height = mediaBox.height + return """ + + ${svgBuilder} + ${tableSvg} + + """.trimIndent() + } + + override fun appendRectangle(rp0: PointF?, rp1: PointF?, rp2: PointF?, rp3: PointF?) { + if (rp0 == null || rp1 == null || rp2 == null || rp3 == null) return + val p0 = t(rp0) + val p1 = t(rp1) + val p2 = t(rp2) + val p3 = t(rp3) + currentPath.append(String.format(Locale.US, "M %.2f %.2f L %.2f %.2f L %.2f %.2f L %.2f %.2f Z ", p0.x, p0.y, p1.x, p1.y, p2.x, p2.y, p3.x, p3.y)) + currentSubPathLines.add(PdfLine(p0.x, p0.y, p1.x, p1.y)) + currentSubPathLines.add(PdfLine(p1.x, p1.y, p2.x, p2.y)) + currentSubPathLines.add(PdfLine(p2.x, p2.y, p3.x, p3.y)) + currentSubPathLines.add(PdfLine(p3.x, p3.y, p0.x, p0.y)) + lastPoint.set(p3.x, p3.y) + } + + override fun moveTo(rx: Float, ry: Float) { + val x = tx(rx) + val y = ty(ry) + currentPath.append(String.format(Locale.US, "M %.2f %.2f ", x, y)) + lastPoint.set(x, y) + } + + override fun lineTo(rx: Float, ry: Float) { + val x = tx(rx) + val y = ty(ry) + currentPath.append(String.format(Locale.US, "L %.2f %.2f ", x, y)) + currentSubPathLines.add(PdfLine(lastPoint.x, lastPoint.y, x, y)) + lastPoint.set(x, y) + } + + override fun curveTo(rcx1: Float, rcy1: Float, rcx2: Float, rcy2: Float, ex: Float, ey: Float) { + val cx1 = tx(rcx1) + val cy1 = ty(rcy1) + val cx2 = tx(rcx2) + val cy2 = ty(rcy2) + val endX = tx(ex) + val endY = ty(ey) + currentPath.append(String.format(Locale.US, "C %.2f %.2f, %.2f %.2f, %.2f %.2f ", cx1, cy1, cx2, cy2, endX, endY)) + lastPoint.set(endX, endY) + } + + override fun getCurrentPoint(): PointF { + return lastPoint + } + + override fun closePath() { + currentPath.append("Z ") + } + + override fun endPath() { + currentPath.clear() + currentSubPathLines.clear() + } + + override fun strokePath() { + val strokeColor = graphicsState.strokingColor.toRGBHex() + val lineWidth = graphicsState.lineWidth + if (currentPath.isNotEmpty()) { + svgBuilder.append("\n") + _lines.addAll(currentSubPathLines) + } + currentPath.clear() + currentSubPathLines.clear() + } + + override fun fillPath(p0: Path.FillType?) { + val fillColor = graphicsState.nonStrokingColor.toRGBHex() + val rule = if (p0 == Path.FillType.EVEN_ODD) "evenodd" else "nonzero" + if (currentPath.isNotEmpty()) { + svgBuilder.append("\n") + _lines.addAll(currentSubPathLines) + } + currentPath.clear() + currentSubPathLines.clear() + } + + override fun fillAndStrokePath(p0: Path.FillType?) { + val strokeColor = graphicsState.strokingColor.toRGBHex() + val fillColor = graphicsState.nonStrokingColor.toRGBHex() + val lineWidth = graphicsState.lineWidth + val rule = if (p0 == Path.FillType.EVEN_ODD) "evenodd" else "nonzero" + if (currentPath.isNotEmpty()) { + svgBuilder.append("\n") + _lines.addAll(currentSubPathLines) + } + currentPath.clear() + currentSubPathLines.clear() + } + + override fun shadingFill(p0: COSName?) { + currentPath.clear() + currentSubPathLines.clear() + } + + private fun PDColor.toRGBHex(): String { + return try { + val rgb = this.toRGB() + String.format(Locale.US, "#%06X", rgb and 0xFFFFFF) + } catch (_: Exception) { + "#000000" + } + } + + override fun drawImage(p0: PDImage?) {} + override fun clip(p0: Path.FillType?) {} + + private fun tx(x: Float): Float { + return x + } + private fun ty(y: Float): Float { + return page.mediaBox.height - y + } + private fun t(p: PointF): PointF { + return PointF(tx(p.x), ty(p.y)) + } + + /** + * Представляет страницу как набор колонок с ячейками + * + * Сначала делит страницу на столбики, затем, изолированно для каждого столбика делит его на ячейки + */ + fun asTable(): List { + val verticalLines = _lines.filter { it.x1 == it.x2 } + val horizontalLines = _lines.filter { it.y1 == it.y2 } + + // Список уникальных "x", чтобы разделить весь лист на колонки + val xs = merge(verticalLines.map { it.x1 }) + + for (v in horizontalLines) { + tableSvg.append("\n") + } + + val columns = mutableListOf() + for (i in 0 until xs.size - 1) { + val left = xs[i] + val right = xs[i + 1] + + tableSvg.append("\n") + + val colWidth = right - left + if (colWidth <= 2f) continue + + // Выборка горизонтальных линиий которые пересекают колонку + val linesInColumn = horizontalLines.filter { line -> (line.left-2f <= left && right <= line.right+2f) } + + val ys = merge(linesInColumn.map { it.y1 }) // Уникальные "y", чтобы разделить уже столбик + + val cells = mutableListOf() + for (ii in 0 until ys.size - 1) { + val top = ys[ii] + val bottom = ys[ii+1] + cells.add(TableCell(left, top, right-left, bottom-top)) + + tableSvg.append("\n") + } + columns.add(TableColumn(left, right-left, cells)) + } + + return columns + } + + /** + * Убирает дубликаты, схлопывает близкие точки + */ + private fun merge(fs: List): List { + val s = fs.distinct().sorted() + val result = mutableListOf() + if(s.isEmpty()) return result + result.add(s[0]) + var pad = 0f + for (i in 0 until s.size - 1) { + val dst = s[i + 1] - s[i] + if (dst <= 4f) { + pad = dst/2f + result[result.size-1] = result.last() + pad + continue + } + result.add(s[i+1]+pad) + pad = 0f + } + return result + } + +} \ No newline at end of file diff --git a/app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfScheduleParser.kt b/app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfScheduleParser.kt new file mode 100644 index 0000000..f7ca53c --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfScheduleParser.kt @@ -0,0 +1,147 @@ +package agzam.vyatsu.data.remote.pdf + +import agzam.vyatsu.domain.model.Day +import agzam.vyatsu.domain.model.Lesson +import agzam.vyatsu.domain.model.TimeSlot +import android.util.Log +import com.tom_roush.pdfbox.pdmodel.PDDocument +import java.time.LocalDate +import java.time.LocalTime +import java.time.format.DateTimeFormatter +import kotlin.math.roundToInt + +/** + * Парсинг расписания из PDF + * @author Agzam + */ +object PdfScheduleParser { + + private const val TAG = "PDF-SCHEDULE" + private const val SVG_TAG = "PDF-SVG" + + private val TIME_FORMAT = DateTimeFormatter.ofPattern("HH:mm") + private val DATE_FORMAT = DateTimeFormatter.ofPattern("dd.MM.yy") + + private fun timeFrom(timeString: String?): LocalTime? { return runCatching { LocalTime.parse(timeString, TIME_FORMAT) }.getOrNull() } + private fun dateFrom(dateString: String?): LocalDate? { return runCatching { LocalDate.parse(dateString, DATE_FORMAT) }.getOrNull() } + + fun parse(pdfBytes: ByteArray): List { + Log.d(TAG, "Parsing ${pdfBytes.size} bytes") + val doc = try { + PDDocument.load(pdfBytes) + } catch (t: Throwable) { + Log.e(TAG, "PDDocument.load failed", t) + throw t + } + + val days = mutableListOf() + try { + for (pageIndex in 0 until doc.numberOfPages) { + Log.v(TAG, "============ Page $pageIndex ============") + + // Парсинг ячеек таблицы + val page = doc.getPage(pageIndex) + val svg = Pdf2Table(page) + svg.processPage(page) + val cols = svg.asTable() + + /** Вывод таблички из PDF в SVG формате + отладочные жлементы из [Pdf2Table.asTable] **/ + Log.v(SVG_TAG, "====") + for(line in svg.asSvg().split("\n")) { + Log.v(SVG_TAG, line) + } + + if(cols.size != 3) throw RuntimeException("Found columns: ${cols.size}/3") + + // Парсинг текста + val textStripper = PdfTextParser() + textStripper.startPage = pageIndex + 1 + textStripper.endPage = pageIndex + 1 + textStripper.getText(doc) + val texts = textStripper.blocks + + val daysColumn = cols[0] // Колонка "День", имеет формат "<день> dd.mm.yy" + val intervalsColumn = cols[1] // Колонка "Интервал", имеет формат "HH:mm-HH:mm" + val lessonsColumn = cols[2] // Колонка с инофрмацией о паре + + Log.v(TAG, "Days: ${cols[0].cells.size}") + Log.v(TAG, "Times: ${cols[1].cells.size}") + Log.v(TAG, "Types: ${cols[2].cells.size}") + + /** Мерджит ячейки в одну строку, пробел в качестве слиятиля */ + fun join(texts: List): String { + val text = StringBuilder() + for (t in texts) { + if(!text.isEmpty()) text.append(' ') + text.append(t.text) + } + return text.toString() + } + + /** + * Извлекает контент из PDF внутри ячейки + * (Подразумевается что в ячейке нет "\n", поэтому используется пробел для слияния) + */ + fun content(cell: Pdf2Table.TableCell): String { + return join(texts.filter { + cell.x <= it.x && it.x <= cell.x + cell.width && cell.y <= it.y && it.y < cell.y + cell.height + }) + } + + /** + * Выбирает все ячейки в целевой колонке, которые находятся на одном уровне (строке) с заданной ячейкой + * @param column - целевая колонка, в которой производится поиск ячеек. + * @param cell - ячейка-ориентир, определяющая границы строки по вертикали. + * @return Список ячеек из [column], попавших в диапазон строки + */ + fun select(column: Pdf2Table.TableColumn, cell: Pdf2Table.TableCell): List { + return column.cells.filter { + cell.y <= it.centerY && it.centerY < cell.y + cell.height + } + } + + + for (dayCell in daysColumn.cells) { + val day = content(dayCell).split(' ') + if(day.size != 2) continue // XXX: добавить защиту от заголовка и выбрасывать исключения вместо пропуска? + + val date = dateFrom(day[1]) ?: continue + val intervals = mutableListOf() + // TODO: день недели (а нужен ли?) + + Log.v(TAG, "############################## $day ############################## ") + for(intervalCell in select(intervalsColumn, dayCell)) { // День содержит интервалы + val timeContent = content(intervalCell) + val range = timeContent.split('-') + if(range.size != 2) continue // XXX: выбрасывать ошибку? + + val start = timeFrom(range[0]) ?: continue + val end = timeFrom(range[1]) ?: continue + val lessons = mutableListOf() + + Log.v(TAG, "=== $timeContent ===") + for(lessonCell in select(lessonsColumn, intervalCell)) { // Информация о паре, может быть разбита, например на подгруппы + val content = content(lessonCell) + Log.v(TAG, "- $content") + // TODO: парсинг контента лекции + lessons.add(Lesson(raw=content)) + } + intervals.add(TimeSlot(start = start, end = end, lessons = lessons)) + } + days.add(Day(date=date, intervals=intervals)) + } + for (text in texts.filter { it.rotation != 0f }) { + Log.v(TAG, "${text.x.roundToInt()}\t${text.y.roundToInt()}\t${text.text}") + } + } + } catch (e: Exception) { + Log.e(TAG, "Parsing error", e) + e.printStackTrace() + } finally { + doc.close() + } + Log.v(TAG, "Days extracted: $days") + return days + } + +} diff --git a/app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfTextParser.kt b/app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfTextParser.kt new file mode 100644 index 0000000..1904054 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/remote/pdf/PdfTextParser.kt @@ -0,0 +1,45 @@ +package agzam.vyatsu.data.remote.pdf + +import com.tom_roush.pdfbox.text.PDFTextStripper +import com.tom_roush.pdfbox.text.TextPosition + +/** + * Парсер блоков текста из PDF + * @author Agzam + */ +class PdfTextParser : PDFTextStripper() { + + data class TextBlock( + val text: String, + val x: Float, + val y: Float, + val width: Float, + val height: Float, + val rotation: Float + ) + + val blocks = mutableListOf() + + init { + sortByPosition = true + } + + override fun writeString(string: String?, textPositions: MutableList?) { + if (!string.isNullOrBlank() && !textPositions.isNullOrEmpty()) { + val first = textPositions.first() + val last = textPositions.last() + + val matrix = first.textMatrix + val rotation = first.dir + + val totalWidth = (last.xDirAdj + last.widthDirAdj) - first.xDirAdj + + val x = matrix.translateX + val y = matrix.translateY - first.heightDir + + val height = first.heightDir + + blocks.add(TextBlock(string.trim(), x, currentPage.mediaBox.height - y - height, totalWidth, height, rotation)) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/agzam/vyatsu/data/repository/GroupRepositoryImpl.kt b/app/src/main/java/agzam/vyatsu/data/repository/GroupRepositoryImpl.kt new file mode 100644 index 0000000..d3b7d18 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/repository/GroupRepositoryImpl.kt @@ -0,0 +1,74 @@ +package agzam.vyatsu.data.repository + +import agzam.vyatsu.data.local.GroupDao +import agzam.vyatsu.data.local.GroupEntity +import agzam.vyatsu.data.remote.GroupsParser +import agzam.vyatsu.data.remote.VyatsuHttpClient +import agzam.vyatsu.data.remote.VyatsuUrls +import agzam.vyatsu.domain.model.Group +import agzam.vyatsu.domain.model.Season +import agzam.vyatsu.domain.repository.GroupRepository +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.map + +class GroupRepositoryImpl( + private val groupDao: GroupDao, +) : GroupRepository { + + override fun observeGroups(): Flow> = + groupDao.observeAll().map { list -> list.map { it.toDomain() } } + + override suspend fun getGroups(): List = + groupDao.observeAll().first().map { it.toDomain() } + + override suspend fun getFaculties(): List = groupDao.getFaculties() + + override suspend fun refreshIfStale(): Boolean { + val last = groupDao.maxSyncedAt() + if (last != null && now() - last < STALE_WINDOW_MS) { + return true + } + refresh() + return true + } + + override suspend fun forceRefresh(): Boolean { + refresh() + return true + } + + private suspend fun refresh() { + val html = VyatsuHttpClient.getText(VyatsuUrls.GROUPS_PAGE) + val groups = GroupsParser.parseGroups(html) + val ranges = GroupsParser.parseDateRanges(html) + val entities = groups.map { group -> + val range = ranges[group.id] + val autumn = range?.get(Season.AUTUMN)?.lastOrNull() + val spring = range?.get(Season.SPRING)?.lastOrNull() + GroupEntity( + id = group.id, + name = group.name, + faculty = group.faculty, + autumnFirst = autumn?.first ?: "", + autumnSecond = autumn?.second ?: "", + springFirst = spring?.first ?: "", + springSecond = spring?.second ?: "", + lastSyncedAt = now() + ) + } + groupDao.insertAll(entities) + } + + private fun now(): Long = System.currentTimeMillis() + + private fun GroupEntity.toDomain(): Group = Group( + id = id, + name = name, + faculty = faculty + ) + + companion object { + private const val STALE_WINDOW_MS = 12 * 60 * 60 * 1000L + } +} diff --git a/app/src/main/java/agzam/vyatsu/data/repository/PreferencesRepositoryImpl.kt b/app/src/main/java/agzam/vyatsu/data/repository/PreferencesRepositoryImpl.kt new file mode 100644 index 0000000..93452cf --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/repository/PreferencesRepositoryImpl.kt @@ -0,0 +1,12 @@ +package agzam.vyatsu.data.repository + +import agzam.vyatsu.data.local.PreferencesDao +import agzam.vyatsu.domain.repository.PreferencesRepository + +class PreferencesRepositoryImpl( + private val dao: PreferencesDao +) : PreferencesRepository { + override suspend fun selectedGroupId(): String? = dao.selectedGroupId() + override suspend fun setSelectedGroup(groupId: String) = dao.setSelectedGroup(groupId) + override suspend fun clearSelectedGroup() = dao.clearSelectedGroup() +} diff --git a/app/src/main/java/agzam/vyatsu/data/repository/ScheduleRepositoryImpl.kt b/app/src/main/java/agzam/vyatsu/data/repository/ScheduleRepositoryImpl.kt new file mode 100644 index 0000000..a80e55f --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/repository/ScheduleRepositoryImpl.kt @@ -0,0 +1,105 @@ +package agzam.vyatsu.data.repository + +import agzam.vyatsu.data.local.ScheduleCodec +import agzam.vyatsu.data.local.ScheduleDao +import agzam.vyatsu.data.local.ScheduleEntity +import agzam.vyatsu.data.local.GroupDao +import agzam.vyatsu.data.local.GroupEntity +import agzam.vyatsu.data.remote.pdf.PdfScheduleParser +import agzam.vyatsu.data.remote.VyatsuHttpClient +import agzam.vyatsu.data.remote.VyatsuUrls +import agzam.vyatsu.domain.ScheduleDates +import agzam.vyatsu.domain.model.DateRange +import agzam.vyatsu.domain.model.Schedule +import agzam.vyatsu.domain.model.Season +import agzam.vyatsu.domain.repository.ScheduleRepository +import android.util.Log +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map + +class ScheduleRepositoryImpl( + private val scheduleDao: ScheduleDao, + private val groupDao: GroupDao, + private val codec: ScheduleCodec +) : ScheduleRepository { + + override fun observeSchedule(groupId: String): Flow = + scheduleDao.observe(groupId).map { it?.toDomain() } + + override suspend fun getSchedule(groupId: String): Schedule? = + scheduleDao.get(groupId)?.toDomain() + + override suspend fun sync(groupId: String): Schedule? { + Log.d(TAG, "sync(groupId=$groupId) start") + val group = groupDao.getById(groupId) + if (group == null) { + Log.w(TAG, "sync: group $groupId not found in DB") + return null + } + val season = ScheduleDates.currentSeason() + val range = dateRangeFor(group, season) + if (range == null) { + Log.w(TAG, "sync: no date range for season $season (group ${group.id}, " + + "autumn=[${group.autumnFirst}, ${group.autumnSecond}], " + + "spring=[${group.springFirst}, ${group.springSecond}])") + return null + } + Log.d(TAG, "sync: season=$season range=[${range.first}, ${range.second}]") + + return try { + val pdfUrl = VyatsuUrls.groupPdfUrl(groupId, season, range) + Log.d(TAG, "sync: downloading $pdfUrl") + val bytes = VyatsuHttpClient.getBytes(pdfUrl) + Log.d(TAG, "sync: downloaded ${bytes.size} bytes") + + val days = PdfScheduleParser.parse(bytes) + Log.d(TAG, "sync: parsed ${days.size} days") + + val entity = ScheduleEntity( + groupId = groupId, + season = season.name, + dateRangeFirst = range.first, + dateRangeSecond = range.second, + weeksJson = codec.toJson(days), + lastSyncedAt = now() + ) + scheduleDao.upsert(entity) + Log.d(TAG, "sync: upserted schedule for $groupId") + entity.toDomain() + } catch (e: Throwable) { + Log.e(TAG, "sync: failed for $groupId (${e::class.simpleName}: ${e.message})", e) + null + } + } + + override suspend fun isStale(groupId: String): Boolean { + val entity = scheduleDao.get(groupId) ?: return true + return now() - entity.lastSyncedAt > STALE_WINDOW_MS + } + + override suspend fun clear(groupId: String) = scheduleDao.delete(groupId) + + private fun dateRangeFor(group: GroupEntity, season: Season): DateRange? { + return when (season) { + Season.AUTUMN -> if (group.autumnFirst.isNotEmpty() && group.autumnSecond.isNotEmpty()) { + DateRange(group.autumnFirst, group.autumnSecond) + } else null + Season.SPRING -> if (group.springFirst.isNotEmpty() && group.springSecond.isNotEmpty()) { + DateRange(group.springFirst, group.springSecond) + } else null + } + } + + private fun now(): Long = System.currentTimeMillis() + + private fun ScheduleEntity.toDomain(): Schedule = Schedule( + groupId = groupId, + season = Season.valueOf(season), + days = codec.fromJson(weeksJson) + ) + + companion object { + private const val STALE_WINDOW_MS = 12 * 60 * 60 * 1000L + private const val TAG = "ScheduleRepo" + } +} diff --git a/app/src/main/java/agzam/vyatsu/data/static/Buildings.kt b/app/src/main/java/agzam/vyatsu/data/static/Buildings.kt new file mode 100644 index 0000000..20cc070 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/static/Buildings.kt @@ -0,0 +1,34 @@ +package agzam.vyatsu.data.static + +data class Building( + val number: Int, + val address: String, + val latitude: Double, + val longitude: Double +) + +val BUILDINGS: List = listOf( + Building(1, "ул. Московская, д. 36", 58.602692, 49.666638), + Building(2, "ул. Московская, д. 39", 58.604297, 49.665926), + Building(3, "ул. Московская, д. 29", 58.604258, 49.673772), + Building(4, "ул. К.Либкнехта, д. 76 (1 корпус)", 58.602210, 49.665506), + Building(5, "ул. Карла Маркса, д. 77", 58.599995, 49.667861), + Building(6, "Студенческий проезд, д. 9", 58.605119, 49.618132), + Building(7, "ул. Преображенская, д. 32", 58.605315, 49.673662), + Building(8, "Студенческий проезд, д. 11", 58.604574, 49.618105), + Building(9, "Студенческий проезд, д. 11а", 58.604417, 49.617226), + Building(10, "ул. Ломоносова, д. 18а", 58.604644, 49.615911), + Building(11, "ул. Преображенская, д. 41", 58.605713, 49.670755), + Building(12, "ул. Ленина, д. 127", 58.586882, 49.681758), + Building(13, "ул. Красноармейская, д. 26", 58.591304, 49.676543), + Building(14, "ул. Ленина, д. 111", 58.591637, 49.680732), + Building(15, "ул. Ленина, д. 198", 58.567400, 49.686333), + Building(16, "ул. Свободы, д. 122", 58.591296, 49.678238), + Building(17, "ул. Ленина, д. 111а", 58.591030, 49.681094), + Building(18, "ул. Молодой Гвардии, д. 13", 58.598915, 49.687212), + Building(19, "ул. Орловская, д. 12", 58.596234, 49.687395), + Building(20, "ул. Ленина, д. 113", 58.590819, 49.681423), + Building(21, "ул. Ленина, д. 111а", 58.591030, 49.681094), + Building(22, "ул. Ленина, д. 111а", 58.591030, 49.681094), + Building(23, "ул. Володарского, д. 2", 58.616236, 49.671680) +) diff --git a/app/src/main/java/agzam/vyatsu/data/static/Calls.kt b/app/src/main/java/agzam/vyatsu/data/static/Calls.kt new file mode 100644 index 0000000..680e591 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/data/static/Calls.kt @@ -0,0 +1,13 @@ +package agzam.vyatsu.data.static + +data class CallTime(val start: String, val end: String) + +val CALLS: List = listOf( + CallTime("8:20", "9:50"), + CallTime("10:00", "11:30"), + CallTime("11:45", "13:15"), + CallTime("14:00", "15:30"), + CallTime("15:45", "17:15"), + CallTime("17:20", "18:50"), + CallTime("18:55", "20:25") +) diff --git a/app/src/main/java/agzam/vyatsu/di/AppContainer.kt b/app/src/main/java/agzam/vyatsu/di/AppContainer.kt new file mode 100644 index 0000000..fccfd50 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/di/AppContainer.kt @@ -0,0 +1,45 @@ +package agzam.vyatsu.di + +import agzam.vyatsu.data.local.AppDatabase +import agzam.vyatsu.data.local.ScheduleCodec +import agzam.vyatsu.data.remote.GroupsParser +import agzam.vyatsu.data.remote.VyatsuHttpClient +import agzam.vyatsu.data.repository.GroupRepositoryImpl +import agzam.vyatsu.data.repository.PreferencesRepositoryImpl +import agzam.vyatsu.data.repository.ScheduleRepositoryImpl +import agzam.vyatsu.domain.repository.GroupRepository +import agzam.vyatsu.domain.repository.PreferencesRepository +import agzam.vyatsu.domain.repository.ScheduleRepository +import android.content.Context +import androidx.room.Room +import com.squareup.moshi.Moshi + +class AppContainer(context: Context) { + private val moshi: Moshi = Moshi.Builder().build() + + private val database: AppDatabase = Room.databaseBuilder( + context.applicationContext, + AppDatabase::class.java, + "vyatsu_schedule.db" + ).build() + + private val codec: ScheduleCodec = ScheduleCodec(moshi) + + val groupRepository: GroupRepository by lazy { + GroupRepositoryImpl( + groupDao = database.groupDao(), + ) + } + + val scheduleRepository: ScheduleRepository by lazy { + ScheduleRepositoryImpl( + scheduleDao = database.scheduleDao(), + groupDao = database.groupDao(), + codec = codec + ) + } + + val preferencesRepository: PreferencesRepository by lazy { + PreferencesRepositoryImpl(database.preferencesDao()) + } +} diff --git a/app/src/main/java/agzam/vyatsu/domain/ScheduleDates.kt b/app/src/main/java/agzam/vyatsu/domain/ScheduleDates.kt new file mode 100644 index 0000000..ea50a2d --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/domain/ScheduleDates.kt @@ -0,0 +1,39 @@ +package agzam.vyatsu.domain + +import agzam.vyatsu.domain.model.DateRange +import agzam.vyatsu.domain.model.Season +import java.time.LocalDate +import java.time.ZoneId +import java.time.format.DateTimeFormatter +import java.time.temporal.ChronoUnit +import java.time.temporal.TemporalAdjusters + +object ScheduleDates { + private val zone: ZoneId = ZoneId.of("Europe/Moscow") + private val format: DateTimeFormatter = DateTimeFormatter.ofPattern("ddMMyyyy") + + fun moscowToday(): LocalDate = LocalDate.now(zone) + + fun asDate(dateStr: String): LocalDate = LocalDate.parse(dateStr, format) + + fun dayIndexes(firstDate: String, today: LocalDate = moscowToday()): Pair { + val begin = asDate(firstDate) + val anchor = begin.with(TemporalAdjusters.previousOrSame(java.time.DayOfWeek.MONDAY)) + val diff = ChronoUnit.DAYS.between(anchor, today) + + var week = Math.floorMod(diff / 7, 2) + var day = Math.floorMod(diff, 7) + + if (day == 6) { + day = (day + 1) % 7 + week = (week + 1) % 2 + } + return week to day + } + + fun dateByIndexes(firstDate: String, week: Int, day: Int): LocalDate = + asDate(firstDate).plusDays((week * 7 + day).toLong()) + + fun currentSeason(today: LocalDate = moscowToday()): Season = + if (today.monthValue in 8..12) Season.AUTUMN else Season.SPRING +} diff --git a/app/src/main/java/agzam/vyatsu/domain/model/DateRange.kt b/app/src/main/java/agzam/vyatsu/domain/model/DateRange.kt new file mode 100644 index 0000000..84aff2c --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/domain/model/DateRange.kt @@ -0,0 +1,6 @@ +package agzam.vyatsu.domain.model + +data class DateRange( + val first: String, + val second: String +) diff --git a/app/src/main/java/agzam/vyatsu/domain/model/Day.kt b/app/src/main/java/agzam/vyatsu/domain/model/Day.kt new file mode 100644 index 0000000..751bc49 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/domain/model/Day.kt @@ -0,0 +1,16 @@ +package agzam.vyatsu.domain.model + +import java.time.LocalDate + +/** + * День + * @author Agzam + */ +data class Day( + + /** Дата, парсится из формата dd.mm.yy из PDF **/ + val date: LocalDate, + /** Список пар **/ + val intervals: List, + +) diff --git a/app/src/main/java/agzam/vyatsu/domain/model/Group.kt b/app/src/main/java/agzam/vyatsu/domain/model/Group.kt new file mode 100644 index 0000000..cd73757 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/domain/model/Group.kt @@ -0,0 +1,11 @@ +package agzam.vyatsu.domain.model + +/** + * Группа студентов ВятГУ. + * id — идентификатор группы из data-grp_period_id без последней цифры (как в PDF URL). + */ +data class Group( + val id: String, + val name: String, + val faculty: String +) diff --git a/app/src/main/java/agzam/vyatsu/domain/model/Lesson.kt b/app/src/main/java/agzam/vyatsu/domain/model/Lesson.kt new file mode 100644 index 0000000..7060241 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/domain/model/Lesson.kt @@ -0,0 +1,29 @@ +package agzam.vyatsu.domain.model + +/** + * Занятие + * @author Agzam + */ +data class Lesson( + + /** Сырое значение из PDF **/ + val raw: String, + + /** Кабинет **/ + val room: String? = null, + + /** Группа, например ИВТб-3304-05-00 **/ + val group: String? = null, + /** Подгруппа, например на физкультуре **/ + val subgroup: String? = null, + + /** Предмет **/ + val subject: String? = null, + + /** Тип, например лекция/практика **/ + val type: LessonType = LessonType.OTHER, + + /** Преподаватель **/ + val teacher: String? = null, + + ) diff --git a/app/src/main/java/agzam/vyatsu/domain/model/LessonType.kt b/app/src/main/java/agzam/vyatsu/domain/model/LessonType.kt new file mode 100644 index 0000000..18e416c --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/domain/model/LessonType.kt @@ -0,0 +1,18 @@ +package agzam.vyatsu.domain.model + +enum class LessonType(val label: String) { + + LECTURE("Лекция"), + PRACTICE("Практическое занятие"), + LABORATORY("Лабораторная работа"), + OTHER("Занятие"); + + companion object { + fun fromRaw(raw: String): LessonType = when (raw.trim()) { + "Лекция" -> LECTURE + "Практическое занятие" -> PRACTICE + "Лабораторная работа" -> LABORATORY + else -> OTHER + } + } +} diff --git a/app/src/main/java/agzam/vyatsu/domain/model/Schedule.kt b/app/src/main/java/agzam/vyatsu/domain/model/Schedule.kt new file mode 100644 index 0000000..7e1b36c --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/domain/model/Schedule.kt @@ -0,0 +1,17 @@ +package agzam.vyatsu.domain.model + +/** + * Расписание группы, как правило содержит 2 недели + * @author Agzam + */ +data class Schedule( + + val groupId: String, + val season: Season, + + /** Может содержать более 7 дней */ + val days: List + +) { + +} diff --git a/app/src/main/java/agzam/vyatsu/domain/model/Season.kt b/app/src/main/java/agzam/vyatsu/domain/model/Season.kt new file mode 100644 index 0000000..1c2eabf --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/domain/model/Season.kt @@ -0,0 +1,11 @@ +package agzam.vyatsu.domain.model + +enum class Season { + AUTUMN, SPRING; + + val apiKey: String + get() = when (this) { + AUTUMN -> "1" + SPRING -> "2" + } +} diff --git a/app/src/main/java/agzam/vyatsu/domain/model/TimeSlot.kt b/app/src/main/java/agzam/vyatsu/domain/model/TimeSlot.kt new file mode 100644 index 0000000..5c36b50 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/domain/model/TimeSlot.kt @@ -0,0 +1,17 @@ +package agzam.vyatsu.domain.model + +import java.time.LocalTime + +/** + * Временной промежуток/пара (например 08:20-09:30 из PDF) + * + * Может содержать несколько [Lesson], например для разделения на подгруппы + * @author Agzam + */ +data class TimeSlot( + + val start: LocalTime, + val end: LocalTime, + val lessons: List + +) diff --git a/app/src/main/java/agzam/vyatsu/domain/repository/GroupRepository.kt b/app/src/main/java/agzam/vyatsu/domain/repository/GroupRepository.kt new file mode 100644 index 0000000..3a19821 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/domain/repository/GroupRepository.kt @@ -0,0 +1,12 @@ +package agzam.vyatsu.domain.repository + +import agzam.vyatsu.domain.model.Group +import kotlinx.coroutines.flow.Flow + +interface GroupRepository { + fun observeGroups(): Flow> + suspend fun getGroups(): List + suspend fun getFaculties(): List + suspend fun refreshIfStale(): Boolean + suspend fun forceRefresh(): Boolean +} diff --git a/app/src/main/java/agzam/vyatsu/domain/repository/PreferencesRepository.kt b/app/src/main/java/agzam/vyatsu/domain/repository/PreferencesRepository.kt new file mode 100644 index 0000000..bcadd2f --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/domain/repository/PreferencesRepository.kt @@ -0,0 +1,7 @@ +package agzam.vyatsu.domain.repository + +interface PreferencesRepository { + suspend fun selectedGroupId(): String? + suspend fun setSelectedGroup(groupId: String) + suspend fun clearSelectedGroup() +} diff --git a/app/src/main/java/agzam/vyatsu/domain/repository/ScheduleRepository.kt b/app/src/main/java/agzam/vyatsu/domain/repository/ScheduleRepository.kt new file mode 100644 index 0000000..8437e20 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/domain/repository/ScheduleRepository.kt @@ -0,0 +1,12 @@ +package agzam.vyatsu.domain.repository + +import agzam.vyatsu.domain.model.Schedule +import kotlinx.coroutines.flow.Flow + +interface ScheduleRepository { + fun observeSchedule(groupId: String): Flow + suspend fun getSchedule(groupId: String): Schedule? + suspend fun sync(groupId: String): Schedule? + suspend fun isStale(groupId: String): Boolean + suspend fun clear(groupId: String) +} diff --git a/app/src/main/java/agzam/vyatsu/ui/groups/GroupPickerScreen.kt b/app/src/main/java/agzam/vyatsu/ui/groups/GroupPickerScreen.kt new file mode 100644 index 0000000..df06eba --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/ui/groups/GroupPickerScreen.kt @@ -0,0 +1,152 @@ +package agzam.vyatsu.ui.groups + +import agzam.vyatsu.domain.model.Group +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBars +import androidx.compose.foundation.layout.windowInsetsPadding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Clear +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material.icons.filled.Search +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SearchBar +import androidx.compose.material3.SearchBarDefaults +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + +/** + * Страница выбора группы + * @author Agzam + */ +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun GroupPickerScreen(viewModel: GroupPickerViewModel, onGroupPicked: (Group) -> Unit) { + val state by viewModel.uiState.collectAsState() + var isSearchActive by remember { mutableStateOf(false) } + + Scaffold { innerPadding -> + Column( + Modifier + .fillMaxSize() + .windowInsetsPadding(WindowInsets.systemBars) + .padding(innerPadding) + .padding(horizontal = 16.dp, vertical = 8.dp) + ) { + if (!isSearchActive) { + Row( + Modifier + .fillMaxWidth() + .padding(bottom = 8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Text( + text = "Выберите группу", + style = MaterialTheme.typography.headlineSmall, + modifier = Modifier.weight(1f) + ) + IconButton(onClick = { viewModel.refresh() }) { + Icon(Icons.Default.Refresh, contentDescription = "Обновить") + } + } + } + + if (state.isLoading && state.groups.isEmpty()) { + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) { + CircularProgressIndicator() + } + return@Column + } + if (state.error != null && state.groups.isEmpty()) { + Column(Modifier.fillMaxWidth()) { + Text(state.error.orEmpty(), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.error) + TextButton(onClick = { viewModel.retry() }) { Text("Повторить") } + } + return@Column + } + SearchBar( + modifier = Modifier.fillMaxWidth(), + expanded = isSearchActive, + onExpandedChange = { isSearchActive = it }, + inputField = { + SearchBarDefaults.InputField( + query = state.searchQuery, + onQueryChange = { viewModel.search(it) }, + onSearch = { isSearchActive = false }, + expanded = isSearchActive, + onExpandedChange = { isSearchActive = it }, + placeholder = { Text("Поиск группы") }, + leadingIcon = { Icon(Icons.Default.Search, contentDescription = null) }, + trailingIcon = { + if (isSearchActive && state.searchQuery.isNotEmpty()) { + IconButton(onClick = { viewModel.search("") }) { + Icon(Icons.Default.Clear, contentDescription = "Очистить") + } + } + } + ) + } + ) { + GroupList( + groups = state.filteredGroups, + onPick = { group -> + isSearchActive = false + onGroupPicked(group) + } + ) + } + + if (!isSearchActive) { + Spacer(modifier = Modifier.height(8.dp)) + GroupList(state.filteredGroups, onGroupPicked) + } + } + } +} + +@Composable +private fun GroupList(groups: List, onPick: (Group) -> Unit) { + LazyColumn(modifier = Modifier.fillMaxSize()) { + items(groups) { group -> + Column(modifier = Modifier.fillMaxWidth() .clickable { onPick(group) }) { + Box( + modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp).padding(horizontal = 16.dp), + contentAlignment = Alignment.CenterStart + ) { + Text(group.name, style = MaterialTheme.typography.bodyMedium) + // XXX: стоит ли добавлять факультет или это засорит интерфейс + // Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.Bottom) { + // if (group.faculty.isNotEmpty()) Text(text = group.faculty + " · ", color = MaterialTheme.colorScheme.onSurfaceVariant) + // } + } + } + HorizontalDivider(thickness = 1.dp, color = MaterialTheme.colorScheme.outlineVariant) + } + } +} diff --git a/app/src/main/java/agzam/vyatsu/ui/groups/GroupPickerViewModel.kt b/app/src/main/java/agzam/vyatsu/ui/groups/GroupPickerViewModel.kt new file mode 100644 index 0000000..75fa4bd --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/ui/groups/GroupPickerViewModel.kt @@ -0,0 +1,100 @@ +package agzam.vyatsu.ui.groups + +import agzam.vyatsu.domain.model.Group +import agzam.vyatsu.domain.repository.GroupRepository +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +/** + * @author Agzam + */ +class GroupPickerViewModel(private val repository: GroupRepository) : ViewModel() { + + private val _uiState = MutableStateFlow(GroupPickerUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + init { + load() + } + + private fun load() { + viewModelScope.launch { + withContext(Dispatchers.IO) { + val ok = try { + repository.refreshIfStale() + } catch (e: Exception) { + _uiState.value = _uiState.value.copy( + error = e.message ?: "Не удалось загрузить группы" + ) + false + } + if (!ok && _uiState.value.groups.isEmpty()) { + _uiState.value = _uiState.value.copy( + error = _uiState.value.error ?: "Не удалось обновить список групп" + ) + } + } + repository.observeGroups().collect { groups -> + val query = _uiState.value.searchQuery + _uiState.value = _uiState.value.copy( + isLoading = false, + groups = groups, + filteredGroups = filterGroups(groups, query), + error = null + ) + } + } + } + + fun search(query: String) { + val groups = _uiState.value.groups + _uiState.value = _uiState.value.copy( + searchQuery = query, + filteredGroups = filterGroups(groups, query) + ) + } + + private fun filterGroups(groups: List, query: String): List { + if (query.isBlank()) return groups + val lowerQuery = query.lowercase() + return groups.filter { group -> + group.name.lowercase().contains(lowerQuery) || group.faculty.lowercase().contains(lowerQuery) + } + } + + fun retry() { + _uiState.value = _uiState.value.copy(isLoading = true, error = null) + load() + } + + fun refresh() { + _uiState.value = _uiState.value.copy(isLoading = true, error = null) + viewModelScope.launch { + withContext(Dispatchers.IO) { + try { + repository.forceRefresh() + } catch (e: Exception) { + _uiState.value = _uiState.value.copy( + isLoading = false, + error = e.message ?: "Не удалось обновить список групп" + ) + return@withContext + } + } + } + } +} + +data class GroupPickerUiState( + val isLoading: Boolean = true, + val error: String? = null, + val groups: List = emptyList(), + val searchQuery: String = "", + val filteredGroups: List = emptyList() +) diff --git a/app/src/main/java/agzam/vyatsu/ui/home/HomeScreen.kt b/app/src/main/java/agzam/vyatsu/ui/home/HomeScreen.kt new file mode 100644 index 0000000..16a476c --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/ui/home/HomeScreen.kt @@ -0,0 +1,73 @@ +package agzam.vyatsu.ui.home + +import agzam.vyatsu.ui.info.BuildingsScreen +import agzam.vyatsu.ui.info.CallsScreen +import agzam.vyatsu.ui.schedule.ScheduleScreen +import agzam.vyatsu.ui.schedule.ScheduleViewModel +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.DateRange +import androidx.compose.material.icons.filled.Home +import androidx.compose.material.icons.filled.Info +import androidx.compose.material3.Icon +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier + +private enum class HomeTab(val label: String) { + SCHEDULE("Расписание"), + CALLS("Звонки"), + BUILDINGS("Корпуса") +} + +@Composable +fun HomeScreen( + scheduleViewModel: ScheduleViewModel, + onSwitchGroup: () -> Unit +) { + var tab by rememberSaveable { mutableStateOf(HomeTab.SCHEDULE) } + + Scaffold( + bottomBar = { + NavigationBar { + HomeTab.entries.forEach { t -> + NavigationBarItem( + selected = tab == t, + onClick = { tab = t }, + icon = { + Icon( + imageVector = when (t) { + HomeTab.SCHEDULE -> Icons.Default.DateRange + HomeTab.CALLS -> Icons.Default.Info + HomeTab.BUILDINGS -> Icons.Default.Home + }, + contentDescription = t.label + ) + }, + label = { Text(t.label) } + ) + } + } + } + ) { innerPadding -> + androidx.compose.foundation.layout.Box( + Modifier + .fillMaxSize() + .padding(innerPadding) + ) { + when (tab) { + HomeTab.SCHEDULE -> ScheduleScreen(viewModel = scheduleViewModel, onSwitchGroup = onSwitchGroup) + HomeTab.CALLS -> CallsScreen() + HomeTab.BUILDINGS -> BuildingsScreen() + } + } + } +} diff --git a/app/src/main/java/agzam/vyatsu/ui/info/BuildingsScreen.kt b/app/src/main/java/agzam/vyatsu/ui/info/BuildingsScreen.kt new file mode 100644 index 0000000..e8b1fe4 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/ui/info/BuildingsScreen.kt @@ -0,0 +1,70 @@ +package agzam.vyatsu.ui.info + +import agzam.vyatsu.data.static.BUILDINGS +import android.content.Intent +import android.net.Uri +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +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.material3.HorizontalDivider +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import agzam.vyatsu.BuildConfig + +@Composable +fun BuildingsScreen() { + val context = LocalContext.current + LazyColumn( + Modifier + .fillMaxWidth() + .windowInsetsPadding(WindowInsets.statusBars) + ) { + items(BUILDINGS) { b -> + Column( + Modifier + .fillMaxWidth() + .clickable { + val uri = Uri.parse("geo:${b.latitude},${b.longitude}?q=${b.latitude},${b.longitude}(Корпус ${b.number})") + context.startActivity(Intent(Intent.ACTION_VIEW, uri)) + } + .padding(horizontal = 16.dp, vertical = 12.dp) + ) { + Text( + "Корпус ${b.number}", + style = MaterialTheme.typography.bodyLarge + ) + Text( + b.address, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + HorizontalDivider(Modifier.padding(horizontal = 16.dp)) + } + + item { + Spacer(Modifier.height(24.dp)) + Text( + "Версия ${BuildConfig.VERSION_NAME}", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center, + modifier = Modifier.fillMaxWidth() + ) + Spacer(Modifier.height(16.dp)) + } + } +} diff --git a/app/src/main/java/agzam/vyatsu/ui/info/CallsScreen.kt b/app/src/main/java/agzam/vyatsu/ui/info/CallsScreen.kt new file mode 100644 index 0000000..afd2103 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/ui/info/CallsScreen.kt @@ -0,0 +1,42 @@ +package agzam.vyatsu.ui.info + +import agzam.vyatsu.data.static.CALLS +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.statusBars +import androidx.compose.foundation.layout.windowInsetsPadding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + +@Composable +fun CallsScreen() { + LazyColumn( + Modifier + .fillMaxWidth() + .windowInsetsPadding(WindowInsets.statusBars) + ) { + itemsIndexed(CALLS) { index, call -> + Row(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 12.dp)) { + Text( + "${index + 1} пара", + style = MaterialTheme.typography.bodyLarge, + modifier = Modifier.weight(1f) + ) + Text( + "${call.start} – ${call.end}", + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + HorizontalDivider(Modifier.padding(horizontal = 16.dp)) + } + } +} diff --git a/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleScreen.kt b/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleScreen.kt new file mode 100644 index 0000000..38e6dcb --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleScreen.kt @@ -0,0 +1,218 @@ +package agzam.vyatsu.ui.schedule + +import agzam.vyatsu.domain.model.Day +import agzam.vyatsu.domain.model.TimeSlot +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +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.only +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBars +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.LazyRow +import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.shape.RoundedCornerShape +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.FilterChip +import androidx.compose.material3.FilterChipDefaults +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import java.time.DayOfWeek +import java.time.format.DateTimeFormatter + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ScheduleScreen(viewModel: ScheduleViewModel, onSwitchGroup: () -> Unit) { + val state by viewModel.uiState.collectAsState() + + Column(Modifier.fillMaxSize()) { + TopAppBar( + title = { Text("Расписание") }, + actions = { + TextButton(onClick = { onSwitchGroup() }) { + Text("Сменить группу") + } + IconButton(onClick = { viewModel.refresh() }) { + Icon(Icons.Default.Refresh, contentDescription = "Обновить") + } + }, + windowInsets = WindowInsets.systemBars.only(androidx.compose.foundation.layout.WindowInsetsSides.Top) + ) + Column(Modifier.fillMaxSize().padding(horizontal = 16.dp, vertical = 0.dp)) { + when { + state.isSyncing && state.schedule == null -> { + Row( + Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Center + ) { + CircularProgressIndicator() + } + } + + state.schedule == null -> { + Column( + Modifier.fillMaxWidth(), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + "Не удалось загрузить расписание", + style = MaterialTheme.typography.bodyLarge + ) + TextButton(onClick = { viewModel.refresh() }) { + Text("Повторить") + } + } + } + + else -> { + val schedule = state.schedule!! + val day = schedule.days.getOrNull(state.selectedIndex) + if (day == null) { + Text("Занятий нет", style = MaterialTheme.typography.bodyLarge) + } else { + val isToday = state.selectedIndex == state.todayIndex + val dayLabel = if (isToday) "Сегодня " else "" + + Text( + "$dayLabel ${dayName(day.date.dayOfWeek)} · ${day.date.format(FULL_DATE)}", + style = MaterialTheme.typography.titleMedium + ) + HorizontalDivider(Modifier.padding(vertical = 8.dp)) + + DayChips( + days = schedule.days, + selectedIndex = state.selectedIndex, + todayIndex = state.todayIndex, + onSelect = viewModel::selectDay + ) + + HorizontalDivider(Modifier.padding(vertical = 8.dp)) + + if (day.intervals.all { it.lessons.isEmpty() }) { + Text("Занятий нет", style = MaterialTheme.typography.bodyLarge) + } else { + LazyColumn( + modifier = Modifier.weight(1f), + verticalArrangement = Arrangement.spacedBy(8.dp) + ) { + itemsIndexed(day.intervals) { slotIndex, slot -> + LessonSlot(slotIndex = slotIndex, slot = slot) + } + } + } + } + } + } + } + } +} + +@Composable +private fun DayChips( + days: List, + selectedIndex: Int, + todayIndex: Int, + onSelect: (Int) -> Unit +) { + LazyRow(horizontalArrangement = Arrangement.spacedBy(6.dp)) { + itemsIndexed(days) { index, day -> + val selected = selectedIndex == index + val isTodayChip = todayIndex == index + FilterChip( + selected = selected, + onClick = { onSelect(index) }, + label = { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text( + dayName(day.date.dayOfWeek), + style = MaterialTheme.typography.labelMedium + ) + Text( + day.date.format(CHIP_DATE), + style = MaterialTheme.typography.labelSmall, + color = if (selected) { + MaterialTheme.colorScheme.onSecondaryContainer + } else { + MaterialTheme.colorScheme.onSurfaceVariant + } + ) + } + }, + modifier = Modifier.padding(vertical = 2.dp), + border = if (isTodayChip && !selected) { + FilterChipDefaults.filterChipBorder( + borderColor = MaterialTheme.colorScheme.primary, + borderWidth = 1.dp, + enabled = true, + selected = false + ) + } else { + FilterChipDefaults.filterChipBorder(enabled = true, selected = selected) + }, + shape = RoundedCornerShape(8.dp) + ) + } + } +} + +@Composable +private fun LessonSlot(slotIndex: Int, slot: TimeSlot) { + Column(Modifier.fillMaxWidth()) { + Text( + "${slotIndex + 1} пара · ${slot.start.format(TIME)}–${slot.end.format(TIME)}", + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.primary + ) + if (slot.lessons.isEmpty()) { + Text("—", style = MaterialTheme.typography.bodyMedium) + } else { + slot.lessons.forEach { lesson -> + Column(Modifier.fillMaxWidth().padding(vertical = 2.dp)) { + Text( + lesson.subject?.takeIf { it.isNotBlank() } ?: lesson.raw, + style = MaterialTheme.typography.bodyLarge + ) + Text( + listOf(lesson.type.label, lesson.subgroup, lesson.teacher, lesson.room) + .filterNotNull() + .filter { it.isNotBlank() } + .joinToString(" · "), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } + } +} + +private fun dayName(dayOfWeek: DayOfWeek): String = when (dayOfWeek) { + DayOfWeek.MONDAY -> "Пн" + DayOfWeek.TUESDAY -> "Вт" + DayOfWeek.WEDNESDAY -> "Ср" + DayOfWeek.THURSDAY -> "Чт" + DayOfWeek.FRIDAY -> "Пт" + DayOfWeek.SATURDAY -> "Сб" + DayOfWeek.SUNDAY -> "Вс" +} + +private val FULL_DATE: DateTimeFormatter = DateTimeFormatter.ofPattern("dd.MM.yyyy") +private val CHIP_DATE: DateTimeFormatter = DateTimeFormatter.ofPattern("dd.MM") +private val TIME: DateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm") \ No newline at end of file diff --git a/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleViewModel.kt b/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleViewModel.kt new file mode 100644 index 0000000..ee00ef7 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/ui/schedule/ScheduleViewModel.kt @@ -0,0 +1,113 @@ +package agzam.vyatsu.ui.schedule + +import agzam.vyatsu.domain.ScheduleDates +import agzam.vyatsu.domain.model.Day +import agzam.vyatsu.domain.model.Schedule +import agzam.vyatsu.domain.repository.PreferencesRepository +import agzam.vyatsu.domain.repository.ScheduleRepository +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch + +class ScheduleViewModel( + private val scheduleRepository: ScheduleRepository, + private val preferencesRepository: PreferencesRepository +) : ViewModel() { + + private val _uiState = MutableStateFlow(ScheduleUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + private var currentGroupId: String? = null + + init { + viewModelScope.launch { + val groupId = preferencesRepository.selectedGroupId() + if (groupId != null) { + selectGroup(groupId) + } else { + _uiState.value = _uiState.value.copy(noGroup = true) + } + } + } + + fun selectGroup(groupId: String) { + currentGroupId = groupId + viewModelScope.launch { + preferencesRepository.setSelectedGroup(groupId) + _uiState.value = _uiState.value.copy(noGroup = false) + + launch { + scheduleRepository.observeSchedule(groupId).collect { schedule -> + currentGroupId?.let { + val days = schedule?.days.orEmpty() + val today = todayIndex(days) + val current = _uiState.value + val selected = current.selectedIndex.takeIf { i -> i in days.indices } ?: today + _uiState.value = current.copy( + schedule = schedule, + todayIndex = today, + selectedIndex = selected + ) + } + } + } + + launch { + _uiState.value = _uiState.value.copy(isSyncing = true) + scheduleRepository.sync(groupId) + _uiState.value = _uiState.value.copy(isSyncing = false) + } + } + } + + fun switchGroup() { + viewModelScope.launch { + currentGroupId = null + preferencesRepository.clearSelectedGroup() + _uiState.value = _uiState.value.copy(noGroup = true) + } + } + + fun refresh() { + val groupId = currentGroupId ?: return + viewModelScope.launch { + _uiState.value = _uiState.value.copy(isRefreshing = true) + scheduleRepository.sync(groupId) + val current = _uiState.value + val days = current.schedule?.days.orEmpty() + val today = todayIndex(days) + _uiState.value = current.copy( + isRefreshing = false, + todayIndex = today, + selectedIndex = current.selectedIndex.takeIf { it in days.indices } ?: today + ) + } + } + + fun selectDay(index: Int) { + val days = _uiState.value.schedule?.days.orEmpty() + if (index !in days.indices) return + _uiState.value = _uiState.value.copy(selectedIndex = index) + } + + private fun todayIndex(days: List): Int { + if (days.isEmpty()) return 0 + val today = ScheduleDates.moscowToday() + val exact = days.indexOfFirst { it.date == today } + if (exact >= 0) return exact + val next = days.indexOfFirst { !it.date.isBefore(today) } + return if (next >= 0) next else days.lastIndex + } +} + +data class ScheduleUiState( + val noGroup: Boolean = false, + val isRefreshing: Boolean = false, + val isSyncing: Boolean = false, + val schedule: Schedule? = null, + val todayIndex: Int = 0, + val selectedIndex: Int = 0 +) diff --git a/app/src/main/java/agzam/vyatsu/ui/theme/Color.kt b/app/src/main/java/agzam/vyatsu/ui/theme/Color.kt new file mode 100644 index 0000000..0dd5191 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package agzam.vyatsu.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/agzam/vyatsu/ui/theme/Theme.kt b/app/src/main/java/agzam/vyatsu/ui/theme/Theme.kt new file mode 100644 index 0000000..70612fb --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/ui/theme/Theme.kt @@ -0,0 +1,58 @@ +package agzam.vyatsu.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun VyatsuScheduleTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/agzam/vyatsu/ui/theme/Type.kt b/app/src/main/java/agzam/vyatsu/ui/theme/Type.kt new file mode 100644 index 0000000..b488957 --- /dev/null +++ b/app/src/main/java/agzam/vyatsu/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package agzam.vyatsu.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..6c2de23 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + VyatsuSchedule + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..63c943d --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +