Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

My Site Dashboard - Phase 2 - Update Error Card & Stale Message Style & Copy #15788

Merged
merged 3 commits into from
Jan 5, 2022
Merged

My Site Dashboard - Phase 2 - Update Error Card & Stale Message Style & Copy #15788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fb3f41
Update error card message
ashiagr Jan 4, 2022
4c2ff9b
Update stale message
ashiagr Jan 4, 2022
2031ff2
Update stale message margin and text alignment
ashiagr Jan 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteCardAndItemDecoration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions WordPress/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion WordPress/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down