diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/activity/ActivityCardViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/activity/ActivityCardViewHolder.kt index 30e77032e472..a492aae95076 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/activity/ActivityCardViewHolder.kt +++ b/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, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/pages/PagesCardViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/pages/PagesCardViewHolder.kt index 553ed23e43d7..6113e0660051 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/pages/PagesCardViewHolder.kt +++ b/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, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/plans/PlansCardViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/plans/PlansCardViewHolder.kt index fb38c50d9471..9c8e2a4c1a85 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/plans/PlansCardViewHolder.kt +++ b/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, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostCardViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostCardViewHolder.kt index 5759f02b7627..dad791e0fe22 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostCardViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/posts/PostCardViewHolder.kt @@ -39,6 +39,8 @@ sealed class PostCardViewHolder( 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) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/todaysstats/TodaysStatsCardViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/todaysstats/TodaysStatsCardViewHolder.kt index 97a575f78424..8c39b052a15b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/todaysstats/TodaysStatsCardViewHolder.kt +++ b/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, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/quickstart/QuickStartCardViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/quickstart/QuickStartCardViewHolder.kt index 0047fcf18d5d..5e0a7334c0e2 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/quickstart/QuickStartCardViewHolder.kt +++ b/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, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt index a637bc7045b9..a9c5acdd1a5c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt +++ b/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): 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 diff --git a/WordPress/src/main/res/layout/my_site_blogging_prompt_card.xml b/WordPress/src/main/res/layout/my_site_blogging_prompt_card.xml index b83bf135bbb0..b9b95951f003 100644 --- a/WordPress/src/main/res/layout/my_site_blogging_prompt_card.xml +++ b/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" diff --git a/WordPress/src/main/res/layout/promote_with_blaze_card.xml b/WordPress/src/main/res/layout/promote_with_blaze_card.xml index 38d28abbf6ba..8271f0eec78e 100644 --- a/WordPress/src/main/res/layout/promote_with_blaze_card.xml +++ b/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" diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index a02a009a4378..577088e2b91e 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -2495,6 +2495,16 @@ @string/my_site_dashboard_card_more_menu_hide_card + + Blaze more + Prompts more + Today\'s stats more + Quick start more + Posts more + Pages more + Recent activity more + Plans more + Hide this diff --git a/defaults.properties b/defaults.properties index 209e02aa436a..0139bb47f293 100644 --- a/defaults.properties +++ b/defaults.properties @@ -1,5 +1,17 @@ jp.sentry.dsn=https://00000000000000000000000000000000@sentry.io/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=e2eflowsignuptestingmobile@example.com +wp.e2e.signup_password=mocked_password +wp.e2e.signup_username=e2eflowsignuptestingmobile +wp.e2e.wp_com_passwordless_user.email=e2eflowtestingmobile+passwordless@example.com +wp.e2e.wp_com_user.email=e2eflowtestingmobile@example.com +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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dfe53ea6fa8d..581795785ffd 100644 --- a/gradle/libs.versions.toml +++ b/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'