[Feature branch] Reading challenge widget

app/build.gradle

@@ -213,6 +213,12 @@ dependencies {
     ksp libs.androidx.room.compiler
     implementation libs.androidx.room.ktx
 
+    implementation libs.androidx.ui.graphics
+    implementation libs.androidx.glance.appwidget
+    implementation libs.androidx.glance.material3
+    implementation libs.androidx.glance.preview
+    implementation libs.androidx.glance.appwidget.preview
+
     // For language detection during editing
     prodImplementation libs.com.google.mlkit.language.id
     betaImplementation libs.com.google.mlkit.language.id
@@ -260,7 +266,6 @@ dependencies {
     androidTestImplementation libs.room.testing
     androidTestUtil libs.androidx.orchestrator
 
-    // Coil
     implementation(libs.coil.compose)
     implementation(libs.coil.network.okhttp)
     implementation(libs.coil.gif)

app/proguard-rules.pro

@@ -2,3 +2,7 @@
 
 -dontwarn com.google.re2j.Matcher
 -dontwarn com.google.re2j.Pattern
+
+# TODO: remove after reading challenge widget is removed
+-keep class * implements androidx.glance.appwidget.action.ActionCallback { public <init>(); }
+

app/src/main/AndroidManifest.xml

@@ -418,6 +418,9 @@
             android:name=".donate.donationreminder.DonationReminderActivity"
             android:windowSoftInputMode="adjustResize"/>
 
+        <activity
+            android:name=".widgets.readingchallenge.ReadingChallengeOnboardingActivity" />
+
         <provider
             android:name=".WikipediaFileProvider"
             android:authorities="${applicationId}.fileprovider"
@@ -456,6 +459,18 @@
                 android:resource="@xml/widget_featured_page" />
         </receiver>
 
+        <receiver
+            android:label="@string/reading_challenge_widget_name"
+            android:name=".widgets.readingchallenge.ReadingChallengeWidgetReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/reading_challenge_widget_info"/>
+        </receiver>
+
         <receiver android:name=".notifications.NotificationPollBroadcastReceiver"
             android:exported="true">
             <intent-filter>

app/src/main/java/org/wikipedia/activity/BaseActivity.kt

@@ -1,7 +1,6 @@
 package org.wikipedia.activity
 
 import android.content.Intent
-import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.MotionEvent
@@ -10,6 +9,7 @@ import androidx.annotation.ColorInt
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.graphics.drawable.toDrawable
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
@@ -40,6 +40,7 @@ import org.wikipedia.games.onthisday.OnThisDayGameResultFragment
 import org.wikipedia.login.LoginActivity
 import org.wikipedia.main.MainActivity
 import org.wikipedia.notifications.NotificationPresenter
+import org.wikipedia.onboarding.InitialOnboardingActivity
 import org.wikipedia.page.ExclusiveBottomSheetPresenter
 import org.wikipedia.readinglist.ReadingListSyncBehaviorDialogs
 import org.wikipedia.readinglist.sync.ReadingListSyncAdapter
@@ -52,6 +53,9 @@ import org.wikipedia.util.DeviceUtil
 import org.wikipedia.util.FeedbackUtil
 import org.wikipedia.util.ResourceUtil
 import org.wikipedia.views.ImageZoomHelper
+import org.wikipedia.widgets.readingchallenge.ReadingChallengeInstallWidgetDialog
+import org.wikipedia.widgets.readingchallenge.ReadingChallengeOnboardingActivity
+import org.wikipedia.widgets.readingchallenge.ReadingChallengeWidgetRepository
 import org.wikipedia.yearinreview.YearInReviewActivity
 import org.wikipedia.yearinreview.YearInReviewOnboardingActivity
 import org.wikipedia.yearinreview.YearInReviewViewModel
@@ -78,6 +82,15 @@ abstract class BaseActivity : AppCompatActivity(), ConnectionStateMonitor.Callba
         }
     }
 
