From 5fd9db182a8a3c79bcc11edab0658a6803d411c6 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Sat, 27 Oct 2018 14:11:47 +0200 Subject: [PATCH] cleanup, mensa detail view and timetbale fragment --- .../uicomponents}/LessonCardView.kt | 3 +- .../uicomponents/MensDayCardView.kt | 28 +++++++++++++++ .../uicomponents}/MenuCardView.kt | 3 +- .../mosad/seil0/projectlaogai/HomeFragment.kt | 1 + .../mosad/seil0/projectlaogai/MainActivity.kt | 5 +++ .../seil0/projectlaogai/MensaFragment.kt | 35 ++++++++++++------- .../seil0/projectlaogai/TimeTableFragment.kt | 25 +++++++++++++ app/src/main/res/layout/fragment_mensa.xml | 20 ++++++----- app/src/main/res/layout/fragment_settings.xml | 6 ++-- .../main/res/layout/fragment_time_table.xml | 13 +++++++ app/src/main/res/layout/mensaday_cardview.xml | 22 ++++++++++++ app/src/main/res/values/colors.xml | 3 +- app/src/main/res/values/strings.xml | 9 +++-- 13 files changed, 145 insertions(+), 28 deletions(-) rename app/src/main/java/{org/mosad/seil0/projectlaogai => ord/mosad/seil0/projectlaogai/uicomponents}/LessonCardView.kt (94%) create mode 100644 app/src/main/java/ord/mosad/seil0/projectlaogai/uicomponents/MensDayCardView.kt rename app/src/main/java/{org/mosad/seil0/projectlaogai => ord/mosad/seil0/projectlaogai/uicomponents}/MenuCardView.kt (89%) create mode 100644 app/src/main/java/org/mosad/seil0/projectlaogai/TimeTableFragment.kt create mode 100644 app/src/main/res/layout/fragment_time_table.xml create mode 100644 app/src/main/res/layout/mensaday_cardview.xml diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/LessonCardView.kt b/app/src/main/java/ord/mosad/seil0/projectlaogai/uicomponents/LessonCardView.kt similarity index 94% rename from app/src/main/java/org/mosad/seil0/projectlaogai/LessonCardView.kt rename to app/src/main/java/ord/mosad/seil0/projectlaogai/uicomponents/LessonCardView.kt index a3b6853..a3ee5a0 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/LessonCardView.kt +++ b/app/src/main/java/ord/mosad/seil0/projectlaogai/uicomponents/LessonCardView.kt @@ -20,12 +20,13 @@ * */ -package org.mosad.seil0.projectlaogai +package ord.mosad.seil0.projectlaogai.uicomponents import android.content.Context import android.graphics.Color import android.util.AttributeSet import android.widget.TextView +import org.mosad.seil0.projectlaogai.R class LessonCardView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : androidx.cardview.widget.CardView(context, attrs){ diff --git a/app/src/main/java/ord/mosad/seil0/projectlaogai/uicomponents/MensDayCardView.kt b/app/src/main/java/ord/mosad/seil0/projectlaogai/uicomponents/MensDayCardView.kt new file mode 100644 index 0000000..3db680a --- /dev/null +++ b/app/src/main/java/ord/mosad/seil0/projectlaogai/uicomponents/MensDayCardView.kt @@ -0,0 +1,28 @@ +package ord.mosad.seil0.projectlaogai.uicomponents + +import android.content.Context +import android.util.AttributeSet +import android.widget.LinearLayout +import android.widget.TextView +import org.mosad.seil0.projectlaogai.R + +class MensaDayCardView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : androidx.cardview.widget.CardView(context, attrs){ + + private var linLayoutMensaDay: LinearLayout + private var txtViewDayHeading: TextView + + init { + inflate(context, R.layout.mensaday_cardview,this) + + linLayoutMensaDay = findViewById(R.id.linLayout_MensaDay) + txtViewDayHeading = findViewById(R.id.txtView_DayHeading) + + // workaround to prevent a white border + //this.setBackgroundColor(Color.TRANSPARENT) + } + + fun getLinLayoutMensaDay(): LinearLayout { + return linLayoutMensaDay + } + +} \ No newline at end of file diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/MenuCardView.kt b/app/src/main/java/ord/mosad/seil0/projectlaogai/uicomponents/MenuCardView.kt similarity index 89% rename from app/src/main/java/org/mosad/seil0/projectlaogai/MenuCardView.kt rename to app/src/main/java/ord/mosad/seil0/projectlaogai/uicomponents/MenuCardView.kt index 1ea6eee..88c9007 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MenuCardView.kt +++ b/app/src/main/java/ord/mosad/seil0/projectlaogai/uicomponents/MenuCardView.kt @@ -1,9 +1,10 @@ -package org.mosad.seil0.projectlaogai +package ord.mosad.seil0.projectlaogai.uicomponents import android.content.Context import android.graphics.Color import android.util.AttributeSet import android.widget.TextView +import org.mosad.seil0.projectlaogai.R class MenuCardView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : androidx.cardview.widget.CardView(context, attrs){ 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 f677306..bf53a79 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/HomeFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/HomeFragment.kt @@ -32,6 +32,7 @@ import android.view.ViewGroup import android.widget.LinearLayout import android.widget.ScrollView import android.widget.TextView +import ord.mosad.seil0.projectlaogai.uicomponents.LessonCardView /** * The "home" controller class 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 46cacbd..8c98c3d 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt @@ -98,6 +98,11 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte } R.id.nav_timetable -> { + val timeTableFragment = TimeTableFragment() + val fragmentTransaction: FragmentTransaction = supportFragmentManager.beginTransaction() + fragmentTransaction.replace(R.id.fragment_container, timeTableFragment) + fragmentTransaction.commit() + } R.id.nav_moodle -> { 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 5c17a16..7d851bb 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MensaFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MensaFragment.kt @@ -22,18 +22,19 @@ package org.mosad.seil0.projectlaogai -import android.graphics.drawable.GradientDrawable +import android.annotation.SuppressLint import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.LinearLayout -import android.widget.TextView +import ord.mosad.seil0.projectlaogai.uicomponents.MensaDayCardView +import ord.mosad.seil0.projectlaogai.uicomponents.MenuCardView /** - * A simple [Fragment] subclass. - * + * The mensa controller class + * contains all needed parts to display and the mensa detail screen */ class MensaFragment : Fragment() { @@ -50,10 +51,10 @@ class MensaFragment : Fragment() { return view } + @SuppressLint("SetTextI18n") fun addDay() { - val linLayoutDay = LinearLayout(context) - val txtViewDayHeading = TextView(context, null, R.string.sample_date) + val cardViewMensaDay = MensaDayCardView(context!!, null) val menuViewMenu1 = MenuCardView(context!!, null) val menuViewMenu2 = MenuCardView(context!!, null) @@ -62,13 +63,23 @@ class MensaFragment : Fragment() { menuViewMenu2.getTxtViewMenuHeading().text = "Essen 2" menuViewMenu2.getTxtViewMenu().text = "Riesen Currywurst\nCurryketchup\nGitterkartoffeln\nBlattsalat" - linLayoutDay.orientation = LinearLayout.VERTICAL - linLayoutDay.layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT) - linLayoutDay.addView(txtViewDayHeading) - linLayoutDay.addView(menuViewMenu1) - linLayoutDay.addView(menuViewMenu2) + cardViewMensaDay.getLinLayoutMensaDay().addView(menuViewMenu1) + cardViewMensaDay.getLinLayoutMensaDay().addView(menuViewMenu2) + linLayoutMensaFragment.addView(cardViewMensaDay) - linLayoutMensaFragment.addView(linLayoutDay) + + val cardViewMensaDay2 = MensaDayCardView(context!!, null) + val menuViewMenu12 = MenuCardView(context!!, null) + val menuViewMenu22 = MenuCardView(context!!, null) + + menuViewMenu12.getTxtViewMenuHeading().text = "Essen 12" + menuViewMenu12.getTxtViewMenu().text = "Buntes Pfannengemüse\nCouscous\nBlattsalat" + menuViewMenu22.getTxtViewMenuHeading().text = "Essen 22" + menuViewMenu22.getTxtViewMenu().text = "Riesen Currywurst\nCurryketchup\nGitterkartoffeln\nBlattsalat" + + cardViewMensaDay2.getLinLayoutMensaDay().addView(menuViewMenu12) + cardViewMensaDay2.getLinLayoutMensaDay().addView(menuViewMenu22) + linLayoutMensaFragment.addView(cardViewMensaDay2) } diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/TimeTableFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/TimeTableFragment.kt new file mode 100644 index 0000000..5f4fd89 --- /dev/null +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/TimeTableFragment.kt @@ -0,0 +1,25 @@ +package org.mosad.seil0.projectlaogai + + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup + +/** + * The timetable controller class + * contains all needed parts to display and the timetable detail screen + */ +class TimeTableFragment : Fragment() { + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + + val view: View = inflater.inflate(R.layout.fragment_time_table, container, false) + + + return view + } + + +} diff --git a/app/src/main/res/layout/fragment_mensa.xml b/app/src/main/res/layout/fragment_mensa.xml index d608200..dbb65db 100644 --- a/app/src/main/res/layout/fragment_mensa.xml +++ b/app/src/main/res/layout/fragment_mensa.xml @@ -1,6 +1,6 @@ @@ -9,16 +9,18 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - + - + android:layout_height="wrap_content" android:id="@+id/linLayout_MensaFragment" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + > + + \ 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 index a21199d..6a2e6ea 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -18,7 +18,8 @@ + android:layout_marginTop="9dp" android:id="@+id/cardView_Info" app:cardElevation="5dp" + app:cardUseCompatPadding="true"> + android:id="@+id/cardView_Settings" app:cardElevation="5dp" + app:cardUseCompatPadding="true"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/mensaday_cardview.xml b/app/src/main/res/layout/mensaday_cardview.xml new file mode 100644 index 0000000..841029a --- /dev/null +++ b/app/src/main/res/layout/mensaday_cardview.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f9f0396..4a25680 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -2,5 +2,6 @@ @color/design_default_color_primary @color/design_default_color_primary_dark - #D81B60 + #d81b60 + #ebe8e9 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aa86df8..8032808 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,7 +2,7 @@ Project Laogai Open navigation drawer Close navigation drawer - hso App 0.0.2 + hso App 0.0.3 seil0@mosad.xyz Navigation header @@ -31,6 +31,11 @@ select version 0.0.2 about - This software is made by @Seil0 and is published under the terms and conditions of GPL 3. For further information visit https://git.mosad.xyz/Seil0/ProjectLaogai\n\n(c) 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 https://git.mosad.xyz/Seil0/ProjectLaogai\n\n(c) 2018 seil0@mosad.xyz + hso App by @Seil0 + + + Hello blank fragment