From c8c933fb20ef9bed0af1ee20064e175aa6479243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Fri, 4 Oct 2019 17:14:56 +0200 Subject: [PATCH] [APIv2] Implement endpoint timers. Fix compilation issues after merge. --- .idea/misc.xml | 5 ++ .../pl/szczodrzynski/edziennik/Extensions.kt | 9 +- .../edziennik/api/v2/Endpoints.kt | 88 ++++++++++--------- .../edziennik/api/v2/librus/Librus.kt | 29 +++--- .../api/v2/librus/LibrusEndpoints.kt | 2 +- .../api/v2/librus/data/DataLibrus.kt | 1 + .../librus/data/{ => api}/LibrusApiGrades.kt | 2 +- .../v2/librus/data/{ => api}/LibrusApiMe.kt | 8 +- .../{ => synergia}/LibrusSynergiaGrades.kt | 2 +- .../edziennik/api/v2/models/Data.kt | 51 +++++++++++ .../api/v2/models/DataRemoveModel.kt | 26 ++++++ .../edziennik/api/v2/models/Endpoint.kt | 2 +- .../edziennik/data/db/AppDb.java | 22 ++++- .../data/db/modules/api/EndpointTimer.kt | 81 +++++++++++++++++ .../data/db/modules/api/EndpointTimerDao.kt | 26 ++++++ .../db/modules/teachers/TeacherAbsenceDao.kt | 5 +- .../ui/modules/agenda/AgendaFragment.java | 2 +- 17 files changed, 298 insertions(+), 63 deletions(-) rename app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/{ => api}/LibrusApiGrades.kt (91%) rename app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/{ => api}/LibrusApiMe.kt (73%) rename app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/{ => synergia}/LibrusSynergiaGrades.kt (90%) create mode 100644 app/src/main/java/pl/szczodrzynski/edziennik/api/v2/models/DataRemoveModel.kt create mode 100644 app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimer.kt create mode 100644 app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimerDao.kt diff --git a/.idea/misc.xml b/.idea/misc.xml index f834a4ed..4ccf11f8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,6 +5,11 @@ + + + + +