Skip to content

Commit

Permalink
[fenix] For mozilla-mobile/fenix#2133 - Add destructive text color to…
Browse files Browse the repository at this point in the history
… delete history button

UltraBlame original commit: 643bc2c079b82be721d14866942577493444f282
  • Loading branch information
marco-c committed Jun 6, 2024
1 parent 1883804 commit 0ead86f
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 99 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,6 @@ Mode
null
private
val
textView
=
view
.
delete_history_button_text
private
val
buttonView
=
view
Expand Down
179 changes: 87 additions & 92 deletions mobile/android/fenix/app/src/main/res/layout/delete_history_button.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,17 @@ MPL
-
>
<
FrameLayout
com
.
google
.
android
.
material
.
button
.
MaterialButton
xmlns
:
android
Expand All @@ -101,64 +111,49 @@ res
/
android
"
android
:
id
=
"
+
id
/
delete_history_button
"
android
xmlns
:
foreground
app
=
"
?
android
http
:
attr
/
selectableItemBackground
"
android
:
background
=
"
drawable
/
button_background
"
android
:
layout_margin
=
"
16dp
"
schemas
.
android
:
padding
=
"
6dp
.
com
/
apk
/
res
-
auto
"
android
:
clickable
id
=
"
true
+
id
/
delete_history_button
"
android
:
focusable
style
=
"
true
style
/
Widget
.
MaterialComponents
.
Button
.
TextButton
"
android
:
Expand All @@ -174,39 +169,28 @@ layout_height
"
wrap_content
"
>
<
TextView
android
:
id
=
"
+
id
/
delete_history_button_text
"
android
:
layout_width
layout_margin
=
"
wrap_content
16dp
"
android
:
layout_height
background
=
"
wrap_content
drawable
/
button_background
"
android
:
layout_gravity
letterSpacing
=
"
center
0
"
android
:
Expand All @@ -219,74 +203,85 @@ history_delete_all
"
android
:
gravity
textAllCaps
=
"
center
false
"
android
:
textColor
=
"
?
primaryText
destructive
"
android
:
textSize
textStyle
=
"
16sp
bold
"
android
:
textStyle
theme
=
"
bold
style
/
Theme
.
MaterialComponents
.
Light
"
android
app
:
clickable
backgroundTint
=
"
false
?
neutral
"
android
app
:
focusable
icon
=
"
false
drawable
/
ic_delete
"
android
app
:
drawableTint
iconGravity
=
"
?
primaryText
textStart
"
android
app
:
drawableStart
iconPadding
=
"
drawable
/
ic_delete
8dp
"
android
app
:
drawablePadding
iconTint
=
"
12dp
?
destructive
"
app
:
rippleColor
=
"
?
secondaryText
"
/
>
<
/
FrameLayout
>

0 comments on commit 0ead86f

Please sign in to comment.