+    private val requestReadingChallengeActivity = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        if (ReadingChallengeWidgetRepository.shouldShowWidgetInstallDialog()) {
+            ExclusiveBottomSheetPresenter.dismiss(supportFragmentManager)
+            ExclusiveBottomSheetPresenter.show(supportFragmentManager,
+                ReadingChallengeInstallWidgetDialog()
+            )
+        }
+    }
+
     private val notificationPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
         // TODO: Show message(s) to the user if they deny the permission
     }
@@ -123,6 +136,7 @@ abstract class BaseActivity : AppCompatActivity(), ConnectionStateMonitor.Callba
         setNavigationBarColor(ResourceUtil.getThemedColor(this, R.attr.paper_color))
         maybeShowLoggedOutInBackgroundDialog()
         maybeShowYearInReview()
+        maybeShowReadingChallengePrompt()
 
         Prefs.localClassName = localClassName
 
@@ -267,8 +281,15 @@ abstract class BaseActivity : AppCompatActivity(), ConnectionStateMonitor.Callba
         }
     }
 
+    protected fun maybeShowReadingChallengePrompt() {
+        if (ReadingChallengeWidgetRepository.shouldShowOnboardingDialog() &&
+            this !is ReadingChallengeOnboardingActivity && this !is InitialOnboardingActivity) {
+            requestReadingChallengeActivity.launch(ReadingChallengeOnboardingActivity.newIntent(this))
+        }
+    }
+
     private fun removeSplashBackground() {
-        window.setBackgroundDrawable(ColorDrawable(ResourceUtil.getThemedColor(this, R.attr.paper_color)))
+        window.setBackgroundDrawable(ResourceUtil.getThemedColor(this, R.attr.paper_color).toDrawable())
     }
 
     private fun maybeShowLoggedOutInBackgroundDialog() {

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

@@ -114,6 +114,7 @@ import org.wikipedia.history.HistoryEntry
 import org.wikipedia.history.HistoryFragment
 import org.wikipedia.login.LoginActivity
 import org.wikipedia.navtab.NavTab
+import org.wikipedia.page.ExclusiveBottomSheetPresenter
 import org.wikipedia.page.PageActivity
 import org.wikipedia.page.PageTitle
 import org.wikipedia.settings.Prefs
@@ -123,6 +124,8 @@ import org.wikipedia.usercontrib.UserContribListActivity
 import org.wikipedia.util.FeedbackUtil
 import org.wikipedia.util.UiState
 import org.wikipedia.util.UriUtil
+import org.wikipedia.widgets.readingchallenge.ReadingChallengeRewardDialog
+import org.wikipedia.widgets.readingchallenge.ReadingChallengeWidgetRepository
 import java.time.LocalDateTime
 
 class ActivityTabFragment : Fragment() {
@@ -211,10 +214,19 @@ class ActivityTabFragment : Fragment() {
                 Prefs.isGameStatsUnavailableSnackbarShown = true
             }
         }
+        maybeShowReadingChallengeRewardDialog()
         viewModel.loadAll()
         requireActivity().invalidateOptionsMenu()
     }
 
