YiR: Share flow for individual slides

app/src/main/java/org/wikipedia/yearinreview/YearInReviewScreenData.kt

@@ -1,7 +1,7 @@
 package org.wikipedia.yearinreview
 
 import android.content.Context
-import androidx.compose.foundation.Image
+import android.graphics.drawable.Animatable
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -28,6 +28,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import coil3.asDrawable
 import coil3.compose.SubcomposeAsyncImage
 import coil3.compose.SubcomposeAsyncImageContent
 import coil3.request.ImageRequest
@@ -50,7 +51,6 @@ sealed class YearInReviewScreenData(
     open class StandardScreen(
         allowDonate: Boolean = true,
         val animatedImageResource: Int = 0,
-        val staticImageResource: Int = 0,
         val headlineText: Any? = null,
         val bodyText: Any? = null,
         showDonateInToolbar: Boolean = true
@@ -84,11 +84,22 @@ sealed class YearInReviewScreenData(
                                 aspectRatio: Float) {
             SubcomposeAsyncImage(
                 model = ImageRequest.Builder(context)
-                    .data(if (screenCaptureMode) staticImageResource else animatedImageResource)
+                    .data(animatedImageResource)
                     .allowHardware(false)
                     .build(),
                 loading = { LoadingIndicator() },
-                success = { SubcomposeAsyncImageContent() },
+                success = {
+                    val drawable = it.result.image.asDrawable(context.resources)
+                    val animatable = drawable as? Animatable
+                    animatable?.let { animation ->
+                        if (screenCaptureMode) {
+                            animation.stop()
+                        } else if (!animation.isRunning) {
+                            animation.start()
+                        }
+                    }
+                    SubcomposeAsyncImageContent()
+                },
                 onSuccess = { isImageResourceLoaded?.invoke(true) },
                 contentDescription = stringResource(R.string.year_in_review_screendeck_image_content_description),
                 modifier = Modifier.fillMaxSize()
@@ -128,7 +139,6 @@ sealed class YearInReviewScreenData(
     class ReadingPatterns(
         allowDonate: Boolean = true,
         animatedImageResource: Int = 0,
-        staticImageResource: Int = 0,
         headlineText: Any? = null,
         bodyText: Any? = null,
         val favoriteTimeText: String,
@@ -137,7 +147,6 @@ sealed class YearInReviewScreenData(
     ) : StandardScreen(
         allowDonate,
         animatedImageResource = animatedImageResource,
-        staticImageResource = staticImageResource,
         headlineText = headlineText,
         bodyText = bodyText,
     )
@@ -149,22 +158,11 @@ sealed class YearInReviewScreenData(
         val showDonateButton: Boolean = false
     ) : StandardScreen(
         allowDonate = allowDonate,
+        animatedImageResource = R.drawable.launcher_foreground_yir25,
         headlineText = headlineText,
         bodyText = bodyText,
         showDonateInToolbar = !showDonateButton
     ) {
-        @Composable
-        override fun HeaderContents(context: Context,
-                                    screenCaptureMode: Boolean,
-                                    isImageResourceLoaded: ((Boolean) -> Unit)?,
-                                    aspectRatio: Float) {
-            Image(
-                modifier = Modifier.size(200.dp),
-                painter = painterResource(R.drawable.launcher_foreground_yir25),
-                contentDescription = null
-            )
-        }
-
         @Composable
         override fun BottomButton(context: Context, onButtonClick: () -> Unit) {
             if (showDonateButton) {

app/src/main/java/org/wikipedia/yearinreview/YearInReviewScreenDeck.kt

@@ -1,11 +1,9 @@
 package org.wikipedia.yearinreview
 
 import android.graphics.Bitmap
-import android.graphics.BlurMaskFilter
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.tween
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -28,10 +26,7 @@ import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
@@ -52,19 +47,16 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.graphics.Paint
 import androidx.compose.ui.graphics.asAndroidBitmap
 import androidx.compose.ui.graphics.layer.drawLayer
-import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.graphics.rememberGraphicsLayer
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextLinkStyles
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -104,13 +96,15 @@ fun YearInReviewScreenDeck(
                 CreateScreenShotBitmap(
                     screenContent = pages[pagerState.currentPage]
                 ) { bitmap ->
+                    val googlePlayUrl = context.getString(R.string.year_in_review_share_url) + YearInReviewViewModel.YIR_TAG
+                    val bodyText = context.getString(R.string.year_in_review_share_body, googlePlayUrl, context.getString(R.string.year_in_review_hashtag))
                     ShareUtil.shareImage(
                         coroutineScope = coroutineScope,
                         context = context,
                         bmp = bitmap,
-                        imageFileName = "year_in_review",
+                        imageFileName = YearInReviewViewModel.YIR_TAG,
                         subject = context.getString(R.string.year_in_review_share_subject),
-                        text = context.getString(R.string.year_in_review_share_url)
+                        text = bodyText
                     )
                     startCapture = false
                 }
@@ -182,7 +176,9 @@ fun YearInReviewScreenDeck(
                         contentPadding = PaddingValues(0.dp),
                     ) { page ->
                         YearInReviewScreenContent(
-                            innerPadding = paddingValues,
+                            modifier = Modifier
+                                .padding(paddingValues)
+                                .verticalScroll(rememberScrollState()),
                             screenData = pages[page]
                         )
                     }
@@ -287,7 +283,6 @@ fun CreateScreenShotBitmap(
     screenContent: YearInReviewScreenData,
     onBitmapReady: (Bitmap) -> Unit
 ) {
-    val shadowColor = WikipediaTheme.colors.primaryColor
     val graphicsLayer = rememberGraphicsLayer()
     var isImageLoaded by remember { mutableStateOf(false) }
 
@@ -300,14 +295,15 @@ fun CreateScreenShotBitmap(
 
     Column(
         modifier = Modifier
-            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
             .drawWithContent {
                 graphicsLayer.record {
                     [email protected]()
                 }
                 drawLayer(graphicsLayer)
             }
-            .background(color = WikipediaTheme.colors.paperColor),
+            .background(color = WikipediaTheme.colors.paperColor)
+            .padding(vertical = 8.dp),
         verticalArrangement = Arrangement.Center,
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
@@ -316,79 +312,43 @@ fun CreateScreenShotBitmap(
             modifier = Modifier
                 .fillMaxWidth()
                 .wrapContentHeight()
-                .padding(bottom = 40.dp),
+                .padding(vertical = 12.dp),
             horizontalArrangement = Arrangement.Center,
             verticalAlignment = Alignment.CenterVertically
         ) {
             Icon(
                 painter = painterResource(R.drawable.ic_wikipedia_b),
                 tint = WikipediaTheme.colors.primaryColor,
-                contentDescription = stringResource(R.string.year_in_review_navigate_left),
+                contentDescription = stringResource(R.string.app_name_prod),
                 modifier = Modifier
-                    .height(32.dp)
-                    .width(50.dp)
+                    .height(20.dp)
+                    .width(31.dp)
             )
         }
+
         YearInReviewScreenContent(
-            innerPadding = PaddingValues(0.dp),
+            modifier = Modifier
+                .padding(0.dp),
             screenData = screenContent,
             screenCaptureMode = true,
-        ) { isLoaded -> isImageLoaded = isLoaded }
-
-        Card(
-            shape = RoundedCornerShape(10.dp),
-            colors = CardDefaults.cardColors(
-                containerColor = WikipediaTheme.colors.paperColor
-            ),
-            modifier = Modifier
-                .width(312.dp)
-                .padding(top = 36.dp)
-                .drawBehind {
-                    /* Manually creating card shadow for render compatibility with graphicsLayer.toImageBitmap() */
-                    val paint = Paint().asFrameworkPaint().apply {
-                        color = shadowColor.copy(alpha = 0.15f).toArgb()
-                        maskFilter = BlurMaskFilter(
-                            20f,
-                            BlurMaskFilter.Blur.NORMAL
-                        )
-                    }
-                    drawContext.canvas.nativeCanvas.drawRoundRect(
-                        0f,
-                        0f,
-                        size.width,
-                        size.height,
-                        16f,
-                        16f,
-                        paint
-                    )
-                }
         ) {
-            Row(
-                horizontalArrangement = Arrangement.spacedBy(12.dp, Alignment.Start),
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .wrapContentHeight()
-                    .padding(start = 12.dp, end = 16.dp, top = 12.dp, bottom = 11.dp)
-
-            ) {
-                Image(
-                    painter = painterResource(R.drawable.globe),
-                    contentDescription = stringResource(R.string.year_in_review_globe_icon)
-                )
-                Text(
-                    text = "#WikipediaYearInReview",
-                    color = WikipediaTheme.colors.progressiveColor,
-                    style = MaterialTheme.typography.titleSmall
-                )
-            }
+            isLoaded -> isImageLoaded = isLoaded
         }
+
+        Text(
+            modifier = Modifier.padding(top = 32.dp),
+            text = processString(R.string.year_in_review_hashtag),
+            color = WikipediaTheme.colors.primaryColor,
+            style = MaterialTheme.typography.bodyLarge.copy(
+                fontWeight = FontWeight.Medium
+            )
+        )
     }
 }
 
 @Composable
 fun YearInReviewScreenContent(
-    innerPadding: PaddingValues,
+    modifier: Modifier = Modifier,
     screenData: YearInReviewScreenData,
     screenCaptureMode: Boolean = false,
     isOnboardingScreen: Boolean = false,
@@ -397,7 +357,7 @@ fun YearInReviewScreenContent(
     when (screenData) {
         is YearInReviewScreenData.StandardScreen -> {
             StandardScreenContent(
-                innerPadding = innerPadding,
+                modifier = modifier,
                 screenData = screenData,
                 screenCaptureMode = screenCaptureMode,
                 isOnboardingScreen = isOnboardingScreen,
@@ -416,20 +376,16 @@ fun YearInReviewScreenContent(
 @Composable
 private fun StandardScreenContent(
     modifier: Modifier = Modifier,
-    innerPadding: PaddingValues,
     screenData: YearInReviewScreenData.StandardScreen,
     screenCaptureMode: Boolean = false,
     isOnboardingScreen: Boolean = false,
     isImageResourceLoaded: ((Boolean) -> Unit)? = null,
 ) {
-    val scrollState = rememberScrollState()
     val headerAspectRatio = 3f / 2f
     val context = LocalContext.current
     Column(
         verticalArrangement = Arrangement.Top,
         modifier = modifier
-            .padding(innerPadding)
-            .verticalScroll(scrollState)
     ) {
         screenData.Header(context, screenCaptureMode, isImageResourceLoaded, headerAspectRatio)
         Column {
@@ -562,7 +518,6 @@ fun PreviewScreenShot() {
             screenContent = YearInReviewScreenData.StandardScreen(
                 allowDonate = true,
                 animatedImageResource = R.drawable.year_in_review_puzzle_pieces,
-                staticImageResource = R.drawable.year_in_review_puzzle_pieces,
                 headlineText = "Over 3 billion bytes added",
                 bodyText = "TBD"
             )
@@ -579,7 +534,6 @@ fun PreviewStandardContent() {
                 YearInReviewScreenData.StandardScreen(
                     allowDonate = true,
                     animatedImageResource = R.drawable.year_in_review_puzzle_pieces,
-                    staticImageResource = R.drawable.year_in_review_puzzle_pieces,
                     headlineText = "Over 3 billion bytes added",
                     bodyText = "TBD"
                 )
@@ -600,7 +554,6 @@ fun PreviewReadingPatternsContent() {
                 YearInReviewScreenData.ReadingPatterns(
                     allowDonate = false,
                     animatedImageResource = R.drawable.year_in_review_puzzle_pieces,
-                    staticImageResource = R.drawable.year_in_review_puzzle_pieces,
                     headlineText = "You have clear reading patterns",
                     bodyText = "",
                     favoriteTimeText = "Afternoon",