Merge branch 'release/5.252.0'

Author: github-actions[bot]

.github/workflows/release_tests.yml

@@ -140,7 +140,7 @@ jobs:
         if: always()
         run: |
           echo "Console URL: ${{ steps.release-tests.outputs.MAESTRO_CLOUD_CONSOLE_URL }}"
-          echo "Flow Results (JSON): ${{ steps.release-tests.outputs.MAESTRO_CLOUD_FLOW_RESULTS }}"
+          echo 'Flow Results (JSON): ${{ steps.release-tests.outputs.MAESTRO_CLOUD_FLOW_RESULTS }}'
           echo "Release Tests Step Conclusion: ${{ steps.release-tests.conclusion }}" # From Maestro action itself
           echo "Analyzed Flow Summary Status: ${{ steps.analyze-flow-results.outputs.flow_summary_status }}" # From our script
 

.gitignore

@@ -46,6 +46,9 @@ captures/
 !.idea/copyright/
 .idea/workspace.xml
 
+# VSCode
+.vscode/*
+
 # Keystore files
 *.jks
 

.maestro/duckplayer/always_youtube_duckplayer.yaml

@@ -1,4 +1,5 @@
 appId: com.duckduckgo.mobile.android
+androidWebViewHierarchy: devtools
 name: "DuckPlayer: Always > YouTube > Duck Player"
 tags:
   - duckplayer

.maestro/duckplayer/common/load_youtube_video.yaml

@@ -1,4 +1,6 @@
+
 appId: com.duckduckgo.mobile.android
+androidWebViewHierarchy: devtools
 ---
 # Navigate to a YouTube video
 - tapOn:

.maestro/duckplayer/never_youtube.yaml

@@ -1,4 +1,5 @@
 appId: com.duckduckgo.mobile.android
+androidWebViewHierarchy: devtools
 name: "DuckPlayer: Never > YouTube"
 tags:
   - duckplayer

app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt

@@ -3839,6 +3839,8 @@ class BrowserTabViewModel @Inject constructor(
         isActiveCustomTab: Boolean = false,
         getWebViewUrl: () -> String?,
     ) {
+        logcat { "jsCallback $featureName $method $data" }
+
         when (method) {
             "webShare" ->
                 if (id != null && data != null) {

app/src/main/java/com/duckduckgo/app/tabs/ui/TabRendererExtension.kt

@@ -17,7 +17,7 @@
 package com.duckduckgo.app.tabs.ui
 
 import android.content.Context
-import android.net.Uri
+import androidx.core.net.toUri
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.tabs.model.TabEntity
 import com.duckduckgo.app.tabs.model.isBlank
@@ -28,7 +28,7 @@ fun TabEntity.displayTitle(context: Context): String {
         return context.getString(R.string.newTabMenuItem)
     }
 
-    return title ?: Uri.parse(resolvedUrl()).host ?: ""
+    return title ?: resolvedUrl().toUri().host?.take(TabSwitcherAdapter.TabSwitcherViewHolder.MAX_TITLE_LENGTH) ?: ""
 }
 
 private fun TabEntity.resolvedUrl(): String {

app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt

@@ -469,6 +469,8 @@ class TabSwitcherAdapter(
             const val TRACKER_ANIMATION_TILE_INFO_PANEL = 2
 
             const val EXTRA_CLOSE_BUTTON_TOUCH_AREA = 6 // dp
+
+            const val MAX_TITLE_LENGTH = 50
         }
 
         interface TabViewHolder {

app/src/main/res/layout/item_tab_grid.xml

@@ -44,7 +44,6 @@
             android:id="@+id/tabUnread"
             android:layout_width="9dp"
             android:layout_height="9dp"
-            android:elevation="30dp"
             android:importantForAccessibility="no"
             android:src="@drawable/tab_unread_indicator"
             app:layout_constraintCircle="@id/favicon"
@@ -78,14 +77,15 @@
 
         <com.duckduckgo.common.ui.view.text.DaxTextView
             android:id="@+id/title"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:lines="1"
             android:maxLines="1"
             android:textIsSelectable="false"
             android:layout_marginStart="@dimen/keyline_2"
             android:layout_marginEnd="6dp"
+            android:breakStrategy="simple"
             app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toStartOf="@+id/selectionIndicator"
             app:layout_constraintStart_toEndOf="@id/favicon"

app/src/main/res/layout/item_tab_list.xml

@@ -48,7 +48,6 @@
             android:layout_height="9dp"
             android:layout_marginEnd="2dp"
             android:layout_marginBottom="2dp"
-            android:elevation="30dp"
             android:importantForAccessibility="no"
             android:src="@drawable/tab_unread_indicator"
             app:layout_constraintCircle="@id/favicon"
@@ -91,6 +90,7 @@
             android:ellipsize="end"
             android:lines="1"
             android:textIsSelectable="false"
+            android:breakStrategy="simple"
             app:layout_constraintEnd_toStartOf="@id/selectionIndicator"
             app:layout_constraintStart_toEndOf="@id/favicon"
             app:layout_constraintTop_toTopOf="parent"