+    private fun maybeShowReadingChallengeRewardDialog() {
+        val intent = requireActivity().intent
+        if (ReadingChallengeWidgetRepository.shouldShowReward(intent)) {
+            intent.removeExtra(ReadingChallengeWidgetRepository.INTENT_EXTRA_READING_CHALLENGE_REWARD)
+            ExclusiveBottomSheetPresenter.show(childFragmentManager, ReadingChallengeRewardDialog())
+        }
+    }
+
     override fun onPause() {
         super.onPause()
         requireActivity().removeMenuProvider(menuProvider)

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

@@ -103,6 +103,8 @@ fun OnboardingScreen(
         containerColor = WikipediaTheme.colors.paperColor,
         bottomBar = {
             TwoButtonBottomBar(
+                modifier = Modifier.fillMaxWidth()
+                    .padding(horizontal = 16.dp, vertical = 16.dp),
                 primaryButtonText = stringResource(R.string.onboarding_continue),
                 secondaryButtonText = stringResource(R.string.activity_tab_menu_info),
                 onPrimaryOnClick = onContinueClick,

app/src/main/java/org/wikipedia/compose/components/Onboarding.kt

@@ -20,6 +20,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.wikipedia.R
@@ -56,7 +57,7 @@ fun OnboardingListItem(
                 color = WikipediaTheme.colors.primaryColor
             )
             Text(
-                text = stringResource(item.subTitle),
+                text = item.subtitleString ?: stringResource(item.subTitle),
                 style = MaterialTheme.typography.bodyMedium,
                 color = WikipediaTheme.colors.secondaryColor
             )
@@ -66,15 +67,14 @@ fun OnboardingListItem(
 
 @Composable
 fun TwoButtonBottomBar(
+    modifier: Modifier = Modifier,
     primaryButtonText: String,
     secondaryButtonText: String,
     onPrimaryOnClick: () -> Unit,
     onSecondaryOnClick: () -> Unit
 ) {
     Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp, vertical = 16.dp),
+        modifier = modifier,
         horizontalArrangement = Arrangement.spacedBy(
             space = 24.dp,
             alignment = Alignment.CenterHorizontally
@@ -96,7 +96,8 @@ fun TwoButtonBottomBar(
             Text(
                 text = secondaryButtonText,
                 style = MaterialTheme.typography.labelLarge,
-                color = WikipediaTheme.colors.progressiveColor
+                color = WikipediaTheme.colors.progressiveColor,
+                textAlign = TextAlign.Center
             )
         }
 
@@ -114,7 +115,8 @@ fun TwoButtonBottomBar(
                 Text(
                     text = targetText,
                     style = MaterialTheme.typography.labelLarge,
-                    color = WikipediaTheme.colors.paperColor
+                    color = WikipediaTheme.colors.paperColor,
+                    textAlign = TextAlign.Center
                 )
             }
         }
@@ -124,7 +126,8 @@ fun TwoButtonBottomBar(
 data class OnboardingItem(
     val icon: Int,
     val title: Int,
-    val subTitle: Int
+    val subTitle: Int = 0,
+    val subtitleString: String? = null
 )
 
 @Preview
@@ -142,3 +145,20 @@ private fun OnboardingListItemPreview() {
         )
     }
 }
+
+@Preview
+@Composable
+private fun TwoButtonBottomBarPreview() {
+    BaseTheme(
+        currentTheme = Theme.DARK
+    ) {
+        TwoButtonBottomBar(
+            modifier = Modifier.fillMaxWidth()
+                .padding(horizontal = 16.dp, vertical = 16.dp),
+            "Foo",
+            "A rather long button label",
+            onPrimaryOnClick = { },
+            onSecondaryOnClick = { }
+        )
+    }
+}

app/src/main/java/org/wikipedia/compose/components/WikipediaAlertDialog.kt

@@ -6,18 +6,21 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import org.wikipedia.compose.theme.WikipediaTheme
 
 @Composable
 fun WikipediaAlertDialog(
+    modifier: Modifier = Modifier,
     title: String,
     message: String,
     confirmButtonText: String,
+    confirmButtonColor: Color = WikipediaTheme.colors.progressiveColor,
     dismissButtonText: String,
+    dismissButtonColor: Color = WikipediaTheme.colors.progressiveColor,
     onDismissRequest: () -> Unit,
     onConfirmButtonClick: () -> Unit,
-    onDismissButtonClick: () -> Unit,
-    modifier: Modifier = Modifier
+    onDismissButtonClick: () -> Unit
 ) {
     AlertDialog(
         modifier = modifier,
@@ -37,19 +40,15 @@ fun WikipediaAlertDialog(
         onDismissRequest = onDismissRequest,
         confirmButton = {
             TextButton(
-                colors = ButtonDefaults.textButtonColors(
-                    contentColor = WikipediaTheme.colors.progressiveColor
-                ),
+                colors = ButtonDefaults.textButtonColors(contentColor = confirmButtonColor),
                 onClick = onConfirmButtonClick
             ) {
                 Text(confirmButtonText)
             }
         },
         dismissButton = {
             TextButton(
-                colors = ButtonDefaults.textButtonColors(
-                    contentColor = WikipediaTheme.colors.progressiveColor
-                ),
+                colors = ButtonDefaults.textButtonColors(contentColor = dismissButtonColor),
                 onClick = onDismissButtonClick
             ) {
                 Text(dismissButtonText)

app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.kt

@@ -97,7 +97,7 @@ class CreateAccountActivity : BaseActivity() {
 
         // Only send event if the activity is created for the first time
         if (savedInstanceState == null) {
-            instrument?.submitInteraction("impression", actionContext = mapOf("create_source" to requestSource))
+            instrument?.submitInteraction("impression", actionContext = mapOf("invoke_source" to requestSource))
         }
 
         addFirstKeystrokeInstrumentation(binding.createAccountUsername.editText, "username")
@@ -396,7 +396,7 @@ class CreateAccountActivity : BaseActivity() {
         setResult(RESULT_ACCOUNT_CREATED, resultIntent)
         showProgressBar(false)
         captchaHandler.cancelCaptcha()
-        instrument?.submitInteraction("success", actionContext = mapOf("create_source" to requestSource))
+        instrument?.submitInteraction("success", actionContext = mapOf("invoke_source" to requestSource))
         DeviceUtil.hideSoftKeyboard(this@CreateAccountActivity)
         finish()
     }

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

@@ -15,6 +15,7 @@ import androidx.core.view.isVisible
 import androidx.core.widget.addTextChangedListener
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
+import kotlinx.coroutines.launch
 import org.wikipedia.R
 import org.wikipedia.WikipediaApp
 import org.wikipedia.activity.BaseActivity
@@ -40,6 +41,8 @@ import org.wikipedia.util.StringUtil
 import org.wikipedia.util.UriUtil.visitInExternalBrowser
 import org.wikipedia.util.log.L
 import org.wikipedia.views.NonEmptyValidator
+import org.wikipedia.widgets.readingchallenge.ReadingChallengeWidgetRepository
+import java.time.LocalDate
 
 class LoginActivity : BaseActivity() {
     private lateinit var binding: ActivityLoginBinding
@@ -223,8 +226,18 @@ class LoginActivity : BaseActivity() {
     }
 
     private fun onLoginSuccess() {
-        instrument?.submitInteraction("success")
-
+        val isReadingChallenge = loginSource == SOURCE_READING_CHALLENGE
+        instrument?.submitInteraction(action = "success", actionContext = if (isReadingChallenge) mapOf("invoke_source" to loginSource) else null)
+        if (isReadingChallenge) {
+            Prefs.readingChallengeEnrolled = true
+            Prefs.readingChallengeEnrollmentDate = LocalDate.now().toString()
+            lifecycleScope.launch {
+                if (ReadingChallengeWidgetRepository.isWidgetInstalled()) {
+                    ReadingChallengeWidgetRepository(this@LoginActivity).updateWidgetsAndSendAnalytics()
+                }
+            }
+            intent.removeExtra(LOGIN_REQUEST_SOURCE)
+        }
         DeviceUtil.hideSoftKeyboard(this@LoginActivity)
         setResult(RESULT_LOGIN_SUCCESS)
 
@@ -347,6 +360,7 @@ class LoginActivity : BaseActivity() {
         const val SOURCE_ACTIVITY_TAB = "activity_tab"
         const val SOURCE_YEAR_IN_REVIEW = "yir"
         const val SOURCE_ON_THIS_DAY_GAME_RESULT = "on_this_day_game_result"
+        const val SOURCE_READING_CHALLENGE = "widget_challenge"
 
         fun newIntent(context: Context, source: String, createAccountFirst: Boolean = true): Intent {
             return Intent(context, LoginActivity::class.java)