Merge branch 'main' into Notification_time_ago

Author: Isira-Seneviratne

app/build.gradle

@@ -37,7 +37,7 @@ android {
         applicationId 'org.wikipedia'
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 50441
+        versionCode 50443
         testApplicationId 'org.wikipedia.test'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -95,7 +95,7 @@ android {
             testProguardFiles 'test-proguard-rules.pro'
         }
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             testProguardFiles 'test-proguard-rules.pro'
         }

app/src/main/AndroidManifest.xml

@@ -96,7 +96,7 @@
             android:name=".page.PageActivity"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
             android:configChanges="orientation|screenSize"
-            android:theme="@style/AppTheme.Page"
+            android:theme="@style/AppTheme"
             android:launchMode="singleTask"
             android:parentActivityName=".main.MainActivity"
             android:exported="true">
@@ -256,7 +256,7 @@
             android:name=".notifications.NotificationActivity"
             android:label="@string/notifications_activity_title"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize"
-            android:theme="@style/AppTheme.Notification" />
+            android:theme="@style/AppTheme" />
 
         <activity
             android:name=".page.tabs.TabActivity"
@@ -277,7 +277,7 @@
         <activity
             android:name=".watchlist.WatchlistFilterActivity"
             android:label="@string/watchlist_filter_title"
-            android:theme="@style/AppTheme.ActionBar.Watchlist"/>
+            android:theme="@style/AppTheme.ActionBar"/>
 
         <activity
             android:name=".suggestededits.SuggestedEditsImageTagEditActivity"

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

@@ -7,10 +7,10 @@ import android.view.MenuItem
 import android.view.MotionEvent
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.ColorInt
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.pm.ShortcutManagerCompat
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.skydoves.balloon.Balloon
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.disposables.Disposable
@@ -188,7 +188,7 @@ abstract class BaseActivity : AppCompatActivity(), ConnectionStateMonitor.Callba
     private fun maybeShowLoggedOutInBackgroundDialog() {
         if (Prefs.loggedOutInBackground) {
             Prefs.loggedOutInBackground = false
-            AlertDialog.Builder(this)
+            MaterialAlertDialogBuilder(this)
                     .setCancelable(false)
                     .setTitle(R.string.logged_out_in_background_title)
                     .setMessage(R.string.logged_out_in_background_dialog)
@@ -231,7 +231,7 @@ abstract class BaseActivity : AppCompatActivity(), ConnectionStateMonitor.Callba
     private inner class ExclusiveBusConsumer : Consumer<Any> {
         override fun accept(event: Any) {
             if (event is SplitLargeListsEvent) {
-                AlertDialog.Builder(this@BaseActivity)
+                MaterialAlertDialogBuilder(this@BaseActivity)
                         .setMessage(getString(R.string.split_reading_list_message, SiteInfoClient.maxPagesPerReadingList))
                         .setPositiveButton(R.string.reading_list_split_dialog_ok_button_text, null)
                         .show()

app/src/main/java/org/wikipedia/analytics/eventplatform/BreadCrumbLogEvent.kt

@@ -3,9 +3,8 @@ package org.wikipedia.analytics.eventplatform
 import android.content.Context
 import android.view.MenuItem
 import android.view.View
-import android.widget.CheckBox
+import android.widget.Checkable
 import android.widget.TextView
-import androidx.appcompat.widget.SwitchCompat
 import androidx.fragment.app.Fragment
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -38,8 +37,7 @@ class BreadCrumbLogEvent(
             }
             val viewReadableName = BreadCrumbViewUtil.getReadableNameForView(view)
             val str = "$viewReadableName." + when (view) {
-                is SwitchCompat -> if (!view.isChecked) "on" else "off"
-                is CheckBox -> if (!view.isChecked) "on" else "off"
+                is Checkable -> if (!view.isChecked) "on" else "off"
                 else -> "click"
             }
             EventPlatformClient.submit(BreadCrumbLogEvent(BreadCrumbViewUtil.getReadableScreenName(context), str))

app/src/main/java/org/wikipedia/analytics/eventplatform/WatchlistAnalyticsHelper.kt

@@ -5,6 +5,16 @@ import org.wikipedia.WikipediaApp
 import org.wikipedia.page.PageTitle
 
 object WatchlistAnalyticsHelper {
+
+    fun logWatchlistItemCountOnLoad(context: Context = WikipediaApp.instance, itemsCount: Int) {
+        EventPlatformClient.submit(
+            BreadCrumbLogEvent(
+                BreadCrumbViewUtil.getReadableScreenName(context),
+                "Watchlist.itemCount:$itemsCount.displayed"
+            )
+        )
+    }
+
     fun logAddedToWatchlist(title: PageTitle?, context: Context = WikipediaApp.instance) {
         EventPlatformClient.submit(
             BreadCrumbLogEvent(

app/src/main/java/org/wikipedia/categories/CategoryDialog.kt

@@ -1,5 +1,6 @@
 package org.wikipedia.categories
 
+import android.graphics.Typeface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -83,6 +84,7 @@ class CategoryDialog : ExtendedBottomSheetDialogFragment() {
         override fun onCreateViewHolder(parent: ViewGroup, pos: Int): CategoryItemHolder {
             val view = PageItemView<PageTitle>(requireContext())
             view.setImageVisible(false)
+            view.setTitleTypeface(Typeface.NORMAL)
             return CategoryItemHolder(view)
         }
 

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

@@ -9,8 +9,8 @@ import android.text.TextWatcher
 import android.util.Patterns
 import android.view.KeyEvent
 import android.view.View
-import androidx.appcompat.app.AlertDialog
 import androidx.core.widget.doOnTextChanged
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputLayout
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.CompositeDisposable
@@ -230,7 +230,7 @@ class CreateAccountActivity : BaseActivity() {
                 binding.createAccountEmail.error = getString(R.string.create_account_email_error)
                 return
             }
-            ValidateResult.NO_EMAIL -> AlertDialog.Builder(this)
+            ValidateResult.NO_EMAIL -> MaterialAlertDialogBuilder(this)
                     .setCancelable(false)
                     .setTitle(R.string.email_recommendation_dialog_title)
                     .setMessage(StringUtil.fromHtml(resources.getString(R.string.email_recommendation_dialog_message)))

app/src/main/java/org/wikipedia/dataclient/Service.kt

@@ -171,6 +171,14 @@ interface Service {
             @Field("url") url: String,
     ): ShortenUrlResponse
 
+    @GET(MW_API_PREFIX + "action=query&generator=geosearch&prop=coordinates|description|pageimages|info&inprop=varianttitles|displaytitle")
+    suspend fun getGeoSearch(
+        @Query("ggscoord", encoded = true) coordinates: String,
+        @Query("ggsradius") radius: Int,
+        @Query("ggslimit") ggsLimit: Int,
+        @Query("colimit") coLimit: Int,
+    ): MwQueryResponse
+
     // ------- CSRF, Login, and Create Account -------
 
     @Headers("Cache-Control: no-cache")
@@ -323,11 +331,11 @@ interface Service {
     ): Observable<Edit>
 
     @GET(MW_API_PREFIX + "action=query&list=usercontribs&ucprop=ids|title|timestamp|comment|size|flags|sizediff|tags&meta=userinfo&uiprop=groups|blockinfo|editcount|latestcontrib")
-    fun getUserContributions(
+    suspend fun getUserContributions(
         @Query("ucuser") username: String,
         @Query("uclimit") maxCount: Int,
         @Query("uccontinue") uccontinue: String?
-    ): Observable<MwQueryResponse>
+    ): MwQueryResponse
 
     @GET(MW_API_PREFIX + "action=query&list=usercontribs&ucprop=ids|title|timestamp|comment|size|flags|sizediff|tags")
     suspend fun getUserContrib(

app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.kt

@@ -21,7 +21,7 @@ class MwQueryPage {
     @SerialName("entityterms") val entityTerms: EntityTerms? = null
 
     private val ns = 0
-    private var coordinates: List<Coordinates>? = null
+    val coordinates: List<Coordinates>? = null
     private val thumbnail: Thumbnail? = null
     private val varianttitles: Map<String, String>? = null
     private val actions: Map<String, List<MwServiceError>>? = null
@@ -49,13 +49,6 @@ class MwQueryPage {
         return Namespace.of(ns)
     }
 
-    fun coordinates(): List<Coordinates>? {
-        // TODO: Handle null values in lists during deserialization, perhaps with a new
-        // @RequiredElements annotation and corresponding TypeAdapter
-        coordinates = coordinates?.filterNotNull()
-        return coordinates
-    }
-
     fun thumbUrl(): String? {
         return thumbnail?.source
     }
@@ -116,7 +109,7 @@ class MwQueryPage {
     class LangLink(val lang: String = "", val title: String = "")
 
     @Serializable
-    class Coordinates(val lat: Double? = null, val lon: Double? = null)
+    class Coordinates(val lat: Double = 0.0, val lon: Double = 0.0)
 
     @Serializable
     internal class Thumbnail(val source: String? = null,

app/src/main/java/org/wikipedia/descriptions/DescriptionEditActivity.kt

@@ -22,6 +22,7 @@ import org.wikipedia.suggestededits.PageSummaryForEdit
 import org.wikipedia.util.ClipboardUtil
 import org.wikipedia.util.DeviceUtil
 import org.wikipedia.util.FeedbackUtil
+import org.wikipedia.util.ReleaseUtil
 import org.wikipedia.util.ShareUtil
 import org.wikipedia.views.ImagePreviewDialog
 import org.wikipedia.views.SuggestedArticleDescriptionsDialog
@@ -36,7 +37,7 @@ class DescriptionEditActivity : SingleFragmentActivity<DescriptionEditFragment>(
         val action = intent.getSerializableExtra(Constants.INTENT_EXTRA_ACTION) as Action
         val pageTitle = intent.getParcelableExtra<PageTitle>(EXTRA_TITLE)!!
 
-        MachineGeneratedArticleDescriptionsAnalyticsHelper.isUserInExperiment = (AccountUtil.isLoggedIn &&
+        MachineGeneratedArticleDescriptionsAnalyticsHelper.isUserInExperiment = (ReleaseUtil.isPreBetaRelease && AccountUtil.isLoggedIn &&
                 action == Action.ADD_DESCRIPTION && pageTitle.description.isNullOrEmpty() &&
                 SuggestedArticleDescriptionsDialog.availableLanguages.contains(pageTitle.wikiSite.languageCode))