diff --git a/app/build.gradle b/app/build.gradle index bd74c01..755612c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,6 +29,7 @@ dependencies { implementation 'com.android.support:support-v4:28.0.0' implementation 'com.android.support:design:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'org.jsoup:jsoup:1.11.3' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/HomeFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/HomeFragment.kt index 9440e39..bf0ac29 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/HomeFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/HomeFragment.kt @@ -23,13 +23,8 @@ package org.mosad.seil0.projectlaogai import android.annotation.SuppressLint -import android.annotation.TargetApi -import android.content.res.ColorStateList import android.graphics.Color -import android.graphics.Color.* -import android.os.Build import android.os.Bundle -import android.support.annotation.RequiresApi import android.support.v4.app.Fragment import android.view.LayoutInflater import android.view.View @@ -75,8 +70,6 @@ class HomeFragment : Fragment() { txtViewMenu2.text = "Riesen Currywurst\nCurryketchup\nGitterkartoffeln\nBlattsalat" } - @TargetApi(Build.VERSION_CODES.O) - @RequiresApi(Build.VERSION_CODES.O) @SuppressLint("SetTextI18n") private fun addLessons() { 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 a816f68..2c4d79f 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt @@ -90,13 +90,16 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte // Handle navigation view item clicks here. when (item.itemId) { R.id.nav_home -> { - // Handle the home action + val homeFragment = HomeFragment() + val fragmentTransaction: android.support.v4.app.FragmentTransaction = supportFragmentManager.beginTransaction() + fragmentTransaction.replace(R.id.fragment_container, homeFragment) + fragmentTransaction.commit() } R.id.nav_mensa -> { - //val mensaFragment: MensaFragment = MensaFragment() - //val fragmentTransaction: android.support.v4.app.FragmentTransaction = supportFragmentManager.beginTransaction() - //fragmentTransaction.replace(R.id.fragment_container, mensaFragment) - //fragmentTransaction.commit() + val mensaFragment: MensaFragment = MensaFragment() + val fragmentTransaction: android.support.v4.app.FragmentTransaction = supportFragmentManager.beginTransaction() + fragmentTransaction.replace(R.id.fragment_container, mensaFragment) + fragmentTransaction.commit() } R.id.nav_timetable -> { @@ -108,7 +111,10 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte } R.id.nav_settings -> { - + val settingsFragment = SettingsFragment() + val fragmentTransaction: android.support.v4.app.FragmentTransaction = supportFragmentManager.beginTransaction() + fragmentTransaction.replace(R.id.fragment_container, settingsFragment) + fragmentTransaction.commit() } } diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/MensaFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/MensaFragment.kt index 744b1be..85f1984 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MensaFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MensaFragment.kt @@ -28,12 +28,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup - -// TODO: Rename parameter arguments, choose names that match -// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER -private const val ARG_PARAM1 = "param1" -private const val ARG_PARAM2 = "param2" - /** * A simple [Fragment] subclass. * diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/SettingsFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/SettingsFragment.kt new file mode 100644 index 0000000..7039486 --- /dev/null +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/SettingsFragment.kt @@ -0,0 +1,46 @@ +/** + * 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 + +import android.os.Bundle +import android.support.v4.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup + +/** + * The settings controller class + * contains all needed parts to display and the settings screen + */ +class SettingsFragment : Fragment() { + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + + val view: View = inflater.inflate(R.layout.fragment_settings, container, false) + + // Inflate the layout for this fragment + return view + } + + +} diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 7f7ecc0..46cc2b0 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -86,12 +86,11 @@ + android:background="@color/colorPrimary" android:paddingTop="6dp"> + android:text="Mensa fragment, soon!"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml new file mode 100644 index 0000000..621ccc0 --- /dev/null +++ b/app/src/main/res/layout/fragment_settings.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +