the home screen will now always show the first 2 meals

* things like a "Schneller Teller" are not shown in the home screen anymore
* updated ti kotlin 1.3.10

README.md

@@ -1 +1,12 @@
-projectlaogai
+# ProjectLaogai "hso App"
+Some info about the app ...
+
+## Features
+* look up what you can eat in the mensa
+* check your timetable
+* probably many many bugs
+
+## Screenshots
+
+
+ProjectLaogai © 2018 mosad www.mosad.xyz, Project by [@Seil0](https://git.mosad.xyz/Seil0)

app/build.gradle

@@ -5,13 +5,15 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
+    signingConfigs {
+    }
     compileSdkVersion 28
     defaultConfig {
         applicationId "org.mosad.seil0.projectlaogai"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 5
-        versionName "0.2.0"
+        versionCode 7
+        versionName "0.2.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -27,15 +29,14 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.1'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
     implementation 'org.jsoup:jsoup:1.11.3'
     implementation 'org.jetbrains.anko:anko-commons:0.10.7'
-    implementation 'com.afollestad.material-dialogs:core:2.0.0-beta4'
-    implementation 'com.afollestad.material-dialogs:color:2.0.0-beta4'
-
+    implementation 'com.afollestad.material-dialogs:core:2.0.0-beta5'
+    implementation 'com.afollestad.material-dialogs:color:2.0.0-beta5'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'

app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt

@@ -29,10 +29,12 @@ import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
 import androidx.fragment.app.FragmentTransaction
+import com.afollestad.materialdialogs.MaterialDialog
 import com.google.android.material.navigation.NavigationView
 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.fragments.HomeFragment
 import org.mosad.seil0.projectlaogai.fragments.MensaFragment
 import org.mosad.seil0.projectlaogai.fragments.SettingsFragment
@@ -48,7 +50,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
 
     private var weekMenus = ArrayList<Meal>()
     private var courseTTLinkList = ArrayList<CourseTTLink>()
-    private var timeTableWeek = arrayOf<Array<Lesson>>()
+    private var timeTableCurrentWeek = arrayOf<Array<Lesson>>()
+    private var timeTableNextWeek = arrayOf<Array<Lesson>>()
 
     private lateinit var course: CourseTTLink
 
@@ -161,7 +164,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
             apply()
         }
 
-        timeTableWeek = timeTableParser.getTimeTable(course.courseTTLink.replace("http", "https"))
+        timeTableCurrentWeek = timeTableParser.getTimeTable(course.courseTTLink.replace("http", "https"))
     }
 
     /**
@@ -190,14 +193,30 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                 courseTTLinkList = timeTableParser.getCourseTTLinks()
             }
 
+            doAsync {
+                try {
+                    timeTableNextWeek = timeTableParser.getTimeTable(course.courseTTLink.replace("week=0","week=1"))
+                } catch (e: Exception) {
+                    e.stackTrace
+                }
+            }
+
             val t1 = doAsync {
                 weekMenus = mensaParser.getMensaMenu()
             }
 
             val t2 = doAsync {
                 try {
-                    timeTableWeek = timeTableParser.getTimeTable(course.courseTTLink)
-                }catch (e: Exception) {
+                    timeTableCurrentWeek = timeTableParser.getTimeTable(course.courseTTLink)
+                } catch (e: Exception) {
+
+                    uiThread {
+                        MaterialDialog(this@MainActivity)
+                            .title(R.string.error)
+                            .message(R.string.no_tt_error)
+                            .show()
+                    }
+
                     e.stackTrace
                 }
             }
@@ -213,8 +232,12 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         return  courseTTLinkList
     }
 
-    fun getCurrentTimeTableWeek(): Array<Array<Lesson>> {
-        return timeTableWeek
+    fun getTimeTableCurrentWeek(): Array<Array<Lesson>> {
+        return timeTableCurrentWeek
+    }
+
+    fun getTimeTableNextWeek(): Array<Array<Lesson>> {
+        return timeTableNextWeek
     }
 
     fun getWeekMenu(): ArrayList<Meal>{

app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt

@@ -34,9 +34,7 @@ import org.jetbrains.anko.doAsync
 import org.jetbrains.anko.uiThread
 import org.mosad.seil0.projectlaogai.MainActivity
 import org.mosad.seil0.projectlaogai.R
-import org.mosad.seil0.projectlaogai.hsoparser.DataTypes
-import org.mosad.seil0.projectlaogai.hsoparser.Meal
-import org.mosad.seil0.projectlaogai.hsoparser.MensaParser
+import org.mosad.seil0.projectlaogai.hsoparser.*
 import org.mosad.seil0.projectlaogai.uicomponents.LessonCardView
 import java.util.*
 
@@ -66,22 +64,42 @@ class HomeFragment : Fragment() {
 
     /**
      * add the current mensa meal to the home screens
-     * TODO show meals of the next day if its later than 1500
      */
     private fun addCurrentMensaMenu() {
         doAsync {
-            val dayMenus: ArrayList<Meal> = MensaParser().getMensaMenuDay(mainActivity.getWeekMenu(), Calendar.getInstance().get(Calendar.DAY_OF_WEEK))
+            val dayMenus: ArrayList<Meal>
+            val cal = Calendar.getInstance()
+
+            // TODO needs testing
+            if (cal.get(Calendar.HOUR_OF_DAY) < 15) {
+                dayMenus = MensaParser().getMensaMenuDay(mainActivity.getWeekMenu(), cal.get(Calendar.DAY_OF_WEEK))
+            } else {
+                dayMenus = MensaParser().getMensaMenuDay(mainActivity.getWeekMenu(), cal.get(Calendar.DAY_OF_WEEK) + 1)
+                uiThread {
+                    // TODO Mensa closed today is showing
+                    txtView_Menu1Heading.text = resources.getString(R.string.meal_1_tomorrow)
+                    txtView_Menu2Heading.text = resources.getString(R.string.meal_2_tomorrow)
+                }
+            }
 
             uiThread {
 
                 if (dayMenus.size >= 2) {
-                    for (part in dayMenus[0].parts) {
-                        txtViewMenu1.append(part)
+                    // get the index of the first meal, not a "Schneller Teller"
+                    loop@ for ((i, meal) in dayMenus.withIndex()) {
+                        if(meal.heading.contains("Essen")) {
+                            for (part in dayMenus[i].parts) {
+                                txtViewMenu1.append(part)
+                            }
+
+                            for (part in dayMenus[i + 1].parts) {
+                                txtViewMenu2.append(part)
+                            }
+
+                            break@loop
+                        }
                     }
 
-                    for (part in dayMenus[1].parts) {
-                        txtViewMenu2.append(part)
-                    }
                 } else {
                     txtViewMenu1.text = resources.getString(R.string.no_meal_today)
                     txtViewMenu2.text = resources.getString(R.string.no_meal_today)
@@ -95,10 +113,11 @@ class HomeFragment : Fragment() {
      * add the current timetable to the home screen
      */
     private fun addCurrentTimeTable() {
+        val dayIndex = NotRetardedCalendar().getDayOfWeekIndex()
 
-        // TODO this needs to be reworked, currently we display the waring if there is no lecture at all not only if we're unable to load the tt
-        if (mainActivity.getCurrentTimeTableWeek().isNotEmpty()) {
-            val timeTableDay = mainActivity.getCurrentTimeTableWeek()[Calendar.getInstance().get(Calendar.DAY_OF_WEEK) -2]
+        if (mainActivity.getTimeTableCurrentWeek().isNotEmpty() && dayIndex < 6) {
+
+            val timeTableDay = mainActivity.getTimeTableCurrentWeek()[dayIndex]
 
             for (i in 0..5) {
                 val lessonCardView = LessonCardView(context!!, null)
@@ -120,10 +139,19 @@ class HomeFragment : Fragment() {
                 linLayoutTimeTable.addView(noLessonCardView)
             }
         } else {
-            MaterialDialog(context!!)
-                .title(R.string.error)
-                .message(R.string.nott_info)
-                .show()
+            if (dayIndex == 6) {
+                // if that's the case it's sunday
+                val noLessonCardView = LessonCardView(context!!, null)
+                noLessonCardView.getTxtViewLesson().text = resources.getString(R.string.no_lesson_today)
+                linLayoutTimeTable.addView(noLessonCardView)
+            } else {
+                MaterialDialog(context!!)
+                    .title(R.string.error)
+                    .message(R.string.gen_tt_error)
+                    .show()
+                // TODO log the error and send feedback
+            }
+
         }
     }
 

app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt

@@ -32,8 +32,6 @@ import org.jetbrains.anko.doAsync
 import org.jetbrains.anko.uiThread
 import org.mosad.seil0.projectlaogai.MainActivity
 import org.mosad.seil0.projectlaogai.R
-import org.mosad.seil0.projectlaogai.hsoparser.Meal
-import org.mosad.seil0.projectlaogai.hsoparser.MensaParser
 import org.mosad.seil0.projectlaogai.uicomponents.MensaDayCardView
 import org.mosad.seil0.projectlaogai.uicomponents.MenuCardView
 import java.util.*
@@ -73,7 +71,7 @@ class MensaFragment : Fragment() {
                         Calendar.THURSDAY -> "Don"
                         Calendar.FRIDAY -> "Fre"
                         Calendar.SATURDAY -> "Sam"
-                        else -> "TODAY" //TODO
+                        else -> "TODAY" // the app will likely crash here
                     }
 
                     val cardViewMensaDay = MensaDayCardView(context!!, null)
@@ -112,34 +110,6 @@ class MensaFragment : Fragment() {
         }
     }
 
-    fun addDay(day: Int) {
-        val cardViewMensaDay = MensaDayCardView(context!!, null)
-
-        doAsync {
-            val mensaParser = MensaParser()
-            val dayMenus: ArrayList<Meal> = mensaParser.getMensaMenuDay(mensaParser.getMensaMenu(), day)
-
-            uiThread {
-
-                for (meal in dayMenus) {
-                    val menuViewMenu = MenuCardView(context!!, null)
-                    menuViewMenu.setMenuHeading(meal.heading)
-
-                    for(part in meal.parts) {
-                        menuViewMenu.getTxtViewMenu().append(part)
-                    }
-
-                    cardViewMensaDay.setDayHeading(meal.day) //TODO move this out of the first for loop, performance!!
-                    cardViewMensaDay.getLinLayoutMensaDay().addView(menuViewMenu)
-                }
-
-                linLayoutMensaFragment.addView(cardViewMensaDay)
-            }
-
-        }
-
-    }
-
     fun setMainActivity(mainActivity: MainActivity) {
         this.mainActivity = mainActivity
     }

app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt

@@ -34,6 +34,7 @@ import org.jetbrains.anko.uiThread
 import org.mosad.seil0.projectlaogai.MainActivity
 import org.mosad.seil0.projectlaogai.R
 import org.mosad.seil0.projectlaogai.hsoparser.DataTypes
+import org.mosad.seil0.projectlaogai.hsoparser.NotRetardedCalendar
 import org.mosad.seil0.projectlaogai.uicomponents.LessonCardView
 import org.mosad.seil0.projectlaogai.uicomponents.MensaDayCardView
 import java.text.SimpleDateFormat
@@ -63,22 +64,21 @@ class TimeTableFragment : Fragment() {
      * add the remaining days of the current week to the timetable screen
      */
     private fun addCurrentWeek() {
+        val dayIndex = NotRetardedCalendar().getDayOfWeekIndex()
+        val formatter = SimpleDateFormat("E dd.MM", Locale.GERMANY) // TODO change to android call when min api is 24
+        val calendar = Calendar.getInstance()
+
         doAsync {
 
             uiThread {
 
-                for(day in Calendar.getInstance().get(Calendar.DAY_OF_WEEK)..7) {
-
-                    val formatter = SimpleDateFormat("E dd.MM", Locale.GERMANY) // TODO change to android call when min api is 24
-                    val calendar = Calendar.getInstance()
-                    calendar.firstDayOfWeek = Calendar.MONDAY
-                    calendar.add(Calendar.DATE,day - Calendar.getInstance().get(Calendar.DAY_OF_WEEK))
-
+                // add current weeks days
+                for(day in dayIndex..5) {
                     val cardViewTimeTableDay = MensaDayCardView(context!!, null)
                     cardViewTimeTableDay.setDayHeading(formatter.format(calendar.time))
 
                     // for each lessen of the day
-                    for((i, lesson) in mainActivity.getCurrentTimeTableWeek()[day - 2].withIndex()) {
+                    for((i, lesson) in mainActivity.getTimeTableCurrentWeek()[day].withIndex()) {
                         val lessonCardView = LessonCardView(context!!, null)
                         lessonCardView.setBackgroundColor(Color.TRANSPARENT)
 
@@ -91,11 +91,39 @@ class TimeTableFragment : Fragment() {
                             cardViewTimeTableDay.getLinLayoutMensaDay().addView(lessonCardView)
                     }
 
-                    // TODO if there is no lesson at one day , show a no lesson card
-
+                    calendar.add(Calendar.DATE,1)
                     linLayoutTTFragment.addView(cardViewTimeTableDay)
                 }
 
+                // add next weeks days, max number  = dayIndex, if timetable was loaded
+                if (mainActivity.getTimeTableNextWeek().isNotEmpty()) {
+                    calendar.add(Calendar.DATE,1) // before this we are at a sunday (no lecture on sundays!)
+
+                    for(day in 0..(dayIndex - 1)) {
+
+                        val cardViewTimeTableDay = MensaDayCardView(context!!, null)
+                        cardViewTimeTableDay.setDayHeading(formatter.format(calendar.time))
+
+                        // for each lessen of the day
+                        for((i, lesson) in mainActivity.getTimeTableNextWeek()[day].withIndex()) {
+                            val lessonCardView = LessonCardView(context!!, null)
+                            lessonCardView.setBackgroundColor(Color.TRANSPARENT)
+
+                            lessonCardView.getTxtViewLesson().text = resources.getString(R.string.string_new_line, lesson.lessonSubject)
+                            lessonCardView.getTxtViewLesson().append(lesson.lessonTeacher + "\n")
+                            lessonCardView.getTxtViewLesson().append(lesson.lessonRoom)
+                            lessonCardView.getTxtViewTime().text = DataTypes().getTime()[i]
+
+                            if(lessonCardView.getTxtViewLesson().text.length > 2)
+                                cardViewTimeTableDay.getLinLayoutMensaDay().addView(lessonCardView)
+                        }
+
+                        calendar.add(Calendar.DATE,1)
+                        linLayoutTTFragment.addView(cardViewTimeTableDay)
+                    }
+                }
+
+                // TODO if there is no lesson at one day , show a no lesson card
             }
 
         }

app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt

@@ -22,6 +22,8 @@
 
 package org.mosad.seil0.projectlaogai.hsoparser
 
+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")
 
@@ -35,6 +37,25 @@ class DataTypes {
 
 }
 
+class NotRetardedCalendar {
+    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
+        }
+    }
+
+
+}
+
 data class Lesson(val lessonSubject: String, val lessonTeacher: String, val lessonRoom:String, val lessonRemark: String)
 
 data class CourseTTLink(val courseTTLink: String, val course: String)

app/src/main/res/values-de-rDE/strings.xml

@@ -8,11 +8,14 @@
     <string name="settings">Einstellungen</string>
     <string name="meal_1">Essen 1</string>
     <string name="meal_2">Essen 2</string>
+    <string name="meal_1_tomorrow">Essen 1, Morgen</string>
+    <string name="meal_2_tomorrow">Essen 1, Morgen</string>
     <string name="no_meal_today">heute keine Essensausgabe</string>
     <string name="no_more_food">Diese Woche keine weitere Essensausgabe</string>
     <string name="no_lesson_today">heute keine Vorlesung</string>
     <string name="error">Fehler</string>
-    <string name="nott_info">Stundenplan konnte nicht geladen werden!</string>
+    <string name="no_tt_error">Stundenplan konnte nicht geladen werden!</string>
+    <string name="gen_tt_error">Allgemeiner Stundenplan Fehler!"</string>
     <string name="info">Info</string>
     <string name="user">Benutzer</string>
     <string name="course_desc">Tippen, um den Kurs zu ändern</string>

app/src/main/res/values/strings.xml

@@ -2,7 +2,7 @@
     <string name="app_name" translatable="false">Project Laogai</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
-    <string name="nav_header_title" translatable="false">hso App 0.2.0</string>
+    <string name="nav_header_title" translatable="false">hso App 0.2.2</string>
     <string name="nav_header_subtitle" translatable="false">seil0@mosad.xyz</string>
     <string name="nav_header_desc" translatable="false">Project Laogai</string>
 
@@ -15,12 +15,15 @@
 
     <string name="meal_1">Meal 1</string>
     <string name="meal_2">Meal 2</string>
+    <string name="meal_1_tomorrow">Meal 1, tomorrow</string>
+    <string name="meal_2_tomorrow">Meal 2, tomorrow</string>
     <string name="no_meal_today">Mensa closed today</string>
     <string name="no_more_food">No more Food this week</string>
 
     <string name="no_lesson_today">"no lecture today "</string>
     <string name="error">Error</string>
-    <string name="nott_info">Could not load timetabl!"</string>
+    <string name="no_tt_error">Could not load timetable!"</string>
+    <string name="gen_tt_error">There was an error with the timetable!"</string>
 
     <string name="sample_user" translatable="false">SampleUser@stud.hs-offenburg.de</string>
     <string name="sample_course" translatable="false">SampleCourse 3</string>
@@ -34,7 +37,7 @@
     <string name="primary_color">primary color</string>
     <string name="main_color_desc">The primary color, default is indigo</string>
     <string name="select">select</string>
-    <string name="version" translatable="false">version 0.2.0</string>
+    <string name="version" translatable="false">version 0.2.2</string>
     <string name="about">about</string>
     <string name="about_txtView" translatable="false">hso App by @Seil0</string>
     <string name="about_text" translatable="false">"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 seil0@mosad.xyz "</string>
@@ -44,6 +47,6 @@
     <string name="hello_blank_fragment">soon ™</string>
     <string name="string_new_line" translatable="false">%1$s\n</string>
 
-    <string name="save_key_course" translatable="false">org.mosag.seil0.projectlaogai.couse</string>
-    <string name="save_key_courseTTLink" translatable="false">org.mosag.seil0.projectlaogai.couseTTLink</string>
+    <string name="save_key_course" translatable="false">org.mosad.seil0.projectlaogai.course</string>
+    <string name="save_key_courseTTLink" translatable="false">org.mosad.seil0.projectlaogai.courseTTLink</string>
 </resources>

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.0'
+    ext.kotlin_version = '1.3.10'
     repositories {
         google()
         jcenter()