From 1870a2f9902647621c8b960dc48a8d0d43466c89 Mon Sep 17 00:00:00 2001
From: williamrai <williamrai13@gmail.com>
Date: Wed, 15 Oct 2025 09:55:01 -0400
Subject: [PATCH] - replaces navigation left button with close button in app
 bar

---
 .../org/wikipedia/yearinreview/YearInReviewActivity.kt | 10 ++--------
 .../wikipedia/yearinreview/YearInReviewScreenDeck.kt   |  8 ++++----
 app/src/main/res/values-qq/strings.xml                 |  1 +
 app/src/main/res/values/strings.xml                    |  1 +
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/wikipedia/yearinreview/YearInReviewActivity.kt b/app/src/main/java/org/wikipedia/yearinreview/YearInReviewActivity.kt
index 64cb8512fec..a7b78623b85 100644
--- a/app/src/main/java/org/wikipedia/yearinreview/YearInReviewActivity.kt
+++ b/app/src/main/java/org/wikipedia/yearinreview/YearInReviewActivity.kt
@@ -52,14 +52,8 @@ class YearInReviewActivity : BaseActivity() {
                         val screenState = viewModel.uiScreenListState.collectAsState().value
                         YearInReviewScreenDeck(
                             state = screenState,
-                            onBackButtonClick = { pagerState ->
-                                if (pagerState.currentPage > 0) {
-                                    coroutineScope.launch {
-                                        pagerState.animateScrollToPage(pagerState.currentPage - 1)
-                                    }
-                                } else {
-                                    finish()
-                                }
+                            onBackButtonClick = {
+                                finish()
                             },
                             onNextButtonClick = { pagerState ->
                                 coroutineScope.launch {
diff --git a/app/src/main/java/org/wikipedia/yearinreview/YearInReviewScreenDeck.kt b/app/src/main/java/org/wikipedia/yearinreview/YearInReviewScreenDeck.kt
index 20f9929249a..49dd0492eeb 100644
--- a/app/src/main/java/org/wikipedia/yearinreview/YearInReviewScreenDeck.kt
+++ b/app/src/main/java/org/wikipedia/yearinreview/YearInReviewScreenDeck.kt
@@ -86,7 +86,7 @@ fun YearInReviewScreenDeck(
     state: UiState<List<YearInReviewScreenData>>,
     onDonateClick: () -> Unit,
     onNextButtonClick: (PagerState) -> Unit,
-    onBackButtonClick: (PagerState) -> Unit
+    onBackButtonClick: () -> Unit
 ) {
     when (state) {
         is UiState.Loading -> {
@@ -124,11 +124,11 @@ fun YearInReviewScreenDeck(
                             containerColor = WikipediaTheme.colors.paperColor),
                         title = { },
                         navigationIcon = {
-                            IconButton(onClick = { onBackButtonClick(pagerState) }) {
+                            IconButton(onClick = { onBackButtonClick() }) {
                                 Icon(
-                                    painter = painterResource(R.drawable.ic_arrow_back_black_24dp),
+                                    painter = painterResource(R.drawable.ic_close_black_24dp),
                                     tint = WikipediaTheme.colors.primaryColor,
-                                    contentDescription = stringResource(R.string.year_in_review_navigate_left)
+                                    contentDescription = stringResource(R.string.year_in_review_close)
                                 )
                             }
                         },
diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml
index dd729113343..67de62c380f 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -1857,6 +1857,7 @@
   <string name="year_in_review_get_started">Button text for the Year in Review button Get Started.</string>
   <string name="year_in_review_topbar_w_icon">Content description of the W Wikipedia icon for the Year in Review scaffold.</string>
   <string name="year_in_review_navigate_left">Content description of the navigation left icon for the Year in Review Scaffold.</string>
+  <string name="year_in_review_close">Content description of the close button in the Year in Review app bar.</string>
   <string name="year_in_review_share_icon">Content description of the share icon for the Year in Review screen scaffold.</string>
   <string name="year_in_review_heart_icon">Content description of the heart icon for the Year in Review screen scaffold.</string>
   <string name="year_in_review_navigate_right">Content description of the navigate right icon for the Year in Review screen scaffold.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8576e9d39d2..d357e61a78f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1965,6 +1965,7 @@
     <string name="year_in_review_get_started">Get Started</string>
     <string name="year_in_review_topbar_w_icon">Wikipedia W Icon</string>
     <string name="year_in_review_navigate_left">Navigate Left</string>
+    <string name="year_in_review_close">Close</string>
     <string name="year_in_review_share_icon">Share Icon</string>
     <string name="year_in_review_heart_icon">Heart Icon</string>
     <string name="year_in_review_navigate_right">Navigate Right</string>