diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..5960165 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/denizk0461/weserplaner/activity/FetcherActivity.kt b/app/src/main/java/com/denizk0461/weserplaner/activity/FetcherActivity.kt index 38ee099..73c52f4 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/activity/FetcherActivity.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/activity/FetcherActivity.kt @@ -14,7 +14,7 @@ import com.denizk0461.weserplaner.data.showSnackBar import com.denizk0461.weserplaner.data.showToast import com.denizk0461.weserplaner.databinding.ActivityFetcherBinding 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.viewmodel.FetcherViewModel import java.io.IOException diff --git a/app/src/main/java/com/denizk0461/weserplaner/adapter/CanteenOfferItemAdapter.kt b/app/src/main/java/com/denizk0461/weserplaner/adapter/CanteenOfferItemAdapter.kt index 2a34cd5..edd0b5c 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/adapter/CanteenOfferItemAdapter.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/adapter/CanteenOfferItemAdapter.kt @@ -15,7 +15,7 @@ import com.denizk0461.weserplaner.databinding.ItemCanteenLineBinding import com.denizk0461.weserplaner.databinding.ItemIconBinding import com.denizk0461.weserplaner.model.CanteenOfferGroup 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. diff --git a/app/src/main/java/com/denizk0461/weserplaner/data/Extensions.kt b/app/src/main/java/com/denizk0461/weserplaner/data/Extensions.kt index 189585e..8f44165 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/data/Extensions.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/data/Extensions.kt @@ -14,7 +14,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.denizk0461.weserplaner.R import com.denizk0461.weserplaner.exception.AcademicQuarterNotApplicableException 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.google.android.material.snackbar.Snackbar import java.text.SimpleDateFormat diff --git a/app/src/main/java/com/denizk0461/weserplaner/data/StwParser.kt b/app/src/main/java/com/denizk0461/weserplaner/data/StwParser.kt index e9573d5..81a9722 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/data/StwParser.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/data/StwParser.kt @@ -2,6 +2,7 @@ package com.denizk0461.weserplaner.data import android.app.Application import com.denizk0461.weserplaner.db.AppRepository +import com.denizk0461.weserplaner.values.DietaryPreferences import com.denizk0461.weserplaner.model.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/denizk0461/weserplaner/db/AppRepository.kt b/app/src/main/java/com/denizk0461/weserplaner/db/AppRepository.kt index 691fa26..46b65dd 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/db/AppRepository.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/db/AppRepository.kt @@ -4,7 +4,11 @@ import android.app.Application import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData 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.values.AllergenPreferences /** * Repository objects that acts as a mediator between view models and the database to retrieve data diff --git a/app/src/main/java/com/denizk0461/weserplaner/fragment/CanteenFragment.kt b/app/src/main/java/com/denizk0461/weserplaner/fragment/CanteenFragment.kt index c447fbf..13a8904 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/fragment/CanteenFragment.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/fragment/CanteenFragment.kt @@ -17,7 +17,9 @@ import com.denizk0461.weserplaner.data.setRainbowProgressCircle import com.denizk0461.weserplaner.data.showErrorSnackBar import com.denizk0461.weserplaner.data.showSnackBar import com.denizk0461.weserplaner.databinding.FragmentCanteenBinding +import com.denizk0461.weserplaner.values.DietaryPreferences import com.denizk0461.weserplaner.model.* +import com.denizk0461.weserplaner.values.TextSheetContentId import com.denizk0461.weserplaner.viewmodel.CanteenViewModel import com.google.android.material.tabs.TabLayoutMediator diff --git a/app/src/main/java/com/denizk0461/weserplaner/fragment/CanteenPageFragment.kt b/app/src/main/java/com/denizk0461/weserplaner/fragment/CanteenPageFragment.kt index 91113c6..d2e0d1d 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/fragment/CanteenPageFragment.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/fragment/CanteenPageFragment.kt @@ -13,7 +13,7 @@ import com.denizk0461.weserplaner.databinding.RecyclerViewBinding import com.denizk0461.weserplaner.model.CanteenOffer import com.denizk0461.weserplaner.model.CanteenOfferGroup 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.viewmodel.CanteenPageViewModel diff --git a/app/src/main/java/com/denizk0461/weserplaner/fragment/TaskOverviewFragment.kt b/app/src/main/java/com/denizk0461/weserplaner/fragment/TaskOverviewFragment.kt index 0eaabb5..2837f85 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/fragment/TaskOverviewFragment.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/fragment/TaskOverviewFragment.kt @@ -12,7 +12,7 @@ import com.denizk0461.weserplaner.adapter.TaskOverviewAdapter import com.denizk0461.weserplaner.data.showSnackBar import com.denizk0461.weserplaner.databinding.FragmentTaskOverviewBinding import com.denizk0461.weserplaner.model.EventTask -import com.denizk0461.weserplaner.model.TaskOrder +import com.denizk0461.weserplaner.values.TaskOrder import com.denizk0461.weserplaner.viewmodel.TaskOverviewViewModel /** diff --git a/app/src/main/java/com/denizk0461/weserplaner/sheet/AllergenConfigSheet.kt b/app/src/main/java/com/denizk0461/weserplaner/sheet/AllergenConfigSheet.kt index d2f9450..5dd8b53 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/sheet/AllergenConfigSheet.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/sheet/AllergenConfigSheet.kt @@ -9,7 +9,7 @@ import com.denizk0461.weserplaner.R import com.denizk0461.weserplaner.data.viewBinding import com.denizk0461.weserplaner.databinding.SheetAllergenConfigBinding import com.denizk0461.weserplaner.fragment.SettingsFragment -import com.denizk0461.weserplaner.model.AllergenPreferences +import com.denizk0461.weserplaner.values.AllergenPreferences import com.denizk0461.weserplaner.viewmodel.AllergenConfigViewModel /** diff --git a/app/src/main/java/com/denizk0461/weserplaner/sheet/AllergenSheet.kt b/app/src/main/java/com/denizk0461/weserplaner/sheet/AllergenSheet.kt index cf2c87e..f418e42 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/sheet/AllergenSheet.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/sheet/AllergenSheet.kt @@ -13,9 +13,9 @@ import com.denizk0461.weserplaner.data.viewBinding import com.denizk0461.weserplaner.databinding.ItemSheetPreferenceBinding import com.denizk0461.weserplaner.databinding.SheetAllergenBinding 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.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 diff --git a/app/src/main/java/com/denizk0461/weserplaner/sheet/TextSheet.kt b/app/src/main/java/com/denizk0461/weserplaner/sheet/TextSheet.kt index eff6089..9677973 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/sheet/TextSheet.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/sheet/TextSheet.kt @@ -6,7 +6,7 @@ import androidx.fragment.app.viewModels import com.denizk0461.weserplaner.R import com.denizk0461.weserplaner.data.viewBinding import com.denizk0461.weserplaner.databinding.SheetTextBinding -import com.denizk0461.weserplaner.model.TextSheetContentId +import com.denizk0461.weserplaner.values.TextSheetContentId import com.denizk0461.weserplaner.viewmodel.TextSheetViewModel /** diff --git a/app/src/main/java/com/denizk0461/weserplaner/model/AllergenPreferences.kt b/app/src/main/java/com/denizk0461/weserplaner/values/AllergenPreferences.kt similarity index 99% rename from app/src/main/java/com/denizk0461/weserplaner/model/AllergenPreferences.kt rename to app/src/main/java/com/denizk0461/weserplaner/values/AllergenPreferences.kt index eecb28c..d920fe7 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/model/AllergenPreferences.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/values/AllergenPreferences.kt @@ -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 diff --git a/app/src/main/java/com/denizk0461/weserplaner/model/Allergens.kt b/app/src/main/java/com/denizk0461/weserplaner/values/Allergens.kt similarity index 98% rename from app/src/main/java/com/denizk0461/weserplaner/model/Allergens.kt rename to app/src/main/java/com/denizk0461/weserplaner/values/Allergens.kt index 4abd1df..593c952 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/model/Allergens.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/values/Allergens.kt @@ -1,4 +1,4 @@ -package com.denizk0461.weserplaner.model +package com.denizk0461.weserplaner.values import com.denizk0461.weserplaner.R diff --git a/app/src/main/java/com/denizk0461/weserplaner/model/DietaryPreferences.kt b/app/src/main/java/com/denizk0461/weserplaner/values/DietaryPreferences.kt similarity index 78% rename from app/src/main/java/com/denizk0461/weserplaner/model/DietaryPreferences.kt rename to app/src/main/java/com/denizk0461/weserplaner/values/DietaryPreferences.kt index e2e8f60..828bda1 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/model/DietaryPreferences.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/values/DietaryPreferences.kt @@ -1,4 +1,4 @@ -package com.denizk0461.weserplaner.model +package com.denizk0461.weserplaner.values import com.denizk0461.weserplaner.R @@ -111,16 +111,16 @@ enum class DietaryPreferences(val value: String) { */ fun deconstruct(): String = String( charArrayOf( - if (this.isFair) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, - if (this.isFish) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, - if (this.isPoultry) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, - if (this.isLamb) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, - if (this.isVital) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, - if (this.isBeef) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, - if (this.isPork) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, - if (this.isVegan) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, - if (this.isVegetarian) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, - if (this.isGame) DietaryPreferences.C_TRUE else DietaryPreferences.C_FALSE, + if (this.isFair) C_TRUE else C_FALSE, + if (this.isFish) C_TRUE else C_FALSE, + if (this.isPoultry) C_TRUE else C_FALSE, + if (this.isLamb) C_TRUE else C_FALSE, + if (this.isVital) C_TRUE else C_FALSE, + if (this.isBeef) C_TRUE else C_FALSE, + if (this.isPork) C_TRUE else C_FALSE, + if (this.isVegan) C_TRUE else C_FALSE, + if (this.isVegetarian) C_TRUE else 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 */ fun construct(values: String): Object = Object( - isFair = values[0] == DietaryPreferences.C_TRUE, - isFish = values[1] == DietaryPreferences.C_TRUE, - isPoultry = values[2] == DietaryPreferences.C_TRUE, - isLamb = values[3] == DietaryPreferences.C_TRUE, - isVital = values[4] == DietaryPreferences.C_TRUE, - isBeef = values[5] == DietaryPreferences.C_TRUE, - isPork = values[6] == DietaryPreferences.C_TRUE, - isVegan = values[7] == DietaryPreferences.C_TRUE, - isVegetarian = values[8] == DietaryPreferences.C_TRUE, - isGame = values[9] == DietaryPreferences.C_TRUE, + isFair = values[0] == C_TRUE, + isFish = values[1] == C_TRUE, + isPoultry = values[2] == C_TRUE, + isLamb = values[3] == C_TRUE, + isVital = values[4] == C_TRUE, + isBeef = values[5] == C_TRUE, + isPork = values[6] == C_TRUE, + isVegan = values[7] == C_TRUE, + isVegetarian = values[8] == C_TRUE, + isGame = values[9] == C_TRUE, ) /** diff --git a/app/src/main/java/com/denizk0461/weserplaner/values/ReminderStatus.kt b/app/src/main/java/com/denizk0461/weserplaner/values/ReminderStatus.kt new file mode 100644 index 0000000..44528a4 --- /dev/null +++ b/app/src/main/java/com/denizk0461/weserplaner/values/ReminderStatus.kt @@ -0,0 +1,8 @@ +package com.denizk0461.weserplaner.values + +enum class ReminderStatus { + NONE_SET, + PENDING, + FIRED, + ; +} \ No newline at end of file diff --git a/app/src/main/java/com/denizk0461/weserplaner/model/SettingsPreferences.kt b/app/src/main/java/com/denizk0461/weserplaner/values/SettingsPreferences.kt similarity index 97% rename from app/src/main/java/com/denizk0461/weserplaner/model/SettingsPreferences.kt rename to app/src/main/java/com/denizk0461/weserplaner/values/SettingsPreferences.kt index 95cd498..436216e 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/model/SettingsPreferences.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/values/SettingsPreferences.kt @@ -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 diff --git a/app/src/main/java/com/denizk0461/weserplaner/model/StudIPColour.kt b/app/src/main/java/com/denizk0461/weserplaner/values/StudIPColour.kt similarity index 93% rename from app/src/main/java/com/denizk0461/weserplaner/model/StudIPColour.kt rename to app/src/main/java/com/denizk0461/weserplaner/values/StudIPColour.kt index 0fff646..d08aa1d 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/model/StudIPColour.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/values/StudIPColour.kt @@ -1,4 +1,4 @@ -package com.denizk0461.weserplaner.model +package com.denizk0461.weserplaner.values import com.denizk0461.weserplaner.R diff --git a/app/src/main/java/com/denizk0461/weserplaner/model/TaskOrder.kt b/app/src/main/java/com/denizk0461/weserplaner/values/TaskOrder.kt similarity index 90% rename from app/src/main/java/com/denizk0461/weserplaner/model/TaskOrder.kt rename to app/src/main/java/com/denizk0461/weserplaner/values/TaskOrder.kt index 8bcae01..e4113cb 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/model/TaskOrder.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/values/TaskOrder.kt @@ -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. diff --git a/app/src/main/java/com/denizk0461/weserplaner/model/TextSheetContentId.kt b/app/src/main/java/com/denizk0461/weserplaner/values/TextSheetContentId.kt similarity index 74% rename from app/src/main/java/com/denizk0461/weserplaner/model/TextSheetContentId.kt rename to app/src/main/java/com/denizk0461/weserplaner/values/TextSheetContentId.kt index 6c8e515..010c41f 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/model/TextSheetContentId.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/values/TextSheetContentId.kt @@ -1,4 +1,4 @@ -package com.denizk0461.weserplaner.model +package com.denizk0461.weserplaner.values object TextSheetContentId { diff --git a/app/src/main/java/com/denizk0461/weserplaner/viewmodel/CanteenPageViewModel.kt b/app/src/main/java/com/denizk0461/weserplaner/viewmodel/CanteenPageViewModel.kt index f87f851..30130bd 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/viewmodel/CanteenPageViewModel.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/viewmodel/CanteenPageViewModel.kt @@ -3,7 +3,7 @@ package com.denizk0461.weserplaner.viewmodel import android.app.Application import androidx.lifecycle.LiveData import com.denizk0461.weserplaner.model.CanteenOffer -import com.denizk0461.weserplaner.model.DietaryPreferences +import com.denizk0461.weserplaner.values.DietaryPreferences class CanteenPageViewModel(app: Application) : AppViewModel(app) { diff --git a/app/src/main/java/com/denizk0461/weserplaner/viewmodel/CanteenViewModel.kt b/app/src/main/java/com/denizk0461/weserplaner/viewmodel/CanteenViewModel.kt index c01cbd0..abb87bb 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/viewmodel/CanteenViewModel.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/viewmodel/CanteenViewModel.kt @@ -4,6 +4,7 @@ import android.app.Application import androidx.lifecycle.LiveData import androidx.lifecycle.viewModelScope import com.denizk0461.weserplaner.data.StwParser +import com.denizk0461.weserplaner.values.DietaryPreferences import com.denizk0461.weserplaner.model.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/denizk0461/weserplaner/viewmodel/TaskOverviewViewModel.kt b/app/src/main/java/com/denizk0461/weserplaner/viewmodel/TaskOverviewViewModel.kt index 4596023..873be29 100644 --- a/app/src/main/java/com/denizk0461/weserplaner/viewmodel/TaskOverviewViewModel.kt +++ b/app/src/main/java/com/denizk0461/weserplaner/viewmodel/TaskOverviewViewModel.kt @@ -1,9 +1,8 @@ package com.denizk0461.weserplaner.viewmodel import android.app.Application -import androidx.lifecycle.LiveData 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]. diff --git a/app/src/main/res/layout/fragment_canteen.xml b/app/src/main/res/layout/fragment_canteen.xml index 1816a39..64b3693 100644 --- a/app/src/main/res/layout/fragment_canteen.xml +++ b/app/src/main/res/layout/fragment_canteen.xml @@ -24,7 +24,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp"> - - - diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index d9ed333..04cbf91 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -14,14 +14,14 @@ android:layout_height="wrap_content" android:fitsSystemWindows="true"> - @@ -58,13 +58,13 @@ android:orientation="vertical" android:paddingBottom="8dp"> - @@ -86,14 +86,14 @@ android:paddingHorizontal="16dp" android:paddingVertical="8dp"> - - - - - - - @@ -233,14 +233,14 @@ android:paddingHorizontal="16dp" android:paddingVertical="8dp"> - - - - - - - - - @@ -433,10 +433,10 @@ android:paddingHorizontal="16dp" android:paddingVertical="8dp"> - @@ -491,14 +491,14 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - - - - - - - - - @@ -645,14 +645,14 @@ android:paddingHorizontal="16dp" android:paddingVertical="8dp"> - - - - - - - @@ -768,7 +768,7 @@ android:id="@+id/input_dev_code" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/ibm_regular" + app:fontFamily="@font/ibm_regular" android:inputType="textNoSuggestions"/> diff --git a/app/src/main/res/layout/fragment_task_overview.xml b/app/src/main/res/layout/fragment_task_overview.xml index 9aff958..dfa3121 100644 --- a/app/src/main/res/layout/fragment_task_overview.xml +++ b/app/src/main/res/layout/fragment_task_overview.xml @@ -20,7 +20,7 @@ android:layout_marginStart="16dp" android:layout_marginEnd="8dp"> - - - - - + app:fontFamily="@font/lato_bolditalic"/> \ No newline at end of file diff --git a/app/src/main/res/layout/item_event.xml b/app/src/main/res/layout/item_event.xml index 66bb879..b81b219 100644 --- a/app/src/main/res/layout/item_event.xml +++ b/app/src/main/res/layout/item_event.xml @@ -1,6 +1,7 @@ - + app:fontFamily="@font/lato_bolditalic"/> - - - @@ -71,7 +72,7 @@ android:src="@drawable/edit_off" android:importantForAccessibility="no"/> - - diff --git a/app/src/main/res/layout/sheet_allergen.xml b/app/src/main/res/layout/sheet_allergen.xml index 2c7330d..a3f7d82 100644 --- a/app/src/main/res/layout/sheet_allergen.xml +++ b/app/src/main/res/layout/sheet_allergen.xml @@ -30,21 +30,21 @@ - - @@ -78,26 +78,26 @@ android:rowCount="2" android:columnCount="2"> - - - - - + - diff --git a/app/src/main/res/layout/sheet_allergen_config.xml b/app/src/main/res/layout/sheet_allergen_config.xml index 5cf42f7..a5c5583 100644 --- a/app/src/main/res/layout/sheet_allergen_config.xml +++ b/app/src/main/res/layout/sheet_allergen_config.xml @@ -29,12 +29,12 @@ - @@ -51,7 +51,7 @@ android:paddingHorizontal="24dp" android:paddingBottom="24dp"> - - - - - - - - - - - - -