From 777929634548c76901091ec101208bcea45d7ef1 Mon Sep 17 00:00:00 2001
From: Seil0 <seil0@mosad.xyz>
Date: Sun, 7 Jun 2020 23:41:49 +0200
Subject: [PATCH] change default accent color, code clean up

---
 .../controller/CacheController.kt             |  6 +-
 .../controller/PreferencesController.kt       | 14 ++--
 .../controller/TCoRAPIController.kt           |  8 +--
 .../projectlaogai/fragments/HomeFragment.kt   |  6 +-
 .../projectlaogai/fragments/MensaFragment.kt  |  4 +-
 .../fragments/SettingsFragment.kt             |  2 +-
 .../fragments/TimeTableFragment.kt            |  2 +-
 .../uicomponents/AddLessonDialog.kt           |  2 +-
 .../projectlaogai/uicomponents/DayCardView.kt |  6 +-
 .../uicomponents/LessonLinearLayout.kt        |  2 +-
 .../uicomponents/MealLinearLayout.kt          |  2 +-
 .../{hsoparser => util}/DataTypes.kt          | 54 +---------------
 .../projectlaogai/util/NotRetardedCalendar.kt | 64 +++++++++++++++++++
 app/src/main/res/values-de-rDE/strings.xml    |  2 +-
 app/src/main/res/values/colors.xml            |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 16 files changed, 99 insertions(+), 79 deletions(-)
 rename app/src/main/java/org/mosad/seil0/projectlaogai/{hsoparser => util}/DataTypes.kt (72%)
 create mode 100644 app/src/main/java/org/mosad/seil0/projectlaogai/util/NotRetardedCalendar.kt

diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/CacheController.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/CacheController.kt
index eeb73cc..3d56e9a 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/CacheController.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/CacheController.kt
@@ -30,9 +30,9 @@ import com.google.gson.JsonParser
 import com.google.gson.reflect.TypeToken
 import kotlinx.coroutines.*
 import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.cCourse
-import org.mosad.seil0.projectlaogai.hsoparser.Course
-import org.mosad.seil0.projectlaogai.hsoparser.MensaMenu
-import org.mosad.seil0.projectlaogai.hsoparser.TimetableCourseWeek
+import org.mosad.seil0.projectlaogai.util.Course
+import org.mosad.seil0.projectlaogai.util.MensaMenu
+import org.mosad.seil0.projectlaogai.util.TimetableCourseWeek
 import java.io.BufferedReader
 import java.io.File
 import java.io.FileReader
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/PreferencesController.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/PreferencesController.kt
index fba95d0..ead7a16 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/PreferencesController.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/PreferencesController.kt
@@ -25,7 +25,7 @@ package org.mosad.seil0.projectlaogai.controller
 import android.content.Context
 import android.graphics.Color
 import org.mosad.seil0.projectlaogai.R
-import org.mosad.seil0.projectlaogai.hsoparser.Course
+import org.mosad.seil0.projectlaogai.util.Course
 
 /**
  * The PreferencesController class
@@ -38,8 +38,11 @@ class PreferencesController {
         var mensaCacheTime: Long = 0
         var timetableCacheTime: Long = 0
         var cColorPrimary: Int = Color.parseColor("#009688")
-        var cColorAccent: Int = Color.parseColor("#3F51B5")
-        var cCourse = Course("https://www.hs-offenburg.de/index.php?id=6627&class=class&iddV=DA64F6FE-9DDB-429E-A677-05D0D40CB636&week=0", "AI3")
+        var cColorAccent: Int = Color.parseColor("#0096ff")
+        var cCourse = Course(
+            "https://www.hs-offenburg.de/index.php?id=6627&class=class&iddV=DA64F6FE-9DDB-429E-A677-05D0D40CB636&week=0",
+            "AI3"
+        )
         var cShowBuffet = true
         var oGiants = false
 
@@ -161,7 +164,10 @@ class PreferencesController {
 
             // load saved course
             cCourse = Course(
-                sharedPref.getString(context.getString(R.string.save_key_courseTTLink), "https://www.hs-offenburg.de/index.php?id=6627&class=class&iddV=DA64F6FE-9DDB-429E-A677-05D0D40CB636&week=0")!!,
+                sharedPref.getString(
+                    context.getString(R.string.save_key_courseTTLink),
+                    "https://www.hs-offenburg.de/index.php?id=6627&class=class&iddV=DA64F6FE-9DDB-429E-A677-05D0D40CB636&week=0"
+                )!!,
                 sharedPref.getString(context.getString(R.string.save_key_course), "AI3")!!
             )
 
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/TCoRAPIController.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/TCoRAPIController.kt
index 6da9d6e..a0f9188 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/TCoRAPIController.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/TCoRAPIController.kt
@@ -31,10 +31,10 @@ import org.json.JSONObject
 import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.coursesCacheTime
 import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.mensaCacheTime
 import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.timetableCacheTime
-import org.mosad.seil0.projectlaogai.hsoparser.CoursesList
-import org.mosad.seil0.projectlaogai.hsoparser.Lesson
-import org.mosad.seil0.projectlaogai.hsoparser.MensaMenu
-import org.mosad.seil0.projectlaogai.hsoparser.TimetableCourseWeek
+import org.mosad.seil0.projectlaogai.util.CoursesList
+import org.mosad.seil0.projectlaogai.util.Lesson
+import org.mosad.seil0.projectlaogai.util.MensaMenu
+import org.mosad.seil0.projectlaogai.util.TimetableCourseWeek
 import java.io.BufferedWriter
 import java.io.File
 import java.io.FileWriter
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt
index bfd233a..e3c7fc9 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt
@@ -35,11 +35,11 @@ import kotlinx.coroutines.*
 import org.mosad.seil0.projectlaogai.R
 import org.mosad.seil0.projectlaogai.controller.CacheController.Companion.mensaMenu
 import org.mosad.seil0.projectlaogai.controller.CacheController.Companion.timetables
-import org.mosad.seil0.projectlaogai.hsoparser.Meal
-import org.mosad.seil0.projectlaogai.hsoparser.NotRetardedCalendar
-import org.mosad.seil0.projectlaogai.hsoparser.TimetableDay
+import org.mosad.seil0.projectlaogai.util.Meal
+import org.mosad.seil0.projectlaogai.util.TimetableDay
 import org.mosad.seil0.projectlaogai.uicomponents.DayCardView
 import org.mosad.seil0.projectlaogai.uicomponents.MealLinearLayout
+import org.mosad.seil0.projectlaogai.util.NotRetardedCalendar
 import java.text.SimpleDateFormat
 import java.util.*
 
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt
index a1548ee..1529dfb 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt
@@ -37,10 +37,10 @@ import org.mosad.seil0.projectlaogai.controller.CacheController
 import org.mosad.seil0.projectlaogai.controller.CacheController.Companion.mensaMenu
 import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.cShowBuffet
 import org.mosad.seil0.projectlaogai.controller.TCoRAPIController
-import org.mosad.seil0.projectlaogai.hsoparser.MensaWeek
-import org.mosad.seil0.projectlaogai.hsoparser.NotRetardedCalendar
+import org.mosad.seil0.projectlaogai.util.MensaWeek
 import org.mosad.seil0.projectlaogai.uicomponents.DayCardView
 import org.mosad.seil0.projectlaogai.uicomponents.MealLinearLayout
+import org.mosad.seil0.projectlaogai.util.NotRetardedCalendar
 
 /**
  * The mensa controller class
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt
index 82b13f7..bb90304 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt
@@ -55,7 +55,7 @@ import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.
 import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.cCourse
 import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.cShowBuffet
 import org.mosad.seil0.projectlaogai.controller.TCoRAPIController
-import org.mosad.seil0.projectlaogai.hsoparser.DataTypes
+import org.mosad.seil0.projectlaogai.util.DataTypes
 import java.util.*
 
 /**
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt
index 5f0c15f..60cabb0 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt
@@ -40,9 +40,9 @@ import org.mosad.seil0.projectlaogai.controller.CacheController.Companion.timeta
 import org.mosad.seil0.projectlaogai.controller.PreferencesController
 import org.mosad.seil0.projectlaogai.controller.PreferencesController.Companion.cCourse
 import org.mosad.seil0.projectlaogai.controller.TCoRAPIController
-import org.mosad.seil0.projectlaogai.hsoparser.NotRetardedCalendar
 import org.mosad.seil0.projectlaogai.uicomponents.AddLessonDialog
 import org.mosad.seil0.projectlaogai.uicomponents.DayCardView
+import org.mosad.seil0.projectlaogai.util.NotRetardedCalendar
 
 /**
  * The timetable controller class
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/AddLessonDialog.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/AddLessonDialog.kt
index 05819e4..8b94f57 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/AddLessonDialog.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/AddLessonDialog.kt
@@ -37,7 +37,7 @@ import kotlinx.coroutines.runBlocking
 import org.mosad.seil0.projectlaogai.R
 import org.mosad.seil0.projectlaogai.controller.CacheController
 import org.mosad.seil0.projectlaogai.controller.TCoRAPIController
-import org.mosad.seil0.projectlaogai.hsoparser.Course
+import org.mosad.seil0.projectlaogai.util.Course
 import java.util.stream.Collectors
 
 /**
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/DayCardView.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/DayCardView.kt
index f1c23c8..8e2c2e4 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/DayCardView.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/DayCardView.kt
@@ -28,8 +28,8 @@ import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
 import kotlinx.android.synthetic.main.cardview_day.view.*
 import org.mosad.seil0.projectlaogai.R
-import org.mosad.seil0.projectlaogai.hsoparser.DataTypes
-import org.mosad.seil0.projectlaogai.hsoparser.TimetableDay
+import org.mosad.seil0.projectlaogai.util.DataTypes
+import org.mosad.seil0.projectlaogai.util.TimetableDay
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -71,7 +71,7 @@ class DayCardView(context: Context) : CardView(context) {
                 if (lesson.lessonSubject.isNotEmpty()) {
 
                     val lessonLayout = LessonLinearLayout(context)
-                    lessonLayout.setLesson(lesson, DataTypes().getTime()[tsIndex])
+                    lessonLayout.setLesson(lesson, DataTypes().times[tsIndex])
                     linLayout_Day.addView(lessonLayout)
 
                     if (lesson != timeslot.last()) {
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonLinearLayout.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonLinearLayout.kt
index fbb92ba..465697b 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonLinearLayout.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonLinearLayout.kt
@@ -28,7 +28,7 @@ import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
 import kotlinx.android.synthetic.main.linearlayout_lesson.view.*
 import org.mosad.seil0.projectlaogai.R
-import org.mosad.seil0.projectlaogai.hsoparser.Lesson
+import org.mosad.seil0.projectlaogai.util.Lesson
 
 class LessonLinearLayout(context: Context?) : LinearLayout(context) {
 
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/MealLinearLayout.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/MealLinearLayout.kt
index 3fea220..a1bda1f 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/MealLinearLayout.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/MealLinearLayout.kt
@@ -28,7 +28,7 @@ import android.widget.LinearLayout
 import androidx.cardview.widget.CardView
 import kotlinx.android.synthetic.main.linearlayout_meal.view.*
 import org.mosad.seil0.projectlaogai.R
-import org.mosad.seil0.projectlaogai.hsoparser.Meal
+import org.mosad.seil0.projectlaogai.util.Meal
 
 class MealLinearLayout(context: Context?): LinearLayout(context) {
 
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/util/DataTypes.kt
similarity index 72%
rename from app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt
rename to app/src/main/java/org/mosad/seil0/projectlaogai/util/DataTypes.kt
index c60a044..21b2e3b 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/util/DataTypes.kt
@@ -20,11 +20,9 @@
  *
  */
 
