diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d89c85c..90b3833 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,16 +10,23 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
+
+
+
+
+
+
+
+
+
-
-
-
-
-
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 200a195..f00c7b5 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt
@@ -33,6 +33,10 @@ import androidx.fragment.app.FragmentTransaction
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.app_bar_main.*
import org.jetbrains.anko.doAsync
+import org.mosad.seil0.projectlaogai.fragments.HomeFragment
+import org.mosad.seil0.projectlaogai.fragments.MensaFragment
+import org.mosad.seil0.projectlaogai.fragments.SettingsFragment
+import org.mosad.seil0.projectlaogai.fragments.TimeTableFragment
import org.mosad.seil0.projectlaogai.hsoparser.Lesson
import org.mosad.seil0.projectlaogai.hsoparser.Meal
import org.mosad.seil0.projectlaogai.hsoparser.MensaParser
@@ -143,7 +147,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
/**
* load the mensa menus of the current week
* TODO show loading screen while loading
- * TODO make mensa nad timetable query parallel
+ * TODO make mensa and timetable query parallel (use coroutines)
* TODO evaluate if we should use a timeout here
*/
private fun load() {
@@ -151,6 +155,5 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
weekMenus = mensaParser.getMensaMenu()
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/SplashActivity.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/SplashActivity.kt
new file mode 100644
index 0000000..f15012b
--- /dev/null
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/SplashActivity.kt
@@ -0,0 +1,16 @@
+package org.mosad.seil0.projectlaogai
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+
+class SplashActivity : AppCompatActivity() {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ val intent = Intent(this, MainActivity::class.java)
+ startActivity(intent)
+ finish()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/HomeFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt
similarity index 95%
rename from app/src/main/java/org/mosad/seil0/projectlaogai/HomeFragment.kt
rename to app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt
index f22ec29..a5d13a5 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/HomeFragment.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt
@@ -20,7 +20,7 @@
*
*/
-package org.mosad.seil0.projectlaogai
+package org.mosad.seil0.projectlaogai.fragments
import android.os.Bundle
import androidx.fragment.app.Fragment
@@ -32,6 +32,7 @@ import kotlinx.android.synthetic.main.fragment_home.*
import org.jetbrains.anko.doAsync
import org.jetbrains.anko.uiThread
+import org.mosad.seil0.projectlaogai.R
import org.mosad.seil0.projectlaogai.hsoparser.DataTypes
import org.mosad.seil0.projectlaogai.hsoparser.Lesson
import org.mosad.seil0.projectlaogai.hsoparser.Meal
@@ -88,8 +89,7 @@ class HomeFragment : Fragment() {
for (i in 0..5) {
val lessonCardView = LessonCardView(context!!, null)
- lessonCardView.getTxtViewLesson().text = """${timeTableDay[i].lessonSubject}
-"""
+ lessonCardView.getTxtViewLesson().text = timeTableDay[i].lessonSubject + "\n"
lessonCardView.getTxtViewLesson().append(timeTableDay[i].lessonTeacher + "\n")
lessonCardView.getTxtViewLesson().append(timeTableDay[i].lessonRoom)
lessonCardView.getTxtViewTime().text = DataTypes().getTime()[i]
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/MensaFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt
similarity index 98%
rename from app/src/main/java/org/mosad/seil0/projectlaogai/MensaFragment.kt
rename to app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt
index 01bac7d..ce31669 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/MensaFragment.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt
@@ -20,7 +20,7 @@
*
*/
-package org.mosad.seil0.projectlaogai
+package org.mosad.seil0.projectlaogai.fragments
import android.os.Bundle
import androidx.fragment.app.Fragment
@@ -30,6 +30,7 @@ import android.view.ViewGroup
import android.widget.LinearLayout
import org.jetbrains.anko.doAsync
import org.jetbrains.anko.uiThread
+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
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/SettingsFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt
similarity index 97%
rename from app/src/main/java/org/mosad/seil0/projectlaogai/SettingsFragment.kt
rename to app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt
index af84e0f..2db4a9f 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/SettingsFragment.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt
@@ -20,7 +20,7 @@
*
*/
-package org.mosad.seil0.projectlaogai
+package org.mosad.seil0.projectlaogai.fragments
import android.graphics.Color
import android.os.Bundle
@@ -33,6 +33,7 @@ import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.color.colorChooser
import com.afollestad.materialdialogs.list.listItems
import kotlinx.android.synthetic.main.fragment_settings.*
+import org.mosad.seil0.projectlaogai.R
/**
* The settings controller class
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/TimeTableFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt
similarity index 86%
rename from app/src/main/java/org/mosad/seil0/projectlaogai/TimeTableFragment.kt
rename to app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt
index 5f4fd89..f6910d3 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/TimeTableFragment.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt
@@ -1,4 +1,4 @@
-package org.mosad.seil0.projectlaogai
+package org.mosad.seil0.projectlaogai.fragments
import android.os.Bundle
@@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import org.mosad.seil0.projectlaogai.R
/**
* The timetable controller class
diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt
index b301c2d..8f6c0d4 100644
--- a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt
+++ b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt
@@ -1,3 +1,25 @@
+/**
+ * ProjectLaogai
+ *
+ * Copyright 2018
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
package org.mosad.seil0.projectlaogai.hsoparser
class DataTypes {
diff --git a/app/src/main/res/drawable-v24/ic_launcher.png b/app/src/main/res/drawable-v24/ic_launcher.png
new file mode 100644
index 0000000..b0907ca
Binary files /dev/null and b/app/src/main/res/drawable-v24/ic_launcher.png differ
diff --git a/app/src/main/res/drawable/background_splash.xml b/app/src/main/res/drawable/background_splash.xml
new file mode 100644
index 0000000..e9d26a3
--- /dev/null
+++ b/app/src/main/res/drawable/background_splash.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ -
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index a095893..86d40dd 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -4,7 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".HomeFragment">
+ tools:context=".fragments.HomeFragment">
+ tools:context=".fragments.MensaFragment">
+ tools:context=".fragments.SettingsFragment">
+ tools:context=".fragments.TimeTableFragment">
@color/colorPrimaryDark
- @color/colorAccent
+
+