diff --git a/app/src/main/java/com/kudlav/kam/adapters/MenuAdapter.kt b/app/src/main/java/com/kudlav/kam/adapters/MenuAdapter.kt index 0e40b95..ef2db76 100644 --- a/app/src/main/java/com/kudlav/kam/adapters/MenuAdapter.kt +++ b/app/src/main/java/com/kudlav/kam/adapters/MenuAdapter.kt @@ -14,6 +14,7 @@ import kotlinx.android.synthetic.main.header_menu.view.* import android.view.LayoutInflater import com.kudlav.kam.R import kotlinx.android.synthetic.main.dialog_food.view.* +import java.lang.Exception class MenuAdapter(private val section: FoodType, private val itemList: ArrayList): StatelessSection( SectionParameters.builder() @@ -48,10 +49,13 @@ class MenuAdapter(private val section: FoodType, private val itemList: ArrayList inner class ItemViewHolder(private val view: View): RecyclerView.ViewHolder(view) { + private val preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(view.context) + private val lang: String? = preferences.getString("food_lang", "cs") + private val priceCategory: String? = preferences.getString("price_category", "cs") + private val allergenChosen: Set? = preferences.getStringSet("allergens", null) + private val allergenNames = view.context.resources.getStringArray(R.array.allergen_entries) + fun bind(position: Int) { - val preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(view.context) - val lang: String? = preferences.getString("food_lang", "cs") - val priceCategory: String? = preferences.getString("price_category", "cs") val data = itemList[position] val price: Int? = when(priceCategory) { @@ -64,6 +68,17 @@ class MenuAdapter(private val section: FoodType, private val itemList: ArrayList view.tvWeight.text = if (data.weight != null) "%d %s".format(data.weight, view.context.getString(R.string.unit_weight)) else "" + val allergens: ArrayList = ArrayList() + try { + allergenChosen?.forEach { item: String -> + if (data.allergens.contains(item.toInt())) { + allergens.add(allergenNames[item.toInt()-1]) + } + } + } catch (e: Exception) { + } + view.tvAllergens.text = allergens.joinToString() + view.tvPrice.text = if (price != null) "%d %s".format(price, view.context.getString(R.string.currency)) else "? ${view.context.getString(R.string.currency)}" diff --git a/app/src/main/res/layout/item_menu.xml b/app/src/main/res/layout/item_menu.xml index c5a504d..569ea09 100644 --- a/app/src/main/res/layout/item_menu.xml +++ b/app/src/main/res/layout/item_menu.xml @@ -23,10 +23,24 @@ android:textSize="16sp" android:textAppearance="@style/TextAppearance.AppCompat.Title" /> - + + + + + + + - Student Zaměstnanec Ostatní - - student - employee - Other - - Čeština Angličtina - - cs - en - Světlý @@ -28,10 +17,21 @@ Nastavený spořičem baterie Podle systému - - MODE_NIGHT_NO - MODE_NIGHT_YES - MODE_NIGHT_AUTO_BATTERY - MODE_NIGHT_FOLLOW_SYSTEM + + + Lepek + Korýši + Vejce + Ryby + Arašídy + Sója + Mléko + Ořechy + Celer + Hořčice + Sezam + Oxid siřičitý + Vlčí bob + Měkkýši diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6334344..2064c36 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -42,4 +42,5 @@ Ochrana soukromí Číslo karty je uloženo v zařízení a přenášeno nešifrovaně na server www.kam.vutbr.cz. V rámci záloh vašeho systému může být uloženo na servery Google. Aplikace nezíská informace o majiteli účtu. Oblíbené + Zobrazované alergeny diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index c81e621..7c13b6f 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -32,4 +32,38 @@ MODE_NIGHT_AUTO_BATTERY MODE_NIGHT_FOLLOW_SYSTEM + + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + Gluten + Crustaceans + Eggs + Fish + Peanuts + Soybeans + Milk + Nuts + Celery + Mustard + Sesame seeds + Sulphur dioxide and sulphites + Lupin + Molluscs + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 110babd..95407f5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -42,4 +42,5 @@ Privacy policy Card number is stored in your device and transmitted to the www.kam.vutbr.cz using unsecured connection. It can be saved to Google servers as a backup of your system. The app does not get account owner information. Favorite + Displayed allergens diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index 35d8598..6c0a1c3 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -29,27 +29,34 @@ + +