TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-21 15:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further accessibility ID changes & removed fragment_new_conversation_home.xml

Browse Source
This commit is contained in:
Al Lansley 2024-08-08 10:53:30 +10:00
parent 9c2111e66e
commit 31bac8e30e
9 changed files with 16 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt
View File

@ -58,14 +58,14 @@ internal fun StartConversationScreen(
ItemButton( ItemButton(
textId = R.string.groupCreate, textId = R.string.groupCreate,
icon = R.drawable.ic_group, icon = R.drawable.ic_group,
modifier = Modifier.contentDescription(R.string.AccessibilityId_create_group), modifier = Modifier.contentDescription(R.string.AccessibilityId_groupCreate),
onClick = delegate::onCreateGroupSelected onClick = delegate::onCreateGroupSelected
) )
Divider(startIndent = LocalDimensions.current.dividerIndent) Divider(startIndent = LocalDimensions.current.dividerIndent)
ItemButton( ItemButton(
textId = R.string.communityJoin, textId = R.string.communityJoin,
icon = R.drawable.ic_globe, icon = R.drawable.ic_globe,
modifier = Modifier.contentDescription(R.string.AccessibilityId_join_community), modifier = Modifier.contentDescription(R.string.AccessibilityId_communityJoin),
onClick = delegate::onJoinCommunitySelected onClick = delegate::onJoinCommunitySelected
) )
Divider(startIndent = LocalDimensions.current.dividerIndent) Divider(startIndent = LocalDimensions.current.dividerIndent)

2
app/src/main/res/layout/activity_home.xml
View File

@ -166,7 +166,7 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/newConversationButton" android:id="@+id/newConversationButton"
android:contentDescription="@string/AccessibilityId_new_conversation_button" android:contentDescription="@string/AccessibilityId_conversationsNew"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"

4
app/src/main/res/layout/activity_message_requests.xml
View File

@ -39,7 +39,7 @@
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
android:contentDescription="@string/AccessibilityId_empty_message_request_folder" android:contentDescription="@string/AccessibilityId_messageRequestsNonePending"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/messageRequestsNonePending" android:text="@string/messageRequestsNonePending"
@ -49,7 +49,7 @@
</LinearLayout> </LinearLayout>
<Button <Button
android:contentDescription="@string/AccessibilityId_clear_all_message_requests" android:contentDescription="@string/AccessibilityId_clearAll"
android:id="@+id/clearAllMessageRequestsButton" android:id="@+id/clearAllMessageRequestsButton"
style="@style/Widget.Session.Button.Common.DangerOutline" style="@style/Widget.Session.Button.Common.DangerOutline"
android:layout_width="196dp" android:layout_width="196dp"

2
app/src/main/res/layout/activity_settings.xml
View File

@ -46,7 +46,7 @@
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingBottom="12dp" android:paddingBottom="12dp"
android:visibility="invisible" android:visibility="invisible"
android:hint="@string/activity_settings_display_name_edit_text_hint" android:hint="@string/displayNameEnter"
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:inputType="textCapWords" android:inputType="textCapWords"
android:maxLines="1" /> android:maxLines="1" />

2
app/src/main/res/layout/fragment_create_group.xml
View File

@ -105,7 +105,7 @@
android:layout_width="196dp" android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height" android:layout_height="@dimen/medium_button_height"
android:layout_marginVertical="@dimen/large_spacing" android:layout_marginVertical="@dimen/large_spacing"
android:contentDescription="@string/AccessibilityId_create_group" android:contentDescription="@string/AccessibilityId_groupCreate"
android:text="@string/create" android:text="@string/create"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

183
app/src/main/res/layout/fragment_new_conversation_home.xml
View File

@ -1,183 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?conversation_menu_background_color">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/medium_spacing" >
<TextView
android:id="@+id/titleText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal|center_vertical"
android:paddingTop="@dimen/large_spacing"
android:paddingBottom="@dimen/very_large_spacing"
android:text="@string/conversationsNew"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/very_large_font_size"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/closeButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/small_spacing"
android:layout_marginStart="@dimen/large_spacing"
android:clickable="true"
android:contentDescription="@string/AccessibilityId_closeDialog"
android:focusable="true"
android:src="@drawable/ic_baseline_close_24"
android:background="?selectableItemBackgroundBorderless"
app:layout_constraintBottom_toTopOf="@id/title_divider"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/title_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginBottom="1dp"
android:background="?conversation_menu_border_color"
app:layout_constraintStart_toStartOf="@+id/titleText"
app:layout_constraintTop_toBottomOf="@+id/titleText" />
<View
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="@+id/createPrivateChatButton"
app:layout_constraintBottom_toBottomOf="@+id/joinCommunityButton"
android:background="?conversation_menu_cell_color"/>
<TextView
android:id="@+id/createPrivateChatButton"
android:contentDescription="@string/AccessibilityId_new_direct_message"
android:layout_width="match_parent"
android:layout_height="@dimen/setting_button_height"
android:drawablePadding="@dimen/large_spacing"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/large_spacing"
android:text="@string/messageNew"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/medium_font_size"
android:background="?selectableItemBackground"
app:drawableStartCompat="@drawable/ic_message"
app:layout_constraintBottom_toTopOf="@+id/new_message_divider"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title_divider" />
<View
android:id="@+id/new_message_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="@dimen/massive_spacing"
android:background="?conversation_menu_border_color"
app:layout_constraintStart_toStartOf="@+id/createPrivateChatButton"
app:layout_constraintTop_toBottomOf="@+id/createPrivateChatButton" />
<TextView
android:id="@+id/createClosedGroupButton"
android:contentDescription="@string/AccessibilityId_create_group"
android:layout_width="match_parent"
android:layout_height="@dimen/setting_button_height"
android:drawablePadding="@dimen/large_spacing"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/large_spacing"
android:text="@string/groupCreate"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/medium_font_size"
android:background="?selectableItemBackground"
app:drawableStartCompat="@drawable/ic_group"
app:layout_constraintBottom_toTopOf="@+id/create_group_divider"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/new_message_divider" />
<View
android:id="@+id/create_group_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="@dimen/massive_spacing"
android:background="?conversation_menu_border_color"
app:layout_constraintStart_toStartOf="@+id/createClosedGroupButton"
app:layout_constraintTop_toBottomOf="@+id/createClosedGroupButton" />
<TextView
android:id="@+id/joinCommunityButton"
android:contentDescription="@string/AccessibilityId_join_community"
android:layout_width="match_parent"
android:layout_height="@dimen/setting_button_height"
android:drawablePadding="@dimen/large_spacing"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/large_spacing"
android:text="@string/communityJoin"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/medium_font_size"
android:background="?selectableItemBackground"
app:drawableStartCompat="@drawable/ic_globe"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/create_group_divider" />
<View
android:id="@+id/join_community_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginBottom="1dp"
android:background="?conversation_menu_border_color"
app:layout_constraintStart_toStartOf="@+id/joinCommunityButton"
app:layout_constraintTop_toBottomOf="@+id/joinCommunityButton" />
<TextView
android:id="@+id/contactsText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/large_spacing"
android:paddingTop="@dimen/medium_spacing"
android:paddingBottom="@dimen/small_spacing"
android:text="@string/contactContacts"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/medium_font_size"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/join_community_divider" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/contactsRecyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/contactsText"
tools:itemCount="6"
tools:listitem="@layout/view_contact" />
<TextView
android:id="@+id/noContactsTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:text="@string/contactNone"
android:visibility="visible"
android:textSize="@dimen/small_font_size"
android:textColor="?android:textColorPrimary" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>

2
app/src/main/res/layout/view_message_request.xml
View File

@ -1,7 +1,7 @@
<?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" xmlns:tools="http://schemas.android.com/tools"
android:contentDescription="@string/AccessibilityId_message_request" android:contentDescription="@string/AccessibilityId_messageRequestsNew"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"

2
app/src/main/res/layout/view_message_request_banner.xml
View File

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/conversation_unread_background" android:background="@drawable/conversation_unread_background"
android:contentDescription="@string/AccessibilityId_message_request_banner" android:contentDescription="@string/AccessibilityId_sessionMessageRequests"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="@dimen/accent_line_thickness" android:paddingStart="@dimen/accent_line_thickness"

15
content-descriptions/src/main/res/values/strings.xml
View File

@ -47,16 +47,15 @@
<!--Settings Page --> <!--Settings Page -->
<string name="AccessibilityId_conversationsBlockedContacts">Blocked contacts</string> <string name="AccessibilityId_conversationsBlockedContacts">Blocked contacts</string>
<string name="AccessibilityId_shareAccountId">Account ID</string> <string name="AccessibilityId_shareAccountId">Account ID</string>
<string name="activity_settings_display_name_edit_text_hint">Enter a display name</string>
<!--Message requests--> <!--Message requests-->
<string name="AccessibilityId_clear_all_message_requests">Clear all</string> <string name="AccessibilityId_clearAll">Clear all</string>
<string name="AccessibilityId_empty_message_request_folder">No pending message requests</string> <string name="AccessibilityId_messageRequestsNonePending">No pending message requests</string>
<string name="AccessibilityId_message_request">Message request</string> <string name="AccessibilityId_messageRequestsNew">Message request</string>
<string name="AccessibilityId_message_request_banner">Message requests banner</string> <string name="AccessibilityId_sessionMessageRequests">Message requests banner</string>
<!--New conversation pop up--> <!--New conversation pop up-->
<string name="AccessibilityId_create_group">Create group</string> <string name="AccessibilityId_groupCreate">Create group</string>
<string name="AccessibilityId_join_community">Join community button</string> <string name="AccessibilityId_communityJoin">Join community button</string>
<string name="AccessibilityId_new_conversation_button">New conversation button</string> <string name="AccessibilityId_conversationsNew">New conversation button</string>
<string name="AccessibilityId_new_direct_message">New direct message</string> <string name="AccessibilityId_new_direct_message">New direct message</string>
<!-- Join community pop up --> <!-- Join community pop up -->
<string name="AccessibilityId_community_input_box">Community input</string> <string name="AccessibilityId_community_input_box">Community input</string>