Merge branch 'trunk' into issue/21084-remove-screen-orientation

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/activity/ActivityCardViewHolder.kt

@@ -31,6 +31,8 @@ class ActivityCardViewHolder(
     private fun MySiteCardToolbarBinding.update(card: ActivityCard.ActivityCardWithItems) {
         uiHelpers.setTextOrHide(mySiteCardToolbarTitle, card.title)
         mySiteCardToolbarMore.visibility = View.VISIBLE
+        mySiteCardToolbarMore.contentDescription =
+            itemView.context.getString(R.string.more_content_description_recent_activity)
         mySiteCardToolbarMore.setOnClickListener {
             showMoreMenu(
                 card.onHideMenuItemClick,

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/pages/PagesCardViewHolder.kt

@@ -38,6 +38,7 @@ class PagesCardViewHolder(
     private fun MySiteCardToolbarBinding.update(card: PagesCardWithData) {
         uiHelpers.setTextOrHide(mySiteCardToolbarTitle, card.title)
         mySiteCardToolbarMore.visibility = View.VISIBLE
+        mySiteCardToolbarMore.contentDescription = itemView.context.getString(R.string.more_content_description_pages)
         mySiteCardToolbarMore.setOnClickListener {
             showMoreMenu(
                 card.moreMenuOptionsLink.onMoreClick,

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/plans/PlansCardViewHolder.kt

@@ -20,6 +20,7 @@ class PlansCardViewHolder(
     fun bind(card: DashboardPlansCard) = with(binding) {
         uiHelpers.setTextOrHide(dashboardCardPlansTitle, card.title)
         dashboardCardPlansCta.setOnClickListener { card.onClick.click() }
+        dashboardPlansCardMore.contentDescription = itemView.context.getString(R.string.more_content_description_plans)
         dashboardPlansCardMore.setOnClickListener {
             showMoreMenu(
                 card.onHideMenuItemClick,

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostCardViewHolder.kt

@@ -39,6 +39,8 @@ sealed class PostCardViewHolder<T : ViewBinding>(
         private fun MySiteCardToolbarBinding.update(card: PostCardWithPostItems) {
             uiHelpers.setTextOrHide(mySiteCardToolbarTitle, card.title)
             mySiteCardToolbarMore.visibility = View.VISIBLE
+            mySiteCardToolbarMore.contentDescription =
+                itemView.context.getString(R.string.more_content_description_posts)
             mySiteCardToolbarMore.setOnClickListener {
                 showMoreMenu(card)
             }

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/todaysstats/TodaysStatsCardViewHolder.kt

@@ -72,6 +72,8 @@ class TodaysStatsCardViewHolder(
     private fun MySiteCardToolbarBinding.update(card: TodaysStatsCardWithData) {
         uiHelpers.setTextOrHide(mySiteCardToolbarTitle, card.title)
         mySiteCardToolbarMore.visibility = View.VISIBLE
+        mySiteCardToolbarMore.contentDescription =
+            mySiteCardToolbarTitle.context.getString(R.string.more_content_description_today_stats)
         mySiteCardToolbarMore.setOnClickListener {
             showMoreMenu(
                 card.moreMenuOptions.onMoreMenuClick,

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/quickstart/QuickStartCardViewHolder.kt

@@ -51,6 +51,8 @@ class QuickStartCardViewHolder(
         mySiteCardToolbar.visibility = View.VISIBLE
         mySiteCardToolbarTitle.text = uiHelpers.getTextOfUiString(itemView.context, card.title)
         mySiteCardToolbarMore.visibility = View.VISIBLE
+        mySiteCardToolbarMore.contentDescription =
+            itemView.context.getString(R.string.more_content_description_quick_start)
         mySiteCardToolbarMore.setOnClickListener {
             showQuickStartCardMenu(
                 card.moreMenuOptions,

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt

@@ -231,7 +231,7 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder(
     private fun buildOverlappingDataSet(context: Context, cut: List<BarEntry>): BarDataSet {
         val dataSet = BarDataSet(cut, "Overlapping data")
         chart.renderer.paintRender.shader = null
-        dataSet.color = ContextCompat.getColor(context, R.color.primary_60)
+        dataSet.color = ContextCompat.getColor(context, R.color.stats_bar_chart_bottom)
         dataSet.formLineWidth = 0f
         dataSet.setDrawValues(false)
         dataSet.isHighlightEnabled = true

WordPress/src/main/res/layout/my_site_blogging_prompt_card.xml

@@ -33,7 +33,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
-            android:contentDescription="@string/content_description_more"
+            android:contentDescription="@string/more_content_description_blogging_prompts"
             android:focusable="true"
             android:src="@drawable/ic_more_vert_white_24dp"
             app:layout_constraintEnd_toEndOf="parent"

WordPress/src/main/res/layout/promote_with_blaze_card.xml

@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
-                android:contentDescription="@string/content_description_more"
+                android:contentDescription="@string/more_content_description_promote_blaze"
                 android:focusable="true"
                 android:src="@drawable/ic_more_vert_white_24dp"
                 app:layout_constraintEnd_toEndOf="parent"

WordPress/src/main/res/values/strings.xml

@@ -2495,6 +2495,16 @@
 
     <string name="jetpack_feature_card_more_menu_item_hide_this" translatable="false">@string/my_site_dashboard_card_more_menu_hide_card</string>
 
+    <!-- My Site - More menu button content descriptions -->
+    <string name="more_content_description_promote_blaze">Blaze more</string>
+    <string name="more_content_description_blogging_prompts">Prompts more</string>
+    <string name="more_content_description_today_stats">Today\'s stats more</string>
+    <string name="more_content_description_quick_start">Quick start more</string>
+    <string name="more_content_description_posts">Posts more</string>
+    <string name="more_content_description_pages">Pages more</string>
+    <string name="more_content_description_recent_activity">Recent activity more</string>
+    <string name="more_content_description_plans">Plans more</string>
+
     <!-- My Site - Dashboard -->
     <string name="my_site_dashboard_card_more_menu_hide_card">Hide this</string>
 

defaults.properties

@@ -1,5 +1,17 @@
 jp.sentry.dsn=https://[email protected]/00000000
 wp.docsbotai.id=wordpress
+wp.e2e.self_hosted_user.password=mocked_password
+wp.e2e.self_hosted_user.site_address=127.0.0.1:8080
+wp.e2e.self_hosted_user.username=e2eflowtestingmobile
+wp.e2e.signup_display_name=e2eflowsignuptestingmobile
+wp.e2e.signup_email[email protected]
+wp.e2e.signup_password=mocked_password
+wp.e2e.signup_username=e2eflowsignuptestingmobile
+wp.e2e.wp_com_passwordless_user.email[email protected]
+wp.e2e.wp_com_user.email[email protected]
+wp.e2e.wp_com_user.password=mocked_password
+wp.e2e.wp_com_user.site_address=e2eflowtestingmobile.wordpress.com
+wp.e2e.wp_com_user.username=e2eflowtestingmobile
 wp.encrypted_logging_key=z0g+oVkqR4kWNUTxJfTozOZQjfXI7W9f6bD0uMJ5VkA=
 wp.oauth.app_id = wordpress
 wp.oauth.app_secret = wordpress

gradle/libs.versions.toml

@@ -90,7 +90,7 @@ mockito-android = '5.14.2'
 mockito-kotlin = '4.1.0'
 mpandroidchart = 'v3.1.0'
 photoview = '2.3.0'
-robolectric = '4.14'
+robolectric = '4.14.1'
 sentry = '4.13.0'
 squareup-java-poet = '1.13.0'
 squareup-kotlin-poet = '1.18.1'