Yir Survey

app/src/main/java/org/wikipedia/main/MainFragment.kt

@@ -93,6 +93,7 @@ import org.wikipedia.views.TabCountsView
 import org.wikipedia.views.imageservice.ImageService
 import org.wikipedia.watchlist.WatchlistActivity
 import org.wikipedia.yearinreview.YearInReviewOnboardingActivity
+import org.wikipedia.yearinreview.YearInReviewSurvey
 import java.io.File
 import java.util.concurrent.TimeUnit
 
@@ -213,6 +214,7 @@ class MainFragment : Fragment(), BackPressedHandler, MenuProvider, FeedFragment.
         downloadReceiver.register(requireContext(), downloadReceiverCallback)
         // reset the last-page-viewed timer
         Prefs.pageLastShown = 0
+        YearInReviewSurvey.maybeShowYearInReviewFeedbackDialog(requireActivity())
     }
 
     override fun onDestroyView() {

app/src/main/java/org/wikipedia/page/PageActivity.kt

@@ -86,6 +86,7 @@ import org.wikipedia.views.FrameLayoutNavMenuTriggerer
 import org.wikipedia.views.ObservableWebView
 import org.wikipedia.views.ViewUtil
 import org.wikipedia.watchlist.WatchlistExpiry
+import org.wikipedia.yearinreview.YearInReviewSurvey
 import java.util.Locale
 
 class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.LoadPageCallback, FrameLayoutNavMenuTriggerer.Callback {
@@ -328,6 +329,7 @@ class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.Lo
         app.resetWikiSite()
         updateNotificationsButton(false)
         Prefs.temporaryWikitext = null
+        YearInReviewSurvey.maybeShowYearInReviewFeedbackDialog(this)
     }
 
     override fun onPause() {

app/src/main/java/org/wikipedia/settings/Prefs.kt

@@ -30,6 +30,7 @@ import org.wikipedia.util.ReleaseUtil.isDevRelease
 import org.wikipedia.util.StringUtil
 import org.wikipedia.watchlist.WatchlistFilterTypes
 import org.wikipedia.yearinreview.YearInReviewModel
+import org.wikipedia.yearinreview.YearInReviewSurveyState
 import java.util.Date
 
 /** Shared preferences utility for convenient POJO access.  */
@@ -788,9 +789,11 @@ object Prefs {
         get() = PrefsIoUtil.getBoolean(R.string.preference_key_year_in_review_visited, false)
         set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_year_in_review_visited, value)
 
-    var yearInReviewSurveyShown
-        get() = PrefsIoUtil.getBoolean(R.string.preference_key_yir_survey_shown, false)
-        set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_yir_survey_shown, value)
+    var yearInReviewSurveyState: YearInReviewSurveyState
+        get() = PrefsIoUtil.getString(R.string.preference_key_yir_survey_state, null)?.let {
+            YearInReviewSurveyState.valueOf(it)
+        } ?: YearInReviewSurveyState.NOT_TRIGGERED
+        set(value) = PrefsIoUtil.setString(R.string.preference_key_yir_survey_state, value.name)
 
     var isRecommendedReadingListEnabled
         get() = PrefsIoUtil.getBoolean(R.string.preference_key_recommended_reading_list_enabled, false)

app/src/main/java/org/wikipedia/settings/dev/DeveloperSettingsPreferenceLoader.kt

@@ -34,6 +34,7 @@ import org.wikipedia.setupLeakCanary
 import org.wikipedia.suggestededits.provider.EditingSuggestionsProvider
 import org.wikipedia.util.FeedbackUtil
 import org.wikipedia.util.StringUtil.fromHtml
+import org.wikipedia.yearinreview.YearInReviewSurveyState
 
 internal class DeveloperSettingsPreferenceLoader(fragment: PreferenceFragmentCompat) : BasePreferenceLoader(fragment) {
     private val setMediaWikiBaseUriChangeListener = Preference.OnPreferenceChangeListener { _, _ ->
@@ -257,6 +258,22 @@ internal class DeveloperSettingsPreferenceLoader(fragment: PreferenceFragmentCom
             fragment.requireActivity().finish()
             true
         }
+        (findPreference(R.string.preference_key_yir_survey_state) as ListPreference).apply {
+            val states = YearInReviewSurveyState.entries
+            val names = states.map { it.name }.toTypedArray()
+            entries = names
+            entryValues = names
+            setOnPreferenceChangeListener { _, newValue ->
+                val selectedState = newValue as String
+                val source = when (selectedState) {
+                    "NOT_TRIGGERED" -> YearInReviewSurveyState.NOT_TRIGGERED
+                    "SHOULD_SHOW" -> YearInReviewSurveyState.SHOULD_SHOW
+                    else -> YearInReviewSurveyState.SHOWN
+                }
+                Prefs.yearInReviewSurveyState = source
+                true
+            }
+        }
     }
 
     private fun setUpMediaWikiSettings() {

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

@@ -19,6 +19,7 @@ import org.wikipedia.analytics.eventplatform.BreadCrumbLogEvent
 import org.wikipedia.analytics.eventplatform.DonorExperienceEvent
 import org.wikipedia.analytics.eventplatform.EventPlatformClient
 import org.wikipedia.compose.theme.BaseTheme
+import org.wikipedia.settings.Prefs
 
 class YearInReviewActivity : BaseActivity() {
 
@@ -49,13 +50,23 @@ class YearInReviewActivity : BaseActivity() {
                         YearInReviewScreenDeck(
                             state = screenState,
                             requestScreenshotBitmap = { width, height -> viewModel.requestScreenshotHeaderBitmap(width, height) },
-                            onBackButtonClick = {
+                            onCloseButtonClick = {
+                                if (viewModel.slideViewedCount >= YearInReviewViewModel.MIN_SLIDES_BEFORE_SURVEY && Prefs.yearInReviewSurveyState == YearInReviewSurveyState.NOT_TRIGGERED) {
+                                    Prefs.yearInReviewSurveyState = YearInReviewSurveyState.SHOULD_SHOW
+                                }
                                 finish()
                             },
-                            onNextButtonClick = { pagerState ->
+                            onNextButtonClick = { pagerState, currentSlideData ->
+                                viewModel.slideViewedCount += 1
                                 coroutineScope.launch {
                                     pagerState.animateScrollToPage(pagerState.currentPage + 1)
                                 }
+                                if (currentSlideData is YearInReviewScreenData.HighlightsScreen) {
+                                    if (Prefs.yearInReviewSurveyState == YearInReviewSurveyState.NOT_TRIGGERED) {
+                                        Prefs.yearInReviewSurveyState = YearInReviewSurveyState.SHOULD_SHOW
+                                    }
+                                    finish()
+                                }
                             },
                             onDonateClick = {
                                 EventPlatformClient.submit(

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

@@ -78,8 +78,8 @@ fun YearInReviewScreenDeck(
     state: UiState<List<YearInReviewScreenData>>,
     requestScreenshotBitmap: ((Int, Int) -> Bitmap)?,
     onDonateClick: () -> Unit,
-    onNextButtonClick: (PagerState) -> Unit,
-    onBackButtonClick: () -> Unit
+    onNextButtonClick: (PagerState, YearInReviewScreenData) -> Unit,
+    onCloseButtonClick: () -> Unit
 ) {
     when (state) {
         is UiState.Loading -> {
@@ -121,7 +121,7 @@ fun YearInReviewScreenDeck(
                             containerColor = WikipediaTheme.colors.paperColor),
                         title = { },
                         navigationIcon = {
-                            IconButton(onClick = { onBackButtonClick() }) {
+                            IconButton(onClick = { onCloseButtonClick() }) {
                                 Icon(
                                     painter = painterResource(R.drawable.ic_close_black_24dp),
                                     tint = WikipediaTheme.colors.primaryColor,
@@ -162,7 +162,7 @@ fun YearInReviewScreenDeck(
                 bottomBar = {
                     MainBottomBar(
                         pages,
-                        onNavigationRightClick = { onNextButtonClick(pagerState) },
+                        onNavigationRightClick = { onNextButtonClick(pagerState, pages[pagerState.currentPage]) },
                         pagerState = pagerState,
                         totalPages = pages.size,
                         onShareClick = {
@@ -553,8 +553,8 @@ fun PreviewStandardContent() {
             )),
             requestScreenshotBitmap = null,
             onDonateClick = {},
-            onBackButtonClick = {},
-            onNextButtonClick = {}
+            onCloseButtonClick = {},
+            onNextButtonClick = { _, _ -> }
         )
     }
 }
@@ -577,8 +577,8 @@ fun PreviewReadingPatternsContent() {
             )),
             requestScreenshotBitmap = null,
             onDonateClick = {},
-            onBackButtonClick = {},
-            onNextButtonClick = {}
+            onCloseButtonClick = {},
+            onNextButtonClick = { _, _ -> }
         )
     }
 }