Added ReminderStatus.kt to keep track of the status of a future notification implementation; moved enums and similar classes to values directory

This commit is contained in:
denizk0461
2023-05-23 08:35:34 +02:00
parent a1f18b3548
commit ce0667300d
38 changed files with 180 additions and 147 deletions
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<targetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\kduez\.android\avd\Pixel_6_A13_.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2023-05-22T13:36:19.819030Z" />
</component>
</project>
@@ -14,7 +14,7 @@ import com.denizk0461.weserplaner.data.showSnackBar
import com.denizk0461.weserplaner.data.showToast import com.denizk0461.weserplaner.data.showToast
import com.denizk0461.weserplaner.databinding.ActivityFetcherBinding import com.denizk0461.weserplaner.databinding.ActivityFetcherBinding
import com.denizk0461.weserplaner.exception.NotLoggedInException import com.denizk0461.weserplaner.exception.NotLoggedInException
import com.denizk0461.weserplaner.model.TextSheetContentId import com.denizk0461.weserplaner.values.TextSheetContentId
import com.denizk0461.weserplaner.sheet.TextSheet import com.denizk0461.weserplaner.sheet.TextSheet
import com.denizk0461.weserplaner.viewmodel.FetcherViewModel import com.denizk0461.weserplaner.viewmodel.FetcherViewModel
import java.io.IOException import java.io.IOException
@@ -15,7 +15,7 @@ import com.denizk0461.weserplaner.databinding.ItemCanteenLineBinding
import com.denizk0461.weserplaner.databinding.ItemIconBinding import com.denizk0461.weserplaner.databinding.ItemIconBinding
import com.denizk0461.weserplaner.model.CanteenOfferGroup import com.denizk0461.weserplaner.model.CanteenOfferGroup
import com.denizk0461.weserplaner.model.CanteenOfferGroupElement import com.denizk0461.weserplaner.model.CanteenOfferGroupElement
import com.denizk0461.weserplaner.model.DietaryPreferences import com.denizk0461.weserplaner.values.DietaryPreferences
/** /**
* Custom RecyclerView adapter that lays out the offers of a given canteen on a given day. * Custom RecyclerView adapter that lays out the offers of a given canteen on a given day.
@@ -14,7 +14,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.denizk0461.weserplaner.R import com.denizk0461.weserplaner.R
import com.denizk0461.weserplaner.exception.AcademicQuarterNotApplicableException import com.denizk0461.weserplaner.exception.AcademicQuarterNotApplicableException
import com.denizk0461.weserplaner.exception.ParcelNotFoundException import com.denizk0461.weserplaner.exception.ParcelNotFoundException
import com.denizk0461.weserplaner.model.TextSheetContentId import com.denizk0461.weserplaner.values.TextSheetContentId
import com.denizk0461.weserplaner.sheet.TextSheet import com.denizk0461.weserplaner.sheet.TextSheet
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
@@ -2,6 +2,7 @@ package com.denizk0461.weserplaner.data
import android.app.Application import android.app.Application
import com.denizk0461.weserplaner.db.AppRepository import com.denizk0461.weserplaner.db.AppRepository
import com.denizk0461.weserplaner.values.DietaryPreferences
import com.denizk0461.weserplaner.model.* import com.denizk0461.weserplaner.model.*
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@@ -4,7 +4,11 @@ import android.app.Application
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.denizk0461.weserplaner.values.DietaryPreferences
import com.denizk0461.weserplaner.values.SettingsPreferences
import com.denizk0461.weserplaner.values.TaskOrder
import com.denizk0461.weserplaner.model.* import com.denizk0461.weserplaner.model.*
import com.denizk0461.weserplaner.values.AllergenPreferences
/** /**
* Repository objects that acts as a mediator between view models and the database to retrieve data * Repository objects that acts as a mediator between view models and the database to retrieve data
@@ -17,7 +17,9 @@ import com.denizk0461.weserplaner.data.setRainbowProgressCircle
import com.denizk0461.weserplaner.data.showErrorSnackBar import com.denizk0461.weserplaner.data.showErrorSnackBar
import com.denizk0461.weserplaner.data.showSnackBar import com.denizk0461.weserplaner.data.showSnackBar
import com.denizk0461.weserplaner.databinding.FragmentCanteenBinding import com.denizk0461.weserplaner.databinding.FragmentCanteenBinding
import com.denizk0461.weserplaner.values.DietaryPreferences
import com.denizk0461.weserplaner.model.* import com.denizk0461.weserplaner.model.*
import com.denizk0461.weserplaner.values.TextSheetContentId
import com.denizk0461.weserplaner.viewmodel.CanteenViewModel import com.denizk0461.weserplaner.viewmodel.CanteenViewModel
import com.google.android.material.tabs.TabLayoutMediator import com.google.android.material.tabs.TabLayoutMediator
@@ -13,7 +13,7 @@ import com.denizk0461.weserplaner.databinding.RecyclerViewBinding
import com.denizk0461.weserplaner.model.CanteenOffer import com.denizk0461.weserplaner.model.CanteenOffer
import com.denizk0461.weserplaner.model.CanteenOfferGroup import com.denizk0461.weserplaner.model.CanteenOfferGroup
import com.denizk0461.weserplaner.model.CanteenOfferGroupElement import com.denizk0461.weserplaner.model.CanteenOfferGroupElement
import com.denizk0461.weserplaner.model.DietaryPreferences import com.denizk0461.weserplaner.values.DietaryPreferences
import com.denizk0461.weserplaner.sheet.AllergenSheet import com.denizk0461.weserplaner.sheet.AllergenSheet
import com.denizk0461.weserplaner.viewmodel.CanteenPageViewModel import com.denizk0461.weserplaner.viewmodel.CanteenPageViewModel
@@ -12,7 +12,7 @@ import com.denizk0461.weserplaner.adapter.TaskOverviewAdapter
import com.denizk0461.weserplaner.data.showSnackBar import com.denizk0461.weserplaner.data.showSnackBar
import com.denizk0461.weserplaner.databinding.FragmentTaskOverviewBinding import com.denizk0461.weserplaner.databinding.FragmentTaskOverviewBinding
import com.denizk0461.weserplaner.model.EventTask import com.denizk0461.weserplaner.model.EventTask
import com.denizk0461.weserplaner.model.TaskOrder import com.denizk0461.weserplaner.values.TaskOrder
import com.denizk0461.weserplaner.viewmodel.TaskOverviewViewModel import com.denizk0461.weserplaner.viewmodel.TaskOverviewViewModel
/** /**
@@ -9,7 +9,7 @@ import com.denizk0461.weserplaner.R
import com.denizk0461.weserplaner.data.viewBinding import com.denizk0461.weserplaner.data.viewBinding
import com.denizk0461.weserplaner.databinding.SheetAllergenConfigBinding import com.denizk0461.weserplaner.databinding.SheetAllergenConfigBinding
import com.denizk0461.weserplaner.fragment.SettingsFragment import com.denizk0461.weserplaner.fragment.SettingsFragment
import com.denizk0461.weserplaner.model.AllergenPreferences import com.denizk0461.weserplaner.values.AllergenPreferences
import com.denizk0461.weserplaner.viewmodel.AllergenConfigViewModel import com.denizk0461.weserplaner.viewmodel.AllergenConfigViewModel
/** /**
@@ -13,9 +13,9 @@ import com.denizk0461.weserplaner.data.viewBinding
import com.denizk0461.weserplaner.databinding.ItemSheetPreferenceBinding import com.denizk0461.weserplaner.databinding.ItemSheetPreferenceBinding
import com.denizk0461.weserplaner.databinding.SheetAllergenBinding import com.denizk0461.weserplaner.databinding.SheetAllergenBinding
import com.denizk0461.weserplaner.exception.ParcelNotFoundException import com.denizk0461.weserplaner.exception.ParcelNotFoundException
import com.denizk0461.weserplaner.model.Allergens import com.denizk0461.weserplaner.values.Allergens
import com.denizk0461.weserplaner.model.CanteenOfferGroupElement import com.denizk0461.weserplaner.model.CanteenOfferGroupElement
import com.denizk0461.weserplaner.model.DietaryPreferences import com.denizk0461.weserplaner.values.DietaryPreferences
/** /**
* This class is used to display further information on a canteen offer to the user. Unlike the name * This class is used to display further information on a canteen offer to the user. Unlike the name
@@ -6,7 +6,7 @@ import androidx.fragment.app.viewModels
import com.denizk0461.weserplaner.R import com.denizk0461.weserplaner.R
import com.denizk0461.weserplaner.data.viewBinding import com.denizk0461.weserplaner.data.viewBinding
import com.denizk0461.weserplaner.databinding.SheetTextBinding import com.denizk0461.weserplaner.databinding.SheetTextBinding
import com.denizk0461.weserplaner.model.TextSheetContentId import com.denizk0461.weserplaner.values.TextSheetContentId
import com.denizk0461.weserplaner.viewmodel.TextSheetViewModel import com.denizk0461.weserplaner.viewmodel.TextSheetViewModel
/** /**
@@ -1,4 +1,4 @@
package com.denizk0461.weserplaner.model package com.denizk0461.weserplaner.values
/** /**
* Class for managing allergen preferences. The user can tell the app which substances they are * Class for managing allergen preferences. The user can tell the app which substances they are
@@ -1,4 +1,4 @@
package com.denizk0461.weserplaner.model package com.denizk0461.weserplaner.values
import com.denizk0461.weserplaner.R import com.denizk0461.weserplaner.R
@@ -1,4 +1,4 @@
package com.denizk0461.weserplaner.model package com.denizk0461.weserplaner.values
import com.denizk0461.weserplaner.R import com.denizk0461.weserplaner.R
@@ -111,16 +111,16 @@ enum class DietaryPreferences(val value: String) {
*/ */
fun deconstruct(): String = String( fun deconstruct(): String = String(
charArrayOf( charArrayOf(
if (this.isFair) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, if (this.isFair) C_TRUE else C_FALSE,
if (this.isFish) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, if (this.isFish) C_TRUE else C_FALSE,
if (this.isPoultry) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, if (this.isPoultry) C_TRUE else C_FALSE,
if (this.isLamb) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, if (this.isLamb) C_TRUE else C_FALSE,
if (this.isVital) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, if (this.isVital) C_TRUE else C_FALSE,
if (this.isBeef) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, if (this.isBeef) C_TRUE else C_FALSE,
if (this.isPork) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, if (this.isPork) C_TRUE else C_FALSE,
if (this.isVegan) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, if (this.isVegan) C_TRUE else C_FALSE,
if (this.isVegetarian) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, if (this.isVegetarian) C_TRUE else C_FALSE,
if (this.isGame) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, if (this.isGame) C_TRUE else C_FALSE,
) )
) )
} }
@@ -156,16 +156,16 @@ enum class DietaryPreferences(val value: String) {
* @return an instance of DietaryPrefObject * @return an instance of DietaryPrefObject
*/ */
fun construct(values: String): Object = Object( fun construct(values: String): Object = Object(
isFair = values[0] == DietaryPreferences.C_TRUE, isFair = values[0] == C_TRUE,
isFish = values[1] == DietaryPreferences.C_TRUE, isFish = values[1] == C_TRUE,
isPoultry = values[2] == DietaryPreferences.C_TRUE, isPoultry = values[2] == C_TRUE,
isLamb = values[3] == DietaryPreferences.C_TRUE, isLamb = values[3] == C_TRUE,
isVital = values[4] == DietaryPreferences.C_TRUE, isVital = values[4] == C_TRUE,
isBeef = values[5] == DietaryPreferences.C_TRUE, isBeef = values[5] == C_TRUE,
isPork = values[6] == DietaryPreferences.C_TRUE, isPork = values[6] == C_TRUE,
isVegan = values[7] == DietaryPreferences.C_TRUE, isVegan = values[7] == C_TRUE,
isVegetarian = values[8] == DietaryPreferences.C_TRUE, isVegetarian = values[8] == C_TRUE,
isGame = values[9] == DietaryPreferences.C_TRUE, isGame = values[9] == C_TRUE,
) )
/** /**
@@ -0,0 +1,8 @@
package com.denizk0461.weserplaner.values
enum class ReminderStatus {
NONE_SET,
PENDING,
FIRED,
;
}
@@ -1,4 +1,4 @@
package com.denizk0461.weserplaner.model package com.denizk0461.weserplaner.values
/** /**
* Enumeration class for user-set preferences that will be saved in persistent storage via * Enumeration class for user-set preferences that will be saved in persistent storage via
@@ -1,4 +1,4 @@
package com.denizk0461.weserplaner.model package com.denizk0461.weserplaner.values
import com.denizk0461.weserplaner.R import com.denizk0461.weserplaner.R
@@ -1,4 +1,4 @@
package com.denizk0461.weserplaner.model package com.denizk0461.weserplaner.values
/** /**
* Used to determine the order in which tasks should be shown. * Used to determine the order in which tasks should be shown.
@@ -1,4 +1,4 @@
package com.denizk0461.weserplaner.model package com.denizk0461.weserplaner.values
object TextSheetContentId { object TextSheetContentId {
@@ -3,7 +3,7 @@ package com.denizk0461.weserplaner.viewmodel
import android.app.Application import android.app.Application
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import com.denizk0461.weserplaner.model.CanteenOffer import com.denizk0461.weserplaner.model.CanteenOffer
import com.denizk0461.weserplaner.model.DietaryPreferences import com.denizk0461.weserplaner.values.DietaryPreferences
class CanteenPageViewModel(app: Application) : AppViewModel(app) { class CanteenPageViewModel(app: Application) : AppViewModel(app) {
@@ -4,6 +4,7 @@ import android.app.Application
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.denizk0461.weserplaner.data.StwParser import com.denizk0461.weserplaner.data.StwParser
import com.denizk0461.weserplaner.values.DietaryPreferences
import com.denizk0461.weserplaner.model.* import com.denizk0461.weserplaner.model.*
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@@ -1,9 +1,8 @@
package com.denizk0461.weserplaner.viewmodel package com.denizk0461.weserplaner.viewmodel
import android.app.Application import android.app.Application
import androidx.lifecycle.LiveData
import com.denizk0461.weserplaner.model.EventTask import com.denizk0461.weserplaner.model.EventTask
import com.denizk0461.weserplaner.model.TaskOrder import com.denizk0461.weserplaner.values.TaskOrder
/** /**
* View model class for [com.denizk0461.weserplaner.fragment.TaskOverviewFragment]. * View model class for [com.denizk0461.weserplaner.fragment.TaskOverviewFragment].
+2 -2
View File
@@ -24,7 +24,7 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="8dp"> android:layout_marginEnd="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/app_title_bar" android:id="@+id/app_title_bar"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:fontFamily="@font/lato_blackitalic" app:fontFamily="@font/lato_blackitalic"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever" android:marqueeRepeatLimit="marquee_forever"
+2 -2
View File
@@ -13,13 +13,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/app_title_bar" android:id="@+id/app_title_bar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/title_schedule" android:text="@string/title_schedule"
android:textSize="28sp" android:textSize="28sp"
android:fontFamily="@font/lato_blackitalic" app:fontFamily="@font/lato_blackitalic"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
@@ -14,14 +14,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/app_title_bar" android:id="@+id/app_title_bar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:fontFamily="@font/lato_blackitalic" app:fontFamily="@font/lato_blackitalic"
android:text="@string/title_room_finder" android:text="@string/title_room_finder"
app:layout_scrollFlags="scroll" app:layout_scrollFlags="scroll"
android:textSize="28sp"/> android:textSize="28sp"/>
+57 -57
View File
@@ -14,14 +14,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/app_title_bar" android:id="@+id/app_title_bar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:fontFamily="@font/lato_blackitalic" app:fontFamily="@font/lato_blackitalic"
android:text="@string/title_settings" android:text="@string/title_settings"
app:layout_scrollFlags="scroll" app:layout_scrollFlags="scroll"
android:textSize="28sp"/> android:textSize="28sp"/>
@@ -58,13 +58,13 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp"> android:paddingBottom="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_schedule" android:text="@string/settings_schedule"
android:textSize="22sp" /> android:textSize="22sp" />
@@ -86,14 +86,14 @@
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:paddingVertical="8dp"> android:paddingVertical="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/refresh_schedule_title" android:text="@string/refresh_schedule_title"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/refresh_schedule_subtitle" android:text="@string/refresh_schedule_subtitle"
@@ -119,14 +119,14 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_current_day_title" android:text="@string/settings_current_day_title"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_current_day_subtitle" android:text="@string/settings_current_day_subtitle"
@@ -162,14 +162,14 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_highlight_title" android:text="@string/settings_highlight_title"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_highlight_subtitle" android:text="@string/settings_highlight_subtitle"
@@ -205,13 +205,13 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp"> android:paddingBottom="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_canteen" android:text="@string/settings_canteen"
android:textSize="22sp" /> android:textSize="22sp" />
@@ -233,14 +233,14 @@
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:paddingVertical="8dp"> android:paddingVertical="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/allergens_config_title" android:text="@string/allergens_config_title"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/allergens_config_subtitle" android:id="@+id/allergens_config_subtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -266,15 +266,15 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/settings_allergens_title_view" android:id="@+id/settings_allergens_title_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_allergens_title" android:text="@string/settings_allergens_title"
android:textSize="16sp"/> android:textSize="16sp"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/settings_allergens_subtitle_view" android:id="@+id/settings_allergens_subtitle_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -311,14 +311,14 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_pref_colour_title" android:text="@string/settings_pref_colour_title"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_pref_colour_subtitle" android:text="@string/settings_pref_colour_subtitle"
@@ -345,14 +345,14 @@
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:paddingVertical="8dp"> android:paddingVertical="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_pricing_title" android:text="@string/settings_pricing_title"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_pricing_subtitle" android:text="@string/settings_pricing_subtitle"
@@ -408,13 +408,13 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp"> android:paddingBottom="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_misc" android:text="@string/settings_misc"
android:textSize="22sp" /> android:textSize="22sp" />
@@ -433,10 +433,10 @@
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:paddingVertical="8dp"> android:paddingVertical="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_launch_canteen_title" android:text="@string/settings_launch_canteen_title"
android:textSize="16sp" /> android:textSize="16sp" />
@@ -491,14 +491,14 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_crashlytics_title" android:text="@string/settings_crashlytics_title"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_crashlytics_subtitle" android:text="@string/settings_crashlytics_subtitle"
@@ -528,14 +528,14 @@
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:paddingVertical="8dp"> android:paddingVertical="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_data_title" android:text="@string/settings_data_title"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_data_subtitle" android:text="@string/settings_data_subtitle"
@@ -555,14 +555,14 @@
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:paddingVertical="8dp"> android:paddingVertical="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_licences_title" android:text="@string/settings_licences_title"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/licences_text" android:id="@+id/licences_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -583,14 +583,14 @@
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:paddingVertical="8dp"> android:paddingVertical="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_app_version" android:text="@string/settings_app_version"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/app_version_text" android:id="@+id/app_version_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -617,13 +617,13 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp"> android:paddingBottom="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_experimental" android:text="@string/settings_experimental"
android:textSize="22sp" /> android:textSize="22sp" />
@@ -645,14 +645,14 @@
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:paddingVertical="8dp"> android:paddingVertical="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_hide_experiments_title" android:text="@string/settings_hide_experiments_title"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_hide_experiments_subtitle" android:text="@string/settings_hide_experiments_subtitle"
@@ -672,14 +672,14 @@
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:paddingVertical="8dp"> android:paddingVertical="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_build_time" android:text="@string/settings_build_time"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/build_time_text" android:id="@+id/build_time_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -705,14 +705,14 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_beta_nav_title" android:text="@string/settings_beta_nav_title"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_beta_nav_subtitle" android:text="@string/settings_beta_nav_subtitle"
@@ -741,10 +741,10 @@
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:paddingVertical="8dp"> android:paddingVertical="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:text="@string/settings_dev_codes_title" android:text="@string/settings_dev_codes_title"
android:textSize="16sp" /> android:textSize="16sp" />
@@ -768,7 +768,7 @@
android:id="@+id/input_dev_code" android:id="@+id/input_dev_code"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/ibm_regular" app:fontFamily="@font/ibm_regular"
android:inputType="textNoSuggestions"/> android:inputType="textNoSuggestions"/>
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@@ -20,7 +20,7 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="8dp"> android:layout_marginEnd="8dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/app_title_bar" android:id="@+id/app_title_bar"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -29,7 +29,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:fontFamily="@font/lato_blackitalic" app:fontFamily="@font/lato_blackitalic"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever" android:marqueeRepeatLimit="marquee_forever"
+3 -3
View File
@@ -17,12 +17,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_category" android:id="@+id/text_category"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="18sp" android:textSize="18sp"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -63,7 +63,7 @@
android:src="@drawable/visibility_off" android:src="@drawable/visibility_off"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_difference" android:id="@+id/text_difference"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_content" android:id="@+id/text_content"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -31,13 +31,13 @@
app:layout_constraintStart_toEndOf="@+id/image_view_container" app:layout_constraintStart_toEndOf="@+id/image_view_container"
app:layout_constraintEnd_toStartOf="@+id/text_price"/> app:layout_constraintEnd_toStartOf="@+id/text_price"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_price" android:id="@+id/text_price"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:fontFamily="@font/lato_bolditalic"/> app:fontFamily="@font/lato_bolditalic"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
+7 -6
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
xmlns:android="http://schemas.android.com/apk/res/android" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="8dp" android:paddingHorizontal="8dp"
@@ -22,12 +23,12 @@
android:focusable="true" android:focusable="true"
android:padding="16dp"> android:padding="16dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_title" android:id="@+id/text_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="24sp" android:textSize="24sp"
android:fontFamily="@font/lato_bolditalic"/> app:fontFamily="@font/lato_bolditalic"/>
<com.google.android.material.divider.MaterialDivider <com.google.android.material.divider.MaterialDivider
android:id="@+id/divider" android:id="@+id/divider"
@@ -36,17 +37,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="4dp"/> android:layout_marginVertical="4dp"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_lecturers" android:id="@+id/text_lecturers"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_timeslot" android:id="@+id/text_timeslot"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_room" android:id="@+id/text_room"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
@@ -71,7 +72,7 @@
android:src="@drawable/edit_off" android:src="@drawable/edit_off"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_no_events" android:id="@+id/text_no_events"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -13,7 +13,7 @@
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/preference_text" android:id="@+id/preference_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
+11 -11
View File
@@ -30,21 +30,21 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_category" android:id="@+id/text_category"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="22sp" android:textSize="22sp"
android:fontFamily="@font/lato_blackitalic" app:fontFamily="@font/lato_blackitalic"
android:paddingHorizontal="24dp" android:paddingHorizontal="24dp"
android:layout_marginBottom="2dp"/> android:layout_marginBottom="2dp"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_title" android:id="@+id/text_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="22sp" android:textSize="22sp"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:paddingHorizontal="24dp"/> android:paddingHorizontal="24dp"/>
@@ -78,26 +78,26 @@
android:rowCount="2" android:rowCount="2"
android:columnCount="2"> android:columnCount="2">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_allergens_title" android:id="@+id/text_allergens_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top"/> android:layout_gravity="top"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_allergens_content" android:id="@+id/text_allergens_content"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="fill_horizontal"/> android:layout_gravity="fill_horizontal"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_additives_title" android:id="@+id/text_additives_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="1dp" android:layout_marginTop="1dp"
android:layout_gravity="top"/> android:layout_gravity="top"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_additives_content" android:id="@+id/text_additives_content"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -108,18 +108,18 @@
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
<!-- <TextView--> <!-- <androidx.appcompat.widget.AppCompatTextView-->
<!-- android:id="@+id/text_content"--> <!-- android:id="@+id/text_content"-->
<!-- android:layout_width="match_parent"--> <!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginBottom="8dp"/>--> <!-- android:layout_marginBottom="8dp"/>-->
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_price" android:id="@+id/text_price"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="20sp" android:textSize="20sp"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:layout_marginTop="4dp"/> android:layout_marginTop="4dp"/>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
@@ -29,12 +29,12 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_title" android:id="@+id/text_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="22sp" android:textSize="22sp"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
android:paddingHorizontal="24dp" android:paddingHorizontal="24dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="@string/allergens_config_header"/> android:text="@string/allergens_config_header"/>
@@ -51,7 +51,7 @@
android:paddingHorizontal="24dp" android:paddingHorizontal="24dp"
android:paddingBottom="24dp"> android:paddingBottom="24dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
@@ -29,14 +29,14 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/event_header" android:id="@+id/event_header"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="22sp" android:textSize="22sp"
android:paddingHorizontal="24dp" android:paddingHorizontal="24dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -74,7 +74,7 @@
android:src="@drawable/edit" android:src="@drawable/edit"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/sheet_event_action_edit_event_title" android:text="@string/sheet_event_action_edit_event_title"
@@ -103,7 +103,7 @@
android:src="@drawable/add_task" android:src="@drawable/add_task"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/sheet_event_action_add_task_title" android:text="@string/sheet_event_action_add_task_title"
@@ -132,7 +132,7 @@
android:src="@drawable/task" android:src="@drawable/task"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/sheet_event_action_view_tasks_title" android:text="@string/sheet_event_action_view_tasks_title"
@@ -161,7 +161,7 @@
android:src="@drawable/location" android:src="@drawable/location"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/sheet_event_action_find_room_title" android:text="@string/sheet_event_action_find_room_title"
@@ -190,7 +190,7 @@
android:src="@drawable/delete" android:src="@drawable/delete"
android:importantForAccessibility="no"/> android:importantForAccessibility="no"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/sheet_event_action_delete_event_title" android:text="@string/sheet_event_action_delete_event_title"
@@ -30,13 +30,13 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="22sp" android:textSize="22sp"
android:paddingHorizontal="24dp" android:paddingHorizontal="24dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:fontFamily="@font/lato_blackitalic" app:fontFamily="@font/lato_blackitalic"
android:text="@string/sheet_event_confirm_deletion_header" android:text="@string/sheet_event_confirm_deletion_header"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@@ -55,7 +55,7 @@
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:paddingHorizontal="24dp"> android:paddingHorizontal="24dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_confirm_deletion_content" android:id="@+id/text_confirm_deletion_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -30,14 +30,14 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/sheet_title" android:id="@+id/sheet_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="22sp" android:textSize="22sp"
android:paddingHorizontal="24dp" android:paddingHorizontal="24dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:fontFamily="@font/lato_blackitalic" app:fontFamily="@font/lato_blackitalic"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -162,7 +162,7 @@
android:layout_weight="1" android:layout_weight="1"
app:strokeColor="?attr/colorOutlineVariant"/> app:strokeColor="?attr/colorOutlineVariant"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/sheet_schedule_update_timeslot_middle" android:text="@string/sheet_schedule_update_timeslot_middle"
+3 -3
View File
@@ -29,14 +29,14 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_header" android:id="@+id/text_header"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="22sp" android:textSize="22sp"
android:paddingHorizontal="24dp" android:paddingHorizontal="24dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:fontFamily="@font/lato_bolditalic" app:fontFamily="@font/lato_bolditalic"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -47,7 +47,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="vertical"> android:scrollbars="vertical">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_content" android:id="@+id/text_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"