diff --git a/app/src/main/java/com/denizk0461/studip/fragment/CanteenFragment.kt b/app/src/main/java/com/denizk0461/studip/fragment/CanteenFragment.kt index 74b3ce2..98af92f 100644 --- a/app/src/main/java/com/denizk0461/studip/fragment/CanteenFragment.kt +++ b/app/src/main/java/com/denizk0461/studip/fragment/CanteenFragment.kt @@ -32,6 +32,10 @@ class CanteenFragment : Fragment() { private lateinit var viewPagerAdapter: CanteenOfferPageAdapter private val viewModel: CanteenViewModel by viewModels() + + private var elements: List = listOf() + private var dateSize = 0 + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { _binding = FragmentCanteenBinding.inflate(inflater, container, false) return binding.root @@ -77,12 +81,16 @@ class CanteenFragment : Fragment() { liveData = viewModel.allOffers liveData.observe(viewLifecycleOwner) { offers -> + elements = offers val groupedElements = offers.groupElements().distinct() dates = groupedElements.map { it.date }.distinct() createTabLayoutMediator() +// this.groupedElements = groupedElements + this.dateSize = dates.size + viewPagerAdapter.setNewItems(groupedElements, dates.size) // TODO this must be changed. if an exception is raised, then this will not fire @@ -113,7 +121,8 @@ class CanteenFragment : Fragment() { private fun setPreference(pref: DietaryPreferences, newValue: Boolean) { viewModel.setPreference(pref, newValue) - viewPagerAdapter.refreshView(getPrefRegex()) +// viewPagerAdapter.refreshView(getPrefRegex()) + viewPagerAdapter.setNewItems(elements.groupElements().distinct(), dateSize) } private fun getPreference(pref: DietaryPreferences): Boolean = @@ -137,6 +146,8 @@ class CanteenFragment : Fragment() { } } +// Log.d("eek!6", "preference: $prefsRegex, list: $filteredForPreferences") + // val a = filteredForPreferences.map { // CanteenOfferGroupElement( // it.title, diff --git a/app/src/main/res/layout/fragment_canteen.xml b/app/src/main/res/layout/fragment_canteen.xml index fe49279..fa13de0 100644 --- a/app/src/main/res/layout/fragment_canteen.xml +++ b/app/src/main/res/layout/fragment_canteen.xml @@ -61,9 +61,7 @@ android:id="@+id/chip_pref_fish" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/pref_fish" - app:chipIcon="@drawable/cross" - app:checkedIcon="@drawable/flatware"/> + android:text="@string/pref_fish"/>