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

Dashboard Cards: Activity Card Foundation #18270

Merged
merged 14 commits into from
Apr 18, 2023
Merged

Dashboard Cards: Activity Card Foundation #18270

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e1c152b
Add string resources for Activity dashboard card
zwarm Apr 12, 2023
67b4d30
Add activity card layout and list item layout
zwarm Apr 12, 2023
95992e0
Add ActivityCard class and types
zwarm Apr 13, 2023
89327ea
Add view holders for the activity card
zwarm Apr 13, 2023
269fa0a
Add activity card items adapter
zwarm Apr 13, 2023
6173ce1
Remove Activity card from the Type enum
zwarm Apr 13, 2023
d4e48c8
Refactor: Change type to CardViewHolder
zwarm Apr 13, 2023
5b74c37
Add support for ActivityCard
zwarm Apr 13, 2023
0b1f296
Update the cards tracker for activity card
zwarm Apr 13, 2023
187999d
Address detekt issue by suppressing longmethod
zwarm Apr 13, 2023
0af029e
Merge branch 'trunk' into issue/dashboard_cards_activity_card_skeleton
zwarm Apr 13, 2023
4e47213
Merge trunk and resolve conflicts
zwarm Apr 14, 2023
f3b3265
Merge branch 'trunk' into issue/dashboard_cards_activity_card_skeleton
zwarm Apr 17, 2023
a9e40b0
Merge with trunk and resolve conflicts
zwarm Apr 18, 2023
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
Prev Previous commit
Merge with trunk and resolve conflicts
  • Loading branch information
@zwarm
zwarm committed Apr 18, 2023
commit a9e40b0d37d898f591cc63689b07c2c1e148fbf8
11 changes: 11 additions & 0 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 @@ -4515,4 +4515,15 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
<!-- Jetpack - Dashboard cards - Activity Card -->
<string name="dashboard_activity_card_title">Recent activity</string>
<string name="dashboard_activity_card_footer_link">View all activity</string>

<string name="gutenberg_native_add_description" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Add description</string>
<string name="gutenberg_native_add_title" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Add title</string>
<string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_decorative" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Describe the purpose of the image. Leave empty if decorative.</string>
<string name="gutenberg_native_dynamic" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Dynamic</string>
<string name="gutenberg_native_manual" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Manual</string>
<string name="gutenberg_native_more" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">More</string>
<string name="gutenberg_native_playback_bar_color" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Playback Bar Color</string>
<string name="gutenberg_native_playback_settings" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Playback Settings</string>
<string name="gutenberg_native_privacy_and_rating" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Privacy and Rating</string>
<string name="gutenberg_native_remove_blocks" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Remove blocks</string>
</resources>
You are viewing a condensed version of this merge commit. You can view the full changes here.