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.

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

Update FAB shape icon and color #18599

Merged
merged 4 commits into from
Jun 16, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
Update FAB style to squircle
Update FAB shape from round to newer squircle
Update the icon from create to plus
  • Loading branch information
ravishanker committed Jun 14, 2023
commit d7a7f3a7a2e3dcb30787bebad8ffd2e45c2e8f79
3 changes: 1 addition & 2 deletions WordPress/src/main/res/layout/main_activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/create_post_page_fab_tooltip"
android:src="@drawable/ic_create_white_24dp"
android:src="@drawable/ic_plus_white_24dp"
android:visibility="gone"
android:backgroundTint="@color/gray_90"
app:borderWidth="0dp"
tools:visibility="visible" />
</RelativeLayout>
Expand Down
2 changes: 1 addition & 1 deletion WordPress/src/main/res/layout/post_list_activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
android:layout_marginBottom="@dimen/fab_margin"
android:layout_marginEnd="@dimen/fab_margin"
android:contentDescription="@string/fab_create_desc"
android:src="@drawable/ic_create_white_24dp"
android:src="@drawable/ic_plus_white_24dp"
android:layout_gravity="end|bottom"
app:borderWidth="0dp"
app:layout_behavior="org.wordpress.android.ui.FloatingActionButtonBehavior" />
Expand Down
3 changes: 2 additions & 1 deletion WordPress/src/main/res/values-night/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@
</style>

<style name="WordPress.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
<item name="android:backgroundTint">?attr/colorSecondaryVariant</item>
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Material3.FloatingActionButton</item>
<item name="android:backgroundTint">?attr/colorBackgroundFloating</item>
<item name="tint">?attr/colorOnSurface</item>
</style>

Expand Down
3 changes: 2 additions & 1 deletion WordPress/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@
</style>

<style name="WordPress.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
<item name="android:backgroundTint">?attr/colorSecondary</item>
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Material3.FloatingActionButton</item>
<item name="android:backgroundTint">?attr/colorOnSurface</item>
</style>

<style name="NumberPickerTheme" parent="WordPress">
Expand Down