From 6fc43fce5f1a0165eb0f89e8fb37851b8079dd4c Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 09:34:40 +0200 Subject: [PATCH 01/16] a11y lock-screen Signed-off-by: Andy Scherzinger --- app/src/main/res/layout/controller_locked.xml | 3 ++- app/src/main/res/values/strings.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/controller_locked.xml b/app/src/main/res/layout/controller_locked.xml index 92079e9c3..414c89f0f 100644 --- a/app/src/main/res/layout/controller_locked.xml +++ b/app/src/main/res/layout/controller_locked.xml @@ -46,6 +46,7 @@ android:layout_width="32dp" android:layout_height="32dp" android:layout_gravity="center" + android:contentDescription="@string/nc_locked" android:src="@drawable/ic_lock_white_24px" /> @@ -57,7 +58,7 @@ android:layout_gravity="center_horizontal" android:paddingTop="16dp" android:paddingBottom="56dp" - android:text="@string/nc_locked" + android:text="@string/nc_locked_tap_to_unlock" android:textAlignment="center" android:textColor="@color/textColorOnPrimaryBackground" android:textSize="22sp" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0c1b0632d..eefb9b323 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -128,7 +128,8 @@ Allows previews of content from received links for supported services link_previews read_privacy - Tap to unlock + Tap to unlock + locked Share my read-status and show the read-status of others Read status From 84fda43187294ff364a5498f8a4d0b19aa08e15d Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 09:43:36 +0200 Subject: [PATCH 02/16] a11y lobby view Signed-off-by: Andy Scherzinger --- app/src/main/res/layout/lobby_view.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/lobby_view.xml b/app/src/main/res/layout/lobby_view.xml index a635e16fd..d267090c3 100644 --- a/app/src/main/res/layout/lobby_view.xml +++ b/app/src/main/res/layout/lobby_view.xml @@ -2,6 +2,8 @@ ~ Nextcloud Talk application ~ ~ @author Mario Danic + ~ @author Andy Scherzinger + ~ Copyright (C) 2021 Andy Scherzinger ~ Copyright (C) 2017-2019 Mario Danic ~ ~ This program is free software: you can redistribute it and/or modify @@ -32,6 +34,7 @@ android:layout_above="@id/lobby_text_view" android:layout_centerHorizontal="true" android:layout_margin="@dimen/margin_between_elements" + android:contentDescription="@string/nc_lobby" android:src="@drawable/ic_room_service_black_24dp" app:tint="@color/grey_600" /> @@ -40,9 +43,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:layout_margin="@dimen/margin_between_elements" + android:layout_margin="@dimen/standard_margin" android:text="@string/nc_lobby_waiting" android:textAlignment="center" - android:textColor="@color/grey_600" /> + android:textColor="@color/grey_600" + android:textSize="16sp" /> \ No newline at end of file From 3a456ceed5ffd3f3506fa89a644fddeadf3d9a12 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 09:49:33 +0200 Subject: [PATCH 03/16] a11y controller menu Signed-off-by: Andy Scherzinger --- app/src/main/res/layout/controller_operations_menu.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/controller_operations_menu.xml b/app/src/main/res/layout/controller_operations_menu.xml index ce17af3ca..144df74b6 100644 --- a/app/src/main/res/layout/controller_operations_menu.xml +++ b/app/src/main/res/layout/controller_operations_menu.xml @@ -32,6 +32,7 @@ android:layout_marginTop="24dp" android:layout_marginEnd="24dp" android:layout_marginBottom="8dp" + android:contentDescription="@null" android:tintMode="src_in" android:visibility="gone" /> From b83d64086d8f2311ceff9f104122d60dbb01b607 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 09:49:52 +0200 Subject: [PATCH 04/16] a11y file browser items Signed-off-by: Andy Scherzinger --- app/src/main/res/layout/rv_item_browser_file.xml | 1 + app/src/main/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/res/layout/rv_item_browser_file.xml b/app/src/main/res/layout/rv_item_browser_file.xml index b8828500c..814249798 100644 --- a/app/src/main/res/layout/rv_item_browser_file.xml +++ b/app/src/main/res/layout/rv_item_browser_file.xml @@ -53,6 +53,7 @@ android:layout_height="16dp" android:layout_below="@id/file_icon" android:layout_alignStart="@+id/file_icon" + android:contentDescription="@string/encrypted" android:src="@drawable/ic_lock_grey600_24px" /> Account not found Favorite + Encrypted Password protected Avatar From bf4f2f87fe47708edce62fd159fb485f8b234700 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 12:52:16 +0200 Subject: [PATCH 05/16] add missing annotation Signed-off-by: Andy Scherzinger --- .../controllers/bottomsheet/EntryMenuController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java index 07efaa4eb..ebb699170 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java @@ -35,13 +35,8 @@ import android.view.inputmethod.EditorInfo; import android.widget.Button; import android.widget.ImageView; -import androidx.annotation.NonNull; -import autodagger.AutoInjector; -import butterknife.BindView; -import butterknife.OnClick; import com.bluelinelabs.conductor.RouterTransaction; import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler; -import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; import com.nextcloud.talk.R; import com.nextcloud.talk.application.NextcloudTalkApplication; @@ -65,6 +60,11 @@ import org.parceler.Parcels; import javax.inject.Inject; +import androidx.annotation.NonNull; +import autodagger.AutoInjector; +import butterknife.BindView; +import butterknife.OnClick; + @AutoInjector(NextcloudTalkApplication.class) public class EntryMenuController extends BaseController { @@ -95,7 +95,6 @@ public class EntryMenuController extends BaseController { private EmojiPopup emojiPopup; - private Bundle originalBundle; public EntryMenuController(Bundle args) { @@ -116,6 +115,7 @@ public class EntryMenuController extends BaseController { this.callUrl = args.getString(BundleKeys.INSTANCE.getKEY_CALL_URL(), ""); } + @NonNull @Override protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) { return inflater.inflate(R.layout.controller_entry_menu, container, false); From 1e702f1d1dcaaf1fc2f6938f21b48b453d6ce3f1 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 12:53:18 +0200 Subject: [PATCH 06/16] a11y conversation-emojie and read/sent status of messages Signed-off-by: Andy Scherzinger --- .../messages/MagicOutcomingTextMessageViewHolder.kt | 8 ++++++++ app/src/main/res/layout/controller_entry_menu.xml | 1 + app/src/main/res/values/strings.xml | 3 +++ 3 files changed, 12 insertions(+) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt index 84a22d33b..852985ebe 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt @@ -194,12 +194,20 @@ class MagicOutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessage else -> null } + val readStatusContentDescriptionString = when (message.readStatus) { + ReadStatus.READ -> context?.resources?.getString(R.string.nc_message_read) + ReadStatus.SENT -> context?.resources?.getString(R.string.nc_message_sent) + else -> null + } + readStatusDrawableInt?.let { drawableInt -> context?.resources?.getDrawable(drawableInt, null)?.let { it.setColorFilter(context?.resources!!.getColor(R.color.white60), PorterDuff.Mode.SRC_ATOP) checkMark?.setImageDrawable(it) } } + + checkMark?.setContentDescription(readStatusContentDescriptionString) } init { diff --git a/app/src/main/res/layout/controller_entry_menu.xml b/app/src/main/res/layout/controller_entry_menu.xml index 664af4045..8f10d5568 100644 --- a/app/src/main/res/layout/controller_entry_menu.xml +++ b/app/src/main/res/layout/controller_entry_menu.xml @@ -74,6 +74,7 @@ android:layout_alignParentEnd="true" android:layout_marginStart="-4dp" android:background="@color/transparent" + android:contentDescription="@string/nc_add_emojis" android:src="@drawable/ic_insert_emoticon_black_24dp" android:tint="@color/emoji_icons" android:visibility="gone" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f06a06907..658ead892 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -233,6 +233,7 @@ OK Conversation name Proceed + Add Emojis The name you entered is the same as the existing one Conversation link is not valid Join the conversation at %1$s/index.php/call/%2$s @@ -275,6 +276,8 @@ Cancel reply You: %1$s + Message read + Message sent No more items to load. Refresh to retry. From e8f9d034ef3cd58d6c9af0ef95efd7e94cb8ecd6 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 14:32:14 +0200 Subject: [PATCH 07/16] a11y call items/states Signed-off-by: Andy Scherzinger --- app/src/main/res/layout/call_item.xml | 4 ++++ app/src/main/res/layout/call_states.xml | 3 +++ app/src/main/res/values/strings.xml | 2 ++ 3 files changed, 9 insertions(+) diff --git a/app/src/main/res/layout/call_item.xml b/app/src/main/res/layout/call_item.xml index 5e9e49bab..1701238f2 100644 --- a/app/src/main/res/layout/call_item.xml +++ b/app/src/main/res/layout/call_item.xml @@ -2,6 +2,8 @@ ~ Nextcloud Talk application ~ ~ @author Mario Danic + ~ @author Andy Scherzinger + ~ Copyright (C) 2021 Andy Scherzinger ~ Copyright (C) 2017 Mario Danic ~ ~ This program is free software: you can redistribute it and/or modify @@ -46,6 +48,7 @@ android:layout_alignParentStart="true" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" + android:contentDescription="@string/nc_remote_audio_off" android:src="@drawable/ic_mic_off_white_24px" android:visibility="invisible" /> @@ -56,6 +59,7 @@ android:layout_below="@id/peer_nick_text_view" android:layout_marginStart="8dp" android:layout_toEndOf="@id/remote_audio_off" + android:contentDescription="@string/nc_remote_video_off" android:src="@drawable/ic_videocam_off_white_24px" android:visibility="invisible" /> diff --git a/app/src/main/res/layout/call_states.xml b/app/src/main/res/layout/call_states.xml index 5e132922d..136805f57 100644 --- a/app/src/main/res/layout/call_states.xml +++ b/app/src/main/res/layout/call_states.xml @@ -2,6 +2,8 @@ ~ Nextcloud Talk application ~ ~ @author Mario Danic + ~ @author Andy Scherzinger + ~ Copyright (C) 2021 Andy Scherzinger ~ Copyright (C) 2017-2019 Mario Danic ~ ~ This program is free software: you can redistribute it and/or modify @@ -29,6 +31,7 @@ android:layout_height="48dp" android:layout_above="@id/callStateTextView" android:layout_centerHorizontal="true" + android:contentDescription="@null" android:src="@drawable/ic_signal_wifi_off_white_24dp" android:visibility="gone" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 658ead892..a120e173e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -278,6 +278,8 @@ You: %1$s Message read Message sent + Remote video off + Remote audio off No more items to load. Refresh to retry. From 8e9d735412553e770e2b33b2c03e36cb058e9d03 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 14:42:46 +0200 Subject: [PATCH 08/16] a11y call notification Signed-off-by: Andy Scherzinger --- .../main/res/layout/controller_call_notification.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/controller_call_notification.xml b/app/src/main/res/layout/controller_call_notification.xml index ff9ac440a..cee15b84d 100644 --- a/app/src/main/res/layout/controller_call_notification.xml +++ b/app/src/main/res/layout/controller_call_notification.xml @@ -2,6 +2,8 @@ ~ Nextcloud Talk application ~ ~ @author Mario Danic + ~ @author Andy Scherzinger + ~ Copyright (C) 2021 Andy Scherzinger ~ Copyright (C) 2017-2018 Mario Danic ~ ~ This program is free software: you can redistribute it and/or modify @@ -27,6 +29,7 @@ android:id="@+id/backgroundImageView" android:layout_width="match_parent" android:layout_height="match_parent" + android:contentDescription="@null" android:scaleType="centerCrop" android:src="@color/grey950" tools:srcCompat="@tools:sample/backgrounds/scenic" /> @@ -48,7 +51,7 @@ app:backgroundImage="@color/nc_darkGreen" app:placeholderImage="@drawable/ic_call_white_24dp" app:roundAsCircle="true" - tools:visibility="visible"/> + tools:visibility="visible" /> + tools:visibility="visible" /> + android:textSize="16sp" /> From 61feac7a53156cf1e462010f04e7c7908051d8cb Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 14:45:00 +0200 Subject: [PATCH 09/16] a11y - set content description to null since it is set dynamically Signed-off-by: Andy Scherzinger --- .../main/res/layout/item_custom_outcoming_text_message.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/item_custom_outcoming_text_message.xml b/app/src/main/res/layout/item_custom_outcoming_text_message.xml index d19c0e670..45c6c7883 100644 --- a/app/src/main/res/layout/item_custom_outcoming_text_message.xml +++ b/app/src/main/res/layout/item_custom_outcoming_text_message.xml @@ -2,6 +2,8 @@ ~ Nextcloud Talk application ~ ~ @author Mario Danic + ~ @author Andy Scherzinger + ~ Copyright (C) 2021 Andy Scherzinger ~ Copyright (C) 2017-2018 Mario Danic ~ ~ This program is free software: you can redistribute it and/or modify @@ -66,7 +68,8 @@ android:layout_height="wrap_content" android:layout_below="@id/messageTime" android:layout_marginStart="8dp" - app:layout_alignSelf="center" /> + app:layout_alignSelf="center" + android:contentDescription="@null" /> From ccf52a97fc75fda9ede1c00409e40a81e0f1bffa Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 14:52:30 +0200 Subject: [PATCH 10/16] a11y call/advancedUser item Signed-off-by: Andy Scherzinger --- app/src/main/res/layout/rv_item_conversation.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/rv_item_conversation.xml b/app/src/main/res/layout/rv_item_conversation.xml index ed7406a1f..9299a55c2 100644 --- a/app/src/main/res/layout/rv_item_conversation.xml +++ b/app/src/main/res/layout/rv_item_conversation.xml @@ -59,6 +59,7 @@ android:layout_centerVertical="true" android:layout_marginStart="@dimen/standard_margin" android:background="?android:attr/selectableItemBackground" + android:contentDescription="@null" android:scaleType="center" android:src="@drawable/ic_more_horiz_black_24dp" /> From 3ba9afca80cce18ea1c969e6662aded735c96179 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 14:52:50 +0200 Subject: [PATCH 11/16] a11y generic menu item Signed-off-by: Andy Scherzinger --- app/src/main/res/layout/rv_item_app.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/res/layout/rv_item_app.xml b/app/src/main/res/layout/rv_item_app.xml index ce5270ef9..9f9121816 100644 --- a/app/src/main/res/layout/rv_item_app.xml +++ b/app/src/main/res/layout/rv_item_app.xml @@ -2,6 +2,8 @@ ~ Nextcloud Talk application ~ ~ @author Mario Danic + ~ @author Andy Scherzinger + ~ Copyright (C) 2021 Andy Scherzinger ~ Copyright (C) 2017 Mario Danic ~ ~ This program is free software: you can redistribute it and/or modify @@ -32,6 +34,7 @@ android:layout_height="24dp" android:layout_centerVertical="true" android:layout_marginStart="16dp" + android:contentDescription="@null" android:focusable="false" android:focusableInTouchMode="false" tools:src="@drawable/ic_add_grey600_24px" /> From d54b3f3d0a1e883c85c037b56e385b0b4b4f3454 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 15:11:11 +0200 Subject: [PATCH 12/16] a11y dynamically set call state info on user items Signed-off-by: Andy Scherzinger --- .../talk/adapters/items/UserItem.java | 31 ++++++++++++++----- .../rv_item_conversation_info_participant.xml | 2 ++ app/src/main/res/values/strings.xml | 3 ++ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java index a569f2a0d..9968aab35 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java @@ -193,24 +193,42 @@ public class UserItem extends AbstractFlexibleItem holder.videoCallImageView.setVisibility(View.GONE); break; case IN_CALL: - holder.voiceOrSimpleCallImageView.setBackground(resources.getDrawable(R.drawable.shape_call_bubble)); + holder.voiceOrSimpleCallImageView.setBackground( + ResourcesCompat.getDrawable(resources, R.drawable.shape_call_bubble, null)); holder.voiceOrSimpleCallImageView.setVisibility(View.VISIBLE); + holder.voiceOrSimpleCallImageView.setContentDescription( + resources.getString(R.string.nc_call_state_in_call, participant.displayName)); holder.videoCallImageView.setVisibility(View.GONE); break; case IN_CALL_WITH_AUDIO: - holder.voiceOrSimpleCallImageView.setBackground(resources.getDrawable(R.drawable.shape_voice_bubble)); + holder.voiceOrSimpleCallImageView.setBackground( + ResourcesCompat.getDrawable(resources, R.drawable.shape_voice_bubble, null)); holder.voiceOrSimpleCallImageView.setVisibility(View.VISIBLE); + holder.voiceOrSimpleCallImageView.setContentDescription( + resources.getString(R.string.nc_call_state_in_call_with_audio, participant.displayName)); holder.videoCallImageView.setVisibility(View.GONE); break; case IN_CALL_WITH_VIDEO: - holder.voiceOrSimpleCallImageView.setBackground(resources.getDrawable(R.drawable.shape_call_bubble)); - holder.videoCallImageView.setBackground(resources.getDrawable(R.drawable.shape_video_bubble)); + holder.voiceOrSimpleCallImageView.setBackground( + ResourcesCompat.getDrawable(resources, R.drawable.shape_call_bubble, null)); + holder.videoCallImageView.setBackground( + ResourcesCompat.getDrawable(resources, R.drawable.shape_video_bubble, null)); + holder.voiceOrSimpleCallImageView.setContentDescription( + resources.getString(R.string.nc_call_state_in_call, participant.displayName)); + holder.videoCallImageView.setContentDescription( + resources.getString(R.string.nc_call_state_with_video, participant.displayName)); holder.voiceOrSimpleCallImageView.setVisibility(View.VISIBLE); holder.videoCallImageView.setVisibility(View.VISIBLE); break; case IN_CALL_WITH_AUDIO_AND_VIDEO: - holder.voiceOrSimpleCallImageView.setBackground(resources.getDrawable(R.drawable.shape_voice_bubble)); - holder.videoCallImageView.setBackground(resources.getDrawable(R.drawable.shape_video_bubble)); + holder.voiceOrSimpleCallImageView.setBackground( + ResourcesCompat.getDrawable(resources, R.drawable.shape_voice_bubble, null)); + holder.videoCallImageView.setBackground( + ResourcesCompat.getDrawable(resources, R.drawable.shape_video_bubble, null)); + holder.voiceOrSimpleCallImageView.setContentDescription( + resources.getString(R.string.nc_call_state_in_call_with_audio)); + holder.videoCallImageView.setContentDescription( + resources.getString(R.string.nc_call_state_with_video)); holder.voiceOrSimpleCallImageView.setVisibility(View.VISIBLE); holder.videoCallImageView.setVisibility(View.VISIBLE); break; @@ -220,7 +238,6 @@ public class UserItem extends AbstractFlexibleItem break; } - if (holder.contactMentionId != null) { String userType = ""; diff --git a/app/src/main/res/layout/rv_item_conversation_info_participant.xml b/app/src/main/res/layout/rv_item_conversation_info_participant.xml index c98f43a7e..3996386e7 100644 --- a/app/src/main/res/layout/rv_item_conversation_info_participant.xml +++ b/app/src/main/res/layout/rv_item_conversation_info_participant.xml @@ -38,6 +38,7 @@ android:layout_height="12dp" android:layout_gravity="bottom|end" android:background="@drawable/shape_lock_bubble" + android:contentDescription="@null" android:visibility="gone" tools:visibility="visible" /> @@ -47,6 +48,7 @@ android:layout_height="12dp" android:layout_gravity="top|end" android:background="@drawable/shape_favorite_bubble" + android:contentDescription="@null" android:visibility="gone" tools:visibility="visible" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a120e173e..23d4722bf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -210,6 +210,9 @@ Reconnecting… Currently offline, please check your connectivity Leaving call… + %1$s in call + %1$s in call with audio + %1$s with video %1$s on %2$s notification channel From 188e33538e86f5d09489fb6d1903e65e38f0f925 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 15:36:40 +0200 Subject: [PATCH 13/16] a11y dynamic content descriptions for scope toggles on profile Signed-off-by: Andy Scherzinger --- .../talk/controllers/ProfileController.java | 22 +++++++++++++++++++ .../layout/user_info_details_table_item.xml | 2 +- app/src/main/res/values/strings.xml | 1 + 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java b/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java index e1f3fd528..8846d925c 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java @@ -749,14 +749,36 @@ public class ProfileController extends BaseController { switch (item.scope) { case PRIVATE: + holder.scope.setImageResource(R.drawable.ic_password); + holder.scope.setContentDescription( + controller.getActivity().getResources().getString( + R.string.scope_toggle_description, + item.hint, + controller.getActivity().getString(R.string.scope_private_title))); + break; case LOCAL: holder.scope.setImageResource(R.drawable.ic_password); + holder.scope.setContentDescription( + controller.getActivity().getResources().getString( + R.string.scope_toggle_description, + item.hint, + controller.getActivity().getString(R.string.scope_local_title))); break; case FEDERATED: holder.scope.setImageResource(R.drawable.ic_contacts); + holder.scope.setContentDescription( + controller.getActivity().getResources().getString( + R.string.scope_toggle_description, + item.hint, + controller.getActivity().getString(R.string.scope_federated_title))); break; case PUBLISHED: holder.scope.setImageResource(R.drawable.ic_link); + holder.scope.setContentDescription( + controller.getActivity().getResources().getString( + R.string.scope_toggle_description, + item.hint, + controller.getActivity().getString(R.string.scope_published_title))); break; } } diff --git a/app/src/main/res/layout/user_info_details_table_item.xml b/app/src/main/res/layout/user_info_details_table_item.xml index aecde4374..e527e9f6b 100644 --- a/app/src/main/res/layout/user_info_details_table_item.xml +++ b/app/src/main/res/layout/user_info_details_table_item.xml @@ -30,7 +30,7 @@ android:layout_width="@dimen/iconized_single_line_item_icon_size" android:layout_height="@dimen/iconized_single_line_item_icon_size" android:layout_marginStart="@dimen/standard_margin" - android:contentDescription="@string/account_icon" + android:contentDescription="@null" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 23d4722bf..5e42ef977 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -408,6 +408,7 @@ Published Synchronize to trusted servers and the global and public address book Scope toggle + Scope toggle for %1$s (%2$s) Search in %s From 26574043bcdb7acd530f4a21ab8e1d20ad9c38ca Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 18:27:37 +0200 Subject: [PATCH 14/16] a11y message input Signed-off-by: Andy Scherzinger --- app/src/main/res/layout/view_message_input.xml | 9 ++++++--- app/src/main/res/values/strings.xml | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/view_message_input.xml b/app/src/main/res/layout/view_message_input.xml index 3cd50fe3a..d64b1a2ad 100644 --- a/app/src/main/res/layout/view_message_input.xml +++ b/app/src/main/res/layout/view_message_input.xml @@ -46,7 +46,8 @@ android:layout_width="36dp" android:layout_height="36dp" android:layout_below="@id/quotedChatMessageView" - android:scaleType="centerInside" /> + android:scaleType="centerInside" + android:contentDescription="@string/nc_add_attachment" /> + android:tint="@color/emoji_icons" + android:contentDescription="@string/nc_add_emojis" /> + android:scaleType="centerInside" + android:contentDescription="@string/nc_description_send_message_button" /> Message sent Remote video off Remote audio off + Add attachment No more items to load. Refresh to retry. From a2c99dd68216b50efc09bad2f5e6a44d1c73dd05 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 4 May 2021 18:29:17 +0200 Subject: [PATCH 15/16] Drone: update Lint results to reflect reduced error/warning count [skip ci] Signed-off-by: Andy Scherzinger --- scripts/analysis/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index f2b89e24f..83c84a5b9 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 3 errors and 367 warnings + Lint Report: 3 errors and 346 warnings From 19cd3e4c792072651b6ef04dad9b43ec303517d7 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 5 May 2021 09:06:54 +0200 Subject: [PATCH 16/16] Improve descriptive strings based on review feedback Signed-off-by: Andy Scherzinger --- .../talk/controllers/ProfileController.java | 27 ++++--------------- app/src/main/res/values/strings.xml | 6 ++--- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java b/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java index 8846d925c..07f94bce2 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java @@ -749,38 +749,21 @@ public class ProfileController extends BaseController { switch (item.scope) { case PRIVATE: - holder.scope.setImageResource(R.drawable.ic_password); - holder.scope.setContentDescription( - controller.getActivity().getResources().getString( - R.string.scope_toggle_description, - item.hint, - controller.getActivity().getString(R.string.scope_private_title))); - break; case LOCAL: holder.scope.setImageResource(R.drawable.ic_password); - holder.scope.setContentDescription( - controller.getActivity().getResources().getString( - R.string.scope_toggle_description, - item.hint, - controller.getActivity().getString(R.string.scope_local_title))); break; case FEDERATED: holder.scope.setImageResource(R.drawable.ic_contacts); - holder.scope.setContentDescription( - controller.getActivity().getResources().getString( - R.string.scope_toggle_description, - item.hint, - controller.getActivity().getString(R.string.scope_federated_title))); break; case PUBLISHED: holder.scope.setImageResource(R.drawable.ic_link); - holder.scope.setContentDescription( - controller.getActivity().getResources().getString( - R.string.scope_toggle_description, - item.hint, - controller.getActivity().getString(R.string.scope_published_title))); break; } + + holder.scope.setContentDescription( + controller.getActivity().getResources().getString( + R.string.scope_toggle_description, + item.hint)); } holder.icon.setImageResource(item.icon); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d6baa3390..edfb50d7a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -129,7 +129,7 @@ link_previews read_privacy Tap to unlock - locked + Locked Share my read-status and show the read-status of others Read status @@ -236,7 +236,7 @@ OK Conversation name Proceed - Add Emojis + Add emojis The name you entered is the same as the existing one Conversation link is not valid Join the conversation at %1$s/index.php/call/%2$s @@ -409,7 +409,7 @@ Published Synchronize to trusted servers and the global and public address book Scope toggle - Scope toggle for %1$s (%2$s) + Change privacy level of %1$s Search in %s