From f28487b07c2db80505eb382bfd68709b489b1daa Mon Sep 17 00:00:00 2001 From: yattoz <12408848+yattoz@users.noreply.github.com> Date: Tue, 14 Apr 2020 00:31:18 +0200 Subject: [PATCH] fixed bug in Planning displayed multiple times (not cleared in-between) --- .../main/java/fr/forum_thalie/tsumugi/planning/Planning.kt | 1 + .../forum_thalie/tsumugi/ui/programme/ProgrammeDayFragment.kt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/planning/Planning.kt b/app/src/main/java/fr/forum_thalie/tsumugi/planning/Planning.kt index 6c4121b..0e38840 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/planning/Planning.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/planning/Planning.kt @@ -64,6 +64,7 @@ class Planning { if (result.has("planning")) { val programList = result.getJSONArray("planning") + programmes.clear() for (i in 0 until programList.length()) { val item = programList[i] as JSONObject diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeDayFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeDayFragment.kt index 98d12dd..408f152 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeDayFragment.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeDayFragment.kt @@ -32,13 +32,13 @@ class ProgrammeDayFragment : Fragment() { viewModel.day = arguments?.getString("day") ?: "" val root = inflater.inflate(R.layout.fragment_programme_day, container, false) + Planning.instance.programmes.forEach { if (it.isThisDay(day = weekdays.indexOf(viewModel.day))) programmeOfTheDay.add(it) } viewManager = LinearLayoutManager(context) - viewAdapter = - ProgrammeAdapter(programmeOfTheDay, viewModel.day) + viewAdapter = ProgrammeAdapter(programmeOfTheDay, viewModel.day) recyclerView = root.findViewById(R.id.programme_recycler).apply { // use this setting to improve performance if you know that changes // in content do not change the layout size of the RecyclerView