Merge branch 'main' into Search-dynamic

Author: Williamrai

.github/workflows/android.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '17'
@@ -48,7 +48,7 @@ jobs:
     - name: Sleep for 30 seconds, to allow the tag to be deleted
       run: sleep 30s
       shell: bash
-    - uses: ncipollo/release-action@v1.18.0
+    - uses: ncipollo/release-action@v1.19.1
       name: Create new tag and release and upload artifacts
       with:
         name: latest

.github/workflows/android_branch.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '17'

.github/workflows/android_offline_test.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'

.github/workflows/android_pr.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - uses: gradle/actions/wrapper-validation@v4
-    - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '17'

.github/workflows/android_smoke_test.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v5
-    - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '17'

app/build.gradle

@@ -40,7 +40,7 @@ android {
         applicationId 'org.wikipedia'
         minSdk = 21
         targetSdk = 36
-        versionCode 50545
+        versionCode 50546
         testApplicationId 'org.wikipedia.test'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'

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

@@ -6,6 +6,7 @@ import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import org.wikipedia.BuildConfig
 import org.wikipedia.WikipediaApp
@@ -41,7 +42,7 @@ object EventPlatformClient {
      */
     private var ENABLED = WikipediaApp.instance.isOnline
 
-    private val coroutineScope = CoroutineScope(Dispatchers.IO)
+    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
     fun setStreamConfig(streamConfig: StreamConfig) {
         STREAM_CONFIGS[streamConfig.streamName] = streamConfig

app/src/main/java/org/wikipedia/bridge/CommunicationBridge.kt

@@ -79,7 +79,7 @@ class CommunicationBridge constructor(private val communicationBridgeListener: C
         pendingJSMessages.clear()
         pendingEvals.clear()
         if (communicationBridgeListener.model.shouldLoadAsMobileWeb) {
-            communicationBridgeListener.webView.loadUrl(pageTitle.mobileUri)
+            communicationBridgeListener.webView.loadUrl(pageTitle.uri)
         } else {
             communicationBridgeListener.webView.loadUrl(ServiceFactory.getRestBasePath(pageTitle.wikiSite) +
                     RestService.PAGE_HTML_ENDPOINT + UriUtil.encodeURL(pageTitle.prefixedText))

app/src/main/java/org/wikipedia/bridge/JavaScriptActionHandler.kt

@@ -21,11 +21,11 @@ import kotlin.math.roundToInt
 object JavaScriptActionHandler {
 
     fun setTopMargin(top: Int): String {
-        return setMargins(16, top + 16, 16, 48)
+        return setMargins(top + 16, 48)
     }
 
-    fun setMargins(left: Int, top: Int, right: Int, bottom: Int): String {
-        return "pcs.c1.Page.setMargins({ top:'${top}px', right:'${right}px', bottom:'${bottom}px', left:'${left}px' })"
+    fun setMargins(top: Int, bottom: Int): String {
+        return "pcs.c1.Page.setMargins({ top:'${top}px', bottom:'${bottom}px' })"
     }
 
     fun getTextSelection(): String {
@@ -104,14 +104,14 @@ object JavaScriptActionHandler {
                 "   \"theme\": \"${app.currentTheme.tag}\"," +
                 "   \"bodyFont\": \"$fontFamily\"," +
                 "   \"dimImages\": ${(app.currentTheme.isDark && Prefs.dimDarkModeImages)}," +
-                "   \"margins\": { \"top\": \"%dpx\", \"right\": \"%dpx\", \"bottom\": \"%dpx\", \"left\": \"%dpx\" }," +
+                "   \"margins\": { \"top\": \"%dpx\", \"bottom\": \"%dpx\" }," +
                 "   \"leadImageHeight\": \"%dpx\"," +
                 "   \"areTablesInitiallyExpanded\": ${isPreview || !Prefs.isCollapseTablesEnabled}," +
                 "   \"textSizeAdjustmentPercentage\": \"100%%\"," +
                 "   \"loadImages\": ${Prefs.isImageDownloadEnabled}," +
                 "   \"userGroups\": ${JsonUtil.encodeToString(AccountUtil.groups)}," +
                 "   \"isEditable\": ${!Prefs.readingFocusModeEnabled}" +
-                "}", topMargin, 16, 48, 16, leadImageHeight)
+                "}", topMargin, 48, leadImageHeight)
     }
 
     fun setUpEditButtons(isEditable: Boolean, isProtected: Boolean): String {

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

@@ -4,6 +4,7 @@ import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
@@ -38,6 +39,7 @@ fun WikiCard(
         contentColor = WikipediaTheme.colors.paperColor
     ),
     border: BorderStroke? = null,
+    onClick: (() -> Unit)? = null,
     shape: Shape = RoundedCornerShape(12.dp),
     content: @Composable () -> Unit
 ) {
@@ -57,7 +59,14 @@ fun WikiCard(
         border = border,
         shape = shape
     ) {
-        content()
+        Box(
+            modifier = Modifier
+                .clickable(enabled = onClick != null) {
+                    onClick?.invoke()
+                }
+        ) {
+            content()
+        }
     }
 }
 
@@ -75,14 +84,12 @@ fun MessageCard(
     onContainerClick: (() -> Unit)? = null
 ) {
     WikiCard(
-        modifier = modifier
+        modifier = modifier,
+        onClick = onContainerClick
     ) {
         Column(
             modifier = Modifier
-            .fillMaxWidth()
-            .clickable(enabled = onContainerClick != null) {
-                onContainerClick?.invoke()
-            }
+                .fillMaxWidth()
         ) {
             Column(
                 modifier = Modifier