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: button theme

This commit is contained in:
Benoit Marty 2019-11-18 09:59:45 +01:00
parent 823acebf78
commit 416bef7903
15 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/res/layout/fragment_create_direct_room.xml
View File

@ -107,7 +107,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/addByMatrixId"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"

2
vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
View File

@ -79,7 +79,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_step1_manualExport"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_margin="16dp"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginEnd="@dimen/layout_horizontal_margin"

2
vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
View File

@ -143,7 +143,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_step2_skip_button"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="@dimen/layout_vertical_margin"

2
vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
View File

@ -78,7 +78,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_step3_copy_button"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_gravity="center"
android:maxWidth="@dimen/button_max_width"
android:text="@string/keys_backup_setup_step3_copy_button_title" />

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

@ -120,7 +120,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/forgetPasswordButton"
style="@style/Style.Vector.Login.Button.Wired"
style="@style/Style.Vector.Login.Button.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"

2
vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
View File

@ -68,7 +68,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/loginSignupSigninSignIn"
style="@style/Style.Vector.Login.Button.Wired"
style="@style/Style.Vector.Login.Button.Outlined"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"

2
vector/src/main/res/layout/fragment_public_rooms.xml
View File

@ -45,7 +45,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/publicRoomsCreateNewRoom"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"

2
vector/src/main/res/layout/fragment_sas_verification_display_code.xml
View File

@ -121,7 +121,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/sas_request_cancel_button"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_margin="@dimen/layout_vertical_margin"
android:text="@string/cancel"
app:layout_constraintEnd_toStartOf="@+id/sas_request_continue_button"

2
vector/src/main/res/layout/fragment_sas_verification_incoming_request.xml
View File

@ -119,7 +119,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/sas_request_cancel_button"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_gravity="end"
android:layout_marginEnd="@dimen/layout_vertical_margin"
android:layout_marginRight="@dimen/layout_vertical_margin"

4
vector/src/main/res/layout/fragment_sas_verification_start.xml
View File

@ -36,7 +36,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/sas_cancel_button"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:text="@string/cancel" />
@ -68,7 +68,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/sas_legacy_verification"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_gravity="end"
android:layout_margin="@dimen/layout_horizontal_margin"
android:text="@string/sas_legacy_verification_button_title"

6
vector/src/main/res/layout/item_room_filter_footer.xml
View File

@ -16,7 +16,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/roomFilterFooterCreateRoom"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -25,7 +25,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/roomFilterFooterCreateDirect"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -33,7 +33,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/roomFilterFooterOpenRoomDirectory"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

2
vector/src/main/res/layout/vector_invite_view.xml
View File

@ -59,7 +59,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/inviteRejectView"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"

4
vector/src/main/res/layout/view_button_state.xml
View File

@ -7,7 +7,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/buttonStateButtonFlat"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -44,7 +44,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/buttonStateRetry"
style="@style/VectorButtonStyleFlat"
style="@style/VectorButtonStyleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

7
vector/src/main/res/values/styles_login.xml
View File

@ -19,7 +19,12 @@
<item name="android:textAllCaps">false</item>
</style>
<style name="Style.Vector.Login.Button.Wired" parent="VectorButtonStyleFlat">
<style name="Style.Vector.Login.Button.Outlined" parent="VectorButtonStyleOutlined">
<item name="android:minHeight">52dp</item>
<item name="android:textAllCaps">false</item>
</style>
<style name="Style.Vector.Login.Button.Text" parent="VectorButtonStyleText">
<item name="android:minHeight">52dp</item>
<item name="android:textAllCaps">false</item>
</style>

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

@ -136,7 +136,7 @@
<!--Widget.AppCompat.Button.Borderless.Colored, which sets the text color to colorAccent,
using colorControlHighlight as an overlay for focused and pressed states.-->
<style name="VectorButtonStyleFlat" parent="Widget.MaterialComponents.Button.TextButton">
<style name="VectorButtonStyleText" parent="Widget.MaterialComponents.Button.TextButton">
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">false</item>
<item name="android:layout_width">wrap_content</item>
@ -154,6 +154,8 @@
<item name="android:background">@null</item>
<!--item name="android:textColor">?colorAccent</item-->
<item name="colorControlHighlight">?colorAccent</item>
<item name="strokeColor">?colorAccent</item>
<item name="strokeWidth">1dp</item>
</style>
<style name="AlerterButton" parent="Widget.AppCompat.Button.Borderless.Colored">