From 0875d13737ce66fdfd1b9d61dfc9e9122ef5b6e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Fri, 11 Oct 2019 23:09:23 +0200
Subject: [PATCH] [APIv2/Librus] Update endpoint list structure

---
 .../edziennik/api/v2/librus/Librus.kt         |  4 +---
 .../LibrusFeatures.kt}                        | 23 ++++--------------
 .../api/v2/librus/data/LibrusData.kt          |  8 +++----
 .../api/v2/librus/data/api/LibrusApiEvents.kt |  2 +-
 .../api/v2/librus/data/api/LibrusApiGrades.kt |  2 +-
 .../api/v2/librus/data/api/LibrusApiMe.kt     |  2 +-
 .../v2/librus/data/api/LibrusApiSchools.kt    |  2 +-
 .../data/web/MobidziennikWebCalendar.kt       |  1 -
 .../data/web/MobidziennikWebGrades.kt         |  8 -------
 .../edziennik/api/v2/template/Template.kt     |  3 +--
 .../api/v2/template/TemplateFeatures.kt       | 24 +++++++++++++++++++
 .../api/v2/template/data/TemplateData.kt      |  6 ++---
 .../v2/template/data/api/TemplateApiSample.kt |  2 +-
 .../v2/template/data/web/TemplateWebSample.kt |  2 +-
 .../template/data/web/TemplateWebSample2.kt   |  2 +-
 15 files changed, 44 insertions(+), 47 deletions(-)
 rename app/src/main/java/pl/szczodrzynski/edziennik/api/v2/{Endpoints.kt => librus/LibrusFeatures.kt} (90%)
 create mode 100644 app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/TemplateFeatures.kt

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/Librus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/Librus.kt
index d8b9e596..667683c1 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/Librus.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/Librus.kt
@@ -8,7 +8,6 @@ import android.util.Log
 import pl.szczodrzynski.edziennik.App
 import pl.szczodrzynski.edziennik.api.v2.CODE_INTERNAL_LIBRUS_ACCOUNT_410
 import pl.szczodrzynski.edziennik.api.v2.LOGIN_METHOD_NOT_NEEDED
-import pl.szczodrzynski.edziennik.api.v2.endpoints
 import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikCallback
 import pl.szczodrzynski.edziennik.api.v2.interfaces.EdziennikInterface
 import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusData
@@ -19,7 +18,6 @@ import pl.szczodrzynski.edziennik.api.v2.models.Feature
 import pl.szczodrzynski.edziennik.data.db.modules.api.*
 import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore
 import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile
