caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1611 from Andries-Smit/fix/style-button-omnipod-disabled

Browse source 
Fix style button Omnipod disabled
This commit is contained in:
Milos Kozak 2022-04-12 10:15:18 +02:00 committed by GitHub
commit 1eba22e481
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/src/main/res/color/mtrl_btn_bg_color_selector_grey.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/buttonBackground" android:state_enabled="true"/>
<item android:alpha="0.12" android:color="?attr/colorOnSurface"/>
</selector>

3
core/src/main/res/values-night/styles.xml
View file

@ -287,8 +287,7 @@
<dimen name="gray_material_button_margin_horizontal">5dp</dimen> <dimen name="gray_material_button_margin_horizontal">5dp</dimen>
<style name="GrayButton" parent="Widget.MaterialComponents.Button"> <style name="GrayButton" parent="Widget.MaterialComponents.Button">
<item name="android:backgroundTint">@color/buttonBackground</item> <item name="android:backgroundTint">@color/mtrl_btn_bg_color_selector_grey</item>
<item name="android:textColor">@color/buttonText</item>
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center_vertical</item> <item name="android:layout_gravity">center_vertical</item>

3
core/src/main/res/values/styles.xml
View file

@ -303,8 +303,7 @@
<dimen name="gray_material_button_margin_horizontal">5dp</dimen> <dimen name="gray_material_button_margin_horizontal">5dp</dimen>
<style name="GrayButton" parent="Widget.MaterialComponents.Button"> <style name="GrayButton" parent="Widget.MaterialComponents.Button">
<item name="android:backgroundTint">@color/buttonBackground</item> <item name="android:backgroundTint">@color/mtrl_btn_bg_color_selector_grey</item>
<item name="android:textColor">@color/buttonText</item>
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center_vertical</item> <item name="android:layout_gravity">center_vertical</item>

9
omnipod-common/src/main/res/layout/omnipod_common_wizard_nav_buttons.xml
View file

@ -1,22 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
style="@style/GrayButton"
android:id="@+id/button_cancel" android:id="@+id/button_cancel"
style="@style/GrayButton"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/omnipod_common_wizard_button_cancel" /> android:text="@string/omnipod_common_wizard_button_cancel" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
style="@style/GrayButton"
android:id="@+id/button_next" android:id="@+id/button_next"
style="@style/GrayButton"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="@string/omnipod_common_wizard_button_next" /> android:text="@string/omnipod_common_wizard_button_next"
tools:enabled="false" />
</LinearLayout> </LinearLayout>