From 3e3a80442ec3258a769657af61da36d411fd966f Mon Sep 17 00:00:00 2001 From: Seil0 Date: Sat, 9 Mar 2019 22:15:53 +0100 Subject: [PATCH] next weeks menu & accent color * the MensaParser can now get the next weeks menus * it's now possible to select a accent color --- .../mosad/seil0/projectlaogai/MainActivity.kt | 24 ++++++--- .../projectlaogai/PreferencesController.kt | 21 +++++--- .../projectlaogai/fragments/HomeFragment.kt | 6 +-- .../projectlaogai/fragments/MensaFragment.kt | 4 +- .../fragments/SettingsFragment.kt | 42 +++++++++++---- .../projectlaogai/hsoparser/DataTypes.kt | 43 +++++++++++++++ .../projectlaogai/hsoparser/MensaParser.kt | 17 ++++-- .../hsoparser/TimeTableParser.kt | 40 +------------- app/src/main/res/layout/activity_main.xml | 1 + app/src/main/res/layout/fragment_settings.xml | 52 ++++++++++++++++--- .../main/res/menu/activity_main_drawer.xml | 5 +- app/src/main/res/values-de-rDE/strings.xml | 7 ++- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/strings.xml | 13 ++--- 14 files changed, 188 insertions(+), 89 deletions(-) diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt index 7d32354..ca65d44 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt @@ -38,12 +38,14 @@ import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.app_bar_main.* import org.jetbrains.anko.doAsync import org.jetbrains.anko.uiThread -import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cColor +import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cColorAccent +import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cColorPrimary import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cCourse import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cCourseTTLinkList import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cTimeTableCurrentWeek import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cTimeTableNextWeek -import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cWeekMenus +import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cMenusCurrentWeek +import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cMenusNextWeek import org.mosad.seil0.projectlaogai.fragments.* import org.mosad.seil0.projectlaogai.hsoparser.MensaParser import org.mosad.seil0.projectlaogai.hsoparser.TimeTableParser @@ -70,12 +72,14 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte Aesthetic.config { colorPrimary(Color.BLACK) colorPrimaryDark(Color.BLACK) + colorAccent(Color.parseColor("#FF1744")) apply() } } else { Aesthetic.config { - colorPrimary(cColor) - colorPrimaryDark(cColor) + colorPrimary(cColorPrimary) + colorPrimaryDark(cColorPrimary) + colorAccent(cColorAccent) apply() } } @@ -160,6 +164,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte * load the mensa menus of the current week */ private fun load() { + val menuLinkCurrentWeek = "https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/" // load the settings PreferencesController.load(this) // this must be finished before doing anything else @@ -176,8 +181,12 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte cCourseTTLinkList = timeTableParser.getCourseTTLinks() } - val jobMenus = doAsync { - cWeekMenus = mensaParser.getMensaMenu() + val jobMenusCurrentWeek = doAsync { + cMenusCurrentWeek = mensaParser.getMensaMenu(menuLinkCurrentWeek) + } + + val jobMenusNextWeek = doAsync { + cMenusNextWeek = mensaParser.getMensaMenu(mensaParser.getMenuLinkNextWeek(menuLinkCurrentWeek)) } val jobTTCurrentWeek = doAsync { @@ -205,7 +214,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte } } - jobMenus.get() + jobMenusCurrentWeek.get() + jobMenusNextWeek.get() jobTTCurrentWeek.get() jobTTNextWeek.get() } diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/PreferencesController.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/PreferencesController.kt index 70b2b80..20307ed 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/PreferencesController.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/PreferencesController.kt @@ -37,15 +37,17 @@ class PreferencesController { companion object { var cCourseTTLinkList = ArrayList() - var cWeekMenus = ArrayList() + var cMenusCurrentWeek = ArrayList() + var cMenusNextWeek = ArrayList() var cTimeTableCurrentWeek = TimeTable() var cTimeTableNextWeek = TimeTable() - var cColor: Int = Color.BLACK + var cColorPrimary: Int = Color.BLACK + var cColorAccent: Int = Color.BLACK var cCourse = Course("https://www.hs-offenburg.de/index.php?id=6627&class=class&iddV=DA64F6FE-9DDB-429E-A677-05D0D40CB636&week=0", "AI3") // the save function fun save(context: Context) { - println(cCourse.courseLink) + //println(cCourse.courseLink) // save the course val sharedPref = context.defaultSharedPreferences with (sharedPref.edit()) { @@ -56,7 +58,13 @@ class PreferencesController { // save the primary color with (sharedPref.edit()) { - putInt(context.getString(R.string.save_key_colorPrimary), cColor) + putInt(context.getString(R.string.save_key_colorPrimary), cColorPrimary) + apply() + } + + // save the accent color + with (sharedPref.edit()) { + putInt(context.getString(R.string.save_key_colorAccent), cColorAccent) apply() } @@ -71,8 +79,9 @@ class PreferencesController { sharedPref.getString(context.getString(R.string.save_key_course), "AI3")!! ) - // load saved color - cColor = sharedPref.getInt(context.getString(R.string.save_key_colorPrimary), Color.BLACK) + // load saved colors + cColorPrimary = sharedPref.getInt(context.getString(R.string.save_key_colorPrimary), Color.BLACK) + cColorAccent = sharedPref.getInt(context.getString(R.string.save_key_colorAccent), Color.parseColor("#FF1744")) } } 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 71c9707..df912f5 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 @@ -33,7 +33,7 @@ import kotlinx.android.synthetic.main.fragment_home.* import org.jetbrains.anko.doAsync import org.jetbrains.anko.uiThread import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cTimeTableCurrentWeek -import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cWeekMenus +import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cMenusCurrentWeek import org.mosad.seil0.projectlaogai.R import org.mosad.seil0.projectlaogai.hsoparser.* import org.mosad.seil0.projectlaogai.uicomponents.LessonCardView @@ -72,9 +72,9 @@ class HomeFragment : Fragment() { val cal = Calendar.getInstance() if (cal.get(Calendar.HOUR_OF_DAY) < 15) { - dayMenus = MensaParser().getMensaMenuDay(cWeekMenus, cal.get(Calendar.DAY_OF_WEEK)) + dayMenus = MensaParser().getMensaMenuDay(cMenusCurrentWeek, cal.get(Calendar.DAY_OF_WEEK)) } else { - dayMenus = MensaParser().getMensaMenuDay(cWeekMenus, cal.get(Calendar.DAY_OF_WEEK) + 1) + dayMenus = MensaParser().getMensaMenuDay(cMenusCurrentWeek, cal.get(Calendar.DAY_OF_WEEK) + 1) uiThread { txtView_Menu1Heading.text = resources.getString(R.string.meal_1_tomorrow) txtView_Menu2Heading.text = resources.getString(R.string.meal_2_tomorrow) 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 17e8796..8bfc2d2 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 @@ -30,7 +30,7 @@ import android.view.ViewGroup import android.widget.LinearLayout import org.jetbrains.anko.doAsync import org.jetbrains.anko.uiThread -import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cWeekMenus +import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cMenusCurrentWeek import org.mosad.seil0.projectlaogai.R import org.mosad.seil0.projectlaogai.uicomponents.MensaDayCardView import org.mosad.seil0.projectlaogai.uicomponents.MenuCardView @@ -76,7 +76,7 @@ class MensaFragment : Fragment() { val cardViewMensaDay = MensaDayCardView(context!!, null) var add = false - for (meal in cWeekMenus) { + for (meal in cMenusCurrentWeek) { //println("Day: " + meal.day) if (meal.day.contains(strDay)) { 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 2195679..3802072 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 @@ -38,12 +38,14 @@ import kotlinx.android.synthetic.main.fragment_settings.* import org.jetbrains.anko.doAsync import org.jetbrains.anko.uiThread import org.mosad.seil0.projectlaogai.PreferencesController -import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cColor +import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cColorPrimary +import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cColorAccent import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cCourse import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cCourseTTLinkList import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cTimeTableCurrentWeek import org.mosad.seil0.projectlaogai.PreferencesController.Companion.cTimeTableNextWeek import org.mosad.seil0.projectlaogai.R +import org.mosad.seil0.projectlaogai.hsoparser.DataTypes import org.mosad.seil0.projectlaogai.hsoparser.TimeTableParser import java.util.* @@ -56,8 +58,8 @@ class SettingsFragment : Fragment() { private lateinit var linLayoutUser: LinearLayout private lateinit var linLayoutCourse: LinearLayout private lateinit var linLayoutInfo: LinearLayout - private lateinit var linLayoutMainColor: LinearLayout - private lateinit var viewPrimaryColor: View + private lateinit var linLayoutPrimaryColor: LinearLayout + private lateinit var linLayoutAccentColor: LinearLayout override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { @@ -66,8 +68,8 @@ class SettingsFragment : Fragment() { linLayoutUser = view.findViewById(R.id.linLayout_User) linLayoutCourse = view.findViewById(R.id.linLayout_Course) linLayoutInfo = view.findViewById(R.id.linLayout_Info) - linLayoutMainColor = view.findViewById(R.id.linLayout_MainColor) - viewPrimaryColor = view.findViewById(R.id.view_PrimaryColor) + linLayoutPrimaryColor = view.findViewById(R.id.linLayout_PrimaryColor) + linLayoutAccentColor = view.findViewById(R.id.linLayout_AccentColor) initActions() @@ -130,26 +132,44 @@ class SettingsFragment : Fragment() { .show() } - linLayoutMainColor.setOnClickListener { + linLayoutPrimaryColor.setOnClickListener { // open a new color chooser dialog - val colors = intArrayOf(Color.BLACK, Color.DKGRAY, Color.RED, Color.GREEN, Color.YELLOW) - MaterialDialog(context!!) .title(R.string.primary_color) - .colorChooser(colors, allowCustomArgb = true, initialSelection = cColor) { _, color -> - viewPrimaryColor.setBackgroundColor(color) + .colorChooser(DataTypes().primaryColors, allowCustomArgb = true, initialSelection = cColorPrimary) { _, color -> + view_PrimaryColor.setBackgroundColor(color) Aesthetic.config { colorPrimary(color) colorPrimaryDark(color) apply() } - cColor = color + cColorPrimary = color PreferencesController.save(context!!) } .positiveButton(R.string.select) .show() } + + linLayoutAccentColor.setOnClickListener { + // open a new color chooser dialog + MaterialDialog(context!!) + .title(R.string.accent_color) + .colorChooser(DataTypes().accentColors, allowCustomArgb = true, initialSelection = cColorAccent) { _, color -> + //viewAccentColor.setBackgroundColor(color) + view_AccentColor.setBackgroundColor(color) + Aesthetic.config { + colorAccent(color) + apply() + } + + cColorAccent = color + PreferencesController.save(context!!) + } + .positiveButton(R.string.select) + .show() + } + } } diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt index 50f72b4..7866319 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt @@ -22,11 +22,54 @@ package org.mosad.seil0.projectlaogai.hsoparser +import android.graphics.Color import java.util.* class DataTypes { val times = arrayOf("8.00 - 9.30", "9.45 - 11.15" ,"11.35 - 13.05", "14.00 -15.30", "15.45 - 17.15", "17.30 - 19.00") + val primaryColors = intArrayOf( + Color.parseColor("#E53935"), + Color.parseColor("#E91E63"), + Color.parseColor("#9C27B0"), + Color.parseColor("#673AB7"), + Color.parseColor("#3F51B5"), + Color.parseColor("#2196F3"), + Color.parseColor("#03A9F4"), + Color.parseColor("#00BCD4"), + Color.parseColor("#009688"), + Color.parseColor("#4CAF50"), + Color.parseColor("#8BC34A"), + Color.parseColor("#CDDC39"), + Color.parseColor("#FDD835"), + Color.parseColor("#FFB300"), + Color.parseColor("#FB8C00"), + Color.parseColor("#FF5722"), + Color.parseColor("#795548"), + Color.parseColor("#9E9E9E"), + Color.parseColor("#607B8B"), + Color.parseColor("#000000") + ) + + val accentColors = intArrayOf( + Color.parseColor("#FF1744"), + Color.parseColor("#F50057"), + Color.parseColor("#D500F9"), + Color.parseColor("#3F51B5"), + Color.parseColor("#3D5AFE"), + Color.parseColor("#2979FF"), + Color.parseColor("#00B0FF"), + Color.parseColor("#00E5FF"), + Color.parseColor("#1DE9B6"), + Color.parseColor("#00E676"), + Color.parseColor("#C6FF00"), + Color.parseColor("#FFD600"), + Color.parseColor("#FFC400"), + Color.parseColor("#FF9100"), + Color.parseColor("#FF3D00"), + Color.parseColor("#000000") + ) + init { // do something } diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/MensaParser.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/MensaParser.kt index ab9f78c..9145229 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/MensaParser.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/MensaParser.kt @@ -28,11 +28,11 @@ import java.util.* class MensaParser { /** - * returns the mensa menu for the whole week + * returns the mensa menu for the a week */ - fun getMensaMenu(): ArrayList { + fun getMensaMenu(menuLink: String): ArrayList { val mealList = ArrayList() - val menuHTML = Jsoup.connect("https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/").get() + val menuHTML = Jsoup.connect(menuLink).get() menuHTML.select("#speiseplan-tabs").select("div.tab-content").select("div.menu-tagesplan").forEachIndexed { _, element -> val day = element.select("h3").text() @@ -44,7 +44,7 @@ class MensaParser { mealList.add(Meal(day, heading, parts, additives)) } catch (e: Exception) { - // catch + //println("Oooups! Something went wrong: ${e.printStackTrace()}") } } } @@ -52,6 +52,15 @@ class MensaParser { return mealList } + /** + * return the link of the menus of the next week + */ + fun getMenuLinkNextWeek(menuLink: String): String { + val menuHTML = Jsoup.connect(menuLink).get() + + return "https://www.swfr.de" + menuHTML.select("#speiseplan-tabs").select("a.next-week").attr("href") + } + /** * return the mensa menu of a given day (Mon - Sat) */ diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/TimeTableParser.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/TimeTableParser.kt index 0dbc43c..715ef34 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/TimeTableParser.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/TimeTableParser.kt @@ -37,15 +37,6 @@ class TimeTableParser { var timeTableWeek = TimeTable() // this must be a var! val scheduleHTML = Jsoup.connect(courseTTURL).get() - // create the timetable array -/* for (i in 0..5) { - var timeTableDay = arrayOf() - for (j in 0..5) { - timeTableDay += Lesson("", "","","") - } - timeTableWeek += timeTableDay - }*/ - //val week = scheduleHTML.select("h1.timetable-caption").text() //println("$week successful!\n") @@ -58,11 +49,8 @@ class TimeTableParser { for ((rowIndex, row) in rows.withIndex()) { var day = 0 + // elements are now all lessons, including empty ones row.select("td.lastcol, td[style]").forEach { element -> - // elements are now all lessons, including empty ones - - //println("-------------> Element (Day.Timeslot: " + day + "." + rowIndex + "): " + element) - //println("Day.Timeslot: " + day + "." + rowIndex + " lesson: " + element.select("div.lesson-subject").text() + ", " + element.select("div.lesson-teacher").text()) // if there is a lecture with rowspan="2", we need to shift everything by one to the left. This is stupid and ugly there needs to bee an API if ((sDay > -1 && sRow > -1) && (sDay == day && ((sRow + 1) == rowIndex))) { @@ -96,11 +84,6 @@ class TimeTableParser { printTimeTableWeek(timeTableWeek) - /*scheduleHTML.select("table.timetable").select("td.lastcol").forEachIndexed { index, element -> - //println("Index: " + index + " lesson: " + element.select("div.lesson-subject").text() + ", " + element.select("div.lesson-teacher").text()) - timeTableWeek[index % 6][index / 6] = Lesson(element.select("div.lesson-subject").text(), element.select("div.lesson-teacher").text(), element.select("div.lesson-room").text(), element.select("div.lesson-remark").text()) - }*/ - return timeTableWeek } @@ -116,27 +99,6 @@ class TimeTableParser { return courseTTLinkList } - @Suppress("unused") - fun printTimeTableWeekOLD (timeTableWeek: Array>) { - - for (j in 0..5) print(days[j].padEnd(25 ,' ') + " | ") - println() - for (j in 0..5) print("-".padEnd(26 + (j.toFloat().div(j).toInt()), '-') + "+") - println() - - for (i in 0..5) { - for (j in 0..5) print(timeTableWeek[j][i].lessonSubject.padEnd(25 ,' ').substring(0,25) + " | ") - println() - for (j in 0..5) print(timeTableWeek[j][i].lessonTeacher.padEnd(25 ,' ').substring(0,25) + " | ") - println() - for (j in 0..5) print(timeTableWeek[j][i].lessonRoom.padEnd(25 ,' ').substring(0,25) + " | ") - println() - for (j in 0..5) print("-".padEnd(26 + (j.toFloat().div(j).toInt()), '-') + "+") - println() - } - println(" \n") - } - @Suppress("unused") fun printTimeTableWeek(timetable: TimeTable) { for (j in 0..5) print(days[j].padEnd(75 ,' ') + " | ") diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ac9a123..7912343 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -21,6 +21,7 @@ android:layout_gravity="start" android:fitsSystemWindows="true" app:headerLayout="@layout/nav_header_main" + app:itemTextColor="?colorAccent" app:menu="@menu/activity_main_drawer"/> diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 28e1d21..67ee170 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:id="@+id/txtView_Info" android:typeface="sans" android:textSize="18sp" android:textStyle="bold" android:fontFamily="sans-serif" - android:layout_margin="7dp" android:textColor="@color/colorPrimary"/> + android:layout_margin="7dp" android:textColor="?colorAccent"/> + android:layout_height="wrap_content" android:id="@+id/linLayout_Settings" android:padding="7dp"> + android:textSize="18sp" android:textColor="?colorAccent" + android:textStyle="bold" android:paddingTop="3dp"/> + android:clickable="true" android:id="@+id/linLayout_PrimaryColor" android:focusable="true"> @@ -140,6 +140,44 @@ android:background="?colorPrimary"/> + + + + + + + + + + diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index ed094a0..f0fdacc 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -4,7 +4,10 @@ tools:showIn="navigation_view"> - + Info Benutzer Tippen, um den Kurs zu ändern - Primärfarbe - Die Primärfarbe, standard ist Schwarz + Hauptfarbe + Die Primärfarbe, Standard ist Schwarz. + Akzentfarbe + Die Akzentfarbe, Standard ist indigo auswählen über lade Stundenplan … Navigationsleiste schließen Navigationsleiste öffnen + Buffet immer anzeigen diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 01b62ab..7631f85 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,7 +2,7 @@ #000000 #000000 - #d81b60 + #3F51B5 #ebe8e9 #FFFFFF diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ab7bce3..dc87e8b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -35,21 +35,22 @@ User Tap to change course primary color - The primary color, default is black + The primary color, default is black. + accent color + The accent color, default is indigo. + always show buffet select version 0.3.3 about hso App by @Seil0 - "This software is made by @Seil0 and is published under the terms and - conditions of GPL 3. For further information visit \ngit.mosad.xyz/Seil0/ProjectLaogai \n\n© 2018-2019 - seil0@mosad.xyz " - + "This software is made by @Seil0 and is published under the terms and conditions of GPL 3. For further information visit \ngit.mosad.xyz/Seil0/ProjectLaogai \n\n© 2018-2019 seil0@mosad.xyz " loading timetable … - %1$s\n org.mosad.seil0.projectlaogai.course org.mosad.seil0.projectlaogai.courseTTLink org.mosad.seil0.projectlaogai.colorPrimary + org.mosad.seil0.projectlaogai.colorAccent +