From 797a634da49c59ed0d70c8bb514f93321f103bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deniz=20D=C3=BCzg=C3=B6ren?= Date: Sun, 15 Sep 2019 15:02:26 +0200 Subject: [PATCH] Restored priority variable because an update would mess up the order of the items temporarily --- .../main/java/com/denizd/substitutionplan/data/DataFetcher.kt | 4 +++- .../java/com/denizd/substitutionplan/database/SubstDao.kt | 2 +- .../denizd/substitutionplan/fragments/PersonalPlanFragment.kt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/denizd/substitutionplan/data/DataFetcher.kt b/app/src/main/java/com/denizd/substitutionplan/data/DataFetcher.kt index 2b93b15..48cc3f0 100644 --- a/app/src/main/java/com/denizd/substitutionplan/data/DataFetcher.kt +++ b/app/src/main/java/com/denizd/substitutionplan/data/DataFetcher.kt @@ -44,6 +44,7 @@ internal class DataFetcher(isPlan: Boolean, isMenu: Boolean, isJobService: Boole private var mContext = WeakReference(context) private var mApplication = application private var mView = WeakReference(parentView) + private var priority = 200 private var notificationText = "" private var informational = "" private val prefs = PreferenceManager.getDefaultSharedPreferences(mContext.get()) @@ -170,10 +171,11 @@ internal class DataFetcher(isPlan: Boolean, isMenu: Boolean, isJobService: Boole additional = cols[5].text(), teacher = cols[6].text(), type = cols[7].text(), - priority = i + priority = priority ) substArray.add(subst) substRepo.insert(subst) + priority-- } var countOfNotificationItems = 0 var countOfMoreNotificationItems = 0 diff --git a/app/src/main/java/com/denizd/substitutionplan/database/SubstDao.kt b/app/src/main/java/com/denizd/substitutionplan/database/SubstDao.kt index c8307e8..c446e85 100644 --- a/app/src/main/java/com/denizd/substitutionplan/database/SubstDao.kt +++ b/app/src/main/java/com/denizd/substitutionplan/database/SubstDao.kt @@ -8,7 +8,7 @@ import com.denizd.substitutionplan.models.Subst @Dao internal interface SubstDao { - @get:Query("SELECT * FROM subst_table ORDER BY priority ASC") + @get:Query("SELECT * FROM subst_table ORDER BY priority DESC") val allSubst: LiveData> @Insert diff --git a/app/src/main/java/com/denizd/substitutionplan/fragments/PersonalPlanFragment.kt b/app/src/main/java/com/denizd/substitutionplan/fragments/PersonalPlanFragment.kt index ad7ebfe..5cd7db5 100644 --- a/app/src/main/java/com/denizd/substitutionplan/fragments/PersonalPlanFragment.kt +++ b/app/src/main/java/com/denizd/substitutionplan/fragments/PersonalPlanFragment.kt @@ -39,7 +39,7 @@ internal class PersonalPlanFragment : PlanFragment() { } persPlanEmpty = (planCardList.size == 1 && planCardList[0].date.substring(0, 3) == "psa") || planCardList.isEmpty() - planCardList.sortWith(Comparator { rhs, lhs -> rhs.priority.compareTo(lhs.priority) }) + planCardList.sortWith(Comparator { lhs, rhs -> rhs.priority.compareTo(lhs.priority) }) recyclerView.scheduleLayoutAnimation() mAdapter.setSubst(planCardList)