From a2c86c85b61f31943023fcb0755ffc6f62d95fb1 Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Wed, 18 Sep 2024 16:14:45 +0200 Subject: [PATCH 01/10] feat: added label to activities in AndroidManifest.xml --- owncloudApp/src/main/AndroidManifest.xml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/owncloudApp/src/main/AndroidManifest.xml b/owncloudApp/src/main/AndroidManifest.xml index 469f0787936..fa99e6bdd5d 100644 --- a/owncloudApp/src/main/AndroidManifest.xml +++ b/owncloudApp/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ android:theme="@style/Theme.ownCloud.Toolbar"> @@ -67,9 +68,15 @@ - - + + + @@ -109,6 +117,7 @@ - + From 043471758641a4e70409ea7e58c153e76411f30f Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Wed, 18 Sep 2024 16:16:25 +0200 Subject: [PATCH 02/10] feat: added strings relate to the labels --- owncloudApp/src/main/res/values/strings.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/owncloudApp/src/main/res/values/strings.xml b/owncloudApp/src/main/res/values/strings.xml index ddbaee43b3d..77dc06fd6fe 100644 --- a/owncloudApp/src/main/res/values/strings.xml +++ b/owncloudApp/src/main/res/values/strings.xml @@ -829,4 +829,17 @@ Link Button + Folder picker + Passcode + Pattern + Receive external files + Video preview + Release notes + Image preview + Login + What\'s new + Audio preview + Details + Text preview + From c5b2d562b997a710988a2fd56aaec421931586eb Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Wed, 18 Sep 2024 16:20:03 +0200 Subject: [PATCH 03/10] feat: added setTitle in FileDisplayActivity to avoid owncloud voice in the talkback --- .../java/com/owncloud/android/ui/activity/FileDisplayActivity.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt index 249a38aa9cc..78da8b0b7c3 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt @@ -962,6 +962,7 @@ class FileDisplayActivity : FileActivity(), FileListOption.ALL_FILES -> getString(R.string.default_display_name_for_root_folder) FileListOption.SPACES_LIST -> getString(R.string.bottom_nav_spaces) } + setTitle(title) setupRootToolbar(title = title, isSearchEnabled = true, isAvatarRequested = false) } else if (space?.isProject == true && chosenFile.remotePath == OCFile.ROOT_PATH) { updateStandardToolbar(title = space.name, displayHomeAsUpEnabled = true, homeButtonEnabled = true) From 63c80c785ff458b795922b7d0339b3e8cc7d55b6 Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Wed, 18 Sep 2024 16:25:17 +0200 Subject: [PATCH 04/10] feat: added setTitle in SettingsActivity to avoid owncloud voice in the talkback --- .../android/presentation/settings/SettingsActivity.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/settings/SettingsActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/settings/SettingsActivity.kt index 7c55302024e..8ff8a258350 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/settings/SettingsActivity.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/settings/SettingsActivity.kt @@ -3,8 +3,9 @@ * * @author Juan Carlos Garrote Gascón * @author David Crespo Ríos + * @author Aitor Ballesteros Pavón * - * Copyright (C) 2021 ownCloud GmbH. + * Copyright (C) 2024 ownCloud GmbH. *

* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -70,7 +71,7 @@ class SettingsActivity : AppCompatActivity() { is SettingsMoreFragment -> R.string.prefs_subsection_more else -> R.string.actionbar_settings } - + setTitle(titleId) supportActionBar?.setTitle(titleId) } From 0096c580263f320d9373f91ac91eb757a651523c Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Wed, 18 Sep 2024 16:35:45 +0200 Subject: [PATCH 05/10] feat: added setTitle in fragments to avoid owncloud voice in talkback --- .../android/presentation/files/details/FileDetailsFragment.kt | 1 + .../java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt | 1 + .../java/com/owncloud/android/ui/preview/PreviewTextFragment.kt | 1 + 3 files changed, 3 insertions(+) diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt index 52e40b97a0c..6bbd0658874 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt @@ -217,6 +217,7 @@ class FileDetailsFragment : FileFragment() { } startListeningToOngoingTransfers() fileDetailsViewModel.checkOnGoingTransfersWhenOpening() + activity?.title = getString(R.string.details_label) } diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt index a3d1d87be42..256b87b41c0 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt @@ -94,6 +94,7 @@ class PreviewAudioFragment : FileFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setHasOptionsMenu(true) + activity?.title = getString(R.string.audio_preview_label) } /** diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt index fa366daafe2..78d722ce2dc 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt @@ -103,6 +103,7 @@ class PreviewTextFragment : FileFragment() { file = savedInstanceState.getParcelable(EXTRA_FILE) account = savedInstanceState.getParcelable(EXTRA_ACCOUNT) } + activity?.title = getString(R.string.text_preview_label) setFile(file) setHasOptionsMenu(true) isOpen = true From f97693bde6acc57b4378867d1a7c49c0cde5a9c5 Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Wed, 18 Sep 2024 18:17:16 +0200 Subject: [PATCH 06/10] chore: added calens file --- changelog/unreleased/4470 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/unreleased/4470 diff --git a/changelog/unreleased/4470 b/changelog/unreleased/4470 new file mode 100644 index 00000000000..b282b4164b3 --- /dev/null +++ b/changelog/unreleased/4470 @@ -0,0 +1,6 @@ +Enhancement: TalkBack announces the view label correctly + +TalkBack no longer announces "ownCloud" every time the screen changes. Now, it correctly dictates the name of the current view. + +https://github.com/owncloud/android/issues/4458 +https://github.com/owncloud/android/pull/4470 From 28da79ffecca64f11c0185a5ddbfb3a83089381a Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Thu, 19 Sep 2024 10:44:24 +0200 Subject: [PATCH 07/10] fix: Activity reference changed by requireActivity() --- .../android/presentation/files/details/FileDetailsFragment.kt | 2 +- .../com/owncloud/android/ui/preview/PreviewAudioFragment.kt | 2 +- .../java/com/owncloud/android/ui/preview/PreviewTextFragment.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt index 6bbd0658874..130d8d735bc 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt @@ -217,7 +217,7 @@ class FileDetailsFragment : FileFragment() { } startListeningToOngoingTransfers() fileDetailsViewModel.checkOnGoingTransfersWhenOpening() - activity?.title = getString(R.string.details_label) + requireActivity().title = getString(R.string.details_label) } diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt index 256b87b41c0..f26847c9872 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.kt @@ -94,7 +94,7 @@ class PreviewAudioFragment : FileFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setHasOptionsMenu(true) - activity?.title = getString(R.string.audio_preview_label) + requireActivity().title = getString(R.string.audio_preview_label) } /** diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt index 78d722ce2dc..f6b912b3e7c 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.kt @@ -103,7 +103,7 @@ class PreviewTextFragment : FileFragment() { file = savedInstanceState.getParcelable(EXTRA_FILE) account = savedInstanceState.getParcelable(EXTRA_ACCOUNT) } - activity?.title = getString(R.string.text_preview_label) + requireActivity().title = getString(R.string.text_preview_label) setFile(file) setHasOptionsMenu(true) isOpen = true From a44f386407996a8e9237cc77fa93f0b958f3bbf4 Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Thu, 19 Sep 2024 11:01:20 +0200 Subject: [PATCH 08/10] fix: Removed unnecessary label in SettingsActivity and added LogsListActivity in the Manifest --- owncloudApp/src/main/AndroidManifest.xml | 4 ++-- .../owncloud/android/presentation/logging/LogsListActivity.kt | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/owncloudApp/src/main/AndroidManifest.xml b/owncloudApp/src/main/AndroidManifest.xml index fa99e6bdd5d..7e985fb96f7 100644 --- a/owncloudApp/src/main/AndroidManifest.xml +++ b/owncloudApp/src/main/AndroidManifest.xml @@ -74,8 +74,7 @@ android:name=".presentation.settings.privacypolicy.PrivacyPolicyActivity" android:label="@string/actionbar_privacy_policy" /> + android:name=".presentation.settings.SettingsActivity"/> (R.id.root_toolbar).isVisible = false setSupportActionBar(toolbar) supportActionBar?.apply { - setTitle(R.string.prefs_log_open_logs_list_view) setDisplayHomeAsUpEnabled(true) } } From d44e58ff3aa05d602d8350c5ff83f25041b143b0 Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Thu, 19 Sep 2024 09:07:17 +0000 Subject: [PATCH 09/10] docs: calens changelog updated --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bbc2801ab5..6e921bf89d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,7 @@ ownCloud admins and users. * Enhancement - Roles added to some elements to improve accessibility: [#4373](https://github.com/owncloud/android/issues/4373) * Enhancement - Hardware keyboard support: [#4438](https://github.com/owncloud/android/pull/4438) * Enhancement - Hardware keyboard support for passcode view: [#4447](https://github.com/owncloud/android/issues/4447) +* Enhancement - TalkBack announces the view label correctly: [#4458](https://github.com/owncloud/android/issues/4458) ## Details @@ -147,6 +148,14 @@ ownCloud admins and users. https://github.com/owncloud/android/issues/4447 https://github.com/owncloud/android/pull/4455 +* Enhancement - TalkBack announces the view label correctly: [#4458](https://github.com/owncloud/android/issues/4458) + + TalkBack no longer announces "ownCloud" every time the screen changes. Now, it + correctly dictates the name of the current view. + + https://github.com/owncloud/android/issues/4458 + https://github.com/owncloud/android/pull/4470 + # Changelog for ownCloud Android Client [4.3.1] (2024-07-22) The following sections list the changes in ownCloud Android Client 4.3.1 relevant to From 23397dd75d4c7c4666c0fa52b74b30e87ce5a837 Mon Sep 17 00:00:00 2001 From: Aitorbp Date: Thu, 19 Sep 2024 11:41:07 +0200 Subject: [PATCH 10/10] refactor: one refactor in Manifest --- owncloudApp/src/main/AndroidManifest.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/owncloudApp/src/main/AndroidManifest.xml b/owncloudApp/src/main/AndroidManifest.xml index 7e985fb96f7..12c4eb22979 100644 --- a/owncloudApp/src/main/AndroidManifest.xml +++ b/owncloudApp/src/main/AndroidManifest.xml @@ -73,9 +73,7 @@ - - +