filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Login screens: Fix issues on button style

This commit is contained in:
Benoit Marty 2019-11-18 10:16:22 +01:00
parent e3e38d4c8a
commit b5f9549a8b
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vector/src/main/res/color/button_background_tint_selector.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/riotx_accent_alpha25" android:state_enabled="false" />
<item android:color="@color/riotx_accent" android:state_enabled="true" />
</selector>

1
vector/src/main/res/layout/fragment_login.xml
View File

@ -134,6 +134,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_gravity="end" android:layout_gravity="end"
android:text="@string/auth_login" android:text="@string/auth_login"
tools:enabled="false"
tools:ignore="RelativeOverlap" /> tools:ignore="RelativeOverlap" />
</RelativeLayout> </RelativeLayout>

2
vector/src/main/res/values/colors_riot.xml
View File

@ -122,7 +122,7 @@
<!-- Button color --> <!-- Button color -->
<color name="button_enabled_text_color">#FFFFFFFF</color> <color name="button_enabled_text_color">#FFFFFFFF</color>
<color name="button_disabled_text_color">#FF7F7F7F</color> <color name="button_disabled_text_color">#FFFFFFFF</color>
<!-- Link color --> <!-- Link color -->
<color name="link_color_light">#368BD6</color> <color name="link_color_light">#368BD6</color>

1
vector/src/main/res/values/colors_riotx.xml
View File

@ -5,6 +5,7 @@
<!-- Accents --> <!-- Accents -->
<color name="riotx_accent">#FF03B381</color> <color name="riotx_accent">#FF03B381</color>
<color name="riotx_accent_alpha25">#3F03B381</color>
<color name="riotx_notice">#FFFF4B55</color> <color name="riotx_notice">#FFFF4B55</color>
<color name="riotx_notice_secondary">#FF61708B</color> <color name="riotx_notice_secondary">#FF61708B</color>

4
vector/src/main/res/values/styles_riot.xml
View File

@ -122,7 +122,7 @@
using colorControlHighlight as an overlay for focused and pressed states. using colorControlHighlight as an overlay for focused and pressed states.
--> -->
<style name="VectorButtonStyle" parent="Widget.MaterialComponents.Button"> <style name="VectorButtonStyle" parent="Widget.MaterialComponents.Button">
<item name="backgroundTint">?colorAccent</item> <item name="backgroundTint">@color/button_background_tint_selector</item>
<item name="android:paddingLeft">16dp</item> <item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item> <item name="android:paddingRight">16dp</item>
<item name="android:minWidth">94dp</item> <item name="android:minWidth">94dp</item>
@ -154,7 +154,7 @@
<item name="android:background">@null</item> <item name="android:background">@null</item>
<!--item name="android:textColor">?colorAccent</item--> <!--item name="android:textColor">?colorAccent</item-->
<item name="colorControlHighlight">?colorAccent</item> <item name="colorControlHighlight">?colorAccent</item>
<item name="strokeColor">?colorAccent</item> <item name="strokeColor">@color/button_background_tint_selector</item>
<item name="strokeWidth">1dp</item> <item name="strokeWidth">1dp</item>
</style> </style>