DROID-4030 Media | Fix | Handle "archived" state on media preview screen

app/src/main/java/com/anytypeio/anytype/ui/media/MediaActivity.kt

@@ -23,14 +23,15 @@ import com.anytypeio.anytype.di.common.componentManager
 import com.anytypeio.anytype.localization.R
 import com.anytypeio.anytype.presentation.media.MediaViewModel
 import com.anytypeio.anytype.presentation.media.MediaViewModel.MediaViewState
+import com.anytypeio.anytype.presentation.search.Subscriptions
 import com.anytypeio.anytype.ui.media.screens.AudioPlayerBox
 import com.anytypeio.anytype.ui.media.screens.ImageGalleryBox
 import com.anytypeio.anytype.ui.media.screens.VideoPlayerBox
+import com.anytypeio.anytype.ui.widgets.collection.CollectionFragment
 import java.util.ArrayList
 import javax.inject.Inject
 import kotlinx.coroutines.launch
 import timber.log.Timber
-
 class MediaActivity : ComponentActivity() {
 
     @Inject
@@ -69,7 +70,14 @@ class MediaActivity : ComponentActivity() {
                         finish()
                     }
                     is MediaViewState.VideoContent -> {
-                        VideoPlayerBox(url = state.url)
+                        val videoId = intent.getStringArrayListExtra(EXTRA_OBJECTS)?.firstOrNull()
+                        VideoPlayerBox(
+                            url = state.url,
+                            isArchived = state.isArchived,
+                            onRestoreClick = {
+                                videoId?.let { vm.onRestoreObjectClicked(it) }
+                            }
+                        )
                     }
                     is MediaViewState.ImageContent -> {
                         ImageGalleryBox(
@@ -87,13 +95,21 @@ class MediaActivity : ComponentActivity() {
                                     toast("Space not found")
                                 }
                             },
-                            onDeleteClick = vm::onDeleteObject
+                            onDeleteClick = vm::onDeleteObject,
+                            onRestoreClick = { obj ->
+                                vm.onRestoreObjectClicked(obj)
+                            }
                         )
                     }
                     is MediaViewState.AudioContent -> {
+                        val audioId = intent.getStringArrayListExtra(EXTRA_OBJECTS)?.firstOrNull()
                         AudioPlayerBox(
                             name = state.name,
-                            url = state.url
+                            url = state.url,
+                            isArchived = state.isArchived,
+                            onRestoreClick = {
+                                audioId?.let { vm.onRestoreObjectClicked(it) }
+                            }
                         )
                     }
                 }
@@ -123,6 +139,9 @@ class MediaActivity : ComponentActivity() {
                             MediaViewModel.Command.ShowToast.MovedToBin -> {
                                 toast(getString(R.string.toast_moved_to_bin))
                             }
+                            MediaViewModel.Command.ShowToast.Restored -> {
+                                toast(getString(R.string.toast_restored))
+                            }
                         }
                     }
                 }
