rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/eric/new_fab' into feature/eric/space-list-modal

Browse Source 
# Conflicts:
#	vector/src/main/res/layout/fragment_room_list.xml
This commit is contained in:
ericdecanini 2022-08-09 14:31:39 +02:00
commit f94aad65dd
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:accessibilityTraversalAfter="@id/newLayoutCreateChatButton" android:accessibilityTraversalAfter="@id/newLayoutCreateChatButton"
android:contentDescription="@string/a11y_create_room" android:contentDescription="@string/a11y_open_spaces"
android:src="@drawable/ic_open_spaces" android:src="@drawable/ic_open_spaces"
android:visibility="gone" android:visibility="gone"
app:backgroundTint="?attr/vctr_toolbar_background" app:backgroundTint="?attr/vctr_toolbar_background"
@ -92,7 +92,7 @@
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:accessibilityTraversalBefore="@id/roomListView" android:accessibilityTraversalBefore="@id/roomListView"
android:contentDescription="@string/a11y_create_room" android:contentDescription="@string/a11y_create_message"
android:src="@drawable/ic_new_chat" android:src="@drawable/ic_new_chat"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"

3
vector/src/main/res/values/strings.xml
View File

@ -1813,7 +1813,8 @@
<string name="a11y_create_menu_close">Close the create room menu…</string> <string name="a11y_create_menu_close">Close the create room menu…</string>
<string name="a11y_create_direct_message">Create a new direct conversation</string> <string name="a11y_create_direct_message">Create a new direct conversation</string>
<string name="a11y_create_message">Create a new conversation or room</string> <string name="a11y_create_message">Create a new conversation or room</string>
<string name="a11y_create_room">Create a new room</string> <string name="a11y_create_room">Create a new room</string> <!-- TODO TO BE REMOVED -->
<string name="a11y_open_spaces">Open spaces list</string>
<string name="a11y_close_keys_backup_banner">Close keys backup banner</string> <string name="a11y_close_keys_backup_banner">Close keys backup banner</string>
<string name="a11y_jump_to_bottom">Jump to bottom</string> <string name="a11y_jump_to_bottom">Jump to bottom</string>