Yir highlights

app/src/main/java/org/wikipedia/util/ShareUtil.kt

@@ -54,7 +54,7 @@ object ShareUtil {
     }
 
     fun shareImage(coroutineScope: CoroutineScope, context: Context, bmp: Bitmap,
-                   imageFileName: String, subject: String, text: String) {
+                   imageFileName: String, subject: String, text: String, onShared: (() -> Unit)? = null) {
         coroutineScope.launch(CoroutineExceptionHandler { _, msg ->
             displayOnCatchMessage(msg, context)
         }) {
@@ -65,6 +65,7 @@ object ShareUtil {
                 val chooserIntent = buildImageShareChooserIntent(context, subject, text, uri)
                 context.startActivity(chooserIntent)
             }
+            onShared?.invoke()
         }
     }
 

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

@@ -55,10 +55,13 @@ class YearInReviewActivity : BaseActivity() {
                             onBackButtonClick = {
                                 finish()
                             },
-                            onNextButtonClick = { pagerState ->
+                            onNextButtonClick = { pagerState, currentSlide ->
                                 coroutineScope.launch {
                                     pagerState.animateScrollToPage(pagerState.currentPage + 1)
                                 }
+                                if (currentSlide is YearInReviewScreenData.HighlightsScreen) {
+                                    finish()
+                                }
                             },
                             onDonateClick = {
                                 EventPlatformClient.submit(

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

@@ -0,0 +1,49 @@
+package org.wikipedia.yearinreview
+
+import android.graphics.Bitmap
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.platform.LocalContext
+import org.wikipedia.R
+import org.wikipedia.util.ShareUtil
+
+@Composable
+fun YearInReviewCaptureHandler(
+    request: YearInReviewCaptureRequest,
+    onComplete: () -> Unit
+) {
+    val coroutineScope = rememberCoroutineScope()
+    val context = LocalContext.current
+
+    val shareImageCallback: (Bitmap) -> Unit = { bitmap ->
+        ShareUtil.shareImage(
+            coroutineScope = coroutineScope,
+            context = context,
+            bmp = bitmap,
+            imageFileName = "year_in_review",
+            subject = context.getString(R.string.year_in_review_share_subject),
+            text = context.getString(R.string.year_in_review_share_url),
+            onShared = onComplete
+        )
+    }
+
+    when (request) {
+        is YearInReviewCaptureRequest.StandardScreen -> {
+            CreateScreenShotBitmap(
+                screenContent = request.screenData,
+                onBitmapReady = shareImageCallback
+            )
+        }
+        is YearInReviewCaptureRequest.HighlightsScreen -> {
+            ShareHighlightsScreenCapture(
+                highlights = request.highlights,
+                onBitmapReady = shareImageCallback
+            )
+        }
+    }
+}
+
+sealed class YearInReviewCaptureRequest {
+    data class StandardScreen(val screenData: YearInReviewScreenData) : YearInReviewCaptureRequest()
+    data class HighlightsScreen(val highlights: List<YearInReviewScreenData.HighlightItem>) : YearInReviewCaptureRequest()
+}

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

@@ -0,0 +1,313 @@
+package org.wikipedia.yearinreview
+
+import android.graphics.Bitmap
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asAndroidBitmap
+import androidx.compose.ui.graphics.rememberGraphicsLayer
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.tooling.preview.Devices
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.util.fastForEachIndexed
+import org.wikipedia.R
+import org.wikipedia.compose.ComposeColors
+import org.wikipedia.compose.theme.BaseTheme
+import org.wikipedia.compose.theme.WikipediaTheme
+import org.wikipedia.theme.Theme
+
+@Composable
+fun YearInReviewHighlightsScreen(
+    modifier: Modifier = Modifier,
+    screenData: YearInReviewScreenData.HighlightsScreen,
+    onShareHighlights: () -> Unit
+) {
+    Column(
+        modifier = modifier
+    ) {
+        Text(
+            modifier = Modifier
+                .padding(top = 60.dp, bottom = 16.dp),
+            text = buildAnnotatedString {
+                append(stringResource(R.string.year_in_review_highlights_thank_you_message))
+                withStyle(
+                    style = SpanStyle(
+                        fontWeight = FontWeight.Normal,
+                    )
+                ) {
+                    append(" ")
+                    append(stringResource(R.string.year_in_review_highlights_looking_forward_message))
+                }
+            },
+            color = WikipediaTheme.colors.paperColor,
+            style = MaterialTheme.typography.bodyLarge,
+            textAlign = TextAlign.Center,
+            fontWeight = FontWeight.Medium
+        )
+
+        ShareableHighlightsCard(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(324.dp)
+                .background(ComposeColors.Gray100)
+                .border(width = 1.dp, color = ComposeColors.Gray300)
+                .padding(8.dp)
+                .verticalScroll(rememberScrollState()),
+            highlights = screenData.highlights,
+            logoDescription = "Wikipedia logo"
+        )
+
+        Button(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 32.dp),
+            colors = ButtonDefaults.buttonColors(
+                containerColor = WikipediaTheme.colors.progressiveColor
+            ),
+            onClick = onShareHighlights
+        ) {
+            Text(
+                "Share highlights"
+            )
+        }
+    }
+}
+
+@Composable
+fun ShareableHighlightsCard(
+    modifier: Modifier = Modifier,
+    hashtag: String = "#WikipediaYearinReview",
+    logoResource: Int = R.drawable.w_nav_mark,
+    logoDescription: String = "",
+    highlights: List<YearInReviewScreenData.HighlightItem>,
+) {
+    Column(
+        modifier = modifier,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Text(
+            text = hashtag,
+            fontWeight = FontWeight.Bold,
+            fontSize = 18.sp,
+            lineHeight = 21.sp,
+            color = ComposeColors.Gray700
+        )
+        Image(
+            modifier = Modifier
+                .size(163.dp)
+                .padding(vertical = 4.dp),
+            painter = painterResource(logoResource),
+            contentDescription = logoDescription
+        )
+        Text(
+            modifier = Modifier
+                .padding(4.dp),
+            text = logoDescription,
+            fontSize = 12.sp,
+            lineHeight = 16.sp,
+            color = ComposeColors.Gray700
+        )
+        highlights.forEach { highlightItem ->
+            HighlightsContent(
+                modifier = Modifier
+                    .padding(top = 12.dp),
+                highlightItem = highlightItem
+            )
+        }
+    }
+}
+
+@Composable
+fun HighlightsContent(
+    modifier: Modifier = Modifier,
+    highlightItem: YearInReviewScreenData.HighlightItem
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
+        Text(
+            modifier = Modifier
+                .width(98.dp),
+            text = highlightItem.title,
+            fontWeight = FontWeight.Bold,
+            fontSize = 14.sp,
+            lineHeight = 21.sp
+        )
+
+        if (highlightItem.singleValue != null) {
+            Text(
+                text = highlightItem.singleValue,
+                fontSize = 14.sp,
+                lineHeight = 21.sp,
+                color = Color.Black
+            )
+        } else {
+            Column {
+                highlightItem.items.fastForEachIndexed { index, item ->
+                    Text(
+                        text = buildAnnotatedString {
+                            append("${index + 1}. ")
+                            withStyle(
+                                style = SpanStyle(
+                                    color = highlightItem.highlightColor
+                                )
+                            ) {
+                                append(text = item)
+                            }
+                        },
+                        lineHeight = 21.sp
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun ShareHighlightsScreenCapture(
+    highlights: List<YearInReviewScreenData.HighlightItem>,
+    onBitmapReady: (Bitmap) -> Unit
+) {
+    val graphicsLayer = rememberGraphicsLayer()
+    var isReadyToCapture by remember { mutableStateOf(false) }
+
+    if (isReadyToCapture) {
+        LaunchedEffect(Unit) {
+            val bitmap = graphicsLayer.toImageBitmap()
+            onBitmapReady(bitmap.asAndroidBitmap())
+        }
+    }
+
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .onGloballyPositioned {
+                isReadyToCapture = true
+            }
+            .drawWithContent {
+                graphicsLayer.record {
+                    drawRect(
+                        color = ComposeColors.White
+                    )
+                    [email protected]()
+                }
+            }
+            .background(ComposeColors.White),
+    ) {
+        ShareableHighlightsCard(
+            modifier = Modifier
+                .align(Alignment.Center)
+                .padding(horizontal = 34.dp)
+                .background(ComposeColors.Gray100)
+                .border(width = 1.dp, color = ComposeColors.Gray300)
+                .padding(8.dp),
+            highlights = highlights
+        )
+
+        Text(
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .padding(bottom = 16.dp),
+            text = stringResource(R.string.year_in_highlights_screenshot_url),
+            style = MaterialTheme.typography.bodyLarge
+        )
+    }
+}
+
+@Preview(device = Devices.PIXEL_9)
+@Composable
+private fun YearInReviewHighlightsScreenPreview() {
+    BaseTheme(
+        currentTheme = Theme.LIGHT
+    ) {
+        YearInReviewHighlightsScreen(
+            screenData = YearInReviewScreenData.HighlightsScreen(
+                highlights = listOf(
+                    YearInReviewScreenData.HighlightItem(
+                        title = "Articles I read the longest",
+                        items = listOf(
+                            "Pamela Anderson",
+                            "Pamukkale",
+                            "History of US science fiction and fantasy magazines to 1950"
+                        ),
+                        highlightColor = ComposeColors.Blue600
+                    )
+                )
+            ),
+            onShareHighlights = {}
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun ListItemsPreview() {
+    BaseTheme(
+        currentTheme = Theme.LIGHT
+    ) {
+        HighlightsContent(
+            highlightItem = YearInReviewScreenData.HighlightItem(
+                title = "Articles I read the longest",
+                items = listOf(
+                    "Pamela Anderson",
+                    "Pamukkale",
+                    "History of US science fiction and fantasy magazines to 1950"
+                ),
+                highlightColor = ComposeColors.Blue600
+            )
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun SingleValuePreview() {
+    BaseTheme(
+        currentTheme = Theme.LIGHT
+    ) {
+        HighlightsContent(
+            highlightItem = YearInReviewScreenData.HighlightItem(
+                title = "Minutes read",
+                singleValue = "924",
+                highlightColor = ComposeColors.Blue600
+            )
+        )
+    }
+}