Store opened media in the history

Author: MrBoomDeveloper

data/src/commonMain/kotlin/com/mrboomdev/awery/data/database/dao/HistoryDao.kt

@@ -5,7 +5,7 @@ import com.mrboomdev.awery.data.database.entity.DBHistoryItem
 
 @Dao
 interface HistoryDao {
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun add(media: DBHistoryItem)
 
     @Delete

data/src/commonMain/kotlin/com/mrboomdev/awery/data/settings/AwerySettings.kt

@@ -28,6 +28,7 @@ object AwerySettings {
 
     val aweryServerInstance by setting("http://awery.mrboomdev.ru:80")
     val aweryServerToken by setting("")
+    val mediaHistory by setting(true)
     val darkTheme by setting(DarkTheme.AUTO)
     val primaryColor by setting(-1L)
     val amoledTheme by setting(false)

ui/src/androidMain/kotlin/com/mrboomdev/awery/ui/screens/media/MediaScreen.android.kt

@@ -44,6 +44,10 @@ import com.mrboomdev.awery.core.Awery
 import com.mrboomdev.awery.core.utils.LoadingStatus
 import com.mrboomdev.awery.core.utils.replaceAll
 import com.mrboomdev.awery.core.utils.toCalendar
+import com.mrboomdev.awery.data.database.database
+import com.mrboomdev.awery.data.database.entity.DBHistoryItem
+import com.mrboomdev.awery.data.database.history
+import com.mrboomdev.awery.data.settings.AwerySettings
 import com.mrboomdev.awery.extension.loaders.getBanner
 import com.mrboomdev.awery.extension.loaders.getLargePoster
 import com.mrboomdev.awery.extension.sdk.Media
@@ -54,20 +58,38 @@ import com.mrboomdev.awery.ui.components.toast
 import com.mrboomdev.awery.ui.effects.BackEffect
 import com.mrboomdev.awery.ui.popups.BookmarkMediaDialog
 import com.mrboomdev.awery.ui.utils.*
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.serialization.json.Json
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.pluralStringResource
 import org.jetbrains.compose.resources.stringResource
 import java.util.*
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 private val SHADOW_COLOR = Color(0xee000000)
 
+@OptIn(ExperimentalTime::class)
 @Composable
 actual fun MediaScreen(
     destination: Routes.Media,
     viewModel: MediaScreenViewModel,
     contentPadding: PaddingValues
 ) {
+    RememberLaunchedEffect(Unit) {
+        if(AwerySettings.mediaHistory.value) {
+            launch(Dispatchers.IO) {
+                Awery.database.history.media.add(DBHistoryItem(
+                    extensionId = destination.extensionId,
+                    mediaId = destination.media.id,
+                    media = Json.encodeToString(destination.media),
+                    date = Clock.System.now().toEpochMilliseconds()
+                ))
+            }
+        }
+    }
+    
     if(Awery.isTv) TvMediaScreen(destination, viewModel)
     else DefaultMediaScreen(destination, viewModel, contentPadding)
 }
@@ -77,9 +99,9 @@ private fun TvMediaScreen(
     destination: Routes.Media,
     viewModel: MediaScreenViewModel
 ) {
-    val coroutineScope = rememberCoroutineScope()
-    val pagerState = rememberPagerState { 2 }
-	val media by viewModel.media.collectAsState()
+    val coroutineScope = rememberCoroutineScope() 
+    val pagerState = rememberPagerState { 2 } 
+    val media by viewModel.media.collectAsState()
 
     Box(Modifier.fillMaxSize()) {
         AsyncImage(

ui/src/commonMain/kotlin/com/mrboomdev/awery/ui/components/Toaster.kt

@@ -68,8 +68,12 @@ fun ToasterContainer(
                         modifier = Modifier
                             .padding(4.dp)
                             .background(MaterialTheme.colorScheme.surfaceContainerHigh, RoundedCornerShape(8.dp))
-                            .thenIf(toast.onClick != null) { clickable(onClick = toast.onClick!!) }
-                            .fillMaxWidth()
+                            .thenIf(toast.onClick != null) {
+                                clickable(onClick = {
+                                    toast.onClick!!
+                                    state.dismiss(toast)
+                                }) 
+                            }.fillMaxWidth()
                             .padding(horizontal = 16.dp, vertical = 12.dp),
                         horizontalArrangement = Arrangement.spacedBy(8.dp),
                         verticalAlignment = Alignment.CenterVertically

ui/src/commonMain/kotlin/com/mrboomdev/awery/ui/utils/ComposeUtils.kt

@@ -6,11 +6,12 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
+import kotlinx.coroutines.CoroutineScope
 
 @Composable
 fun RememberLaunchedEffect(
 	key1: Any?,
-	block: suspend () -> Unit
+	block: suspend CoroutineScope.() -> Unit
 ) {
 	var didExecute by rememberSaveable(key1) { mutableStateOf(false) }
 

ui/src/desktopMain/kotlin/com/mrboomdev/awery/ui/screens/media/MediaScreen.desktop.kt

@@ -19,15 +19,25 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import coil3.compose.AsyncImage
+import com.mrboomdev.awery.core.Awery
+import com.mrboomdev.awery.data.database.database
+import com.mrboomdev.awery.data.database.entity.DBHistoryItem
+import com.mrboomdev.awery.data.database.history
+import com.mrboomdev.awery.data.settings.AwerySettings
 import com.mrboomdev.awery.extension.loaders.getBanner
 import com.mrboomdev.awery.extension.loaders.getPoster
 import com.mrboomdev.awery.extension.sdk.Media
 import com.mrboomdev.awery.ui.Routes
 import com.mrboomdev.awery.ui.components.LocalToaster
 import com.mrboomdev.awery.ui.components.toast
 import com.mrboomdev.awery.ui.screens.GalleryScreen
+import com.mrboomdev.awery.ui.utils.RememberLaunchedEffect
 import com.mrboomdev.awery.ui.utils.collapse
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.serialization.json.Json
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 @Composable
 actual fun MediaScreen(
@@ -36,7 +46,7 @@ actual fun MediaScreen(
 	contentPadding: PaddingValues
 ) = DesktopMediaScreen(destination, viewModel)
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalTime::class)
 @Composable
 private fun DesktopMediaScreen(
     destination: Routes.Media,
@@ -49,8 +59,8 @@ private fun DesktopMediaScreen(
     }
 
     val infoHeaderBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(snapAnimationSpec = null)
-    val coroutineScope = rememberCoroutineScope()
-    val pagerState = rememberPagerState { tabs.count() }
+    val coroutineScope = rememberCoroutineScope() 
+	val pagerState = rememberPagerState { tabs.count() } 
 	var showGallery by rememberSaveable { mutableStateOf(false) }
     val toaster = LocalToaster.current
 
@@ -88,6 +98,19 @@ private fun DesktopMediaScreen(
 			)
 		}
 	}
+
+	RememberLaunchedEffect(Unit) {
+		if(AwerySettings.mediaHistory.value) {
+			launch(Dispatchers.IO) {
+				Awery.database.history.media.add(DBHistoryItem(
+					extensionId = destination.extensionId,
+					mediaId = destination.media.id,
+					media = Json.encodeToString(destination.media),
+					date = Clock.System.now().toEpochMilliseconds()
+				))
+			}
+		}
+	}
 
     Box(
         modifier = Modifier.fillMaxSize(),