Seil0/ProjectLaogai
1
0
Fork 0
Code Issues 4 Pull Requests Releases 13 Wiki Activity

init fragment in onViewCreated()
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
* closes #42
* show a info text if no mensa menus where found
* the refresh spinner respects the selecte theme now
This commit is contained in:
Jannik
2020-08-17 22:30:12 +02:00
parent 953b4825a9
commit 99ba87c3f6
16 changed files with 183 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/res/layouts/fragments/layout/fragment_mensa.xml
View File

@ -1,26 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".fragments.MensaFragment"
android:background="?themePrimary">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/refreshLayout_Mensa">
android:id="@+id/refreshLayout_Mensa"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/scrollView_Mensa">
android:id="@+id/scrollView_Mensa"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="false"
android:id="@+id/linLayout_Mensa"/>
android:id="@+id/linLayout_Mensa"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="false"
android:orientation="vertical" />
</ScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

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

@ -33,11 +33,15 @@
<string name="no_more_food">Diese Woche keine weitere Essensausgabe</string>
<string name="no_lesson_today">heute keine Vorlesung!</string>
<!-- fragment_mensa -->
<string name="no_more_meals">Für diese und nächste Woche ist der Speiseplan leer.</string>
<!-- fragment_timetable -->
<string name="add_lesson">Eine Vorlesung hinzufügen</string>
<string name="add_lesson_desc">Füge eine Vorlesung eines anderen Studiengangs zu deinem Stundenplan hinzu.</string>
<string name="courses">Studiengänge:</string>
<string name="lessons">Vorlesungen:</string>
<string name="timetable_generic_error">Beim laden des Stundenplans ist ein Fehler aufgetreten.\n</string>
<!-- fragment_grades -->
<string name="loading_from_hs">Lade Daten von den Hochschul Servern.\nDas kann eine Weile dauern.</string>
@ -78,7 +82,7 @@
<!-- errors -->
<string name="error">Fehler</string>
<string name="timetable_error">Stundenplan konnte nicht geladen werden!</string>
<string name="timetable_error">Der Stundenplan konnte nicht geladen werden.</string>
<!-- shortcuts -->
<string name="shortcut_mensa_short">Mensa</string>

6
app/src/main/res/values/strings.xml
View File

@ -35,11 +35,15 @@
<string name="no_more_food">No more Food this week</string>
<string name="no_lesson_today">"No lecture today!"</string>
<!-- fragment_mensa -->
<string name="no_more_meals">The menu is empty for this and the next week.</string>
<!-- fragment_timetable -->
<string name="add_lesson">Add a lesson</string>
<string name="add_lesson_desc">Add a lesson from another course to your timetable.</string>
<string name="courses">Courses:</string>
<string name="lessons">Lessons:</string>
<string name="timetable_generic_error">An error occurred while loading the timetable.\n</string>
<!-- fragment_grades -->
<string name="loading_from_hs">Loading data from the university servers.\nThis may take a while.</string>
@ -93,7 +97,7 @@
<!-- errors -->
<string name="error">Error</string>
<string name="timetable_error">Could not load timetable!"</string>
<string name="timetable_error">Could not load the timetable!"</string>
<!-- shortcuts -->
<string name="shortcut_mensa_short">Mensa</string>