Yir Survey

app/src/main/AndroidManifest.xml

@@ -88,9 +88,13 @@
 
         <activity
             android:name=".main.MainActivity"
-            android:icon="@mipmap/launcher"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/AppTheme.Splash"
+            android:exported="true" />
+        <activity-alias
+            android:name=".DefaultIcon"
+            android:targetActivity=".main.MainActivity"
+            android:icon="@mipmap/launcher"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -103,7 +107,26 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="wikipedia" />
             </intent-filter>
-        </activity>
+        </activity-alias>
+        <activity-alias
+            android:name=".YIR25Icon"
+            android:targetActivity=".main.MainActivity"
+            android:icon="@mipmap/launcher_yir25"
+            android:exported="true"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="wikipedia" />
+            </intent-filter>
+        </activity-alias>
+
         <activity
             android:name=".page.PageActivity"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
@@ -373,6 +396,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

@@ -136,20 +136,20 @@ class ActivityTabViewModel() : ViewModel() {
             val now = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()
             val weekInMillis = TimeUnit.DAYS.toMillis(7)
             var weekAgo = now - weekInMillis
-            val totalTimeSpent = AppDatabase.instance.historyEntryWithImageDao().getTimeSpentSinceTimeStamp(weekAgo)
+            val totalTimeSpent = AppDatabase.instance.historyEntryWithImageDao().getTimeSpentBetween(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()
 
-            val articlesSavedThisMonth = AppDatabase.instance.readingListPageDao().getTotalLocallySavedPagesSince(thirtyDaysAgo) ?: 0
+            val articlesSavedThisMonth = AppDatabase.instance.readingListPageDao().getTotalLocallySavedPagesBetween(thirtyDaysAgo) ?: 0
             val articlesSaved = AppDatabase.instance.readingListPageDao().getLocallySavedPagesSince(thirtyDaysAgo, 4)
                 .map { ReadingListPage.toPageTitle(it) }
             val mostRecentSaveTime = AppDatabase.instance.readingListPageDao().getMostRecentLocallySavedPage()?.atime?.let { Instant.ofEpochMilli(it) }?.atZone(ZoneId.systemDefault())?.toLocalDateTime()

app/src/main/java/org/wikipedia/categories/db/CategoryDao.kt

@@ -28,6 +28,10 @@ interface CategoryDao {
     @Query("SELECT year, month, title, lang, SUM (count) AS count FROM Category WHERE year = :year AND month = :month GROUP BY title, lang ORDER BY count DESC")
     suspend fun getTopCategoriesByMonth(year: Int, month: Int): List<Category>
 
+    // Get top categories by year
+    @Query("SELECT year, month, title, lang, SUM (count) AS count FROM Category WHERE year = :year GROUP BY title, lang ORDER BY count DESC LIMIT :limit")
+    suspend fun getTopCategoriesByYear(year: Int, limit: Int): List<Category>
+
     @Query("SELECT * FROM Category")
     suspend fun getAllCategories(): List<Category>
 

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

@@ -24,11 +24,14 @@ interface HistoryEntryDao {
     @Query("SELECT * FROM HistoryEntry WHERE authority = :authority AND lang = :lang AND apiTitle = :apiTitle AND timestamp = :timestamp LIMIT 1")
     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
+    @Query("SELECT COUNT(*) FROM (SELECT DISTINCT HistoryEntry.lang, HistoryEntry.apiTitle FROM HistoryEntry WHERE timestamp BETWEEN :startMillis AND :endMillis)")
+    suspend fun getDistinctEntriesCountBetween(startMillis: Long, endMillis: Long = System.currentTimeMillis()): 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 displayTitle FROM HistoryEntry WHERE timestamp BETWEEN :startMillis AND :endMillis GROUP BY displayTitle HAVING COUNT(displayTitle) > 1 ORDER BY COUNT(displayTitle) DESC LIMIT :limit")
+    suspend fun getTopVisitedEntriesBetween(limit: Int, startMillis: Long, endMillis: Long = System.currentTimeMillis()): List<String>
 
     @Query("SELECT COUNT(*) FROM HistoryEntry")
     suspend fun getHistoryCount(): Int
@@ -39,12 +42,18 @@ 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?
 
+    @Query("SELECT CAST(strftime('%H', timestamp / 1000, 'unixepoch', 'localtime') AS INTEGER) AS hour FROM HistoryEntry WHERE timestamp BETWEEN :startMillis AND :endMillis GROUP BY hour ORDER BY COUNT(id) DESC LIMIT 1")
+    suspend fun getFavoriteTimeToReadBetween(startMillis: Long, endMillis: Long = System.currentTimeMillis()): Int?
+
+    @Query("SELECT CAST(strftime('%w', timestamp / 1000, 'unixepoch', 'localtime') AS INTEGER) AS dayOfWeek FROM HistoryEntry WHERE timestamp BETWEEN :startMillis AND :endMillis GROUP BY dayOfWeek ORDER BY COUNT(id) DESC LIMIT 1")
+    suspend fun getFavoriteDayToReadBetween(startMillis: Long, endMillis: Long = System.currentTimeMillis()): Int?
+
+    @Query("SELECT CAST(strftime('%m', timestamp / 1000, 'unixepoch', 'localtime') AS INTEGER) AS month FROM HistoryEntry WHERE timestamp BETWEEN :startMillis AND :endMillis GROUP BY month ORDER BY COUNT(id) DESC LIMIT 1")
+    suspend fun getMostReadingMonthBetween(startMillis: Long, endMillis: Long = System.currentTimeMillis()): Int?
+
     @Transaction
     suspend fun insert(entries: List<HistoryEntry>) {
         entries.forEach {

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

@@ -37,9 +37,9 @@ interface HistoryEntryWithImageDao {
     @Query("SELECT SUM(timeSpentSec) FROM (" +
             "  SELECT DISTINCT HistoryEntry.lang, HistoryEntry.apiTitle, PageImage.timeSpentSec FROM HistoryEntry" +
             "  LEFT OUTER JOIN PageImage ON (HistoryEntry.namespace = PageImage.namespace AND HistoryEntry.apiTitle = PageImage.apiTitle AND HistoryEntry.lang = PageImage.lang)" +
-            "  WHERE timestamp > :timeStamp" +
+            "  WHERE timestamp BETWEEN :startMillis AND :endMillis" +
             ")")
-    suspend fun getTimeSpentSinceTimeStamp(timeStamp: Long): Long
+    suspend fun getTimeSpentBetween(startMillis: Long, endMillis: Long = System.currentTimeMillis()): Long
 
     suspend fun findHistoryItem(wikiSite: WikiSite, searchQuery: String): SearchResults {
         var normalizedQuery = StringUtils.stripAccents(searchQuery)

app/src/main/java/org/wikipedia/login/LoginActivity.kt

@@ -298,6 +298,7 @@ class LoginActivity : BaseActivity() {
         const val SOURCE_SUGGESTED_EDITS = "suggestededits"
         const val SOURCE_TALK = "talk"
         const val SOURCE_ACTIVITY_TAB = "activity_tab"
+        const val SOURCE_YEAR_IN_REVIEW = "yir"
 
         fun newIntent(context: Context, source: String, createAccountFirst: Boolean = true): Intent {
             return Intent(context, LoginActivity::class.java)

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

@@ -92,7 +92,8 @@ 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 org.wikipedia.yearinreview.maybeShowYearInReviewFeedbackDialog
 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
+        maybeShowYearInReviewFeedbackDialog(requireActivity())
     }
 
     override fun onDestroyView() {
@@ -499,7 +501,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/navtab/MenuNavTabDialog.kt

@@ -94,6 +94,7 @@ class MenuNavTabDialog : ExtendedBottomSheetDialogFragment() {
             callback()?.yearInReviewClick()
             dismiss()
         }
+        binding.yearInReviewRedDot.isVisible = !Prefs.yearInReviewVisited
 
         binding.mainDrawerEditContainer.setOnClickListener {
             BreadCrumbLogEvent.logClick(requireActivity(), binding.mainDrawerEditContainer)

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

@@ -86,6 +86,8 @@ import org.wikipedia.views.FrameLayoutNavMenuTriggerer
 import org.wikipedia.views.ObservableWebView
 import org.wikipedia.views.ViewUtil
 import org.wikipedia.watchlist.WatchlistExpiry
+import org.wikipedia.yearinreview.YearInReviewOnboardingActivity
+import org.wikipedia.yearinreview.maybeShowYearInReviewFeedbackDialog
 import java.util.Locale
 
 class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.LoadPageCallback, FrameLayoutNavMenuTriggerer.Callback {
@@ -179,6 +181,12 @@ class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.Lo
         }
     }
 
+    private val yearInReviewLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        if (it.resultCode == RESULT_CANCELED) {
+            FeedbackUtil.showMessage(this, getString(R.string.year_in_review_get_started_later))
+        }
+    }
+
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         if (!DeviceUtil.assertAppContext(this)) {
@@ -283,6 +291,8 @@ class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.Lo
             // then we must have been launched with an Intent, so... handle it!
             handleIntent(intent)
         }
+
+        maybeShowYearInReview()
     }
 
     override fun onStart() {
@@ -328,6 +338,7 @@ class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.Lo
         app.resetWikiSite()
         updateNotificationsButton(false)
         Prefs.temporaryWikitext = null
+        maybeShowYearInReviewFeedbackDialog(this)
     }
 
     override fun onPause() {
@@ -706,6 +717,12 @@ class PageActivity : BaseActivity(), PageFragment.Callback, LinkPreviewDialog.Lo
             .show()
     }
 
+    private fun maybeShowYearInReview() {
+        if (Prefs.isYearInReviewEnabled && !Prefs.yearInReviewVisited) {
+            yearInReviewLauncher.launch((YearInReviewOnboardingActivity.newIntent(this)))
+        }
+    }
+
     private fun maybeShowThemeTooltip() {
         if (!Prefs.showOneTimeCustomizeToolbarTooltip) {
             return

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

@@ -74,6 +74,9 @@ interface ReadingListPageDao {
     @Query("SELECT * FROM ReadingListPage WHERE lang = :lang ORDER BY RANDOM() LIMIT 1")
     suspend fun getRandomPage(lang: String): ReadingListPage?
 
+    @Query("SELECT displayTitle FROM ReadingListPage WHERE atime > 0 AND atime BETWEEN :startMillis AND :endMillis ORDER BY RANDOM() LIMIT :limit")
+    suspend fun getRandomPageTitlesBetween(limit: Int, startMillis: Long, endMillis: Long = System.currentTimeMillis()): List<String?>
+
     @Query("SELECT * FROM ReadingListPage WHERE UPPER(displayTitle) LIKE UPPER(:term) ESCAPE '\\'")
     suspend fun findPageBySearchTerm(term: String): List<ReadingListPage>
 
@@ -86,8 +89,8 @@ interface ReadingListPageDao {
     @Query("SELECT * FROM ReadingListPage WHERE remoteId < 1")
     suspend fun getAllPagesToBeSynced(): List<ReadingListPage>
 
-    @Query("SELECT COUNT(*) FROM ReadingListPage WHERE atime > 0 AND atime > :timestamp")
-    suspend fun getTotalLocallySavedPagesSince(timestamp: Long): Int?
+    @Query("SELECT COUNT(*) FROM ReadingListPage WHERE atime > 0 AND atime BETWEEN :startMillis AND :endMillis")
+    suspend fun getTotalLocallySavedPagesBetween(startMillis: Long, endMillis: Long = System.currentTimeMillis()): Int?
 
     @Query("SELECT * FROM ReadingListPage WHERE atime > 0 AND atime > :timestamp ORDER BY atime DESC LIMIT :limit")
     suspend fun getLocallySavedPagesSince(timestamp: Long, limit: Int): List<ReadingListPage>

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

@@ -0,0 +1,83 @@
+package org.wikipedia.settings
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.AlignItems
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexboxLayoutManager
+import com.google.android.flexbox.JustifyContent
+import org.wikipedia.R
+import org.wikipedia.appshortcuts.AppShortcuts
+import org.wikipedia.databinding.DialogAppIconBinding
+import org.wikipedia.databinding.ItemAppIconBinding
+import org.wikipedia.page.ExtendedBottomSheetDialogFragment
+import org.wikipedia.util.DimenUtil
+import org.wikipedia.util.ResourceUtil
+
+class AppIconDialog : ExtendedBottomSheetDialogFragment() {
+    private var _binding: DialogAppIconBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        _binding = DialogAppIconBinding.inflate(inflater, container, false)
+
+        binding.appIconRecyclerView.layoutManager = FlexboxLayoutManager(requireContext()).apply {
+            flexDirection = FlexDirection.ROW
+            justifyContent = JustifyContent.CENTER
+            alignItems = AlignItems.CENTER
+        }
+        binding.appIconRecyclerView.adapter = AppIconAdapter(LauncherIcon.entries).apply {
+            onItemClickListener = { icon ->
+                Prefs.selectedAppIcon = icon.key
+                LauncherController.setIcon(icon)
+                AppShortcuts.setShortcuts(requireContext())
+                dismiss()
+                Toast.makeText(requireActivity(), R.string.settings_app_icon_updated, Toast.LENGTH_SHORT).show()
+            }
+        }
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    private class AppIconAdapter(val list: List<LauncherIcon>) : RecyclerView.Adapter<AppIconAdapter.AppIconViewHolder>() {
+        var onItemClickListener: ((LauncherIcon) -> Unit)? = null
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AppIconViewHolder {
+            val view = ItemAppIconBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+            return AppIconViewHolder(view)
+        }
+
+        override fun getItemCount() = list.size
+
+        override fun onBindViewHolder(holder: AppIconViewHolder, position: Int) {
+            val item = list[position]
+            holder.bind(item)
+        }
+
+        private inner class AppIconViewHolder(val binding: ItemAppIconBinding) : RecyclerView.ViewHolder(binding.root) {
+            fun bind(item: LauncherIcon) {
+                binding.appIcon.apply {
+                    foreground = ContextCompat.getDrawable(binding.root.context, item.foreground)
+                    background = ContextCompat.getDrawable(binding.root.context, item.background)
+                    setOnClickListener {
+                        onItemClickListener?.invoke(item)
+                    }
+                    val isSelected = Prefs.selectedAppIcon == item.key
+                    val strokeColor = if (isSelected) R.attr.progressive_color else R.attr.border_color
+                    val newStrokeWidth = if (isSelected) 2f else 1f
+                    this.strokeColor = ResourceUtil.getThemedColorStateList(context, strokeColor)
+                    this.strokeWidth = DimenUtil.dpToPx(newStrokeWidth)
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,47 @@
+package org.wikipedia.settings
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.pm.PackageManager
+import org.wikipedia.R
+import org.wikipedia.WikipediaApp
+
+object LauncherController {
+
+    fun setIcon(icon: LauncherIcon) {
+        val context = WikipediaApp.instance.applicationContext
+        val packageManager = context.packageManager
+        LauncherIcon.entries.forEach { launcherIcon ->
+            packageManager.setComponentEnabledSetting(
+                launcherIcon.getComponentName(context),
+                if (launcherIcon == icon) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else
+                    PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP
+            )
+        }
+    }
+}
+
+enum class LauncherIcon(
+    val key: String,
+    val background: Int,
+    val foreground: Int,
+    val label: Int
+) {
+    DEFAULT(
+        key = "DefaultIcon",
+        background = R.drawable.launcher_background,
+        foreground = R.drawable.launcher_foreground,
+        label = R.string.app_name
+    ),
+    YIR25(
+        key = "YIR25Icon",
+        background = R.drawable.launcher_background,
+        foreground = R.drawable.launcher_foreground_yir25,
+        label = R.string.app_name
+    );
+
+    fun getComponentName(context: Context): ComponentName {
+        return ComponentName(context.packageName, "org.wikipedia.$key")
+    }
+}