Skip to content

Commit 53e932a

Browse files
committed
Move the FAB styles to the theme
1 parent d4aa09b commit 53e932a

File tree

6 files changed

+22
-17
lines changed

6 files changed

+22
-17
lines changed

app/src/main/res/layout/activity_tab_switcher.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@
5252
android:layout_margin="@dimen/keyline_4"
5353
android:contentDescription="New Tab"
5454
android:text="New tab"
55-
android:height="56dp"
56-
app:shapeAppearanceOverlay="@style/NewTabButtonOverlay"
57-
style="@style/NewTabButtonStyle"
58-
app:icon="@drawable/ic_add_24"
59-
app:fabSize="normal" />
55+
app:icon="@drawable/ic_add_24" />
6056

6157
</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/values/styles.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

common/common-ui/src/main/res/values/design-system-dimensions.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@
7373
<dimen name="gridItemTextWidth">72dp</dimen>
7474
<dimen name="gridItemPreviewHeight">170dp</dimen>
7575

76+
<!-- Extended FAB -->
77+
<dimen name="fabHeight">56dp</dimen>
78+
7679
<!-- PopupMenu -->
7780
<dimen name="popupMenuWidth">200dp</dimen>
7881
<dimen name="popupMenuNavigationItemHeight">24dp</dimen>

common/common-ui/src/main/res/values/design-system-theming.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<item name="tabStyle">@style/Widget.DuckDuckGo.TabLayout</item>
5656
<item name="radioButtonStyle">@style/Widget.DuckDuckGo.RadioButton</item>
5757
<item name="checkboxStyle">@style/Widget.DuckDuckGo.CheckBox</item>
58+
<item name="extendedFloatingActionButtonStyle">@style/Widget.DuckDuckGo.ExtensibleFloatingActionButton</item>
5859
<item name="sliderStyle">@style/Widget.DuckDuckGo.Slider</item>
5960
<item name="switchStyle">@style/Widget.DuckDuckGo.v3.Switch</item>
6061
<item name="snackbarStyle">@style/Widget.DuckDuckGo.Snackbar</item>

common/common-ui/src/main/res/values/widget-colors.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,7 @@
4141
<color name="searchWidgetSearchBarTrailingIconColor">@color/black84</color>
4242
<color name="emptyFavoriteDescriptionTextColor">@color/black60</color>
4343
<color name="emptyFavoriteActionTextColor">@color/blue50</color>
44+
<color name="fabBackgroundTint">@color/blue10_solid</color>
45+
<color name="fabIconTint">@color/blue70</color>
46+
<color name="fabTextColor">@color/blue70</color>
4447
</resources>

common/common-ui/src/main/res/values/widgets.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,20 @@
207207
<item name="android:paddingStart">@dimen/keyline_2</item>
208208
</style>
209209

210+
<style name="Widget.DuckDuckGo.ExtensibleFloatingActionButton" parent="Widget.MaterialComponents.ExtendedFloatingActionButton">
211+
<item name="backgroundTint">@color/fabBackgroundTint</item>
212+
<item name="iconTint">@color/fabIconTint</item>
213+
<item name="android:textColor">@color/fabTextColor</item>
214+
<item name="shapeAppearanceOverlay">@style/Widget.DuckDuckGo.ExtensibleFloatingActionButton.Overlay</item>
215+
<item name="fabSize">normal</item>
216+
<item name="android:height">@dimen/fabHeight</item>
217+
</style>
218+
219+
<style name="Widget.DuckDuckGo.ExtensibleFloatingActionButton.Overlay">
220+
<item name="cornerFamily">rounded</item>
221+
<item name="cornerSize">@dimen/keyline_4</item>
222+
</style>
223+
210224
<!-- List Items -->
211225
<style name="Widget.DuckDuckGo.OneLineListItem">
212226
<item name="android:layout_width">match_parent</item>

0 commit comments

Comments
 (0)