Update transition id to correspond to item id, instead of random id g…

…enerated by groupie.
bernaferrari · Sep 23, 2018 · 970a94753c389a15d047aac166d107f8eaa86afa · 970a947
1 parent 7ebc842
commit 970a94753c389a15d047aac166d107f8eaa86afa
diff --git a/app/src/main/java/com/bernaferrari/changedetection/MainFragment.kt b/app/src/main/java/com/bernaferrari/changedetection/MainFragment.kt
@@ -269,7 +269,7 @@ class MainFragment : ScopedFragment() {
            MainActivity.LASTCHANGE to item.lastSnap?.timestamp?.convertTimestampToDate()
        )

-        val extras = view?.findViewWithTag<View>("${item.id}")?.let {
+        val extras = view?.findViewWithTag<View>(item.site.id)?.let {
            FragmentNavigatorExtras(it to getString(R.string.shared_transition))
        }

diff --git a/app/src/main/java/com/bernaferrari/changedetection/MainViewModel.kt b/app/src/main/java/com/bernaferrari/changedetection/MainViewModel.kt
@@ -82,7 +82,7 @@ class MainViewModel(
        mSitesRepository.updateSite(site)
    }

-    internal var items = MutableLiveData<MutableList<SiteAndLastSnap>>()
+    private var items = MutableLiveData<MutableList<SiteAndLastSnap>>()

    internal fun loadSites(): MutableLiveData<MutableList<SiteAndLastSnap>> {
        items = MutableLiveData()
@@ -91,15 +91,13 @@ class MainViewModel(
    }

    internal fun updateItems() = GlobalScope.launch {
-
        mutableListOf<SiteAndLastSnap>().also { list ->
            mSitesRepository.getSites().mapTo(list) { SiteAndLastSnap(it, getLastSnap(it.id)) }

            withContext(Dispatchers.Main) {
                items.value = list
            }
        }
-
    }

    private suspend fun getLastSnap(siteId: String): Snap? {
diff --git a/app/src/main/java/com/bernaferrari/changedetection/groupie/MainCardItem.kt b/app/src/main/java/com/bernaferrari/changedetection/groupie/MainCardItem.kt
@@ -94,7 +94,7 @@ class MainCardItem(
            changeStatus()
        }

-        val tag = "$id"
+        val tag = site.id
        holder.containerView.tag = tag
        ViewCompat.setTransitionName(holder.containerView, tag)