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

Merge remote-tracking branch 'ratatoskr-org/sc' into sc 

Change-Id: Ic2a0c968c1ab484fbf3fbd9effabf5a94fa1032d
This commit is contained in:
SpiritCroc 2024-09-24 20:14:26 +02:00
parent eb9922f4bc ee84015e1d
commit e48fdcae8e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vector/src/main/res/drawable/bg_login_server_selector.xml
View File

@ -2,6 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_login_server_checked" android:state_checked="true" /> <item android:drawable="@drawable/bg_login_server_checked" android:state_checked="true" />
<item android:drawable="@drawable/bg_login_server_checked" android:state_focused="true" />
<item android:drawable="@drawable/bg_login_server_checked" android:state_pressed="true" /> <item android:drawable="@drawable/bg_login_server_checked" android:state_pressed="true" />
<item android:drawable="@drawable/bg_login_server" /> <item android:drawable="@drawable/bg_login_server" />

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

@ -52,6 +52,8 @@
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:background="@drawable/bg_login_server_selector" android:background="@drawable/bg_login_server_selector"
android:contentDescription="@string/login_a11y_connect_using_matrix_id_sc" android:contentDescription="@string/login_a11y_connect_using_matrix_id_sc"
android:clickable="true"
android:focusable="true"
android:minHeight="80dp" android:minHeight="80dp"
android:paddingStart="@dimen/layout_horizontal_margin" android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingEnd="@dimen/layout_horizontal_margin" android:paddingEnd="@dimen/layout_horizontal_margin"
@ -95,6 +97,8 @@
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
android:background="@drawable/bg_login_server_selector" android:background="@drawable/bg_login_server_selector"
android:contentDescription="@string/login_a11y_choose_other_sc" android:contentDescription="@string/login_a11y_choose_other_sc"
android:clickable="true"
android:focusable="true"
android:minHeight="80dp" android:minHeight="80dp"
android:paddingStart="@dimen/layout_horizontal_margin" android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingEnd="@dimen/layout_horizontal_margin" android:paddingEnd="@dimen/layout_horizontal_margin"
@ -138,6 +142,8 @@
android:layout_marginTop="@dimen/layout_vertical_margin" android:layout_marginTop="@dimen/layout_vertical_margin"
android:background="@drawable/bg_login_server_selector" android:background="@drawable/bg_login_server_selector"
android:contentDescription="@string/login_a11y_choose_matrix_org" android:contentDescription="@string/login_a11y_choose_matrix_org"
android:clickable="true"
android:focusable="true"
android:minHeight="80dp" android:minHeight="80dp"
android:paddingStart="@dimen/layout_horizontal_margin" android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingEnd="@dimen/layout_horizontal_margin" android:paddingEnd="@dimen/layout_horizontal_margin"