diff --git a/app/build.gradle b/app/build.gradle index fa9bb52..f1d68de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "org.mosad.seil0.projectlaogai" minSdkVersion 21 targetSdkVersion 28 - versionCode 3 - versionName "0.1.2" + versionCode 4 + versionName "0.1.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { 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 52aefed..3220681 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt @@ -32,7 +32,6 @@ import android.view.MenuItem import androidx.fragment.app.FragmentTransaction import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.app_bar_main.* -import org.jetbrains.anko.custom.async import org.jetbrains.anko.doAsync import org.mosad.seil0.projectlaogai.fragments.HomeFragment import org.mosad.seil0.projectlaogai.fragments.MensaFragment @@ -151,7 +150,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte println(course.course) println(course.courseTTLink) - // the app is hanging here + // the app is hanging here TODO show loading dialog doAsync { timeTableWeek = timeTableParser.getTimeTable(course.courseTTLink.replace("http", "https")) }.get() @@ -159,8 +158,6 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte /** * load the mensa menus of the current week - * TODO show loading screen while loading - * TODO make mensa and timetable query parallel (use coroutines) * TODO evaluate if we should use a timeout here */ private fun load() { 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 c1b7d3b..ee57480 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 @@ -92,7 +92,7 @@ class HomeFragment : Fragment() { for (i in 0..5) { val lessonCardView = LessonCardView(context!!, null) - lessonCardView.getTxtViewLesson().text = timeTableDay[i].lessonSubject + "\n" + lessonCardView.getTxtViewLesson().text = resources.getString(R.string.string_new_line, timeTableDay[i].lessonSubject) lessonCardView.getTxtViewLesson().append(timeTableDay[i].lessonTeacher + "\n") lessonCardView.getTxtViewLesson().append(timeTableDay[i].lessonRoom) lessonCardView.getTxtViewTime().text = DataTypes().getTime()[i] @@ -105,7 +105,7 @@ class HomeFragment : Fragment() { 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" + noLessonCardView.getTxtViewLesson().text = resources.getString(R.string.no_lesson_today) linLayoutTimeTable.addView(noLessonCardView) } } 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 62604a8..50f575e 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 @@ -68,7 +68,7 @@ class MensaParser { Calendar.THURSDAY -> "Don" Calendar.FRIDAY -> "Fre" Calendar.SATURDAY -> "Sam" - else -> "TODAY" //TODO + else -> "TODAY" } for (meal in mealList) { diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index d579f6f..8b7a207 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml new file mode 100644 index 0000000..48d7448 --- /dev/null +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -0,0 +1,24 @@ + + + Home + Mensa + Stundenplan + Moodle + E-Mail + Einstellungen + Essen 1 + Essen 2 + heute keine Essensausgabe + Diese Woche keine weitere Essensausgabe + heute keine Vorlesung + Info + Benutzer + Tippen, um den Kurs zu ändern + Primärfarbe + Die Primärfarbe, standard ist Indigo + auswählen + über + bald ™ + Navigationsleiste schließen + Navigationsleiste öffnen + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 511a19b..a5927f6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,44 +1,45 @@ - Project Laogai + Project Laogai Open navigation drawer Close navigation drawer - hso App 0.1.2 - seil0@mosad.xyz - Navigation header + hso App 0.1.3 + seil0@mosad.xyz + Project Laogai Home Mensa Timetable - moodle + Moodle E-Mail Settings - Settings - Essen 1 - Essen 2 - heute keine Essensausgabe - Diese Woche keine weitere Essensausgabe + Meal 1 + Meal 2 + Mensa closed today + No more Food this week - heute keine Vorlesung + "no lecture today " - a lesson\na teacher\na room - 0.00 – 23.59 + SampleUser@stud.hs-offenburg.de + SampleCourse 3 + Montag, 30.02 + a lesson\na teacher\na room + 0.00 – 23.59 Info User - SampleUser@stud.hs-offenburg.de - SampleCourse 3 - Montag, 30.02 Tap to change course primary color The primary color, default is indigo select - version 0.1.2 + version 0.1.3 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 + 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 git.mosad.xyz/Seil0/ProjectLaogai © 2018 seil0@mosad.xyz " - hso App by @Seil0 - Hello blank fragment + soon ™ + %1$s\n +