fix: consider new database columns when caching episodes

urFate · Jul 5, 2024 · 549e8d2 · 549e8d2
1 parent 5264bf5
commit 549e8d2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceActivity.kt b/app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceActivity.kt
@@ -398,11 +398,8 @@ fun Resource(
                     FilledIconButton(
                         modifier = Modifier
                             .requiredSize(54.dp),
-                        colors = IconButtonDefaults.filledIconButtonColors(containerColor = MaterialTheme.colorScheme.errorContainer),
-                        onClick = {
-                            model.switchFavouriteStatus(content.shikimoriID)
-                        }
                         colors = IconButtonDefaults.filledIconButtonColors(containerColor = errorContainerLight),
+                        onClick = model::switchFavouriteStatus
                     ) {
                         Icon(
                             modifier = Modifier.size(ButtonDefaults.IconSize),

diff --git a/app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceViewModel.kt b/app/src/main/java/org/shirabox/app/ui/activity/resource/ResourceViewModel.kt
@@ -44,7 +44,7 @@ class ResourceViewModel @Inject constructor(@ApplicationContext context: Context
     val content = mutableStateOf<Content?>(null)
     val relatedContents = mutableStateListOf<Content>()
 
-    val internalContentUid = mutableLongStateOf(0)
+    val internalContentUid = mutableLongStateOf(-1)
 
     val isFavourite = mutableStateOf(false)
     val pinnedTeams = mutableStateListOf<String>()
@@ -169,13 +169,13 @@ class ResourceViewModel @Inject constructor(@ApplicationContext context: Context
         }
     }
 
-    fun switchFavouriteStatus(id: Int) {
+    fun switchFavouriteStatus() {
         viewModelScope.launch(Dispatchers.IO) {
             isFavourite.value = !isFavourite.value
 
-            val content = db.contentDao().getContent(id)
-            content?.let {
-                db.contentDao().updateContents(it.copy(isFavourite = isFavourite.value))
+            if(internalContentUid.longValue > -1) {
+                val content = db.contentDao().getContentByUid(internalContentUid.value)
+                db.contentDao().updateContents(content.copy(isFavourite = isFavourite.value))
             }
         }
     }
@@ -230,6 +230,4 @@ class ResourceViewModel @Inject constructor(@ApplicationContext context: Context
             }
         }
     }
-
-
 }
diff --git a/data/src/main/java/org/shirabox/data/EpisodesHelper.kt b/data/src/main/java/org/shirabox/data/EpisodesHelper.kt
@@ -56,7 +56,9 @@ class EpisodesHelper(private val db: AppDatabase) {
                         uid = matchingEpisode.uid,
                         contentUid = contentUid,
                         watchingTime = matchingEpisode.watchingTime,
-                        readingPage = matchingEpisode.readingPage
+                        readingPage = matchingEpisode.readingPage,
+                        videoLength = matchingEpisode.videoLength,
+                        viewTimestamp = matchingEpisode.viewTimestamp
                     )
                 }
             }