[Feature branch] Year In Review

app/src/main/AndroidManifest.xml

@@ -373,6 +373,9 @@
         <activity
             android:name=".settings.dev.playground.CategoryDeveloperPlayGround"/>
 
+        <activity
+            android:name=".yearinreview.YearInReviewOnboardingActivity"/>
+
         <activity
             android:name=".yearinreview.YearInReviewActivity"/>
 

app/src/main/java/org/wikipedia/activitytab/ActivityTabViewModel.kt

@@ -139,12 +139,12 @@ class ActivityTabViewModel() : ViewModel() {
             val totalTimeSpent = AppDatabase.instance.historyEntryWithImageDao().getTimeSpentSinceTimeStamp(weekAgo)
 
             val thirtyDaysAgo = now - TimeUnit.DAYS.toMillis(30)
-            val articlesReadThisMonth = AppDatabase.instance.historyEntryDao().getDistinctEntriesSince(thirtyDaysAgo) ?: 0
+            val articlesReadThisMonth = AppDatabase.instance.historyEntryDao().getDistinctEntriesCountSince(thirtyDaysAgo) ?: 0
             val articlesReadByWeek = mutableListOf<Int>()
-            articlesReadByWeek.add(AppDatabase.instance.historyEntryDao().getDistinctEntriesSince(weekAgo) ?: 0)
+            articlesReadByWeek.add(AppDatabase.instance.historyEntryDao().getDistinctEntriesCountSince(weekAgo) ?: 0)
             for (i in 1..3) {
                 weekAgo -= weekInMillis
-                val articlesRead = AppDatabase.instance.historyEntryDao().getDistinctEntriesBetween(weekAgo, weekAgo + weekInMillis)
+                val articlesRead = AppDatabase.instance.historyEntryDao().getDistinctEntriesCountBetween(weekAgo, weekAgo + weekInMillis)
                 articlesReadByWeek.add(articlesRead)
             }
             val mostRecentReadTime = AppDatabase.instance.historyEntryDao().getMostRecentEntry()?.timestamp?.toInstant()?.atZone(ZoneId.systemDefault())?.toLocalDateTime()

app/src/main/java/org/wikipedia/history/db/HistoryEntryDao.kt

@@ -25,10 +25,13 @@ interface HistoryEntryDao {
     suspend fun findEntryBy(authority: String, lang: String, apiTitle: String, timestamp: Long): HistoryEntry?
 
     @Query("SELECT COUNT(*) FROM (SELECT DISTINCT HistoryEntry.lang, HistoryEntry.apiTitle FROM HistoryEntry WHERE timestamp BETWEEN :startDate AND :endDate)")
-    suspend fun getDistinctEntriesBetween(startDate: Long?, endDate: Long?): Int
+    suspend fun getDistinctEntriesCountBetween(startDate: Long?, endDate: Long?): Int
 
-    @Query("SELECT DISTINCT displayTitle FROM HistoryEntry LIMIT 3")
-    suspend fun getDisplayTitles(): List<String>
+    @Query("SELECT COUNT(*) FROM (SELECT DISTINCT HistoryEntry.lang, HistoryEntry.apiTitle FROM HistoryEntry WHERE timestamp > :timestamp)")
+    suspend fun getDistinctEntriesCountSince(timestamp: Long): Int?
+
+    @Query("SELECT DISTINCT displayTitle FROM HistoryEntry ORDER BY timestamp DESC LIMIT :limit")
+    suspend fun getLastestArticleTitles(limit: Int): List<String>
 
     @Query("SELECT COUNT(*) FROM HistoryEntry")
     suspend fun getHistoryCount(): Int
@@ -39,9 +42,6 @@ interface HistoryEntryDao {
     @Query("DELETE FROM HistoryEntry WHERE authority = :authority AND lang = :lang AND namespace = :namespace AND apiTitle = :apiTitle")
     suspend fun deleteBy(authority: String, lang: String, namespace: String?, apiTitle: String)
 
-    @Query("SELECT COUNT(*) FROM (SELECT DISTINCT HistoryEntry.lang, HistoryEntry.apiTitle FROM HistoryEntry WHERE timestamp > :timestamp)")
-    suspend fun getDistinctEntriesSince(timestamp: Long): Int?
-
     @Query("SELECT * FROM HistoryEntry ORDER BY timestamp DESC LIMIT 1")
     suspend fun getMostRecentEntry(): HistoryEntry?
 

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

@@ -92,7 +92,7 @@ import org.wikipedia.views.NotificationButtonView
 import org.wikipedia.views.TabCountsView
 import org.wikipedia.views.imageservice.ImageService
 import org.wikipedia.watchlist.WatchlistActivity
-import org.wikipedia.yearinreview.YearInReviewEntryDialog
+import org.wikipedia.yearinreview.YearInReviewOnboardingActivity
 import java.io.File
 import java.util.concurrent.TimeUnit
 
@@ -499,7 +499,7 @@ class MainFragment : Fragment(), BackPressedHandler, MenuProvider, FeedFragment.
     }
 
     override fun yearInReviewClick() {
-        ExclusiveBottomSheetPresenter.show(childFragmentManager, YearInReviewEntryDialog.newInstance())
+        startActivity(YearInReviewOnboardingActivity.newIntent(requireActivity()))
     }
 
     fun setBottomNavVisible(visible: Boolean) {

app/src/main/java/org/wikipedia/readinglist/db/ReadingListPageDao.kt

@@ -98,6 +98,12 @@ interface ReadingListPageDao {
     @Query("SELECT * FROM ReadingListPage WHERE atime > 0 ORDER BY atime DESC LIMIT :limit OFFSET :offset")
     suspend fun getPagesByLocallySavedTime(limit: Int, offset: Int): List<ReadingListPage>
 
+    @Query("SELECT COUNT(*) FROM (SELECT DISTINCT apiTitle, displayTitle FROM ReadingListPage WHERE atime BETWEEN :startDate AND :endDate)")
+    suspend fun getDistinctEntriesCountBetween(startDate: Long?, endDate: Long?): Int
+
+    @Query("SELECT DISTINCT displayTitle FROM ReadingListPage ORDER BY atime DESC LIMIT :limit")
+    suspend fun getLastestArticleTitles(limit: Int): List<String>
+
     suspend fun getAllPagesToBeSaved() = getPagesByStatus(ReadingListPage.STATUS_QUEUE_FOR_SAVE, true)
 
     suspend fun getAllPagesToBeForcedSave() = getPagesByStatus(ReadingListPage.STATUS_QUEUE_FOR_FORCED_SAVE, true)

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

@@ -17,7 +17,6 @@ import androidx.compose.runtime.setValue
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.wikipedia.activity.BaseActivity
 import org.wikipedia.analytics.eventplatform.BreadCrumbLogEvent
@@ -43,7 +42,7 @@ class YearInReviewActivity : BaseActivity() {
                     if (viewModel.canShowSurvey) {
                         isSurveyVisible = true
                     } else {
-                        endYearInReviewActivity(coroutineScope, this)
+                        finish()
                     }
                 }
 
@@ -52,7 +51,7 @@ class YearInReviewActivity : BaseActivity() {
                     YearInReviewSurvey(
                         onCancelButtonClick = {
                             isSurveyVisible = false
-                            endYearInReviewActivity(coroutineScope, this)
+                            finish()
                         },
                         onSubmitButtonClick = { selectedOption, userInput ->
                             PatrollerExperienceEvent.logAction(
@@ -65,36 +64,19 @@ class YearInReviewActivity : BaseActivity() {
                                     )
                             )
                             isSurveyVisible = false
-                            endYearInReviewActivity(coroutineScope, this)
+                            finish()
                         }
                     )
                 }
 
                 NavHost(
                     navController = navController,
-                    startDestination = YearInReviewNavigation.Onboarding.name,
+                    startDestination = YearInReviewNavigation.ScreenDeck.name,
                     enterTransition = { EnterTransition.None },
                     popEnterTransition = { EnterTransition.None },
                     popExitTransition = { ExitTransition.None },
                     exitTransition = { ExitTransition.None }
                 ) {
-                    composable(route = YearInReviewNavigation.Onboarding.name) {
-                        YearInReviewOnboardingScreen(
-                            contentData = YearInReviewViewModel.getStartedData,
-                            onBackButtonClick = {
-                                if (viewModel.canShowSurvey) {
-                                    isSurveyVisible = true
-                                } else {
-                                    endYearInReviewActivity(coroutineScope, this@YearInReviewActivity)
-                                }
-                            },
-                            onGetStartedClick = {
-                                navController.navigate(
-                                    route = YearInReviewNavigation.ScreenDeck.name
-                                )
-                            }
-                        )
-                    }
                     composable(route = YearInReviewNavigation.ScreenDeck.name) {
                         val screenState = viewModel.uiScreenListState.collectAsState().value
                         YearInReviewScreenDeck(
@@ -138,9 +120,5 @@ class YearInReviewActivity : BaseActivity() {
         fun newIntent(context: Context): Intent {
             return Intent(context, YearInReviewActivity::class.java)
         }
-
-        fun endYearInReviewActivity(scope: CoroutineScope, activity: YearInReviewActivity) {
-            activity.finish()
-        }
     }
 }

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

@@ -1,6 +1,5 @@
 package org.wikipedia.yearinreview
 
 enum class YearInReviewNavigation {
-    Onboarding,
     ScreenDeck
 }

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

@@ -0,0 +1,33 @@
+package org.wikipedia.yearinreview
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import org.wikipedia.activity.BaseActivity
+import org.wikipedia.compose.theme.BaseTheme
+
+class YearInReviewOnboardingActivity : BaseActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            BaseTheme {
+                YearInReviewOnboardingScreen(
+                    onBackButtonClick = {
+                        finish()
+                    },
+                    onGetStartedClick = {
+                        startActivity(YearInReviewActivity.newIntent(this))
+                    }
+                )
+            }
+        }
+    }
+
+    companion object {
+        fun newIntent(context: Context): Intent {
+            return Intent(context, YearInReviewOnboardingActivity::class.java)
+        }
+    }
+}