Commit 4cc5e9f9 authored by RikkaW's avatar RikkaW Committed by John Wu

Let module remove button support disable state

parent 6a2ae898
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<Button <Button
android:id="@+id/module_remove" android:id="@+id/module_remove"
style="@style/WidgetFoundation.Button.Text.Secondary" style="@style/WidgetFoundation.Button.Text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
...@@ -157,6 +157,7 @@ ...@@ -157,6 +157,7 @@
android:onClick="@{() -> item.delete()}" android:onClick="@{() -> item.delete()}"
android:text="@{item.removed ? @string/module_state_restore : @string/module_state_remove}" android:text="@{item.removed ? @string/module_state_restore : @string/module_state_remove}"
android:textAllCaps="false" android:textAllCaps="false"
android:theme="@style/ThemeOverlay.Button.Text.Secondary"
app:icon="@{item.removed ? @drawable/ic_restart : @drawable/ic_delete_md2}" app:icon="@{item.removed ? @drawable/ic_restart : @drawable/ic_delete_md2}"
app:iconGravity="textEnd" app:iconGravity="textEnd"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
...@@ -61,11 +61,6 @@ ...@@ -61,11 +61,6 @@
<item name="iconPadding">@dimen/l_50</item> <item name="iconPadding">@dimen/l_50</item>
</style> </style>
<style name="WidgetFoundation.Button.Text.Secondary">
<item name="android:textColor">?colorSecondary</item>
<item name="iconTint">?colorSecondary</item>
</style>
<style name="WidgetFoundation.Button.Text.OnPrimary"> <style name="WidgetFoundation.Button.Text.OnPrimary">
<item name="rippleColor">?colorOnPrimary</item> <item name="rippleColor">?colorOnPrimary</item>
<item name="android:textColor">?colorOnPrimary</item> <item name="android:textColor">?colorOnPrimary</item>
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="ThemeOverlay.Button.Text.Secondary" parent="">
<item name="colorPrimary">?colorSecondary</item>
</style>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment