diff --git a/app/src/main/java/com/denizk0461/studip/activity/MainActivity.kt b/app/src/main/java/com/denizk0461/studip/activity/MainActivity.kt index c42c188..d433e81 100644 --- a/app/src/main/java/com/denizk0461/studip/activity/MainActivity.kt +++ b/app/src/main/java/com/denizk0461/studip/activity/MainActivity.kt @@ -1,13 +1,11 @@ package com.denizk0461.studip.activity import android.os.Bundle -import com.google.android.material.snackbar.Snackbar import androidx.appcompat.app.AppCompatActivity import androidx.core.view.WindowCompat import androidx.navigation.findNavController import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.navigateUp -import androidx.navigation.ui.setupActionBarWithNavController import android.view.Menu import android.view.MenuItem import com.denizk0461.studip.R diff --git a/app/src/main/java/com/denizk0461/studip/data/DummyData.kt b/app/src/main/java/com/denizk0461/studip/data/DummyData.kt index 812c206..e043ee9 100644 --- a/app/src/main/java/com/denizk0461/studip/data/DummyData.kt +++ b/app/src/main/java/com/denizk0461/studip/data/DummyData.kt @@ -29,6 +29,8 @@ object DummyData { "16:15" to 5, "18:00" to 6, "18:15" to 6, + "20:00" to 7, + "20:15" to 7, ) private val timeslotEndMap: Map = mapOf( @@ -46,6 +48,8 @@ object DummyData { "17:45" to 5, "20:00" to 6, "19:45" to 6, + "22:00" to 7, + "21:45" to 7, ) fun parseTimeslot(time: String): Pair { diff --git a/app/src/main/java/com/denizk0461/studip/data/StudIPParser.kt b/app/src/main/java/com/denizk0461/studip/data/StudIPParser.kt index 635050e..0ef6322 100644 --- a/app/src/main/java/com/denizk0461/studip/data/StudIPParser.kt +++ b/app/src/main/java/com/denizk0461/studip/data/StudIPParser.kt @@ -1,6 +1,5 @@ package com.denizk0461.studip.data -import android.util.Log import com.denizk0461.studip.model.StudIPEvent import org.jsoup.Jsoup diff --git a/app/src/main/java/com/denizk0461/studip/fragment/EventFragment.kt b/app/src/main/java/com/denizk0461/studip/fragment/EventFragment.kt index e107517..7123c8c 100644 --- a/app/src/main/java/com/denizk0461/studip/fragment/EventFragment.kt +++ b/app/src/main/java/com/denizk0461/studip/fragment/EventFragment.kt @@ -14,15 +14,10 @@ import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.OnScrollListener import com.denizk0461.studip.R import com.denizk0461.studip.adapter.StudIPEventPageAdapter -import com.denizk0461.studip.data.DummyData -import com.denizk0461.studip.data.StudIPParser import com.denizk0461.studip.databinding.FragmentEventBinding import com.denizk0461.studip.viewmodel.EventViewModel import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout.OnTabSelectedListener -import java.time.DayOfWeek -import java.time.LocalDate -import java.time.LocalTime import java.util.* /** diff --git a/app/src/main/java/com/denizk0461/studip/model/StudIPEvent.kt b/app/src/main/java/com/denizk0461/studip/model/StudIPEvent.kt index e05ef23..5b48027 100644 --- a/app/src/main/java/com/denizk0461/studip/model/StudIPEvent.kt +++ b/app/src/main/java/com/denizk0461/studip/model/StudIPEvent.kt @@ -1,6 +1,5 @@ package com.denizk0461.studip.model -import android.util.Log import androidx.room.Entity import androidx.room.Ignore import androidx.room.PrimaryKey @@ -16,8 +15,8 @@ data class StudIPEvent( val timeslotEnd: Int, // 1 = 09:45 etc. ) { - @Ignore private val timeSlotStartTimes: List = listOf("06:15", "08:15", "10:15", "12:15", "14:15", "16:15", "18:15") - @Ignore private val timeSlotEndTimes: List = listOf("07:45", "09:45", "11:45", "13:45", "15:45", "17:45", "19:45") + @Ignore private val timeSlotStartTimes: List = listOf("06:15", "08:15", "10:15", "12:15", "14:15", "16:15", "18:15", "20:15") + @Ignore private val timeSlotEndTimes: List = listOf("07:45", "09:45", "11:45", "13:45", "15:45", "17:45", "19:45", "21:45") fun timeslot(): String = "${timeSlotStartTimes[timeslotStart]} – ${timeSlotEndTimes[timeslotEnd]}" diff --git a/app/src/main/res/drawable/design.xml b/app/src/main/res/drawable/design.xml new file mode 100644 index 0000000..d3ca206 --- /dev/null +++ b/app/src/main/res/drawable/design.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/drawable/flatware.xml b/app/src/main/res/drawable/flatware.xml new file mode 100644 index 0000000..e21135a --- /dev/null +++ b/app/src/main/res/drawable/flatware.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/restaurant.xml b/app/src/main/res/drawable/restaurant.xml new file mode 100644 index 0000000..9ead2b7 --- /dev/null +++ b/app/src/main/res/drawable/restaurant.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml new file mode 100644 index 0000000..298a5a1 --- /dev/null +++ b/app/src/main/res/drawable/settings.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 9b79aaa..badae32 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,14 +7,6 @@ android:fitsSystemWindows="true" tools:context=".activity.MainActivity"> - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index e1b25df..4d7a0f4 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -5,16 +5,45 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior"> + + + + + + + app:layout_constraintTop_toBottomOf="@+id/toolbar" + app:navGraph="@navigation/nav_graph"/> + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_event.xml b/app/src/main/res/layout/fragment_event.xml index c4921ad..a8e0306 100644 --- a/app/src/main/res/layout/fragment_event.xml +++ b/app/src/main/res/layout/fragment_event.xml @@ -1,80 +1,67 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + android:text="@string/monday"/> - \ No newline at end of file + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/nav_view_items.xml b/app/src/main/res/menu/nav_view_items.xml new file mode 100644 index 0000000..91577ff --- /dev/null +++ b/app/src/main/res/menu/nav_view_items.xml @@ -0,0 +1,18 @@ + + + + + + \ 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 398aeed..5aeea97 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -15,6 +15,10 @@ Your Schedule + Schedule + Food + Settings + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam in scelerisque sem. Mauris volutpat, dolor id interdum ullamcorper, risus dolor egestas lectus, sit amet mattis purus