-package org.mosad.seil0.projectlaogai.hsoparser
+package org.mosad.seil0.projectlaogai.util
 
 import android.graphics.Color
-import org.mosad.seil0.projectlaogai.R
-import java.util.*
 import kotlin.collections.ArrayList
 
 class DataTypes {
@@ -60,7 +58,7 @@ class DataTypes {
         Color.parseColor("#3F51B5"),
         Color.parseColor("#3D5AFE"),
         Color.parseColor("#2979FF"),
-        Color.parseColor("#00B0FF"),
+        Color.parseColor("#0096FF"),
         Color.parseColor("#00E5FF"),
         Color.parseColor("#1DE9B6"),
         Color.parseColor("#00E676"),
@@ -77,54 +75,6 @@ class DataTypes {
         Dark("Dark"),
         Black("Black")
     }
-
-    init {
-        // do something
-    }
-
-    fun getTime(): Array<String> {
-        return times
-    }
-
-}
-
-class NotRetardedCalendar {
-    companion object {
-        private val calendar = Calendar.getInstance()
-
-        fun getDayOfWeekIndex(): Int {
-            return when (calendar.get(Calendar.DAY_OF_WEEK)) {
-                Calendar.MONDAY -> 0
-                Calendar.TUESDAY -> 1
-                Calendar.WEDNESDAY -> 2
-                Calendar.THURSDAY -> 3
-                Calendar.FRIDAY -> 4
-                Calendar.SATURDAY -> 5
-                Calendar.SUNDAY -> 6
-                else -> 7
-            }
-        }
-
-        fun getTomorrowWeekIndex(): Int {
-            return when (calendar.get(Calendar.DAY_OF_WEEK)) {
-                Calendar.MONDAY -> 1
-                Calendar.TUESDAY -> 2
-                Calendar.WEDNESDAY -> 3
-                Calendar.THURSDAY -> 4
-                Calendar.FRIDAY -> 5
-                Calendar.SATURDAY -> 6
-                Calendar.SUNDAY -> 0
-                else -> 7
-            }
-        }
-
-        fun getWeekOfYear(): Int {
-            return when (calendar.get(Calendar.DAY_OF_WEEK)) {
-                Calendar.SUNDAY -> Calendar.getInstance().get(Calendar.WEEK_OF_YEAR) - 1
-                else -> Calendar.getInstance().get(Calendar.WEEK_OF_YEAR)
-            }
-        }
-    }
 }
 
 // data classes for the course part
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/util/NotRetardedCalendar.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/util/NotRetardedCalendar.kt
new file mode 100644
index 0000000..651f2b5
--- /dev/null
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/util/NotRetardedCalendar.kt
@@ -0,0 +1,64 @@
+/**
+ * ProjectLaogai
+ *
+ * Copyright 2019-2020  <seil0@mosad.xyz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.seil0.projectlaogai.util
+
+import java.util.*
+
+class NotRetardedCalendar {
+    companion object {
+        private val calendar = Calendar.getInstance()
+
+        fun getDayOfWeekIndex(): Int {
+            return when (calendar.get(Calendar.DAY_OF_WEEK)) {
+                Calendar.MONDAY -> 0
+                Calendar.TUESDAY -> 1
+                Calendar.WEDNESDAY -> 2
+                Calendar.THURSDAY -> 3
+                Calendar.FRIDAY -> 4
+                Calendar.SATURDAY -> 5
+                Calendar.SUNDAY -> 6
+                else -> 7
+            }
+        }
+
+        fun getTomorrowWeekIndex(): Int {
+            return when (calendar.get(Calendar.DAY_OF_WEEK)) {
+                Calendar.MONDAY -> 1
+                Calendar.TUESDAY -> 2
+                Calendar.WEDNESDAY -> 3
+                Calendar.THURSDAY -> 4
+                Calendar.FRIDAY -> 5
+                Calendar.SATURDAY -> 6
+                Calendar.SUNDAY -> 0
+                else -> 7
+            }
+        }
+
+        fun getWeekOfYear(): Int {
+            return when (calendar.get(Calendar.DAY_OF_WEEK)) {
+                Calendar.SUNDAY -> Calendar.getInstance().get(Calendar.WEEK_OF_YEAR) - 1
+                else -> Calendar.getInstance().get(Calendar.WEEK_OF_YEAR)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 8e1a4b6..fffc8c8 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -53,7 +53,7 @@
     <string name="primary_color">Primärfarbe</string>
     <string name="primary_color_desc">Zum Ändern tippen, Standard ist Blaugrün.</string>
     <string name="accent_color">Akzentfarbe</string>
-    <string name="accent_color_desc">Zum Ändern tippen, Standard ist Indigo.</string>
+    <string name="accent_color_desc">Zum Ändern tippen, Standard ist Hellblau.</string>
     <string name="show_buffet">Buffet immer anzeigen</string>
 
     <!-- dialogs -->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index da83996..0d0f8cb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,7 +2,7 @@
 <resources>
     <color name="colorPrimary">#009688</color>
     <color name="colorPrimaryDark">#009688</color>
-    <color name="colorAccent">#3f51b5</color>
+    <color name="colorAccent">#0096ff</color>
     <color name="ic_launcher_background">#ffffff</color>
 
     <!--theme color section, not the working colors-->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a31d78a..14b61c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,7 +58,7 @@
     <string name="primary_color">Primary color</string>
     <string name="primary_color_desc">Tap to change, default is teal blue.</string>
     <string name="accent_color">Accent color</string>
-    <string name="accent_color_desc">Tap to change, default is indigo.</string>
+    <string name="accent_color_desc">Tap to change, default is light blue.</string>
     <string name="show_buffet">Always show buffet</string>
 
     <!-- dialogs -->