Merge pull request #15788 from wordpress-mobile/issue/15785-update-er…

…ror-card-stale-msg-style-copy My Site Dashboard - Phase 2 - Update Error Card & Stale Message Style & Copy
wordpress-mobile · Jan 5, 2022 · 66bfb56 · 66bfb56
2 parents 4768d54 + 2031ff2
commit 66bfb56
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteCardAndItemDecoration.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteCardAndItemDecoration.kt
@@ -18,6 +18,11 @@ class MySiteCardAndItemDecoration(
         val position = parent.getChildAdapterPosition(view)
         if (position < 0) return
         when (parent.adapter?.getItemViewType(position)) {
+            MySiteCardAndItem.Type.INFO_ITEM.ordinal -> {
+                outRect.top = verticalMargin
+                outRect.left = horizontalMargin
+                outRect.right = horizontalMargin
+            }
             MySiteCardAndItem.Type.LIST_ITEM.ordinal,
             MySiteCardAndItem.Type.CATEGORY_HEADER_ITEM.ordinal -> {
                 outRect.left = horizontalMargin

diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
@@ -2204,7 +2204,7 @@
 
     <!-- My Site - Dashboard -->
     <string name="my_site_dashboard_update_error">Couldn\'t update dashboard.</string>
-    <string name="my_site_dashboard_stale_message">Couldn\'t update dashboard. Check your connection and pull to refresh.</string>
+    <string name="my_site_dashboard_stale_message">The dashboard is not updated. Please check your connection and then pull to refresh.</string>
 
     <!-- My Site - Post Card -->
     <string name="my_site_post_card_draft_title">Work on a draft post</string>
@@ -2220,8 +2220,8 @@
     <string name="my_site_post_card_link_go_to_scheduled_posts">Go to scheduled posts</string>
 
     <!-- My Site - Error Card -->
-    <string name="my_site_error_card_title">Some data wasn\'t loaded</string>
-    <string name="my_site_error_card_subtitle">Couldn\'t display more data about your site right now.</string>
+    <string name="my_site_error_card_title">Some data hasn\'t loaded</string>
+    <string name="my_site_error_card_subtitle">We\'re having trouble loading your site\'s data at the moment.</string>
 
     <!-- site picker -->
     <string name="site_picker_title">Choose site</string>

diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
@@ -600,7 +600,7 @@
     </style>
 
     <style name="MySiteInfoItemTextView">
-        <item name="android:textAlignment">center</item>
+        <item name="android:textAlignment">viewStart</item>
         <item name="android:singleLine">false</item>
         <item name="android:textAppearance">?attr/textAppearanceCaption</item>
         <item name="android:textColor">?attr/wpColorOnSurfaceMedium</item>