From 199aa8f44c499a12c27a7371a9bb4e69139f7bd7 Mon Sep 17 00:00:00 2001
From: denizk0461 <denizk0461@gmail.com>
Date: Sun, 16 Apr 2023 22:17:00 +0200
Subject: [PATCH] Preparing database optimisations

---
 .../denizk0461/studip/model/CanteenOffer.kt   |  1 +
 .../denizk0461/studip/model/OfferCanteen.kt   |  6 +++
 .../denizk0461/studip/model/OfferCategory.kt  |  8 ++++
 .../com/denizk0461/studip/model/OfferDate.kt  |  6 +++
 .../com/denizk0461/studip/model/OfferItem.kt  | 18 ++++++++
 app/src/main/res/layout/fragment_canteen.xml  | 42 +++++++++++++++++++
 app/src/main/res/layout/fragment_food.xml     | 21 ----------
 app/src/main/res/values-de/strings.xml        | 13 +++++-
 app/src/main/res/values/strings.xml           | 13 +++++-
 9 files changed, 105 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/java/com/denizk0461/studip/model/OfferCanteen.kt
 create mode 100644 app/src/main/java/com/denizk0461/studip/model/OfferCategory.kt
 create mode 100644 app/src/main/java/com/denizk0461/studip/model/OfferDate.kt
 create mode 100644 app/src/main/java/com/denizk0461/studip/model/OfferItem.kt
 create mode 100644 app/src/main/res/layout/fragment_canteen.xml
 delete mode 100644 app/src/main/res/layout/fragment_food.xml

diff --git a/app/src/main/java/com/denizk0461/studip/model/CanteenOffer.kt b/app/src/main/java/com/denizk0461/studip/model/CanteenOffer.kt
index 1a13585..cf06889 100644
--- a/app/src/main/java/com/denizk0461/studip/model/CanteenOffer.kt
+++ b/app/src/main/java/com/denizk0461/studip/model/CanteenOffer.kt
@@ -8,6 +8,7 @@ data class CanteenOffer(
     @PrimaryKey val id: Int,
     val date: String,
     val dateId: Int, // gives every item on the same day the same ID for easier filtering
+//    val canteen: Int,
     val category: String,
     val title: String,
     val price: String, // price for students
diff --git a/app/src/main/java/com/denizk0461/studip/model/OfferCanteen.kt b/app/src/main/java/com/denizk0461/studip/model/OfferCanteen.kt
new file mode 100644
index 0000000..1223f67
--- /dev/null
+++ b/app/src/main/java/com/denizk0461/studip/model/OfferCanteen.kt
@@ -0,0 +1,6 @@
+package com.denizk0461.studip.model
+
+data class OfferCanteen(
+    val id: Int,
+    val canteen: String,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/denizk0461/studip/model/OfferCategory.kt b/app/src/main/java/com/denizk0461/studip/model/OfferCategory.kt
new file mode 100644
index 0000000..669ffcd
--- /dev/null
+++ b/app/src/main/java/com/denizk0461/studip/model/OfferCategory.kt
@@ -0,0 +1,8 @@
+package com.denizk0461.studip.model
+
+data class OfferCategory(
+    val id: Int,
+    val dateId: Int,
+    val canteenId: Int,
+    val category: String,
+)
diff --git a/app/src/main/java/com/denizk0461/studip/model/OfferDate.kt b/app/src/main/java/com/denizk0461/studip/model/OfferDate.kt
new file mode 100644
index 0000000..31f6d3f
--- /dev/null
+++ b/app/src/main/java/com/denizk0461/studip/model/OfferDate.kt
@@ -0,0 +1,6 @@
+package com.denizk0461.studip.model
+
+data class OfferDate(
+    val id: Int,
+    val date: String,
+)
diff --git a/app/src/main/java/com/denizk0461/studip/model/OfferItem.kt b/app/src/main/java/com/denizk0461/studip/model/OfferItem.kt
new file mode 100644
index 0000000..a3f46db
--- /dev/null
+++ b/app/src/main/java/com/denizk0461/studip/model/OfferItem.kt
@@ -0,0 +1,18 @@
+package com.denizk0461.studip.model
+
+data class OfferItem(
+    val id: Int,
+    val categoryId: Int,
+    val title: Int,
+    val price: String,
+    val isFair: Boolean,
+    val isFish: Boolean,
+    val isPoultry: Boolean,
+    val isLamb: Boolean,
+    val isVital: Boolean,
+    val isBeef: Boolean,
+    val isPork: Boolean,
+    val isVegan: Boolean,
+    val isVegetarian: Boolean,
+    val isGame: Boolean,
+)
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_canteen.xml b/app/src/main/res/layout/fragment_canteen.xml
new file mode 100644
index 0000000..f7f6ca8
--- /dev/null
+++ b/app/src/main/res/layout/fragment_canteen.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorBackground"
+    android:orientation="vertical">
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/swipe_refresh_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/day_tab_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:tabMode="scrollable"
+                android:background="@android:color/transparent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
+            <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/view_pager"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/day_tab_layout"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_food.xml b/app/src/main/res/layout/fragment_food.xml
deleted file mode 100644
index 6fa493a..0000000
--- a/app/src/main/res/layout/fragment_food.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/colorBackground"
-    android:orientation="vertical">
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/swipe_refresh_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"/>
-
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e2bb88b..2be5335 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -11,8 +11,19 @@
     <string name="title_food">Mensen-Angebote</string>
     <string name="title_settings">App-Einstellungen</string>
 
+    <string name="mensa_uni">Uni-Mensa</string>
+    <string name="cafe_central">Café Central</string>
+    <string name="mensa_nw1">Mensa NW1</string>
+    <string name="cafeteria_gw2">Cafeteria GW2</string>
+    <string name="mensa_neustadt">Mensa Neustadtswall</string>
+    <string name="mensa_werder">Mensa Werderstraße</string>
+    <string name="mensa_airport">Mensa Airport</string>
+    <string name="mensa_bhv">Mensa Bremerhaven</string>
+    <string name="cafeteria_bhv">Cafeteria Bremerhaven</string>
+    <string name="mensa_hfk">Interimsmensa HfK</string>
+
     <string name="nav_schedule">Stundenplan</string>
-    <string name="nav_food">esn</string>
+    <string name="nav_food">Mensen</string>
     <string name="nav_settings">Einstellungen</string>
 
     <string name="toast_fetch_finished">Dein Stundenplan wurde aktualisiert!</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 27eee04..3430ced 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,8 +11,19 @@
     <string name="title_food">Canteen Offers</string>
     <string name="title_settings">App Settings</string>
 
+    <string name="mensa_uni">Uni-Mensa</string>
+    <string name="cafe_central">Café Central</string>
+    <string name="mensa_nw1">Mensa NW1</string>
+    <string name="cafeteria_gw2">Cafeteria GW2</string>
+    <string name="mensa_neustadt">Mensa Neustadtswall</string>
+    <string name="mensa_werder">Mensa Werderstraße</string>
+    <string name="mensa_airport">Mensa Airport</string>
+    <string name="mensa_bhv">Mensa Bremerhaven</string>
+    <string name="cafeteria_bhv">Cafeteria Bremerhaven</string>
+    <string name="mensa_hfk">Interimsmensa HfK</string>
+
     <string name="nav_schedule">Schedule</string>
-    <string name="nav_food">Food</string>
+    <string name="nav_food">Canteens</string>
     <string name="nav_settings">Settings</string>
 
     <string name="toast_fetch_finished">Your schedule has been refreshed!</string>