TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-05 05:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further AccessibilityId mapping & fixed group members counts to display correct details

Browse Source
This commit is contained in:
Al Lansley
2024-08-12 09:49:57 +10:00
parent 558d6741b1
commit fc3b4ad367
113 changed files with 47 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
View File

@@ -531,7 +531,7 @@ class ConversationReactionOverlay : FrameLayout {
// Reply
val canWrite = openGroup == null || openGroup.canWrite
if (canWrite && !message.isPending && !message.isFailed && !message.isOpenGroupInvitation) {
items += ActionItem(R.attr.menu_reply_icon, R.string.reply, { handleActionItemClicked(Action.REPLY) }, R.string.AccessibilityId_reply_message)
items += ActionItem(R.attr.menu_reply_icon, R.string.reply, { handleActionItemClicked(Action.REPLY) }, R.string.AccessibilityId_reply)
}
// Copy message text
if (!containsControlMessage && hasText) {
@@ -544,7 +544,7 @@ class ConversationReactionOverlay : FrameLayout {
// Delete message
if (userCanDeleteSelectedItems(context, message, openGroup, userPublicKey, blindedPublicKey)) {
items += ActionItem(R.attr.menu_trash_icon, R.string.delete, { handleActionItemClicked(Action.DELETE) },
R.string.AccessibilityId_delete_message, message.subtitle, ThemeUtil.getThemedColor(context, R.attr.danger))
R.string.AccessibilityId_deleteMessage, message.subtitle, ThemeUtil.getThemedColor(context, R.attr.danger))
}
// Ban user
if (userCanBanSelectedUsers(context, message, openGroup, userPublicKey, blindedPublicKey)) {
@@ -572,7 +572,7 @@ class ConversationReactionOverlay : FrameLayout {
items += ActionItem(R.attr.menu_save_icon,
R.string.save,
{ handleActionItemClicked(Action.DOWNLOAD) },
R.string.AccessibilityId_save_attachment
R.string.AccessibilityId_save
)
}
}

4
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
View File

@@ -80,8 +80,8 @@ class InputBar @JvmOverloads constructor(
var voiceRecorderState = VoiceRecorderState.Idle
private val attachmentsButton = InputBarButton(context, R.drawable.ic_plus_24).apply { contentDescription = context.getString(R.string.AccessibilityId_attachmentsButton)}
val microphoneButton = InputBarButton(context, R.drawable.ic_microphone).apply { contentDescription = context.getString(R.string.AccessibilityId_microphone_button)}
private val sendButton = InputBarButton(context, R.drawable.ic_arrow_up, true).apply { contentDescription = context.getString(R.string.AccessibilityId_send_message_button)}
val microphoneButton = InputBarButton(context, R.drawable.ic_microphone).apply { contentDescription = context.getString(R.string.AccessibilityId_voiceMessageNew)}
private val sendButton = InputBarButton(context, R.drawable.ic_arrow_up, true).apply { contentDescription = context.getString(R.string.AccessibilityId_send)}
init {
// Attachments button

10
app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt
View File

@@ -109,14 +109,10 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
groupID = intent.getStringExtra(groupIDKey)!!
val groupInfo = DatabaseComponent.get(this).groupDatabase().getGroup(groupID).get()
originalName = groupInfo.title
isSelfAdmin = groupInfo.admins.any{ it.serialize() == TextSecurePreferences.getLocalNumber(this) }
isSelfAdmin = groupInfo.admins.any { it.serialize() == TextSecurePreferences.getLocalNumber(this) }
name = originalName
// Update the group member count
val memberCountTV = findViewById<TextView>(R.id.editGroupMemberCount)
memberCountTV.text = resources.getQuantityString(R.plurals.members, members.size, members.size)
mainContentContainer = findViewById(R.id.mainContentContainer)
cntGroupNameEdit = findViewById(R.id.cntGroupNameEdit)
cntGroupNameDisplay = findViewById(R.id.cntGroupNameDisplay)
@@ -179,6 +175,10 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
originalMembers.clear()
originalMembers.addAll(members + zombies)
updateMembers()
// Now that we have the group members we can update the text on the member count
val memberCountTV = findViewById<TextView>(R.id.editGroupMemberCount)
memberCountTV.text = resources.getQuantityString(R.plurals.members, members.size, members.size)
}
override fun onLoaderReset(loader: Loader<GroupMembers>) {

6
app/src/main/res/layout/activity_conversation_v2.xml
View File

@@ -114,7 +114,7 @@
android:id="@+id/gifButtonContainer"
android:layout_width="@dimen/input_bar_button_expanded_size"
android:layout_height="@dimen/input_bar_button_expanded_size"
android:contentDescription="@string/AccessibilityId_gif_button"
android:contentDescription="@string/AccessibilityId_gif"
android:alpha="0" />
<FrameLayout
@@ -130,7 +130,7 @@
android:layout_marginTop="8dp"
android:layout_width="@dimen/input_bar_button_expanded_size"
android:layout_height="@dimen/input_bar_button_expanded_size"
android:contentDescription="@string/AccessibilityId_images_folder"
android:contentDescription="@string/AccessibilityId_image"
android:alpha="0" />
<FrameLayout
@@ -138,7 +138,7 @@
android:layout_marginTop="8dp"
android:layout_width="@dimen/input_bar_button_expanded_size"
android:layout_height="@dimen/input_bar_button_expanded_size"
android:contentDescription="@string/AccessibilityId_select_camera_button"
android:contentDescription="@string/AccessibilityId_camera"
android:alpha="0" />
</LinearLayout>

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

@@ -112,7 +112,7 @@
android:layout_marginEnd="@dimen/small_spacing"
android:layout_marginBottom="@dimen/small_spacing"
android:layout_weight="1"
android:text="Replaced in code!"
android:text="{count} members"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/medium_font_size" />

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

@@ -19,7 +19,7 @@
android:src="@drawable/ic_delivery_status_sent"
android:paddingStart="2dp"
android:visibility="gone"
android:contentDescription="@string/conversation_item_sent__delivered_description" />
android:contentDescription="@string/AccessibilityId_deliveryIndicator" />
<ImageView android:id="@+id/delivered_indicator"
android:layout_width="wrap_content"
@@ -28,7 +28,7 @@
android:src="@drawable/ic_delivery_status_delivered"
android:paddingStart="2dp"
android:visibility="gone"
android:contentDescription="@string/conversation_item_sent__delivered_description"
android:contentDescription="@string/AccessibilityId_deliveryIndicator"
tools:visibility="gone"/>
<ImageView android:id="@+id/read_indicator"

6
app/src/main/res/layout/fragment_delete_message_bottom_sheet.xml
View File

@@ -11,21 +11,21 @@
<TextView
android:id="@+id/deleteForMeTextView"
android:contentDescription="@string/AccessibilityId_delete_just_for_me"
android:contentDescription="@string/AccessibilityId_deleteMessageMe"
style="@style/BottomSheetActionItem"
android:text="@string/clearMessagesForMe"
android:textColor="?danger" />
<TextView
android:id="@+id/deleteForEveryoneTextView"
android:contentDescription="@string/AccessibilityId_delete_for_everyone"
android:contentDescription="@string/AccessibilityId_deleteMessageEveryone"
style="@style/BottomSheetActionItem"
android:text="@string/clearMessagesForEveryone"
android:textColor="?danger" />
<TextView
android:id="@+id/cancelTextView"
android:contentDescription="@string/AccessibilityId_cancel_deletion"
android:contentDescription="@string/AccessibilityId_deleteMessageCancel"
style="@style/BottomSheetActionItem"
android:text="@string/cancel" />

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

@@ -28,7 +28,7 @@
android:layout_height="match_parent"
android:background="?selectableItemBackgroundBorderless"
android:clickable="false"
android:contentDescription="@string/KeyboardPagerfragment_back_to_emoji"
android:contentDescription="@string/AccessibilityId_emojiSearch"
android:scaleType="centerInside"
app:srcCompat="@drawable/ic_search_24"
app:tint="?searchIconColor" />
@@ -55,7 +55,7 @@
android:layout_height="match_parent"
android:background="?selectableItemBackgroundBorderless"
android:clickable="false"
android:contentDescription="@string/KeyboardPagerfragment_clear_search_entry"
android:contentDescription="@string/AccessibilityId_emojiSearchClear"
android:scaleType="centerInside"
app:tint="@color/signal_icon_tint_tab_selected"
tools:srcCompat="@drawable/ic_x" />

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

@@ -19,7 +19,7 @@
<TextView
android:id="@+id/deleteTitleTextView"
android:contentDescription="@string/AccessibilityId_deleted_message"
android:contentDescription="@string/AccessibilityId_deleteMessageDeleted"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"

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

@@ -36,7 +36,7 @@
<org.thoughtcrime.securesms.conversation.v2.input_bar.InputBarEditText
android:id="@+id/inputBarEditText"
android:contentDescription="@string/AccessibilityId_message_input"
android:contentDescription="@string/AccessibilityId_inputBox"
android:inputType="textMultiLine"
android:layout_width="match_parent"
android:layout_height="40dp"

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

@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="@string/AccessibilityId_untrusted_attachment_message"
android:contentDescription="@string/AccessibilityId_attachmentsClickToDownload"
android:orientation="horizontal"
android:padding="@dimen/medium_spacing"
android:gravity="center">

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

@@ -118,7 +118,7 @@
<TextView
android:id="@+id/messageStatusTextView"
android:contentDescription="@string/AccessibilityId_message_sent_status"
android:contentDescription="@string/AccessibilityId_sent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="2dp"

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

@@ -99,7 +99,7 @@
app:barrierDirection="bottom"/>
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:contentDescription="@string/AccessibilityId_message_body"
android:contentDescription="@string/AccessibilityId_message"
app:layout_constraintHorizontal_bias="0"
tools:visibility="visible"
android:visibility="gone"

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

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/mainVoiceMessageViewContainer"
android:contentDescription="@string/AccessibilityId_voice_message"
android:contentDescription="@string/AccessibilityId_messageVoice"
android:layout_width="160dp"
android:layout_height="36dp">