diff --git a/app/build.gradle b/app/build.gradle index bc0dd29..0dd0a94 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.mosad.seil0.projectlaogai" minSdkVersion 21 targetSdkVersion 28 - versionCode 2 - versionName "0.1.1" + versionCode 3 + versionName "0.1.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -24,13 +24,13 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.0.0' 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 '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' 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 f00c7b5..e8d9e76 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt @@ -156,4 +156,5 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte timeTableWeek = timeTableParser.getTimeTable("https://www.hs-offenburg.de/index.php?id=6627&class=class&iddV=DA64F6FE-9DDB-429E-A677-05D0D40CB636&week=0") }.get() } + } 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 a5d13a5..f3ec0a0 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 @@ -71,12 +71,18 @@ class HomeFragment : Fragment() { val dayMenus: ArrayList = MensaParser().getMensaMenuDay(currentMenus, Calendar.getInstance().get(Calendar.DAY_OF_WEEK)) uiThread { - for(part in dayMenus[0].parts) { - txtViewMenu1.append(part) - } - for(part in dayMenus[1].parts) { - txtViewMenu2.append(part) + if (dayMenus.size >= 2) { + for(part in dayMenus[0].parts) { + txtViewMenu1.append(part) + } + + 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) } } } @@ -97,6 +103,14 @@ class HomeFragment : Fragment() { if(lessonCardView.getTxtViewLesson().text.length > 2) linLayoutTimeTable.addView(lessonCardView) } + + // add a card if there is no lesson today + if (linLayoutTimeTable.childCount == 0) { + // TODO we could display the next day with a lecture + val noLessonCardView = LessonCardView(context!!, null) + noLessonCardView.getTxtViewLesson().text = resources.getString(R.string.no_lesson_today) + "\n" + linLayoutTimeTable.addView(noLessonCardView) + } } fun setCurrentMenu(weekMenus: ArrayList){ 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 ce31669..6212613 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 @@ -99,6 +99,13 @@ class MensaFragment : Fragment() { if(add) linLayoutMensaFragment.addView(cardViewMensaDay) } + + // add a card if there are no more meals in this week + if(linLayoutMensaFragment.childCount == 0) { + val cardViewNoMoreFood = MensaDayCardView(context!!, null) + cardViewNoMoreFood.setDayHeading(resources.getString(R.string.no_more_food)) + linLayoutMensaFragment.addView(cardViewNoMoreFood) + } } } 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 847a159..62604a8 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 @@ -72,9 +72,8 @@ class MensaParser { } for (meal in mealList) { - if (meal.day.contains(strDay)) { + if (meal.day.contains(strDay)) dayMenus.add(meal) - } } return dayMenus } diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 86d40dd..4206f37 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> Project Laogai Open navigation drawer Close navigation drawer - hso App 0.1.1 + hso App 0.1.2 seil0@mosad.xyz Navigation header @@ -14,8 +14,12 @@ Settings Settings - Essen 1 - Essen 2 + Essen 1 + Essen 2 + heute keine Essensausgabe + Diese Woche keine weitere Essensausgabe + + heute keine Vorlesung a lesson\na teacher\na room 0.00 – 23.59 @@ -29,7 +33,7 @@ primary color The primary color, default is indigo select - version 0.1.1 + version 0.1.2 about This software is made by @Seil0 and is published under the terms and conditions of GPL 3. For further information visit git.mosad.xyz/Seil0/ProjectLaogai\n\n© 2018 seil0@mosad.xyz