-import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
     companion object {
@@ -67,7 +65,7 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
 
         // get all endpoints for every feature, only if possible to login
         for (featureId in featureIds) {
-            endpoints.filter {
+            LibrusFeatures.filter {
                         it.featureId == featureId && possibleLoginMethods.containsAll(it.requiredLoginMethods)
                     }
                     .let {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Endpoints.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/LibrusFeatures.kt
similarity index 90%
rename from app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Endpoints.kt
rename to app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/LibrusFeatures.kt
index c04e1343..46ba4706 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/Endpoints.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/LibrusFeatures.kt
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) Kuba Szczodrzyński 2019-9-20.
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
  */
 
-package pl.szczodrzynski.edziennik.api.v2
+package pl.szczodrzynski.edziennik.api.v2.librus
 
+import pl.szczodrzynski.edziennik.api.v2.*
 import pl.szczodrzynski.edziennik.api.v2.models.Feature
 
 const val ENDPOINT_LIBRUS_API_ME                        = 1001
@@ -48,11 +49,7 @@ const val ENDPOINT_LIBRUS_MESSAGES_TRASH                = 3030
 const val ENDPOINT_LIBRUS_MESSAGES_RECEIVERS            = 3040
 const val ENDPOINT_LIBRUS_MESSAGES_GET                  = 3040
 
-const val ENDPOINT_TEMPLATE_WEB_SAMPLE                  = 9991
-const val ENDPOINT_TEMPLATE_WEB_SAMPLE_2                = 9992
-const val ENDPOINT_TEMPLATE_API_SAMPLE                  = 9993
-
-val endpoints = listOf(
+val LibrusFeatures = listOf(
 
         // LIBRUS: API
         Feature(LOGIN_TYPE_LIBRUS, FEATURE_TIMETABLE, listOf(
@@ -143,16 +140,4 @@ val endpoints = listOf(
         Feature(LOGIN_TYPE_LIBRUS, FEATURE_MESSAGES_SENT, listOf(
                 ENDPOINT_LIBRUS_MESSAGES_SENT to LOGIN_METHOD_LIBRUS_MESSAGES
         ), listOf(LOGIN_METHOD_LIBRUS_MESSAGES))
-)
-
-val templateEndpoints = listOf(
-        Feature(LOGIN_TYPE_LIBRUS, FEATURE_STUDENT_INFO, listOf(
-                ENDPOINT_TEMPLATE_WEB_SAMPLE to LOGIN_METHOD_TEMPLATE_WEB
-        ), listOf(LOGIN_METHOD_TEMPLATE_WEB)),
-        Feature(LOGIN_TYPE_LIBRUS, FEATURE_SCHOOL_INFO, listOf(
-                ENDPOINT_TEMPLATE_WEB_SAMPLE_2 to LOGIN_METHOD_TEMPLATE_WEB
-        ), listOf(LOGIN_METHOD_TEMPLATE_WEB)),
-        Feature(LOGIN_TYPE_LIBRUS, FEATURE_GRADES, listOf(
-                ENDPOINT_TEMPLATE_API_SAMPLE to LOGIN_METHOD_TEMPLATE_API
-        ), listOf(LOGIN_METHOD_TEMPLATE_API))
 )
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusData.kt
index 08a32a06..f55dec05 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusData.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusData.kt
@@ -5,10 +5,10 @@
 package pl.szczodrzynski.edziennik.api.v2.librus.data
 
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_EVENTS
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_ME
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_NORMAL_GRADES
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_SCHOOLS
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_EVENTS
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_ME
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADES
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_SCHOOLS
 import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
 import pl.szczodrzynski.edziennik.api.v2.librus.data.api.LibrusApiEvents
 import pl.szczodrzynski.edziennik.api.v2.librus.data.api.LibrusApiGrades
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiEvents.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiEvents.kt
index 2d9211de..fc57f248 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiEvents.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiEvents.kt
@@ -5,7 +5,7 @@
 package pl.szczodrzynski.edziennik.api.v2.librus.data.api
 
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_EVENTS
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_EVENTS
 import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
 import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGrades.kt
index 65ba5628..226ea6d4 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiGrades.kt
@@ -1,7 +1,7 @@
 package pl.szczodrzynski.edziennik.api.v2.librus.data.api
 
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_NORMAL_GRADES
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADES
 import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
 import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiMe.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiMe.kt
index 586dbbf7..ad1a8efb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiMe.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiMe.kt
@@ -5,7 +5,7 @@
 package pl.szczodrzynski.edziennik.api.v2.librus.data.api
 
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_ME
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_ME
 import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
 import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiSchools.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiSchools.kt
index e48d8068..5b1b1086 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiSchools.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/api/LibrusApiSchools.kt
@@ -5,7 +5,7 @@
 package pl.szczodrzynski.edziennik.api.v2.librus.data.api
 
 import pl.szczodrzynski.edziennik.*
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_SCHOOLS
+import pl.szczodrzynski.edziennik.api.v2.librus.ENDPOINT_LIBRUS_API_SCHOOLS
 import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
 import pl.szczodrzynski.edziennik.api.v2.librus.data.LibrusApi
 import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebCalendar.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebCalendar.kt
index 94f0a5e4..2fa16345 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebCalendar.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebCalendar.kt
@@ -5,7 +5,6 @@
 package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web
 
 import com.google.gson.JsonParser
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_ME
 import pl.szczodrzynski.edziennik.api.v2.Regexes
 import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
 import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_CALENDAR
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebGrades.kt
index 2a24b436..cad45ab8 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebGrades.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/web/MobidziennikWebGrades.kt
@@ -5,27 +5,19 @@
 package pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.web
 
 import android.graphics.Color
-import com.google.gson.JsonParser
 import org.jsoup.Jsoup
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_LIBRUS_API_ME
 import pl.szczodrzynski.edziennik.api.v2.Regexes
 import pl.szczodrzynski.edziennik.api.v2.mobidziennik.DataMobidziennik
 import pl.szczodrzynski.edziennik.api.v2.mobidziennik.ENDPOINT_MOBIDZIENNIK_WEB_GRADES
 import pl.szczodrzynski.edziennik.api.v2.mobidziennik.data.MobidziennikWeb
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
-import pl.szczodrzynski.edziennik.data.db.modules.events.Event
 import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade
 import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata
 import pl.szczodrzynski.edziennik.fixWhiteSpaces
 import pl.szczodrzynski.edziennik.get
-import pl.szczodrzynski.edziennik.getString
 import pl.szczodrzynski.edziennik.singleOrNull
-import pl.szczodrzynski.edziennik.utils.Utils
-import pl.szczodrzynski.edziennik.utils.Utils.strToInt
 import pl.szczodrzynski.edziennik.utils.models.Date
 import pl.szczodrzynski.edziennik.utils.models.Time
-import java.util.*
-import java.util.regex.Pattern
 
 class MobidziennikWebGrades(override val data: DataMobidziennik,
                               val onSuccess: () -> Unit) : MobidziennikWeb(data)  {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/Template.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/Template.kt
index 6e39087c..a703f73a 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/Template.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/Template.kt
@@ -14,7 +14,6 @@ import pl.szczodrzynski.edziennik.api.v2.models.ApiError
 import pl.szczodrzynski.edziennik.api.v2.models.Feature
 import pl.szczodrzynski.edziennik.api.v2.template.data.TemplateData
 import pl.szczodrzynski.edziennik.api.v2.template.login.TemplateLogin
-import pl.szczodrzynski.edziennik.api.v2.templateEndpoints
 import pl.szczodrzynski.edziennik.api.v2.templateLoginMethods
 import pl.szczodrzynski.edziennik.data.db.modules.api.EndpointTimer
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
@@ -69,7 +68,7 @@ class Template(val app: App, val profile: Profile?, val loginStore: LoginStore,
 
         // get all endpoints for every feature, only if possible to login
         for (featureId in featureIds) {
-            templateEndpoints.filter {
+            TemplateFeatures.filter {
                 it.featureId == featureId && possibleLoginMethods.containsAll(it.requiredLoginMethods)
             }
                     .let {
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/TemplateFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/TemplateFeatures.kt
new file mode 100644
index 00000000..b643f74d
--- /dev/null
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/TemplateFeatures.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Kuba Szczodrzyński 2019-10-11.
+ */
+
+package pl.szczodrzynski.edziennik.api.v2.template
+
+import pl.szczodrzynski.edziennik.api.v2.*
+import pl.szczodrzynski.edziennik.api.v2.models.Feature
+
+const val ENDPOINT_TEMPLATE_WEB_SAMPLE                  = 9991
+const val ENDPOINT_TEMPLATE_WEB_SAMPLE_2                = 9992
+const val ENDPOINT_TEMPLATE_API_SAMPLE                  = 9993
+
+val TemplateFeatures = listOf(
+        Feature(LOGIN_TYPE_TEMPLATE, FEATURE_STUDENT_INFO, listOf(
+                ENDPOINT_TEMPLATE_WEB_SAMPLE to LOGIN_METHOD_TEMPLATE_WEB
+        ), listOf(LOGIN_METHOD_TEMPLATE_WEB)),
+        Feature(LOGIN_TYPE_TEMPLATE, FEATURE_SCHOOL_INFO, listOf(
+                ENDPOINT_TEMPLATE_WEB_SAMPLE_2 to LOGIN_METHOD_TEMPLATE_WEB
+        ), listOf(LOGIN_METHOD_TEMPLATE_WEB)),
+        Feature(LOGIN_TYPE_TEMPLATE, FEATURE_GRADES, listOf(
+                ENDPOINT_TEMPLATE_API_SAMPLE to LOGIN_METHOD_TEMPLATE_API
+        ), listOf(LOGIN_METHOD_TEMPLATE_API))
+)
\ No newline at end of file
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateData.kt
index dfdc7813..35b2f004 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateData.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/TemplateData.kt
@@ -5,10 +5,10 @@
 package pl.szczodrzynski.edziennik.api.v2.template.data
 
 import pl.szczodrzynski.edziennik.R
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_TEMPLATE_API_SAMPLE
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_TEMPLATE_WEB_SAMPLE
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_TEMPLATE_WEB_SAMPLE_2
 import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_API_SAMPLE
+import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_WEB_SAMPLE
+import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_WEB_SAMPLE_2
 import pl.szczodrzynski.edziennik.api.v2.template.data.api.TemplateApiSample
 import pl.szczodrzynski.edziennik.api.v2.template.data.web.TemplateWebSample
 import pl.szczodrzynski.edziennik.api.v2.template.data.web.TemplateWebSample2
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/api/TemplateApiSample.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/api/TemplateApiSample.kt
index ef0ac8e6..470b81ef 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/api/TemplateApiSample.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/api/TemplateApiSample.kt
@@ -6,8 +6,8 @@ package pl.szczodrzynski.edziennik.api.v2.template.data.api
 
 import pl.szczodrzynski.edziennik.DAY
 import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_TEMPLATE_API_SAMPLE
 import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_API_SAMPLE
 import pl.szczodrzynski.edziennik.api.v2.template.data.TemplateApi
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample.kt
index 6e5340e1..f015debd 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample.kt
@@ -7,8 +7,8 @@ package pl.szczodrzynski.edziennik.api.v2.template.data.web
 import pl.szczodrzynski.edziennik.DAY
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_GRADES
 import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOME
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_TEMPLATE_WEB_SAMPLE
 import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_WEB_SAMPLE
 import pl.szczodrzynski.edziennik.api.v2.template.data.TemplateWeb
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS
 
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample2.kt b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample2.kt
index 94e2235d..7a3cdb33 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample2.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/api/v2/template/data/web/TemplateWebSample2.kt
@@ -6,8 +6,8 @@ package pl.szczodrzynski.edziennik.api.v2.template.data.web
 
 import pl.szczodrzynski.edziennik.DAY
 import pl.szczodrzynski.edziennik.MainActivity
-import pl.szczodrzynski.edziennik.api.v2.ENDPOINT_TEMPLATE_WEB_SAMPLE_2
 import pl.szczodrzynski.edziennik.api.v2.template.DataTemplate
+import pl.szczodrzynski.edziennik.api.v2.template.ENDPOINT_TEMPLATE_WEB_SAMPLE_2
 import pl.szczodrzynski.edziennik.api.v2.template.data.TemplateWeb
 import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS