Merge branch 'main' into yearInReview_design

Author: cooltey

app/build.gradle

@@ -38,7 +38,7 @@ android {
         applicationId 'org.wikipedia'
         minSdk 21
         targetSdk 35
-        versionCode 50527
+        versionCode 50528
         testApplicationId 'org.wikipedia.test'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'

app/src/main/AndroidManifest.xml

@@ -152,10 +152,9 @@
             android:theme="@style/AppTheme.ActionBar"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize" />
         <activity
-            android:name=".language.LanguagesListActivity"
-            android:label="@string/languages_list_activity_title"
-            android:theme="@style/AppTheme.ActionBar"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize" />
+            android:name=".language.addlanguages.AddLanguagesListActivity"
+            android:windowSoftInputMode="adjustResize"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize"/>
         <activity
             android:name=".suggestededits.SuggestionsActivity"
             android:launchMode="singleTask"

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

@@ -24,7 +24,6 @@ import org.wikipedia.WikipediaApp
 import org.wikipedia.analytics.BreadcrumbsContextHelper
 import org.wikipedia.analytics.eventplatform.BreadCrumbLogEvent
 import org.wikipedia.analytics.eventplatform.EventPlatformClient
-import org.wikipedia.analytics.eventplatform.NotificationInteractionEvent
 import org.wikipedia.analytics.metricsplatform.MetricsPlatform
 import org.wikipedia.appshortcuts.AppShortcuts
 import org.wikipedia.auth.AccountUtil
@@ -96,9 +95,6 @@ abstract class BaseActivity : AppCompatActivity(), ConnectionStateMonitor.Callba
         }
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        if (savedInstanceState == null) {
-            NotificationInteractionEvent.processIntent(intent)
-        }
 
         // Conditionally execute all recurring tasks
         RecurringTasksExecutor().run()

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

@@ -7,6 +7,7 @@ import org.wikipedia.R
 import org.wikipedia.WikipediaApp
 import org.wikipedia.auth.AccountUtil
 import org.wikipedia.dataclient.WikiSite
+import org.wikipedia.extensions.getStrings
 import org.wikipedia.json.JsonUtil
 import org.wikipedia.page.Namespace
 import org.wikipedia.page.PageTitle
@@ -15,7 +16,6 @@ import org.wikipedia.settings.Prefs
 import org.wikipedia.util.DimenUtil
 import org.wikipedia.util.DimenUtil.densityScalar
 import org.wikipedia.util.DimenUtil.leadImageHeightForDevice
-import org.wikipedia.util.L10nUtil
 import java.util.Date
 import java.util.Locale
 import java.util.concurrent.TimeUnit
@@ -90,7 +90,7 @@ object JavaScriptActionHandler {
     fun setUp(context: Context, title: PageTitle, isPreview: Boolean, toolbarMargin: Int): String {
         val app = WikipediaApp.instance
         val topActionBarHeight = if (isPreview) 0 else DimenUtil.roundedPxToDp(toolbarMargin.toFloat())
-        val res = L10nUtil.getStringsForArticleLanguage(title, intArrayOf(R.string.description_edit_add_description,
+        val res = context.getStrings(title, intArrayOf(R.string.description_edit_add_description,
                 R.string.table_infobox, R.string.table_other, R.string.table_close))
         val leadImageHeight = if (isPreview) 0 else
             (if (DimenUtil.isLandscape(context) || !Prefs.isImageDownloadEnabled) 0 else (leadImageHeightForDevice(context) / densityScalar).roundToInt() - topActionBarHeight)

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

@@ -41,7 +41,7 @@ val Typography = WikipediaTypography(
     ),
     h3 = TextStyle(
         fontFamily = FontFamily.SansSerif,
-        fontWeight = FontWeight.Medium,
+        fontWeight = FontWeight.Bold,
         fontSize = 16.sp,
         lineHeight = 24.sp
     ),
@@ -57,6 +57,11 @@ val Typography = WikipediaTypography(
         fontSize = 12.sp,
         lineHeight = 18.sp
     ),
+    p = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontSize = 16.sp,
+        lineHeight = 24.sp
+    ),
     button = TextStyle(
         fontFamily = FontFamily.SansSerif,
         fontWeight = FontWeight.Medium,

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

@@ -170,7 +170,7 @@ class DescriptionEditViewModel(savedStateHandle: SavedStateHandle) : ViewModel()
         var text = firstRevision?.contentMain.orEmpty()
         val baseRevId = firstRevision?.revId ?: 0
         text = updateDescriptionInArticle(text, currentDescription)
-        val automaticallyAddedEditSummary = L10nUtil.getStringForArticleLanguage(pageTitle,
+        val automaticallyAddedEditSummary = L10nUtil.getString(pageTitle,
             if (pageTitle.description.isNullOrEmpty()) R.string.edit_summary_added_short_description
             else R.string.edit_summary_updated_short_description)
         var editSummary = automaticallyAddedEditSummary