@@ -138,11 +157,21 @@ class MediaActivity : ComponentActivity() {
         val name = intent.getStringExtra(EXTRA_MEDIA_NAME)
         val mediaType = intent.getIntExtra(EXTRA_MEDIA_TYPE, TYPE_UNKNOWN)
         val index = intent.getIntExtra(EXTRA_IMAGE_INDEX, 0)
+        val givenSpace = space
+
+        if (givenSpace == null) {
+            Timber.e("Space ID is missing")
+            toast("Space not found")
+            finish()
+            return
+        }
+
+        val spaceId = SpaceId(givenSpace)
 
         when (mediaType) {
-            TYPE_IMAGE -> vm.processImage(objects, index)
-            TYPE_VIDEO -> vm.processVideo(objects.firstOrNull().orEmpty())
-            TYPE_AUDIO -> vm.processAudio(objects.firstOrNull().orEmpty(), name.orEmpty())
+            TYPE_IMAGE -> vm.processImage(objects, index, spaceId)
+            TYPE_VIDEO -> vm.processVideo(objects.firstOrNull().orEmpty(), spaceId)
+            TYPE_AUDIO -> vm.processAudio(objects.firstOrNull().orEmpty(), name.orEmpty(), spaceId)
             else -> {
                 Timber.e("Invalid media type: $mediaType")
                 finish()

app/src/main/java/com/anytypeio/anytype/ui/media/screens/MediaScreen.kt

@@ -51,6 +51,11 @@ import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
@@ -62,6 +67,7 @@ import com.anytypeio.anytype.core_models.Id
 import com.anytypeio.anytype.core_ui.common.DefaultPreviews
 import com.anytypeio.anytype.core_ui.views.BodyCallout
 import com.anytypeio.anytype.core_ui.views.Caption1Medium
+import com.anytypeio.anytype.core_ui.views.Caption2Medium
 import com.anytypeio.anytype.presentation.media.MediaViewModel
 import kotlinx.coroutines.delay
 import me.saket.telephoto.zoomable.coil3.ZoomableAsyncImage
@@ -74,7 +80,8 @@ fun ImageGallery(
     onBackClick: () -> Unit = {},
     onDownloadClick: (Id) -> Unit = {},
     onOpenClick: (Id) -> Unit = {},
-    onDeleteClick: (Id) -> Unit = {}
+    onDeleteClick: (Id) -> Unit = {},
+    onRestoreClick: (Id) -> Unit = {}
 ) {
     val pagerState = rememberPagerState(initialPage = index) { images.size }
     var chromeVisible by remember { mutableStateOf(true) }
@@ -83,6 +90,9 @@ fun ImageGallery(
         chromeVisible = true
     }
 
+    val currentImage = images.getOrNull(pagerState.settledPage)
+    val isCurrentImageArchived = currentImage?.isArchived ?: false
+
     Box(Modifier.fillMaxSize()) {
         HorizontalPager(
             state = pagerState,
@@ -101,6 +111,46 @@ fun ImageGallery(
             )
         }
 
+        // Archived banner (top-center)
+        if (isCurrentImageArchived) {
+            val fullText = stringResource(R.string.media_object_in_bin)
+            val restoreText = "Restore it?"
+            val startIndex = fullText.indexOf(restoreText)
+
+            val annotatedText = buildAnnotatedString {
+                if (startIndex >= 0) {
+                    // Add text before "Restore it?"
+                    append(fullText.substring(0, startIndex))
+                    // Add "Restore it?" with underline
+                    withStyle(style = SpanStyle(textDecoration = TextDecoration.Underline)) {
+                        append(restoreText)
+                    }
+                    // Add any text after (shouldn't be any in this case)
+                    if (startIndex + restoreText.length < fullText.length) {
+                        append(fullText.substring(startIndex + restoreText.length))
+                    }
+                } else {
+                    append(fullText)
+                }
+            }
+
+            Box(
+                modifier = Modifier
+                    .align(Alignment.TopCenter)
+                    .systemBarsPadding()
+                    .padding(top = 16.dp)
+                    .clickable { 
+                        currentImage?.let { onRestoreClick(it.obj) }
+                    }
+            ) {
+                Text(
+                    text = annotatedText,
+                    style = BodyCallout,
+                    color = colorResource(R.color.text_secondary)
+                )
+            }
+        }
+
         // Page counter chip (top-center)
 
         if (images.size > 1) {
@@ -113,7 +163,7 @@ fun ImageGallery(
                 Box(
                     modifier = Modifier
                         .systemBarsPadding()
-                        .padding(top = 48.dp)
+                        .padding(top = if (isCurrentImageArchived) 48.dp else 48.dp)
                         .background(
                             color = colorResource(R.color.home_screen_toolbar_button),
                             shape = RoundedCornerShape(12.dp)
@@ -140,6 +190,7 @@ fun ImageGallery(
         ) {
             MediaActionToolbar(
                 modifier = Modifier.padding(bottom = 32.dp),
+                isArchived = isCurrentImageArchived,
                 onBackClick = onBackClick,
                 onDownloadClick = {
                     onDownloadClick(images[pagerState.settledPage].obj)
@@ -220,48 +271,124 @@ private fun ImageViewer(
     }
 }
 
+@Composable
+fun ImageGalleryBox(
+    images: List<MediaViewModel.MediaViewState.ImageContent.Image> =  emptyList(),
+    index: Int = 0,
+    onBackClick: () -> Unit = {},
+    onDownloadClick: (Id) -> Unit = {},
+    onOpenClick: (Id) -> Unit = {},
+    onDeleteClick: (Id) -> Unit = {},
+    onRestoreClick: (Id) -> Unit = {}
+) {
+    Box(modifier = Modifier.fillMaxSize()) {
+        ImageGallery(
+            images = images,
+            index = index,
+            onBackClick = onBackClick,
+            onDownloadClick = onDownloadClick,
+            onDeleteClick = onDeleteClick,
+            onOpenClick = onOpenClick,
+            onRestoreClick = onRestoreClick
+        )
+    }
+}
+
 @Composable
 fun AudioPlayerBox(
     name: String,
-    url: String
+    url: String,
+    isArchived: Boolean = false,
+    onRestoreClick: () -> Unit = {}
 ) {
     Box(modifier = Modifier.fillMaxSize()) {
         AudioPlayer(
             url = url,
             name = name
         )
+
+        // Archived banner (top-center)
+        if (isArchived) {
+            val fullText = stringResource(R.string.media_object_in_bin)
+            val restoreText = "Restore it?"
+            val startIndex = fullText.indexOf(restoreText)
+
+            val annotatedText = buildAnnotatedString {
+                if (startIndex >= 0) {
+                    append(fullText.substring(0, startIndex))
+                    withStyle(style = SpanStyle(textDecoration = TextDecoration.Underline)) {
+                        append(restoreText)
+                    }
+                    if (startIndex + restoreText.length < fullText.length) {
+                        append(fullText.substring(startIndex + restoreText.length))
+                    }
+                } else {
+                    append(fullText)
+                }
+            }
+
+            Box(
+                modifier = Modifier
+                    .align(Alignment.TopCenter)
+                    .systemBarsPadding()
+                    .padding(top = 16.dp)
+                    .clickable { onRestoreClick() }
+            ) {
+                Text(
+                    text = annotatedText,
+                    style = BodyCallout,
+                    color = colorResource(R.color.text_secondary)
+                )
+            }
+        }
     }
 }
 
 @Composable
 fun VideoPlayerBox(
-    url: String
+    url: String,
+    isArchived: Boolean = false,
+    onRestoreClick: () -> Unit = {}
 ) {
     Box(modifier = Modifier.fillMaxSize()) {
         VideoPlayer(
             url = url
         )
-    }
-}
-
-@Composable
-fun ImageGalleryBox(
-    images: List<MediaViewModel.MediaViewState.ImageContent.Image> =  emptyList(),
-    index: Int = 0,
-    onBackClick: () -> Unit = {},
-    onDownloadClick: (Id) -> Unit = {},
-    onOpenClick: (Id) -> Unit = {},
-    onDeleteClick: (Id) -> Unit = {}
-) {
-    Box(modifier = Modifier.fillMaxSize()) {
-        ImageGallery(
-            images = images,
-            index = index,
-            onBackClick = onBackClick,
-            onDownloadClick = onDownloadClick,
-            onDeleteClick = onDeleteClick,
-            onOpenClick = onOpenClick
-        )
+
+        // Archived banner (top-center)
+        if (isArchived) {
+            val fullText = stringResource(R.string.media_object_in_bin)
+            val restoreText = "Restore it?"
+            val startIndex = fullText.indexOf(restoreText)
+
+            val annotatedText = buildAnnotatedString {
+                if (startIndex >= 0) {
+                    append(fullText.substring(0, startIndex))
+                    withStyle(style = SpanStyle(textDecoration = TextDecoration.Underline)) {
+                        append(restoreText)
+                    }
+                    if (startIndex + restoreText.length < fullText.length) {
+                        append(fullText.substring(startIndex + restoreText.length))
+                    }
+                } else {
+                    append(fullText)
+                }
+            }
+
+            Box(
+                modifier = Modifier
+                    .align(Alignment.TopCenter)
+                    .systemBarsPadding()
+                    .padding(top = 16.dp)
+                    .clickable { onRestoreClick() }
+            ) {
+                Text(
+                    text = annotatedText,
+                    style = BodyCallout,
+                    color = colorResource(R.color.text_secondary)
+                )
+            }
+        }
     }
 }