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 6128533..7b582a2 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt @@ -35,16 +35,12 @@ import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.app_bar_main.* import org.jetbrains.anko.doAsync import org.jetbrains.anko.uiThread -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.fragments.* import org.mosad.seil0.projectlaogai.hsoparser.* import kotlin.system.measureTimeMillis class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener { - //TODO make toolbar and navbar global private val mensaParser = MensaParser() private val timeTableParser = TimeTableParser() @@ -60,6 +56,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte setContentView(R.layout.activity_main) setSupportActionBar(toolbar) + // load mensa and timetable load() @@ -129,7 +126,11 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte } R.id.nav_moodle -> { - +// val moodleFragment = MoodleFragment() +// +// val fragmentTransaction: FragmentTransaction = supportFragmentManager.beginTransaction() +// fragmentTransaction.replace(R.id.fragment_container, moodleFragment) +// fragmentTransaction.commit() } R.id.nav_settings -> { val settingsFragment = SettingsFragment() @@ -166,7 +167,6 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte /** * load the mensa menus of the current week - * 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 884d7bd..39333bf 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 @@ -70,7 +70,6 @@ class HomeFragment : Fragment() { val dayMenus: ArrayList val cal = Calendar.getInstance() - // TODO needs testing if (cal.get(Calendar.HOUR_OF_DAY) < 15) { dayMenus = MensaParser().getMensaMenuDay(mainActivity.getWeekMenu(), cal.get(Calendar.DAY_OF_WEEK)) } else { diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MoodleFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MoodleFragment.kt new file mode 100644 index 0000000..ea0a99d --- /dev/null +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MoodleFragment.kt @@ -0,0 +1,31 @@ +package org.mosad.seil0.projectlaogai.fragments + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import kotlinx.android.synthetic.main.fragment_moodle.* +import org.mosad.seil0.projectlaogai.R + +/** + * The moodle screen controller class + * contains all needed parts to display and the moodle screen + */ +class MoodleFragment : Fragment() { + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + val view: View = inflater.inflate(R.layout.fragment_settings, container, false) + + //webView.loadUrl("www.google.de") + + return view + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + //webView.loadUrl("www.google.de") + } + +} diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt index b662bfa..e0e7f74 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt @@ -125,11 +125,11 @@ class SettingsFragment : Fragment() { linLayoutMainColor.setOnClickListener { // open a new color chooser dialog - val colors = intArrayOf(Color.parseColor("#3F51B5"), Color.RED, Color.GREEN, Color.BLUE) + val colors = intArrayOf(Color.BLACK, Color.RED, Color.GREEN, Color.BLUE) MaterialDialog(context!!) .title(R.string.primary_color) - .colorChooser(colors, initialSelection = Color.parseColor("#3F51B5")) { _, color -> + .colorChooser(colors, initialSelection = Color.BLACK) { _, color -> viewPrimaryColor.setBackgroundColor(color) } .positiveButton(R.string.select) diff --git a/app/src/main/res/layout/fragment_moodle.xml b/app/src/main/res/layout/fragment_moodle.xml new file mode 100644 index 0000000..1b7c209 --- /dev/null +++ b/app/src/main/res/layout/fragment_moodle.xml @@ -0,0 +1,17 @@ + + + + + + + + \ 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 aeb46d4..555b035 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -19,10 +19,10 @@ Benutzer Tippen, um den Kurs zu ändern Primärfarbe - Die Primärfarbe, standard ist Indigo + Die Primärfarbe, standard ist Schwarz auswählen über lade Stundenplan … 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 940f892..1b9f60a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,12 +34,15 @@ User Tap to change course primary color - The primary color, default is indigo + The primary color, default is black select version 0.3.0 about 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 \ngit.mosad.xyz/Seil0/ProjectLaogai \n\n© 2018 seil0@mosad.xyz " + "This software is made by @Seil0 and is published under the terms and + conditions of GPL 3. For further information visit \ngit.mosad.xyz/Seil0/ProjectLaogai \n\n© 2018 + seil0@mosad.xyz " + loading timetable … @@ -47,4 +50,7 @@ org.mosad.seil0.projectlaogai.course org.mosad.seil0.projectlaogai.courseTTLink + + + Hello blank fragment