diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt
index c06d7a0..910a500 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt
@@ -26,10 +26,16 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.AdapterView.OnItemSelectedListener
import android.widget.ScrollView
+import android.widget.Spinner
import androidx.fragment.app.Fragment
import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.bottomsheets.setPeekHeight
+import com.afollestad.materialdialogs.customview.customView
+import com.afollestad.materialdialogs.customview.getCustomView
import com.google.android.material.floatingactionbutton.FloatingActionButton
import kotlinx.android.synthetic.main.fragment_timetable.*
import kotlinx.coroutines.*
@@ -82,10 +88,7 @@ class TimeTableFragment : Fragment() {
}
faBtnAddLesson.setOnClickListener {
- MaterialDialog(context!!, BottomSheet())
- .title(text = resources.getString(R.string.add_lesson))
- .message(text = "wähle einen Studiengang aus:\n\nWähle eine Vorlesung aus: \n\nDiese Funktion ist noch nicht verfügbar")
- .show()
+ initAddLessonDialog().show()
}
// hide the btnCardValue if the user is scrolling down
@@ -160,4 +163,43 @@ class TimeTableFragment : Fragment() {
}
}
+ // TODO move to separate class
+ private fun initAddLessonDialog(): MaterialDialog {
+ val dialog = MaterialDialog(context!!, BottomSheet())
+ .title(R.string.add_lesson)
+ .message(R.string.add_lesson_desc)
+ .customView(R.layout.dialog_add_lesson)
+ .setPeekHeight(900)
+ .positiveButton(R.string.add) {
+ println("add course")
+ }
+ .negativeButton(R.string.cancel) { }
+
+ val spinnerCourses: Spinner = dialog.getCustomView().findViewById(R.id.spinner_Courses)
+ val spinnerLessons: Spinner = dialog.getCustomView().findViewById(R.id.spinner_Lessons)
+
+ spinnerCourses.onItemSelectedListener = object : OnItemSelectedListener {
+ override fun onItemSelected(parent: AdapterView<*>, view: View, pos: Int, id: Long) {
+ println(parent.getItemAtPosition(pos))
+ }
+
+ override fun onNothingSelected(parent: AdapterView<*>) {
+ // Another interface callback
+ }
+ }
+
+ spinnerLessons.onItemSelectedListener = object : OnItemSelectedListener {
+ override fun onItemSelected(parent: AdapterView<*>, view: View, pos: Int, id: Long) {
+ println(parent.getItemAtPosition(pos))
+ }
+
+ override fun onNothingSelected(parent: AdapterView<*>) {
+ // Another interface callback
+ }
+
+ }
+
+ return dialog
+ }
+
}
diff --git a/app/src/main/res/layouts/dialogs/layout/dialog_add_lesson.xml b/app/src/main/res/layouts/dialogs/layout/dialog_add_lesson.xml
index ae3a6e5..b058e18 100644
--- a/app/src/main/res/layouts/dialogs/layout/dialog_add_lesson.xml
+++ b/app/src/main/res/layouts/dialogs/layout/dialog_add_lesson.xml
@@ -3,6 +3,40 @@
android:id="@+id/linLayout_addlesson"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:paddingStart="24dp"
+ android:paddingEnd="24dp">
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 4766dfe..f865486 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -34,6 +34,9 @@
Eine Vorlesung hinzufügen
+ Füge eine Vorlesung eines anderen Studiengangs zu deinem Stundenplan hinzu.
+ Studiengänge:
+ Vorlesungen:
Info
@@ -54,6 +57,8 @@
Wähle deinen Studiengang
lade Stundenplan …
+ hinzufügen
+ abbrechen
auswählen
schließen
Mensa-Guthaben
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0a293d9..056a5d0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -36,6 +36,9 @@
Add a lesson
+ Add a lesson from another course to your timetable.
+ Courses:
+ Lessons:
Info
@@ -59,13 +62,14 @@
Select your course
loading timetable …
+ add
+ @android:string/cancel
select
close
Mensa credit
current: %1$s\n
last: %1$s
-
spinefield@stud.hs-offenburg.de
SampleCourse 3
@@ -100,4 +104,21 @@
org.mosad.seil0.projectlaogai.mensaCacheTime
org.mosad.seil0.projectlaogai.timetableCacheTime
+
+
+ - AI-1
+ - AI-2
+ - AI-3
+ - AI-4
+ - AI-5
+ - AI-6
+
+
+
+ - Mathematik
+ - Verteilte Systemr
+ - EA 1
+ - IT Security
+
+